@profullstack/ai-providers 0.1.0 → 0.1.1

package/index.d.ts

@@ -179,6 +179,7 @@ export declare class AnthropicProvider implements TextProvider {
 
 export declare function extractJson(text: string): unknown;
 export declare function validate<T>(schema: SchemaLike<T> | undefined, value: unknown): T;
+export declare function unwrapEcho(value: unknown, jsonSchema?: Record<string, unknown>, name?: string): unknown;
 export declare function jsonInstructions(name?: string, jsonSchema?: Record<string, unknown>): string;
 
 export interface CreateOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@profullstack/ai-providers",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "description": "One text-model call for every Profullstack app: c0mpute first, OpenAI and Anthropic as alternating fallbacks, dead keys parked. Zero dependencies.",
   "keywords": [

package/src/json.js

@@ -57,9 +57,39 @@ export function validate(schema, value) {
   return value;
 }
 
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+
+/**
+ * Small models shown a JSON Schema often answer in the shape of the schema, with
+ * correct values one level down: {"$schema":..., "type":"object", "properties":
+ * {"headline":"Real copy", ...}, "required":[...]}. Nothing is wrong with the
+ * values, but validating that object reports every field as undefined. Same for
+ * {"ad_copy":{...}}, where the object is wrapped in its own name.
+ *
+ * Only unwraps when the top level has none of the schema's fields and the inner
+ * object has at least one, so a schema with a field really called `properties`
+ * is left alone.
+ */
+export function unwrapEcho(value, jsonSchema, name) {
+  const keys = Object.keys(jsonSchema?.properties ?? {});
+  if (!keys.length || !isObject(value) || keys.some((k) => k in value)) return value;
+  const entries = Object.values(value);
+  const candidates = [value.properties, name ? value[name] : undefined, entries.length === 1 ? entries[0] : undefined];
+  return candidates.find((c) => isObject(c) && keys.some((k) => k in c)) ?? value;
+}
+
 export function jsonInstructions(name, jsonSchema) {
+  // The meta keys add nothing to the answer and are what start a model copying
+  // the schema instead of filling it in.
+  const { $schema, $id, ...shape } = jsonSchema ?? {};
   return [
     `Return only one JSON object${name ? ` (${name})` : ''}. No Markdown, no code fences, no commentary.`,
-    ...(jsonSchema ? ['It must match this JSON schema:', JSON.stringify(jsonSchema)] : []),
+    ...(jsonSchema
+      ? [
+          'It must match this JSON schema:',
+          JSON.stringify(shape),
+          'The schema describes your answer, it is not part of it. Put each value at the top level of the object, and never write the words "type", "properties" or "required" as keys.',
+        ]
+      : []),
   ].join('\n');
 }

package/src/router.js

@@ -13,7 +13,7 @@
  * A success clears it.
  */
 import { ProviderError, toProviderError } from './errors.js';
-import { extractJson, validate, jsonInstructions } from './json.js';
+import { extractJson, validate, jsonInstructions, unwrapEcho } from './json.js';
 
 export class AllProvidersFailedError extends Error {
   constructor(attempts, skipped = []) {
@@ -163,10 +163,11 @@ export class AiRouter {
 export async function generateObjectOn(provider, req) {
   const system = [req.system, jsonInstructions(req.name, req.jsonSchema)].filter(Boolean).join('\n\n');
   const base = { ...req, system, json: true };
+  const read = (text) => validate(req.schema, unwrapEcho(extractJson(text), req.jsonSchema, req.name));
   let out = await provider.generate(base);
   let object;
   try {
-    object = validate(req.schema, extractJson(out.text));
+    object = read(out.text);
   } catch (first) {
     const repairs = req.repairs ?? 1;
     if (repairs < 1) throw new ProviderError(provider.name, first.message, { kind: 'output' });
@@ -187,7 +188,7 @@ export async function generateObjectOn(provider, req) {
       ].join('\n'),
     });
     try {
-      object = validate(req.schema, extractJson(out.text));
+      object = read(out.text);
     } catch (second) {
       throw new ProviderError(provider.name, second.message, { kind: 'output' });
     }