ibm-watsonx-orchestrate 1.5.0b1__py3-none-any.whl → 1.6.0b0__py3-none-any.whl

ibm_watsonx_orchestrate/client/utils.py

@@ -9,7 +9,9 @@ from ibm_watsonx_orchestrate.cli.config import (
     CONTEXT_SECTION_HEADER,
     CONTEXT_ACTIVE_ENV_OPT,
     ENVIRONMENTS_SECTION_HEADER,
-    ENV_WXO_URL_OPT
+    ENV_WXO_URL_OPT,
+    BYPASS_SSL,
+    VERIFY
 )
 from threading import Lock
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient
@@ -45,6 +47,11 @@ def is_local_dev(url: str | None = None) -> bool:
 
     return False
 
+def is_cpd_env(url: str) -> bool:
+    if url.lower().startswith("https://cpd"):
+        return True
+    return False
+
 def check_token_validity(token: str) -> bool:
     try:
         token_claimset = jwt.decode(token, options={"verify_signature": False})
@@ -65,6 +72,17 @@ def instantiate_client(client: type[T] , url: str | None=None) -> T:
             with open(os.path.join(DEFAULT_CONFIG_FILE_FOLDER, DEFAULT_CONFIG_FILE), "r") as f:
                 config = yaml_safe_load(f)
             active_env = config.get(CONTEXT_SECTION_HEADER, {}).get(CONTEXT_ACTIVE_ENV_OPT)
+            bypass_ssl = (
+                config.get(ENVIRONMENTS_SECTION_HEADER, {})
+                    .get(active_env, {})
+                    .get(BYPASS_SSL, None)
+            )
+
+            verify = (
+                config.get(ENVIRONMENTS_SECTION_HEADER, {})
+                    .get(active_env, {})
+                    .get(VERIFY, None)
+            )
 
             if not url:
                 url = config.get(ENVIRONMENTS_SECTION_HEADER, {}).get(active_env, {}).get(ENV_WXO_URL_OPT)
@@ -86,7 +104,14 @@ def instantiate_client(client: type[T] , url: str | None=None) -> T:
             if not check_token_validity(token):
                 logger.error(f"The token found for environment '{active_env}' is missing or expired. Use `orchestrate env activate {active_env}` to fetch a new one")
                 exit(1)
-            client_instance = client(base_url=url, api_key=token, is_local=is_local_dev(url))
+            is_cpd = is_cpd_env(url)
+            if is_cpd:
+                if bypass_ssl is True:
+                    client_instance = client(base_url=url, api_key=token, is_local=is_local_dev(url), verify=False)
+                elif verify is not None:
+                    client_instance = client(base_url=url, api_key=token, is_local=is_local_dev(url), verify=verify)
+            else:
+                client_instance = client(base_url=url, api_key=token, is_local=is_local_dev(url))
 
         return client_instance
     except FileNotFoundError as e:

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -46,6 +46,7 @@ services:
       WXO_SERVER_URL: http://wxo-server:4321
       MAX_POOL: 60
       DEPLOYMENT_MODE: laptop
+      SUFFIXLIST: '["global_05d7ba72", "ibm_184bdbd3"]'
     ports:
       - 3001:3001
 
@@ -60,6 +61,16 @@ services:
       WATSONX_URL: ${WATSONX_URL}
       WATSONX_SPACE_ID: ${WATSONX_SPACE_ID}
 
