Internal main

deployment/components/edp/templates/ingestion/ingestion-configmap.yaml

@@ -7,6 +7,7 @@ metadata:
   name: edp-ingestion-configmap
   namespace: edp
 data:
+  EMBEDDING_MODEL_NAME: {{ .Values.ingestion.config.embedding_model_name | quote }}
   VECTOR_STORE: {{ .Values.ingestion.config.vector_store | quote }}
   VECTOR_ALGORITHM: {{ .Values.ingestion.config.vector_algorithm | quote }}
   VECTOR_DIMS: {{ .Values.ingestion.config.vector_dims | quote }}

deployment/components/edp/values.yaml

@@ -26,6 +26,8 @@ edpOidcConfigUrl: "http://keycloak-http.auth.svc/realms/EnterpriseRAG/.well-know
 edpOidcClientSecret: ""
 bucketNameRegexFilter: '.*'
 presignedUrlCredentialsSystemFallback: "false"
+embedding_model_name: &embedding_model_name "BAAI/bge-base-en-v1.5"
+
 
 minioApiDomain: &minioApiDomain "s3.erag.com"
 minioBrowserDomain: &minioBrowserDomain "minio.erag.com"
@@ -895,6 +897,7 @@ ingestion:
   tag: latest
   config:
     opeaLoggerLevel: "INFO" # "DEBUG", "INFO", "WARNING", "ERROR", "CRITICAL"
+    embedding_model_name: *embedding_model_name # e.g., "BAAI/bge-base-en-v1.5"
     # Vector Algorithm configuration
     vector_algorithm: "FLAT" # "FLAT", "HNSW"
     vector_dims: "768" # Depends on model used in embedding. For example bge-large-en-v1.5=768, bge-large-en-v1.5=1024

deployment/components/gmc/values.yaml

@@ -221,6 +221,8 @@ images:
     tag: *tag
     pullPolicy: Always
     envfile: "src/comps/retrievers/impl/microservice/.env"
+    envs:
+      EMBEDDING_MODEL_NAME: *embedding_model_name
   ingestion-usvc:
     image: "erag-ingestion"
     repository: *repo

deployment/pipelines/docsum/reference-cpu.yaml

@@ -54,7 +54,6 @@ spec:
           config:
             endpoint: /v1/chat/completions
             LLM_MODEL_SERVER: vllm
-            LLM_OPENAI_FORMAT_STREAMING: "True"
             LLM_MODEL_SERVER_ENDPOINT: vllm-service-m
           isDownstreamService: true
       - name: DocSum

deployment/pipelines/docsum/reference-hpu.yaml

@@ -55,7 +55,6 @@ spec:
             endpoint: /v1/chat/completions
             LLM_MODEL_SERVER: vllm
             LLM_MODEL_SERVER_ENDPOINT: vllm-gaudi-svc
-            LLM_OPENAI_FORMAT_STREAMING: "True"
           isDownstreamService: true
       - name: DocSum
         data: $response

deployment/roles/application/edp/templates/values.yaml.j2

@@ -12,6 +12,8 @@ proxy:
 alternateTagging: {{ use_alternate_tagging }}
 {% endif %}
 
+embedding_model_name: &embedding_model_name {{ embedding_model_name }}
+
 {% set storage = lookup('env', 'edp_storage_type') or edp.storageType if edp.storageType is defined else "minio" %}
 {% if storage == "minio" %}
 edpAccessKey: {{ EDP_MINIO_ACCESS_KEY }}
@@ -136,10 +138,10 @@ ingestion:
   tag: {{ tag }}
   repository: {{ registry }}
   config:
+    embedding_model_name: *embedding_model_name
 {% if edp.hierarchical_indices.enabled is true %}
     use_hierarchical_indices: "True"
 {% endif %}
-  config:
     vector_dims: {{ vector_databases.vector_dims }}
     vector_datatype: {{ vector_databases.vector_datatype }}
 {% if edp.late_chunking.enabled is true %}

deployment/roles/application/pipeline/templates/values.yaml.j2

@@ -148,6 +148,7 @@ images:
     vector_store: {{ vector_databases.vector_store }}
 {% endif %}
     envs:
+      EMBEDDING_MODEL_NAME: *embedding_model_name
 {% if edp.hierarchical_indices.enabled is true %}
       USE_HIERARCHICAL_INDICES: "True"
       K_SUMMARIES: {{ edp.hierarchical_indices.kSummaries }}

deployment/terraform/ibm/README.md

@@ -1,6 +1,6 @@
 # IBM Cloud Terraform Configuration for Enterprise RAG (Intel Gaudi)
 
-This directory contains Terraform configuration files for deploying the Enterprise RAG solution on IBM Cloud using Intel Gaudi accelerators.
+This directory contains Terraform configuration files for deploying the Enterprise RAG solution on IBM Cloud using Intel hardware.
 
 ## Complete Deployment Guide
 
@@ -20,13 +20,15 @@ The comprehensive deployment guide covers:
 This deployment creates a complete Enterprise RAG infrastructure:
 
 **Infrastructure Components:**
