wirejs-deploy-amplify-basic 0.1.146-llm → 0.1.148-llm

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

@@ -2,7 +2,7 @@
 	"type": "module",
 	"dependencies": {
 		"jsdom": "^25.0.1",
-		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.146-llm"
+		"wirejs-dom": "^1.0.44",
+		"wirejs-resources": "^0.1.148-llm"
 	}
 }

package/dist/services/llm.d.ts

@@ -1,4 +1,4 @@
-import { LLM as BaseLLM, LLMMessage, LLMChunk, Resource } from 'wirejs-resources';
+import { LLM as BaseLLM, LLMMessage, ContinueConversationOptions, Resource } from 'wirejs-resources';
 export declare class LLM extends BaseLLM {
     private bedrockClient;
     constructor(scope: Resource | string, id: string, options: {
@@ -11,5 +11,5 @@ export declare class LLM extends BaseLLM {
     private invokeBedrock;
     private streamBedrock;
     private invokeModel;
-    continueConversation(history: LLMMessage[], onChunk?: (chunk: LLMChunk) => void | Promise<void>): Promise<LLMMessage>;
+    continueConversation({ history, onChunk, timeoutSeconds, systemPrompt, }: ContinueConversationOptions): Promise<LLMMessage>;
 }

package/dist/services/llm.js

@@ -39,33 +39,37 @@ export class LLM extends BaseLLM {
         };
         return modelMap[model] || model;
     }
-    async invokeBedrock(modelId, messages, stream) {
+    async invokeBedrock(modelId, systemPrompt, messages, stream, abortSignal) {
         if (stream) {
             const command = new ConverseStreamCommand({
                 modelId,
                 messages: this.convertToBedrockFormat(messages),
-                system: this.systemPrompt ? [{
-                        text: this.systemPrompt
+                system: systemPrompt ? [{
+                        text: systemPrompt
                     }] : undefined
             });
-            return await this.bedrockClient.send(command);
+            return await this.bedrockClient.send(command, { abortSignal });
         }
         else {
             const command = new ConverseCommand({
                 modelId,
                 messages: this.convertToBedrockFormat(messages),
-                system: this.systemPrompt ? [{
-                        text: this.systemPrompt
+                system: systemPrompt ? [{
+                        text: systemPrompt
                     }] : undefined
             });
-            return await this.bedrockClient.send(command);
+            return await this.bedrockClient.send(command, { abortSignal });
         }
     }
-    async streamBedrock(response, onChunk) {
+    async streamBedrock(response, onChunk, abortSignal) {
         if (!response.stream)
             return null;
         let content = '';
         for await (const chunk of response.stream) {
+            // Check if request was aborted
+            if (abortSignal?.aborted) {
+                throw new Error('Request was cancelled');
+            }
             const chunkText = chunk.contentBlockDelta?.delta?.text;
             if (chunkText) {
                 content += chunkText;
@@ -92,16 +96,16 @@ export class LLM extends BaseLLM {
             content
         };
     }
-    async invokeModel(model, history, onChunk, maxRetries = 10) {
+    async invokeModel(model, systemPrompt, history, onChunk, abortSignal, maxRetries = 10) {
         const stream = typeof onChunk === 'function';
         for (let i = 0; i < maxRetries; i++) {
             try {
                 const modelId = this.getModelId(model);
                 if (modelId !== model)
                     console.log(`Mapped ${model} to ${modelId}`);
-                const response = await this.invokeBedrock(modelId, history, stream);
+                const response = await this.invokeBedrock(modelId, systemPrompt, history, stream, abortSignal);
                 if (stream) {
-                    return this.streamBedrock(response, onChunk);
+                    return this.streamBedrock(response, onChunk, abortSignal);
                 }
                 else {
                     const data = JSON.parse(new TextDecoder().decode(response.body));
@@ -112,6 +116,9 @@ export class LLM extends BaseLLM {
                 }
             }
             catch (error) {
+                if (error.name === 'AbortError') {
+                    throw new Error('Request was cancelled');
+                }
                 if (error.name === 'ThrottlingException') {
                     console.warn(`ThrottlingException encountered for model ${model}. Retrying...`);
                     await new Promise(resolve => setTimeout(resolve, i * 1000 + Math.random() * 1000));
@@ -124,27 +131,51 @@ export class LLM extends BaseLLM {
         }
         throw new Error("Exceeded max retries trying to invoke " + model);
     }
-    async continueConversation(history, onChunk) {
-        // models are expected to be given in priority order. first one that doesn't
-        // throw a fit wins.
-        for (const model of this.models) {
-            try {
-                const result = await this.invokeModel(model, history, onChunk);
-                if (!result)
-                    throw new Error("No response from model.");
-                return result;
-            }
-            catch (error) {
-                console.log(`Attempt failed with model: ${model}`);
-                console.error(error);
-                if (error.name === 'ValidationException' && error.message?.includes('model')) {
-                    continue;
+    async continueConversation({ history, onChunk, timeoutSeconds, systemPrompt, }) {
+        const controller = new AbortController();
+        let timeoutId;
+        if (timeoutSeconds) {
+            timeoutId = setTimeout(() => {
+                controller.abort();
+            }, timeoutSeconds * 1000);
+        }
+        try {
+            // models are expected to be given in priority order. first one that doesn't
+            // throw a fit wins.
+            for (const model of this.models) {
+                try {
+                    const result = await this.invokeModel(model, (systemPrompt ?? this.systemPrompt) ?? '', history, onChunk, controller.signal);
+                    if (!result)
+                        throw new Error("No response from model.");
+                    if (timeoutId) {
+                        clearTimeout(timeoutId);
+                    }
+                    return result;
                 }
-                if (error.name === 'AccessDeniedException') {
-                    continue;
+                catch (error) {
+                    if (error.name === 'AbortError' || error.message?.includes('cancelled')) {
+                        throw new Error(`Request timed out after ${timeoutSeconds} seconds`);
+                    }
+                    console.log(`Attempt failed with model: ${model}`);
+                    console.error(error);
+                    if (error.name === 'ValidationException' && error.message?.includes('model')) {
+                        continue;
+                    }
+                    if (error.name === 'AccessDeniedException') {
+                        continue;
+                    }
                 }
             }
         }
+        catch (error) {
+            if (timeoutId) {
+                clearTimeout(timeoutId);
+            }
+            throw error;
+        }
+        if (timeoutId) {
+            clearTimeout(timeoutId);
+        }
         const message = this.createBedrockInstructionMessage(`None of the attempted models are not available in your AWS account. ` +
             `Please enable it in the AWS Bedrock console:\n\n` +
             `1. Go to AWS Bedrock Console (https://console.aws.amazon.com/bedrock/)\n` +

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.146-llm",
+	"version": "0.1.148-llm",
 	"type": "module",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",
@@ -43,8 +43,8 @@
 		"jsdom": "^25.0.0",
 		"recursive-copy": "^2.0.14",
 		"rimraf": "^6.0.1",
-		"wirejs-dom": "^1.0.42",
-		"wirejs-resources": "^0.1.146-llm"
+		"wirejs-dom": "^1.0.44",
+		"wirejs-resources": "^0.1.148-llm"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",