@llumiverse/drivers 1.2.0 → 1.4.0-dev.20260629.090753Z

package/src/watsonx/interfaces.ts

@@ -1,5 +1,3 @@
-
-
 export interface WatsonxTextGenerationPayload {
     model_id: string;
     input: string;
@@ -10,7 +8,7 @@ export interface WatsonxTextGenerationPayload {
         temperature?: number;
         top_k?: number;
         top_p?: number;
-    },
+    };
     project_id: string;
 }
 
@@ -22,7 +20,7 @@ export interface WatsonxTextGenerationResponse {
         generated_token_count: number;
         input_token_count: number;
         stop_reason: string;
-    }[]
+    }[];
 }
 
 export interface GenerateEmbeddingPayload {
@@ -31,13 +29,12 @@ export interface GenerateEmbeddingPayload {
     project_id: string;
 }
 
-
 export interface GenerateEmbeddingResponse {
     model_id: string;
     created_at: string;
     results: {
         embedding: number[];
-    }[]
+    }[];
     input_token_count: number;
 }
 
@@ -51,25 +48,23 @@ export interface WatsonxModelSpec {
         id: string;
         ratings: {
             quality: number;
-        }
+        };
     }[];
     min_shot_size: number;
     tier: string;
     number_params: string;
 }
 
-
 export interface WatsonxListModelResponse {
     total_count: number;
     limit: number;
     resources: WatsonxModelSpec[];
 }
 
-
 export interface WatsonAuthToken {
-    access_token: string
-    refresh_token: string
-    token_type: string
-    expire_in: number
-    expiration: number
-}
+    access_token: string;
+    refresh_token: string;
+    token_type: string;
+    expire_in: number;
+    expiration: number;
+}

package/src/xai/index.ts

