ibm-watsonx-orchestrate 1.8.1__py3-none-any.whl → 1.9.0__py3-none-any.whl

ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -4,11 +4,13 @@ import os
 import platform
 import subprocess
 import sys
+import shutil
 import tempfile
 import time
 from pathlib import Path
 from urllib.parse import urlparse
 
+import re
 import jwt
 import requests
 import typer
@@ -32,6 +34,13 @@ logger = logging.getLogger(__name__)
 
 server_app = typer.Typer(no_args_is_help=True)
 
+_EXPORT_FILE_TYPES: set[str] = {
+    'py',
+    'yaml',
+    'yml',
+    'json',
+    'env'
+}
 
 _ALWAYS_UNSET: set[str] = {
     "WO_API_KEY",
@@ -43,11 +52,34 @@ _ALWAYS_UNSET: set[str] = {
     "WO_USERNAME",
     "WO_PASSWORD",
 }
+
+NON_SECRET_ENV_ITEMS: set[str] = {
+    "WO_DEVELOPER_EDITION_SOURCE",
+    "WO_INSTANCE",
+    "USE_SAAS_ML_TOOLS_RUNTIME",
+    "AUTHORIZATION_URL",
+    "OPENSOURCE_REGISTRY_PROXY",
+    "SAAS_WDU_RUNTIME",
+    "LATEST_ENV_FILE",
+}
   
 def define_saas_wdu_runtime(value: str = "none") -> None:
     cfg = Config()
     cfg.write(USER_ENV_CACHE_HEADER,"SAAS_WDU_RUNTIME",value)
 
+def set_compose_file_path_in_env(path: str = None) -> None:
+    Config().save(
+        {
+            USER_ENV_CACHE_HEADER: {
+                "DOCKER_COMPOSE_FILE_PATH" : path
+            }
+        }
+    )
+
+def get_compose_file_path_from_env() -> str:
+    return Config().read(USER_ENV_CACHE_HEADER,"DOCKER_COMPOSE_FILE_PATH")
+
+
 def ensure_docker_installed() -> None:
     try:
         subprocess.run(["docker", "--version"], check=True, capture_output=True)
@@ -106,6 +138,11 @@ def docker_login_by_dev_edition_source(env_dict: dict, source: str) -> None:
 
 
 def get_compose_file() -> Path:
+    custom_compose_path = get_compose_file_path_from_env()
+    return Path(custom_compose_path) if custom_compose_path else get_default_compose_file()
+
+
+def get_default_compose_file() -> Path:
     with resources.as_file(
         resources.files("ibm_watsonx_orchestrate.docker").joinpath("compose-lite.yml")
     ) as compose_file:
@@ -283,12 +320,17 @@ def _prepare_clean_env(env_file: Path) -> None:
     for key in keys_to_unset:
         os.environ.pop(key, None)
 
-def write_merged_env_file(merged_env: dict) -> Path:
-    tmp = tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".env")
-    with tmp:
+def write_merged_env_file(merged_env: dict, target_path: str = None) -> Path:
+
+    if target_path:
+        file = open(target_path,"w")
+    else:
+        file = tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".env")
+
+    with file:
         for key, val in merged_env.items():
-            tmp.write(f"{key}={val}\n")
-    return Path(tmp.name)
+            file.write(f"{key}={val}\n")
+    return Path(file.name)
 
 
 def get_dbtag_from_architecture(merged_env_dict: dict) -> str:
@@ -310,14 +352,6 @@ def refresh_local_credentials() -> None:
     clear_protected_env_credentials_token()
     _login(name=PROTECTED_ENV_NAME, apikey=None)
 
-NON_SECRET_ENV_ITEMS = {
-    "WO_DEVELOPER_EDITION_SOURCE",
-    "WO_INSTANCE",
-    "USE_SAAS_ML_TOOLS_RUNTIME",
-    "AUTHORIZATION_URL",
-    "OPENSOURCE_REGISTRY_PROXY",
-    "SAAS_WDU_RUNTIME"
-}
 def persist_user_env(env: dict, include_secrets: bool = False) -> None:
     if include_secrets:
         persistable_env = env
