@llumiverse/drivers 0.20.0 → 0.22.0

package/lib/cjs/azure/azure_foundry.js

@@ -0,0 +1,388 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AzureFoundryDriver = void 0;
+exports.parseAzureFoundryModelId = parseAzureFoundryModelId;
+exports.isCompositeModelId = isCompositeModelId;
+const identity_1 = require("@azure/identity");
+const core_1 = require("@llumiverse/core");
+const ai_projects_1 = require("@azure/ai-projects");
+const ai_inference_1 = require("@azure-rest/ai-inference");
+const azure_openai_js_1 = require("../openai/azure_openai.js");
+const core_sse_1 = require("@azure/core-sse");
+const openai_format_js_1 = require("../openai/openai_format.js");
+class AzureFoundryDriver extends core_1.AbstractDriver {
+    service;
+    provider = core_1.Providers.azure_foundry;
+    OPENAI_API_VERSION = "2025-01-01-preview";
+    INFERENCE_API_VERSION = "2024-05-01-preview";
+    constructor(opts) {
+        super(opts);
+        this.formatPrompt = openai_format_js_1.formatOpenAILikeMultimodalPrompt;
+        if (!opts.endpoint) {
+            throw new Error("Azure AI Foundry endpoint is required");
+        }
+        try {
+            if (!opts.azureADTokenProvider) {
+                // Using Microsoft Entra ID (Azure AD) for authentication
+                opts.azureADTokenProvider = new identity_1.DefaultAzureCredential();
+            }
+        }
+        catch (error) {
+            this.logger.error("Failed to initialize Azure AD token provider:", error);
+            throw new Error("Failed to initialize Azure AD token provider");
+        }
+        // Initialize AI Projects client which provides access to inference operations
+        this.service = new ai_projects_1.AIProjectClient(opts.endpoint, opts.azureADTokenProvider);
+        if (opts.apiVersion) {
+            this.OPENAI_API_VERSION = opts.apiVersion;
+            this.INFERENCE_API_VERSION = opts.apiVersion;
+            this.logger.info(`[Azure Foundry] Overriding default API version, using API version: ${opts.apiVersion}`);
+        }
+    }
+    /**
+     * Get default authentication for Azure AI Foundry API
+     */
+    getDefaultAIFoundryAuth() {
+        const scope = "https://ai.azure.com/.default";
+        const azureADTokenProvider = (0, identity_1.getBearerTokenProvider)(new identity_1.DefaultAzureCredential(), scope);
+        return azureADTokenProvider;
+    }
+    async isOpenAIDeployment(model) {
+        const { deploymentName } = parseAzureFoundryModelId(model);
+        let deployment = undefined;
+        // First, verify the deployment exists
+        try {
+            deployment = await this.service.deployments.get(deploymentName);
+            this.logger.debug(`[Azure Foundry] Deployment ${deploymentName} found`);
+        }
+        catch (deploymentError) {
+            this.logger.error(`[Azure Foundry] Deployment ${deploymentName} not found:`, deploymentError);
+        }
+        return deployment.modelPublisher == "OpenAI";
+    }
+    canStream(_options) {
+        return Promise.resolve(true);
+    }
+    async requestTextCompletion(prompt, options) {
+        const { deploymentName } = parseAzureFoundryModelId(options.model);
+        const model_options = options.model_options;
+        const isOpenAI = await this.isOpenAIDeployment(options.model);
+        let response;
+        if (isOpenAI) {
+            // Use the Azure OpenAI client for OpenAI models
+            const azureOpenAI = await this.service.inference.azureOpenAI({ apiVersion: this.OPENAI_API_VERSION });
+            const subDriver = new azure_openai_js_1.AzureOpenAIDriver(azureOpenAI);
+            // Use deployment name for API calls
+            const modifiedOptions = { ...options, model: deploymentName };
+            const response = await subDriver.requestTextCompletion(prompt, modifiedOptions);
+            return response;
+        }
+        else {
+            // Use the chat completions client from the inference operations
+            const chatClient = this.service.inference.chatCompletions({ apiVersion: this.INFERENCE_API_VERSION });
+            response = await chatClient.post({
+                body: {
+                    messages: prompt,
+                    max_tokens: model_options?.max_tokens,
+                    model: deploymentName,
+                    stream: true,
+                    temperature: model_options?.temperature,
+                    top_p: model_options?.top_p,
+                    frequency_penalty: model_options?.frequency_penalty,
+                    presence_penalty: model_options?.presence_penalty,
+                    stop: model_options?.stop_sequence,
+                }
+            });
+            if (response.status !== "200") {
+                this.logger.error(`[Azure Foundry] Chat completion request failed:`, response);
+                throw new Error(`Chat completion request failed with status ${response.status}: ${response.body}`);
+            }
+            return this.extractDataFromResponse(response.body);
+        }
+    }
+    async requestTextCompletionStream(prompt, options) {
+        const { deploymentName } = parseAzureFoundryModelId(options.model);
+        const model_options = options.model_options;
+        const isOpenAI = await this.isOpenAIDeployment(options.model);
+        if (isOpenAI) {
+            const azureOpenAI = await this.service.inference.azureOpenAI({ apiVersion: this.OPENAI_API_VERSION });
+            const subDriver = new azure_openai_js_1.AzureOpenAIDriver(azureOpenAI);
+            const modifiedOptions = { ...options, model: deploymentName };
+            const stream = await subDriver.requestTextCompletionStream(prompt, modifiedOptions);
+            return stream;
+        }
+        else {
+            const chatClient = this.service.inference.chatCompletions({ apiVersion: this.INFERENCE_API_VERSION });
+            const response = await chatClient.post({
+                body: {
+                    messages: prompt,
+                    max_tokens: model_options?.max_tokens,
+                    model: deploymentName,
+                    stream: true,
+                    temperature: model_options?.temperature,
+                    top_p: model_options?.top_p,
+                    frequency_penalty: model_options?.frequency_penalty,
+                    presence_penalty: model_options?.presence_penalty,
+                    stop: model_options?.stop_sequence,
+                }
+            }).asNodeStream();
+            // We type assert from NodeJS.ReadableStream to NodeJSReadableStream
+            // The Azure Examples, expect a .destroy() method on the stream
+            const stream = response.body;
+            if (!stream) {
+                throw new Error("The response stream is undefined");
+            }
+            if (response.status !== "200") {
+                stream.destroy();
+                throw new Error(`Failed to get chat completions, http operation failed with ${response.status} code`);
+            }
+            const sseStream = (0, core_sse_1.createSseStream)(stream);
+            return this.processStreamResponse(sseStream);
+        }
+    }
+    async *processStreamResponse(sseStream) {
+        try {
+            for await (const event of sseStream) {
+                if (event.data === "[DONE]") {
+                    break;
+                }
+                try {
+                    const data = JSON.parse(event.data);
+                    if (!data) {
+                        this.logger.warn(`[Azure Foundry] Received empty data in streaming response`);
+                        continue;
+                    }
+                    const choice = data.choices?.[0];
+                    if (!choice) {
+                        continue;
+                    }
+                    const chunk = {
+                        result: choice.delta?.content || "",
+                        finish_reason: this.convertFinishReason(choice.finish_reason),
+                        token_usage: {
+                            prompt: data.usage?.prompt_tokens,
+                            result: data.usage?.completion_tokens,
+                            total: data.usage?.total_tokens,
+                        },
+                    };
+                    yield chunk;
+                }
+                catch (parseError) {
+                    this.logger.warn(`[Azure Foundry] Failed to parse streaming response:`, parseError);
+                    continue;
+                }
+            }
+        }
+        catch (error) {
+            this.logger.error(`[Azure Foundry] Streaming error:`, error);
+            throw error;
+        }
+    }
+    extractDataFromResponse(result) {
+        const tokenInfo = {
+            prompt: result.usage?.prompt_tokens,
+            result: result.usage?.completion_tokens,
+            total: result.usage?.total_tokens,
+        };
+        const choice = result.choices?.[0];
+        if (!choice) {
+            this.logger?.error("[Azure Foundry] No choices in response", result);
+            throw new Error("No choices in response");
+        }
+        const data = choice.message?.content;
+        const toolCalls = choice.message?.tool_calls;
+        if (!data && !toolCalls) {
+            this.logger?.error("[Azure Foundry] Response is not valid", result);
+            throw new Error("Response is not valid: no content or tool calls");
+        }
+        const completion = {
+            result: data,
+            token_usage: tokenInfo,
+            finish_reason: this.convertFinishReason(choice.finish_reason),
+        };
+        if (toolCalls && toolCalls.length > 0) {
+            completion.tool_use = toolCalls.map((call) => ({
+                id: call.id,
+                tool_name: call.function?.name,
+                tool_input: call.function?.arguments ? JSON.parse(call.function.arguments) : {}
+            }));
+        }
+        return completion;
+    }
+    convertFinishReason(reason) {
+        if (!reason)
+            return undefined;
+        // Map Azure AI finish reasons to standard format
+        switch (reason) {
+            case 'stop': return 'stop';
+            case 'length': return 'length';
+            case 'tool_calls': return 'tool_use';
+            default: return reason;
+        }
+    }
+    async validateConnection() {
+        try {
+            // Test the AI Projects client by listing deployments
+            const deploymentsIterable = this.service.deployments.list();
+            let hasDeployments = false;
+            for await (const deployment of deploymentsIterable) {
+                hasDeployments = true;
+                this.logger.debug(`[Azure Foundry] Found deployment: ${deployment.name} (${deployment.type})`);
+                break; // Just check if we can get at least one deployment
+            }
+            if (!hasDeployments) {
+                this.logger.warn("[Azure Foundry] No deployments found in the project");
+            }
+            return true;
+        }
+        catch (error) {
+            this.logger.error("Azure Foundry connection validation failed:", error);
+            return false;
+        }
+    }
+    async generateEmbeddings(options) {
+        if (!options.model) {
+            throw new Error("Default embedding model selection not supported for Azure Foundry. Please specify a model.");
+        }
+        if (options.text) {
+            return this.generateTextEmbeddings(options);
+        }
+        else if (options.image) {
+            return this.generateImageEmbeddings(options);
+        }
+        else {
+            throw new Error("No text or images provided for embeddings");
+        }
+    }
+    async generateTextEmbeddings(options) {
+        if (!options.text) {
+            throw new Error("No text provided for text embeddings");
+        }
+        const { deploymentName } = parseAzureFoundryModelId(options.model || "");
+        let response;
+        try {
+            // Use the embeddings client from the inference operations
+            const embeddingsClient = this.service.inference.embeddings({ apiVersion: this.INFERENCE_API_VERSION });
+            response = await embeddingsClient.post({
+                body: {
+                    input: Array.isArray(options.text) ? options.text : [options.text],
+                    model: deploymentName
+                }
+            });
+        }
+        catch (error) {
+            this.logger.error("Azure Foundry text embeddings error:", error);
+            throw error;
+        }
+        if ((0, ai_inference_1.isUnexpected)(response)) {
+            throw new Error(`Text embeddings request failed: ${response.status} ${response.body?.error?.message || 'Unknown error'}`);
+        }
+        const embeddings = response.body.data?.[0]?.embedding;
+        if (!embeddings || !Array.isArray(embeddings) || embeddings.length === 0) {
+            throw new Error("No valid embedding array found in response");
+        }
+        return {
+            values: embeddings,
+            model: options.model ?? ""
+        };
+    }
+    async generateImageEmbeddings(options) {
+        if (!options.image) {
+            throw new Error("No images provided for image embeddings");
+        }
+        const { deploymentName } = parseAzureFoundryModelId(options.model || "");
+        let response;
+        try {
+            // Use the embeddings client from the inference operations
+            const embeddingsClient = this.service.inference.embeddings({ apiVersion: this.INFERENCE_API_VERSION });
+            response = await embeddingsClient.post({
+                body: {
+                    input: Array.isArray(options.image) ? options.image : [options.image],
+                    model: deploymentName
+                }
+            });
+        }
+        catch (error) {
+            this.logger.error("Azure Foundry image embeddings error:", error);
+            throw error;
+        }
+        if ((0, ai_inference_1.isUnexpected)(response)) {
+            throw new Error(`Image embeddings request failed: ${response.status} ${response.body?.error?.message || 'Unknown error'}`);
+        }
+        const embeddings = response.body.data?.[0]?.embedding;
+        if (!embeddings || !Array.isArray(embeddings) || embeddings.length === 0) {
+            throw new Error("No valid embedding array found in response");
+        }
+        return {
+            values: embeddings,
+            model: options.model ?? ""
+        };
+    }
+    async listModels() {
+        const filter = (m) => {
+            // Only include models that support chat completions
+            return !!m.capabilities.chat_completion;
+        };
+        return this._listModels(filter);
+    }
+    async _listModels(filter) {
+        let deploymentsIterable;
+        try {
+            // List all deployments in the Azure AI Foundry project
+            deploymentsIterable = this.service.deployments.list();
+        }
+        catch (error) {
+            this.logger.error("Failed to list deployments:", error);
+            throw new Error("Failed to list deployments in Azure AI Foundry project");
+        }
+        const deployments = [];
+        for await (const page of deploymentsIterable.byPage()) {
+            for (const deployment of page) {
+                deployments.push(deployment);
+            }
+        }
+        let modelDeployments = deployments.filter((d) => {
+            return d.type === "ModelDeployment";
+        });
+        if (filter) {
+            modelDeployments = modelDeployments.filter(filter);
+        }
+        const aiModels = modelDeployments.map((model) => {
+            // Create composite ID: deployment_name::base_model
+            const compositeId = `${model.name}::${model.modelName}`;
+            const modelCapability = (0, core_1.getModelCapabilities)(model.modelName, core_1.Providers.azure_foundry);
+            return {
+                id: compositeId,
+                name: model.name,
+                description: `${model.modelName} - ${model.modelVersion}`,
+                version: model.modelVersion,
+                provider: this.provider,
+                owner: model.modelPublisher,
+                input_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.input),
+                output_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.output),
+                tool_support: modelCapability.tool_support,
+            };
+        }).sort((modelA, modelB) => modelA.id.localeCompare(modelB.id));
+        return aiModels;
+    }
+}
+exports.AzureFoundryDriver = AzureFoundryDriver;
+// Helper functions to parse the composite ID
+function parseAzureFoundryModelId(compositeId) {
+    const parts = compositeId.split('::');
+    if (parts.length === 2) {
+        return {
+            deploymentName: parts[0],
+            baseModel: parts[1]
+        };
+    }
+    // Backwards compatibility: if no delimiter found, treat as deployment name
+    return {
+        deploymentName: compositeId,
+        baseModel: compositeId
+    };
+}
+function isCompositeModelId(modelId) {
+    return modelId.includes('::');
+}
+//# sourceMappingURL=azure_foundry.js.map

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

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

