Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 31 commits into from
May 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
f39af39
seedformer module for qaRagUsingAppSync
saikatak Apr 26, 2024
5222f23
Merge branch 'awslabs:main' into main
saikatak Apr 26, 2024
cfcf045
Added deployspec and integrated llm-rag modules in deployment yaml
saikatak Apr 29, 2024
16f935e
Added IAC for Question and Answering module
saikatak May 3, 2024
ac753ba
Merge branch 'awslabs:main' into main
saikatak May 3, 2024
a3165e0
removed unwanted comments from the code
saikatak May 3, 2024
3cd60cd
added READ ME and other minor corrections to paths
saikatak May 3, 2024
482fc7f
Added change description to CHANGELOG.md
saikatak May 3, 2024
894260a
Updated repository README.md with qna-rag module details
saikatak May 3, 2024
269a352
Corrected type in repository readme
saikatak May 3, 2024
cbcca91
updated urlib version
saikatak May 3, 2024
75bb382
Added tests and upgdated read me
saikatak May 3, 2024
4957fb4
removed print statement and added open search security group as input…
saikatak May 8, 2024
5ed92ce
Resolved merge conflicts
saikatak May 8, 2024
1bf11ab
updated example to include open search security group id
saikatak May 8, 2024
2422dd7
Fixed unit test failure
saikatak May 8, 2024
35858b6
Moved qna-rag manifest to examples
saikatak May 9, 2024
ec7510e
Merge branch 'awslabs:main' into main
saikatak May 9, 2024
3b8f21b
Merge branch 'main' into main
kukushking May 12, 2024
53737d7
Updated Q&A Rag ingestion module to include ingestion modules as well
saikatak May 21, 2024
775d7c1
Merge branch 'main' into main
saikatak May 21, 2024
a7a7d48
deleted storage yaml from examples
saikatak May 21, 2024
e21a652
Merge remote-tracking branch 'origin/main'
saikatak May 21, 2024
45459f9
Merge branch 'main' into main
kukushking May 21, 2024
ae131d2
updated readme and added mypy validation fixes
saikatak May 22, 2024
e36916a
Merge remote-tracking branch 'origin/main'
saikatak May 22, 2024
87c7b65
Merge branch 'awslabs:main' into main
saikatak May 22, 2024
301206e
Updated read me to include ingestion construct and add existing S3 bu…
saikatak May 22, 2024
a24c5c7
Added Optional type for input asset bucket
saikatak May 22, 2024
d3ab066
removed the unnecessary comment
saikatak May 22, 2024
ad0e94d
Addressed review comments - Updated IDF open search module version, A…
saikatak May 23, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- added `sagemaker-model-package-promote-pipeline` module.
- added `sagemaker-hugging-face-endpoint` module
- added `hf_import_models` template to import hugging face models
- added `qna-rag` module

### **Changed**

Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,11 @@ See deployment steps in the [Deployment Guide](DEPLOYMENT.md).

### FMOps Modules

| Type | Description |
|-----------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------|
| [SageMaker JumpStart Foundation Model Endpoint Module](modules/fmops/sagemaker-jumpstart-fm-endpoint/README.md) | Creates an endpoint for a SageMaker JumpStart Foundation Model. |
| [SageMaker Hugging Face Foundation Model Endpoint Module](modules/fmops/sagemaker-hugging-face-endpoint/README.md) | Creates an endpoint for a SageMaker Hugging Face Foundation Model. |
| Type | Description |
|--------------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
| [SageMaker JumpStart Foundation Model Endpoint Module](modules/fmops/sagemaker-jumpstart-fm-endpoint/README.md) | Creates an endpoint for a SageMaker JumpStart Foundation Model. |
| [SageMaker Hugging Face Foundation Model Endpoint Module](modules/fmops/sagemaker-hugging-face-endpoint/README.md) | Creates an endpoint for a SageMaker Hugging Face Foundation Model. |
| [AppSync Knowledge Base Ingestion and Question and Answering RAG Module](modules/fmops/qna-rag/README.md) | Creates an Graphql endpoint for ingestion of data and and use ingested as knowledge base for a Question and Answering model using RAG. |


