graphlit-client 1.0.20260627002 → 1.0.20260628002

package/dist/streaming/providers.d.ts

@@ -6,6 +6,7 @@ export interface GooglePromptCache {
     entries: Map<string, string>;
     maxEntries?: number;
 }
+export declare function buildGoogleTools(tools: ToolDefinitionInput[] | undefined): any[] | undefined;
 /**
  * Stream with OpenAI SDK
  */

package/dist/streaming/providers.js

@@ -44,35 +44,19 @@ function simplifySchemaForGroq(schema) {
     }
     return JSON.stringify(simplified);
 }
-/**
- * Clean schema for Google Gemini by removing unsupported fields
- */
-function cleanSchemaForGoogle(schema) {
-    if (typeof schema !== "object" || schema === null) {
-        return schema;
-    }
-    if (Array.isArray(schema)) {
-        return schema.map((item) => cleanSchemaForGoogle(item));
-    }
-    const cleaned = {};
-    for (const [key, value] of Object.entries(schema)) {
-        // Skip fields that Google doesn't support
-        if (key === "$schema" || key === "additionalProperties") {
-            continue;
-        }
-        // Handle format field for string types - Google only supports 'enum' and 'date-time'
-        if (key === "format" && typeof value === "string") {
-            // Only keep supported formats
-            if (value === "enum" || value === "date-time") {
-                cleaned[key] = value;
-            }
-            // Skip unsupported formats like "date", "time", "email", etc.
-            continue;
-        }
-        // Recursively clean nested objects
-        cleaned[key] = cleanSchemaForGoogle(value);
+export function buildGoogleTools(tools) {
+    if (!tools || tools.length === 0) {
+        return undefined;
     }
-    return cleaned;
+    return [
+        {
+            functionDeclarations: tools.map((tool) => ({
+                name: tool.name,
+                description: tool.description,
+                parametersJsonSchema: tool.schema ? JSON.parse(tool.schema) : {},
+            })),
+        },
+    ];
 }
 function shortHash(value) {
     return createHash("sha256").update(value).digest("hex").slice(0, 16);
@@ -1084,36 +1068,7 @@ promptCache, onEvent, onComplete, abortSignal, thinkingConfig, toolConfig) {
         if (systemPrompt) {
             streamConfig.system = systemPrompt;
         }
-        // Add tools if provided
-        if (tools && tools.length > 0) {
-            streamConfig.tools = tools.map((tool) => ({
-                name: tool.name,
-                description: tool.description,
-                input_schema: tool.schema ? JSON.parse(tool.schema) : {},
-            }));
-        }
-        // Configure tools for Google - expects a single array of function declarations
-        const googleTools = tools && tools.length > 0
-            ? [
-                {
-                    functionDeclarations: tools.map((tool) => {
-                        const rawSchema = tool.schema ? JSON.parse(tool.schema) : {};
-                        const cleanedSchema = cleanSchemaForGoogle(rawSchema);
-                        if (process.env.DEBUG_GRAPHLIT_SDK_STREAMING) {
-                            const hadCleanup = JSON.stringify(rawSchema) !== JSON.stringify(cleanedSchema);
-                            if (hadCleanup) {
-                                console.log(`[Google] Cleaned schema for tool ${tool.name} - removed unsupported fields`);
-                            }
-                        }
-                        return {
-                            name: tool.name,
-                            description: tool.description,
-                            parameters: cleanedSchema,
-                        };
-                    }),
-                },
-            ]
-            : undefined;
+        const googleTools = buildGoogleTools(tools);
         // Add thinking configuration if provided
         // Note: Google's thinking API is still in preview and may require specific model support
         const generationConfig = {
@@ -1155,10 +1110,18 @@ promptCache, onEvent, onComplete, abortSignal, thinkingConfig, toolConfig) {
         // Build the config object for the new SDK
         const config = {
             ...generationConfig,
-            ...(toolConfig ? { toolConfig } : {}),
         };
         const systemInstructionParts = getGoogleSystemInstructionParts(systemPrompt);
-        const stableCacheKey = promptCache && systemInstructionParts.length > 0
+        // Google rejects any GenerateContent request that combines `cachedContent`
+        // with request-level `system_instruction`, `tools`, or `tool_config`:
+        //   "CachedContent can not be used with GenerateContent request setting
+        //    system_instruction, tools or tool_config."
+        // A forced tool choice (`toolConfig`) is a per-round directive — it cannot be
+        // baked into the shared cache without breaking reuse across rounds — so when
+        // it is present we skip the cache entirely and send the system instruction,
+        // tools, and tool config inline instead.
+        const canUseCache = !!promptCache && systemInstructionParts.length > 0 && !toolConfig;
+        const stableCacheKey = canUseCache
             ? shortHash(JSON.stringify({
                 model: modelName,
                 systemInstructionParts,
@@ -1193,16 +1156,22 @@ promptCache, onEvent, onComplete, abortSignal, thinkingConfig, toolConfig) {
             }
         }
         if (cachedContentName) {
+            // System instruction, tools, and tool config live inside the cache; sending
+            // any of them at request level alongside `cachedContent` is a 400 from Google.
             config.cachedContent = cachedContentName;
         }
-        else if (systemInstructionParts.length > 0) {
-            config.systemInstruction = {
-                parts: systemInstructionParts.map((text) => ({ text })),
-            };
-        }
-        // Add tools to config if provided and not already attached to cachedContent.
-        if (googleTools && !cachedContentName) {
-            config.tools = googleTools;
+        else {
+            if (systemInstructionParts.length > 0) {
+                config.systemInstruction = {
+                    parts: systemInstructionParts.map((text) => ({ text })),
+                };
+            }
+            if (googleTools) {
+                config.tools = googleTools;
+            }
+            if (toolConfig) {
+                config.toolConfig = toolConfig;
+            }
         }
         const createStreamResponse = () => googleClient.models.generateContentStream({
             model: modelName,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphlit-client",
-  "version": "1.0.20260627002",
+  "version": "1.0.20260628002",
   "description": "Graphlit API Client for TypeScript",
   "type": "module",
   "main": "./dist/client.js",