diff --git a/ibm_catalog.json b/ibm_catalog.json index 41f83b0..5ca7dea 100644 --- a/ibm_catalog.json +++ b/ibm_catalog.json @@ -65,7 +65,7 @@ { "label": "Basic with sample application (Deploy on Code Engine)", "name": "basic", - "index": 1, + "index": 2, "short_description": "Provides Code Engine users with serverless simplicity plus a hosted sample app and CI/CD pipeline.", "working_directory": "solutions/basic", "ignore_readme": true, @@ -602,7 +602,7 @@ { "label": "Standard with sample application (Deploy on Red Hat OpenShift)", "name": "standard", - "index": 2, + "index": 3, "short_description": "Offers Red Hat OpenShift users enterprise-grade flexibility along with a hosted sample app and automated pipeline deployment.", "working_directory": "solutions/standard", "ignore_readme": true, @@ -1340,7 +1340,7 @@ { "label": "Basic (Deploy on Code Engine)", "name": "basic-without-app", - "index": 3, + "index": 4, "short_description": "Designed for Code Engine users who want serverless simplicity without deploying a sample app or pipeline.", "working_directory": "solutions/basic-without-sample-app", "ignore_readme": true, @@ -1858,7 +1858,7 @@ { "label": "Standard (Deploy on Red Hat OpenShift)", "name": "standard-without-app", - "index": 4, + "index": 5, "short_description": "Ideal for Red Hat OpenShift users seeking enterprise-grade flexibility without a sample app or pipeline included.", "working_directory": "solutions/standard-without-sample-app", "ignore_readme": true, diff --git a/reference-architectures/rag-pattern.svg b/reference-architectures/rag-pattern.svg index c4350ed..41880c3 100644 --- a/reference-architectures/rag-pattern.svg +++ b/reference-architectures/rag-pattern.svg @@ -1,4 +1,4 @@ -
Primary Region (Multi Zone)
5
Client Workload
Gen AI App
Data Processing
watsonx Assistant or watsonx.ai
SaaS
Cloud Object Storagewatsonx.ai In-memoryICD Elasticsearch or Watson Discovery
LLM 
(Embedded)
6
IBM Cloud
1. Raw client data is stored in Object Storage 
2. Data is processed utilizing custom tools or data preparation and transformation features available in watsonx.ai or watsonx Asssitant. 
    Machine learning models create vector indexes/embeddings and store 'in-memory' watsonx.ai or Elasticsearch vector db. Alternatively 
    create and store keyword indexes in Watson Discovery.
3. User asks natural language question (Query)
4. Gen AI app routes question through watsonx Assistant (for conversational flow) or through watsonx.ai
5. watsonx Assistant or watsonx.ai queries the vector or keyword indexes to get the relevant content (Retrieval)
6. The received content is sent to LLM to generate a summary (Generation)
7. Generated summary response is sent to the requesting Gen AI app
8. Generated summarized response is received by the user (Response)
UserAI EngineerClient Data
7
2
3
4
8
1
\ No newline at end of file +
Primary Region (Multi Zone)
5
Client Workload
Gen AI App
Data Processing
watsonx Assistant or watsonx.ai
SaaS
Cloud Object Storagewatsonx.ai In-memoryICD Elasticsearch or Watson Discovery
LLM 
(Embedded)
6
IBM Cloud
1. Raw client data is stored in Object Storage 
2. Data is processed utilizing custom tools or data preparation and transformation features available in watsonx.ai or watsonx Assistant. 
    Machine learning models create vector indexes/embeddings and store 'in-memory' watsonx.ai or Elasticsearch vector db. Alternatively 
    create and store keyword indexes in Watson Discovery.
3. User asks natural language question (Query)
4. Gen AI app routes question through watsonx Assistant (for conversational flow) or through watsonx.ai
5. watsonx Assistant or watsonx.ai queries the vector or keyword indexes to get the relevant content (Retrieval)
6. The received content is sent to LLM to generate a summary (Generation)
7. Generated summary response is sent to the requesting Gen AI app
8. Generated summarized response is received by the user (Response)
UserAI EngineerClient Data
7
2
3
4
8
1
\ No newline at end of file diff --git a/reference-architectures/rag-stack-without-app-and-alm.svg b/reference-architectures/rag-stack-without-app-and-alm.svg index e8dadde..547bb90 100644 --- a/reference-architectures/rag-stack-without-app-and-alm.svg +++ b/reference-architectures/rag-stack-without-app-and-alm.svg @@ -1,4 +1,4 @@ -
Account Structure
watsonx.ai
watsonx.data
watsonx.governance
Watson Discovery
watsonx Assistant Orchestrate 
Security and Compliance Center -
Workload Protection
Key Protect
Secrets Manager
Object Storage
Monitoring
Logging
Event Notifications
Code Engine
Red Hat Openshift (ROKS)
Elasticsearch
App Configuration
ibm-cloud--key-protect
\ No newline at end of file +
Account Structure
watsonx.ai
watsonx.data
watsonx.governance
Watson Discovery
Security and Compliance Center -
Workload Protection
Key Protect
Secrets Manager
Event Notifications
Code Engine
ibm-cloud--key-protect
Activity Tracker
Event Routing
Object Storage
Monitoring

Logging

App Configuration
watsonx
Assistant / Orchestrate
Elasticsearch
Red Hat Openshift (ROKS)
\ No newline at end of file diff --git a/reference-architectures/rag-stack.svg b/reference-architectures/rag-stack.svg index 11d7ab3..22e3c13 100644 --- a/reference-architectures/rag-stack.svg +++ b/reference-architectures/rag-stack.svg @@ -1,4 +1,4 @@ - \ No newline at end of file +
Account Structure
watsonx.ai
watsonx.data
watsonx.governance
Watson Discovery
Security and Compliance Center -
Workload Protection
Key Protect
Secrets Manager
Event Notifications
Code Engine
ibm-cloud--key-protect
Activity Tracker
Event Routing
Object Storage
Monitoring

Logging

App Configuration
watsonx
Assistant / Orchestrate
Elasticsearch
Red Hat Openshift (ROKS)
Application Lifecycle Management (CI/CD)
Retrieval Augmented Generation
(Sample Application)
\ No newline at end of file diff --git a/tests/go.mod b/tests/go.mod index 47b176c..77a25a8 100644 --- a/tests/go.mod +++ b/tests/go.mod @@ -7,7 +7,7 @@ toolchain go1.25.4 require ( github.com/gruntwork-io/terratest v0.53.0 github.com/stretchr/testify v1.11.1 - github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.27 + github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.31 ) require ( diff --git a/tests/go.sum b/tests/go.sum index 8f070a4..59ae9b2 100644 --- a/tests/go.sum +++ b/tests/go.sum @@ -297,8 +297,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.27 h1:gEQWV1UdcawxJjO2Az4AYK5p2Z9SrKOWWiC2UwmFNuM= -github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.27/go.mod h1:9X9hk3QCx9h/5mmoWUwDT2ORmgvyr1tURcgDtiqlC2Q= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.31 h1:2ZslGjNvCrqTSmnqkbpsDLIchvO4hyBYCJvA28B35Ec= +github.com/terraform-ibm-modules/ibmcloud-terratest-wrapper v1.60.31/go.mod h1:9X9hk3QCx9h/5mmoWUwDT2ORmgvyr1tURcgDtiqlC2Q= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tmccombs/hcl2json v0.6.4 h1:/FWnzS9JCuyZ4MNwrG4vMrFrzRgsWEOVi+1AyYUVLGw= github.com/tmccombs/hcl2json v0.6.4/go.mod h1:+ppKlIW3H5nsAsZddXPy2iMyvld3SHxyjswOZhavRDk=