smoltalk 0.0.42 → 0.0.44

package/dist/clients/google.d.ts

@@ -1,8 +1,13 @@
-import { GoogleGenAI } from "@google/genai";
+import { Content, GenerateContentConfig, GoogleGenAI } from "@google/genai";
 import { BaseClientConfig, PromptConfig, PromptResult, Result, SmolClient, StreamChunk } from "../types.js";
 import { BaseClient } from "./baseClient.js";
 import { ModelName } from "../models.js";
 export type SmolGoogleConfig = BaseClientConfig;
+type GeneratedRequest = {
+    contents: Content[];
+    model: ModelName;
+    config: GenerateContentConfig;
+};
 export declare class SmolGoogle extends BaseClient implements SmolClient {
     private client;
     private logger;
@@ -13,5 +18,7 @@ export declare class SmolGoogle extends BaseClient implements SmolClient {
     private calculateUsageAndCost;
     private buildRequest;
     _textSync(config: PromptConfig): Promise<Result<PromptResult>>;
+    __textSync(request: GeneratedRequest): Promise<Result<PromptResult>>;
     _textStream(config: PromptConfig): AsyncGenerator<StreamChunk>;
 }
+export {};

package/dist/clients/google.js

@@ -1,10 +1,11 @@
 import { GoogleGenAI } from "@google/genai";
 import { ToolCall } from "../classes/ToolCall.js";
 import { getLogger } from "../logger.js";
-import { success, } from "../types.js";
+import { addCosts, addTokenUsage, success, } from "../types.js";
 import { zodToGoogleTool } from "../util/tool.js";
 import { BaseClient } from "./baseClient.js";
 import { Model } from "../model.js";
+import { userMessage } from "../classes/message/index.js";
 export class SmolGoogle extends BaseClient {
     client;
     logger;
@@ -65,10 +66,7 @@ export class SmolGoogle extends BaseClient {
         if (tools.length > 0) {
             genConfig.tools = [{ functionDeclarations: tools }];
         }
-        if (config.responseFormat && tools.length > 0) {
-            console.error("Warning: Both responseFormat and tools are specified in the prompt config. Google Gemini does not support enforcing a response format when tools are included, so the responseFormat will be ignored.");
-        }
-        else if (config.responseFormat && tools.length === 0) {
+        if (config.responseFormat) {
             genConfig.responseMimeType = "application/json";
             genConfig.responseJsonSchema = config.responseFormat.toJSONSchema();
         }
@@ -94,6 +92,67 @@ export class SmolGoogle extends BaseClient {
         if (signal) {
             request.config = { ...request.config, abortSignal: signal };
         }
+        const hasTools = config.tools && config.tools.length > 0;
+        const hasStructuredResponse = !!config.responseFormat;
+        if (!hasTools && !hasStructuredResponse) {
+            // If there are no tools or structured response, we can make a single request and return immediately
+            return this.__textSync(request);
+        }
+        // Google Gemini does not support combining function calling with
+        // responseMimeType 'application/json'. When tools are present, we
+        // make two requests instead
+        /*********** TOOL CALL REQUEST ************/
+        this.logger.debug("Detected both tool calls and structured response in call to Google Gemini. Making separate request to Google Gemini for tool calls.");
+        const toolRequest = {
+            ...request,
+            config: {
+                ...request.config,
+                responseMimeType: undefined,
+                responseJsonSchema: undefined,
+            },
+        };
+        const toolResult = await this.__textSync(toolRequest);
+        if (!toolResult.success) {
+            return toolResult;
+        }
+        if (toolResult.value.toolCalls.length > 0) {
+            this.logger.debug("Tool calls detected. Returning tool calls without making second request for structured response.");
+            return toolResult;
+        }
+        if (!toolResult.value.output) {
+            throw new Error("No output or tool calls detected in Google Gemini response. This should not happen.");
+        }
+        this.logger.debug("No tool calls detected. Making second request to Google Gemini for structured response.");
+        /*********** STRUCTURED OUTPUT REQUEST ************/
+        const message = userMessage(`Please return this output in the specified structured format. Output: ${toolResult.value.output}`);
+        const messages = [message.toGoogleMessage()];
+        const responseRequest = {
+            ...request,
+            config: {
+                ...request.config,
+                tools: undefined,
+            },
+            messages,
+        };
+        const responseResult = await this.__textSync(responseRequest);
+        if (!responseResult.success) {
+            return responseResult;
+        }
+        const thinkingBlocks = [
+            ...(toolResult.value.thinkingBlocks || []),
+            ...(responseResult.value.thinkingBlocks || []),
+        ];
+        return success({
+            output: responseResult.value.output,
+            // if there were tool calls, we would have returned already, so we know these are empty
+            toolCalls: [],
+            ...(thinkingBlocks.length > 0 && { thinkingBlocks }),
+            usage: addTokenUsage(toolResult.value.usage, responseResult.value.usage),
+            cost: addCosts(toolResult.value.cost, responseResult.value.cost),
+            model: request.model,
+        });
+    }
+    async __textSync(request) {
         this.logger.debug("Sending request to Google Gemini:", JSON.stringify(request, null, 2));
         // Send the prompt as the latest message
         const result = await this.client.models.generateContent(request);
@@ -136,6 +195,13 @@ export class SmolGoogle extends BaseClient {
         if (signal) {
             request.config = { ...request.config, abortSignal: signal };
         }
+        const hasTools = config.tools && config.tools.length > 0;
+        const hasStructuredResponse = !!config.responseFormat;
+        if (hasTools && hasStructuredResponse) {
+            this.logger.debug("Gemini does not support streaming responses with both tool calls and structured response formats. Response format will be ignored.");
+            request.config.responseMimeType = undefined;
+            request.config.responseJsonSchema = undefined;
+        }
         this.logger.debug("Sending streaming request to Google Gemini:", JSON.stringify(request, null, 2));
         const stream = await this.client.models.generateContentStream(request);
         let content = "";

package/dist/model.js

@@ -109,12 +109,12 @@ export class Model {
         if (!model || !isTextModel(model)) {
             return null;
         }
-        const inputCost = round((usage.inputTokens * (model.inputTokenCost || 0)) / 1_000_000, 2);
-        const outputCost = round((usage.outputTokens * (model.outputTokenCost || 0)) / 1_000_000, 2);
+        const inputCost = round((usage.inputTokens * (model.inputTokenCost || 0)) / 1_000_000, 6);
+        const outputCost = round((usage.outputTokens * (model.outputTokenCost || 0)) / 1_000_000, 6);
         const cachedInputCost = usage.cachedInputTokens && model.cachedInputTokenCost
-            ? round((usage.cachedInputTokens * model.cachedInputTokenCost) / 1_000_000, 2)
+            ? round((usage.cachedInputTokens * model.cachedInputTokenCost) / 1_000_000, 6)
             : undefined;
-        const totalCost = round(inputCost + outputCost + (cachedInputCost || 0), 2);
+        const totalCost = round(inputCost + outputCost + (cachedInputCost || 0), 6);
         return {
             inputCost,
             outputCost,