Added new seadfarmer module for Question and Answering Gen AI construct #81

saikatak · 2024-05-08T06:37:07Z

Describe your changes

Added new seadfarmer module for Question and Answering Gen AI construct

Issue ticket number and link

Checklist before requesting a review

I updated CHANGELOG.MD with a description of my changes
If the change was to a module, I ran the code validation script (scripts/validate.sh)
If the change was to a module, I have added thorough tests
If the change was to a module, I have added/updated the module's README.md
If a module was added, I added a reference to the module to the repository's README.md
I verified that my code deploys successfully using seedfarmer apply

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

… parameter

malachi-constant · 2024-05-08T06:38:08Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 5ed92ce
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-08T06:44:02Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 1bf11ab
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-08T06:55:19Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 2422dd7
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

kukushking · 2024-05-08T11:47:25Z

modules/fmops/qna-rag/stack.py

+        )
+
+        # get an existing userpool
+        cognito_pool_id = cognito_pool_id


Is Congnito mandatory? Can we add a parameter to support both IAM and Cognito?

As of today cognito is mandatory to be used with this construct. Created a feature request on the construct to make cognito user pool id as optional parameter

kukushking · 2024-05-08T11:50:53Z

manifests/qna-rag-modules.yaml

+path: modules/fmops/qna-rag
+parameters:
+  - name: cognito-pool-id
+    value: us-east-1-XXXXX


Looks like we need an IDF module for Cognito. Can you move the manifest in examples/manifests/ since this requires user input/pre-setup Conginto user pool? We can move it back once we have congnito module/or IAM-only auth mode.

Moved the manifest to examples

malachi-constant · 2024-05-09T08:51:42Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 35858b6
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-09T08:52:26Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: ec7510e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-12T00:03:14Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 3b8f21b
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

kukushking · 2024-05-13T12:46:29Z

modules/fmops/qna-rag/app.py

+vpc_id = os.getenv(_param("VPC_ID"))
+cognito_pool_id = os.getenv(_param("COGNITO_POOL_ID"))
+os_domain_endpoint = os.getenv(_param("OS_DOMAIN_ENDPOINT"))
+os_security_group_id = os.getenv(_param("OS_SECURITY_GROUP_ID"))


Minor query - can you please add ability to provide input asset bucket & enable observability (ref params here)?

modules/fmops/qna-rag/app.py

kukushking

Looks great, thank you!

I added a few minor comments, also as discussed this covers the consumer part, and in the next PRs would be great to see also the ingestion/embeddings generation for a complete E2E flow. Thanks!

malachi-constant · 2024-05-21T17:05:55Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 53737d7
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-21T17:07:56Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 775d7c1
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-21T18:13:08Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: e21a652
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-21T18:19:39Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 45459f9
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-22T07:29:09Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: e36916a
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-22T07:30:22Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 87c7b65
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

…cket as optional input to RAG module

malachi-constant · 2024-05-22T18:11:59Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: 301206e
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

malachi-constant · 2024-05-22T18:36:59Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: a24c5c7
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

kukushking

Looks good, thank you!

malachi-constant · 2024-05-22T18:44:23Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: d3ab066
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

LeonLuttenberger · 2024-05-22T19:00:28Z

manifests/storage-modules.yaml

@@ -51,3 +51,25 @@ parameters:
    value: 30
  - name: removal-policy
    value: DESTROY
+---
+name: opensearch
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch/


We should lock this version to a release of IDF:

git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch?ref=release/1.7.0&depth=1

updated the manifest

LeonLuttenberger · 2024-05-22T19:01:03Z

manifests/fmops-qna-rag/storage-modules.yaml

@@ -0,0 +1,22 @@
+---
+name: opensearch
+path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch/


We should lock this version to a release of IDF:

git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch?ref=release/1.7.0&depth=1

Updated the manifest

LeonLuttenberger · 2024-05-22T19:02:34Z

modules/fmops/qna-rag/stack.py

