@profullstack/ai-providers 0.1.0 → 0.1.2

package/README.md

@@ -57,7 +57,7 @@ A thrown error with `status` 401/402/403, or a 429 or 400 that mentions credits
 
 | Variable | Default | |
 |---|---|---|
-| `C0MPUTE_API_KEY` | none | Infernet trusted-client key (`ifc_...`), one per app. Without it the public limit is 20 requests an hour per IP. |
+| `C0MPUTE_API_KEY` | none | Infernet **account** key (`ik_live_...`), billed per job. An `ifc_` trusted-client key without an end-user subject, or no key at all, gets the free tier of 10 queries a day. |
 | `C0MPUTE_URL` | `https://infernetprotocol.com` | |
 | `C0MPUTE_MODELS` | `huihui_ai/qwen3.5-abliterated:9b,qwen2.5:7b,qwen3:4b,gemma3:4b,huihui_ai/qwen3.5-abliterated:4b` | Tried in order. The first is an Infernet house model every node pulls. |
 | `C0MPUTE_ANY_MODEL` | off | Let any free node answer as a last resort. Small models write junk JSON. |

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.2",
   "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/c0mpute.js

@@ -5,8 +5,9 @@
  *     -> {jobId, source, model}
  *   GET  /api/chat/stream/<jobId>   server-sent events: meta, token..., done | error
  *
- * Without a key the public playground allows 20 requests an hour per IP. A
- * trusted-client key (`ifc_...`, one per app) has its own budget.
+ * Use an account key (`ik_live_...`): it is billed per job with no daily cap.
+ * With no key, or a trusted-client key (`ifc_...`) that names no end user, the
+ * caller gets the free tier of 10 queries a day.
  *
  * `p2p_only` (default on) stops Infernet handing the job to its billed hosted
  * fallback; an answer from anything but a peer node is refused.

package/src/index.js

@@ -26,8 +26,9 @@ const num = (v) => (v == null || v === '' || Number.isNaN(Number(v)) ? undefined
 /**
  * Builds the router from the environment.
  *
- *   C0MPUTE_API_KEY      Infernet trusted-client key (ifc_...). Without it the
- *                        public limit of 20 requests an hour per IP applies.
+ *   C0MPUTE_API_KEY      Infernet account key (ik_live_...), billed per job. No
+ *                        key, or an ifc_ key with no subject, gets 10 free
+ *                        queries a day.
  *   C0MPUTE_URL          default https://infernetprotocol.com
  *   C0MPUTE_MODELS       comma list, tried in order (C0MPUTE_MODEL also read)
  *   C0MPUTE_ANY_MODEL    1 to let any free node answer as a last resort

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' });
     }