ibm-watsonx-orchestrate 1.9.0b0__py3-none-any.whl → 1.9.0b1__py3-none-any.whl

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/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/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/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/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/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

ibm_watsonx_orchestrate/docker/default.env

@@ -1,3 +1,7 @@
+# These credentials are for local development only.
+# They are default values and can be overridden by the user.
+# These do NOT provide access to any production or sensitive
+
 #DOCKER_IAM_KEY=dummy #Must Define in env
 #You can generate any JWT_SECRET with python -c 'import secrets; print(secrets.token_hex(32))'
 JWT_SECRET=11759cbc89dbec64956715e10a854eb38f8b7a1775bdf68142786170f5e8b5b2
@@ -53,24 +57,24 @@ EVENT_BROKER_TTL="3600"
 REGISTRY_URL=
 
 
-SERVER_TAG=22-07-2025
+SERVER_TAG=31-07-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=22-07-2025
+WORKER_TAG=31-07-2025
 WORKER_REGISTRY=
 
 AI_GATEWAY_TAG=21-07-2025
 AI_GATEWAY_REGISTRY=
 
-AGENT_GATEWAY_TAG=07-07-2025
+AGENT_GATEWAY_TAG=29-07-2025
 AGENT_GATEWAY_REGISTRY=
 
 DB_REGISTRY=
 # If you build multiarch set all three of these to the same, we have a pr against main
 # to not have this separation, but we can merge it later
-DBTAG=22-07-2025
-AMDDBTAG=24-06-2025-v1
-ARM64DBTAG=24-06-2025-v1
+DBTAG=29-07-2025-9f3661b
+AMDDBTAG=29-07-2025-9f3661b
+ARM64DBTAG=29-07-2025-9f3661b
 
 UI_REGISTRY=
 UITAG=23-07-2025
@@ -84,10 +88,10 @@ TRM_REGISTRY=
 TR_TAG=23-07-2025-3c60549f0bac275de3e5736265a3fd49cdd3a203
 TR_REGISTRY=
 
-BUILDER_TAG=22-07-2025-v1
+BUILDER_TAG=29-07-2025
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=15-07-2025
+FLOW_RUNTIME_TAG=28-07-2025-v2
 FLOW_RUMTIME_REGISTRY=
 
 
@@ -107,10 +111,10 @@ CPE_REGISTRY=
 WDU_TAG=2.5.0
 WDU_REGISTRY=
 
-DOCPROC_DPS_TAG=20250610-183301-248-865fbc1
-DOCPROC_LLMSERVICE_TAG=20250604-192056-107-e1d4d66
-DOCPROC_CACHE_TAG=20250610-214940-68-f3258f4
-DOCPROC_DPI_TAG=20250702-000808-237-7b1e424d
+DOCPROC_DPS_TAG=20250721-164412-250-503756a
+DOCPROC_LLMSERVICE_TAG=20250725-100249-111-51d3e51
+DOCPROC_CACHE_TAG=20250723-100852-70-9edc1ab
+DOCPROC_DPI_TAG=20250710-195309-241-8f9fb6d7
 DOCPROC_REGISTRY=
 
 # END -- IMAGE REGISTRIES AND TAGS

ibm_watsonx_orchestrate/flow_builder/flows/constants.py

@@ -17,3 +17,5 @@ RESERVED = {
     ANY_USER,
     CURRENT_USER
 }
+
+

ibm_watsonx_orchestrate/flow_builder/flows/flow.py

@@ -8,7 +8,7 @@ from datetime import datetime
 from enum import Enum
 import inspect
 from typing import (
-    Any, AsyncIterator, Callable, cast, List, Sequence, Union, Tuple
+    Any, AsyncIterator, Callable, Optional, cast, List, Sequence, Union, Tuple
 )
 import json
 import logging
@@ -18,7 +18,7 @@ import pytz
 import os
 
 from typing_extensions import Self
