fix(conversation): allow changes to systemPrompt, inferenceConfig, aiModel to be hotswapped #2923
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
sundersc
approved these changes
Oct 7, 2024
palpatim
approved these changes
Oct 7, 2024
|
|
||
| let resolver = fs.readFileSync(path.join(__dirname, 'init-resolver-fn.template.js'), 'utf8'); | ||
| Object.entries(substitutions).forEach(([key, value]) => { | ||
| const replaced = resolver.replace(new RegExp(`\\[\\[${key}\\]\\]`, 'g'), value); |
There was a problem hiding this comment.
Future PR is OK. Didn't you make a utility for the [[key]] flavor of search/replace? I believe you're using it in several places, so would love to see that refactored rather than scattering these leaning toothpicks throughout the code :)
There was a problem hiding this comment.
Yes. I have a WIP branch that consolidates the resolver creation logic (including this regex logic). I'm expecting to cut that later this week.
palpatim
added a commit
that referenced
this pull request
Oct 10, 2024
* 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>
tejas2008
pushed a commit
that referenced
this pull request
Oct 29, 2024
…Model to be hotswapped (#2923)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Resources that reference
are not hot-swappable. This is a CDK constraint.
The
invoke-lambdaresolver function currently referencesctx.api.graphqlUrlin the resolver code. In addition to the GraphQLUrl, theinvoke-lambdaresolver function also contains thesystemPrompt,aiModel, andinferenceConfigurationvalues defined in a conversation route /@conversationdirective.This is less than ideal because any changes to
systemPrompt,aiModel, and/orinferenceConfigurationcannot hotswap today.This change moves the
ctx.api.graphqlUrl/"Fn:GetAtt": ["GraphQLAPI", "GraphQLUrl"]reference into the existinginitresolver function. In turn, changes tosystemPrompt,aiModel, and/or'inferenceConfigurationare now hotswapped.CDK / CloudFormation Parameters Changed
N/A
Issue #, if available
Description of how you validated changes
Checklist
yarn testpassesE2E test run linkedRelevant documentation is changed or added (and PR referenced)New AWS SDK calls or CloudFormation actions have been added to relevant test and service IAM policiesAny CDK or CloudFormation parameter changes are called out explicitlyBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.