Merge pull request #908 from aws-amplify/main

chore(release): merge main to release

Author: tejas2008

packages/amplify-codegen-e2e-tests/src/gen2-codegen-tests-base/commands.ts

@@ -103,8 +103,6 @@ export const sandboxDeploy = async (cwd: string, props: Gen2DeployProps = {}): P
     spawn(ampxCli, ['sandbox'], commandOptions)
       .wait('Watching for file changes...')
       .sendCtrlC()
-      .wait('Would you like to delete all the resources in your sandbox environment')
-      .sendLine('N')
       .runAsync();
 };
 

packages/appsync-modelgen-plugin/src/__tests__/visitors/__snapshots__/appsync-model-introspection-visitor.test.ts.snap

@@ -182,7 +182,7 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
                         \\"role\\": {
                             \\"name\\": \\"role\\",
                             \\"type\\": {
-                                \\"enum\\": \\"ConversationParticipantRole\\"
+                                \\"enum\\": \\"AmplifyAIConversationParticipantRole\\"
                             },
                             \\"attributes\\": [],
                             \\"isArray\\": false,
@@ -191,7 +191,7 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
                         \\"content\\": {
                             \\"name\\": \\"content\\",
                             \\"type\\": {
-                                \\"nonModel\\": \\"ContentBlock\\"
+                                \\"nonModel\\": \\"AmplifyAIContentBlock\\"
                             },
                             \\"attributes\\": [],
                             \\"isArray\\": true,
@@ -207,7 +207,7 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
                         \\"toolConfiguration\\": {
                             \\"name\\": \\"toolConfiguration\\",
                             \\"type\\": {
-                                \\"nonModel\\": \\"ToolConfiguration\\"
+                                \\"nonModel\\": \\"AmplifyAIToolConfiguration\\"
                             },
                             \\"attributes\\": [],
                             \\"isArray\\": true,
@@ -270,7 +270,7 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
             \\"nonModels\\": {},
             \\"enums\\": {
                 \\"ConversationParticipantRole\\": {
-                    \\"name\\": \\"ConversationParticipantRole\\",
+                    \\"name\\": \\"AmplifyAIConversationParticipantRole\\",
                     \\"values\\": [
                         \\"user\\",
                         \\"assistant\\"
@@ -326,7 +326,7 @@ exports[`Conversation Route Introspection Visitor Metadata snapshot should gener
                     \\"isRequired\\": false,
                     \\"name\\": \\"onCreateAssistantResponsePirateChat\\",
                     \\"type\\": {
-                        \\"nonModel\\": \\"ConversationMessageStreamPart\\"
+                        \\"nonModel\\": \\"AmplifyAIConversationMessageStreamPart\\"
                     },
                     \\"arguments\\": {
                         \\"conversationId\\": {

packages/appsync-modelgen-plugin/src/utils/process-conversation.ts

@@ -26,7 +26,7 @@ export function processConversationRoute(
     nonModels: {},
     enums: {
       ConversationParticipantRole: {
-        name: 'ConversationParticipantRole',
+        name: 'AmplifyAIConversationParticipantRole',
         values: ['user', 'assistant'],
       }
     },
@@ -91,10 +91,10 @@ function generateConversationMessageModel(conversationModelName: string, modelNa
       id: generateField('id', 'ID', { isRequired: true }),
       conversationId: generateField('conversationId', 'ID', { isRequired: true }),
       conversation: generateConversationField(conversationModelName),
-      role: generateField('role', { enum: 'ConversationParticipantRole' }),
-      content: generateField('content', { nonModel: 'ContentBlock' }, { isArray: true }),
+      role: generateField('role', { enum: 'AmplifyAIConversationParticipantRole' }),
+      content: generateField('content', { nonModel: 'AmplifyAIContentBlock' }, { isArray: true }),
       aiContext: generateField('aiContext', 'AWSJSON'),
-      toolConfiguration: generateField('toolConfiguration', { nonModel: 'ToolConfiguration' }, { isArray: true, isArrayNullable: true }),
+      toolConfiguration: generateField('toolConfiguration', { nonModel: 'AmplifyAIToolConfiguration' }, { isArray: true, isArrayNullable: true }),
       createdAt: generateTimestampField('createdAt'),
       updatedAt: generateTimestampField('updatedAt'),
     },
@@ -185,7 +185,7 @@ function generateSubscriptionMetadata(routeName: string, modelName: string): Sch
     isArray: false,
     isRequired: false,
     name: `onCreateAssistantResponse${routeName}`,
-    type: { nonModel: 'ConversationMessageStreamPart' },
+    type: { nonModel: 'AmplifyAIConversationMessageStreamPart' },
     arguments: {
       'conversationId': {
         name: 'conversationId',