@chainfuse/ai-tools 0.7.1 → 0.9.0

package/dist/models.d.mts

@@ -1,7 +1,7 @@
 import type { LanguageModelValues, TextEmbeddingModelValues } from '@chainfuse/types';
-import { wrapLanguageModel, type embed, type embedMany } from 'ai';
+import type { embed, embedMany, wrapLanguageModel } from 'ai';
 import { AiBase } from './base.mjs';
-import { AiRegistry } from './registry.mjs';
+import type { AiRegistry } from './registry.mjs';
 import type { AiRequestConfig } from './types.mjs';
 type ProvidersReturnType = Awaited<ReturnType<AiRegistry['providers']>>;
 type ValidProviders = keyof ProvidersReturnType;

package/dist/models.mjs

@@ -1,15 +1,15 @@
-import { extractReasoningMiddleware, wrapLanguageModel } from 'ai';
 import { AiBase } from './base.mjs';
-import { AiRegistry } from './registry.mjs';
 export class AiModel extends AiBase {
     wrappedLanguageModel(args, modelOrProvider, model) {
-        return new AiRegistry(this.config).registry(args).then((registry) => wrapLanguageModel({
+        return import('./registry.mjs')
+            .then(({ AiRegistry }) => new AiRegistry(this.config).registry(args))
+            .then((registry) => import('ai').then(({ extractReasoningMiddleware, wrapLanguageModel }) => wrapLanguageModel({
             model: registry.languageModel(model ? `${modelOrProvider}:${model}` : modelOrProvider),
             middleware: [extractReasoningMiddleware({ tagName: 'think' }), this.middleware],
-        }));
+        })));
     }
     wrappedTextEmbeddingModel(args, modelOrProvider, model) {
-        return new AiRegistry(this.config).registry(args).then((registry) => registry.textEmbeddingModel(model ? `${modelOrProvider}:${model}` : modelOrProvider));
+        return import('./registry.mjs').then(({ AiRegistry }) => new AiRegistry(this.config).registry(args)).then((registry) => registry.textEmbeddingModel(model ? `${modelOrProvider}:${model}` : modelOrProvider));
     }
     get middleware() {
         return {};

package/dist/providers/customProviders.d.mts

@@ -1,11 +1,11 @@
 import type { GoogleGenerativeAIProvider } from '@ai-sdk/google';
 import type { OpenAICompatibleProvider } from '@ai-sdk/openai-compatible';
 import { AiBase } from '../base.mjs';
-import type { AiRequestConfig } from '../types.mjs';
+import type { AiRequestConfig, AzureServers } from '../types.mjs';
 import type { AzureOpenAIProvider, WorkersAIProvider } from './types.mjs';
 export declare class AiCustomProviders extends AiBase {
     oaiOpenai(args: AiRequestConfig): Promise<import("@ai-sdk/openai").OpenAIProvider>;
-    azOpenai(args: AiRequestConfig, [server, ...servers]?: import("../serverSelector/types.mts").Server[]): Promise<AzureOpenAIProvider>;
+    azOpenai(args: AiRequestConfig, filteredServers?: AzureServers): Promise<AzureOpenAIProvider>;
     anthropic(args: AiRequestConfig): Promise<import("@ai-sdk/anthropic").AnthropicProvider>;
     private static workersAiIsRest;
     cfWorkersAi(args: AiRequestConfig): Promise<WorkersAIProvider | OpenAICompatibleProvider<"@cf/qwen/qwen1.5-0.5b-chat" | "@cf/google/gemma-2b-it-lora" | "@hf/nexusflow/starling-lm-7b-beta" | "@cf/meta/llama-3-8b-instruct" | "@cf/meta/llama-3.2-3b-instruct" | "@hf/thebloke/llamaguard-7b-awq" | "@hf/thebloke/neural-chat-7b-v3-1-awq" | "@cf/meta/llama-guard-3-8b" | "@cf/meta/llama-2-7b-chat-fp16" | "@cf/mistral/mistral-7b-instruct-v0.1" | "@cf/mistral/mistral-7b-instruct-v0.2-lora" | "@cf/tinyllama/tinyllama-1.1b-chat-v1.0" | "@hf/mistral/mistral-7b-instruct-v0.2" | "@cf/fblgit/una-cybertron-7b-v2-bf16" | "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b" | "@cf/thebloke/discolm-german-7b-v1-awq" | "@cf/meta/llama-2-7b-chat-int8" | "@cf/meta/llama-3.1-8b-instruct-fp8" | "@hf/thebloke/mistral-7b-instruct-v0.1-awq" | "@cf/qwen/qwen1.5-7b-chat-awq" | "@cf/meta/llama-3.2-1b-instruct" | "@hf/thebloke/llama-2-13b-chat-awq" | "@hf/thebloke/deepseek-coder-6.7b-base-awq" | "@cf/meta-llama/llama-2-7b-chat-hf-lora" | "@cf/meta/llama-3.3-70b-instruct-fp8-fast" | "@hf/thebloke/openhermes-2.5-mistral-7b-awq" | "@hf/thebloke/deepseek-coder-6.7b-instruct-awq" | "@cf/deepseek-ai/deepseek-math-7b-instruct" | "@cf/tiiuae/falcon-7b-instruct" | "@hf/nousresearch/hermes-2-pro-mistral-7b" | "@cf/meta/llama-3.1-8b-instruct" | "@cf/meta/llama-3.1-8b-instruct-awq" | "@hf/thebloke/zephyr-7b-beta-awq" | "@cf/google/gemma-7b-it-lora" | "@cf/qwen/qwen1.5-1.8b-chat" | "@cf/meta/llama-3-8b-instruct-awq" | "@cf/meta/llama-3.2-11b-vision-instruct" | "@cf/defog/sqlcoder-7b-2" | "@cf/microsoft/phi-2" | "@hf/meta-llama/meta-llama-3-8b-instruct" | "@hf/google/gemma-7b-it" | "@cf/qwen/qwen1.5-14b-chat-awq" | "@cf/openchat/openchat-3.5-0106", "@cf/qwen/qwen1.5-0.5b-chat" | "@cf/google/gemma-2b-it-lora" | "@hf/nexusflow/starling-lm-7b-beta" | "@cf/meta/llama-3-8b-instruct" | "@cf/meta/llama-3.2-3b-instruct" | "@hf/thebloke/llamaguard-7b-awq" | "@hf/thebloke/neural-chat-7b-v3-1-awq" | "@cf/meta/llama-guard-3-8b" | "@cf/meta/llama-2-7b-chat-fp16" | "@cf/mistral/mistral-7b-instruct-v0.1" | "@cf/mistral/mistral-7b-instruct-v0.2-lora" | "@cf/tinyllama/tinyllama-1.1b-chat-v1.0" | "@hf/mistral/mistral-7b-instruct-v0.2" | "@cf/fblgit/una-cybertron-7b-v2-bf16" | "@cf/deepseek-ai/deepseek-r1-distill-qwen-32b" | "@cf/thebloke/discolm-german-7b-v1-awq" | "@cf/meta/llama-2-7b-chat-int8" | "@cf/meta/llama-3.1-8b-instruct-fp8" | "@hf/thebloke/mistral-7b-instruct-v0.1-awq" | "@cf/qwen/qwen1.5-7b-chat-awq" | "@cf/meta/llama-3.2-1b-instruct" | "@hf/thebloke/llama-2-13b-chat-awq" | "@hf/thebloke/deepseek-coder-6.7b-base-awq" | "@cf/meta-llama/llama-2-7b-chat-hf-lora" | "@cf/meta/llama-3.3-70b-instruct-fp8-fast" | "@hf/thebloke/openhermes-2.5-mistral-7b-awq" | "@hf/thebloke/deepseek-coder-6.7b-instruct-awq" | "@cf/deepseek-ai/deepseek-math-7b-instruct" | "@cf/tiiuae/falcon-7b-instruct" | "@hf/nousresearch/hermes-2-pro-mistral-7b" | "@cf/meta/llama-3.1-8b-instruct" | "@cf/meta/llama-3.1-8b-instruct-awq" | "@hf/thebloke/zephyr-7b-beta-awq" | "@cf/google/gemma-7b-it-lora" | "@cf/qwen/qwen1.5-1.8b-chat" | "@cf/meta/llama-3-8b-instruct-awq" | "@cf/meta/llama-3.2-11b-vision-instruct" | "@cf/defog/sqlcoder-7b-2" | "@cf/microsoft/phi-2" | "@hf/meta-llama/meta-llama-3-8b-instruct" | "@hf/google/gemma-7b-it" | "@cf/qwen/qwen1.5-14b-chat-awq" | "@cf/openchat/openchat-3.5-0106", "@cf/baai/bge-m3" | "@cf/baai/bge-small-en-v1.5" | "@cf/baai/bge-base-en-v1.5" | "@cf/baai/bge-large-en-v1.5">>;

package/dist/providers/customProviders.mjs

@@ -3,21 +3,24 @@ import { AiModels, enabledCloudflareLlmProviders } from '@chainfuse/types';
 import { APICallError, customProvider, TypeValidationError, wrapLanguageModel } from 'ai';
 import { ZodError } from 'zod';
 import { AiBase } from '../base.mjs';
-import { AzureServerSelector } from '../serverSelector/azure.mjs';
+import { ServerSelector } from "../serverSelector.mjs";
 import { AiRawProviders } from './rawProviders.mjs';
 export class AiCustomProviders extends AiBase {
     oaiOpenai(args) {
         return new AiRawProviders(this.config).oaiOpenai(args);
     }
-    async azOpenai(args, [server, ...servers] = new AzureServerSelector(this.config).closestServers()) {
+    async azOpenai(args, filteredServers) {
+        if (!filteredServers)
+            filteredServers = await new ServerSelector(this.config).closestServers(await import('@chainfuse/types/ai-tools/catalog/azure').then(({ azureCatalog }) => azureCatalog));
+        const [server, ...servers] = filteredServers;
         const raw = new AiRawProviders(this.config);
         return customProvider({
             // @ts-expect-error override for types
             languageModels: await server.languageModelAvailability.reduce(async (accPromise, model) => {
                 const acc = await accPromise;
                 // @ts-expect-error override for types
-                acc[model] = wrapLanguageModel({
-                    model: (await raw.azOpenai(args, server))(model),
+                acc[model.name] = wrapLanguageModel({
+                    model: (await raw.azOpenai(args, server, 'inputTokenCost' in model || 'outputTokenCost' in model ? { inputTokenCost: model.inputTokenCost, outputTokenCost: model.outputTokenCost } : undefined))(model.name),
                     middleware: {
                         wrapGenerate: async ({ doGenerate, model, params }) => {
                             try {
@@ -28,23 +31,34 @@ export class AiCustomProviders extends AiBase {
                                 if (APICallError.isInstance(error)) {
                                     const idempotencyId = new Headers(error.responseHeaders).get('X-Idempotency-Id');
                                     const lastServer = new URL(error.url).pathname.split('/')[5];
-                                    const compatibleServers = new AzureServerSelector(this.config).closestServers(model.modelId);
+                                    const compatibleServers = await new ServerSelector(this.config).closestServers(await import('@chainfuse/types/ai-tools/catalog/azure').then(({ azureCatalog }) => azureCatalog), model.modelId);
                                     const lastServerIndex = compatibleServers.findIndex((s) => s.id.toLowerCase() === lastServer.toLowerCase());
-                                    if (args.logging ?? this.config.environment !== 'production')
+                                    if (args.logging ?? !this.config.environment.startsWith('production'))
                                         console.error('ai', 'custom provider', this.chalk.rgb(...Helpers.uniqueIdColor(idempotencyId))(`[${idempotencyId}]`), this.chalk.red('FAIL'), compatibleServers[lastServerIndex].id, 'REMAINING', JSON.stringify(compatibleServers.slice(lastServerIndex + 1).map((s) => s.id)));
                                     // Should retry with the next server
                                     const leftOverServers = compatibleServers.slice(lastServerIndex + 1);
                                     const errors = [error];
                                     for (const nextServer of leftOverServers) {
                                         try {
-                                            if (args.logging ?? this.config.environment !== 'production')
+                                            if (args.logging ?? !this.config.environment.startsWith('production'))
                                                 console.error('ai', 'custom provider', this.chalk.rgb(...Helpers.uniqueIdColor(idempotencyId))(`[${idempotencyId}]`), this.chalk.blue('FALLBACK'), nextServer.id, 'REMAINING', JSON.stringify(leftOverServers.slice(leftOverServers.indexOf(nextServer) + 1).map((s) => s.id)));
                                             // Must be double awaited to prevent a promise from being returned
-                                            return await (await raw.azOpenai({ ...args, idempotencyId }, nextServer))(model.modelId).doGenerate(params);
+                                            return await (await raw.azOpenai({ ...args, idempotencyId }, nextServer, (() => {
+                                                const foundModel = server.languageModelAvailability.find((languageModel) => languageModel.name === model.modelId);
+                                                if (foundModel && ('inputTokenCost' in foundModel || 'outputTokenCost' in foundModel)) {
+                                                    return {
+                                                        inputTokenCost: foundModel.inputTokenCost,
+                                                        outputTokenCost: foundModel.outputTokenCost,
+                                                    };
+                                                }
+                                                else {
+                                                    return undefined;
+                                                }
+                                            })()))(model.modelId).doGenerate(params);
                                         }
                                         catch (nextServerError) {
                                             if (APICallError.isInstance(nextServerError)) {
-                                                if (args.logging ?? this.config.environment !== 'production')
+                                                if (args.logging ?? !this.config.environment.startsWith('production'))
                                                     console.error('ai', 'custom provider', this.chalk.rgb(...Helpers.uniqueIdColor(idempotencyId))(`[${idempotencyId}]`), this.chalk.red('FAIL'), nextServer.id, 'REMAINING', JSON.stringify(leftOverServers.slice(leftOverServers.indexOf(nextServer) + 1).map((s) => s.id)));
                                                 errors.push(nextServerError);
                                             }

package/dist/providers/rawProviders.d.mts

@@ -1,14 +1,16 @@
 import type { OpenAICompatibleProvider } from '@ai-sdk/openai-compatible';
 import type { cloudflareModelPossibilities } from '@chainfuse/types';
 import { AiBase } from '../base.mjs';
-import type { Server } from '../serverSelector/types.mjs';
-import type { AiRequestConfig } from '../types.mjs';
+import type { AiRequestConfig, Servers } from '../types.mjs';
 import type { WorkersAIProvider } from './types.mts';
 export declare class AiRawProviders extends AiBase {
     private readonly cacheTtl;
     private updateGatewayLog;
     oaiOpenai(args: AiRequestConfig): Promise<import("@ai-sdk/openai").OpenAIProvider>;
-    azOpenai(args: AiRequestConfig, server: Server): Promise<import("@ai-sdk/azure").AzureOpenAIProvider>;
+    azOpenai(args: AiRequestConfig, server: Servers[number], cost?: {
+        inputTokenCost?: number;
+        outputTokenCost?: number;
+    }): Promise<import("@ai-sdk/azure").AzureOpenAIProvider>;
     anthropic(args: AiRequestConfig): Promise<import("@ai-sdk/anthropic").AnthropicProvider>;
     custom(args: AiRequestConfig): Promise<OpenAICompatibleProvider<string, string, string>>;
     googleAi(args: AiRequestConfig): Promise<import("@ai-sdk/google").GoogleGenerativeAIProvider>;

package/dist/providers/rawProviders.mjs

@@ -1,23 +1,28 @@
-import { BufferHelpers, CryptoHelpers, DnsHelpers, Helpers, NetHelpers } from '@chainfuse/helpers';
-import haversine from 'haversine-distance';
-import { z } from 'zod';
+import { BufferHelpers, CryptoHelpers, Helpers } from '@chainfuse/helpers';
 import { AiBase } from '../base.mjs';
 export class AiRawProviders extends AiBase {
     // 2628288 seconds is what cf defines as 1 month in their cache rules
     cacheTtl = 2628288;
     async updateGatewayLog(response, metadataHeader, startRoundTrip, modelTime) {
-        const updateMetadata = NetHelpers.cfApi(this.config.gateway.apiToken).then((cf) => cf.aiGateway.logs.edit(this.config.environment, response.headers.get('cf-aig-log-id'), {
+        const updateMetadata = import('@chainfuse/helpers')
+            .then(({ NetHelpers }) => NetHelpers.cfApi(this.config.gateway.apiToken))
+            .then((cf) => cf.aiGateway.logs.edit(this.config.environment, response.headers.get('cf-aig-log-id'), {
             account_id: this.config.gateway.accountId,
             metadata: {
-                ...Object.entries(metadataHeader).reduce((acc, [key, value]) => {
+                ...Object.entries({
+                    ...metadataHeader,
+                    serverInfo: {
+                        ...JSON.parse(metadataHeader.serverInfo),
+                        timing: {
+                            fromCache: response.headers.get('cf-aig-cache-status')?.toLowerCase() === 'hit',
+                            totalRoundtripTime: performance.now() - startRoundTrip,
+                            modelTime,
+                        },
+                    },
+                }).reduce((acc, [key, value]) => {
                     acc[key] = typeof value === 'string' ? value : JSON.stringify(value);
                     return acc;
                 }, {}),
-                timing: JSON.stringify({
-                    fromCache: response.headers.get('cf-aig-cache-status')?.toLowerCase() === 'hit',
-                    totalRoundtripTime: performance.now() - startRoundTrip,
-                    modelTime,
-                }),
             },
         }));
         if (this.config.backgroundContext) {
@@ -35,21 +40,14 @@ export class AiRawProviders extends AiBase {
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
                 'cf-aig-metadata': JSON.stringify({
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: 'openai',
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 }),
                 ...(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' }),
@@ -63,10 +61,10 @@ export class AiRawProviders extends AiBase {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                     headers.set('cf-aig-metadata', JSON.stringify(metadataHeader));
                 }
-                if (args.logging ?? this.config.environment !== 'production')
+                if (args.logging ?? !this.config.environment.startsWith('production'))
                     console.info('ai', 'raw provider', 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(input, { ...rawInit, headers }).then(async (response) => {
-                    if (args.logging ?? this.config.environment !== 'production')
+                    if (args.logging ?? !this.config.environment.startsWith('production'))
                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                     await this.updateGatewayLog(response, metadataHeader, startRoundTrip, response.headers.has('openai-processing-ms') ? parseInt(response.headers.get('openai-processing-ms')) : undefined);
                     // Inject it to have it available for retries
@@ -84,7 +82,7 @@ export class AiRawProviders extends AiBase {
             },
         }));
     }
-    azOpenai(args, server) {
+    azOpenai(args, server, cost) {
         return import('@ai-sdk/azure').then(async ({ createAzure }) => createAzure({
             apiKey: this.config.providers.azureOpenAi.apiTokens[`AZURE_API_KEY_${server.id.toUpperCase().replaceAll('-', '_')}`],
             /**
@@ -95,26 +93,23 @@ export class AiRawProviders extends AiBase {
             baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'azure-openai', server.id.toLowerCase()].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({
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: `azure-${server.id}`,
-                        distance: haversine({
-                            lat: Helpers.precisionFloat(this.config.geoRouting?.userCoordinate?.lat ?? '0'),
-                            lon: Helpers.precisionFloat(this.config.geoRouting?.userCoordinate?.lon ?? '0'),
-                        }, server.coordinate),
+                        distance: await import('haversine-distance').then(async ({ default: haversine }) => haversine(await import("../serverSelector.mjs").then(({ ServerSelector }) => new ServerSelector(this.config).determineLocation().then(({ coordinate }) => ({
+                            lat: Helpers.precisionFloat(coordinate.lat),
+                            lon: Helpers.precisionFloat(coordinate.lon),
+                        }))), {
+                            lat: Helpers.precisionFloat(server.coordinate.lat),
+                            lon: Helpers.precisionFloat(server.coordinate.lon),
+                        })),
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 }),
                 ...(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' }),
@@ -127,10 +122,10 @@ export class AiRawProviders extends AiBase {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                     headers.set('cf-aig-metadata', JSON.stringify(metadataHeader));
                 }
-                if (args.logging ?? this.config.environment !== 'production')
+                if (args.logging ?? !this.config.environment.startsWith('production'))
                     console.info('ai', 'raw provider', 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(input, { ...rawInit, headers }).then(async (response) => {
-                    if (args.logging ?? this.config.environment !== 'production')
+                    if (args.logging ?? !this.config.environment.startsWith('production'))
                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                     await this.updateGatewayLog(response, metadataHeader, startRoundTrip, response.headers.has('x-envoy-upstream-service-time') ? parseInt(response.headers.get('x-envoy-upstream-service-time')) : undefined);
                     // Inject it to have it available for retries
@@ -155,21 +150,14 @@ export class AiRawProviders extends AiBase {
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
                 'cf-aig-metadata': JSON.stringify({
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: 'anthropic',
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 }),
                 ...(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' }),
@@ -182,10 +170,10 @@ export class AiRawProviders extends AiBase {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                     headers.set('cf-aig-metadata', JSON.stringify(metadataHeader));
                 }
-                if (args.logging ?? this.config.environment !== 'production')
+                if (args.logging ?? !this.config.environment.startsWith('production'))
                     console.info('ai', 'raw provider', 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(input, { ...rawInit, headers }).then(async (response) => {
-                    if (args.logging ?? this.config.environment !== 'production')
+                    if (args.logging ?? !this.config.environment.startsWith('production'))
                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                     await this.updateGatewayLog(response, metadataHeader, startRoundTrip);
                     // Inject it to have it available for retries
@@ -205,8 +193,10 @@ export class AiRawProviders extends AiBase {
     }
     custom(args) {
         if (this.config.providers.custom?.url) {
+            return import('zod')
+                .then(({ z }) => 
             // Verify that the custom provider url is a valid URL
-            return z
+            z
                 .string()
                 .trim()
                 .url()
@@ -219,13 +209,14 @@ export class AiRawProviders extends AiBase {
                 .trim()
                 .ip()
                 .safeParseAsync(customProviderUrl.hostname)
-                .then(async ({ success }) => {
+                .then(({ success }) => ({ customProviderUrl, success }))))
+                .then(async ({ customProviderUrl, success }) => {
                 if (success) {
                     throw new Error('IP custom providers not allowed');
                 }
                 else {
                     // Run domain through ZT policies
-                    const doh = new DnsHelpers(new URL('dns-query', `https://${this.config.providers.custom?.dohId}.cloudflare-gateway.com`));
+                    const doh = await import('@chainfuse/helpers').then(({ DnsHelpers }) => new DnsHelpers(new URL('dns-query', `https://${this.config.providers.custom?.dohId}.cloudflare-gateway.com`)));
                     const aCheck = doh.query(customProviderUrl.hostname, 'A', undefined, undefined, 2 * 1000);
                     const aaaaCheck = doh.query(customProviderUrl.hostname, 'AAAA', undefined, undefined, 2 * 1000);
                     return Promise.allSettled([aCheck, aaaaCheck]).then((checks) => {
@@ -265,10 +256,10 @@ export class AiRawProviders extends AiBase {
                                         idempotencyId = `${idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                                         headers.set('X-Idempotency-Id', idempotencyId);
                                     }
-                                    if (args.logging ?? this.config.environment !== 'production')
+                                    if (args.logging ?? !this.config.environment.startsWith('production'))
                                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(idempotencyId))(`[${idempotencyId}]`), this.chalk.magenta(rawInit?.method), this.chalk.magenta(new URL(new Request(input).url).pathname));
                                     return fetch(input, { ...rawInit, headers }).then(async (response) => {
-                                        if (args.logging ?? this.config.environment !== 'production')
+                                        if (args.logging ?? !this.config.environment.startsWith('production'))
                                             console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(idempotencyId))(`[${idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                                         // Inject it to have it available for retries
                                         const mutableHeaders = new Headers(response.headers);
@@ -290,7 +281,7 @@ export class AiRawProviders extends AiBase {
                         }
                     });
                 }
-            }))
+            })
                 .catch(() => {
                 throw new Error('Invalid custom provider url');
             });
@@ -319,21 +310,14 @@ export class AiRawProviders extends AiBase {
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
                 'cf-aig-metadata': JSON.stringify({
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: 'googleai',
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 }),
                 ...(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' }),
@@ -346,10 +330,10 @@ export class AiRawProviders extends AiBase {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                     headers.set('cf-aig-metadata', JSON.stringify(metadataHeader));
                 }
-                if (args.logging ?? this.config.environment !== 'production')
+                if (args.logging ?? !this.config.environment.startsWith('production'))
                     console.info('ai', 'raw provider', 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(input, { ...rawInit, headers }).then(async (response) => {
-                    if (args.logging ?? this.config.environment !== 'production')
+                    if (args.logging ?? !this.config.environment.startsWith('production'))
                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                     await this.updateGatewayLog(response, metadataHeader, startRoundTrip);
                     // Inject it to have it available for retries
@@ -374,21 +358,14 @@ export class AiRawProviders extends AiBase {
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
                 'cf-aig-metadata': JSON.stringify({
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: 'cloudflare',
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 }),
                 ...(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' }),
@@ -402,10 +379,10 @@ export class AiRawProviders extends AiBase {
                     metadataHeader.idempotencyId = `${metadataHeader.idempotencyId}-${(await CryptoHelpers.getHash('SHA-256', await new Request(input, rawInit).arrayBuffer())).slice(0, 12)}`;
                     headers.set('cf-aig-metadata', JSON.stringify(metadataHeader));
                 }
-                if (args.logging ?? this.config.environment !== 'production')
+                if (args.logging ?? !this.config.environment.startsWith('production'))
                     console.info('ai', 'raw provider', 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(input, { ...rawInit, headers }).then(async (response) => {
-                    if (args.logging ?? this.config.environment !== 'production')
+                    if (args.logging ?? !this.config.environment.startsWith('production'))
                         console.info('ai', 'raw provider', this.chalk.rgb(...Helpers.uniqueIdColor(metadataHeader.idempotencyId))(`[${metadataHeader.idempotencyId}]`), response.ok ? this.chalk.green(response.status) : this.chalk.red(response.status), response.ok ? this.chalk.green(new URL(response.url).pathname) : this.chalk.red(new URL(response.url).pathname));
                     await this.updateGatewayLog(response, metadataHeader, startRoundTrip);
                     // Inject it to have it available for retries
@@ -431,21 +408,14 @@ export class AiRawProviders extends AiBase {
                 ...(args.cache && { cacheTtl: typeof args.cache === 'boolean' ? (args.cache ? this.cacheTtl : 0) : args.cache }),
                 ...(args.skipCache && { skipCache: true }),
                 metadata: {
-                    dbInfo: JSON.stringify({
-                        messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
-                        dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
-                    }),
-                    executor: JSON.stringify(args.executor),
-                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
-                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    dataspaceId: (await BufferHelpers.uuidConvert(args.dataspaceId)).utf8,
+                    messageId: (await BufferHelpers.uuidConvert(args.messageId)).utf8,
                     serverInfo: JSON.stringify({
                         name: 'cloudflare',
                     }),
-                    /**
-                     * Blank at first, add after request finishes
-                     * CF AI Gateway allows only editing existing metadata not creating new ones after the request is made
-                     */
-                    timing: JSON.stringify({}),
+                    // Generate incomplete id because we don't have the body to hash yet. Fill it in in the `fetch()`
+                    idempotencyId: args.idempotencyId ?? (await BufferHelpers.generateUuid).utf8.slice(0, 23),
+                    executor: JSON.stringify(args.executor),
                 },
             },
         }));

package/dist/registry.mjs

@@ -1,18 +1,16 @@
-import { experimental_createProviderRegistry as createProviderRegistry } from 'ai';
 import { AiBase } from './base.mjs';
-import { AiCustomProviders } from './providers/customProviders.mjs';
 export class AiRegistry extends AiBase {
-    async providers(args) {
-        return Object.freeze({
+    providers(args) {
+        return import('./providers/customProviders.mjs').then(async ({ AiCustomProviders }) => Object.freeze({
             openai: await new AiCustomProviders(this.config).oaiOpenai(args),
             azure: await new AiCustomProviders(this.config).azOpenai(args),
             anthropic: await new AiCustomProviders(this.config).anthropic(args),
             custom: await new AiCustomProviders(this.config).custom(args),
             'google.generative-ai': await new AiCustomProviders(this.config).googleAi(args),
             workersai: await new AiCustomProviders(this.config).cfWorkersAi(args),
-        });
+        }));
     }
-    async registry(args) {
-        return createProviderRegistry(await this.providers(args));
+    registry(args) {
+        return import('ai').then(async ({ experimental_createProviderRegistry: createProviderRegistry }) => createProviderRegistry(await this.providers(args)));
     }
 }

package/dist/serverSelector.d.mts

@@ -0,0 +1,17 @@
+import type { Coordinate } from '@chainfuse/types';
+import type { IncomingRequestCfProperties } from '@cloudflare/workers-types/experimental';
+import { AiBase } from './base.mts';
+import type { PrivacyRegion, Servers } from './types.mjs';
+export declare class ServerSelector extends AiBase {
+    static determinePrivacyRegion(country?: IncomingRequestCfProperties['country'], continent?: IncomingRequestCfProperties['continent']): ("APPs" | "LGPD" | "GDPR" | "PIPEDA" | "APPI" | "UK-GDPR" | "PIPA" | "PoPIA" | "revFADP" | "NPDA" | "PDP")[];
+    determineLocation(geoRouting?: {
+        userCoordinate?: Coordinate;
+        country?: IncomingRequestCfProperties["country"];
+        continent?: IncomingRequestCfProperties["continent"];
+    } | undefined): Promise<{
+        coordinate: Coordinate;
+        country: IncomingRequestCfProperties['country'];
+        continent: IncomingRequestCfProperties['continent'];
+    }>;
+    closestServers(servers: Servers, requiredCapability?: string, userCoordinate?: Coordinate, privacyRegion?: PrivacyRegion[]): Promise<Servers>;
+}