bedrock-wrapper 2.2.0 → 2.3.0

package/test-models.js

@@ -1,145 +1,145 @@
-// ================================================================================
-// == AWS Bedrock Example: Invoke a Model with a Streamed or Unstreamed Response ==
-// ================================================================================
-
-// ---------------------------------------------------------------------
-// -- import environment variables from .env file or define them here --
-// ---------------------------------------------------------------------
-import dotenv from 'dotenv';
-import fs from 'fs/promises';
-import chalk from 'chalk';
-
-dotenv.config();
-
-const AWS_REGION = process.env.AWS_REGION;
-const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
-const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
-const LLM_MAX_GEN_TOKENS = parseInt(process.env.LLM_MAX_GEN_TOKENS);
-const LLM_TEMPERATURE = parseFloat(process.env.LLM_TEMPERATURE);
-const LLM_TOP_P = parseFloat(process.env.LLM_TOP_P);
-
-// --------------------------------------------
-// -- import functions from bedrock-wrapper   --
-// --     - bedrockWrapper                 --
-// --     - listBedrockWrapperSupportedModels --
-// --------------------------------------------
-import {
-    bedrockWrapper,
-    listBedrockWrapperSupportedModels
-} from "./bedrock-wrapper.js";
-
-async function logOutput(message, type = 'info', writeToFile = true ) {
-    if (writeToFile) {
-        // Log to file
-        await fs.appendFile('test-models-output.txt', message + '\n');
-    }
-    
-    // Log to console with colors
-    switch(type) {
-        case 'success':
-            console.log(chalk.green('✓ ' + message));
-            break;
-        case 'error':
-            console.log(chalk.red('✗ ' + message));
-            break;
-        case 'info':
-            console.log(chalk.blue('ℹ ' + message));
-            break;
-        case 'running':
-            console.log(chalk.yellow(message));
-            break;
-    }
-}
-
-async function testModel(model, awsCreds, testMessage, isStreaming) {
-    const messages = [{ role: "user", content: testMessage }];
-    const openaiChatCompletionsCreateObject = {
-        messages,
-        model,
-        max_tokens: LLM_MAX_GEN_TOKENS,
-        stream: isStreaming,
-        temperature: LLM_TEMPERATURE,
-        top_p: LLM_TOP_P,
-    };
-
-    let completeResponse = "";
-    
-    try {
-        if (isStreaming) {
-            for await (const chunk of bedrockWrapper(awsCreds, openaiChatCompletionsCreateObject, { logging: false })) {
-                completeResponse += chunk;
-            }
-        } else {
-            const response = await bedrockWrapper(awsCreds, openaiChatCompletionsCreateObject, { logging: false });
-            for await (const data of response) {
-                completeResponse += data;
-            }
-        }
-
-        // Check if response is empty or undefined
-        if (!completeResponse || completeResponse.trim() === '' || completeResponse.trim() === 'undefined') {
-            throw new Error('Empty or invalid response received');
-        }
-
-        return { success: true, response: completeResponse.trim() };
-    } catch (error) {
-        return { success: false, error: error.message };
-    }
-}
-
-async function main() {
-    const testMessage = "Respond with exactly one word: What is 1+1?";
-    
-    // Clear output file and add header
-    await fs.writeFile('test-models-output.txt', 
-        `Test Question: "${testMessage}"\n` +
-        `=`.repeat(50) + '\n\n'
-    );
-
-    const supportedModels = await listBedrockWrapperSupportedModels();
-    const availableModels = supportedModels.map(model => {
-        const fixedJson = model
-            .replace(/modelName": ([^,]+),/, 'modelName": "$1",')
-            .replace(/modelId": ([^}]+)}/, 'modelId": "$1"}');
-        return JSON.parse(fixedJson).modelName;
-    });
-
-    console.clear();
-    await logOutput(`Starting tests with ${availableModels.length} models...`, 'info');
-    await logOutput(`Each model will be tested with streaming and non-streaming calls\n`, 'info');
-
-    const awsCreds = {
-        region: AWS_REGION,
-        accessKeyId: AWS_ACCESS_KEY_ID,
-        secretAccessKey: AWS_SECRET_ACCESS_KEY,
-    };
-
-    for (const model of availableModels) {
-        await logOutput(`\n${'-'.repeat(50)}\nTesting ${model} ⇢`, 'running');
-
-        // Test streaming
-        const streamResult = await testModel(model, awsCreds, testMessage, true);
-        if (streamResult.success) {
-            await logOutput(`Streaming test passed for ${model}: "${streamResult.response}"`, 'success');
-        } else {
-            await logOutput(`Streaming test failed for ${model}: ${streamResult.error}`, 'error');
-        }
-
-        // Test non-streaming
-        const nonStreamResult = await testModel(model, awsCreds, testMessage, false);
-        if (nonStreamResult.success) {
-            await logOutput(`Non-streaming test passed for ${model}: "${nonStreamResult.response}"`, 'success');
-        } else {
-            await logOutput(`Non-streaming test failed for ${model}: ${nonStreamResult.error}`, 'error');
-        }
-        
-        console.log(''); // Add blank line between models
-    }
-
-    await logOutput('Testing complete! Check test-models-output.txt for full test results.', 'info', false);
-}
-
-main().catch(async (error) => {
-    await logOutput(`Fatal Error: ${error.message}`, 'error');
-    console.error(error);
-});
+// ================================================================================
+// == AWS Bedrock Example: Invoke a Model with a Streamed or Unstreamed Response ==
+// ================================================================================
+
+// ---------------------------------------------------------------------
+// -- import environment variables from .env file or define them here --
+// ---------------------------------------------------------------------
+import dotenv from 'dotenv';
+import fs from 'fs/promises';
+import chalk from 'chalk';
+
+dotenv.config();
+
+const AWS_REGION = process.env.AWS_REGION;
+const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
+const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
+const LLM_MAX_GEN_TOKENS = parseInt(process.env.LLM_MAX_GEN_TOKENS);
+const LLM_TEMPERATURE = parseFloat(process.env.LLM_TEMPERATURE);
+const LLM_TOP_P = parseFloat(process.env.LLM_TOP_P);
+
+// --------------------------------------------
+// -- import functions from bedrock-wrapper   --
+// --     - bedrockWrapper                 --
+// --     - listBedrockWrapperSupportedModels --
+// --------------------------------------------
+import {
+    bedrockWrapper,
+    listBedrockWrapperSupportedModels
+} from "./bedrock-wrapper.js";
+
+async function logOutput(message, type = 'info', writeToFile = true ) {
+    if (writeToFile) {
+        // Log to file
+        await fs.appendFile('test-models-output.txt', message + '\n');
+    }
+    
+    // Log to console with colors
+    switch(type) {
+        case 'success':
+            console.log(chalk.green('✓ ' + message));
+            break;
+        case 'error':
+            console.log(chalk.red('✗ ' + message));
+            break;
+        case 'info':
+            console.log(chalk.blue('ℹ ' + message));
+            break;
+        case 'running':
+            console.log(chalk.yellow(message));
+            break;
+    }
+}
+
+async function testModel(model, awsCreds, testMessage, isStreaming) {
+    const messages = [{ role: "user", content: testMessage }];
+    const openaiChatCompletionsCreateObject = {
+        messages,
+        model,
+        max_tokens: LLM_MAX_GEN_TOKENS,
+        stream: isStreaming,
+        temperature: LLM_TEMPERATURE,
+        top_p: LLM_TOP_P,
+    };
+
+    let completeResponse = "";
+    
+    try {
+        if (isStreaming) {
+            for await (const chunk of bedrockWrapper(awsCreds, openaiChatCompletionsCreateObject, { logging: true })) {
+                completeResponse += chunk;
+            }
+        } else {
+            const response = await bedrockWrapper(awsCreds, openaiChatCompletionsCreateObject, { logging: true });
+            for await (const data of response) {
+                completeResponse += data;
+            }
+        }
+
+        // Check if response is empty or undefined
+        if (!completeResponse || completeResponse.trim() === '' || completeResponse.trim() === 'undefined') {
+            throw new Error('Empty or invalid response received');
+        }
+
+        return { success: true, response: completeResponse.trim() };
+    } catch (error) {
+        return { success: false, error: error.message };
+    }
+}
+
+async function main() {
+    const testMessage = "Respond with exactly one word: What is 1+1?";
+    
+    // Clear output file and add header
+    await fs.writeFile('test-models-output.txt', 
+        `Test Question: "${testMessage}"\n` +
+        `=`.repeat(50) + '\n\n'
+    );
+
+    const supportedModels = await listBedrockWrapperSupportedModels();
+    const availableModels = supportedModels.map(model => {
+        const fixedJson = model
+            .replace(/modelName": ([^,]+),/, 'modelName": "$1",')
+            .replace(/modelId": ([^}]+)}/, 'modelId": "$1"}');
+        return JSON.parse(fixedJson).modelName;
+    });
+
+    console.clear();
+    await logOutput(`Starting tests with ${availableModels.length} models...`, 'info');
+    await logOutput(`Each model will be tested with streaming and non-streaming calls\n`, 'info');
+
+    const awsCreds = {
+        region: AWS_REGION,
+        accessKeyId: AWS_ACCESS_KEY_ID,
+        secretAccessKey: AWS_SECRET_ACCESS_KEY,
+    };
+
+    for (const model of availableModels) {
+        await logOutput(`\n${'-'.repeat(50)}\nTesting ${model} ⇢`, 'running');
+
+        // Test streaming
+        const streamResult = await testModel(model, awsCreds, testMessage, true);
+        if (streamResult.success) {
+            await logOutput(`Streaming test passed for ${model}: "${streamResult.response}"`, 'success');
+        } else {
+            await logOutput(`Streaming test failed for ${model}: ${streamResult.error}`, 'error');
+        }
+
+        // Test non-streaming
+        const nonStreamResult = await testModel(model, awsCreds, testMessage, false);
+        if (nonStreamResult.success) {
+            await logOutput(`Non-streaming test passed for ${model}: "${nonStreamResult.response}"`, 'success');
+        } else {
+            await logOutput(`Non-streaming test failed for ${model}: ${nonStreamResult.error}`, 'error');
+        }
+        
+        console.log(''); // Add blank line between models
+    }
+
+    await logOutput('Testing complete! Check test-models-output.txt for full test results.', 'info', false);
+}
+
+main().catch(async (error) => {
+    await logOutput(`Fatal Error: ${error.message}`, 'error');
+    console.error(error);
+});

package/test-vision.js

@@ -0,0 +1,71 @@
+import { bedrockWrapper } from "./bedrock-wrapper.js";
+import dotenv from 'dotenv';
+import fs from 'fs/promises';
+
+dotenv.config();
+
+const awsCreds = {
+    region: process.env.AWS_REGION,
+    accessKeyId: process.env.AWS_ACCESS_KEY_ID,
+    secretAccessKey: process.env.AWS_SECRET_ACCESS_KEY,
+};
+
+async function testVisionCapabilities() {
+    // Read and convert image to base64
+    const imageBuffer = await fs.readFile('./test-image.jpg');
+    const base64Image = imageBuffer.toString('base64');
+
+    const messages = [
+        {
+            role: "user",
+            content: [
+                {
+                    type: "text",
+                    text: "What's in this image? Please describe it in detail."
+                },
+                {
+                    type: "image_url",
+                    image_url: {
+                        url: `data:image/jpeg;base64,${base64Image}`
+                        // url: "https://github.com/jparkerweb/ref/blob/main/equill-labs/bedrock-proxy-endpoint/bedrock-proxy-endpoint.png?raw=true"
+                    }
+                }
+            ]
+        }
+    ];
+
+    // Test with both Claude and Llama models that support vision
+    const visionModels = ["Claude-3-5-Sonnet-v2", "Claude-3-7-Sonnet"];
+
+    for (const model of visionModels) {
+        console.log(`\nTesting vision capabilities with ${model}...`);
+        
+        const openaiChatCompletionsCreateObject = {
+            messages,
+            model,
+            max_tokens: 1000,
+            stream: true,
+            temperature: 0.7
+        };
+
+        try {
+            console.log(`\nSending request to ${model} with format:`, 
+                JSON.stringify(openaiChatCompletionsCreateObject, null, 2));
+            
+            let response = "";
+            for await (const chunk of bedrockWrapper(awsCreds, openaiChatCompletionsCreateObject, { logging: true })) {
+                response += chunk;
+                process.stdout.write(chunk);
+            }
+            console.log("\n-------------------");
+        } catch (error) {
+            console.error(`Error with ${model}:`, error);
+            // Log the full error details
+            if (error.response) {
+                console.error('Response error:', error.response);
+            }
+        }
+    }
+}
+
+testVisionCapabilities().catch(console.error); 

package/utils.js

@@ -1,28 +1,28 @@
-// **********************
-// ** HELPER FUNCTIONS **
-// **********************
-
-
-// ----------------------------------------------------
-// -- get a value from an object using a path string --
-// ----------------------------------------------------
-export function getValueByPath(obj, path) {
-    // Split the path into an array of keys
-    let keys = path.replace(/\[(\w+)\]/g, '.$1').split('.');  // Convert indexes into properties
-    // Reduce the keys array to the final value
-    return keys.reduce((acc, key) => acc && acc[key], obj);
-}
-
-
-// --------------------------
-// -- write ascii art logo --
-// --------------------------
-export async function writeAsciiArt() {
-    console.log(`
-     ___         _                 _     _ _ _                               
-    | . > ___  _| | _ _  ___  ___ | |__ | | | | _ _  ___  ___  ___  ___  _ _ 
-    | . \\/ ._>/ . || '_>/ . \\/ | '| / / | | | || '_><_> || . \\| . \\/ ._>| '_>
-    |___/\\___.\\___||_|  \\___/\\_|_.|_\\_\\ |__/_/ |_|  <___||  _/|  _/\\___.|_|  
-                                                         |_|  |_|            
-    `);
+// **********************
+// ** HELPER FUNCTIONS **
+// **********************
+
+
+// ----------------------------------------------------
+// -- get a value from an object using a path string --
+// ----------------------------------------------------
+export function getValueByPath(obj, path) {
+    // Split the path into an array of keys
+    let keys = path.replace(/\[(\w+)\]/g, '.$1').split('.');  // Convert indexes into properties
+    // Reduce the keys array to the final value
+    return keys.reduce((acc, key) => acc && acc[key], obj);
+}
+
+
+// --------------------------
+// -- write ascii art logo --
+// --------------------------
+export async function writeAsciiArt() {
+    console.log(`
+     ___         _                 _     _ _ _                               
+    | . > ___  _| | _ _  ___  ___ | |__ | | | | _ _  ___  ___  ___  ___  _ _ 
+    | . \\/ ._>/ . || '_>/ . \\/ | '| / / | | | || '_><_> || . \\| . \\/ ._>| '_>
+    |___/\\___.\\___||_|  \\___/\\_|_.|_\\_\\ |__/_/ |_|  <___||  _/|  _/\\___.|_|  
+                                                         |_|  |_|            
+    `);
 }