### MWAA Modules
Expand Down
1 change: 1 addition & 0 deletions examples/manifests/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ groups:
path: manifests/sagemaker-model-package-group-modules.yaml
- name: promote-models
path: manifests/sagemaker-model-package-promote-pipeline-modules.yaml

targetAccountMappings:
- alias: primary
accountId:
Expand Down
20 changes: 20 additions & 0 deletions manifests/fmops-qna-rag/deployment.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: mlops-qna-rag
toolchainRegion: us-east-1
forceDependencyRedeploy: true
groups:
- name: networking
path: manifests/fmops-qna-rag/networking-modules.yaml
- name: storage
path: manifests/fmops-qna-rag/storage-modules.yaml
- name: qna-rag
path: manifests/fmops-qna-rag/qna-rag-modules.yaml

targetAccountMappings:
- alias: primary
accountId:
valueFrom:
envVariable: PRIMARY_ACCOUNT
default: true
regionMappings:
- region: us-east-1
default: true
6 changes: 6 additions & 0 deletions manifests/fmops-qna-rag/networking-modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
name: networking
path: git::https://github.com/awslabs/idf-modules.git//modules/network/basic-cdk?ref=release/1.3.0&depth=1
targetAccount: primary
parameters:
- name: internet-accessible
value: True
24 changes: 24 additions & 0 deletions manifests/fmops-qna-rag/qna-rag-modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: qna-rag
path: modules/fmops/qna-rag
parameters:
- name: cognito-pool-id
#Replace below value with valid congnito pool id
value: us-east-1_XXXXX
- name: os-domain-endpoint
valueFrom:
moduleMetadata:
group: storage
name: opensearch
key: OpenSearchDomainEndpoint
- name: os-security-group-id
valueFrom:
moduleMetadata:
group: storage
name: opensearch
key: OpenSearchSecurityGroupId
- name: vpc-id
valueFrom:
moduleMetadata:
group: networking
name: networking
key: VpcId
22 changes: 22 additions & 0 deletions manifests/fmops-qna-rag/storage-modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
---
name: opensearch
path: git::https://github.com/awslabs/idf-modules.git//modules/storage/opensearch?ref=release/1.7.0&depth=1
targetAccount: primary
targetRegion: us-east-1
parameters:
- name: encryption-type
value: SSE
- name: retention-type
value: RETAIN
- name: vpc-id
valueFrom:
moduleMetadata:
group: networking
name: networking
key: VpcId
- name: private-subnet-ids
valueFrom:
moduleMetadata:
group: networking
name: networking
key: PrivateSubnetIds
24 changes: 24 additions & 0 deletions manifests/qna-rag-modules.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: qna-rag
path: modules/fmops/qna-rag
parameters:
- name: cognito-pool-id
#Replace below value with valid congnito pool id
value: us-east-1_XXXXX
- name: os-domain-endpoint
valueFrom:
moduleMetadata:
group: storage
name: opensearch
key: OpenSearchDomainEndpoint
- name: os-security-group-id
valueFrom:
moduleMetadata:
group: storage
name: opensearch
key: OpenSearchSecurityGroupId
- name: vpc-id
valueFrom:
moduleMetadata:
group: networking
name: networking
key: VpcId
22 changes: 22 additions & 0 deletions manifests/storage-modules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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?ref=release/1.7.0&depth=1
targetAccount: primary
targetRegion: us-east-1
parameters:
- name: encryption-type
value: SSE
- name: retention-type
value: RETAIN
- name: vpc-id
valueFrom:
moduleMetadata:
group: networking
name: networking
key: VpcId
- name: private-subnet-ids
valueFrom:
moduleMetadata:
group: networking
name: networking
key: PrivateSubnetIds
2 changes: 2 additions & 0 deletions manifests/uber-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ groups:
path: manifests/mwaa-modules.yaml
- name: mwaa-dags
path: manifests/mwaa-dag-modules.yaml
- name: qna-rag
path: manifests/qna-rag-modules.yaml
targetAccountMappings:
- alias: primary
accountId:
Expand Down
Loading
Loading