@chainfuse/ai-tools 1.0.15 → 1.0.16

package/dist/base.d.mts

@@ -3,7 +3,7 @@ export declare class AiBase {
     protected readonly chalk: import("chalk").ChalkInstance;
     protected _config: AiConfig;
     constructor(config: AiConfig);
-    get config(): Readonly<AiConfig>;
+    get config(): Readonly<Omit<AiConfig, 'backgroundContext'>> & Pick<AiConfig, 'backgroundContext'>;
     protected get gatewayName(): "nocost" | "production-passive-bot" | "production-passive-human" | "production-active-bot" | "production-active-human" | "preview-passive-bot" | "preview-passive-human" | "preview-active-bot" | "preview-active-human";
     protected get gatewayLog(): boolean;
 }

package/dist/base.mjs

@@ -6,7 +6,10 @@ export class AiBase {
         this._config = config;
     }
     get config() {
-        return Object.freeze(this._config);
+        return {
+            ...Object.freeze(this._config),
+            backgroundContext: this._config.backgroundContext,
+        };
     }
     get gatewayName() {
         if (this.config.billing.noCost) {

package/dist/providers/rawProviders.mjs

@@ -23,22 +23,39 @@ export class AiRawProviders extends AiBase {
             },
         };
         if (logId) {
-            const updateMetadata = import('@chainfuse/helpers')
-                .then(({ NetHelpers }) => NetHelpers.cfApi(this.config.gateway.apiToken, { logging: { level: Number(logging) } }))
-                .then((cf) => cf.aiGateway.logs.edit(this.gatewayName, logId, {
-                account_id: this.config.gateway.accountId,
-                metadata: {
-                    ...Object.entries(rawMetadata).reduce((acc, [key, value]) => {
-                        acc[key] = typeof value === 'string' ? value : JSON.stringify(value);
-                        return acc;
-                    }, {}),
-                },
-            }));
+            const updateMetadata = (() => {
+                if ('gateway' in this.config.providers.workersAi && typeof this.config.providers.workersAi.gateway === 'function') {
+                    return this.config.providers.workersAi
+                        .gateway(this.gatewayName)
+                        .patchLog(logId, {
+                        metadata: {
+                            ...Object.entries(rawMetadata).reduce((acc, [key, value]) => {
+                                acc[key] = typeof value === 'string' ? value : JSON.stringify(value);
+                                return acc;
+                            }, {}),
+                        },
+                    })
+                        .catch((error) => console.warn('Not updating gateway log', error));
+                }
+                else {
+                    return import('@chainfuse/helpers')
+                        .then(({ NetHelpers }) => NetHelpers.cfApi(this.config.gateway.apiToken, { logging: { level: Number(logging) } }))
+                        .then((cf) => cf.aiGateway.logs.edit(this.gatewayName, logId, {
+                        account_id: this.config.gateway.accountId,
+                        metadata: {
+                            ...Object.entries(rawMetadata).reduce((acc, [key, value]) => {
+                                acc[key] = typeof value === 'string' ? value : JSON.stringify(value);
+                                return acc;
+                            }, {}),
+                        },
+                    }).catch((error) => console.warn('Not updating gateway log', error)));
+                }
+            })();
             if (this.config.backgroundContext) {
                 this.config.backgroundContext.waitUntil(updateMetadata);
             }
             else {
-                await updateMetadata.catch((error) => console.warn('Not updating gateway log', error));
+                await updateMetadata;
             }
         }
         else {
@@ -99,31 +116,36 @@ export class AiRawProviders extends AiBase {
             },
         }));
     }
