Skip to content

Commit ea94735

Browse files
committed
docs: improve readme style
1 parent bcd1484 commit ea94735

File tree

3 files changed

+33
-30
lines changed

3 files changed

+33
-30
lines changed

.secrets.baseline

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"files": "go.sum|^.secrets.baseline$",
44
"lines": null
55
},
6-
"generated_at": "2024-05-03T08:36:56Z",
6+
"generated_at": "2024-05-07T11:31:16Z",
77
"plugins_used": [
88
{
99
"name": "AWSKeyDetector"
@@ -82,23 +82,23 @@
8282
"hashed_secret": "bbc4e9d52252171a3a306be55086c65b126189e8",
8383
"is_secret": false,
8484
"is_verified": false,
85-
"line_number": 35,
85+
"line_number": 37,
8686
"type": "Secret Keyword",
8787
"verified_result": null
8888
},
8989
{
9090
"hashed_secret": "d9e9019d9eb455a3d72a3bc252c26927bb148a10",
9191
"is_secret": false,
9292
"is_verified": false,
93-
"line_number": 52,
93+
"line_number": 54,
9494
"type": "Secret Keyword",
9595
"verified_result": null
9696
},
9797
{
9898
"hashed_secret": "b13d7622394e85c3b2694f426bc096b093764462",
9999
"is_secret": false,
100100
"is_verified": false,
101-
"line_number": 56,
101+
"line_number": 58,
102102
"type": "Secret Keyword",
103103
"verified_result": null
104104
}

README.md

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,44 @@
1-
# Retrieval Augmented Generation (RAG) stack
1+
# Retrieval Augmented Generation Pattern for Watsonx on IBM Cloud
22

3-
To run the full stack, follow these steps. These steps will be updated as development progresses on the stack and underlying DAs.
3+
The following [deployable architecture](https://cloud.ibm.com/docs/secure-enterprise?topic=secure-enterprise-understand-module-da#what-is-da) automates the deployment of a sample GenAI Pattern on IBM Cloud, including all underlying infrastructure. This architecture implements the best practices for Watsonx GenAI Pattern deployment on IBM Cloud, as described in the [reference architecture](https://cloud.ibm.com/docs/pattern-genai-rag?topic=pattern-genai-rag-genai-pattern).
44

5-
## 1. Deploy the stack in a new project from catalog
5+
# Deployment Details
66

7-
Catalog url: https://cloud.ibm.com/catalog/7df1e4ca-d54c-4fd0-82ce-3d13247308cd/architecture/Retrieval_Augmented_Generation_Pattern-5fdd0045-30fc-4013-a8bc-6db9d5447a52?bss_account=9f9af00a96104f49b6509aa715f9d6a5
7+
To run the full stack, follow these steps. These steps will be updated as development progresses on the stack and underlying deployable architectures.
88

9-
Click the "Add to project" button, and select create in new project.
9+
## 1. Deploy the Stack in a New Project from Catalog
1010

11-
## 2. Prereqs in target account
11+
Catalog URL: https://cloud.ibm.com/catalog/7df1e4ca-d54c-4fd0-82ce-3d13247308cd/architecture/Retrieval_Augmented_Generation_Pattern-5fdd0045-30fc-4013-a8bc-6db9d5447a52?bss_account=9f9af00a96104f49b6509aa715f9d6a5
12+
13+
Click the "Add to Project" button and select "Create in new project."
14+
15+
## 2. Prerequisites in Target Account
1216

1317
Before deploying the stack, ensure you have:
14-
- Created an API key in the target account with sufficient permissions. Note the API key, as it will be used later.
15-
- For now, grant it admin privileges. The exact permissions required will be refined in future versions.
16-
- Install the IBM Cloud CLI's Project addon using `ibmcloud plugin install project` command. More info here: https://cloud.ibm.com/docs/cli?topic=cli-projects-cli
1718

19+
* Created an API key in the target account with sufficient permissions. Note the API key, as it will be used later. For now, grant it admin privileges. The exact permissions required will be refined in future versions.
20+
* Installed the IBM Cloud CLI's Project add-on using the `ibmcloud plugin install project` command. More information is available here: https://cloud.ibm.com/docs/cli?topic=cli-projects-cli
1821

19-
## 3. Set the input configuration for the stack
22+
## 3. Set the Input Configuration for the Stack
2023

21-
- Clone this repository locally.
22-
- Create a file with name ".def.json" with the following content.
24+
* Clone this repository locally.
25+
* Create a file named ".def.json" with the following content:
2326

2427
**Important**:
25-
- Ensure region is either us-south or eu-de as watsonx can only be deployed in those 2 locations for now.
26-
- Ensure that the prefix is globally unique. It is used for the container registry namespace (which needs to be globally unique) in this alpha version.
27-
- If specifying `existing_secrets_manager_crn`, the ibmcloud_api_key that is passed as an input must have the documented read and write access to the instance
28-
- If specifying `existing_secrets_manager_crn`, ensure that the default security group does not contain secrets named `signing-key` and `ibmcloud-api-key` . The RAG DA currently always attempt to create secret with those names (temporary issue - to be fixed).
28+
* Ensure the region is either us-south or eu-de, as Watsonx can only be deployed in those two locations for now.
29+
* Ensure that the prefix is globally unique. It is used for the container registry namespace (which needs to be globally unique) in this alpha version.
30+
* If specifying `existing_secrets_manager_crn`, the `ibmcloud_api_key` that is passed as an input must have the documented read and write access to the instance.
31+
* If specifying `existing_secrets_manager_crn`, ensure that the default security group does not contain secrets named `signing-key` and `ibmcloud-api-key`. The RAG DA currently always attempts to create a secret with those names (temporary issue - to be fixed).
2932

3033
```json
3134
{
3235
"inputs": {
3336
"prefix": "<prefix for resources name - ensure unique>",
3437
"ibmcloud_api_key": "<API Key of the target account with sufficient permissions>",
35-
"resource_group_name": "<target resource group - name of a new resource group that the stack will creates>",
38+
"resource_group_name": "<target resource group - name of a new resource group that the stack will create>",
3639
"region": "<region where all resources are deployed>",
3740
"sample_app_git_url": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application",
38-
"watsonx_admin_api_key": "<optional - admin key to use for watson if different from ibmcloud_api_key>",
41+
"watsonx_admin_api_key": "<optional - admin key to use for Watsonx if different from ibmcloud_api_key>",
3942
"signing_key": "signing key used to sign build artifacts",
4043
"existing_secrets_manager_crn": "<optional> - reuse an existing secret manager instance",
4144
"enable_platform_logs_metrics": "<optional> - set to true to enable observability instance to capture regional logs"
@@ -52,7 +55,7 @@ Example:
5255
"resource_group_name": "stack-service-rg",
5356
"region": "eu-de",
5457
"sample_app_git_url": "https://github.com/IBM/gen-ai-rag-watsonx-sample-application",
55-
"watsonx_admin_api_key": "<optional - admin key to use for watson if different from ibmcloud_api_key>",
58+
"watsonx_admin_api_key": "<optional - admin key to use for Watsonx if different from ibmcloud_api_key>",
5659
"signing_key": "signing key used to sign build artifacts",
5760
"enable_platform_logs_metrics": "false",
5861
"existing_secrets_manager_crn": "crn:v1:bluemix:public:secrets-manager:us-south:a/190c293e9fda4c6684b5acf4b17871b8:14580411-4fa2-42d3-af3f-ab7fc6371b6d::"
@@ -63,20 +66,20 @@ Example:
6366

6467
## 4. Run ./deploy-many.sh
6568

66-
- Ensure you are login into the account containing the Cloud project with the stack using ibmcloud login --sso
67-
- Execute ./deploy-many.sh with project name, stack name and optional configuration name pattern. The selected non-stack configruations will be processed by their name in alphabetical order. Using configuration name pattern (regex can be used - make sure to enclose it in quotes) you can chose which configurations are deployed
69+
* Ensure you are logged in to the account containing the Cloud project with the stack using `ibmcloud login --sso`.
70+
* Execute `./deploy-many.sh` with the project name, stack name, and optional configuration name pattern. The selected non-stack configurations will be processed by their name in alphabetical order. Using the configuration name pattern (regex can be used - make sure to enclose it in quotes), you can choose which configurations are deployed.
6871

69-
Example 1 - update stack inputs for stack configuration `RAG` and process all non-stack configurations in the project:
72+
Example 1 - Update stack inputs for stack configuration `RAG` and process all non-stack configurations in the project:
7073
```bash
7174
./deploy-many.sh my-test-project RAG
7275
```
7376

74-
Example 2 - update stack inputs and process some configurations in the project:
77+
Example 2 - Update stack inputs and process some configurations in the project:
7578
```bash
7679
./deploy-many.sh my-test-project RAG 'RAG-1|RAG-4|RAG-5'
7780
```
7881

79-
Example 3 - simulate updating stack inputs and validating some configurations in the project in dry-run mode (no changes or actual validation or deployments is done):
82+
Example 3 - Simulate updating stack inputs and validating some configurations in the project in dry-run mode (no changes or actual validation or deployments are done):
8083
```bash
8184
DRY_RUN=true ./deploy-many.sh my-test-project RAG 'RAG-1|RAG-4|RAG-5'
8285
```

ibm_catalog.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
"watson",
1515
"ai"
1616
],
17-
"short_description": "An automated solution that deploys a sample application illustrating how to implement the RAG Pattern with watsonx.ai and IBM Cloud services.",
17+
"short_description": "An automated solution that deploys a sample application illustrating how to implement the RAG Pattern with watson.ai and IBM Cloud services.",
1818
"offering_icon_url": "https://globalcatalog.cloud.ibm.com/api/v1/1082e7d2-5e2f-0a11-a3bc-f88a8e1931fc/artifacts/solution.svg",
1919
"flavors": [
2020
{
@@ -104,7 +104,7 @@
104104
"architecture": {
105105
"features": [
106106
{
107-
"title": "Deploy a banking retrieval augmented generation app to Code Engine using Continous Delivery.",
107+
"title": "Deploy a banking retrieval augmented generation (RAG) app to IBM Cloud Code Engine using Continous Delivery.",
108108
"description": ""
109109
}
110110
],

0 commit comments

Comments
 (0)