-- Intel Gaudi3-powered VPC instance (`gx3d-160x1792x8gaudi3`)
+- Intel-powered VPC instance:
+  - Gaudi - `gx3d-160x1792x8gaudi3`
+  - Xeon - `bx3d-128x640`
 - VPC networking with subnet and security groups
 - Optimized storage configuration for AI workloads
 - Automated software installation and configuration
 
 **AI Software Stack:**
-- Intel Gaudi drivers and optimization libraries
+- Intel Gaudi drivers (if necessary) and optimization libraries
 - Large Language Model service (Intel optimized)
 - Text embedding service for semantic search
 - Document reranking for improved relevance
@@ -90,7 +92,7 @@ api_key = "YOUR_IBM_CLOUD_API_KEY"
 
 # Basic Configuration
 region         = "us-south"
-instance_name  = "erag-gaudi"
+instance_name  = "YOUR_IBM_CLOUD_INSTANCE_NAME"
 instance_zone  = "us-south-2"
 ssh_key_name   = "your-ssh-key-name"
 resource_group = "default"
@@ -103,19 +105,22 @@ ssh_user = "ubuntu"
 hugging_face_token = "YOUR_HUGGING_FACE_TOKEN"
 
 # Solution Version (optional)
-solution_version = "release-2.0.0"  # Options: "release-2.0.0", "release-1.5.0", "main"
+solution_version = "release-2.0.1"  # Options: "release-2.0.1", "release-1.5.0", "main"
 ```
 
 ## Optional Variables
 
 ```hcl
 # Instance Configuration
-instance_profile = "gx3d-160x1792x8gaudi3"  # Intel Gaudi instance
+instance_profile = ""  # Intel instance
+# Example gaudi instance: gx3d-160x1792x8gaudi3
+# Example xeon instance: bx3d-128x640
+
 boot_volume_size = 250                       # GB
 
 # Version Control
-solution_version = "release-2.0.0"         # Git tag or branch (default: "release-2.0.0")
-                                            # Examples: "release-2.0.0", "release-1.5.0", "main"
+solution_version = "release-2.0.1"         # Git tag or branch (default: "release-2.0.1")
+                                            # Examples: "release-2.0.1", "release-1.5.0", "main"
 
 # Model Configuration (Intel Gaudi optimized)
 deployment_type       = "hpu"

deployment/terraform/ibm/main.tf

@@ -302,7 +302,7 @@ resource "null_resource" "run_install_system" {
     }
     inline = [
       "chmod +x /tmp/run_install.sh",
-      "/tmp/run_install.sh --platform ibm --gaudi --stage system --tag ${var.solution_version}"
+      "/tmp/run_install.sh --platform ibm --stage system --tag ${var.solution_version}${var.deployment_type == "hpu" ? " --gaudi" : ""}"
     ]
   }
 }
@@ -326,7 +326,7 @@ resource "null_resource" "run_install_cluster" {
       proxy_port   = var.use_proxy ? var.proxy_port : null
     }
     inline = [
-      "/tmp/run_install.sh --platform ibm --gaudi --stage cluster --tag ${var.solution_version}"
+      "/tmp/run_install.sh --platform ibm --stage cluster --tag ${var.solution_version}${var.deployment_type == "hpu" ? " --gaudi" : ""}"
     ]
   }
 }
@@ -350,7 +350,7 @@ resource "null_resource" "run_install_application" {
       proxy_port   = var.use_proxy ? var.proxy_port : null
     }
     inline = [
-      "/tmp/run_install.sh --platform ibm --gaudi --stage application --tag ${var.solution_version}"
+      "/tmp/run_install.sh --platform ibm --stage application --tag ${var.solution_version}${var.deployment_type == "hpu" ? " --gaudi" : ""}"
     ]
   }
 }

deployment/terraform/scripts/run_install.sh

@@ -247,12 +247,16 @@ configure_platform_defaults() {
             ;;
         ibm)
             log_info "Configuring IBM Cloud platform defaults"
-            STORAGE_DEVICE="/dev/nvme1n1"
-            STORAGE_MOUNT_POINT="/mnt/nvme1"
+            if [[ "$INSTALL_GAUDI_DRIVER" == "true" ]]; then
+                STORAGE_DEVICE="/dev/nvme1n1"
+                STORAGE_MOUNT_POINT="/mnt/nvme1"
+            else
+                STORAGE_DEVICE="/dev/vdb"
+                STORAGE_MOUNT_POINT="/mnt/vdb1"
+            fi
             CONTAINERD_STORAGE_DIR="${STORAGE_MOUNT_POINT}/containerd"
             LOCAL_PATH_STORAGE_DIR="${STORAGE_MOUNT_POINT}/local-path-provisioner"
             ETCD_DATA_DIR="${STORAGE_MOUNT_POINT}/etcd"
-            INSTALL_GAUDI_DRIVER=true
             ;;
     esac
 
@@ -535,7 +539,13 @@ create_partition_and_format_storage() {
         sudo parted -s $device mkpart primary ext4 0% 100%
         sudo partprobe $device
 
-        # Wait for partition to be available
+        # Wait for partition to be available (up to 10 seconds)
+        for i in {1..10}; do
+            if [[ -b "$partition_device" ]]; then
+                break
+            fi
+            sleep 1
+        done
         if [[ ! -b "$partition_device" ]]; then
             log_fatal "Partition device not found after creation: $partition_device"
         fi