@assistant-ui/react-google-adk 0.0.6 → 0.0.8

package/src/convertAdkMessages.test.ts

@@ -78,6 +78,59 @@ describe("convertAdkMessage - ai messages", () => {
     });
   });
 
+  it("converts file content parts to file message parts", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "ai",
+      content: [
+        {
+          type: "file",
+          mimeType: "application/pdf",
+          data: "JVBERi0xLjQK",
+          filename: "report.pdf",
+        },
+      ],
+    };
+    const result = convertAdkMessage(msg);
+    expect(result).toMatchObject({
+      content: [
+        {
+          type: "file",
+          mimeType: "application/pdf",
+          data: "JVBERi0xLjQK",
+          filename: "report.pdf",
+        },
+      ],
+    });
+  });
+
+  it("converts file_url content parts to data parts", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "ai",
+      content: [
+        {
+          type: "file_url",
+          url: "gs://bucket/report.pdf",
+          mimeType: "application/pdf",
+        },
+      ],
+    };
+    const result = convertAdkMessage(msg);
+    expect(result).toMatchObject({
+      content: [
+        {
+          type: "data",
+          name: "file_url",
+          data: {
+            url: "gs://bucket/report.pdf",
+            mimeType: "application/pdf",
+          },
+        },
+      ],
+    });
+  });
+
   it("converts code content parts to data parts", () => {
     const msg: AdkMessage = {
       id: "m1",

package/src/convertAdkMessages.ts

@@ -1,13 +1,14 @@
 "use client";
 
 import type { ToolCallMessagePart } from "@assistant-ui/core";
-import { useExternalMessageConverter } from "@assistant-ui/core/react";
+import type { useExternalMessageConverter } from "@assistant-ui/core/react";
 import type { AdkMessage, AdkMessageContentPart } from "./types";
 
 type ContentPart =
   | { type: "text"; text: string }
   | { type: "reasoning"; text: string }
   | { type: "image"; image: string }
+  | { type: "file"; data: string; mimeType: string; filename?: string }
   | { type: "data"; name: string; data: unknown };
 
 const contentToParts = (content: AdkMessage["content"]): ContentPart[] => {
@@ -28,6 +29,22 @@ const contentToParts = (content: AdkMessage["content"]): ContentPart[] => {
           };
         case "image_url":
           return { type: "image", image: part.url };
+        case "file":
+          return {
+            type: "file",
+            data: part.data,
+            mimeType: part.mimeType,
+            ...(part.filename != null && { filename: part.filename }),
+          };
+        case "file_url":
+          return {
+            type: "data",
+            name: "file_url",
+            data: {
+              url: part.url,
+              ...(part.mimeType != null && { mimeType: part.mimeType }),
+            },
+          };
         case "code":
           return {
             type: "data",

package/src/types.ts

@@ -109,6 +109,17 @@ export type AdkMessageContentPart =
   | { type: "reasoning"; text: string }
   | { type: "image"; mimeType: string; data: string }
   | { type: "image_url"; url: string }
+  | {
+      type: "file";
+      mimeType: string;
+      data: string;
+      filename?: string | undefined;
+    }
+  | {
+      type: "file_url";
+      url: string;
+      mimeType?: string | undefined;
+    }
   | { type: "code"; code: string; language: string }
   | { type: "code_result"; output: string; outcome: string }
   | { type: "activity"; message: string };

package/src/useAdkMessages.test.ts

@@ -0,0 +1,75 @@
+import { describe, expect, it } from "vitest";
+import { messageToEvent } from "./useAdkMessages";
+import type { AdkMessage } from "./types";
+
+describe("messageToEvent (contentToParts)", () => {
+  it("serializes a file content part as inlineData", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "human",
+      content: [
+        {
+          type: "file",
+          mimeType: "application/pdf",
+          data: "JVBERi0xLjQK",
+          filename: "report.pdf",
+        },
+      ],
+    };
+    const event = messageToEvent(msg);
+    expect(event.content?.parts).toEqual([
+      { inlineData: { mimeType: "application/pdf", data: "JVBERi0xLjQK" } },
+    ]);
+  });
+
+  it("serializes a file_url content part as fileData with mimeType", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "human",
+      content: [
+        {
+          type: "file_url",
+          url: "gs://bucket/report.pdf",
+          mimeType: "application/pdf",
+        },
+      ],
+    };
+    const event = messageToEvent(msg);
+    expect(event.content?.parts).toEqual([
+      {
+        fileData: {
+          fileUri: "gs://bucket/report.pdf",
+          mimeType: "application/pdf",
+        },
+      },
+    ]);
+  });
+
+  it("serializes a file_url without mimeType as bare fileData", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "human",
+      content: [{ type: "file_url", url: "gs://bucket/unknown" }],
+    };
+    const event = messageToEvent(msg);
+    expect(event.content?.parts).toEqual([
+      { fileData: { fileUri: "gs://bucket/unknown" } },
+    ]);
+  });
+
+  it("serializes mixed text + file content as multiple parts", () => {
+    const msg: AdkMessage = {
+      id: "m1",
+      type: "human",
+      content: [
+        { type: "text", text: "see attached" },
+        { type: "file", mimeType: "image/png", data: "AAAA" },
+      ],
+    };
+    const event = messageToEvent(msg);
+    expect(event.content?.parts).toEqual([
+      { text: "see attached" },
+      { inlineData: { mimeType: "image/png", data: "AAAA" } },
+    ]);
+  });
+});

