@chainfuse/ai-tools 0.9.0 → 0.11.0

package/dist/base.d.mts

@@ -4,4 +4,6 @@ export declare class AiBase {
     protected _config: AiConfig;
     constructor(config: AiConfig);
     get config(): Readonly<AiConfig>;
+    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

@@ -8,4 +8,20 @@ export class AiBase {
     get config() {
         return Object.freeze(this._config);
     }
+    get gatewayName() {
+        if (this.config.billing.noCost) {
+            return 'nocost';
+        }
+        else {
+            return `${this.config.billing.environment}-${this.config.billing.action}-${this.config.billing.user}`;
+        }
+    }
+    get gatewayLog() {
+        if (this.config.billing.noCost) {
+            return true;
+        }
+        else {
+            return this.config.billing.environment !== 'production';
+        }
+    }
 }

package/dist/providers/customProviders.mjs

@@ -33,14 +33,14 @@ export class AiCustomProviders extends AiBase {
                                     const lastServer = new URL(error.url).pathname.split('/')[5];
                                     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.startsWith('production'))
+                                    if (args.logging ?? this.gatewayLog)
                                         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.startsWith('production'))
+                                            if (args.logging ?? this.gatewayLog)
                                                 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, (() => {
@@ -58,7 +58,7 @@ export class AiCustomProviders extends AiBase {
                                         }
                                         catch (nextServerError) {
                                             if (APICallError.isInstance(nextServerError)) {
-                                                if (args.logging ?? !this.config.environment.startsWith('production'))
+                                                if (args.logging ?? this.gatewayLog)
                                                     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.mjs

@@ -6,7 +6,7 @@ export class AiRawProviders extends AiBase {
     async updateGatewayLog(response, metadataHeader, startRoundTrip, modelTime) {
         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'), {
+            .then((cf) => cf.aiGateway.logs.edit(this.gatewayName, response.headers.get('cf-aig-log-id'), {
             account_id: this.config.gateway.accountId,
             metadata: {
                 ...Object.entries({
@@ -34,7 +34,7 @@ export class AiRawProviders extends AiBase {
     }
     oaiOpenai(args) {
         return import('@ai-sdk/openai').then(async ({ createOpenAI }) => createOpenAI({
-            baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'openai'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
+            baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, 'openai'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
             apiKey: this.config.providers.openAi.apiToken,
             organization: this.config.providers.openAi.organization,
             headers: {
@@ -61,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.startsWith('production'))
+                if (args.logging ?? this.gatewayLog)
                     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.startsWith('production'))
+                    if (args.logging ?? this.gatewayLog)
                         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
@@ -90,7 +90,7 @@ export class AiRawProviders extends AiBase {
              * From the table, pick the `Latest GA release` for `Data plane - inference`
              */
             apiVersion: '2024-10-21',
-            baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'azure-openai', server.id.toLowerCase()].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
+            baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, '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 }) }),
@@ -122,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.startsWith('production'))
+                if (args.logging ?? this.gatewayLog)
                     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.startsWith('production'))
+                    if (args.logging ?? this.gatewayLog)
                         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
@@ -145,7 +145,7 @@ export class AiRawProviders extends AiBase {
     }
     anthropic(args) {
         return import('@ai-sdk/anthropic').then(async ({ createAnthropic }) => createAnthropic({
-            baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'anthropic'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
+            baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, 'anthropic'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
             apiKey: this.config.providers.anthropic.apiToken,
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
@@ -170,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.startsWith('production'))
+                if (args.logging ?? this.gatewayLog)
                     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.startsWith('production'))
+                    if (args.logging ?? this.gatewayLog)
                         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
@@ -256,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.startsWith('production'))
+                                    if (args.logging ?? this.gatewayLog)
                                         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.startsWith('production'))
+                                        if (args.logging ?? this.gatewayLog)
                                             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);
@@ -305,7 +305,7 @@ export class AiRawProviders extends AiBase {
              * `v1beta` is the only one that supports function calls as of now
              * @link https://ai.google.dev/gemini-api/docs/api-versions
              */
-            baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'google-ai-studio', 'v1beta'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
+            baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, 'google-ai-studio', 'v1beta'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
             apiKey: this.config.providers.googleAi.apiToken,
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
@@ -330,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.startsWith('production'))
+                if (args.logging ?? this.gatewayLog)
                     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.startsWith('production'))
+                    if (args.logging ?? this.gatewayLog)
                         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
@@ -353,7 +353,7 @@ export class AiRawProviders extends AiBase {
     }
     restWorkersAi(args) {
         return import('@ai-sdk/openai-compatible').then(async ({ createOpenAICompatible }) => createOpenAICompatible({
-            baseURL: new URL(['v1', this.config.gateway.accountId, this.config.environment, 'workers-ai', 'v1'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
+            baseURL: new URL(['v1', this.config.gateway.accountId, this.gatewayName, 'workers-ai', 'v1'].join('/'), 'https://gateway.ai.cloudflare.com').toString(),
             apiKey: this.config.providers.workersAi.apiToken,
             headers: {
                 'cf-aig-authorization': `Bearer ${this.config.gateway.apiToken}`,
@@ -379,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.startsWith('production'))
+                if (args.logging ?? this.gatewayLog)
                     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.startsWith('production'))
+                    if (args.logging ?? this.gatewayLog)
                         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
@@ -404,7 +404,7 @@ export class AiRawProviders extends AiBase {
         return import('workers-ai-provider').then(async ({ createWorkersAI }) => createWorkersAI({
             binding: this.config.providers.workersAi,
             gateway: {
-                id: this.config.environment,
+                id: this.gatewayName,
                 ...(args.cache && { cacheTtl: typeof args.cache === 'boolean' ? (args.cache ? this.cacheTtl : 0) : args.cache }),
                 ...(args.skipCache && { skipCache: true }),
                 metadata: {

package/dist/types.d.mts

@@ -12,7 +12,18 @@ export interface AiConfig {
         country?: IncomingRequestCfProperties['country'];
         continent?: IncomingRequestCfProperties['continent'];
     };
-    environment: 'internal' | 'production-passive' | 'preview-passive' | 'production-active' | 'preview-active';
+    billing: {
+        noCost: true;
+    } | ({
+        noCost: false;
+        environment: 'production' | 'preview';
+    } & ({
+        user: 'bot';
+        action: 'passive';
+    } | {
+        user: 'human' | 'bot';
+        action: 'active';
+    }));
     providers: AiConfigProviders;
     backgroundContext?: ExecutionContext;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@chainfuse/ai-tools",
-	"version": "0.9.0",
+	"version": "0.11.0",
 	"description": "",
 	"author": "ChainFuse",
 	"homepage": "https://github.com/ChainFuse/packages/tree/main/packages/ai-tools#readme",
@@ -48,21 +48,21 @@
 	},
 	"prettier": "@demosjarco/prettier-config",
 	"dependencies": {
-		"@ai-sdk/anthropic": "^1.2.0",
-		"@ai-sdk/azure": "^1.3.0",
-		"@ai-sdk/google": "^1.2.1",
+		"@ai-sdk/anthropic": "^1.2.1",
+		"@ai-sdk/azure": "^1.3.2",
+		"@ai-sdk/google": "^1.2.3",
 		"@ai-sdk/openai": "^1.0.5",
-		"@ai-sdk/openai-compatible": "^0.2.0",
-		"@chainfuse/helpers": "^2.1.1",
-		"@chainfuse/types": "^2.0.0",
-		"ai": "^4.2.0",
+		"@ai-sdk/openai-compatible": "^0.2.1",
+		"@chainfuse/helpers": "^2.2.1",
+		"@chainfuse/types": "^2.1.1",
+		"ai": "^4.2.5",
 		"chalk": "^5.4.1",
 		"haversine-distance": "^1.2.3",
 		"workers-ai-provider": "^0.2.0"
 	},
 	"devDependencies": {
-		"@cloudflare/workers-types": "^4.20250320.0",
+		"@cloudflare/workers-types": "^4.20250321.0",
 		"openai": "^4.89.0"
 	},
-	"gitHead": "60babb051a4005d8495655784427e446fc7c7bcb"
+	"gitHead": "540b2b0358f6d2602370d23eccf64c856868d3d9"
 }