+  wxo-agent-gateway:
+    image: ${AGENT_GATEWAY_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-agent-gateway:${AGENT_GATEWAY_TAG:-latest}
+    platform: linux/amd64
+    restart: unless-stopped
+    ports:
+      - "8989:8989"
+    environment:
+      JWT_SECRET: ${JWT_SECRET}
+      DEPLOYMENT_PLATFORM: laptop-lite
+
   ui:
     image: ${UI_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-chat:${UITAG:-latest}
     platform: linux/amd64
@@ -107,6 +118,7 @@ services:
       WXO_DEPLOYMENT_TYPE: 'laptop'
       AGENT_RUNTIME_ENDPOINT: http://wxo-server:4321
       TEMPUS_RUNTIME_ENDPOINT: http://wxo-tempus-runtime:9044
+      CONNECTIONS_MANAGER_ENDPOINT: http://wxo-server-connection-manager:3001
     command: 'npm start'
     ports:
       - '4025:4025'
@@ -190,19 +202,8 @@ services:
       retries: 3
   
   socket-handler:
-    container_name: socket-handler
-    profiles:
-      - webhooks
-      - ui
-    build:
-      context: .
-      dockerfile: ./socket_handler/Dockerfile
-      target: socket-handler
-      args:
-        GIT_BRANCH: "main"
-      ssh:
-        - default
-    image: docker.io/library/socket-handler:latest
+    image: ${SOCKET_HANDLER_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-socket-handler:${SOCKET_HANDLER_TAG:-latest}
+    platform: linux/amd64
     command: "npm start"
     ports:
       - 4001:4001
@@ -248,12 +249,14 @@ services:
           condition: service_started
           required: False
     environment:
+      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY:-testapikey} 
       PIP_NO_CACHE_DIR:
       JWT_SECRET: ${JWT_SECRET}
       TRM_BASE_URL: http://tools-runtime-manager:8080
       POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/postgres
       # POSTGRES_POOL_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:6432/postgres
       CELERY_BROKER_URL: redis://wxo-server-redis:6379/0
+      AGENT_GATEWAY_URI: http://wxo-agent-gateway:8989
       CELERY_RESULT_BACKEND: redis://wxo-server-redis:6379/0
       FLOWER_URL: http://wxo-server-flower:5555
       DB_ENCRYPTION_KEY: thisisthedbencryptionkeyforlocaltestingonly
@@ -340,11 +343,13 @@ services:
       - ./sdk:/packages
       - tools:/tools
     environment:
+      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY:-testapikey} 
       AI_GATEWAY_ENABLED : ${AI_GATEWAY_ENABLED}
       AI_GATEWAY_BASE_URL: ${AI_GATEWAY_BASE_URL}
       IS_WXO_LITE: 'TRUE'
       TRM_BASE_URL: http://tools-runtime-manager:8080
       AGENT_STEP_DETAILS: redis://wxo-server-redis:6379/0
+      AGENT_GATEWAY_URI: http://wxo-agent-gateway:8989
       JWT_SECRET: ${JWT_SECRET}
       POSTGRES_URL: postgresql://${POSTGRES_USER:-postgres}:${POSTGRES_PASSWORD:-postgres}@wxo-server-db:5432/postgres
       CELERY_BROKER_URL: redis://wxo-server-redis:6379/0
@@ -410,6 +415,8 @@ services:
       USE_SAAS_ML_TOOLS_RUNTIME: ${USE_SAAS_ML_TOOLS_RUNTIME}
       AUTHORIZATION_URL: ${AUTHORIZATION_URL}
       WO_AUTH_TYPE: ${WO_AUTH_TYPE}
+      WXO_DEPLOYMENT_PLATFORM: saas
+      CALLBACK_HOST_URL: http://wxo-server:4321
   
   tools-runtime-manager:
     image: ${TRM_REGISTRY:-us.icr.io/watson-orchestrate-private}/tools-runtime-manager:${TRM_TAG:-latest}
@@ -424,6 +431,7 @@ services:
       - $HOME/.kube/config:/root/.kube/config
       - tools-runtime-data:/shared-data
     environment:
+      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY:-testapikey} 
       KUBECONFIG: /root/.kube/config
       K8S_SERVER: "https://lima-rancher-desktop:6443"  # Kubernetes API on host
       DB_HOST: wxo-server-db
@@ -439,7 +447,6 @@ services:
       SERVER_HOST: ${SERVER_HOST}
       SCHEMA_FILE_PATH: ${SCHEMA_FILE_PATH}
       WXO_BASE_URL: ${WXO_BASE_URL}
-      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY}
       NAMESPACE: ${NAMESPACE}
       DEPLOYMENT_PLATFORM: ${DEPLOYMENT_PLATFORM}
       VOLUME_MOUNT_PATH: "/shared-data"
@@ -469,7 +476,7 @@ services:
     environment:
       DEPLOYMENT_PLATFORM: ${DEPLOYMENT_PLATFORM}
       VOLUME_MOUNT_PATH: "/shared-data"
-      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY}
+      RUNTIME_MANAGER_API_KEY: ${RUNTIME_MANAGER_API_KEY:-testapikey} 
       TOOLS_RUNTIME_MANAGER_BASE_URL: ${TOOLS_RUNTIME_MANAGER_BASE_URL}
       DB_HOST: wxo-server-db
       DB_PORT: ${DB_PORT:-5432}  # Ensure default port
@@ -589,7 +596,8 @@ services:
       SERVER_HTTP_PORT: "9044"
       SERVER_CONTEXT_PATH:
       SERVER_JWK_URL: https://wo-ibm-dev.verify.ibm.com/v1.0/endpoint/default/jwks
-      SERVER_CALLBACK_URL: http://wxo-tempus-runtime:9044/task/callback/{thread_id}/{requestId}
+      SERVER_STANDALONE_TASK_CALLBACK_URL: http://localhost:9044/task/callback/{thread_id}/{requestId}
+      SERVER_FLOW_CALLBACK_URL: http://localhost:9044/v1/flows/{flow_instance_id}/{task_instance_id}/resume/async
       JWT_SECRET: ${JWT_SECRET}
       SERVER_INTERNAL_PROTOCOL: http
       SERVER_INTERNAL_HOSTNAME: wxo-tempus-runtime