@@ -337,7 +371,10 @@ def get_persisted_user_env() -> dict | None:
     return user_env
 
 def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False, experimental_with_ibm_telemetry=False, with_doc_processing=False) -> None:
+    
+    
     compose_path = get_compose_file()
+
     compose_command = ensure_docker_compose_installed()
     _prepare_clean_env(final_env_file)  
     db_tag = read_env_file(final_env_file).get('DBTAG', None)
@@ -754,6 +791,32 @@ def auto_configure_callback_ip(merged_env_dict: dict) -> dict:
 
     return merged_env_dict
 
+def prepare_server_env_vars(user_env: dict = {}):
+    
+    default_env = read_env_file(get_default_env_file())
+    dev_edition_source = get_dev_edition_source(user_env)
+    default_registry_vars = get_default_registry_env_vars_by_dev_edition_source(default_env, user_env, source=dev_edition_source)
+    
+    # Update the default environment with the default registry variables only if they are not already set
+    for key in default_registry_vars:
+        if key not in default_env or not default_env[key]:
+            default_env[key] = default_registry_vars[key]
+
+    # Merge the default environment with the user environment
+    merged_env_dict = {
+        **default_env,
+        **user_env,
+    }
+
+    merged_env_dict = apply_server_env_dict_defaults(merged_env_dict)
+
+    # Auto-configure callback IP for async tools
+    merged_env_dict = auto_configure_callback_ip(merged_env_dict)
+
+    apply_llm_api_key_defaults(merged_env_dict)
+
+    return merged_env_dict
+
 @server_app.command(name="start")
 def server_start(
     user_env_file: str = typer.Option(
@@ -787,38 +850,37 @@ def server_start(
         '--with-doc-processing', '-d',
         help='Enable IBM Document Processing to extract information from your business documents. Enabling this activates the Watson Document Understanding service.'
     ),
+    custom_compose_file: str = typer.Option(
+        None,
+        '--compose-file', '-f',
+        help='Provide the path to a custom docker-compose file to use instead of the default compose file'
+    ),  
 ):
     confirm_accepts_license_agreement(accept_terms_and_conditions)
 
     define_saas_wdu_runtime()
     
+    ensure_docker_installed()
+
     if user_env_file and not Path(user_env_file).exists():
-        logger.error(f"Error: The specified environment file '{user_env_file}' does not exist.")
+        logger.error(f"The specified environment file '{user_env_file}' does not exist.")
         sys.exit(1)
-    ensure_docker_installed()
 
-    default_env = read_env_file(get_default_env_file())
+    if custom_compose_file:
+        if Path(custom_compose_file).exists():
+            logger.warning("You are using a custom docker compose file, official support will not be available for this configuration")
+        else:
+            logger.error(f"The specified docker-compose file '{custom_compose_file}' does not exist.")
+            sys.exit(1)
+    
+    #Run regardless, to allow this to set compose as 'None' when not in use 
+    set_compose_file_path_in_env(custom_compose_file)
+
     user_env = read_env_file(user_env_file) if user_env_file else {}
     persist_user_env(user_env, include_secrets=persist_env_secrets)
     
-    dev_edition_source = get_dev_edition_source(user_env)
-    default_registry_vars = get_default_registry_env_vars_by_dev_edition_source(default_env, user_env, source=dev_edition_source)
-
-    # Update the default environment with the default registry variables only if they are not already set
-    for key in default_registry_vars:
-        if key not in default_env or not default_env[key]:
-            default_env[key] = default_registry_vars[key]
+    merged_env_dict = prepare_server_env_vars(user_env)  
 
-    # Merge the default environment with the user environment
-    merged_env_dict = {
-        **default_env,
-        **user_env,
-    }
-
-    merged_env_dict = apply_server_env_dict_defaults(merged_env_dict)
-
-    # Auto-configure callback IP for async tools
-    merged_env_dict = auto_configure_callback_ip(merged_env_dict)
     if not _check_exclusive_observibility(experimental_with_langfuse, experimental_with_ibm_telemetry):
         logger.error("Please select either langfuse or ibm telemetry for observability not both")
         sys.exit(1)
@@ -835,14 +897,12 @@ def server_start(
         merged_env_dict['USE_IBM_TELEMETRY'] = 'true'
 
     try:
+        dev_edition_source = get_dev_edition_source(merged_env_dict)
         docker_login_by_dev_edition_source(merged_env_dict, dev_edition_source)
     except ValueError as e:
         logger.error(f"Error: {e}")
         sys.exit(1)
 
-    apply_llm_api_key_defaults(merged_env_dict)
-
-
     final_env_file = write_merged_env_file(merged_env_dict)
 
     run_compose_lite(final_env_file=final_env_file,
@@ -1000,5 +1060,55 @@ def run_db_migration() -> None:
         )
         sys.exit(1)
 
+
+def bump_file_iteration(filename: str) -> str:
+    regex = re.compile(f"^(?P<name>[^\\(\\s\\.\\)]+)(\\((?P<num>\\d+)\\))?(?P<type>\\.(?:{'|'.join(_EXPORT_FILE_TYPES)}))?$")
+    _m = regex.match(filename)
+    iter = int(_m['num']) + 1 if (_m and _m['num']) else 1
+    return f"{_m['name']}({iter}){_m['type'] or ''}"
+
+def get_next_free_file_iteration(filename: str) -> str:
+    while Path(filename).exists():
+        filename = bump_file_iteration(filename)
+    return filename
+
+@server_app.command(name="eject", help="output the docker-compose file and associated env file used to run the server")
+def server_eject(
+    user_env_file: str = typer.Option(
+        None,
+        "--env-file",
+        "-e",
+        help="Path to a .env file that overrides default.env. Then environment variables override both."
+    )
+):
+    
+    if not user_env_file:
+        logger.error(f"To use 'server eject' you need to specify an env file with '--env-file' or '-e'")
+        sys.exit(1)
+
+    if not Path(user_env_file).exists():
+        logger.error(f"The specified environment file '{user_env_file}' does not exist.")
+        sys.exit(1)
+
+    logger.warning("Changes to your docker compose file are not supported")
+    
+    compose_file_path = get_compose_file()
+
+    compose_output_file = get_next_free_file_iteration('docker-compose.yml')
+    logger.info(f"Exporting docker compose file to '{compose_output_file}'")
+
+    shutil.copyfile(compose_file_path,compose_output_file)
+
+
+    user_env = read_env_file(user_env_file)
+    merged_env_dict = prepare_server_env_vars(user_env)
+    
+    env_output_file = get_next_free_file_iteration('server.env')
+    logger.info(f"Exporting env file to '{env_output_file}'")
+
+    write_merged_env_file(merged_env=merged_env_dict,target_path=env_output_file)
+
+    logger.info(f"To make use of the exported configuration file run \"orchestrate server start -e {env_output_file} -f {compose_output_file}\"")
+
 if __name__ == "__main__":
     server_app()

ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py

@@ -64,8 +64,8 @@ def import_toolkit(
     else:
         tool_list = None
 
-    if not package and not package_root:
-        logger.error("You must provide either '--package' or '--package-root'.")
+    if not package and not package_root and not command:
+        logger.error("You must provide either '--package', '--package-root' or '--command'.")
         sys.exit(1)
 
     if package_root and not command:
@@ -85,6 +85,8 @@ def import_toolkit(
             else:
                 logger.error("Unable to infer start up command: '--language' flag must be either 'node' or 'python' when using the '--package' flag without '--command' flag.")
                 sys.exit(1)
+        else:
+            logger.warning(f"Default package installation command for package '{package}' overridden by '--command {command}'.")
 
 
     toolkit_controller = ToolkitController(

ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py

@@ -70,7 +70,7 @@ class ToolkitController:
         self.client = None
 
         self.source: ToolkitSource = (
-            ToolkitSource.PUBLIC_REGISTRY if package else ToolkitSource.FILES
+            ToolkitSource.FILES if package_root else ToolkitSource.PUBLIC_REGISTRY
         )
 
     def get_client(self) -> ToolKitClient:
@@ -105,6 +105,14 @@ class ToolkitController:
         command = command_parts[0]
         args = command_parts[1:]
 
+        if self.package_root:
+            is_folder = os.path.isdir(self.package_root)
+            is_zip_file = os.path.isfile(self.package_root) and zipfile.is_zipfile(self.package_root)
+
+            if not is_folder and not is_zip_file:
+                logger.error(f"Unable to find a valid directory or zip file at location '{self.package_root}'")
+                sys.exit(1)
+
         console = Console()
 
         with tempfile.TemporaryDirectory() as tmpdir:

ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -590,7 +590,7 @@ class ToolsController:
             for tool in tools:
                 tools_list.append(json.loads(tool.dumps_spec()))
 
-            rich.print(JSON(json.dumps(tools_list, indent=4)))
+            rich.print_json(json.dumps(tools_list, indent=4))
         else:
             table = rich.table.Table(show_header=True, header_style="bold white", show_lines=True)
             column_args = {

ibm_watsonx_orchestrate/client/connections/connections_client.py

@@ -3,6 +3,7 @@ from typing import List
 from ibm_cloud_sdk_core.authenticators import MCSPAuthenticator
 from pydantic import BaseModel, ValidationError
 from typing import Optional
+from enum import Enum
 
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient, ClientAPIException
 from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionEnvironment, ConnectionPreference, ConnectionAuthType, ConnectionSecurityScheme, IdpConfigData, AppConfigData, ConnectionType
@@ -12,12 +13,23 @@ import logging
 logger = logging.getLogger(__name__)
 
 
+class FetchConfigAuthTypes(str, Enum):
+    BASIC_AUTH = ConnectionType.BASIC_AUTH.value
+    BEARER_TOKEN = ConnectionType.BEARER_TOKEN.value
+    API_KEY_AUTH = ConnectionType.API_KEY_AUTH.value
+    OAUTH2_AUTH_CODE = ConnectionType.OAUTH2_AUTH_CODE.value
+    OAUTH2_IMPLICIT = 'oauth2_implicit'
+    OAUTH2_PASSWORD = 'oauth2_password'
+    OAUTH2_CLIENT_CREDS = ConnectionType.OAUTH2_CLIENT_CREDS.value
+    OAUTH_ON_BEHALF_OF_FLOW = ConnectionType.OAUTH_ON_BEHALF_OF_FLOW.value
+    KEY_VALUE = ConnectionType.KEY_VALUE.value
+
 class ListConfigsResponse(BaseModel):
     connection_id: str = None,
     app_id: str = None
     name: str = None
     security_scheme: ConnectionSecurityScheme | None = None,
-    auth_type: ConnectionAuthType | None = None,
+    auth_type: FetchConfigAuthTypes | None = None,
     environment:  ConnectionEnvironment | None = None,
     preference: ConnectionPreference | None = None,
     credentials_entered: bool | None = False
@@ -28,7 +40,7 @@ class GetConfigResponse(BaseModel):
     app_id: str = None
     environment: ConnectionEnvironment = None
     preference: ConnectionPreference = None
-    auth_type: ConnectionAuthType | None = None
+    auth_type: FetchConfigAuthTypes | None = None
     sso: bool = None
     security_scheme: ConnectionSecurityScheme = None
     server_url: str | None = None

ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py

@@ -21,13 +21,15 @@ class CPEClient(BaseAPIClient):
         }
 
 
-    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None, agents: Dict[str, Any] = None) -> dict:
+    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None, collaborators: Dict[str, Any] = None, knowledge_bases: Dict[str, Any] = None, selected:bool=False) -> dict:
         payload = {
             "message": user_message,
             "tools": tools,
-            "agents": agents,
+            "collaborators": collaborators,
+            "knowledge_bases": knowledge_bases,
             "chat_id": self.chat_id,
-            "chat_model_name": self.chat_model_name
+            "chat_model_name": self.chat_model_name,
+            'selected':selected
         }
 
         response = self._post_nd_json("/wxo-cpe/create-agent", data=payload)

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -1,3 +1,4 @@
+name: docker
 services:
   ########################
   # Orchestrate Lite dependencies
@@ -121,6 +122,11 @@ services:
       CONNECTIONS_MANAGER_ENDPOINT: http://wxo-server-connection-manager:3001
       AGENT_OPS_API_KEY: ${AGENTOPS_API_KEY}
       AGENTS_OPS_RUNTIME_ENDPOINT: https://frontend-server:443
+      DPI_WO_WDU_SERVER_ENDPOINT: https://wxo-doc-processing-service:8080
+      DPI_RAG_SERVER_ENDPOINT: https://wxo-doc-processing-llm-service:8083
+      IBM_DPS_CACHE_SERVICE: https://wxo-doc-processing-cache:8080
+      DOCPROC_BASE_URL: http://wxo-doc-processing-infra-standalone:9080
+      BUILDER_ASYNC_CALLBACK_ENDPOINT: http://wxo-builder:4025
       IS_OBSERVABILITY_FEATURE_ENABLED: "true"
       ALLOW_INSECURE_TLS: "true"
     command: 'npm start'
@@ -164,7 +170,7 @@ services:
       "
 
   wxo-milvus-standalone:
-    image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/milvusdb/milvus:v2.5.6
+    image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/milvusdb/milvus:v2.5.15
     command: ["milvus", "run", "standalone"]
     security_opt:
       - seccomp:unconfined
@@ -548,6 +554,7 @@ services:
       - TENANT_DEFAULT_PASSWORD=${ES_PASSWORD}
       - TENANT_DEFAULT_HOSTNAME=http://elasticsearch:9200
       - DEFAULT_TENANT_ID=${DEFAULT_TENANT_ID}
+      - FORCE_SINGLE_TENANT=${FORCE_SINGLE_TENANT:-true}
     ports:
       - "9202:9201" # Expose proxy on host port 9202
     networks:
@@ -643,6 +650,7 @@ services:
       - INBOUND_API_KEY=${AGENTOPS_API_KEY}
       - DEFAULT_TENANT_ID=${DEFAULT_TENANT_ID}
       - TENANT_DEFAULT_HOSTNAME=http://elasticsearch:9200
+      - FORCE_SINGLE_TENANT=${FORCE_SINGLE_TENANT:-true}
     ports:
       - "8765:443"
     networks:
@@ -780,13 +788,13 @@ services:
       LANGFUSE_PUBLIC_KEY: ${LANGFUSE_PUBLIC_KEY:-pk-lf-7417757e-d6df-421b-957e-683b76acb5df}
       LANGFUSE_SECRET_KEY: ${LANGFUSE_PRIVATE_KEY:-sk-lf-7bc4da63-7b2b-40c0-b5eb-1e0cf64f9af2}
       LOG_LEVEL: info
-      DISABLE_FLOW_BINDING: true
       DOCPROC_ENABLED: ${DOCPROC_ENABLED:-false}
       DOCPROC_BASE_URL: http://wxo-doc-processing-infra-standalone:9080
       WO_API_KEY: ${WO_API_KEY}
       WO_INSTANCE: ${WO_INSTANCE}
       AUTHORIZATION_URL: ${AUTHORIZATION_URL}
       WO_AUTH_TYPE: ${WO_AUTH_TYPE}
+      FLOW_CALLBACK_REQUEST_RETRIES: "1"
     healthcheck:
       test: curl -k http://localhost:9044/readiness --fail
       interval: 30s
@@ -825,7 +833,7 @@ services:
 ######################## 
 
   wxo-doc-processing-service:
-    image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo_doc_processing_service:${DOCPROC_DPS_TAG:-20250606-172035-246-4191121}
+    image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo_doc_processing_service:${DOCPROC_DPS_TAG:-20250721-164412-250-503756a}
     platform: linux/amd64
     restart: unless-stopped
     environment:
@@ -841,9 +849,9 @@ services:
       IBM_DPS_CACHE_SERVICE: https://wxo-doc-processing-cache:8080
     profiles:
       - docproc
-    # depends_on:
-      # wxo-doc-processing-cache:
-        # condition: service_healthy
+    depends_on:
+      wxo-doc-processing-cache:
+        condition: service_healthy
     ports:
       - "18081:8080"
     healthcheck:
@@ -855,6 +863,7 @@ services:
   wdu-runtime:
     image: ${WDU_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wdu-runtime:${WDU_TAG:-2.4.0}
     platform: linux/amd64
+    user: app
     restart: unless-stopped
     environment:
       MEMORY_MINIMAL: "true"
@@ -894,6 +903,48 @@ services:
     tmpfs:
       - "/dev/shm"
 
+  wxo-doc-processing-cache:
+    image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo_doc_processing_cache:${DOCPROC_CACHE_TAG:-20250723-100852-70-9edc1ab}
+    platform: linux/amd64
+    restart: unless-stopped
+    environment:
+      SERVICE_NAME: wxo-doc-processing-cache
+      LOG_LEVEL: info
+      RATE_LIMITING_ENABLED: "false"
+      USE_DUMMY_CACHE: "false"
+      CACHE_ENFORCE_STRICT_JWT: "false" 
+      PGHOST: wxo-server-db
+      PGPORT: "5432"
+      PGUSER: ${POSTGRES_USER:-postgres}
+      PGPASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      PGDATABASE: wxo-document-processing-cache
+      PG_DB_SCHEMA: dpschema
+      # PG_USE_SSL: false
+      S3_ENDPOINT_URL: http://wxo-server-minio:9000
+      S3_ACCESS_KEY: ${MINIO_ROOT_USER:-minioadmin}
+      S3_SECRET_KEY: ${MINIO_ROOT_PASSWORD:-watsonxorchestrate}
+      S3_REGION: us-east-1
+      S3_BUCKET_NAME: wxo-document-processing-cache
+      VERIFY_CLIENT_CERT: 1
+      # S3_USE_SSL: false
+      # S3_VERIFY_CERT: false
+    profiles:
+      - docproc
+    depends_on:
+      wxo-doc-processing-pg-init:
+        condition: service_completed_successfully
+      wxo-doc-processing-cache-minio-init:
+        condition: service_completed_successfully
+    ports:
+      - "18083:8080"
+    # volumes:
+      # - ./docker/wo_doc_processing_rag_base/etc/certs:/etc/certs
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fk https://localhost:8080/ping"]
+      interval: 30s
+      timeout: 30s
+      retries: 10
+
   wxo-doc-processing-infra-standalone:
     image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo-doc-processing-infra-standalone:${DOCPROC_DPI_TAG:-2025-06-13-dev-1}
     platform: linux/amd64
@@ -918,7 +969,7 @@ services:
       SIDECAR_METERED_ENABLED: "false"
       DPI_DEBUG: "false"
       DPI_WO_WDU_SERVER_ENDPOINT: https://wxo-doc-processing-service:8080
-      # DPI_RAG_SERVER_ENDPOINT: https://wxo-doc-processing-llm-service:8083
+      DPI_RAG_SERVER_ENDPOINT: https://wxo-doc-processing-llm-service:8083
       DISABLE_TLS: true
       STANDALONE_DPI: "true"
     depends_on:
@@ -928,8 +979,8 @@ services:
         condition: service_completed_successfully
       wxo-doc-processing-service:
         condition: service_healthy
-      # wxo-doc-processing-llm-service:
-      #   condition: service_healthy
+      wxo-doc-processing-llm-service:
+        condition: service_healthy
     ports:
       - 19080:9080
       - 19443:9443
@@ -939,6 +990,33 @@ services:
       timeout: 30s
       retries: 10
 
+  wxo-doc-processing-llm-service:
+    image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo_doc_processing_rag:${DOCPROC_LLMSERVICE_TAG:-20250725-100249-111-51d3e51}
+    platform: linux/amd64
+    restart: unless-stopped
+    environment:
+      SERVICE_NAME: wxo-doc-processing-llm-service
+      LOG_LEVEL: info
+      WATSONX_API_ENDPOINT: ${WATSONX_URL:-https://us-south.ml.cloud.ibm.com}
+      WATSONX_API_KEY: ${WATSONX_APIKEY}
+      WATSONX_PROJECT_ID: ${WATSONX_PROJECT_ID}
+      WATSONX_SPACE_ID: ${WATSONX_SPACE_ID}
+      IBM_DPS_CACHE_SERVICE: 'wxo-doc-processing-cache:8080'
+    profiles:
+      - docproc
+    depends_on:
+      wxo-doc-processing-cache: 
+        condition: service_healthy
+    ports:
+      - "18084:8083"
+    # volumes:
+      # - ./conf/rag/certs:/etc/certs
+    healthcheck:
+      test: ["CMD-SHELL", "curl -fk https://localhost:8083/ping"]
+      interval: 30s
+      timeout: 30s
+      retries: 10
+
   wxo-doc-processing-infra-pg-init:
     image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo-doc-processing-infra-pg-init:${DOCPROC_DPI_TAG:-2025-06-13-dev-1}
     platform: linux/amd64
@@ -963,6 +1041,28 @@ services:
       timeout: 5s
       retries: 50
 
+  wxo-doc-processing-pg-init:
+    image: ${DOCPROC_REGISTRY:-us.icr.io/watson-orchestrate-private}/document-processing/wo_doc_processing_cache_rds_init:${DOCPROC_CACHE_TAG:-20250723-100852-70-9edc1ab}
+    platform: linux/amd64
+    environment:
+      PGHOST: wxo-server-db
+      PGPORT: "5432"
+      PGUSER: ${POSTGRES_USER:-postgres}
+      PGPASSWORD: ${POSTGRES_PASSWORD:-postgres}
+      PGDATABASE: wxo-document-processing-cache
+      PG_DB_SCHEMA: dpschema
+      # PG_USE_SSL: false
+    profiles:
+      - docproc
+    depends_on:
+      wxo-server-db:
+        condition: service_started
+    healthcheck:
+      test: ["CMD-SHELL", "psql -h localhost -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_PASSWORD:-postgres}"]
+      interval: 1s
+      timeout: 5s
+      retries: 50
+
   wxo-doc-processing-dpi-minio-init:
     image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/minio/mc:latest
     platform: linux/amd64
@@ -978,6 +1078,21 @@ services:
       exit 0;
       "
 
+  wxo-doc-processing-cache-minio-init:
+    image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/minio/mc:latest
+    platform: linux/amd64
+    profiles:
+      - docproc
+    depends_on:
+      wxo-server-minio:
+        condition: service_healthy
+    entrypoint: >
+      /bin/sh -c "
+      /usr/bin/mc alias set wxo-server-minio http://wxo-server-minio:9000 ${MINIO_ROOT_USER:-minioadmin} ${MINIO_ROOT_PASSWORD:-watsonxorchestrate};
+      /usr/bin/mc mb wxo-server-minio/wxo-document-processing-cache;
+      exit 0;
+      "
+
 volumes:
   tools:
     driver: local