+        )
+        os_security_group.add_ingress_rule(
+            peer=security_group,
+            connection=ec2.Port.tcp(443),


Where is this port number coming from?

This is the port on which open search is listening, Thus allowing traffic to Open search from lambda on port 443. Can make this configurable if that makes sense.

Made the port configurable parameter with default value as 443

…dded Port as configurable parameter

malachi-constant · 2024-05-23T06:25:54Z

AWS CodeBuild CI Report

CodeBuild project: AIOpsModuleTestsInfrastruct-doMLXEYsnmxr
Commit ID: ad0e94d
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

saikatak and others added 14 commits April 26, 2024 13:34

seedformer module for qaRagUsingAppSync

f39af39

Merge branch 'awslabs:main' into main

5222f23

Added deployspec and integrated llm-rag modules in deployment yaml

cfcf045

Added IAC for Question and Answering module

16f935e

Merge branch 'awslabs:main' into main

ac753ba

removed unwanted comments from the code

a3165e0

added READ ME and other minor corrections to paths

3cd60cd

Added change description to CHANGELOG.md

482fc7f

Updated repository README.md with qna-rag module details

894260a

Corrected type in repository readme

269a352

updated urlib version

cbcca91

Added tests and upgdated read me

75bb382

removed print statement and added open search security group as input…

4957fb4

… parameter

Resolved merge conflicts

5ed92ce

updated example to include open search security group id

1bf11ab

Fixed unit test failure

2422dd7

kukushking reviewed May 8, 2024

View reviewed changes

saikatak and others added 2 commits May 9, 2024 14:20

Moved qna-rag manifest to examples

35858b6

Merge branch 'awslabs:main' into main

ec7510e

Merge branch 'main' into main

3b8f21b

kukushking reviewed May 13, 2024

View reviewed changes

modules/fmops/qna-rag/app.py Outdated Show resolved Hide resolved

kukushking previously approved these changes May 13, 2024

View reviewed changes

Updated Q&A Rag ingestion module to include ingestion modules as well

53737d7

saikatak dismissed kukushking’s stale review via 53737d7 May 21, 2024 17:03

Merge branch 'main' into main

775d7c1

saikatak added 2 commits May 21, 2024 23:33

deleted storage yaml from examples

a7a7d48

Merge remote-tracking branch 'origin/main'

e21a652

Merge branch 'main' into main

45459f9

saikatak and others added 3 commits May 22, 2024 12:56

updated readme and added mypy validation fixes

ae131d2

Merge remote-tracking branch 'origin/main'

e36916a

Merge branch 'awslabs:main' into main

87c7b65

Updated read me to include ingestion construct and add existing S3 bu…

301206e

…cket as optional input to RAG module

Added Optional type for input asset bucket

a24c5c7

kukushking previously approved these changes May 22, 2024

View reviewed changes

removed the unnecessary comment

d3ab066

saikatak dismissed kukushking’s stale review via d3ab066 May 22, 2024 18:43

kukushking previously approved these changes May 22, 2024

View reviewed changes

LeonLuttenberger reviewed May 22, 2024

View reviewed changes

Addressed review comments - Updated IDF open search module version, A…

ad0e94d

…dded Port as configurable parameter

saikatak dismissed kukushking’s stale review via ad0e94d May 23, 2024 06:24

kukushking approved these changes May 23, 2024

View reviewed changes

kukushking merged commit cb9844f into awslabs:main May 23, 2024
16 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added new seadfarmer module for Question and Answering Gen AI construct #81

Added new seadfarmer module for Question and Answering Gen AI construct #81

saikatak commented May 8, 2024

malachi-constant commented May 8, 2024

malachi-constant commented May 8, 2024

malachi-constant commented May 8, 2024

kukushking May 8, 2024

saikatak May 9, 2024

kukushking May 12, 2024

kukushking May 8, 2024

saikatak May 9, 2024

kukushking May 12, 2024

malachi-constant commented May 9, 2024

malachi-constant commented May 9, 2024

malachi-constant commented May 12, 2024

kukushking May 13, 2024

kukushking left a comment

malachi-constant commented May 21, 2024

malachi-constant commented May 21, 2024

malachi-constant commented May 21, 2024

malachi-constant commented May 21, 2024

malachi-constant commented May 22, 2024

malachi-constant commented May 22, 2024

malachi-constant commented May 22, 2024

malachi-constant commented May 22, 2024

kukushking left a comment

malachi-constant commented May 22, 2024

LeonLuttenberger May 22, 2024

saikatak May 23, 2024

LeonLuttenberger May 22, 2024

saikatak May 23, 2024

LeonLuttenberger May 22, 2024

saikatak May 23, 2024

saikatak May 23, 2024

malachi-constant commented May 23, 2024

Added new seadfarmer module for Question and Answering Gen AI construct #81

Added new seadfarmer module for Question and Answering Gen AI construct #81

Conversation

saikatak commented May 8, 2024

Describe your changes

Issue ticket number and link

Checklist before requesting a review

malachi-constant commented May 8, 2024

AWS CodeBuild CI Report

malachi-constant commented May 8, 2024

AWS CodeBuild CI Report

malachi-constant commented May 8, 2024

AWS CodeBuild CI Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

malachi-constant commented May 9, 2024

AWS CodeBuild CI Report

malachi-constant commented May 9, 2024

AWS CodeBuild CI Report

malachi-constant commented May 12, 2024

AWS CodeBuild CI Report

Choose a reason for hiding this comment

kukushking left a comment

Choose a reason for hiding this comment

malachi-constant commented May 21, 2024

AWS CodeBuild CI Report

malachi-constant commented May 21, 2024

AWS CodeBuild CI Report

malachi-constant commented May 21, 2024

AWS CodeBuild CI Report

malachi-constant commented May 21, 2024

AWS CodeBuild CI Report

malachi-constant commented May 22, 2024

AWS CodeBuild CI Report

malachi-constant commented May 22, 2024

AWS CodeBuild CI Report

malachi-constant commented May 22, 2024

AWS CodeBuild CI Report

malachi-constant commented May 22, 2024

AWS CodeBuild CI Report

kukushking left a comment

Choose a reason for hiding this comment

malachi-constant commented May 22, 2024

AWS CodeBuild CI Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

malachi-constant commented May 23, 2024

AWS CodeBuild CI Report