wirejs-deploy-amplify-basic 0.1.163-llm → 0.1.165

package/amplify-backend-assets/api/handler.ts

@@ -51,6 +51,10 @@ function createContext(event: APIGatewayProxyEventV2) {
 					description: 'HTTP origin (base address) for machines outside your network to use. Only populated for `npm run start:public`, and only accessible in environments that support NAT-PMP.',
 					value: location.origin
 				}),
+				new SystemAttribute('wirejs', 'aws-region', {
+					description: 'AWS region where the application is deployed.',
+					value: env.AWS_REGION || 'unknown'
+				}),
 			]
 		});
 	} catch {

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

@@ -3,6 +3,6 @@
 	"dependencies": {
 		"jsdom": "^25.0.1",
 		"wirejs-dom": "^1.0.44",
-		"wirejs-resources": "^0.1.163-llm"
+		"wirejs-resources": "^0.1.165"
 	}
 }

package/build.js

@@ -103,64 +103,6 @@ async function discoverResources() {
 	);
 }
 
-// /**
-//  * 
-//  * @returns {string[]}
-//  */
-// function discoverApiDeps() {
-// 	return execSync(`npm ls --omit=dev --all --parseable -w ./api`)
-// 		.toString()
-// 		.split('\n')
-// 		.map(line => line.trim())
-// 		.filter(line => line.includes('node_modules'));
-// }
-
-// async function installApiDeps() {
-// 	console.log("adding deps to package.json");
-// 	// add deps used by Amplify to deploy backend
-// 	const packageData = JSON.parse(
-// 		await fs.promises.readFile(path.join(LAMBDA_BUILD_DIR, 'package.json'))
-// 	);
-// 	packageData.dependencies = {
-// 		'jose': '^6.1.0',
-// 		...(packageData.dependencies || {}),
-// 		'wirejs-resources': `file:${SELF_DIR}`
-// 	};
-// 	await fs.promises.writeFile(
-// 		path.join(LAMBDA_BUILD_DIR, 'package.json'),
-// 		JSON.stringify(packageData, null, 2)
-// 	);
-
-// 	console.log("installing all deps")
-
-// 	// install all
-// 	execSync('npm i');
-
-// 	console.log("done installing deps");
-// }
-
-// /**
-//  * 
-//  * @param {string[]} deps 
-//  */
-// async function prepareApiLambda(deps) {
-// 	await copy
-// 		(path.join(CWD, 'api', 'dist'),
-// 		path.join(LAMBDA_BUILD_DIR, 'dist')
-// 	);
-// 	await copy(
-// 		path.join(CWD, 'api', 'dist', 'package.json'),
-// 		path.join(LAMBDA_BUILD_DIR, 'dist', 'package.json')
-// 	);
-
-// 	buildSync({
-// 		entryPoints: path.join(LAMBDA_BUILD_DIR, 'handler.ts'),
-// 		bundle: true,
-// 		packages: 'external',
-// 		outfile: 'handler.js',
-// 	});
-// }
-
 async function deployFrontend() {
 	console.log("copying frontend assets");
 	await copy(PROJECT_DIST_DIR, STATIC_DIR);

package/dist/services/llm.d.ts

@@ -9,6 +9,8 @@ export declare class LLM extends BaseLLM {
     });
     private createBedrockInstructionMessage;
     private convertToBedrockFormat;
+    private getModelAliases;
+    private getRegionalPrefix;
     private getModelId;
     private invokeBedrock;
     private streamBedrock;

package/dist/services/llm.js

@@ -1,6 +1,7 @@
 import { LLM as BaseLLM } from 'wirejs-resources';
 import { BedrockRuntimeClient, ConverseCommand, ConverseStreamCommand, } from '@aws-sdk/client-bedrock-runtime';
 import { defaultProvider } from '@aws-sdk/credential-provider-node';
+import { env } from 'process';
 export class LLM extends BaseLLM {
     bedrockClient;
     constructor(scope, id, options) {
@@ -53,19 +54,60 @@ export class LLM extends BaseLLM {
             }
         });
     }
