@jaypie/llm 1.2.24 → 1.2.25

package/dist/cjs/providers/gemini/types.d.ts

@@ -72,6 +72,7 @@ export interface GeminiGenerateContentConfig {
     };
     responseMimeType?: string;
     responseJsonSchema?: JsonObject;
+    responseSchema?: JsonObject;
     temperature?: number;
     topP?: number;
     topK?: number;

package/dist/cjs/util/index.d.ts

@@ -2,6 +2,7 @@ export * from "./determineModelProvider.js";
 export * from "./extractReasoning.js";
 export * from "./formatOperateInput.js";
 export * from "./formatOperateMessage.js";
+export * from "./jsonSchemaToOpenApi3.js";
 export * from "./logger.js";
 export * from "./maxTurnsFromOptions.js";
 export * from "./naturalZodSchema.js";

package/dist/cjs/util/jsonSchemaToOpenApi3.d.ts

@@ -0,0 +1,10 @@
+import { JsonObject } from "@jaypie/types";
+/**
+ * Converts a JSON Schema (Draft 2020-12) object to the OpenAPI 3.0 schema subset
+ * that Gemini's `responseSchema` accepts. This constrains generation (not just validation)
+ * and avoids the `items`-keyword leakage bug in `responseJsonSchema`.
+ *
+ * Strips: $schema, additionalProperties, $defs, $ref (inlines where possible), const
+ * Preserves: type, properties, required, items, enum, description, nullable
+ */
+export declare function jsonSchemaToOpenApi3(schema: JsonObject): JsonObject;

package/dist/esm/index.js

@@ -552,6 +552,50 @@ function formatOperateInput(input, options) {
     return [input];
 }
 
+/**
+ * Converts a JSON Schema (Draft 2020-12) object to the OpenAPI 3.0 schema subset
+ * that Gemini's `responseSchema` accepts. This constrains generation (not just validation)
+ * and avoids the `items`-keyword leakage bug in `responseJsonSchema`.
+ *
+ * Strips: $schema, additionalProperties, $defs, $ref (inlines where possible), const
+ * Preserves: type, properties, required, items, enum, description, nullable
+ */
+function jsonSchemaToOpenApi3(schema) {
+    if (typeof schema !== "object" || schema === null || Array.isArray(schema)) {
+        return schema;
+    }
+    const result = {};
+    for (const [key, value] of Object.entries(schema)) {
+        // Strip JSON Schema keywords not in OpenAPI 3.0 subset
+        if (key === "$schema" ||
+            key === "$defs" ||
+            key === "additionalProperties" ||
+            key === "const" ||
+            key === "$ref") {
+            continue;
+        }
+        if (key === "properties" &&
+            typeof value === "object" &&
+            value !== null &&
+            !Array.isArray(value)) {
+            const convertedProps = {};
+            for (const [propKey, propValue] of Object.entries(value)) {
+                convertedProps[propKey] = jsonSchemaToOpenApi3(propValue);
+            }
+            result[key] = convertedProps;
+        }
+        else if (key === "items" &&
+            typeof value === "object" &&
+            value !== null) {
+            result[key] = jsonSchemaToOpenApi3(value);
+        }
+        else {
+            result[key] = value;
+        }
+    }
+    return result;
+}
+
 const getLogger$5 = () => log$1.lib({ lib: JAYPIE.LIB.LLM });
 
 // Turn policy constants
@@ -1538,11 +1582,21 @@ class GeminiAdapter extends BaseProviderAdapter {
         // Gemini doesn't support combining function calling with responseMimeType: 'application/json'
         // When tools are present, structured output is handled via the structured_output tool
         if (request.format && !(request.tools && request.tools.length > 0)) {
-            geminiRequest.config = {
-                ...geminiRequest.config,
-                responseMimeType: "application/json",
-                responseJsonSchema: request.format,
-            };
+            const useJsonSchema = request.providerOptions?.useJsonSchema === true;
+            if (useJsonSchema) {
+                geminiRequest.config = {
+                    ...geminiRequest.config,
+                    responseMimeType: "application/json",
+                    responseJsonSchema: request.format,
+                };
+            }
+            else {
+                geminiRequest.config = {
+                    ...geminiRequest.config,
+                    responseMimeType: "application/json",
+                    responseSchema: jsonSchemaToOpenApi3(request.format),
+                };
+            }
         }
         // When format is specified with tools, add instruction to use structured_output tool
         if (request.format && request.tools && request.tools.length > 0) {
@@ -1610,11 +1664,7 @@ class GeminiAdapter extends BaseProviderAdapter {
                 : naturalZodSchema(schema);
             jsonSchema = z.toJSONSchema(zodSchema);
         }
-        // Remove $schema property (Gemini doesn't need it)
-        if (jsonSchema.$schema) {
-            delete jsonSchema.$schema;
-        }
-        return jsonSchema;
+        return jsonSchemaToOpenApi3(jsonSchema);
     }
     //
     // API Execution