wirejs-deploy-amplify-basic 0.1.137-llm → 0.1.139-llm

package/amplify-hosting-assets/compute/default/package.json

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.137-llm"
+		"wirejs-resources": "^0.1.139-llm"
 	}
 }

package/dist/services/llm.js

@@ -1,5 +1,5 @@
 import { LLM as BaseLLM } from 'wirejs-resources';
-import { BedrockRuntimeClient, InvokeModelCommand, InvokeModelWithResponseStreamCommand } from '@aws-sdk/client-bedrock-runtime';
+import { BedrockRuntimeClient, ConverseCommand, ConverseStreamCommand, } from '@aws-sdk/client-bedrock-runtime';
 import { defaultProvider } from '@aws-sdk/credential-provider-node';
 export class LLM extends BaseLLM {
     bedrockClient;
@@ -19,7 +19,9 @@ export class LLM extends BaseLLM {
     convertToBedrockFormat(messages) {
         return messages.map(msg => ({
             role: msg.role === 'user' ? 'user' : 'assistant',
-            content: msg.content
+            content: [{
+                    text: msg.content
+                }]
         }));
     }
     getModelId(model) {
@@ -36,54 +38,49 @@ export class LLM extends BaseLLM {
         return modelMap[model] || model;
     }
     async invokeBedrock(modelId, messages, stream) {
-        const body = JSON.stringify({
-            anthropic_version: "bedrock-2023-05-31",
-            max_tokens: 10000,
-            messages: this.convertToBedrockFormat(messages)
-        });
         if (stream) {
-            const command = new InvokeModelWithResponseStreamCommand({
+            const command = new ConverseStreamCommand({
                 modelId,
-                body,
-                contentType: 'application/json',
-                accept: 'application/json'
+                messages: this.convertToBedrockFormat(messages),
+                inferenceConfig: {
+                    maxTokens: 10000
+                }
             });
             return await this.bedrockClient.send(command);
         }
         else {
-            const command = new InvokeModelCommand({
+            const command = new ConverseCommand({
                 modelId,
-                body,
-                contentType: 'application/json',
-                accept: 'application/json'
+                messages: this.convertToBedrockFormat(messages),
+                inferenceConfig: {
+                    maxTokens: 10000
+                }
             });
             return await this.bedrockClient.send(command);
         }
     }
     async streamBedrock(response, onChunk) {
+        if (!response.stream)
+            return null;
         let content = '';
-        if (response.body) {
-            for await (const chunk of response.body) {
-                if (chunk.chunk?.bytes) {
-                    const data = JSON.parse(new TextDecoder().decode(chunk.chunk.bytes));
-                    if (data.delta?.text) {
-                        content += data.delta.text;
-                        const llmChunk = {
-                            created_at: new Date().toISOString(),
-                            message: {
-                                role: 'assistant',
-                                content: data.delta.text
-                            },
-                            done: false
-                        };
-                        if (onChunk) {
-                            try {
-                                await onChunk(llmChunk);
-                            }
-                            catch (error) {
-                                console.error(error);
-                            }
-                        }
+        for await (const chunk of response.stream) {
+            const chunkText = chunk.contentBlockDelta?.delta?.text;
+            if (chunkText) {
+                content += chunkText;
+                const llmChunk = {
+                    created_at: new Date().toISOString(),
+                    message: {
+                        role: 'assistant',
+                        content: chunkText
+                    },
+                    done: false
+                };
+                if (onChunk) {
+                    try {
+                        await onChunk(llmChunk);
+                    }
+                    catch (error) {
+                        console.error(error);
                     }
                 }
             }
@@ -128,7 +125,9 @@ export class LLM extends BaseLLM {
         // throw a fit wins.
         for (const model of this.models) {
             try {
-                return await this.invokeModel(model, history, onChunk);
+                const result = await this.invokeModel(model, history, onChunk);
+                if (!result)
+                    throw new Error("No response from model.");
             }
             catch (error) {
                 console.log(error);

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.137-llm",
+	"version": "0.1.139-llm",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -44,7 +44,7 @@
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
 		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.137-llm"
+		"wirejs-resources": "^0.1.139-llm"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",