@llumiverse/drivers 0.17.0 → 0.19.0

package/README.md

@@ -297,4 +297,4 @@ Please see [CONTRIBUTING.md](https://github.com/vertesia/llumiverse/blob/main/CO
 
 ## License
 
-Llumivers is licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Feel free to use it accordingly.
+Llumiverse is licensed under the [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0). Feel free to use it accordingly.

package/lib/cjs/bedrock/converse.js

@@ -3,9 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.converseConcatMessages = converseConcatMessages;
 exports.converseSystemToMessages = converseSystemToMessages;
 exports.converseRemoveJSONprefill = converseRemoveJSONprefill;
-exports.fortmatConversePrompt = fortmatConversePrompt;
+exports.converseJSONprefill = converseJSONprefill;
+exports.formatConversePrompt = formatConversePrompt;
 const core_1 = require("@llumiverse/core");
 const client_bedrock_runtime_1 = require("@aws-sdk/client-bedrock-runtime");
+const s3_js_1 = require("./s3.js");
 function getJSONSafetyNotice(schema) {
     return "The answer must be a JSON object using the following JSON Schema:\n" + JSON.stringify(schema, undefined, 2);
 }
@@ -72,15 +74,40 @@ function converseRemoveJSONprefill(messages) {
     }
     return messages ?? [];
 }
