smoltalk 0.0.5 → 0.0.6

package/dist/classes/ToolCall.d.ts

@@ -1,3 +1,4 @@
+import { FunctionCall } from "@google/genai";
 export type ToolCallOptions = {};
 export declare class ToolCall {
     private _id;
@@ -8,4 +9,8 @@ export declare class ToolCall {
     get id(): string;
     get name(): string;
     get arguments(): Record<string, any>;
+    toOpenAI(): any;
+    toGoogle(): {
+        functionCall: FunctionCall;
+    };
 }

package/dist/classes/ToolCall.js

@@ -30,4 +30,22 @@ export class ToolCall {
     get arguments() {
         return this._arguments;
     }
+    toOpenAI() {
+        return {
+            id: this._id,
+            type: "function",
+            function: {
+                name: this.name,
+                arguments: JSON.stringify(this.arguments),
+            },
+        };
+    }
+    toGoogle() {
+        return {
+            functionCall: {
+                name: this.name,
+                args: this.arguments,
+            },
+        };
+    }
 }

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

@@ -2,30 +2,28 @@ import { BaseMessage, MessageClass } from "./BaseMessage.js";
 import { TextPart } from "../../types.js";
 import { ChatCompletionMessageParam } from "openai/resources";
 import { Content } from "@google/genai";
+import { ToolCall } from "../ToolCall.js";
 export declare class AssistantMessage extends BaseMessage implements MessageClass {
     _role: "assistant";
     _content: string | Array<TextPart> | null;
     _name?: string;
     _audio?: any | null;
-    _function_call?: any | null;
     _refusal?: string | null;
-    _tool_calls?: Array<any>;
+    _toolCalls?: ToolCall[];
     _rawData?: any;
     constructor(content: string | Array<TextPart> | null, options?: {
         name?: string;
         audio?: any | null;
-        function_call?: any | null;
         refusal?: string | null;
-        tool_calls?: Array<any>;
+        toolCalls?: ToolCall[];
         rawData?: any;
     });
     get content(): string;
     get role(): "assistant";
     get name(): string | undefined;
     get audio(): any | null | undefined;
-    get function_call(): any | null | undefined;
     get refusal(): string | null | undefined;
-    get tool_calls(): Array<any> | undefined;
+    get toolCalls(): ToolCall[] | undefined;
     get rawData(): any;
     toOpenAIMessage(): ChatCompletionMessageParam;
     toGoogleMessage(): Content;

package/dist/classes/message/AssistantMessage.js

@@ -4,18 +4,16 @@ export class AssistantMessage extends BaseMessage {
     _content;
     _name;
     _audio;
-    _function_call;
     _refusal;
-    _tool_calls;
+    _toolCalls;
     _rawData;
     constructor(content, options = {}) {
         super();
         this._content = content;
         this._name = options.name;
         this._audio = options.audio;
-        this._function_call = options.function_call;
         this._refusal = options.refusal;
-        this._tool_calls = options.tool_calls;
+        this._toolCalls = options.toolCalls;
         this._rawData = options.rawData;
     }
     get content() {
@@ -35,22 +33,33 @@ export class AssistantMessage extends BaseMessage {
     get audio() {
         return this._audio;
     }
-    get function_call() {
-        return this._function_call;
-    }
     get refusal() {
         return this._refusal;
     }
-    get tool_calls() {
-        return this._tool_calls;
+    get toolCalls() {
+        return this._toolCalls;
     }
     get rawData() {
         return this._rawData;
     }
     toOpenAIMessage() {
-        return { role: this.role, content: this.content, name: this.name };
+        return {
+            role: this.role,
+            content: this.content,
+            name: this.name,
+            tool_calls: this.toolCalls?.map((tc) => tc.toOpenAI()),
+        };
     }
     toGoogleMessage() {
-        return { role: "model", parts: [{ text: this.content }] };
+        const parts = [];
+        if (this.content) {
+            parts.push({ text: this.content });
+        }
+        if (this.toolCalls) {
+            for (const tc of this.toolCalls) {
+                parts.push(tc.toGoogle());
+            }
+        }
+        return { role: "model", parts };
     }
 }

package/dist/classes/message/UserMessage.js

@@ -23,7 +23,11 @@ export class UserMessage extends BaseMessage {
         return this._rawData;
     }
     toOpenAIMessage() {
-        return { role: this.role, content: this.content, name: this.name };
+        return {
+            role: this.role,
+            content: this.content,
+            name: this.name,
+        };
     }
     toGoogleMessage() {
         return { role: this.role, parts: [{ text: this.content }] };

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

@@ -17,9 +17,8 @@ export declare function userMessage(content: string, options?: {
 export declare function assistantMessage(content: string | Array<TextPart> | null, options?: {
     name?: string;
     audio?: any | null;
-    function_call?: any | null;
     refusal?: string | null;
-    tool_calls?: Array<any>;
+    toolCalls?: Array<any>;
     rawData?: any;
 }): AssistantMessage;
 export declare function developerMessage(content: string | Array<TextPart>, options?: {

package/dist/clients/google.js

@@ -27,6 +27,10 @@ export class SmolGoogle extends BaseClient {
         if (tools.length > 0) {
             genConfig.tools = [{ functionDeclarations: tools }];
         }
+        if (config.responseFormat && config.responseFormat.type === "json_schema") {
+            genConfig.responseMimeType = "application/json";
+            genConfig.responseJsonSchema = config.responseFormat.json_schema.schema;
+        }
         const request = {
             contents: messages,
             model: this.model,

package/dist/clients/openai.js

@@ -22,12 +22,14 @@ export class SmolOpenAi extends BaseClient {
     }
     async text(config) {
         const messages = config.messages.map((msg) => msg.toOpenAIMessage());
-        const completion = await this.client.chat.completions.create({
+        const request = {
             model: this.model,
             messages,
             tools: config.tools,
             response_format: config.responseFormat,
-        });
+        };
+        this.logger.debug("Sending request to OpenAI:", JSON.stringify(request, null, 2));
+        const completion = await this.client.chat.completions.create(request);
         this.logger.debug("Response from OpenAI:", JSON.stringify(completion, null, 2));
         const message = completion.choices[0].message;
         const output = message.content;
@@ -43,9 +45,6 @@ export class SmolOpenAi extends BaseClient {
                 }
             }
         }
-        if (toolCalls.length > 0) {
-            this.logger.debug("Tool calls detected:", toolCalls);
-        }
         return success({ output, toolCalls });
     }
 }

package/dist/types.d.ts

@@ -5,6 +5,7 @@ import { Message } from "./classes/message/index.js";
 import { Result } from "./types/result.js";
 import { ToolCall } from "./classes/ToolCall.js";
 import { OpenAIToolDefinition } from "./util/common.js";
+import { ResponseFormatJSONSchema, ResponseFormatText } from "openai/resources";
 export type PromptConfig = {
     messages: Message[];
     tools?: OpenAIToolDefinition[];
@@ -13,9 +14,11 @@ export type PromptConfig = {
     temperature?: number;
     numSuggestions?: number;
     parallelToolCalls?: boolean;
-    responseFormat?: any;
+    responseFormat?: ResponseFormatText | ResponseFormatJSONSchema;
     rawAttributes?: Record<string, any>;
 };
+export declare function responseFormatText(): ResponseFormatText;
+export declare function responseFormatJSONSchema(schema: ResponseFormatJSONSchema.JSONSchema): ResponseFormatJSONSchema;
 export type SmolConfig = {
     openAiApiKey?: string;
     googleApiKey?: string;

package/dist/types.js

@@ -1 +1,7 @@
 export * from "./types/result.js";
+export function responseFormatText() {
+    return { type: "text" };
+}
+export function responseFormatJSONSchema(schema) {
+    return { type: "json_schema", json_schema: schema };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoltalk",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "A common interface for LLM APIs",
   "homepage": "https://github.com/egonSchiele/smoltalk",
   "scripts": {
@@ -31,8 +31,10 @@
   "license": "ISC",
   "devDependencies": {
     "@types/node": "^25.0.3",
+    "termcolors": "github:egonSchiele/termcolors",
     "typescript": "^5.9.3",
-    "vitest": "^4.0.16"
+    "vitest": "^4.0.16",
+    "zod": "^4.3.5"
   },
   "dependencies": {
     "@google/genai": "^1.34.0",