@aws-amplify/data-schema 1.9.0 → 1.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aws-amplify/data-schema",
-  "version": "1.9.0",
+  "version": "1.9.2",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",

package/src/SchemaProcessor.ts

@@ -510,6 +510,16 @@ function customOperationToGql(
     const { aiModel, systemPrompt, inferenceConfiguration } =
       typeDef.data.input;
 
+    // This is done to escape newlines in potentially multi-line system prompts
+    // e.g.
+    // generateStuff: a.generation({
+    //   aiModel: a.ai.model('Claude 3 Haiku'),
+    //   systemPrompt: `Generate a haiku
+    //   make it multiline`,
+    // }),
+    //
+    // It doesn't affect non multi-line string inputs for system prompts
+    const escapedSystemPrompt = systemPrompt.replace(/\r?\n/g, '\\n');
     const inferenceConfigurationEntries = Object.entries(
       inferenceConfiguration ?? {},
     );
@@ -519,7 +529,7 @@ function customOperationToGql(
             .map(([key, value]) => `${key}: ${value}`)
             .join(', ')} }`
         : '';
-    gqlHandlerContent += `@generation(aiModel: "${aiModel.resourcePath}", systemPrompt: "${systemPrompt}"${inferenceConfigurationGql}) `;
+    gqlHandlerContent += `@generation(aiModel: "${aiModel.resourcePath}", systemPrompt: "${escapedSystemPrompt}"${inferenceConfigurationGql}) `;
   }
 
   const gqlField = `${callSignature}: ${returnTypeName} ${gqlHandlerContent}${authString}`;
@@ -1432,7 +1442,9 @@ const schemaPreprocessor = (
         }
       } else if (isConversationRoute(typeDef)) {
         // TODO: add inferenceConfiguration values to directive.
-        customMutations.push(createConversationField(typeDef, typeName));
+        const { field, functionHandler } = createConversationField(typeDef, typeName);
+        customMutations.push(field);
+        Object.assign(lambdaFunctions, functionHandler);
         shouldAddConversationTypes = true;
       }
     } else if (staticSchema) {

package/src/ai/ConversationSchemaTypes.ts

@@ -1,3 +1,4 @@
+import { LambdaFunctionDefinition } from '@aws-amplify/data-schema-types';
 import { InternalRef } from '../RefType';
 import { capitalize } from '../runtime/utils';
 import type {
@@ -8,20 +9,28 @@ import type {
 export const createConversationField = (
   typeDef: InternalConversationType,
   typeName: string,
-): string => {
+): { field: string, functionHandler: LambdaFunctionDefinition } => {
   const { aiModel, systemPrompt, handler, tools } = typeDef;
 
   const args: Record<string, string> = {
     aiModel: aiModel.resourcePath,
-    systemPrompt,
+    // This is done to escape newlines in potentially multi-line system prompts
+    // e.g.
+    // realtorChat: a.conversation({
+    //   aiModel: a.ai.model('Claude 3 Haiku'),
+    //   systemPrompt: `You are a helpful real estate assistant
+    //   Respond in the poetic form of haiku.`,
+    // }),
+    //
+    // It doesn't affect non multi-line string inputs for system prompts
+    systemPrompt: systemPrompt.replace(/\r?\n/g, '\\n'),
   };
 
+  const functionHandler: LambdaFunctionDefinition = {};
   if (handler) {
-    if (typeof handler === 'string') {
-      args['functionName'] = handler;
-    } else if (typeof handler.getInstance === 'function') {
-      args['functionName'] = `Fn${capitalize(typeName)}`;
-    }
+    const functionName = `Fn${capitalize(typeName)}`;
+    args['functionName'] = functionName;
+    functionHandler[functionName] = handler;
   }
 
   const argsString = Object.entries(args)
@@ -34,7 +43,8 @@ export const createConversationField = (
 
   const conversationDirective = `@conversation(${argsString}${toolsString})`;
 
-  return `${typeName}(conversationId: ID!, content: [ContentBlockInput], aiContext: AWSJSON, toolConfiguration: ToolConfigurationInput): ConversationMessage ${conversationDirective} @aws_cognito_user_pools`;
+  const field = `${typeName}(conversationId: ID!, content: [ContentBlockInput], aiContext: AWSJSON, toolConfiguration: ToolConfigurationInput): ConversationMessage ${conversationDirective} @aws_cognito_user_pools`;
+  return { field, functionHandler };
 };
 
 const isRef = (query: unknown): query is { data: InternalRef['data'] } =>

package/src/ai/ConversationType.ts

@@ -125,7 +125,7 @@ export interface ConversationInput {
   systemPrompt: string;
   inferenceConfiguration?: InferenceConfiguration;
   tools?: ToolDefinition[];
-  handler?: DefineFunction | string;
+  handler?: DefineFunction;
 }
 
 export interface InternalConversationType