@@ -598,6 +606,7 @@ services:
       WATSONX_AI_PROJECT_ID: ""
       WATSONX_AI_SPACE_ID: ${WATSONX_SPACE_ID}
       WATSONX_AI_APIKEY: ${WATSONX_APIKEY}
+      WATSONX_AI_SERVICE_URL: ${WATSONX_URL}
       PG_HOST: wxo-server-db
       PG_PORT: "5432"
       PG_USER: ${POSTGRES_USER:-postgres}
@@ -616,6 +625,7 @@ 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
     healthcheck:
       test: curl -k http://localhost:9044/readiness --fail
       interval: 5s
@@ -652,4 +662,4 @@ volumes:
 networks:
   default:
     name: wxo-server
-    
+    

ibm_watsonx_orchestrate/docker/default.env

@@ -22,7 +22,6 @@ ASSISTANT_EMBEDDINGS_API_BASE=https://us-south.ml.cloud.ibm.com
 #ASSISTANT_EMBEDDINGS_SPACE_ID=#Will default to WATSONX_SPACE_ID if specified
 ROUTING_LLM_API_BASE=https://us-south.ml.cloud.ibm.com
 ROUTING_LLM_MODEL_ID=watsonx/ibm/granite-8b-unified-api-model-v2
-AUTHORIZATION_URL=https://iam.test.cloud.ibm.com/identity/token
 #ROUTING_LLM_API_KEY=#Will default to WATSONX_APIKEY if specified
 #ROUTING_LLM_SPACE_ID=#Will default to WATSONX_SPACE_ID if specified
 ASSISTANT_INDEX_CHUNK_SIZE=1000
@@ -53,44 +52,51 @@ EVENT_BROKER_TTL="-1"
 # See get_default_registry_env_vars_by_dev_edition_source() in src/ibm_watsonx_orchestrate/cli/commands/server/server_command.py for more details.
 REGISTRY_URL=
 
-SERVER_TAG=05-06-2025
+SERVER_TAG=19-06-2025-v2
+
 SERVER_REGISTRY=
 
-WORKER_TAG=03-06-2025
+WORKER_TAG=19-06-2025-v2
 WORKER_REGISTRY=
 
-AI_GATEWAY_TAG=03-06-2025
+AI_GATEWAY_TAG=18-06-2025-v2
 AI_GATEWAY_REGISTRY=
 
+AGENT_GATEWAY_TAG=16-06-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=07-06-2025
-AMDDBTAG=07-06-2025
-ARM64DBTAG=07-06-2025
+DBTAG=17-06-2025-v1
+AMDDBTAG=17-06-2025-v1
+ARM64DBTAG=17-06-2025-v1
 
 UI_REGISTRY=
-UITAG=03-06-2025
+UITAG=19-06-2025
 
 CM_REGISTRY=
-CM_TAG=13-05-2025
+CM_TAG=18-06-2025
 
-TRM_TAG=11-06-2025-1-5-0
+TRM_TAG=10-06-2025
 TRM_REGISTRY=
 
-TR_TAG=11-06-2025-1-5-0
+TR_TAG=10-06-2025
 TR_REGISTRY=
 
-BUILDER_TAG=03-06-2025
+BUILDER_TAG=16-06-2025
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=13-05-2025
+FLOW_RUNTIME_TAG=17-06-2025
 FLOW_RUMTIME_REGISTRY=
 
+SOCKET_HANDLER_TAG=29-05-2025
+SOCKET_HANDLER_REGISTRY=
+
 # END -- IMAGE REGISTRIES AND TAGS
 
 TAVILY_API_KEY=dummy_tavily_api_key
-PREFERRED_MODELS=meta-llama/llama-3-1-8b-instruct,meta-llama/llama-3-1-70b-instruct,meta-llama/llama-3-405b-instruct,meta-llama/llama-3-2-1b-instruct,meta-llama/llama-3-2-3b-instruct,meta-llama/llama-3-2-11b-vision-instruct,meta-llama/llama-3-2-90b-vision-instruct,mistralai/mistral-large,mistralai/mixtral-8x7b-instruct-v01,ibm/granite-3-2b-instruct,ibm/granite-3-8b-instruct
+PREFERRED_MODELS=meta-llama/llama-3-2-90b-vision-instruct,meta-llama/llama-3-405b-instruct
 INCOMPATIBLE_MODELS=flan,embedding,cross-encoder,tinytimemixers
 #WATSONX_APIKEY= #Must define in .env
 WATSONX_URL=https://us-south.ml.cloud.ibm.com