package/src/useAdkMessages.ts

@@ -3,11 +3,10 @@ import { useState, useCallback, useRef, useMemo } from "react";
 import { v4 as uuidv4 } from "uuid";
 import { useAui } from "@assistant-ui/store";
 import { AdkEventAccumulator } from "./AdkEventAccumulator";
+import { contentToParts } from "./contentToParts";
 import type {
   AdkEvent,
-  AdkEventPart,
   AdkMessage,
-  AdkMessageContentPart,
   AdkMessageMetadata,
   AdkSendMessageConfig,
   AdkStreamCallback,
@@ -200,7 +199,8 @@ export const useAdkMessages = ({
   };
 };
 
-const messageToEvent = (msg: AdkMessage): AdkEvent => {
+/** @internal — exported for unit tests. */
+export const messageToEvent = (msg: AdkMessage): AdkEvent => {
   if (msg.type === "human") {
     return {
       id: msg.id ?? uuidv4(),
@@ -246,31 +246,3 @@ const messageToEvent = (msg: AdkMessage): AdkEvent => {
   };
   return result;
 };
-
-const contentToParts = (
-  content: string | AdkMessageContentPart[],
-): AdkEventPart[] => {
-  if (typeof content === "string") return [{ text: content }];
-  return content.map((part) => {
-    switch (part.type) {
-      case "text":
-        return { text: part.text };
-      case "reasoning":
-        return { text: part.text, thought: true };
-      case "image":
-        return { inlineData: { mimeType: part.mimeType, data: part.data } };
-      case "image_url":
-        return { fileData: { fileUri: part.url } };
-      case "code":
-        return {
-          executableCode: { code: part.code, language: part.language },
-        };
-      case "code_result":
-        return {
-          codeExecutionResult: { output: part.output, outcome: part.outcome },
-        };
-      default:
-        return { text: "" };
-    }
-  });
-};

package/src/useAdkRuntime.test.ts

@@ -1,7 +1,23 @@
 import { describe, it, expect } from "vitest";
-import { getPendingCancellations, getPendingToolCalls } from "./useAdkRuntime";
+import {
+  getMessageContent,
+  getPendingCancellations,
+  getPendingToolCalls,
+} from "./useAdkRuntime";
+import type { AppendMessage } from "@assistant-ui/core";
 import type { AdkMessage } from "./types";
 
+const makeAppendMessage = (content: AppendMessage["content"]): AppendMessage =>
+  ({
+    role: "user",
+    content,
+    attachments: [],
+    parentId: null,
+    sourceId: null,
+    runConfig: undefined,
+    metadata: { custom: {} },
+  }) as unknown as AppendMessage;
+
 const aiWithToolCalls = (
   id: string,
   toolCalls: Array<{ id: string; name: string }>,
@@ -136,3 +152,60 @@ describe("getPendingCancellations", () => {
     });
   });
 });
+
+describe("getMessageContent", () => {
+  it("preserves file part data and mimeType end-to-end", () => {
+    const result = getMessageContent(
+      makeAppendMessage([
+        { type: "text", text: "see attached" },
+        {
+          type: "file",
+          mimeType: "application/pdf",
+          data: "JVBERi0xLjQK",
+          filename: "report.pdf",
+        },
+      ]),
+    );
+    expect(result).toEqual([
+      { type: "text", text: "see attached" },
+      {
+        type: "file",
+        mimeType: "application/pdf",
+        data: "JVBERi0xLjQK",
+        filename: "report.pdf",
+      },
+    ]);
+  });
+
+  it("keeps file-only content as an array (does not collapse to a text marker)", () => {
+    const result = getMessageContent(
+      makeAppendMessage([
+        {
+          type: "file",
+          mimeType: "image/png",
+          data: "AAAA",
+          filename: "x.png",
+        },
+      ]),
+    );
+    expect(result).toEqual([
+      {
+        type: "file",
+        mimeType: "image/png",
+        data: "AAAA",
+        filename: "x.png",
+      },
+    ]);
+  });
+
+  it("omits filename when not provided", () => {
+    const result = getMessageContent(
+      makeAppendMessage([
+        { type: "file", mimeType: "application/pdf", data: "AAAA" },
+      ]),
+    );
+    expect(result).toEqual([
+      { type: "file", mimeType: "application/pdf", data: "AAAA" },
+    ]);
+  });
+});

package/src/useAdkRuntime.ts

@@ -3,6 +3,7 @@ import { useEffect, useRef, useState } from "react";
 import {
   getExternalStoreMessages,
   type AttachmentAdapter,
+  type DictationAdapter,
   type FeedbackAdapter,
   type SpeechSynthesisAdapter,
   type AppendMessage,
@@ -32,7 +33,8 @@ import { convertAdkMessage } from "./convertAdkMessages";
 import { symbolAdkRuntimeExtras, type AdkRuntimeExtras } from "./hooks";
 import { v4 as uuidv4 } from "uuid";
 
-const getMessageContent = (msg: AppendMessage) => {
+/** @internal — exported for unit tests. */
+export const getMessageContent = (msg: AppendMessage) => {
   const allContent = [
     ...msg.content,
     ...(msg.attachments?.flatMap((a) => a.content) ?? []),
@@ -46,19 +48,22 @@ const getMessageContent = (msg: AppendMessage) => {
         return { type: "image_url" as const, url: part.image };
       case "file":
         return {
-          type: "text" as const,
-          text: `[File: ${part.filename ?? "file"}]`,
+          type: "file" as const,
+          mimeType: part.mimeType,
+          data: part.data,
+          ...(part.filename != null && { filename: part.filename }),
         };
 
       case "tool-call":
         throw new Error("Tool call appends are not supported.");
 
-      default:
+      default: {
         const _exhaustiveCheck: "reasoning" | "source" | "audio" | "data" =
           type;
         throw new Error(
           `Unsupported append message part type: ${_exhaustiveCheck}`,
         );
+      }
     }
   });
 
@@ -143,6 +148,7 @@ export type UseAdkRuntimeOptions = {
     | {
         attachments?: AttachmentAdapter;
         speech?: SpeechSynthesisAdapter;
+        dictation?: DictationAdapter;
         feedback?: FeedbackAdapter;
       }
     | undefined;
@@ -163,13 +169,14 @@ export type UseAdkRuntimeOptions = {
 
 const useAdkRuntimeImpl = ({
   autoCancelPendingToolCalls,
-  adapters: { attachments, feedback, speech } = {},
+  adapters: { attachments, dictation, feedback, speech } = {},
   unstable_allowCancellation,
   stream,
   load,
   getCheckpointId,
   eventHandlers,
 }: UseAdkRuntimeOptions) => {
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const aui = useAui();
   const {
     messages,
@@ -184,12 +191,15 @@ const useAdkRuntimeImpl = ({
     sendMessage,
     cancel,
     replaceMessages,
+    // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   } = useAdkMessages({
     stream,
     ...(eventHandlers && { eventHandlers }),
   });
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const [isRunning, setIsRunning] = useState(false);
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const [toolStatuses, setToolStatuses] = useState<
     Record<string, ToolExecutionStatus>
   >({});
@@ -210,21 +220,25 @@ const useAdkRuntimeImpl = ({
     }
   };
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const threadMessages = useExternalMessageConverter({
     callback: convertAdkMessage,
     messages,
     isRunning: effectiveIsRunning,
   });
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const threadMessagesRef = useRef(threadMessages);
   threadMessagesRef.current = threadMessages;
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const [runtimeRef] = useState(() => ({
     get current() {
       return runtime;
     },
   }));
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const toolInvocations = useToolInvocations({
     state: { messages: threadMessages, isRunning: effectiveIsRunning },
     getTools: () => runtimeRef.current.thread.getModelContext().tools,
@@ -248,10 +262,11 @@ const useAdkRuntimeImpl = ({
     setToolStatuses,
   });
 
+  // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
   const runtime = useExternalStoreRuntime({
     isRunning: effectiveIsRunning,
     messages: threadMessages,
-    adapters: { attachments, feedback, speech },
+    adapters: { attachments, dictation, feedback, speech },
     extras: {
       [symbolAdkRuntimeExtras]: true,
       agentInfo,
@@ -362,11 +377,14 @@ const useAdkRuntimeImpl = ({
   });
 
   {
+    // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
     const loadRef = useRef(load);
+    // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
     useEffect(() => {
       loadRef.current = load;
     });
 
+    // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
     useEffect(() => {
       const loadFn = loadRef.current;
       if (!loadFn) return;
@@ -410,6 +428,7 @@ export const useAdkRuntime = ({
 
   return useRemoteThreadListRuntime({
     runtimeHook: function RuntimeHook() {
+      // biome-ignore lint/correctness/useHookAtTopLevel: intentional conditional/nested hook usage
       return useAdkRuntimeImpl(options);
     },
     adapter,