@substrat-run/model-providers 0.4.12 → 0.5.1

package/dist/list-models.js

@@ -29,29 +29,66 @@ export async function listModels(provider, env) {
         .filter((id) => id !== null)
         .sort();
 }
+/**
+ * Can this model run a tool call?
+ *
+ * A build turn is a tool loop from end to end, so a model that cannot call a
+ * function cannot run one — it can only be picked and then fail. The catalog
+ * answers per row: `function_calling: "true"` inside `properties`, present on the
+ * models that support it and absent on the ones that do not.
+ *
+ * Fails SOFT, and the asymmetry is deliberate. A row carrying NO `properties`
+ * array is kept, because that is the response shape moving rather than the model
+ * saying no; a row that HAS the array and no flag is dropped, because that is the
+ * catalog answering. Offering too much is a picker a builder can work around;
+ * offering nothing is not.
+ */
+function runsToolCalls(row) {
+    if (!Array.isArray(row.properties))
+        return true;
+    const props = row.properties;
+    const flag = props.find((p) => p !== null && typeof p === 'object' && p.property_id === 'function_calling');
+    return flag?.value === 'true';
+}
 /**
  * Workers AI's OpenAI-compatible surface serves chat/completions and embeddings
  * but NOT `GET /models` (405) — the catalog lives one level up, on the account
- * API (`…/ai/v1` → `…/ai/models/search`), task-filtered server-side so the
- * picker offers models that can run a text turn, not embeddings or speech. It
- * lists Cloudflare's own `@cf/…` models only; partner-served `vendor/model` ids
- * stay free-text. Paged defensively; the filtered catalog fits one page today.
+ * API (`…/ai/v1` → `…/ai/models/search`). Three of the four filters are the
+ * endpoint's own documented query parameters, so they cost nothing to apply:
+ * `task` (a text turn, not embeddings or speech), `hide_experimental` and
+ * `include_deprecated`. The fourth — can it run a tool call — is per row and
+ * applied here (`runsToolCalls`). It lists Cloudflare's own `@cf/…` models only;
+ * partner-served `vendor/model` ids stay free-text. Paged defensively; the
+ * filtered catalog fits one page today.
  */
 async function listCloudflareCatalog(baseUrl, headers) {
     const root = baseUrl.replace(/\/$/, '').replace(/\/v1$/, '');
     const names = [];
+    const seen = [];
     for (let page = 1; page <= 5; page++) {
-        const url = `${root}/models/search?task=${encodeURIComponent('Text Generation')}&per_page=100&page=${page}`;
+        const url = `${root}/models/search?task=${encodeURIComponent('Text Generation')}` +
+            `&hide_experimental=true&include_deprecated=false&per_page=100&page=${page}`;
         const res = await fetch(url, { headers });
         if (!res.ok)
             throw new ProviderError(`${root}/models/search returned HTTP ${res.status}`);
         const body = (await res.json());
         const rows = body.result ?? [];
-        names.push(...rows.map((m) => (typeof m.name === 'string' ? m.name : null)).filter((n) => n !== null));
+        for (const row of rows) {
+            if (typeof row.name !== 'string')
+                continue;
+            seen.push(row.name);
+            if (runsToolCalls(row))
+                names.push(row.name);
+        }
         // The page boundary is the RAW page length: a filtered-out entry must not end the walk early.
         if (rows.length < 100)
             break;
     }
+    // The last fail-soft: if the catalog answered and the tool-call filter took ALL of
+    // it, the flag has moved rather than every model having lost the capability. An
+    // over-wide picker beats an empty one, which reads as "Cloudflare is down".
+    if (names.length === 0 && seen.length > 0)
+        return seen.sort();
     return names.sort();
 }
 //# sourceMappingURL=list-models.js.map

package/dist/list-models.js.map

@@ -1 +1 @@
-{"version":3,"file":"list-models.js","sourceRoot":"","sources":["../src/list-models.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,YAAY,EAAsB,MAAM,cAAc,CAAC;AAEhG,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,QAAgB,EAAE,GAAkB;IACpE,MAAM,GAAG,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IACnC,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QAC/B,MAAM,IAAI,aAAa,CACtB,oEAAoE;YACnE,GAAG,QAAQ,oDAAoD,CAChE,CAAC;IACH,CAAC;IACD,MAAM,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAC7C,IAAI,CAAC,KAAK,CAAC,OAAO;QAAE,MAAM,IAAI,aAAa,CAAC,YAAY,QAAQ,UAAU,GAAG,CAAC,UAAU,OAAO,CAAC,CAAC;IACjG,MAAM,OAAO,GAA2B,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,UAAU,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAExG,IAAI,GAAG,CAAC,OAAO,KAAK,oBAAoB;QAAE,OAAO,qBAAqB,CAAC,KAAK,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAE/F,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,SAAS,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IACnF,IAAI,CAAC,GAAG,CAAC,EAAE;QAAE,MAAM,IAAI,aAAa,CAAC,GAAG,KAAK,CAAC,OAAO,yBAAyB,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5F,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAAuC,CAAC;IACtE,OAAO,CAAC,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC;SACtB,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACpD,MAAM,CAAC,CAAC,EAAE,EAAgB,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC;SACzC,IAAI,EAAE,CAAC;AACV,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,qBAAqB,CAAC,OAAe,EAAE,OAA+B;IACpF,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IAC7D,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,CAAC;QACtC,MAAM,GAAG,GAAG,GAAG,IAAI,uBAAuB,kBAAkB,CAAC,iBAAiB,CAAC,sBAAsB,IAAI,EAAE,CAAC;QAC5G,MAAM,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1C,IAAI,CAAC,GAAG,CAAC,EAAE;YAAE,MAAM,IAAI,aAAa,CAAC,GAAG,IAAI,gCAAgC,GAAG,CAAC,MAAM,EAAE,CAAC,CAAC;QAC1F,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA2C,CAAC;QAC1E,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC;QAC/B,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAe,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;QACpH,8FAA8F;QAC9F,IAAI,IAAI,CAAC,MAAM,GAAG,GAAG;YAAE,MAAM;IAC9B,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC;AACrB,CAAC"}
+{"version":3,"file":"list-models.js","sourceRoot":"","sources":["../src/list-models.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@substrat-run/model-providers",
-  "version": "0.4.12",
+  "version": "0.5.1",
   "description": "The model-provider seam: one `provider:model` grammar, a table of providers (Anthropic, OpenAI, Google, Mistral, Qwen, Cloudflare, Scaleway, Ollama, any OpenAI-compatible endpoint), the hosting disclosure per provider, the generated rate card and the list-price math over it. Cloudflare is one row, not the design (#1054).",
   "license": "AGPL-3.0-only",
   "repository": {
@@ -24,7 +24,7 @@
   "dependencies": {
     "@ai-sdk/openai-compatible": "3.0.30",
     "ai": "7.0.62",
-    "@substrat-run/contracts": "^0.109.0"
+    "@substrat-run/contracts": "^0.111.0"
   },
   "devDependencies": {
     "typescript": "^7.0.0",