@llumiverse/drivers 0.21.0 → 0.22.0-dev.1

package/src/xai/index.ts

@@ -5,7 +5,7 @@ import OpenAI from "openai";
 import { BaseOpenAIDriver } from "../openai/index.js";
 
 export interface xAiDriverOptions extends DriverOptions {
-    
+
     apiKey: string;
 
     endpoint?: string;
@@ -17,7 +17,7 @@ export class xAIDriver extends BaseOpenAIDriver {
     service: OpenAI;
     provider: "xai";
     xai_service: FetchClient;
-    DEFAULT_ENDPOINT = "https://api.x.ai/v1"; 
+    DEFAULT_ENDPOINT = "https://api.x.ai/v1";
 
     constructor(opts: xAiDriverOptions) {
         super(opts);
@@ -29,8 +29,8 @@ export class xAIDriver extends BaseOpenAIDriver {
         this.service = new OpenAI({
             apiKey: opts.apiKey,
             baseURL: opts.endpoint ?? this.DEFAULT_ENDPOINT,
-          });
-        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).withAuthCallback(async () => `Bearer ${opts.apiKey}`);
         this.provider = "xai";
         //this.formatPrompt = this._formatPrompt; //TODO: fix xai prompt formatting
     }
@@ -43,7 +43,7 @@ export class xAIDriver extends BaseOpenAIDriver {
             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;
 
@@ -51,7 +51,7 @@ export class xAIDriver extends BaseOpenAIDriver {
 
     extractDataFromResponse(_options: ExecutionOptions, result: OpenAI.Chat.Completions.ChatCompletion): Completion {
         return {
-            result: result.choices[0].message.content,
+            result: result.choices[0].message.content ? [{ type: "text", value: result.choices[0].message.content }] : [],
             finish_reason: result.choices[0].finish_reason,
             token_usage: {
                 prompt: result.usage?.prompt_tokens,
@@ -63,7 +63,7 @@ export class xAIDriver extends BaseOpenAIDriver {
 
     async listModels(): Promise<AIModel[]> {
         const [lm, em] = await Promise.all([
-            this.xai_service.get("/language-models") ,
+            this.xai_service.get("/language-models"),
             this.xai_service.get("/embedding-models")
         ]) as [xAIModelResponse, xAIModelResponse];
 
@@ -93,9 +93,9 @@ export class xAIDriver extends BaseOpenAIDriver {
 
 interface xAIModelResponse {
     models: xAIModel[];
-  }
-  
-  interface xAIModel {
+}
+
+interface xAIModel {
     completion_text_token_price: number;
     created: number;
     id: string;
@@ -105,5 +105,4 @@ interface xAIModelResponse {
     owned_by: string;
     prompt_image_token_price: number;
     prompt_text_token_price: number;
-  }
-  
+}

package/lib/cjs/openai/azure.js

@@ -1,31 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AzureOpenAIDriver = void 0;
-const identity_1 = require("@azure/identity");
-const openai_1 = require("openai");
-const index_js_1 = require("./index.js");
-class AzureOpenAIDriver extends index_js_1.BaseOpenAIDriver {
-    service;
-    provider;
-    constructor(opts) {
-        super(opts);
-        if (!opts.azureADTokenProvider && !opts.apiKey) {
-            opts.azureADTokenProvider = this.getDefaultAuth();
-        }
-        this.service = new openai_1.AzureOpenAI({
-            apiKey: opts.apiKey,
-            azureADTokenProvider: opts.azureADTokenProvider,
-            endpoint: opts.endpoint,
-            apiVersion: opts.apiVersion ?? "2024-10-21",
-            deployment: opts.deployment
-        });
-        this.provider = "azure_openai";
-    }
-    getDefaultAuth() {
-        const scope = "https://cognitiveservices.azure.com/.default";
-        const azureADTokenProvider = (0, identity_1.getBearerTokenProvider)(new identity_1.DefaultAzureCredential(), scope);
-        return azureADTokenProvider;
-    }
-}
-exports.AzureOpenAIDriver = AzureOpenAIDriver;
-//# sourceMappingURL=azure.js.map

package/lib/cjs/openai/azure.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"azure.js","sourceRoot":"","sources":["../../../src/openai/azure.ts"],"names":[],"mappings":";;;AAAA,8CAAiF;AAEjF,mCAAqC;AACrC,yCAA8C;AAmB9C,MAAa,iBAAkB,SAAQ,2BAAgB;IAGnD,OAAO,CAAc;IACrB,QAAQ,CAAiB;IAEzB,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,oBAAW,CAAC;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,YAAY;YAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;IACnC,CAAC;IAGD,cAAc;QACV,MAAM,KAAK,GAAG,8CAA8C,CAAC;QAC7D,MAAM,oBAAoB,GAAG,IAAA,iCAAsB,EAAC,IAAI,iCAAsB,EAAE,EAAE,KAAK,CAAC,CAAC;QACzF,OAAO,oBAAoB,CAAC;IAChC,CAAC;CAGJ;AA/BD,8CA+BC"}

package/lib/esm/openai/azure.js

@@ -1,27 +0,0 @@
-import { DefaultAzureCredential, getBearerTokenProvider } from "@azure/identity";
-import { AzureOpenAI } from "openai";
-import { BaseOpenAIDriver } from "./index.js";
-export class AzureOpenAIDriver extends BaseOpenAIDriver {
-    service;
-    provider;
-    constructor(opts) {
-        super(opts);
-        if (!opts.azureADTokenProvider && !opts.apiKey) {
-            opts.azureADTokenProvider = this.getDefaultAuth();
-        }
-        this.service = new AzureOpenAI({
-            apiKey: opts.apiKey,
-            azureADTokenProvider: opts.azureADTokenProvider,
-            endpoint: opts.endpoint,
-            apiVersion: opts.apiVersion ?? "2024-10-21",
-            deployment: opts.deployment
-        });
-        this.provider = "azure_openai";
-    }
-    getDefaultAuth() {
-        const scope = "https://cognitiveservices.azure.com/.default";
-        const azureADTokenProvider = getBearerTokenProvider(new DefaultAzureCredential(), scope);
-        return azureADTokenProvider;
-    }
-}
-//# sourceMappingURL=azure.js.map

package/lib/esm/openai/azure.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"azure.js","sourceRoot":"","sources":["../../../src/openai/azure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmB9C,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IAGnD,OAAO,CAAc;IACrB,QAAQ,CAAiB;IAEzB,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,YAAY;YAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;IACnC,CAAC;IAGD,cAAc;QACV,MAAM,KAAK,GAAG,8CAA8C,CAAC;QAC7D,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,IAAI,sBAAsB,EAAE,EAAE,KAAK,CAAC,CAAC;QACzF,OAAO,oBAAoB,CAAC;IAChC,CAAC;CAGJ"}

package/lib/esm/src/openai/azure.js

@@ -1,27 +0,0 @@
-import { DefaultAzureCredential, getBearerTokenProvider } from "@azure/identity";
-import { AzureOpenAI } from "openai";
-import { BaseOpenAIDriver } from "./index.js";
-export class AzureOpenAIDriver extends BaseOpenAIDriver {
-    service;
-    provider;
-    constructor(opts) {
-        super(opts);
-        if (!opts.azureADTokenProvider && !opts.apiKey) {
-            opts.azureADTokenProvider = this.getDefaultAuth();
-        }
-        this.service = new AzureOpenAI({
-            apiKey: opts.apiKey,
-            azureADTokenProvider: opts.azureADTokenProvider,
-            endpoint: opts.endpoint,
-            apiVersion: opts.apiVersion ?? "2024-10-21",
-            deployment: opts.deployment
-        });
-        this.provider = "azure_openai";
-    }
-    getDefaultAuth() {
-        const scope = "https://cognitiveservices.azure.com/.default";
-        const azureADTokenProvider = getBearerTokenProvider(new DefaultAzureCredential(), scope);
-        return azureADTokenProvider;
-    }
-}
-//# sourceMappingURL=azure.js.map

package/lib/esm/src/openai/azure.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"azure.js","sourceRoot":"","sources":["../../../../src/openai/azure.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAmB9C,MAAM,OAAO,iBAAkB,SAAQ,gBAAgB;IAGnD,OAAO,CAAc;IACrB,QAAQ,CAAiB;IAEzB,YAAY,IAA8B;QACtC,KAAK,CAAC,IAAI,CAAC,CAAC;QAEZ,IAAI,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7C,IAAI,CAAC,oBAAoB,GAAG,IAAI,CAAC,cAAc,EAAE,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,WAAW,CAAC;YAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;YAC/C,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU,IAAI,YAAY;YAC3C,UAAU,EAAE,IAAI,CAAC,UAAU;SAC9B,CAAC,CAAC;QACH,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;IACnC,CAAC;IAGD,cAAc;QACV,MAAM,KAAK,GAAG,8CAA8C,CAAC;QAC7D,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,IAAI,sBAAsB,EAAE,EAAE,KAAK,CAAC,CAAC;QACzF,OAAO,oBAAoB,CAAC;IAChC,CAAC;CAGJ"}

package/lib/types/openai/azure.d.ts

@@ -1,20 +0,0 @@
-import { DriverOptions } from "@llumiverse/core";
-import { AzureOpenAI } from "openai";
-import { BaseOpenAIDriver } from "./index.js";
-export interface AzureOpenAIDriverOptions extends DriverOptions {
-    /**
-     * The credentials to use to access Azure OpenAI
-     */
-    azureADTokenProvider?: any;
-    apiKey?: string;
-    endpoint?: string;
-    apiVersion?: string;
-    deployment?: string;
-}
-export declare class AzureOpenAIDriver extends BaseOpenAIDriver {
-    service: AzureOpenAI;
-    provider: "azure_openai";
-    constructor(opts: AzureOpenAIDriverOptions);
-    getDefaultAuth(): () => Promise<string>;
-}
-//# sourceMappingURL=azure.d.ts.map

package/lib/types/openai/azure.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"azure.d.ts","sourceRoot":"","sources":["../../../src/openai/azure.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,wBAAyB,SAAQ,aAAa;IAE3D;;OAEG;IACH,oBAAoB,CAAC,EAAE,GAAG,CAAC;IAE3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAElB,UAAU,CAAC,EAAE,MAAM,CAAA;IAEnB,UAAU,CAAC,EAAE,MAAM,CAAC;CAEvB;AAED,qBAAa,iBAAkB,SAAQ,gBAAgB;IAGnD,OAAO,EAAE,WAAW,CAAC;IACrB,QAAQ,EAAE,cAAc,CAAC;gBAEb,IAAI,EAAE,wBAAwB;IAkB1C,cAAc;CAOjB"}

package/lib/types/src/openai/azure.d.ts

@@ -1,19 +0,0 @@
-import { DriverOptions } from "@llumiverse/core";
-import { AzureOpenAI } from "openai";
-import { BaseOpenAIDriver } from "./index.js";
-export interface AzureOpenAIDriverOptions extends DriverOptions {
-    /**
-     * The credentials to use to access Azure OpenAI
-     */
-    azureADTokenProvider?: any;
-    apiKey?: string;
-    endpoint?: string;
-    apiVersion?: string;
-    deployment?: string;
-}
-export declare class AzureOpenAIDriver extends BaseOpenAIDriver {
-    service: AzureOpenAI;
-    provider: "azure_openai";
-    constructor(opts: AzureOpenAIDriverOptions);
-    getDefaultAuth(): () => Promise<string>;
-}