smoltalk 0.13.1 → 0.13.2

package/dist/clients/google.js

@@ -4,7 +4,7 @@ import { getLogger } from "../util/logger.js";
 import { redactAttachments } from "../util/redact.js";
 import { addCosts, addTokenUsage, success, } from "../types.js";
 import { zodToGoogleTool } from "../util/tool.js";
-import { responseFormatToJsonSchema } from "../util/jsonSchema.js";
+import { responseFormatToJsonSchema, constToEnum } from "../util/jsonSchema.js";
 import { normalizeGoogleStopReason } from "../util/stopReason.js";
 import { SmolError, SmolContentPolicyError, SmolContextWindowExceededError, smolErrorForStatus, } from "../smolError.js";
 import { extractHttpErrorFields } from "../util/httpError.js";
@@ -297,7 +297,8 @@ export class SmolGoogle extends BaseClient {
         }
         if (config.responseFormat) {
             genConfig.responseMimeType = "application/json";
-            genConfig.responseJsonSchema = responseFormatToJsonSchema(config.responseFormat);
+            // Gemini ignores `const` but honours `enum`; see constToEnum.
+            genConfig.responseJsonSchema = constToEnum(responseFormatToJsonSchema(config.responseFormat));
         }
         if (config.thinking?.enabled) {
             // Gemini only returns thought-summary parts (parts with `thought: true`,
@@ -520,7 +521,7 @@ export class SmolGoogle extends BaseClient {
         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.");
+            this.logger.warn("Gemini does not support streaming responses with both tool calls and structured response formats. Response format will be ignored.");
             this.statelogClient?.debug("Google Gemini: streaming with tools + structured response not supported, ignoring response format", {});
             request.config.responseMimeType = undefined;
             request.config.responseJsonSchema = undefined;

package/dist/util/jsonSchema.d.ts

@@ -36,3 +36,17 @@ export declare function responseFormatToJsonSchema(schema: {
  * there are left as-is and only an object subschema is sanitized.
  */
 export declare function sanitizeJsonSchema(node: unknown): unknown;
+/**
+ * Rewrite `const` to a one-value `enum`, recursing through the same
+ * subschema positions as `sanitizeJsonSchema` (value slots and the
+ * anyOf/oneOf/allOf/prefixItems arrays; assertion positions such as `not` and
+ * `contains` are left untouched), and collapse an `anyOf` whose branches are
+ * all single-type enums of the same type into one `{type, enum}` node.
+ *
+ * Gemini's `responseJsonSchema` silently ignores `const` (verified live: a Zod
+ * union of string literals — emitted as `anyOf: [{type:"string", const:"a"}, …]`
+ * — came back as free prose), but it enforces `enum`. Other providers accept
+ * `const`, so only the Google client applies this. Annotations on each node
+ * are preserved; a mixed-type anyOf stays an anyOf with each const rewritten.
+ */
+export declare function constToEnum(node: unknown): unknown;

package/dist/util/jsonSchema.js

@@ -131,3 +131,86 @@ function sanitizeSubschema(value) {
         return value;
     return sanitizeJsonSchema(value);
 }
+/**
+ * Rewrite `const` to a one-value `enum`, recursing through the same
+ * subschema positions as `sanitizeJsonSchema` (value slots and the
+ * anyOf/oneOf/allOf/prefixItems arrays; assertion positions such as `not` and
+ * `contains` are left untouched), and collapse an `anyOf` whose branches are
+ * all single-type enums of the same type into one `{type, enum}` node.
+ *
+ * Gemini's `responseJsonSchema` silently ignores `const` (verified live: a Zod
+ * union of string literals — emitted as `anyOf: [{type:"string", const:"a"}, …]`
+ * — came back as free prose), but it enforces `enum`. Other providers accept
+ * `const`, so only the Google client applies this. Annotations on each node
+ * are preserved; a mixed-type anyOf stays an anyOf with each const rewritten.
+ */
+export function constToEnum(node) {
+    if (typeof node !== "object" || node === null || Array.isArray(node)) {
+        return node;
+    }
+    const out = { ...node };
+    if ("const" in out) {
+        out.enum = [out.const];
+        delete out.const;
+    }
+    for (const key of SCHEMA_KEYS) {
+        if (key in out) {
+            out[key] = constToEnumSubschema(out[key]);
+        }
+    }
+    for (const key of SCHEMA_MAP_KEYS) {
+        const map = out[key];
+        if (map && typeof map === "object" && !Array.isArray(map)) {
+            const rewritten = Object.create(null);
+            for (const [name, sub] of Object.entries(map)) {
+                rewritten[name] = constToEnum(sub);
+            }
+            out[key] = rewritten;
+        }
+    }
+    for (const key of SCHEMA_ARRAY_KEYS) {
+        const arr = out[key];
+        if (Array.isArray(arr)) {
+            out[key] = arr.map((sub) => constToEnum(sub));
+        }
+    }
+    if ("additionalProperties" in out) {
+        out.additionalProperties = constToEnumSubschema(out.additionalProperties);
+    }
+    return collapseEnumAnyOf(out);
+}
+function constToEnumSubschema(value) {
+    if (typeof value === "boolean") {
+        return value;
+    }
+    return constToEnum(value);
+}
+/**
+ * `{anyOf: [{type:"string", enum:["a"]}, {type:"string", enum:["b"]}]}` →
+ * `{type:"string", enum:["a","b"]}`. Only collapses when every branch is
+ * exactly `{type, enum}` with one shared `type`, so no constraint is lost.
+ */
+function collapseEnumAnyOf(node) {
+    const branches = node.anyOf;
+    if (!Array.isArray(branches) || branches.length === 0) {
+        return node;
+    }
+    const first = branches[0];
+    const sharedType = typeof first === "object" && first !== null
+        ? first.type
+        : undefined;
+    if (typeof sharedType !== "string") {
+        return node;
+    }
+    const isPlainEnum = (branch) => typeof branch === "object" &&
+        branch !== null &&
+        Object.keys(branch).every((key) => key === "type" || key === "enum") &&
+        branch.type === sharedType &&
+        Array.isArray(branch.enum);
+    if (!branches.every(isPlainEnum)) {
+        return node;
+    }
+    const { anyOf, ...rest } = node;
+    const values = branches.flatMap((branch) => branch.enum);
+    return { ...rest, type: sharedType, enum: values };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "smoltalk",
-  "version": "0.13.1",
+  "version": "0.13.2",
   "description": "A common interface for LLM APIs",
   "homepage": "https://github.com/egonSchiele/smoltalk",
   "files": [