@@ -1,51 +1,56 @@
-import { AIModel, DriverOptions, PromptOptions, PromptSegment, Providers } from "@llumiverse/core";
-import { formatOpenAILikeMultimodalPrompt, OpenAIPromptFormatterOptions } from "../openai/openai_format.js";
-import { FetchClient } from "@vertesia/api-fetch-client";
-import OpenAI from "openai";
-import { BaseOpenAIDriver } from "../openai/index.js";
+import { type AIModel, type DriverOptions, type PromptOptions, type PromptSegment, Providers } from '@llumiverse/core';
+import { FetchClient } from '@vertesia/api-fetch-client';
+import OpenAI from 'openai';
+import { BaseOpenAIDriver } from '../openai/index.js';
+import { formatOpenAILikeMultimodalPrompt, type OpenAIPromptFormatterOptions } from '../openai/openai_format.js';
 
 export interface xAiDriverOptions extends DriverOptions {
-
     apiKey: string;
 
     endpoint?: string;
-
 }
 
 export class xAIDriver extends BaseOpenAIDriver {
-
     service: OpenAI;
     readonly provider = Providers.xai;
     xai_service: FetchClient;
-    DEFAULT_ENDPOINT = "https://api.x.ai/v1";
+    DEFAULT_ENDPOINT = 'https://api.x.ai/v1';
 
     constructor(opts: xAiDriverOptions) {
         super(opts);
 
         if (!opts.apiKey) {
-            throw new Error("apiKey is required");
+            throw new Error('apiKey is required');
         }
 
         this.service = new OpenAI({
             apiKey: opts.apiKey,
             baseURL: opts.endpoint ?? this.DEFAULT_ENDPOINT,
+            fetch: this.getDriverFetch(),
         });
-        this.xai_service = new FetchClient(opts.endpoint ?? this.DEFAULT_ENDPOINT).withAuthCallback(async () => `Bearer ${opts.apiKey}`);
+        this.xai_service = new FetchClient(
+            opts.endpoint ?? this.DEFAULT_ENDPOINT,
+            this.getDriverFetch(),
+        ).withAuthCallback(async () => `Bearer ${opts.apiKey}`);
         //this.formatPrompt = this._formatPrompt; //TODO: fix xai prompt formatting
     }
 
-    async _formatPrompt(segments: PromptSegment[], opts: PromptOptions): Promise<OpenAI.Chat.Completions.ChatCompletionMessageParam[]> {
-
+    async _formatPrompt(
+        segments: PromptSegment[],
+        opts: PromptOptions,
+    ): Promise<OpenAI.Chat.Completions.ChatCompletionMessageParam[]> {
         const options: OpenAIPromptFormatterOptions = {
-            multimodal: opts.model.includes("vision"),
+            multimodal: opts.model.includes('vision'),
             schema: opts.result_schema,
             useToolForFormatting: false,
-        }
+        };
 
-        const p = await formatOpenAILikeMultimodalPrompt(segments, { ...options, ...opts }) as OpenAI.Chat.Completions.ChatCompletionMessageParam[];
+        const p = (await formatOpenAILikeMultimodalPrompt(segments, {
+            ...options,
+            ...opts,
+        })) as OpenAI.Chat.Completions.ChatCompletionMessageParam[];
 
         return p;
-
     }
 
     // Note: We intentionally do NOT override extractDataFromResponse here.
@@ -53,17 +58,16 @@ export class xAIDriver extends BaseOpenAIDriver {
     // xAI's API is OpenAI-compatible and returns tool_calls in the same format.
 
     async listModels(): Promise<AIModel[]> {
-        const [lm, em] = await Promise.all([
-            this.xai_service.get("/language-models"),
-            this.xai_service.get("/embedding-models")
-        ]) as [xAIModelResponse, xAIModelResponse];
+        const [lm, em] = (await Promise.all([
+            this.xai_service.get('/language-models'),
+            this.xai_service.get('/embedding-models'),
+        ])) as [xAIModelResponse, xAIModelResponse];
 
-
-        em.models.forEach(m => {
-            m.output_modalities.push("vectors");
+        em.models.forEach((m) => {
+            m.output_modalities.push('vectors');
         });
 
-        const models = [...lm.models, ...em.models].map(model => {
+        const models = [...lm.models, ...em.models].map((model) => {
             return {
                 id: model.id,
                 provider: this.provider,
@@ -72,18 +76,14 @@ export class xAIDriver extends BaseOpenAIDriver {
                 is_multimodal: model.input_modalities.length > 1,
                 input_modalities: model.input_modalities,
                 output_modalities: model.output_modalities,
-                tags: [...model.input_modalities.map(m => `i:${m}`), ...model.output_modalities.map(m => `o:${m}`)],
+                tags: [...model.input_modalities.map((m) => `i:${m}`), ...model.output_modalities.map((m) => `o:${m}`)],
             } satisfies AIModel;
         });
 
         return models;
-
     }
-
-
 }
 
-
 interface xAIModelResponse {
     models: xAIModel[];
 }

package/lib/cjs/adobe/firefly.js

@@ -1,120 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FireflyDriver = void 0;
-const core_1 = require("@llumiverse/core");
-class FireflyDriver extends core_1.AbstractDriver {
-    static PROVIDER = "firefly";
-    provider = FireflyDriver.PROVIDER;
-    endpoint;
-    constructor(options) {
-        super(options);
-        if (!options.apiKey) {
-            throw new Error("No API key provided for Firefly driver");
-        }
-        this.endpoint = options.endpoint || "https://firefly-api.adobe.io/v3";
-    }
-    async requestTextCompletion(_prompt, _options) {
-        throw new Error("Text completion not supported by Firefly");
-    }
-    async requestTextCompletionStream(_prompt, _options) {
-        throw new Error("Text completion streaming not supported by Firefly");
-    }
-    async requestImageGeneration(segments, options) {
-        this.logger.debug(`[${this.provider}] Generating image with model ${options.model}`);
-        const prompt = segments.map(s => s.content).join("\n\n");
-        try {
-            const payload = {
-                prompt: prompt,
-            };
-            const response = await fetch(`${this.endpoint}/images/generate`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/json',
-                    'x-api-key': this.options.apiKey,
-                },
-                body: JSON.stringify(payload)
-            });
-            if (!response.ok) {
-                const error = await response.json();
-                throw new Error(`Firefly API error: ${error.message || response.statusText}`);
-            }
-            const result = await response.json();
-            if (result.promptHasDeniedWords || result.promptHasBlockedArtists) {
-                return {
-                    result: [],
-                    error: {
-                        message: "Prompt contains denied words or blocked artists",
-                        code: "content_policy_violation"
-                    }
-                };
-            }
-            return {
-                result: result.outputs.map(output => ({
-                    type: "image",
-                    value: output.image.url
-                }))
-            };
-        }
-        catch (error) {
-            this.logger.error({ error }, "[Firefly] Image generation failed");
-            return {
-                result: [],
-                error: {
-                    message: error.message,
-                    code: error.code || 'GENERATION_FAILED'
-                }
-            };
-        }
-    }
-    mapSize(size) {
-        // Default to 1024x1024 if no size specified
-        if (!size)
-            return { width: 1024, height: 1024 };
-        const [width, height] = size.split('x').map(Number);
-        return { width, height };
-    }
-    async listModels(_params) {
-        return [
-            {
-                id: "firefly-v3-text-to-image",
-                name: "Firefly v3 Text to Image",
-                provider: this.provider,
-                description: "Adobe Firefly v3 text to image generation model",
-                tags: ["image-generation"]
-            },
-            {
-                id: "firefly-v3-image-to-image",
-                name: "Firefly v3 Image to Image",
-                provider: this.provider,
-                description: "Adobe Firefly v3 image to image generation model",
-                tags: ["image-generation"]
-            },
-            {
-                id: "firefly-v3-inpainting",
-                name: "Firefly v3 Inpainting",
-                provider: this.provider,
-                description: "Adobe Firefly v3 inpainting model",
-                tags: ["image-generation"]
-            }
-        ];
-    }
-    async validateConnection() {
-        try {
-            const response = await fetch(`${this.endpoint}/auth/validate`, {
-                headers: {
-                    'x-api-key': this.options.apiKey
-                }
-            });
-            return response.ok;
-        }
-        catch (error) {
-            this.logger.error({ error }, "[Firefly] Connection validation failed");
-            return false;
-        }
-    }
-    async generateEmbeddings(_options) {
-        throw new Error("Embeddings not supported by Firefly");
-    }
-}
-exports.FireflyDriver = FireflyDriver;
-//# sourceMappingURL=firefly.js.map

package/lib/cjs/adobe/firefly.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"firefly.js","sourceRoot":"","sources":["../../../src/adobe/firefly.ts"],"names":[],"mappings":"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"}