@@ -119,7 +125,7 @@ TOOLS_RUNTIME_MANAGER_BASE_URL="http://tools-runtime-manager:8080"
 CONNECTION_SERVICE_BASE_URL="http://wxo-server-connection-manager:3001"
 AI_GATEWAY_BASE_URL="http://ai-gateway:8787/v1"
 AI_GATEWAY_ENABLED=True
-
+AGENT_GATEWAY_URI="http://wxo-agent-gateway:8989"
 #To Prevent warnings
 VECTOR_STORE_PROVIDER=
 MILVUS_URI=

ibm_watsonx_orchestrate/{experimental/flow_builder → flow_builder}/flows/__init__.py

@@ -1,8 +1,8 @@
 from .constants import START, END, RESERVED
 from ..types import FlowContext, TaskData, TaskEventType
-from ..node import UserNode, AgentNode, StartNode, EndNode, PromptNode
+from ..node import UserNode, AgentNode, StartNode, EndNode, PromptNode, ToolNode
 from .flow import Flow, CompiledFlow, FlowRun, FlowEvent, FlowEventType, FlowFactory, MatchPolicy, WaitPolicy, ForeachPolicy, Branch, Foreach, Loop
-from .decorators import user, flow_spec, flow
+from .decorators import flow
 from ..data_map import Assignment, DataMap
 
 
@@ -20,6 +20,7 @@ __all__ = [
     "StartNode",
     "EndNode",
     "PromptNode",
+    "ToolNode",
     "Assignment",
     "DataMap",
 

ibm_watsonx_orchestrate/flow_builder/flows/decorators.py

@@ -0,0 +1,77 @@
+"""
+A set of decorators to help define different Flow constructs.
+"""
+
+import asyncio
+from functools import wraps
+import logging
+import inspect
+from typing import Callable, Optional, Sequence
+from pydantic import BaseModel
+from ..types import extract_node_spec, UserNodeSpec, FlowSpec
+
+from .flow import FlowFactory, Flow
+
+logger = logging.getLogger(__name__)
+
+
+class FlowWrapper:
+    def __init__(self, func, a_model):
+        self.func = func
+        self.a_model = a_model
+        wraps(func)(self)  # Preserve metadata
+
+    def __call__(self, *args, **kwargs):
+        result = self.func(self.a_model)
+        if not isinstance(result, Flow):
+            raise ValueError("Return value must be of type Flow")
+        return result
+    
+def flow(*args, 
+         name: Optional[str]=None, 
+         display_name: Optional[str]=None,
+         description: str|None=None,
+         input_schema: type[BaseModel] | None = None,
+         output_schema: type[BaseModel] | None = None,
+         initiators: Sequence[str] = ()):
+    """Decorator to mark a function as a flow model builder."""
+
+    def decorator(func: Callable):
+        """
+        Decorator that takes a function as an argument and returns a wrapper function.
+        The wrapper function takes a single argument of type Flow and calls the original function with the created flow as an argument.
+        """
+
+        sig = inspect.signature(func)
+        if len(sig.parameters) != 1:
+            raise ValueError("Only one argument is allowed")
+        param = list(sig.parameters.values())[0]
+        if param.annotation != Flow:
+            raise ValueError("Argument must be of type Flow")
+        if sig.return_annotation != Flow:
+            raise ValueError("Return value must be of type Flow")
+        
+        node_spec = extract_node_spec(func, name, description)
+        a_model = FlowFactory.create_flow(
+                             name = node_spec.name,
+                             display_name = display_name,
+                             description = node_spec.description,
+                             input_schema = input_schema,
+                             output_schema = output_schema,
+                             initiators = initiators)
+
+        # logger.info("Creating flow model: %s", a_model.spec.name)
+
+        # @wraps(func)
+        # def wrapper(*args, **kwargs):
+        #     result = func(a_model)
+        #     if not isinstance(result, Flow):
+        #         raise ValueError("Return value must be of type Flow")
+        #     return result
+
+        return FlowWrapper(func, a_model)
+
+    if len(args) == 1 and callable(args[0]):
+        return decorator(args[0])
+    else:
+        return decorator

ibm_watsonx_orchestrate/{experimental/flow_builder → flow_builder}/flows/events.py

@@ -47,8 +47,13 @@ class StreamConsumer:
 def deserialize_flow_event(byte_data: bytes) -> FlowEvent:
     """Deserialize byte data into a FlowEvent object."""
     # Decode the byte data
-    decoded_data = byte_data[b'message'].decode('utf-8')
+    decoded_data = byte_data[b'data'].decode('utf-8') if b'data' in byte_data else None
+    if not decoded_data:
+        decoded_data = byte_data[b'message'].decode('utf-8') if b'message' in byte_data else None
     
+    if not decoded_data:
+        raise ValueError("No data in received event.")
+
     # Parse the JSON string into a dictionary
     parsed_data = json.loads(decoded_data)