fix(conversation): use functionMap for custom handler IFunction reference #2922

atierian · 2024-10-04T03:22:24Z

Related data-schema PR aws-amplify/amplify-data#361

Description of changes

Updates ConversationTransformer to allow functionMap?: record<string, lambda.IFunction> to be passed. This is done to properly reference a custom conversation handler defined via defineConversationHandlerFunction in a Gen2 backend.

CDK / CloudFormation Parameters Changed

Issue #, if available

Description of how you validated changes

New test case asserting functionMap value is used for Lambda data source.

Checklist

PR description included
yarn test passes
~~E2E test run linked~~
Tests are changed or added
~~Relevant documentation is changed or added (and PR referenced)~~
~~New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policies~~
~~Any CDK or CloudFormation parameter changes are called out explicitly~~

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

atierian · 2024-10-04T03:59:17Z

packages/amplify-graphql-conversation-transformer/package.json

@@ -37,7 +37,8 @@
    "immer": "^9.0.12"
  },
  "devDependencies": {
-    "@aws-amplify/graphql-transformer-test-utils": "1.0.3"
+    "@aws-amplify/graphql-transformer-test-utils": "1.0.3",
+    "esbuild": "^0.24.0"


required for test cases

atierian · 2024-10-04T12:42:33Z

dependency_licenses.txt

@@ -14486,6 +14486,32 @@ SOFTWARE.

 -----

+The following software may be included in this product: esbuild. A copy of the source code may be downloaded from git+https://github.com/evanw/esbuild.git. This software contains the following license and notice below:


This is from adding esbuild as a dev dependency in the conversation transformer.

atierian · 2024-10-04T16:29:35Z

...phql-conversation-transformer/src/__tests__/amplify-graphql-conversation-transformer.test.ts

+      const expectedCustomHandlerArn = out.rawRootStack.resolve(customHandler.functionArn);
+      const conversationLambdaStackName = `${toUpper(routeName)}ConversationDirectiveLambdaStack`;
+      const conversationLambdaDataSourceName = `Fn${routeName}LambdaDataSource`;
+      const conversationLambdaDataSourceFunctionArnRef =
+        out.stacks[conversationLambdaStackName].Resources?.[conversationLambdaDataSourceName].Properties.LambdaConfig.LambdaFunctionArn.Ref;
+      const lambdaDataSourceFunctionArn =
+        out.rootStack.Resources?.[conversationLambdaStackName].Properties?.Parameters?.[conversationLambdaDataSourceFunctionArnRef];
+      expect(lambdaDataSourceFunctionArn).toEqual(expectedCustomHandlerArn);


I welcome suggestions for a more succinct way to do this, like using CDK test helpers -- I was unable to find a better way.

palpatim · 2024-10-08T18:39:06Z

...fy-graphql-conversation-transformer/src/transformer-steps/conversation-resolver-generator.ts

@@ -101,28 +103,18 @@ export class ConversationResolverGenerator {
   * @param functionStack - The CDK stack to add the function to


nit: delete

Suggested change

* @param functionStack - The CDK stack to add the function to

thanks. will remove in follow up.

@default

* chore: update .jsii assembly * chore: update .jsii assembly * chore: migrate pg array objects e2e test in gen2 cdk (#2906) * chore: graphql prep for test migration * refactor: generic graphql field selection string with fieldmap * feat: add postgres array objects e2e test * test: remove bootstrap in test code * chore: schema cleanup * chore: final cleanup * chore: add explanation on FieldMap ans examples * chore: remove dup test --------- Signed-off-by: Kevin Shan <siqishan@amazon.com> Co-authored-by: Tim Schmelter <schmelte@amazon.com> * fix(model-transformer) IndexName -> index in query list resolver (#2912) * chore: upgrade cdk library dependency to 2.158.0 (#2876) * chore: upgrade cdk dependency to 2.158.0 * chore: install and use nvm * chore: use full version for nvm * chore: testing linux build with nvm * chore: fix version in cdk tests * chore: update jsii files * update: increase memory size * add: debug statement * update: mem size back to 8096, use ps1 file for shell script * fix: path to Setup-NodeVersion.ps1 * fix: path to codebuild_specs/Setup-NodeVersion.ps1 * add: set runtime version * update: image * add: debug statement * update: use earlier code * add: debug statements * update: clean up code * update: use the correct image * add: list installed node versions and used nodejs.install * restart: install nvm using choco * add: back mem size variable * add: nvm install and use 18.20.4 * add: env var NVM_HOME and NVM_SYMLINK * add: spawn powershell as admin * update: remove all other builds * add: debug statement * add: env var path * update: print env var * add: commands * update: env var set up * add: refresh env var * update: more debug statement * update * revamp: find nvm.exe * update: install nvm windows directly * update: launch new shell if current shell does not recognize nvm * update: install node in buildspec * add: install and use node in build spec * update: use single quote to prevent interpreting \ * add: 2 scripts, one for installing nvm, another for using nvm * fix: path error * test: which way set env var * update: set up env var in pre_build * update: use choco in pre-build * fix: syntax error * update: build_windows working, running all tests * test: remove bootstrap in test code * debug: _runGqlE2ETests * update: debug_workflow * update: debug_workflow * update: debug_workflow * update: debug_workflow * add: debug statement * add: debug test * add: debug * update: use uuid for bucket name * remove: use of uuid * add: debug statement * update: use differrent bucket name * add: mili second timestamp * add: debug statement * remove: debug statement * remove: redundant code --------- Co-authored-by: Bobby Yu <bobbyu@amazon.com> Co-authored-by: Tim Schmelter <schmelte@amazon.com> * test: fix gen 1 init (#2924) * fix(conversation): allow changes to systemPrompt, inferenceConfig, aiModel to be hotswapped (#2923) * feat: auto increment support (#2883) * chore(graphql-default-value-transformer): tidy tests * test(graphql-default-value-transformer): add unit tests for auto increment support * feat: 🎸 utils to detect Postgres datasource * feat: 🎸 support auto increment Implements support for auto increment (serial) fields from Postgres datasources. Such fields are denoted by an empty `@default` applied to an `Int` field. * test(graphql-default-value-transformer): pk can be auto increment * test(graphql-default-value-transformer): auto-increment crud e2e * chore: describe test purpose * chore: removing logging * chore: describe why invalid cases are invalid * chore: remove unecessary e2e test case * chore: test messaging clarity * chore: type safety * chore: alphabetize list * chore: type of return value asserts against string Co-authored-by: Tim Schmelter <schmelte+github@amazon.com> * chore: test ensures customers can insert to serial fields with custom values * chore: verify that @default(value) works on mysql * chore: remove unecessary ssm test case * chore: update branch from main * test: value cannot be null on ddb --------- Co-authored-by: Tim Schmelter <schmelte+github@amazon.com> * fix(conversation): use functionMap for custom handler IFunction reference (#2922) * fix(generation): gracefully handle stringified tool_use responses (#2919) * feat(conversation): per message items and lambda history retrieval pattern (#2914) * fix: sql default value e2e failures (#2932) * fix(generation): remove trailing comma in inferenceConfig resolver code (#2933) * fix: add aws_iam to custom operations when enableIamAuthorization is enabled; fix graphql type utils (#2921) - test: Add additional tests to fix coverage metrics for unchanged files - test: Add implicit IAM auth support tests - Added a skipped test for custom type support, to be re-enabled once we figure out the right strategy for this. * fix: appsync ttl correct duration time unit in ms (#2928) Signed-off-by: Kevin Shan <siqishan@amazon.com> --------- Signed-off-by: Kevin Shan <siqishan@amazon.com> Co-authored-by: amplify-data-ci <amplify-data-dev+github@amazon.com> Co-authored-by: Kevin Shan <siqishan@amazon.com> Co-authored-by: Ian Saultz <52051793+atierian@users.noreply.github.com> Co-authored-by: Phani Srikar Edupuganti <55896475+phani-srikar@users.noreply.github.com> Co-authored-by: Bobby Yu <bobbyu@amazon.com> Co-authored-by: Dane Pilcher <dppilche@amazon.com> Co-authored-by: Peter V. <98245483+p5quared@users.noreply.github.com>

…ence (#2922)

atierian added 2 commits October 3, 2024 23:20

fix(conversation): use functionMap for grabbing IFunction reference

649a702

test(conversation): update test cases

76e79fe

atierian commented Oct 4, 2024

View reviewed changes

atierian added 3 commits October 4, 2024 00:04

extract deps

9df386a

extract api

3daf7b9

prettier

b289b62

atierian commented Oct 4, 2024

View reviewed changes

add custom function test case

fd26ee3

atierian marked this pull request as ready for review October 4, 2024 16:24

atierian requested review from a team as code owners October 4, 2024 16:24

atierian mentioned this pull request Oct 4, 2024

fix: include custom conversation handlers in lambdaFunctions for downstream processing aws-amplify/amplify-data#361

Merged

atierian commented Oct 4, 2024

View reviewed changes

sundersc approved these changes Oct 7, 2024

View reviewed changes

palpatim approved these changes Oct 8, 2024

View reviewed changes

atierian merged commit d8d9eef into main Oct 8, 2024
7 checks passed

atierian deleted the ai.fix-custom-conversation-handler-reference branch October 8, 2024 19:02

tejas2008 pushed a commit that referenced this pull request Oct 29, 2024

fix(conversation): use functionMap for custom handler IFunction refer…

d1e128b

…ence (#2922)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(conversation): use functionMap for custom handler IFunction reference #2922

fix(conversation): use functionMap for custom handler IFunction reference #2922

atierian commented Oct 4, 2024 •

edited

Loading

atierian Oct 4, 2024

atierian Oct 4, 2024

atierian Oct 4, 2024

palpatim Oct 8, 2024

atierian Oct 8, 2024

		@@ -14486,6 +14486,32 @@ SOFTWARE.

		-----

		The following software may be included in this product: esbuild. A copy of the source code may be downloaded from git+https://github.com/evanw/esbuild.git. This software contains the following license and notice below:

		@@ -101,28 +103,18 @@ export class ConversationResolverGenerator {
		* @param functionStack - The CDK stack to add the function to

fix(conversation): use functionMap for custom handler IFunction reference #2922

fix(conversation): use functionMap for custom handler IFunction reference #2922

Conversation

atierian commented Oct 4, 2024 • edited Loading

Description of changes

CDK / CloudFormation Parameters Changed

Issue #, if available

Description of how you validated changes

Checklist

atierian Oct 4, 2024

Choose a reason for hiding this comment

atierian Oct 4, 2024

Choose a reason for hiding this comment

atierian Oct 4, 2024

Choose a reason for hiding this comment

palpatim Oct 8, 2024

Choose a reason for hiding this comment

atierian Oct 8, 2024

Choose a reason for hiding this comment

atierian commented Oct 4, 2024 •

edited

Loading