ibm-watsonx-orchestrate 1.12.0b0__py3-none-any.whl → 1.13.0b0__py3-none-any.whl

ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py

@@ -1,4 +1,4 @@
-from typing import Dict, Any
+from typing import Dict, Any, List
 from uuid import uuid4
 
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient
@@ -37,6 +37,39 @@ class CPEClient(BaseAPIClient):
         if response:
             return response[-1]
 
+    def refine_agent_with_chats(self, instruction: str, tools: Dict[str, Any], collaborators: Dict[str, Any], knowledge_bases: Dict[str, Any], trajectories_with_feedback: List[List[dict]], model: str | None = None) -> dict:
+        """
+        Refines an agent's instruction using provided chat trajectories and optional model name.
+        This method sends a payload containing the agent's current instruction and a list of chat trajectories
+        to the Copilot Prompt Engine (CPE) for refinement.
+        Optionally, a target model name can be specified to use in the refinement process.
+        Parameters:
+            instruction (str): The current instruction or prompt associated with the agent.
+            tools (Dict[str, Any]) - a dictionary containing the selected tools
+            collaborators (Dict[str, Any]) - a dictionary containing the selected collaborators
+            knowledge_bases (Dict[str, Any]) - a dictionary containing the selected knowledge_bases
+            trajectories_with_feedback (List[List[dict]]): A list of chat trajectories, where each trajectory is a list
+                of message dictionaries that may include user feedback.
+            model (str | None): Optional. The name of the model to use for refinement.
+        Returns:
+            dict: The last response from the CPE containing the refined instruction.
+        """
+
+        payload = {
+            "trajectories_with_feedback":trajectories_with_feedback,
+            "instruction":instruction,
+            "tools": tools,
+            "collaborators": collaborators,
+            "knowledge_bases": knowledge_bases
+        }
+
+        if model:
+            payload["target_model_name"] = model
+
+        response = self._post_nd_json("/wxo-cpe/refine-agent-with-trajectories", data=payload)
+
+        if response:
+            return response[-1]
 
     def init_with_context(self, model: str | None = None, context_data: Dict[str, Any] = None) -> dict:
         payload = {

ibm_watsonx_orchestrate/client/knowledge_bases/knowledge_base_client.py

@@ -30,8 +30,12 @@ class KnowledgeBaseClient(BaseAPIClient):
     def get_by_id(self, knowledge_base_id: str) -> dict:
         return self._get(f"{self.base_endpoint}/{knowledge_base_id}")
 
-    def get_by_names(self, name: List[str]) -> List[dict]:
-        formatted_names = [f"names={x}" for x in name]
+    def get_by_names(self, names: List[str]) -> List[dict]:
+        formatted_names = [f"names={x}" for x in names]
+        return self._get(f"{self.base_endpoint}?{'&'.join(formatted_names)}")
+    
+    def get_by_ids(self, ids: List[str]) -> List[dict]:
+        formatted_names = [f"ids={x}" for x in ids]
         return self._get(f"{self.base_endpoint}?{'&'.join(formatted_names)}")
     
     def status(self, knowledge_base_id: str) -> dict:

ibm_watsonx_orchestrate/client/model_policies/model_policies_client.py

@@ -58,7 +58,7 @@ class ModelPoliciesClient(BaseAPIClient):
                 return []
             raise e
     
-    def get_draft_by_name(self, policy_name: str) -> ModelPolicy:
+    def get_draft_by_name(self, policy_name: str) -> List[ModelPolicy]:
         return self.get_drafts_by_names([policy_name])
 
 

ibm_watsonx_orchestrate/client/models/models_client.py

@@ -60,7 +60,7 @@ class ModelsClient(BaseAPIClient):
                 return []
             raise e
     
-    def get_draft_by_name(self, model_name: str) -> ListVirtualModel:
+    def get_draft_by_name(self, model_name: str) -> List[ListVirtualModel]:
         return self.get_drafts_by_names([model_name])
 
 

ibm_watsonx_orchestrate/client/threads/threads_client.py

@@ -0,0 +1,34 @@
+from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient
+
+
+class ThreadsClient(BaseAPIClient):
+    """
+    Client to handle read operations for Threads (chat history- trajectories) endpoints
+    """
+
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self.base_endpoint = "/threads"
+
+    def get_all_threads(self, agent_id) -> dict:
+        return self._get(self.base_endpoint, params={"agent_id": agent_id})
+
+    def get_thread_messages(self, thread_id) -> dict:
+        return self._get(f"{self.base_endpoint}/{thread_id}/messages")
+
+    def get(self) -> dict:
+        return self._get(self.base_endpoint)
+
+    def get_threads_messages(self, thread_ids: list[str]):
+        """
+        get the messages for a list of threads (chats) ids
+        :param thread_ids:
+        :param threads_client:
+        :return:
+        """
+        all_thread_messages = []
+        for thread_id in thread_ids:
+            thread_messages = self.get_thread_messages(thread_id=thread_id)
+            all_thread_messages.append(thread_messages)
+
+        return all_thread_messages

ibm_watsonx_orchestrate/client/utils.py

@@ -175,23 +175,24 @@ def instantiate_client(client: type[T] , url: str | None=None) -> T:
         raise FileNotFoundError(message)
 
 
+def get_arm_architectures () -> list[str]:
+    # NOTE: intentionally omitting 32 bit arm architectures.
+    return ["aarch64", "arm64", "arm", "aarch64_be", "armv8b", "armv8l"]
+
+
 def get_architecture () -> str:
     arch = platform.machine().lower()
     if arch in ("amd64", "x86_64"):
         return "amd64"
-
-    elif arch == "i386":
-        return "386"
-
-    elif arch in ("aarch64", "arm64", "arm"):
-        return "arm"
+    elif arch in get_arm_architectures():
+        return arch
 
     else:
         raise Exception("Unsupported architecture %s" % arch)
 
 
 def is_arm_architecture () -> bool:
-    return platform.machine().lower() in ("aarch64", "arm64", "arm")
+    return platform.machine().lower() in get_arm_architectures()
 
 
 def get_os_type () -> str:
@@ -201,3 +202,24 @@ def get_os_type () -> str:
 
     else:
         raise Exception("Unsupported operating system %s" % system)
+
+def concat_bin_files(target_bin_file: str, source_files: list[str], read_chunk_size: int = None,
+                     delete_source_files_post: bool = True) -> None:
+    if read_chunk_size is None:
+        # default read chunk size is 100 MB.
+        read_chunk_size = 100 * 1024 * 1024
+
+    with open(target_bin_file, "wb") as target:
+        for source_file in source_files:
+            with open(source_file, "rb") as source:
+                while True:
+                    source_chunk = source.read(read_chunk_size)
+
+                    if source_chunk:
+                        target.write(source_chunk)
+
+                    else:
+                        break
+
+            if delete_source_files_post is True:
+                os.remove(source_file)

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -49,8 +49,28 @@ services:
       MAX_POOL: 60
       DEPLOYMENT_MODE: laptop
       SUFFIXLIST: ${CM_SUFFIXLIST:-[]}
+      BACKEND_BASE_URL: http://localhost:3001
+      CALLBACK_URL: http://localhost:3001/auth/oauth2/callback
     ports:
       - 3001:3001
+  
+  wxo-server-connections-ui:
+    image: ${CONNECTIONS_UI_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-connections-ui:${CONNECTIONS_UI_TAG:-latest}
+    platform: linux/amd64
+    profiles: [connections-ui]
+    environment:
+      PORT: 3412
+      WXO_CONNECTIONS_URL: http://wxo-server-connection-manager:3001
+      DEPLOYMENT_MODE: laptop 
+      WXO_URL: http://localhost:3412
+      ENV: production
+      WXO_SERVER_URL: http://localhost:4321
+      TENANT_ID: ${REACT_APP_TENANT_ID}
+      WXO_CHAT_URL: http://localhost:3000
+    ports:
+     - "3412:3412"
+    networks:
+      - default
 
   ai-gateway:
     image: ${AI_GATEWAY_REGISTRY:-us.icr.io/watson-orchestrate-private}/ai-gateway:${AI_GATEWAY_TAG:-latest}
@@ -73,6 +93,24 @@ services:
     environment:
       JWT_SECRET: ${JWT_SECRET}
       DEPLOYMENT_PLATFORM: laptop-lite
+      CALLBACK_HOST_URL: ${CALLBACK_HOST_URL:-}
+      REDIS_URL: redis://wxo-server-redis:6379/0
+    entrypoint: >
+      sh -c '
+        if [ ! -z "$$CALLBACK_HOST_URL" ]; then
+          GATEWAY_IP=$$(echo "$$CALLBACK_HOST_URL" | sed "s|http://||" | cut -d: -f1)
+          export CALL_BACK_URL="http://$$GATEWAY_IP:8989"
+          echo "Auto-configured CALL_BACK_URL: $$CALL_BACK_URL"
+        else
+          export CALL_BACK_URL="http://wxo-agent-gateway:8989"
+          echo "Using fallback CALL_BACK_URL: $$CALL_BACK_URL"
+        fi
+        if [ $$# -eq 0 ]; then
+          exec ./conditional_script.sh
+        else
+          exec "$$@"
+        fi
+      '
 
   ui:
     image: ${UI_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-chat:${UITAG:-latest}
@@ -105,6 +143,7 @@ services:
       STANDALONE: "true"
       STREAM_TIMEOUT: ${STREAM_TIMEOUT:-120000}
       WXO_VOICE_URL: http://localhost:9876/v1
+      DPS_CACHE_URL: http://localhost:18083
     command: "./StartServer.sh"
     ports:
       - "3000:4002"
@@ -127,13 +166,13 @@ services:
       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
+      IBM_DPS_CACHE_SERVICE: http://wxo-doc-processing-cache:8080
       DOCPROC_BASE_URL: http://wxo-doc-processing-infra-standalone:9080
       BUILDER_ASYNC_CALLBACK_ENDPOINT: http://wxo-builder:4025
       DOCPROC_ENABLED: ${DOCPROC_ENABLED:-false}
       IS_OBSERVABILITY_FEATURE_ENABLED: "true"
       ALLOW_INSECURE_TLS: "true"
-      ENABLE_EDIT_PROMPTS: "false"
+      ENABLE_EDIT_PROMPTS: "true"
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
       ENABLE_EMBED_SCRIPT: "true"
     command: 'npm start'
@@ -202,7 +241,7 @@ services:
       - "wxo-server-minio"
 
   wxo-milvus-etcd:
-    image: quay.io/coreos/etcd:v3.5.18
+    image: ${ETCD_REGISTRY:-quay.io}/coreos/etcd:${ETCD_TAG:-v3.5.18}
     environment:
       - ETCD_AUTO_COMPACTION_MODE=revision
       - ETCD_AUTO_COMPACTION_RETENTION=1000
@@ -353,6 +392,10 @@ services:
       ES_HOST: http://elasticsearch:9200
       ORIGIN_HEADER: "internal"
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
+      WATSONX_SERVER: WXO
+      EVALUATION_PLATFORM: lite-local
+      AGENTOPS_BACKEND_URL: https://frontend-server:443
+      OBSERVABILITY_POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/wxo_observability
 
   wxo-server-worker:
     image: ${WORKER_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-server-conversation_controller:${WORKER_TAG:-latest}
@@ -453,6 +496,10 @@ services:
       CPD_VERIFY: ${CPD_VERIFY}
       CALLBACK_HOST_URL: ${CALLBACK_HOST_URL:-http://wxo-server:4321}
       LANGFLOW_ENABLED: ${LANGFLOW_ENABLED:-false}
+      WATSONX_SERVER: WXO
+      EVALUATION_PLATFORM: lite-local
+      AGENTOPS_BACKEND_URL: https://frontend-server:443
+      OBSERVABILITY_POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/wxo_observability
   
   tools-runtime-manager:
     image: ${TRM_REGISTRY:-us.icr.io/watson-orchestrate-private}/tools-runtime-manager:${TRM_TAG:-latest}
@@ -533,7 +580,7 @@ services:
   # IBM AGENT-OPS
   ########################
   elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.19.0
+    image: ${ELASTICSEARCH_REGISTRY:-docker.elastic.co}/elasticsearch/elasticsearch:${ELASTICSEARCH_TAG:-8.19.0}
     profiles: [ibm-telemetry]
     environment:
       - discovery.type=single-node
@@ -813,6 +860,7 @@ services:
       AUTHORIZATION_URL: ${AUTHORIZATION_URL}
       WO_AUTH_TYPE: ${WO_AUTH_TYPE}
       FLOW_CALLBACK_REQUEST_RETRIES: "1"
+      DOCPROC_CACHE_SERVER_URL: http://wxo-doc-processing-cache:8080
     healthcheck:
       test: curl -k http://localhost:9044/readiness --fail
       interval: 30s
@@ -858,13 +906,13 @@ services:
       SERVICE_NAME: wxo-doc-processing-service
       LOG_LEVEL: info
       VERIFY_CLIENT_CERT: 0
-      SERVICE_URL: ${SERVICE_URL:-https://wxo-doc-processing-cache:8080}
+      SERVICE_URL: ${SERVICE_URL:-http://wxo-doc-processing-cache:8080}
       RATE_LIMITING_ENABLED: "false"
       SHOULD_CACHE_IMAGES: "false"
       HANDWRITING_ENABLED: "true"
       WDU_RUNTIME_URL: wdu-runtime:8080
       WDU_TIMEOUT_SECS: "180"
-      IBM_DPS_CACHE_SERVICE: https://wxo-doc-processing-cache:8080
+      IBM_DPS_CACHE_SERVICE: http://wxo-doc-processing-cache:8080
     profiles:
       - docproc
     depends_on:
@@ -959,6 +1007,8 @@ services:
       VERIFY_CLIENT_CERT: 1
       # S3_USE_SSL: false
       # S3_VERIFY_CERT: false
+      ISTIO_ENABLED: true
+      IS_ADK_ENV: true
     profiles:
       - docproc
     depends_on:
@@ -971,7 +1021,7 @@ services:
     # volumes:
       # - ./docker/wo_doc_processing_rag_base/etc/certs:/etc/certs
     healthcheck:
-      test: ["CMD-SHELL", "curl -fk https://localhost:8080/ping"]
+      test: ["CMD-SHELL", "curl -fk http://localhost:8080/ping"]
       interval: 30s
       timeout: 30s
       retries: 10
@@ -1030,7 +1080,7 @@ services:
       LOG_LEVEL: info
       WATSONX_API_ENDPOINT: ${WATSONX_URL:-https://us-south.ml.cloud.ibm.com}
       WXO_SERVER_BASE_URL : http://wxo-server:4321
-      IBM_DPS_CACHE_SERVICE: 'wxo-doc-processing-cache:8080'
+      IBM_DPS_CACHE_SERVICE: 'http://wxo-doc-processing-cache:8080'
     profiles:
       - docproc
     depends_on:

ibm_watsonx_orchestrate/docker/default.env

@@ -58,41 +58,44 @@ REGISTRY_URL=
 
 
 
-SERVER_TAG=09-09-2025-2164abd
+SERVER_TAG=24-09-2025-17d7c67
 SERVER_REGISTRY=
 
-WORKER_TAG=09-09-2025-2164abd
+WORKER_TAG=24-09-2025-17d7c67
 WORKER_REGISTRY=
 
 AI_GATEWAY_TAG=20-08-2025-9ed6d40
 AI_GATEWAY_REGISTRY=
 
-AGENT_GATEWAY_TAG=29-07-2025
+AGENT_GATEWAY_TAG=19-10-2025-e48ad3a
 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=09-09-2025-fb76647
-AMDDBTAG=09-09-2025-fb76647
-ARM64DBTAG=09-09-2025-fb76647
+DBTAG=17-09-2025-8a9aff2
+AMDDBTAG=17-09-2025-8a9aff2
+ARM64DBTAG=17-09-2025-8a9aff2
 
 UI_REGISTRY=
-UITAG=29-08-2025
+UITAG=22-09-2025-e35f498
 
 CM_REGISTRY=
-CM_TAG=24-07-2025
+CM_TAG=16-09-2025-e33b344
 
-TRM_TAG=09-09-2025-6e9d73d
+CONNECTIONS_UI_REGISTRY=
+CONNECTIONS_UI_TAG=15-09-2025-98aa9da
+
+TRM_TAG=16-09-2025-cb6b9df
 TRM_REGISTRY=
 
-TR_TAG=09-09-2025-6e9d73d
+TR_TAG=24-09-2025-a515038
 TR_REGISTRY=
 
-BUILDER_TAG=12-09-2025-e441686
+BUILDER_TAG=24-09-2025-f9b68d8
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=15-09-2025-2e8478c
+FLOW_RUNTIME_TAG=22-09-2025-0bd3f58
 FLOW_RUMTIME_REGISTRY=
 
 
@@ -105,7 +108,7 @@ JAEGER_PROXY_REGISTRY=
 SOCKET_HANDLER_TAG=29-05-2025
 SOCKET_HANDLER_REGISTRY=
 
-CPE_TAG=29-08-2025-e612bea
+CPE_TAG=24-09-2025-2be3101
 CPE_REGISTRY=
 
 VOICE_CONTROLLER_TAG=12-09-2025-0e04772
@@ -118,12 +121,18 @@ LANGFLOW_IMAGE=
 WDU_TAG=2.7.0
 WDU_REGISTRY=
 
-DOCPROC_DPS_TAG=20250904-181617-287-1ca2bf1
-DOCPROC_LLMSERVICE_TAG=20250904-main-136-b94360e
-DOCPROC_CACHE_TAG=20250902-master-83-748d456
-DOCPROC_DPI_TAG=20250905-092707-286-8c6b8f92
+DOCPROC_DPS_TAG=20250910-165658-290-c566031
+DOCPROC_LLMSERVICE_TAG=20250915-main-139-7a36ad3
+DOCPROC_CACHE_TAG=20250916-master-86-454157f
+DOCPROC_DPI_TAG=20250910-214413-288-a348dfd9
 DOCPROC_REGISTRY=
 
+ETCD_TAG=
+ETCD_REGISTRY=
+
+ELASTICSEARCH_TAG=
+ELASTICSEARCH_REGISTRY=
+
 # END -- IMAGE REGISTRIES AND TAGS
 
 CPD_VERIFY=true

ibm_watsonx_orchestrate/flow_builder/flows/decorators.py

@@ -8,6 +8,8 @@ import logging
 import inspect
 from typing import Callable, Optional, Sequence
 from pydantic import BaseModel
+
+from ...agent_builder.models.types import ListVirtualModel
 from ..types import extract_node_spec, UserNodeSpec, FlowSpec
 
 from .flow import FlowFactory, Flow
@@ -33,8 +35,11 @@ def flow(*args,
          description: str|None=None,
          input_schema: type[BaseModel] | None = None,
          output_schema: type[BaseModel] | None = None,
+         private_schema: type[BaseModel] | None = None,
          initiators: Sequence[str] = (),
-         schedulable: bool = False):
+         schedulable: bool = False,
+         llm_model: str|ListVirtualModel|None=None,
+         agent_conversation_memory_turns_limit: int|None=None):
     """Decorator to mark a function as a flow model builder."""
 
     def decorator(func: Callable):
@@ -59,8 +64,11 @@ def flow(*args,
                              description = node_spec.description,
                              input_schema = input_schema,
                              output_schema = output_schema,
+                             private_schema = private_schema,
                              initiators = initiators,
-                             schedulable = schedulable)
+                             schedulable = schedulable,
+                             llm_model = llm_model,
+                             agent_conversation_memory_turns_limit = agent_conversation_memory_turns_limit)
 
         # logger.info("Creating flow model: %s", a_model.spec.name)