package/lib/cjs/bedrock/index.js

@@ -38,11 +38,13 @@ function maxTokenFallbackClaude(option) {
         return modelOptions.max_tokens;
     }
     else {
+        const thinking_budget = modelOptions?.thinking_budget_tokens ?? 0;
+        let maxSupportedTokens = (0, core_1.getMaxTokensLimitBedrock)(option.model) ?? 8192; // Should always return a number for claude, 8192 is to satisfy the TypeScript type checker;
         // Fallback to the default max tokens limit for the model
-        if (option.model.includes('claude-3-7-sonnet') && (modelOptions?.thinking_budget_tokens ?? 0) < 64000) {
-            return 64000; // Claude 3.7 can go up to 128k with a beta header, but when no max tokens is specified, we default to 64k.
+        if (option.model.includes('claude-3-7-sonnet') && (modelOptions?.thinking_budget_tokens ?? 0) < 48000) {
+            maxSupportedTokens = 64000; // Claude 3.7 can go up to 128k with a beta header, but when no max tokens is specified, we default to 64k.
         }
-        return (0, core_1.getMaxTokensLimitBedrock)(option.model) ?? 8192; // Should always return a number for claude, 8192 is to satisfy the TypeScript type checker
+        return Math.min(16000 + thinking_budget, maxSupportedTokens); // Cap to 16k, to avoid taking up too much context window and quota.
     }
 }
 class BedrockDriver extends core_1.AbstractDriver {
@@ -82,7 +84,7 @@ class BedrockDriver extends core_1.AbstractDriver {
         }
         return await (0, converse_js_1.formatConversePrompt)(segments, opts);
     }