-from pydantic import BaseModel, Field, SerializeAsAny
+from pydantic import BaseModel, Field, SerializeAsAny, create_model
 import yaml
 from ibm_watsonx_orchestrate.agent_builder.tools.python_tool import PythonTool
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
@@ -27,11 +27,11 @@ from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ..types import (
     EndNodeSpec, Expression, ForeachPolicy, ForeachSpec, LoopSpec, BranchNodeSpec, MatchPolicy, PromptLLMParameters, PromptNodeSpec, 
     StartNodeSpec, ToolSpec, JsonSchemaObject, ToolRequestBody, ToolResponseBody, UserFieldKind, UserFieldOption, UserFlowSpec, UserNodeSpec, WaitPolicy,
-    DocProcSpec, TextExtractionResponse, File, DecisionsNodeSpec, DecisionsRule
+    DocProcSpec, TextExtractionResponse, File, DecisionsNodeSpec, DecisionsRule, DocExtSpec, LanguageCode
 )
 from .constants import CURRENT_USER, START, END, ANY_USER
 from ..node import (
-    EndNode, Node, PromptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode, DecisionsNode
+    EndNode, Node, PromptNode, StartNode, UserNode, AgentNode, DataMap, ToolNode, DocProcNode, DecisionsNode, DocExtNode
 )
 from ..types import (
     AgentNodeSpec, extract_node_spec, FlowContext, FlowEventType, FlowEvent, FlowSpec,
@@ -433,6 +433,50 @@ class Flow(Node):
         node = self._add_node(node)
         return cast(PromptNode, node)
     
+    def docext(self, 
+            name: str, 
+            llm : str = "meta-llama/llama-3-2-11b-vision-instruct",
+            version: str = "TIP",
+            display_name: str| None = None,
+            input_entities: type[BaseModel]| None = None, 
+            description: str | None = None,
+            input_map: DataMap = None) -> tuple[DocExtNode, type[BaseModel]]:
+        
+        if name is None :
+            raise ValueError("name must be provided.")
+
+        doc_ext_config = DocExtNode.generate_config(llm=llm, input_entites=input_entities)
+
+        DocExtFieldValue = DocExtNode.generate_docext_field_value_model(input_entities=input_entities)
+        
+        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = File)
+        output_schema_obj = _get_json_schema_obj("output", DocExtFieldValue)
+
+        if "$defs" in output_schema_obj.model_extra:
+            output_schema_obj.model_extra.pop("$defs")
+
+        # Create the docext spec
+        task_spec = DocExtSpec(
+            name=name,
+            display_name=display_name if display_name is not None else name,
+            description=description,
+            input_schema=_get_tool_request_body(input_schema_obj),
+            output_schema=_get_tool_response_body(output_schema_obj),
+            output_schema_object = output_schema_obj,
+            config=doc_ext_config,
+            version=version
+        )
+        node = DocExtNode(spec=task_spec)
+
+        # setup input map
+        if input_map:
+            node.input_map = self._get_data_map(input_map)
+        
+        # add the node to the list of node
+        
+        node = self._add_node(node)
+        return cast(DocExtNode, node), DocExtFieldValue
+
     def decisions(self, 
             name: str, 
             display_name: str|None=None,
@@ -486,8 +530,6 @@ class Flow(Node):
         if name is None :
             raise ValueError("name must be provided.")
         
-        if task is None:
-            raise ValueError("task must be provided.")
         
         output_schema_dict = { 
             "text_extraction" : TextExtractionResponse

ibm_watsonx_orchestrate/flow_builder/node.py

@@ -1,11 +1,14 @@
 import json
-from typing import Any, cast
+from typing import Any, cast, Type
 import uuid
 
 import yaml
-from pydantic import BaseModel, Field, SerializeAsAny
+from pydantic import BaseModel, Field, SerializeAsAny, create_model
+from enum import Enum
+
+from .types import EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec, \
+                    DocExtSpec, DocExtConfig, LanguageCode, DecisionsNodeSpec
 
-from .types import EndNodeSpec, NodeSpec, AgentNodeSpec, PromptNodeSpec, StartNodeSpec, ToolNodeSpec, UserFieldKind, UserFieldOption, UserNodeSpec, DocProcSpec, DecisionsNodeSpec
 from .data_map import DataMap
 
 class Node(BaseModel):
@@ -116,6 +119,34 @@ class DocProcNode(Node):
 
     def get_spec(self) -> DocProcSpec:
         return cast(DocProcSpec, self.spec)
+    
+class DocExtNode(Node):
+    def __repr__(self):
+        return f"DocExtNode(name='{self.spec.name}', description='{self.spec.description}')"
+
+    def get_spec(self) -> DocExtSpec:
+        return cast(DocExtSpec, self.spec)
+    
+    @staticmethod
+    def generate_config(llm: str, input_entites: type[BaseModel]) -> DocExtConfig:
+        entities = input_entites.__dict__.values()
+        return DocExtConfig(llm=llm, entities=entities)
+    
+    @staticmethod
+    def generate_docext_field_value_model(input_entities: type[BaseModel]) -> type[BaseModel]:
+        create_field_value_description = lambda field_name: "Extracted value for " + field_name
+
+        DocExtFieldValue = create_model(
+                "DocExtFieldValue",
+                    **{
+                        name: (str, Field(
+                            title=value['name'], 
+                            description=create_field_value_description(value['name']),
+                            )
+                        )
+                        for name, value in input_entities.model_dump().items()})
+        return DocExtFieldValue
+    
 class DecisionsNode(Node):
     def __repr__(self):
         return f"DecisionsNode(name='{self.spec.name}', description='{self.spec.description}')"

ibm_watsonx_orchestrate/flow_builder/types.py

@@ -9,7 +9,6 @@ from typing import (
 )
 
 import docstring_parser
-from munch import Munch
 from pydantic import BaseModel, Field
 
 from langchain_core.tools.base import create_schema_from_function
@@ -164,6 +163,39 @@ class NodeSpec(BaseModel):
 
         return model_spec
 
+class DocExtConfigEntity(BaseModel):
+    name: str = Field(description="Entity name")
+    type: Literal["string", "date", "number"] = Field(default="string",  description="The type of the entity values")
+    description: str = Field(title="Description", description="Description of the entity", default="")
+    field_name: str = Field(title="Field Name", description="The normalized name of the entity", default="")
+    multiple_mentions: bool = Field(title="Multiple mentions",description="When true, we can produce multiple mentions of this entity", default=False)
+    example_value: str = Field(description="Value of example", default="")
+    examples: list[str] = Field(title="Examples", description="Examples that help the LLM understand the expected entity mentions", default=[])
+
+class DocExtConfig(BaseModel):
+    domain: str = Field(description="Domiain of the document", default="other")
+    type: str = Field(description="Document type", default="agreement")
+    llm: str = Field(description="The LLM used for the document extraction", default="meta-llama/llama-3-2-11b-vision-instruct")
+    entities: list[DocExtConfigEntity] = Field(default=[])
+
+class LanguageCode(StrEnum):
+    en = auto()
+    fr = auto()
+
+class DocExtSpec(NodeSpec):
+    version : str = Field(description="A version of the spec")
+    config : DocExtConfig
+
+    def __init__(self, **data):
+        super().__init__(**data)
+        self.kind = "docext"
+
+    def to_json(self) -> dict[str, Any]:
+        model_spec = super().to_json()
+        model_spec["version"] = self.version
+        model_spec["config"] = self.config.model_dump()
+        return model_spec
+    
 class DocProcTask(StrEnum):
     '''
     Possible names for the Document processing task parameter
@@ -674,6 +706,7 @@ class TaskEventType(Enum):
     ON_TASK_END = "task:on_task_end"
     ON_TASK_STREAM = "task:on_task_stream"
     ON_TASK_ERROR = "task:on_task_error"
+    ON_TASK_RESUME= "task:on_task_resume"
 
 class FlowData(BaseModel):
     '''This class represents the data that is passed between tasks in a flow.'''
@@ -708,7 +741,7 @@ class FlowEventType(Enum):
     ON_FLOW_START = "flow:on_flow_start"
     ON_FLOW_END = "flow:on_flow_end"
     ON_FLOW_ERROR = "flow:on_flow_error"
-
+    ON_FLOW_RESUME = "flow:on_flow_resume"
 
 @dataclass
 class FlowEvent:
@@ -763,22 +796,15 @@ class File(BaseModel):
         description='Optional language code of the document, defaults to "en"', 
         title='Document language code', 
         default=LanguageCode.en)
-
-class TextExtraction(BaseModel):
-    '''
-    This class represents the output generated by a "text_extraction" document processing (docproc) operation.
-    Attributes:
-        text (str): the text extracted from the input document.
-    '''
-    text: str = Field(description='The text extracted from the input document', title='Text extraction')
+ 
 
 class TextExtractionResponse(BaseModel):
     '''
     The text extraction operation response.
     Attributes:
-        output (TextExtraction): a wrapper for the text extraction response
+        text (str): the text extracted from the input document.
     '''
-    output: TextExtraction = Field(description='The text extraction response')
+    text : str = Field(description="the text extracted from the input document.")
 
 
 class DecisionsCondition(BaseModel):

ibm_watsonx_orchestrate/flow_builder/utils.py

@@ -6,9 +6,7 @@ import logging
 from pydantic import BaseModel, TypeAdapter
 
 from langchain_core.utils.json_schema import dereference_refs
-from rpds import List
 import typer
-import yaml
 
 from ibm_watsonx_orchestrate.agent_builder.tools.base_tool import BaseTool
 from ibm_watsonx_orchestrate.agent_builder.tools.flow_tool import create_flow_json_tool

{ibm_watsonx_orchestrate-1.9.0b0.dist-info → ibm_watsonx_orchestrate-1.9.0b1.dist-info}/METADATA

@@ -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.dist-info → ibm_watsonx_orchestrate-1.9.0b1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ibm_watsonx_orchestrate/__init__.py,sha256=2UaugDcM-5kU7VcYFZlaSUp30w1dBcZbs9OZJ-nA2vA,427
+ibm_watsonx_orchestrate/__init__.py,sha256=wenjO7SaJ_OKOQuhufZaqfd2aSi-hCVjmnDeyymUqj0,427
 ibm_watsonx_orchestrate/agent_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/agent_builder/agents/__init__.py,sha256=lmZwaiWXD4Ea19nrMwZXaqCxFMG29xNS8vUoZtK3yI4,392
 ibm_watsonx_orchestrate/agent_builder/agents/agent.py,sha256=W0uya81fQPrYZFaO_tlsxBL56Bfpw0xrqdxQJhAZ6XI,983
@@ -27,14 +27,13 @@ ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py,sha256=h9ma18GUQHt88
 ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py,sha256=FDY-y9jy4bNy88i7JG85Zj_YrxnPfJPD0DjwvL9ITxc,12012
 ibm_watsonx_orchestrate/agent_builder/tools/types.py,sha256=SAyDEnWYuguTFk6WxgSDnMaONqDqcr6QhBAxD1u5FDU,8165
 ibm_watsonx_orchestrate/agent_builder/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ibm_watsonx_orchestrate/agent_builder/utils/pydantic_utils.py,sha256=QEanM6FpkmntvS02whdhWx1d4v6zT_1l9ipEbfTgHs8,7623
 ibm_watsonx_orchestrate/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/config.py,sha256=iXjDxymWhAmLSUu6eh7zJR20dYZDzbxcU5VoBdh3VIw,8318
 ibm_watsonx_orchestrate/cli/init_helper.py,sha256=qxnKdFcPtGsV_6RqP_IuLshRxgB004SxzDAkBTExA-4,1675
 ibm_watsonx_orchestrate/cli/main.py,sha256=eE71dfx-EdDYHymYDqXcTjyMXpX0b3cueXOxCI2YLLs,3119
 ibm_watsonx_orchestrate/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py,sha256=Zif3bH3X7j5qf7MWGcr53mJ2oEKXNRHeg3ZHeoHTIqQ,8984
-ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=AvDZ3HSRFzaCQ00Kgu9IsOtq0Dv6HPv2E0o9IrisA7Y,47981
+ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py,sha256=gEsuG3Mbz6shuv8yB2C-dPcqM5mMXUAVO0YniNNOMk0,48379
 ibm_watsonx_orchestrate/cli/commands/channels/channels_command.py,sha256=fVIFhPUTPdxsxIE10nWL-W5wvBR-BS8V8D6r__J8R98,822
 ibm_watsonx_orchestrate/cli/commands/channels/channels_controller.py,sha256=WjQxwJujvo28SsWgfJSXIpkcgniKcskJ2arL4MOz0Ys,455
 ibm_watsonx_orchestrate/cli/commands/channels/types.py,sha256=hMFvWPr7tAmDrhBqtzfkCsrubX3lsU6lapTSOFsUbHM,475
@@ -42,9 +41,9 @@ ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_command.p
 ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py,sha256=CGfmKsCBX4E3HMZ8C0IXD-DHQNwe96V1Y_BxUZM2us0,8557
 ibm_watsonx_orchestrate/cli/commands/chat/chat_command.py,sha256=Q9vg2Z5Fsunu6GQFY_TIsNRhUCa0SSGSPnK4jxSGK34,1581
 ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py,sha256=bZBzaaVMFmGY4Guk-JCknZqd8HvXY5L-FirxpxddQfc,10497
-ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=odsqxthEDyPO3C-GEtSn31sxLjRYgUBf1Vdkg6ZEwms,22290
+ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py,sha256=_s1chAQ4Oqz-A0tQ4LkRAHL3-lGDtalbrLHFJ35lA_I,22293
 ibm_watsonx_orchestrate/cli/commands/copilot/copilot_command.py,sha256=IxasApIyQYWRMKPXKa38ZPVkUvOc4chggSmSGjgQGXc,2345
-ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py,sha256=rr6p4_yqriq3ts1FwFC4aV0ub5UC5D6JqpuLoba4j_U,14808
+ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py,sha256=fLnrBpO6avs-V3wnK_-8KPmT5iRSHejnLOyFhrthlbg,14752
 ibm_watsonx_orchestrate/cli/commands/copilot/copilot_server_controller.py,sha256=AcBE97qNYsRN0ftY_E-AAjKFyVea4fHtU5eB2HsB42I,5619
 ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py,sha256=xwq7gdyjMtl2RYAnLAahGk2wDetr9BStt8yu7JkeBhk,3768
 ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py,sha256=oHZ7LONtPg3-SSnU_rRZryLi8N2mplz5h-LGg4XjzD4,10261
@@ -57,7 +56,7 @@ ibm_watsonx_orchestrate/cli/commands/login/login_command.py,sha256=xArMiojoozg7E
 ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py,sha256=RVZfFCuPWiASkR9Mox61v5SZ1AoRxo4_g9stnbfjCkc,7994
 ibm_watsonx_orchestrate/cli/commands/models/models_command.py,sha256=PW-PIM5Nq0qdCopWjANGBWEuEoA3NLTFThYrN8ggGCI,6425
 ibm_watsonx_orchestrate/cli/commands/models/models_controller.py,sha256=eZSYQUg9TL_-8lgcPVpKIx7MtOE7K_NCvZW9Y9YsFA0,18466
-ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=ho1rSTN_fIJKeKzA5d4BdoQELl_4aF5Gzx90VySbaX8,39687
+ibm_watsonx_orchestrate/cli/commands/server/server_command.py,sha256=9VM9i2g54UwK0wsQ7z1m3KSDItoAslSk693YKGXPq0s,43309
 ibm_watsonx_orchestrate/cli/commands/server/types.py,sha256=UCrgGErbSVBnOzesfjrIii4tTCuVfWemYz5AKGZX0oA,4213
 ibm_watsonx_orchestrate/cli/commands/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/settings/settings_command.py,sha256=CzXRkd-97jXyS6LtaaNtMah-aZu0919dYl-mDwzGThc,344
@@ -65,8 +64,8 @@ ibm_watsonx_orchestrate/cli/commands/settings/observability/__init__.py,sha256=4
 ibm_watsonx_orchestrate/cli/commands/settings/observability/observability_command.py,sha256=TAkpKwoqocsShSgEeR6LzHCzJx16VDQ6cYsbpljxeqI,372
 ibm_watsonx_orchestrate/cli/commands/settings/observability/langfuse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/cli/commands/settings/observability/langfuse/langfuse_command.py,sha256=Wa0L8E44EdxH9LdOvmnluLk_ApJVfTLauNOC1kV4W8k,6515
-ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py,sha256=e2VwpxbN7vwfFp6Gu8hDe2B5c3fdzXYfQBkN15tYR90,4195
-ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py,sha256=fq48tWNbuYFjrHXyVDmJBT96tww5iMdE2iOYUjr-fUc,11563
+ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py,sha256=KI96Yexq4ZkM-VxcW88oMszjnOxbdU7quSxFtvf_ry4,4367
+ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py,sha256=3Jykp5-DzMM_At8kYJto171V6LesaqKdsk2nfg1TRpk,11949
 ibm_watsonx_orchestrate/cli/commands/tools/tools_command.py,sha256=Cuo1ZvlfsymojqbadCqdwwS0HUjaWpe2XQrV70g61_s,3943
 ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py,sha256=uL0WHi0YD7NIYSLOui-CymVHj-h9Y0i3PxS7T2SXSvo,40408
 ibm_watsonx_orchestrate/cli/commands/tools/types.py,sha256=_md0GEa_cTH17NO_moWDY_LNdFvyEFQ1UVB9_FltYiA,173
@@ -97,8 +96,8 @@ ibm_watsonx_orchestrate/client/models/models_client.py,sha256=ZvP3iPgUFw_SXp41kJ
 ibm_watsonx_orchestrate/client/toolkit/toolkit_client.py,sha256=TLFNS39EeBD_t4Y-rX9sGp4sWBDr--mE5qVtHq8Q2hk,3121
 ibm_watsonx_orchestrate/client/tools/tempus_client.py,sha256=24fKDZUOVHBW-Vj4mubnpnUmab5LgGn8u5hOVyJaozI,1804
 ibm_watsonx_orchestrate/client/tools/tool_client.py,sha256=d3i3alVwa0TCN72w9sWOrM20GCbNmnpTnqEOJVbBIFM,1994
-ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=igtukwqVFamdaRbuAbrlLPU8EfZ7hpveWSA0Ka34YHo,39437
-ibm_watsonx_orchestrate/docker/default.env,sha256=84p3BEFeA0mVe_C_WKMi4JLiOhQkFLq8hwI_Hoe1eWE,5894
+ibm_watsonx_orchestrate/docker/compose-lite.yml,sha256=JrBImiUmcIfk0BJfQe_LFgPlLKnfZ1B7PTH1IPfedt0,43150
+ibm_watsonx_orchestrate/docker/default.env,sha256=33zXK2uObFVZzJPZ6O53Zt7e2TKnugIWrUIeFz8jGhc,6087
 ibm_watsonx_orchestrate/docker/proxy-config-single.yaml,sha256=WEbK4ENFuTCYhzRu_QblWp1_GMARgZnx5vReQafkIG8,308
 ibm_watsonx_orchestrate/docker/start-up.sh,sha256=LTtwHp0AidVgjohis2LXGvZnkFQStOiUAxgGABOyeUI,1811
 ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0-py3-none-any.whl,sha256=Hi3-owh5OM0Jz2ihX9nLoojnr7Ky1TV-GelyqLcewLE,2047417
@@ -106,14 +105,14 @@ ibm_watsonx_orchestrate/docker/sdk/ibm_watsonx_orchestrate-0.6.0.tar.gz,sha256=e
 ibm_watsonx_orchestrate/docker/tempus/common-config.yaml,sha256=Zo3F36F5DV4VO_vUg1RG-r4WhcukVh79J2fXhGl6j0A,22
 ibm_watsonx_orchestrate/flow_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/flow_builder/data_map.py,sha256=1brmWWFERDsNG2XGais-5-r58LKUUwBtqwdaLQIFRhE,503
-ibm_watsonx_orchestrate/flow_builder/node.py,sha256=I90a-K_xnEgZrl2NHo_rDmfT2Dj0n0Om15aDnEzhe74,4755
-ibm_watsonx_orchestrate/flow_builder/types.py,sha256=xNXHWxVMx7e954ERveBpl52BFTGOx6pZq4k3zVxJEng,37166
-ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=wTyYnLmB_SsT7A-VxRRnqNZ6jwChJ95EnlZ2wZXU03o,11731
+ibm_watsonx_orchestrate/flow_builder/node.py,sha256=l9J9bMyrvU5yKT2W0G9M-KM5rrfCeuG8jcANegQkrL8,5971
+ibm_watsonx_orchestrate/flow_builder/types.py,sha256=3KckhswqMPsFM7md28K-C93jYgH7LZW4dROeuEuHltU,38519
+ibm_watsonx_orchestrate/flow_builder/utils.py,sha256=OgJxIXeF4-qT3CMct4qi87IzXcUByOldwU0KqhIJ81E,11697
 ibm_watsonx_orchestrate/flow_builder/flows/__init__.py,sha256=dHS2fB-xbVS5yt_yNyZqYeuiAGs78lbCF65AX_VQlD4,1025
-ibm_watsonx_orchestrate/flow_builder/flows/constants.py,sha256=XXYtL5Y1OTjj3jKo2zoJiwb7FCUNu_M43fgU8w591TY,322
+ibm_watsonx_orchestrate/flow_builder/flows/constants.py,sha256=-TGneZyjA4YiAtJJK7OmmjDHYQC4mw2e98MPAZqiB50,324
 ibm_watsonx_orchestrate/flow_builder/flows/decorators.py,sha256=lr4qSWq5PWqlGFf4fzUQZCVQDHBYflrYwZ24S89Aq80,2794
 ibm_watsonx_orchestrate/flow_builder/flows/events.py,sha256=VyaBm0sADwr15LWfKbcBQS1M80NKqzYDj3UlW3OpOf4,2984
-ibm_watsonx_orchestrate/flow_builder/flows/flow.py,sha256=a33ciPFM5VUQlY4BdcXAQVed_MGARNi_GpChIHJ1uS4,55124
+ibm_watsonx_orchestrate/flow_builder/flows/flow.py,sha256=NivtbU33urrE0oi0yGrirh757dz2s9_WZi68h3gf4hQ,56822
 ibm_watsonx_orchestrate/run/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/run/connections.py,sha256=K-65GXPA8GEsVmRdPfMe_LB2G9RfXQUr95wvRUOhkS4,1828
 ibm_watsonx_orchestrate/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -122,8 +121,8 @@ ibm_watsonx_orchestrate/utils/utils.py,sha256=U7z_2iASoFiZ2zM0a_2Mc2Y-P5oOT7hOwu
 ibm_watsonx_orchestrate/utils/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ibm_watsonx_orchestrate/utils/logging/logger.py,sha256=FzeGnidXAjC7yHrvIaj4KZPeaBBSCniZFlwgr5yV3oA,1037
 ibm_watsonx_orchestrate/utils/logging/logging.yaml,sha256=9_TKfuFr1barnOKP0fZT5D6MhddiwsXVTFjtRbcOO5w,314
-ibm_watsonx_orchestrate-1.9.0b0.dist-info/METADATA,sha256=UJ2foCbjQAimZdumyE7BfggZo_iLLQGeNDZKWbtz5Po,1431
-ibm_watsonx_orchestrate-1.9.0b0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-ibm_watsonx_orchestrate-1.9.0b0.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
-ibm_watsonx_orchestrate-1.9.0b0.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
-ibm_watsonx_orchestrate-1.9.0b0.dist-info/RECORD,,
+ibm_watsonx_orchestrate-1.9.0b1.dist-info/METADATA,sha256=Jxibq7aV6_Wqi15CpBEFfRnx8QckAtI2sEx4ZKBs0qA,1362
+ibm_watsonx_orchestrate-1.9.0b1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+ibm_watsonx_orchestrate-1.9.0b1.dist-info/entry_points.txt,sha256=SfIT02-Jen5e99OcLhzbcM9Bdyf8SGVOCtnSplgZdQI,69
+ibm_watsonx_orchestrate-1.9.0b1.dist-info/licenses/LICENSE,sha256=Shgxx7hTdCOkiVRmfGgp_1ISISrwQD7m2f0y8Hsapl4,1083
+ibm_watsonx_orchestrate-1.9.0b1.dist-info/RECORD,,

ibm_watsonx_orchestrate/agent_builder/utils/pydantic_utils.py

@@ -1,149 +0,0 @@
-import json
-from pathlib import Path
-from typing import Any, Dict, Type, Literal
-
-import jsonschema
-from pydantic import BaseModel
-from pydantic.json_schema import DEFAULT_REF_TEMPLATE, GenerateJsonSchema, JsonSchemaMode
-from pydantic.main import IncEx
-from typing_extensions import Self
-
-from ibm_watsonx_orchestrate.agent_builder.tools import ToolRequestBody, ToolResponseBody, JsonSchemaObject
-
-
-def generate_schema_only_base_model(schema: ToolRequestBody | ToolResponseBody | JsonSchemaObject) -> Type[BaseModel]:
-    class SchemaOnlyBaseModel(BaseModel):
-        __primitive__: Any
-        model_config = {
-            'extra': 'allow'
-        }
-        """
-        The purpose of a SchemaOnlyBaseModel is to pass along the json schema represented by schema
-        to a langchain tool's arg_schema
-        :arg schema The json schema to emulate
-        :returns a fake BaseModel that only returns a json schema
-        """
-
-        def __init__(self, /, *args, **kwargs: Any) -> None:
-            if schema.type == 'object':
-                super().__init__(**kwargs)
-                for name, value in kwargs.items():
-                    setattr(self, name, value)
-            else:
-                kwargs={}
-                kwargs['__primitive__'] = args[0]
-                super().__init__(**kwargs)
-                setattr(self, '__primitive__', args[0])
-
-        @classmethod
-        def model_json_schema(cls, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE,
-                              schema_generator: type[GenerateJsonSchema] = GenerateJsonSchema,
-                              mode: JsonSchemaMode = 'validation') -> dict[str, Any]:
-            return schema.model_dump(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def schema(cls, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE) -> Dict[str, Any]:
-            return schema.model_dump(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def schema_json(cls, *, by_alias: bool = True, ref_template: str = DEFAULT_REF_TEMPLATE,
-                        **dumps_kwargs: Any) -> str:
-            return schema.model_dump_json(exclude_unset=True, exclude_none=True)
-
-        @classmethod
-        def model_validate_json(cls, json_data: str | bytes | bytearray, *, strict: bool | None = None,
-                                context: Any | None = None) -> Self:
-            obj = json.loads(json_data)
-            jsonschema.validate(obj, schema=schema.model_dump(exclude_unset=True))
-            if schema.type == 'object':
-                return SchemaOnlyBaseModel(**obj)
-            else:
-                return SchemaOnlyBaseModel(obj)
-
-        @classmethod
-        def model_validate(cls, obj: Any, *, strict: bool | None = None, from_attributes: bool | None = None,
-                           context: Any | None = None) -> Self:
-            jsonschema.validate(obj, schema=schema.model_dump(exclude_unset=True))
-            if schema.type == 'object':
-                return SchemaOnlyBaseModel(**obj)
-            else:
-                return SchemaOnlyBaseModel(obj)
-
-        @classmethod
-        def model_validate_strings(cls, obj: Any, *, strict: bool | None = None, context: Any | None = None) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def validate(cls, value: Any) -> Self:
-            jsonschema.validate(value, schema=schema.model_dump(exclude_unset=True))
-            return SchemaOnlyBaseModel(**value)
-
-        @classmethod
-        def model_construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def model_parametrized_name(cls, params: tuple[type[Any], ...]) -> str:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def model_rebuild(cls, *, force: bool = False, raise_errors: bool = True, _parent_namespace_depth: int = 2,
-                          _types_namespace: Any = None) -> bool | None:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_obj(cls, obj: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_raw(cls, b: str | bytes, *, content_type: str | None = None, encoding: str = 'utf8',
-                      proto: Any | None = None, allow_pickle: bool = False) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def parse_file(cls, path: str | Path, *, content_type: str | None = None, encoding: str = 'utf8',
-                       proto: Any | None = None, allow_pickle: bool = False) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def from_orm(cls, obj: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def construct(cls, _fields_set: set[str] | None = None, **values: Any) -> Self:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        @classmethod
-        def update_forward_refs(cls, **localns: Any) -> None:
-            raise NotImplementedError('unimplemented for SchemaOnlyBaseModel')
-
-        def model_dump(self, *, mode: Literal['json', 'python'] | str = 'python', include: IncEx | None = None,
-                       exclude: IncEx | None = None, context: Any | None = None, by_alias: bool = False,
-                       exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False,
-                       round_trip: bool = False, warnings: bool | Literal['none', 'warn', 'error'] = True,
-                       serialize_as_any: bool = False) -> dict[str, Any]:
-            primitive = getattr(self, '__primitive__', None)
-            if primitive is not None:
-                return primitive
-            else:
-                return super().model_dump(mode=mode, include=include, exclude=exclude, context=context, by_alias=by_alias,
-                                          exclude_unset=exclude_unset, exclude_defaults=exclude_defaults,
-                                          exclude_none=exclude_none, round_trip=round_trip, warnings=warnings,
-                                          serialize_as_any=serialize_as_any)
-
-        def model_dump_json(self, *, indent: int | None = None, include: IncEx | None = None,
-                            exclude: IncEx | None = None, context: Any | None = None, by_alias: bool = False,
-                            exclude_unset: bool = False, exclude_defaults: bool = False, exclude_none: bool = False,
-                            round_trip: bool = False, warnings: bool | Literal['none', 'warn', 'error'] = True,
-                            serialize_as_any: bool = False) -> str:
-            primitive = getattr(self, '__primitive__')
-            if primitive is not None:
-                return json.dumps(primitive)
-            else:
-                return super().model_dump_json(indent=indent, include=include, exclude=exclude, context=context,
-                                           by_alias=by_alias, exclude_unset=exclude_unset,
-                                           exclude_defaults=exclude_defaults, exclude_none=exclude_none,
-                                           round_trip=round_trip, warnings=warnings, serialize_as_any=serialize_as_any)
-
-    return SchemaOnlyBaseModel
-