-async function fortmatConversePrompt(segments, schema) {
+function converseJSONprefill(messages) {
+    if (!messages) {
+        messages = [];
+    }
+    //prefill the json
+    messages.push({
+        content: [{ text: "```json" }],
+        role: client_bedrock_runtime_1.ConversationRole.ASSISTANT,
+    });
+    return messages;
+}
+async function formatConversePrompt(segments, schema) {
     //Non-const for concat
     let system = [];
     const safety = [];
     let messages = [];
     for (const segment of segments) {
         const parts = [];
+        //Tool response
+        if (segment.role === core_1.PromptRole.tool) {
+            parts.push({
+                content: [{
+                        toolResult: {
+                            toolUseId: segment.tool_use_id,
+                            content: [{ text: segment.content }],
+                        }
+                    }],
+                role: client_bedrock_runtime_1.ConversationRole.USER,
+            });
+            messages = messages.concat(parts);
+            continue;
+        }
         //File segments
-        if (segment.files)
+        if (segment.files) {
             for (const f of segment.files) {
                 const source = await f.getStream();
                 let content;
@@ -110,14 +137,41 @@ async function fortmatConversePrompt(segments, schema) {
                     //Video file - "mov | mkv | mp4 | webm | flv | mpeg | mpg | wmv | three_gp"
                 }
                 else if (f.mime_type && f.mime_type.startsWith("video")) {
-                    content = [
-                        {
-                            video: {
-                                format: mimeToVideoType(f.mime_type),
-                                source: { bytes: await readStreamAsUint8Array(source) },
+                    let url_string = (await f.getURL()).toLowerCase();
+                    let url_format = new URL(url_string);
+                    if (url_format.hostname.endsWith("amazonaws.com") &&
+                        (url_format.hostname.startsWith("s3.") || url_format.hostname.includes(".s3."))) {
+                        //Convert to s3:// format
+                        const parsedUrl = (0, s3_js_1.parseS3UrlToUri)(new URL(url_string));
+                        url_string = parsedUrl;
+                        url_format = new URL(parsedUrl);
+                    }
+                    if (url_format.protocol === "s3:") {
+                        //Use S3 bucket if available
+                        content = [
+                            {
+                                video: {
+                                    format: mimeToVideoType(f.mime_type),
+                                    source: {
+                                        s3Location: {
+                                            uri: url_string, //S3 URL
+                                            //bucketOwner:  We don't have this additional information.
+                                        }
+                                    },
+                                },
                             },
-                        },
-                    ];
+                        ];
+                    }
+                    else {
+                        content = [
+                            {
+                                video: {
+                                    format: mimeToVideoType(f.mime_type),
+                                    source: { bytes: await readStreamAsUint8Array(source) },
+                                },
+                            },
+                        ];
+                    }
                     //Fallback, send string
                 }
                 else {
@@ -128,6 +182,7 @@ async function fortmatConversePrompt(segments, schema) {
                     role: roleConversion(segment.role),
                 });
             }
+        }
         //Text segments
         if (segment.content) {
             parts.push({
@@ -161,11 +216,6 @@ async function fortmatConversePrompt(segments, schema) {
     if (schema) {
         safety.push({ text: "IMPORTANT: " + getJSONSafetyNotice(schema) });
         system = system.concat(safety);
-        //prefill the json
-        messages.push({
-            content: [{ text: "```json" }],
-            role: client_bedrock_runtime_1.ConversationRole.ASSISTANT,
-        });
     }
     messages = converseConcatMessages(messages);
     return {

package/lib/cjs/bedrock/converse.js.map

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

package/lib/cjs/bedrock/index.js

@@ -66,9 +66,9 @@ class BedrockDriver extends core_1.AbstractDriver {
         if (opts.model.includes("canvas")) {
             return await (0, formatters_1.formatNovaPrompt)(segments, opts.result_schema);
         }
-        return await (0, converse_js_1.fortmatConversePrompt)(segments, opts.result_schema);
+        return await (0, converse_js_1.formatConversePrompt)(segments, opts.result_schema);
     }
-    static getExtractedExecuton(result, _prompt) {
+    static getExtractedExecution(result, _prompt) {
         return {
             result: result.output?.message?.content?.map(c => c.text).join("\n") ?? "",
             token_usage: {
@@ -105,14 +105,39 @@ class BedrockDriver extends core_1.AbstractDriver {
     }
     ;
     async requestTextCompletion(prompt, options) {
-        const payload = this.preparePayload(prompt, options);
+        let conversation = updateConversation(options.conversation, prompt);
+        const payload = this.preparePayload(conversation, options);
         const executor = this.getExecutor();
         const res = await executor.converse({
             ...payload,
         });
+        conversation = updateConversation(conversation, {
+            messages: [res.output?.message ?? { content: [{ text: "" }], role: "assistant" }],
+            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;
+            }
+        }
         const completion = {
-            ...BedrockDriver.getExtractedExecuton(res, prompt),
+            ...BedrockDriver.getExtractedExecution(res, prompt),
             original_response: options.include_original_response ? res : undefined,
+            conversation: conversation,
+            tool_use: tool_use,
         };
         return completion;
     }
@@ -213,29 +238,32 @@ class BedrockDriver extends core_1.AbstractDriver {
         });
     }
     preparePayload(prompt, options) {
-        const model_options = options.model_options;
+        const model_options = options.model_options ?? { _option_id: "text-fallback" };
         let additionalField = {};
         if (options.model.includes("amazon")) {
+            if (options.result_schema) {
+                prompt.messages = (0, converse_js_1.converseJSONprefill)(prompt.messages);
+            }
             //Titan models also exists but does not support any additional options
             if (options.model.includes("nova")) {
-                additionalField = { inferenceConfig: { topK: model_options?.top_k } };
+                additionalField = { inferenceConfig: { topK: model_options.top_k } };
             }
         }
         else if (options.model.includes("claude")) {
+            if (options.result_schema) {
+                prompt.messages = (0, converse_js_1.converseJSONprefill)(prompt.messages);
+            }
             if (options.model.includes("claude-3-7")) {
                 const thinking_options = options.model_options;
-                const thinking = thinking_options?.thinking_mode ?? false;
-                if (!model_options?.max_tokens) {
-                    model_options.max_tokens = thinking ? 128000 : 8192;
-                }
+                const thinking = thinking_options.thinking_mode ?? false;
                 additionalField = {
-                    top_k: model_options?.top_k,
+                    ...additionalField,
                     reasoning_config: {
                         type: thinking ? "enabled" : "disabled",
-                        budget_tokens: thinking_options?.thinking_budget_tokens,
+                        budget_tokens: thinking_options.thinking_budget_tokens,
                     }
                 };
-                if (thinking && (thinking_options?.thinking_budget_tokens ?? 0) > 64000) {
+                if (thinking && (thinking_options.thinking_budget_tokens ?? 0) > 64000) {
                     additionalField = {
                         ...additionalField,
                         anthorpic_beta: ["output-128k-2025-02-19"]
@@ -243,51 +271,40 @@ class BedrockDriver extends core_1.AbstractDriver {
                 }
             }
             //Needs max_tokens to be set
-            if (!model_options?.max_tokens) {
-                if (options.model.includes("claude-3-5")) {
-                    model_options.max_tokens = 8192;
-                    //Bug with AWS Converse Sonnet 3.5, does not effect Haiku.
-                    //See https://github.com/boto/boto3/issues/4279
-                    if (options.model.includes("claude-3-5-sonnet")) {
-                        model_options.max_tokens = 4096;
-                    }
-                }
-                else {
-                    model_options.max_tokens = 4096;
-                }
+            if (!model_options.max_tokens) {
+                model_options.max_tokens = (0, core_1.getMaxTokensLimit)(options.model, model_options);
             }
-            additionalField = { top_k: model_options?.top_k };
+            additionalField = { ...additionalField, top_k: model_options.top_k };
         }
         else if (options.model.includes("meta")) {
-            //If last message is "```json", remove it. Model requires the final message to be a user message
-            prompt.messages = (0, converse_js_1.converseRemoveJSONprefill)(prompt.messages);
+            //LLaMA models support no additional options
         }
         else if (options.model.includes("mistral")) {
             //7B instruct and 8x7B instruct
             if (options.model.includes("7b")) {
-                additionalField = { top_k: model_options?.top_k };
+                additionalField = { top_k: model_options.top_k };
                 //Does not support system messages
                 if (prompt.system && prompt.system?.length != 0) {
                     prompt.messages?.push((0, converse_js_1.converseSystemToMessages)(prompt.system));
                     prompt.system = undefined;
                     prompt.messages = (0, converse_js_1.converseConcatMessages)(prompt.messages);
                 }
+                if (options.result_schema) {
+                    prompt.messages = (0, converse_js_1.converseJSONprefill)(prompt.messages);
+                }
             }
             else {
                 //Other models such as Mistral Small,Large and Large 2
                 //Support no additional fields.
-                prompt.messages = (0, converse_js_1.converseRemoveJSONprefill)(prompt.messages);
             }
         }
         else if (options.model.includes("ai21")) {
-            //If last message is "```json", remove it. Model requires the final message to be a user message
-            prompt.messages = (0, converse_js_1.converseRemoveJSONprefill)(prompt.messages);
             //Jamba models support no additional options
             //Jurassic 2 models do.
             if (options.model.includes("j2")) {
                 additionalField = {
-                    presencePenalty: { scale: model_options?.presence_penalty },
-                    frequencyPenalty: { scale: model_options?.frequency_penalty },
+                    presencePenalty: { scale: model_options.presence_penalty },
+                    frequencyPenalty: { scale: model_options.frequency_penalty },
                 };
                 //Does not support system messages
                 if (prompt.system && prompt.system?.length != 0) {
@@ -299,19 +316,17 @@ class BedrockDriver extends core_1.AbstractDriver {
         }
         else if (options.model.includes("cohere.command")) {
             // If last message is "```json", remove it.
-            // Model requires the final message to be a user message or does not support assistant messages
-            prompt.messages = (0, converse_js_1.converseRemoveJSONprefill)(prompt.messages);
             //Command R and R plus
             if (options.model.includes("cohere.command-r")) {
                 additionalField = {
-                    k: model_options?.top_k,
-                    frequency_penalty: model_options?.frequency_penalty,
-                    presence_penalty: model_options?.presence_penalty,
+                    k: model_options.top_k,
+                    frequency_penalty: model_options.frequency_penalty,
+                    presence_penalty: model_options.presence_penalty,
                 };
             }
             else {
                 // Command non-R
-                additionalField = { k: model_options?.top_k };
+                additionalField = { k: model_options.top_k };
                 //Does not support system messages
                 if (prompt.system && prompt.system?.length != 0) {
                     prompt.messages?.push((0, converse_js_1.converseSystemToMessages)(prompt.system));
@@ -320,10 +335,22 @@ class BedrockDriver extends core_1.AbstractDriver {
                 }
             }
         }
+        else if (options.model.includes("palmyra")) {
+            const palmyraOptions = options.model_options;
+            additionalField = {
+                seed: palmyraOptions?.seed,
+                presence_penalty: palmyraOptions?.presence_penalty,
+                frequency_penalty: palmyraOptions?.frequency_penalty,
+                min_tokens: palmyraOptions?.min_tokens,
+            };
+        }
+        else if (options.model.includes("deepseek")) {
+            //DeepSeek models support no additional options
+        }
         //If last message is "```json", add corresponding ``` as a stop sequence.
         if (prompt.messages && prompt.messages.length > 0) {
             if (prompt.messages[prompt.messages.length - 1].content?.[0].text === "```json") {
-                let stopSeq = model_options?.stop_sequence;
+                let stopSeq = model_options.stop_sequence;
                 if (!stopSeq) {
                     model_options.stop_sequence = ["```"];
                 }
@@ -333,20 +360,28 @@ class BedrockDriver extends core_1.AbstractDriver {
                 }
             }
         }
-        return {
+        const tool_defs = getToolDefinitions(options.tools);
+        const request = {
             messages: prompt.messages,
             system: prompt.system,
             modelId: options.model,
             inferenceConfig: {
-                maxTokens: model_options?.max_tokens,
-                temperature: model_options?.temperature,
-                topP: model_options?.top_p,
-                stopSequences: model_options?.stop_sequence,
+                maxTokens: model_options.max_tokens,
+                temperature: model_options.temperature,
+                topP: model_options.top_p,
+                stopSequences: model_options.stop_sequence,
             },
             additionalModelRequestFields: {
                 ...additionalField,
-            },
+            }
         };
+        //Only add tools if they are defined
+        if (tool_defs) {
+            request.toolConfig = {
+                tools: tool_defs,
+            };
+        }
+        return request;
     }
     async requestImageGeneration(prompt, options) {
         if (options.output_modality !== core_1.Modalities.image) {
@@ -450,7 +485,7 @@ class BedrockDriver extends core_1.AbstractDriver {
     }
     async _listModels(foundationFilter) {
         const service = this.getService();
-        const [foundationals, customs, inferenceProfiles] = await Promise.all([
+        const [foundationModelsList, customModelsList, inferenceProfilesList] = await Promise.all([
             service.listFoundationModels({}).catch(() => {
                 this.logger.warn("[Bedrock] Can't list foundation models. Check if the user has the right permissions.");
                 return undefined;
@@ -464,68 +499,114 @@ class BedrockDriver extends core_1.AbstractDriver {
                 return undefined;
             }),
         ]);
-        if (!foundationals?.modelSummaries) {
+        if (!foundationModelsList?.modelSummaries) {
             throw new Error("Foundation models not found");
         }
-        let fmodels = foundationals.modelSummaries || [];
+        let foundationModels = foundationModelsList.modelSummaries || [];
         if (foundationFilter) {
-            fmodels = fmodels.filter(foundationFilter);
+            foundationModels = foundationModels.filter(foundationFilter);
         }
-        const supportedProviders = ["amazon", "anthropic", "cohere", "ai21", "mistral", "meta", "deepseek"];
-        fmodels = fmodels.filter((m) => {
-            supportedProviders.some((provider) => {
-                m.providerName?.includes(provider) ?? false;
-            });
-        });
-        const aimodels = fmodels.map((m) => {
+        const supportedPublishers = ["amazon", "anthropic", "cohere", "ai21", "mistral", "meta", "deepseek", "writer"];
+        const unsupportedModelsByPublisher = {
+            amazon: ["titan-image-generator", "nova-reel", "nova-sonic", "rerank"],
+            anthropic: [],
+            cohere: ["rerank"],
+            ai21: [],
+            mistral: [],
+            meta: [],
+            deepseek: [],
+            writer: [],
+        };
+        // Helper function to check if model should be filtered out
+        const shouldIncludeModel = (modelId, providerName) => {
+            if (!modelId || !providerName)
+                return false;
+            const normalizedProvider = providerName.toLowerCase();
+            // Check if provider is supported
+            const isProviderSupported = supportedPublishers.some(provider => normalizedProvider.includes(provider));
+            if (!isProviderSupported)
+                return false;
+            // Check if model is in the unsupported list for its provider
+            for (const provider of supportedPublishers) {
+                if (normalizedProvider.includes(provider)) {
+                    const unsupportedModels = unsupportedModelsByPublisher[provider] || [];
+                    return !unsupportedModels.some(unsupported => modelId.toLowerCase().includes(unsupported));
+                }
+            }
+            return true;
+        };
+        foundationModels = foundationModels.filter(m => shouldIncludeModel(m.modelId, m.providerName));
+        const aiModels = foundationModels.map((m) => {
             if (!m.modelId) {
                 throw new Error("modelId not found");
             }
+            const modelCapability = (0, core_1.getModelCapabilities)(m.modelArn ?? m.modelId, this.provider);
             const model = {
                 id: m.modelArn ?? m.modelId,
                 name: `${m.providerName} ${m.modelName}`,
                 provider: this.provider,
-                input_modalities: m.inputModalities ?? [],
                 //description: ``,
                 owner: m.providerName,
                 can_stream: m.responseStreamingSupported ?? false,
-                is_multimodal: m.inputModalities?.includes("IMAGE") ?? false,
-                tags: m.outputModalities ?? [],
+                input_modalities: m.inputModalities ? formatAmazonModalities(m.inputModalities) : (0, core_1.modelModalitiesToArray)(modelCapability.input),
+                output_modalities: m.outputModalities ? formatAmazonModalities(m.outputModalities) : (0, core_1.modelModalitiesToArray)(modelCapability.input),
+                tool_support: modelCapability.tool_support,
             };
             return model;
         });
         //add custom models
-        if (customs?.modelSummaries) {
-            customs.modelSummaries.forEach((m) => {
+        if (customModelsList?.modelSummaries) {
+            customModelsList.modelSummaries.forEach((m) => {
                 if (!m.modelArn) {
                     throw new Error("Model ID not found");
                 }
+                const modelCapability = (0, core_1.getModelCapabilities)(m.modelArn, this.provider);
                 const model = {
                     id: m.modelArn,
                     name: m.modelName ?? m.modelArn,
                     provider: this.provider,
                     description: `Custom model from ${m.baseModelName}`,
                     is_custom: true,
+                    input_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.input),
+                    output_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.output),
+                    tool_support: modelCapability.tool_support,
                 };
-                aimodels.push(model);
+                aiModels.push(model);
                 this.validateConnection;
             });
         }
         //add inference profiles
-        if (inferenceProfiles?.inferenceProfileSummaries) {
-            inferenceProfiles.inferenceProfileSummaries.forEach((p) => {
+        if (inferenceProfilesList?.inferenceProfileSummaries) {
+            inferenceProfilesList.inferenceProfileSummaries.forEach((p) => {
                 if (!p.inferenceProfileArn) {
                     throw new Error("Profile ARN not found");
                 }
-                const model = {
-                    id: p.inferenceProfileArn ?? p.inferenceProfileId,
-                    name: p.inferenceProfileName ?? p.inferenceProfileArn,
-                    provider: this.provider,
-                };
-                aimodels.push(model);
+                // Apply the same filtering logic to inference profiles based on their name
+                const profileId = p.inferenceProfileId || "";
+                const profileName = p.inferenceProfileName || "";
+                // Extract provider name from profile name or ID
+                let providerName = "";
+                for (const provider of supportedPublishers) {
+                    if (profileName.toLowerCase().includes(provider) || profileId.toLowerCase().includes(provider)) {
+                        providerName = provider;
+                        break;
+                    }
+                }
+                const modelCapability = (0, core_1.getModelCapabilities)(p.inferenceProfileArn ?? p.inferenceProfileId, this.provider);
+                if (providerName && shouldIncludeModel(profileId, providerName)) {
+                    const model = {
+                        id: p.inferenceProfileArn ?? p.inferenceProfileId,
+                        name: p.inferenceProfileName ?? p.inferenceProfileArn,
+                        provider: this.provider,
+                        input_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.input),
+                        output_modalities: (0, core_1.modelModalitiesToArray)(modelCapability.output),
+                        tool_support: modelCapability.tool_support,
+                    };
+                    aiModels.push(model);
+                }
             });
         }
-        return aimodels;
+        return aiModels;
     }
     async generateEmbeddings({ text, image, model }) {
         this.logger.info("[Bedrock] Generating embeddings with model " + model);
@@ -581,4 +662,57 @@ function jobInfo(job, jobId) {
         details
     };
 }
+function getToolDefinitions(tools) {
+    return tools ? tools.map(getToolDefinition) : undefined;
+}
+function getToolDefinition(tool) {
+    return {
+        toolSpec: {
+            name: tool.name,
+            description: tool.description,
+            inputSchema: {
+                json: tool.input_schema,
+            }
+        }
+    };
+}
+/**
+ * Update the conversation messages
+ * @param prompt
+ * @param response
+ * @returns
+ */
+function updateConversation(conversation, prompt) {
+    return {
+        ...conversation,
+        ...prompt,
+        messages: [...(conversation?.messages || []), ...(prompt.messages || [])],
+        system: prompt.system || conversation?.system,
+    };
+}
+function formatAmazonModalities(modalities) {
+    const standardizedModalities = [];
+    for (const modality of modalities) {
+        if (modality === client_bedrock_1.ModelModality.TEXT) {
+            standardizedModalities.push("text");
+        }
+        else if (modality === client_bedrock_1.ModelModality.IMAGE) {
+            standardizedModalities.push("image");
+        }
+        else if (modality === client_bedrock_1.ModelModality.EMBEDDING) {
+            standardizedModalities.push("embedding");
+        }
+        else if (modality == "SPEECH") {
+            standardizedModalities.push("audio");
+        }
+        else if (modality == "VIDEO") {
+            standardizedModalities.push("video");
+        }
+        else {
+            // Handle other modalities as needed
+            standardizedModalities.push(modality.toString().toLowerCase());
+        }
+    }
+    return standardizedModalities;
+}
 //# sourceMappingURL=index.js.map