Use AiModel from data-schema-types as possible input (aws-amplify#2133)

vigy02 · Oct 21, 2024 · 0d6489d · 0d6489d
1 parent 5f46d8d
commit 0d6489d
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 29 deletions.
diff --git a/.changeset/happy-jokes-double.md b/.changeset/happy-jokes-double.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-data': patch
+---
+
+Update data-schema-types
diff --git a/.changeset/tough-taxis-tan.md b/.changeset/tough-taxis-tan.md
@@ -0,0 +1,5 @@
+---
+'@aws-amplify/backend-ai': patch
+---
+
+Use AiModel from data-schema-types as possible input
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/backend-ai/API.md b/packages/backend-ai/API.md
@@ -4,6 +4,7 @@
 
 ```ts
 
+import { AiModel } from '@aws-amplify/data-schema-types';
 import { ConstructFactory } from '@aws-amplify/plugin-types';
 import { ConversationTurnEventVersion } from '@aws-amplify/ai-constructs/conversation';
 import { FunctionResources } from '@aws-amplify/plugin-types';
@@ -49,9 +50,7 @@ type DefineConversationHandlerFunctionProps = {
     name: string;
     entry?: string;
     models: Array<{
-        modelId: string | {
-            resourcePath: string;
-        };
+        modelId: string | AiModel;
         region?: string;
     }>;
 };

diff --git a/packages/backend-ai/package.json b/packages/backend-ai/package.json
@@ -25,6 +25,7 @@
     "@aws-amplify/ai-constructs": "^0.6.0",
     "@aws-amplify/backend-output-schemas": "^1.3.0",
     "@aws-amplify/backend-output-storage": "^1.0.2",
+    "@aws-amplify/data-schema-types": "^1.2.0",
     "@aws-amplify/platform-core": "^1.1.0",
     "@aws-amplify/plugin-types": "^1.0.1"
   },

diff --git a/packages/backend-ai/src/conversation/factory.ts b/packages/backend-ai/src/conversation/factory.ts
@@ -15,6 +15,7 @@ import {
 } from '@aws-amplify/ai-constructs/conversation';
 import path from 'path';
 import { CallerDirectoryExtractor } from '@aws-amplify/platform-core';
+import { AiModel } from '@aws-amplify/data-schema-types';
 
 class ConversationHandlerFunctionGenerator
   implements ConstructContainerEntryGenerator
@@ -115,12 +116,7 @@ export type DefineConversationHandlerFunctionProps = {
   name: string;
   entry?: string;
   models: Array<{
-    modelId:
-      | string
-      | {
-          // This is to match return of 'a.ai.model.anthropic.claude3Haiku()'
-          resourcePath: string;
-        };
+    modelId: string | AiModel;
     region?: string;
   }>;
 };

diff --git a/packages/backend-data/package.json b/packages/backend-data/package.json
@@ -32,6 +32,6 @@
     "@aws-amplify/backend-output-schemas": "^1.1.0",
     "@aws-amplify/data-construct": "^1.10.1",
     "@aws-amplify/plugin-types": "^1.2.2",
-    "@aws-amplify/data-schema-types": "^1.1.1"
+    "@aws-amplify/data-schema-types": "^1.2.0"
   }
 }