-    azOpenai(args) {
-        return import('@ai-sdk/azure').then(async ({ createAzure }) => createAzure({
+    async azOpenai(args) {
+        const metadataHeader = {
+            dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+            ...(args.groupBillingId && { groupBillingId: (await BufferHelpers.uuidConvert(args.groupBillingId)).utf8 }),
+            // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+            idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid7()).utf8.slice(0, 23),
+            executor: JSON.stringify(args.executor),
+            // @ts-expect-error server info gets added in afterwards
+        };
+        return import('@ai-sdk/azure').then(({ createAzure }) => createAzure({
             apiKey: 'apikey-placeholder',
+            /**
+             * @link https://learn.microsoft.com/en-us/azure/ai-foundry/openai/api-version-lifecycle?view=foundry-classic
+             * @link https://learn.microsoft.com/en-us/azure/ai-services/openai/reference#api-specs
+             * From the table, pick the `Latest GA release` for `Data plane - inference`
+             */
+            apiVersion: '2025-04-01-preview',
             useDeploymentBasedUrls: true,
             baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, 'azure-openai', 'server-placeholder'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
-                // ...(cost && { 'cf-aig-custom-cost': JSON.stringify({ per_token_in: cost.inputTokenCost ?? undefined, per_token_out: cost.outputTokenCost ?? undefined }) }),
-                'cf-aig-metadata': JSON.stringify({
-                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    ...(args.groupBillingId && { groupBillingId: (await BufferHelpers.uuidConvert(args.groupBillingId)).utf8 }),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid7()).utf8.slice(0, 23),
-                    executor: JSON.stringify(args.executor),
-                    // @ts-expect-error server info gets added in afterwards
-                }),
+                'cf-aig-metadata': JSON.stringify(metadataHeader),
                 ...(args.cache && { 'cf-aig-cache-ttl': (typeof args.cache === 'boolean' ? (args.cache ? this.cacheTtl : 0) : args.cache).toString() }),
                 ...(args.skipCache && { 'cf-aig-skip-cache': 'true' }),
             },
             fetch: (input, rawInit) => Promise.all([import('../serverSelector.mjs'), import('@chainfuse/types/ai-tools/azure/catalog')])
                 .then(([{ ServerSelector }, { azureCatalog }]) => new ServerSelector(this.config).closestServers(azureCatalog))
-                .then(async (filteredServers) => {
+                .then(async (closestServers) => {
                 const startRoundTrip = performance.now();
                 const headers = new Headers(rawInit?.headers);
-                const metadataHeader = JSON.parse(headers.get('cf-aig-metadata'));
                 // Calculate the idempotencyId if it doesn't exist yet
                 if (metadataHeader.idempotencyId.split('-').length === 4) {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
@@ -148,6 +170,14 @@ export class AiRawProviders extends AiBase {
                 catch (error) {
                     fallbackedQuery = rawInit?.body;
                 }
+                const modelName = fallbackedEndpointParts[1];
+                const filteredServers = 
+                // Check language models
+                closestServers.filter((server) => server.languageModelAvailability.some((model) => model.name === modelName) ??
+                    // Check image models
+                    server.imageModelAvailability.some((model) => model.name === modelName) ??
+                    // Check embedding models
+                    server.textEmbeddingModelAvailability.some((model) => model.name === modelName));
                 // Build universal gateway request
                 const fallbackedBody = await Promise.all([import('haversine-distance'), import("../serverSelector.mjs")]).then(([{ default: haversine }, { ServerSelector }]) => Promise.all(filteredServers.map(async (server) => {
                     const fallbackedHeaders = {
@@ -167,7 +197,6 @@ export class AiRawProviders extends AiBase {
                             }),
                         }),
                     };
-                    const modelName = fallbackedEndpointParts[0];
                     const languageModel = server.languageModelAvailability.find((model) => model.name === modelName);
                     if (languageModel && ('inputTokenCost' in languageModel || 'outputTokenCost' in languageModel)) {
                         fallbackedHeaders['cf-aig-custom-cost'] = {
@@ -190,7 +219,31 @@ export class AiRawProviders extends AiBase {
                 })));
                 if (args.logging ?? this.gatewayLog)
                     console.info(new Date().toISOString(), this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), this.chalk.magenta(rawInit?.method), this.chalk.magenta(new URL(new Request(input).url).pathname));
-                return fetch(new URL(['v1', this.config.gateway.accountId, this.gatewayName].join('/'), 'https://gateway.ai.cloudflare.com'), { ...rawInit, headers, body: JSON.stringify(fallbackedBody) }).then(async (response) => {
+                return (() => {
+                    if ('gateway' in this.config.providers.workersAi && typeof this.config.providers.workersAi.gateway === 'function') {
+                        return this.config.providers.workersAi.gateway(this.gatewayName).run(fallbackedBody, {
+                            extraHeaders: (() => {
+                                // Prevent duplicates
+                                headers.delete('cf-aig-authorization');
+                                headers.delete('cf-aig-metadata');
+                                headers.delete('cf-aig-cache-ttl');
+                                headers.delete('cf-aig-skip-cache');
+                                return headers;
+                            })(),
+                            gateway: {
+                                id: this.gatewayName,
+                                eventId: metadataHeader.idempotencyId,
+                                metadata: metadataHeader,
+                                ...(args.cache && { cacheTtl: typeof args.cache === 'boolean' ? (args.cache ? this.cacheTtl : 0) : args.cache }),
+                                ...(args.skipCache && { skipCache: true }),
+                            },
+                        });
+                    }
+                    else {
+                        return fetch(new URL(['v1', this.config.gateway.accountId, this.gatewayName].join('/'), 'https://gateway.ai.cloudflare.com'), { ...rawInit, headers, body: JSON.stringify(fallbackedBody) });
+                    }
+                })().then(async (_response) => {
+                    const response = _response;
                     // Inject it to have it available for retries
                     const mutableHeaders = new Headers(response.headers);
                     // Carry down

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@chainfuse/ai-tools",
-	"version": "1.0.15",
+	"version": "1.0.16",
 	"description": "",
 	"author": "ChainFuse",
 	"homepage": "https://github.com/ChainFuse/packages/tree/main/packages/ai-tools#readme",
@@ -49,13 +49,13 @@
 	"prettier": "@demosjarco/prettier-config",
 	"dependencies": {
 		"@ai-sdk/anthropic": "^2.0.49",
-		"@ai-sdk/azure": "^2.0.74",
+		"@ai-sdk/azure": "^2.0.75",
 		"@ai-sdk/google": "^2.0.43",
 		"@ai-sdk/openai": "^2.0.71",
 		"@ai-sdk/openai-compatible": "^1.0.27",
 		"@ai-sdk/provider": "^2.0.0",
-		"@chainfuse/helpers": "^4.2.5",
-		"@chainfuse/types": "^4.1.5",
+		"@chainfuse/helpers": "^4.2.6",
+		"@chainfuse/types": "^4.1.6",
 		"ai": "^5.0.102",
 		"chalk": "^5.6.2",
 		"haversine-distance": "^1.2.4",
@@ -63,8 +63,8 @@
 		"zod": "^4.1.13"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20251125.0",
+		"@cloudflare/workers-types": "^4.20251127.0",
 		"openai": "^6.9.1"
 	},
-	"gitHead": "ad1e1b8662a1792b4e39dc02fba265d07bdaaf8b"
+	"gitHead": "a7ba85aa01dd1c54356ef54b1af743cd9f6a767e"
 }