wirejs-deploy-amplify-basic 0.1.162-llm → 0.1.164

package/amplify-backend-assets/backend.ts

@@ -1,3 +1,4 @@
+import fs from 'fs';
 import path from 'path';
 import { randomUUID } from 'crypto';
 import {
@@ -14,7 +15,7 @@ import { Bucket, BlockPublicAccess } from 'aws-cdk-lib/aws-s3';
 import { Table, AttributeType, BillingMode } from 'aws-cdk-lib/aws-dynamodb';
 import { AnyPrincipal, PolicyStatement } from 'aws-cdk-lib/aws-iam';
 
-import { TableDefinition, indexName } from 'wirejs-resources';
+import { TableDefinition, indexName, DeploymentConfig } from 'wirejs-resources';
 import { TableIndexes } from './constructs/table-indexes';
 import { RealtimeService } from './constructs/realtime-service';
 import { auth } from './auth/resource';
@@ -22,13 +23,14 @@ import { auth } from './auth/resource';
 // @ts-ignore
 import generatedResources from './generated-resources';
 import { copyFileSync } from 'fs';
-import { cwd } from 'process';
+import { config, cwd } from 'process';
 
 const __filename = import.meta.url.replace(/^file:/, '');
 const __dirname = path.dirname(__filename);
 
 const generated: any[] = generatedResources;
 
+const CONFIG_PATH = path.join(cwd(), 'deployment-config.ts');
 const APP_ID = process.env.AWS_APP_ID ?? process.env.PWD?.replace(/[^a-zA-Z0-9-_]/g, '_');
 const BRANCH_ID = process.env.AWS_BRANCH ?? process.env.USER ?? 'anonymous';
 const TABLE_NAME_PREFIX = `${APP_ID}-${BRANCH_ID}-`;
@@ -49,19 +51,31 @@ copyFileSync(
   path.join(cwd(), 'api', 'wirejs-handler.ts')
 );
 
+let cfg: DeploymentConfig = {};
+if (fs.existsSync(CONFIG_PATH)) {
+  cfg = (await import(CONFIG_PATH)).default as DeploymentConfig;
+  console.log("\nDeployment config found: ", JSON.stringify(cfg), "\n");
+} else {
+  console.log('\nNo deployment config found. Using defaults.\n')
+}
+
 const api = new NodejsFunction(backend.stack, 'ApiHandler', {
-  runtime: Runtime.NODEJS_22_X,
-  memorySize: 2 * 1024,
+  runtime: {
+    20: Runtime.NODEJS_20_X,
+    22: Runtime.NODEJS_22_X,
+    24: Runtime.NODEJS_24_X,
+  }[cfg.runtimeNodeVersion ?? 24],
+  memorySize: cfg.runtimeDesiredMemoryMB ?? 2 * 1024,
   handler: 'handler',
   entry: path.join(cwd(), 'api', 'wirejs-handler.ts'),
   bundling: {
-    nodeModules: ['jsdom'],
-    format: OutputFormat.CJS,
-    minify: false,
-    sourceMap: true,
+    nodeModules: cfg.bundleNodeModules ?? ['jsdom'],
+    format: cfg.bundleFormat === 'esm' ? OutputFormat.ESM : OutputFormat.CJS,
+    minify: Boolean(cfg.bundleMinify),
+
   },
   depsLockFilePath: path.join(cwd(), 'package-lock.json'),
-  timeout: Duration.minutes(15)
+  timeout: Duration.seconds(cfg.runtimeTimeoutSeconds ?? 15 * 60),
 });
 
 /**

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.162-llm"
+		"wirejs-resources": "^0.1.164"
 	}
 }

package/dist/services/llm.d.ts

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

package/dist/services/llm.js

@@ -53,19 +53,37 @@ 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;
+    }
+    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)) {
+                return canonicalModelId;
+            }
+        }
+        return model;
     }
     async invokeBedrock(modelId, systemPrompt, messages, stream, tools, abortSignal) {
         const toolConfig = tools && tools.length > 0 ? {
@@ -237,15 +255,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 +298,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.162-llm",
+	"version": "0.1.164",
 	"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.162-llm"
+		"wirejs-resources": "^0.1.164"
 	},
 	"devDependencies": {
 		"@aws-amplify/backend": "^1.14.0",