-    static getExtractedExecution(result, _prompt, options) {
+    getExtractedExecution(result, _prompt, options) {
         let resultText = "";
         let reasoning = "";
         if (result.output?.message?.content) {
@@ -91,9 +93,9 @@ class BedrockDriver extends core_1.AbstractDriver {
                 if (content.text) {
                     resultText += content.text;
                 }
-                // Get reasoning content only if include_thoughts is true
-                if (content.reasoningContent && options) {
-                    const claudeOptions = options.model_options;
+                else if (content.reasoningContent) {
+                    // Get reasoning content only if include_thoughts is true
+                    const claudeOptions = options?.model_options;
                     if (claudeOptions?.include_thoughts) {
                         if (content.reasoningContent.reasoningText) {
                             reasoning += content.reasoningContent.reasoningText.text;
@@ -104,6 +106,14 @@ class BedrockDriver extends core_1.AbstractDriver {
                             reasoning += `[Redacted thinking: ${redactedData}]`;
                         }
                     }
+                    else {
+                        this.logger.info("[Bedrock] Not outputting reasoning content as include_thoughts is false");
+                    }
+                }
+                else {
+                    // Get content block type
+                    const type = Object.keys(content).find(key => key !== '$unknown' && content[key] !== undefined);
+                    this.logger.info("[Bedrock] Unsupported content response type:", type);
                 }
             }
             // Add spacing if we have reasoning content
@@ -123,7 +133,7 @@ class BedrockDriver extends core_1.AbstractDriver {
         return completionResult;
     }
     ;
-    static getExtractedStream(result, _prompt, options) {
+    getExtractedStream(result, _prompt, options) {
         let output = "";
         let reasoning = "";
         let stop_reason = "";
@@ -158,8 +168,15 @@ class BedrockDriver extends core_1.AbstractDriver {
                 else if (delta.reasoningContent.signature) {
                     // Handle signature updates for reasoning content - end of thinking
                     reasoning = "\n\n";
+                    // Putting logging here so it only triggers once.
+                    this.logger.info("[Bedrock] Not outputting reasoning content as include_thoughts is false");
                 }
             }
+            else if (delta) {
+                // Get content block type
+                const type = Object.keys(delta).find(key => key !== '$unknown' && delta[key] !== undefined);
+                this.logger.info("[Bedrock] Unsupported content response type:", type);
+            }
         }
         // Handle content block stop events
         if (result.contentBlockStop) {
@@ -275,25 +292,23 @@ class BedrockDriver extends core_1.AbstractDriver {
             modelId: prompt.modelId,
         });
         let tool_use = undefined;
-        //Get tool requests
-        if (res.stopReason == "tool_use") {
-            tool_use = res.output?.message?.content?.reduce((tools, c) => {
-                if (c.toolUse) {
-                    tools.push({
-                        tool_name: c.toolUse.name ?? "",
-                        tool_input: c.toolUse.input,
-                        id: c.toolUse.toolUseId ?? "",
-                    });
-                }
-                return tools;
-            }, []);
-            //If no tools were used, set to undefined
-            if (tool_use && tool_use.length == 0) {
-                tool_use = undefined;
+        //Get tool requests, we check tool use regardless of finish reason, as you can hit length and still get a valid response.
+        tool_use = res.output?.message?.content?.reduce((tools, c) => {
+            if (c.toolUse) {
+                tools.push({
+                    tool_name: c.toolUse.name ?? "",
+                    tool_input: c.toolUse.input,
+                    id: c.toolUse.toolUseId ?? "",
+                });
             }
+            return tools;
+        }, []);
+        //If no tools were used, set to undefined
+        if (tool_use && tool_use.length == 0) {
+            tool_use = undefined;
         }
         const completion = {
-            ...BedrockDriver.getExtractedExecution(res, prompt, options),
+            ...this.getExtractedExecution(res, prompt, options),
             original_response: options.include_original_response ? res : undefined,
             conversation: conversation,
             tool_use: tool_use,
@@ -311,10 +326,10 @@ class BedrockDriver extends core_1.AbstractDriver {
                 throw new Error("[Bedrock] Stream not found in response");
             }
             return (0, async_1.transformAsyncIterator)(stream, (streamSegment) => {
-                return BedrockDriver.getExtractedStream(streamSegment, prompt, options);
+                return this.getExtractedStream(streamSegment, prompt, options);
             });
         }).catch((err) => {
-            this.logger.error("[Bedrock] Failed to stream", err);
+            this.logger.error("[Bedrock] Failed to stream", { error: err });
             throw err;
         });
     }
@@ -626,7 +641,6 @@ class BedrockDriver extends core_1.AbstractDriver {
                 id: m.modelArn ?? m.modelId,
                 name: `${m.providerName} ${m.modelName}`,
                 provider: this.provider,
-                //description: ``,
                 owner: m.providerName,
                 can_stream: m.responseStreamingSupported ?? false,
                 input_modalities: m.inputModalities ? formatAmazonModalities(m.inputModalities) : (0, core_1.modelModalitiesToArray)(modelCapability.input),
@@ -646,6 +660,7 @@ class BedrockDriver extends core_1.AbstractDriver {
                     id: m.modelArn,
                     name: m.modelName ?? m.modelArn,
                     provider: this.provider,
+                    owner: "custom",
                     description: `Custom model from ${m.baseModelName}`,
                     is_custom: true,
                     input_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.input),
@@ -679,6 +694,7 @@ class BedrockDriver extends core_1.AbstractDriver {
                         id: p.inferenceProfileArn ?? p.inferenceProfileId,
                         name: p.inferenceProfileName ?? p.inferenceProfileArn,
                         provider: this.provider,
+                        owner: providerName,
                         input_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.input),
                         output_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.output),
                         tool_support: modelCapability.tool_support,