smoltalk 0.0.63 → 0.0.64

package/dist/classes/message/ToolMessage.d.ts

@@ -7,15 +7,18 @@ import { Message } from "ollama";
 import type { ResponseInputItem } from "openai/resources/responses/responses.js";
 export declare const ToolMessageJSONSchema: z.ZodObject<{
     role: z.ZodLiteral<"tool">;
-    content: z.ZodUnion<readonly [z.ZodString, z.ZodArray<z.ZodObject<{
-        type: z.ZodLiteral<"text">;
-        text: z.ZodString;
-    }, z.core.$strip>>]>;
+    content: z.ZodAny;
     name: z.ZodString;
     tool_call_id: z.ZodDefault<z.ZodString>;
     rawData: z.ZodOptional<z.ZodAny>;
 }, z.core.$strip>;
-export type ToolMessageJSON = z.infer<typeof ToolMessageJSONSchema>;
+export type ToolMessageJSON = {
+    role: "tool";
+    content: any;
+    name: string;
+    tool_call_id: string;
+    rawData?: any;
+};
 export declare class ToolMessage extends BaseMessage implements MessageClass {
     _role: "tool";
     _content: string | Array<TextPart>;

package/dist/classes/message/ToolMessage.js

@@ -1,9 +1,11 @@
 import { z } from "zod";
 import { BaseMessage } from "./BaseMessage.js";
 import { TextPartSchema } from "../../types.js";
+import { getLogger } from "../../util/logger.js";
 export const ToolMessageJSONSchema = z.object({
     role: z.literal("tool"),
-    content: z.union([z.string(), z.array(TextPartSchema)]),
+    //content: z.union([z.string(), z.array(TextPartSchema)]),
+    content: z.any(),
     name: z.string(),
     tool_call_id: z.string().default(""),
     rawData: z.any().optional(),
@@ -55,6 +57,18 @@ export class ToolMessage extends BaseMessage {
             console.error(z.prettifyError(result.error));
             throw new Error("Failed to parse ToolMessage");
         }
+        const TextPartArraySchema = z.array(TextPartSchema);
+        const textPartArrayResult = TextPartArraySchema.safeParse(result.data.content);
+        if (textPartArrayResult.success) {
+            result.data.content = textPartArrayResult.data;
+        }
+        else if (typeof result.data.content === "string") {
+            // do nothing, it's already a string
+        }
+        else {
+            getLogger().warn("ToolMessage content is neither a string nor an array of TextParts. Converting to string using JSON.stringify.");
+            result.data.content = JSON.stringify(result.data.content);
+        }
         return new ToolMessage(result.data.content, {
             tool_call_id: result.data.tool_call_id,
             name: result.data.name,
@@ -101,7 +115,13 @@ export class ToolMessage extends BaseMessage {
     toAnthropicMessage() {
         return {
             role: "user",
-            content: [{ type: "tool_result", tool_use_id: this.tool_call_id, content: this.content }],
+            content: [
+                {
+                    type: "tool_result",
+                    tool_use_id: this.tool_call_id,
+                    content: this.content,
+                },
+            ],
         };
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoltalk",
-  "version": "0.0.63",
+  "version": "0.0.64",
   "description": "A common interface for LLM APIs",
   "homepage": "https://github.com/egonSchiele/smoltalk",
   "scripts": {