feat: bump rag da version + associated extra parameters (#4)

* feat: add inputs

* fix: remove problematic iam

* fix: image link

* fix: image link

* feat: more inputs

* feat: more wiring

* feat: add alm DA in stack

* feat: add watson

* feat: add RAG config da to stack

* feat: add RAG config da to stack

* feat: configure watsonx plans

* fix: add workaround for unique watson project name

* Use project name and config name pattern to deploy many

* chore: merge with master

* feat: bump RAG DA version

* fix: use prefix as registry namepsace for now

* fix: set context strategy

* docs: prefix

* feat: change rag app image name

---------

Co-authored-by: Igor Naumov <[email protected]>

Author: vburckhardt

README.md

@@ -1,4 +1,4 @@
-# Retrievel Augmented Generation (RAG) stack
+# Retrieval Augmented Generation (RAG) stack
 
 To run the full stack. These steps will be updated as development progresses on the stack and underlaying DAs.
 
@@ -17,7 +17,11 @@ Click the "Add to project" button, and select create in new project.
 ## 3. Set the input configuration for the stack
 
 - Clone this repository locally - and checkout the dev branch.
-- Create a file with name ".def.json" with the following content. Important: ensure region is either us-south or eu-de as watsonx can only be deployed in those 2 locations for now.
+- Create a file with name ".def.json" with the following content. 
+
+**Important**: 
+- Ensure region is either us-south or eu-de as watsonx can only be deployed in those 2 locations for now.
+- 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.
 
 ```json
 {
@@ -68,3 +72,12 @@ DRY_RUN=true ./deploy-many.sh my-test-project RAG 'RAG-1|RAG-4|RAG-5'
 Tips: If deployment fail in one of the DA, you may need to remove the configuration name of the deployment that already passes from the pattern before re-running the script.
 
 Tips: to accelerate iteration you may deploy only a subset of the configurations: the bare minimum are key management, security manager, watson saas, alm and rag configuration da. Base account, observability and SCC are not on the critical path to get the app running.
+
+
+# 5. Deploy the sample app
+
+A few manual steps are required in the alpha version to trigger the deployment of the app:
+1. In the secret manager instance, in the default group, create an arbitrary secret named "ibmcloud-api-key". Put the used api key as secret.
+2. Follow the steps at https://cloud.ibm.com/docs/devsecops?topic=devsecops-devsecops-image-signing to generate a gpg key
+3. In the secret manager instance, in the default group, create an arbitrary secret named "signing_key". Put the signing key. See https://cloud.ibm.com/docs/devsecops?topic=devsecops-devsecops-image-signing#cd-devsecops-gpg-store-secretsmgr
+4. Navigate to the "Generative AI Sample App-CI-Toolchain" CD instance, click "ci-pipeline" and execute the "Manual Trigger".

ibm_catalog.json

@@ -3,7 +3,7 @@
 		{
 			"label": "Retrieval Augmented Generation Pattern",
 			"name": "Retrieval_Augmented_Generation_Pattern",
-			"version": "0.0.3-alpha",
+			"version": "0.1.0-dev",
 			"product_kind": "solution",
 			"tags": [
 				"watson",

stack_definition.json

@@ -255,11 +255,27 @@
 				},
 				{
 					"name": "registry_namespace",
-					"value": "namespace-rag"
+					"value": "ref:../../inputs/prefix"
 				},
 				{
 					"name": "ci_app_repo_clone_from_url",
 					"value": "ref:../../inputs/sample_app_git_url"
+				},
+				{
+					"name": "repositories_prefix",
+					"value": "rag-sample"
+				},
+				{
+					"name": "ci_app_name",
+					"value": "rag-sample-app"
+				},
+				{
+					"name": "ci_code_engine_context_dir",
+					"value": ""
+				},
+				{
+					"name": "ci_code_engine_image_name",
+					"value": "code-engine-rag-app"
 				}
 			],
 			"name": "5 - Generative AI Sample App - Code Engine Toolchain Config",
@@ -298,10 +314,38 @@
 				{
 					"name": "ci_pipeline_id",
 					"value": "ref:../5 - Generative AI Sample App - Code Engine Toolchain Config/outputs/ci_pipeline_id"
+				},
+				{
+					"name": "watson_machine_learning_instance_guid",
+					"value": "ref:../4 - WatsonX SaaS services/outputs/watson_machine_learning_guid"
+				},
+				{
+					"name": "watson_machine_learning_instance_resource_name",
+					"value": "ref:../4 - WatsonX SaaS services/outputs/watson_machine_learning_name"
+				},
+				{
+					"name": "watson_machine_learning_instance_crn",
+					"value": "ref:../4 - WatsonX SaaS services/outputs/watson_machine_learning_crn"
+				},
+				{
+					"name": "toolchain_resource_group",
+					"value": "ref:../../inputs/resource_group_name"
+				},
+				{
+					"name": "prefix",
+					"value": "ref:../../inputs/prefix"
+				},
+				{
+					"name": "resource_group_name",
+					"value": "ref:../../inputs/resource_group_name"
+				},
+				{
+					"name": "use_existing_resource_group",
+					"value": true
 				}
 			],
 			"name": "6 - Sample RAG app configuration",
-			"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.e2855bfd-352e-492b-bf4c-080d8d105c81"
+			"version_locator": "7df1e4ca-d54c-4fd0-82ce-3d13247308cd.19041420-5bc9-4aca-9dc8-0cb432c80962"
 		}
 	]
 }