-    getModelId(model) {
-        // small set of convenience identifier aliases. maybe worth breaking out into
-        // a larger, shared, canonical JSON later?
-        const modelMap = {
-            'claude': 'anthropic.claude-3-haiku-20240307-v1:0',
-            'claude-haiku': 'anthropic.claude-3-haiku-20240307-v1:0',
-            'claude-sonnet': 'anthropic.claude-3-sonnet-20240229-v1:0',
-            'claude-opus': 'anthropic.claude-3-opus-20240229-v1:0',
-            'llama2': 'meta.llama2-70b-chat-v1',
-            'llama3': 'meta.llama3-70b-instruct-v1:0',
-            'llama3.2': 'meta.llama3-2-90b-instruct-v1:0'
+    getModelAliases() {
+        return {
+            // Anthropic Claude
+            'anthropic.claude-3-5-sonnet-20241022-v2:0': ['claude', 'claude-3.5-sonnet'],
+            'anthropic.claude-3-sonnet-20240229-v1:0': ['claude-3-sonnet'],
+            'anthropic.claude-3-5-haiku-20241022-v1:0': ['claude-3.5-haiku'],
+            'anthropic.claude-3-haiku-20240307-v1:0': ['claude-3-haiku'],
+            'anthropic.claude-3-opus-20240229-v1:0': ['claude-3-opus'],
+            // Meta Llama
+            'meta.llama3-2-90b-instruct-v1:0': ['llama3.2'],
+            'meta.llama3-2-8b-instruct-v1:0': ['llama3.2-8b'],
+            'meta.llama3-1-405b-instruct-v1:0': ['llama3.1'],
+            'meta.llama3-70b-instruct-v1:0': ['llama3'],
+            // Mistral
+            'mistral.mistral-large-2407-v1:0': ['mistral-large', 'mistral'],
+            'mistral.mistral-7b-instruct-v0:2': ['mistral-7b'],
+            // Amazon Nova (newer)
+            'amazon.nova-pro-v1:0': ['nova-pro'],
+            'amazon.nova-lite-v1:0': ['nova-lite'],
+            'amazon.nova-micro-v1:0': ['nova-micro']
         };
-        return modelMap[model] || model;
+    }
+    getRegionalPrefix() {
+        const region = env.AWS_REGION || 'us-east-1';
+        if (region.startsWith('us-')) {
+            return 'us';
+        }
+        else if (region.startsWith('eu-')) {
+            return 'eu';
+        }
+        else if (region.startsWith('ap-')) {
+            return 'ap';
+        }
+        else if (region.startsWith('ca-')) {
+            return 'us'; // Canada uses US prefix
+        }
+        else if (region.startsWith('sa-')) {
+            return 'us'; // South America uses US prefix
+        }
+        // Default to US for unknown regions
+        return 'us';
+    }
+    getModelId(model) {
+        const normalized = model.trim().toLowerCase();
+        const modelAliases = this.getModelAliases();
+        for (const [canonicalModelId, aliases] of Object.entries(modelAliases)) {
+            if (normalized === canonicalModelId || aliases.includes(normalized)) {
+                const regionalPrefix = this.getRegionalPrefix();
+                return `${regionalPrefix}.${canonicalModelId}`;
+            }
+        }
+        // For unknown models, still apply regional prefix if it looks like a standard model ID
+        const regionalPrefix = this.getRegionalPrefix();
+        return `${regionalPrefix}.${model}`;
     }
     async invokeBedrock(modelId, systemPrompt, messages, stream, tools, abortSignal) {
         const toolConfig = tools && tools.length > 0 ? {
@@ -237,15 +279,16 @@ export class LLM extends BaseLLM {
     async continueConversation({ history, onChunk, timeoutSeconds, systemPrompt, models, tools, }) {
         const controller = new AbortController();
         let timeoutId;
+        const intendedModels = models ?? this.models;
         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 models ?? this.models) {
+            // models are expected to be given in priority order.
+            // first one that doesn't throw a fit wins.
+            for (const model of intendedModels) {
                 try {
                     const result = await this.invokeModel(model, (systemPrompt ?? this.systemPrompt) ?? '', history, onChunk, controller.signal, tools ?? this.tools);
                     if (!result)
@@ -279,13 +322,14 @@ export class LLM extends BaseLLM {
         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` +
+        const message = this.createBedrockInstructionMessage(`None of the attempted models are suitable for this request. ` +
+            `Review CloudWatch logs to see the reason why. If necessary:\n\n` +
             `1. Go to AWS Bedrock Console (https://console.aws.amazon.com/bedrock/)\n` +
             `2. Navigate to "Model access"\n` +
-            `3. Request access to the model\n` +
-            `4. Accept the End User License Agreement (EULA)\n\n` +
-            `Available models attempted: ${this.models.join(', ')}\n`);
+            `3. Request access to and accept the model's End User License Agreement (EULA)\n\n` +
+            `Models attempted: ${intendedModels.join(', ')}\n\n` +
+            `Note: The following friendly aliases are available:\n` +
+            `${Object.entries(this.getModelAliases()).map(([name, aliases]) => `${name}: ${aliases.join(', ')}`).join('\n')}`);
         if (onChunk) {
             try {
                 await onChunk({

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "wirejs-deploy-amplify-basic",
-	"version": "0.1.163-llm",
+	"version": "0.1.165",
 	"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.44",
-		"wirejs-resources": "^0.1.163-llm"
+		"wirejs-resources": "^0.1.165"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",