ibm-watsonx-orchestrate 1.9.0b0__tar.gz → 1.9.0b1__tar.gz

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.9.0b0
+Version: 1.9.0b1
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -13,10 +13,8 @@ Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: ibm-cloud-sdk-core>=3.24.2
 Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.8
 Requires-Dist: jsonref==1.1.0
-Requires-Dist: jsonschema<5.0.0,>=4.23.0
 Requires-Dist: langchain-core<=0.3.63
 Requires-Dist: langsmith<=0.3.45
-Requires-Dist: munch>=4.0.0
 Requires-Dist: packaging>=24.2
 Requires-Dist: pydantic<3.0.0,>=2.10.3
 Requires-Dist: pyjwt<3.0.0,>=2.10.1

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/pyproject.toml

@@ -22,7 +22,6 @@ dependencies = [
     "httpx>=0.28.1,<1.0.0",
     "ibm-cloud-sdk-core>=3.24.2",
     "jsonref==1.1.0",
-    "jsonschema>=4.23.0,<5.0.0",
     "langchain-core<=0.3.63",
     "langsmith<=0.3.45",
     "packaging>=24.2",
@@ -34,7 +33,6 @@ dependencies = [
     "rich>=13.9.4,<14.0.0",
     "typer>=0.15.1,<1.0.0",
     "urllib3>=2.2.3",
-    "munch>=4.0.0",
     "pytz>=2025.2",
     "redis>=6.0.0",
     "ibm_watsonx_orchestrate_evaluation_framework==1.0.8"

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.9.0b0"
+__version__ = "1.9.0b1"
 
 
 

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py

@@ -750,6 +750,13 @@ class AgentsController:
     def list_agents(self, kind: AgentKind=None, verbose: bool=False):
         parse_errors = []
 
+        if verbose:
+            verbose_output_dictionary = {
+                "native":[],
+                "assistant":[],
+                "external":[]  
+            }
+
         if kind == AgentKind.NATIVE or kind is None:
             response = self.get_native_client().get()
             native_agents = []
@@ -769,7 +776,7 @@ class AgentsController:
                 for agent in native_agents:
                     agents_list.append(json.loads(agent.dumps_spec()))
 
-                rich.print_json(json.dumps(agents_list, indent=4))
+                verbose_output_dictionary["native"] = agents_list
             else:
                 native_table = rich.table.Table(
                     show_header=True, 
@@ -832,7 +839,7 @@ class AgentsController:
             if verbose:
                 for agent in external_agents:
                     external_agents_list.append(json.loads(agent.dumps_spec()))
-                rich.print_json(json.dumps(external_agents_list, indent=4))
+                verbose_output_dictionary["external"] = external_agents_list
             else:
                 external_table = rich.table.Table(
                     show_header=True, 
@@ -899,8 +906,10 @@ class AgentsController:
                     assistant_agent.config.authorization_url = response_data.get("authorization_url", assistant_agent.config.authorization_url)
 
             if verbose:
+                assistant_agent_specs = []
                 for agent in assistant_agents:
-                    rich.print_json(agent.dumps_spec())
+                    assistant_agent_specs.append(json.loads(agent.dumps_spec()))
+                verbose_output_dictionary["assistant"] = assistant_agent_specs
             else:
                 assistants_table = rich.table.Table(
                     show_header=True, 
@@ -938,6 +947,9 @@ class AgentsController:
                     )
                 rich.print(assistants_table)
 
+        if verbose:
+            rich.print_json(data=verbose_output_dictionary)
+
         for error in parse_errors:
             for l in error:
                 logger.error(l)

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -169,7 +169,7 @@ def _validate_connection_params(type: ConnectionType, **args) -> None:
     
 
 def _parse_entry(entry: str) -> dict[str,str]:
-    split_entry = entry.split('=')
+    split_entry = entry.split('=', 1)
     if len(split_entry) != 2:
         message = f"The entry '{entry}' is not in the expected form '<key>=<value>'"
         logger.error(message)

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py

@@ -137,9 +137,6 @@ def gather_utterances(max: int) -> list[str]:
     while count < max:
         utterance = Prompt.ask("  [green]>[/green]").strip()
 
-        if utterance.lower() == 'q':
-            break
-
         if utterance:
             utterances.append(utterance)
             count += 1

{ibm_watsonx_orchestrate-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/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-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/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-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/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-1.9.0b0 → ibm_watsonx_orchestrate-1.9.0b1}/src/ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -1,3 +1,4 @@
+name: docker
 services:
   ########################
   # Orchestrate Lite dependencies
@@ -780,7 +781,6 @@ 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}
@@ -825,7 +825,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 +841,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 +855,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 +895,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 +961,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 +971,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 +982,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 +1033,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 +1070,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