ai 3.3.15 → 3.3.16

package/dist/index.mjs

@@ -1333,21 +1333,22 @@ function prepareResponseHeaders(init, {
   return headers;
 }
 
-// core/generate-object/inject-json-schema-into-system.ts
+// core/generate-object/inject-json-instruction.ts
 var DEFAULT_SCHEMA_PREFIX = "JSON schema:";
 var DEFAULT_SCHEMA_SUFFIX = "You MUST answer with a JSON object that matches the JSON schema above.";
-function injectJsonSchemaIntoSystem({
-  system,
+var DEFAULT_GENERIC_SUFFIX = "You MUST answer with JSON.";
+function injectJsonInstruction({
+  prompt,
   schema,
-  schemaPrefix = DEFAULT_SCHEMA_PREFIX,
-  schemaSuffix = DEFAULT_SCHEMA_SUFFIX
+  schemaPrefix = schema != null ? DEFAULT_SCHEMA_PREFIX : void 0,
+  schemaSuffix = schema != null ? DEFAULT_SCHEMA_SUFFIX : DEFAULT_GENERIC_SUFFIX
 }) {
   return [
-    system,
-    system != null ? "" : null,
-    // add a newline if system is not null
+    prompt != null && prompt.length > 0 ? prompt : void 0,
+    prompt != null && prompt.length > 0 ? "" : void 0,
+    // add a newline if prompt is not null
     schemaPrefix,
-    JSON.stringify(schema),
+    schema != null ? JSON.stringify(schema) : void 0,
     schemaSuffix
   ].filter((line) => line != null).join("\n");
 }
@@ -1387,6 +1388,62 @@ var NoObjectGeneratedError = class extends AISDKError6 {
 };
 _a6 = symbol6;
 
+// core/generate-object/validate-object-generation-input.ts
+function validateObjectGenerationInput({
+  output,
+  mode,
+  schema,
+  schemaName,
+  schemaDescription
+}) {
+  if (output != null && output !== "object" && output !== "no-schema") {
+    throw new InvalidArgumentError({
+      parameter: "output",
+      value: output,
+      message: "Invalid output type."
+    });
+  }
+  if (output === "no-schema") {
+    if (mode === "auto" || mode === "tool") {
+      throw new InvalidArgumentError({
+        parameter: "mode",
+        value: mode,
+        message: 'Mode must be "json" for no-schema output.'
+      });
+    }
+    if (schema != null) {
+      throw new InvalidArgumentError({
+        parameter: "schema",
+        value: schema,
+        message: "Schema is not supported for no-schema output."
+      });
+    }
+    if (schemaDescription != null) {
+      throw new InvalidArgumentError({
+        parameter: "schemaDescription",
+        value: schemaDescription,
+        message: "Schema description is not supported for no-schema output."
+      });
+    }
+    if (schemaName != null) {
+      throw new InvalidArgumentError({
+        parameter: "schemaName",
+        value: schemaName,
+        message: "Schema name is not supported for no-schema output."
+      });
+    }
+  }
+  if (output === "object") {
+    if (schema == null) {
+      throw new InvalidArgumentError({
+        parameter: "schema",
+        value: schema,
+        message: "Schema is required for object output."
+      });
+    }
+  }
+}
+
 // core/generate-object/generate-object.ts
 async function generateObject({
   model,
@@ -1394,6 +1451,7 @@ async function generateObject({
   schemaName,
   schemaDescription,
   mode,
+  output = "object",
   system,
   prompt,
   messages,
@@ -1404,13 +1462,23 @@ async function generateObject({
   ...settings
 }) {
   var _a12;
+  validateObjectGenerationInput({
+    output,
+    mode,
+    schema: inputSchema,
+    schemaName,
+    schemaDescription
+  });
+  if (output === "no-schema" && mode === void 0) {
+    mode = "json";
+  }
   const baseTelemetryAttributes = getBaseTelemetryAttributes({
     model,
     telemetry,
     headers,
     settings: { ...settings, maxRetries }
   });
-  const schema = asSchema(inputSchema);
+  const schema = inputSchema != null ? asSchema(inputSchema) : void 0;
   const tracer = getTracer({ isEnabled: (_a12 = telemetry == null ? void 0 : telemetry.isEnabled) != null ? _a12 : false });
   return recordSpan({
     name: "ai.generateObject",
@@ -1426,11 +1494,10 @@ async function generateObject({
         "ai.prompt": {
           input: () => JSON.stringify({ system, prompt, messages })
         },
-        "ai.schema": {
-          input: () => JSON.stringify(schema.jsonSchema)
-        },
+        "ai.schema": schema != null ? { input: () => JSON.stringify(schema.jsonSchema) } : void 0,
         "ai.schema.name": schemaName,
         "ai.schema.description": schemaDescription,
+        "ai.settings.output": output,
         "ai.settings.mode": mode
       }
     }),
@@ -1450,8 +1517,8 @@ async function generateObject({
       switch (mode) {
         case "json": {
           const validatedPrompt = validatePrompt({
-            system: model.supportsStructuredOutputs ? system : injectJsonSchemaIntoSystem({
-              system,
+            system: schema == null ? injectJsonInstruction({ prompt: system }) : model.supportsStructuredOutputs && schema != null ? system : injectJsonInstruction({
+              prompt: system,
               schema: schema.jsonSchema
             }),
             prompt,
@@ -1493,7 +1560,7 @@ async function generateObject({
                 const result2 = await model.doGenerate({
                   mode: {
                     type: "object-json",
-                    schema: schema.jsonSchema,
+                    schema: schema == null ? void 0 : schema.jsonSchema,
                     name: schemaName,
                     description: schemaDescription
                   },
@@ -1632,7 +1699,12 @@ async function generateObject({
           throw new Error(`Unsupported mode: ${_exhaustiveCheck}`);
         }
       }
-      const parseResult = safeParseJSON({ text: result, schema });
+      const parseResult = safeParseJSON({
+        text: result,
+        // type casting required for `undefined` schema (no-schema mode),
+        // in which case <T> is <JSONValue> as desired.
+        schema
+      });
       if (!parseResult.success) {
         throw parseResult.error;
       }
@@ -1768,6 +1840,7 @@ async function streamObject({
   schemaName,
   schemaDescription,
   mode,
+  output = "object",
   system,
   prompt,
   messages,
@@ -1779,6 +1852,16 @@ async function streamObject({
   ...settings
 }) {
   var _a12;
+  validateObjectGenerationInput({
+    output,
+    mode,
+    schema: inputSchema,
+    schemaName,
+    schemaDescription
+  });
+  if (output === "no-schema" && mode === void 0) {
+    mode = "json";
+  }
   const baseTelemetryAttributes = getBaseTelemetryAttributes({
     model,
     telemetry,
@@ -1787,7 +1870,7 @@ async function streamObject({
   });
   const tracer = getTracer({ isEnabled: (_a12 = telemetry == null ? void 0 : telemetry.isEnabled) != null ? _a12 : false });
   const retry = retryWithExponentialBackoff({ maxRetries });
-  const schema = asSchema2(inputSchema);
+  const schema = inputSchema != null ? asSchema2(inputSchema) : void 0;
   return recordSpan({
     name: "ai.streamObject",
     attributes: selectTelemetryAttributes({
@@ -1802,9 +1885,10 @@ async function streamObject({
         "ai.prompt": {
           input: () => JSON.stringify({ system, prompt, messages })
         },
-        "ai.schema": { input: () => JSON.stringify(schema.jsonSchema) },
+        "ai.schema": schema != null ? { input: () => JSON.stringify(schema.jsonSchema) } : void 0,
         "ai.schema.name": schemaName,
         "ai.schema.description": schemaDescription,
+        "ai.settings.output": output,
         "ai.settings.mode": mode
       }
     }),
@@ -1819,8 +1903,8 @@ async function streamObject({
       switch (mode) {
         case "json": {
           const validatedPrompt = validatePrompt({
-            system: model.supportsStructuredOutputs ? system : injectJsonSchemaIntoSystem({
-              system,
+            system: schema == null ? injectJsonInstruction({ prompt: system }) : model.supportsStructuredOutputs && schema != null ? system : injectJsonInstruction({
+              prompt: system,
               schema: schema.jsonSchema
             }),
             prompt,
@@ -1829,7 +1913,7 @@ async function streamObject({
           callOptions = {
             mode: {
               type: "object-json",
-              schema: schema.jsonSchema,
+              schema: schema == null ? void 0 : schema.jsonSchema,
               name: schemaName,
               description: schemaDescription
             },
@@ -1951,6 +2035,8 @@ async function streamObject({
         stream: stream.pipeThrough(new TransformStream(transformer)),
         warnings,
         rawResponse,
+        // type casting required for `undefined` schema (no-schema mode),
+        // in which case <T> is <JSONValue> as desired.
         schema,
         onFinish,
         rootSpan,