ibm-watsonx-orchestrate 1.4.2__py3-none-any.whl → 1.5.0b1__py3-none-any.whl

ibm_watsonx_orchestrate/client/tools/tool_client.py

@@ -1,3 +1,4 @@
+from typing import Literal
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient, ClientAPIException
 from typing_extensions import List
 
@@ -32,7 +33,7 @@ class ToolClient(BaseAPIClient):
         formatted_tool_names = [f"names={x}" for x in tool_names]
         return self._get(f"/tools?{'&'.join(formatted_tool_names)}")
     
-    def get_draft_by_id(self, tool_id: str) -> List[dict]:
+    def get_draft_by_id(self, tool_id: str) -> dict | Literal[""]:
         if tool_id is None:
             return ""
         else:

ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -323,6 +323,7 @@ services:
       AI_GATEWAY_BASE_URL: ${AI_GATEWAY_BASE_URL}
       AI_GATEWAY_ENABLED : ${AI_GATEWAY_ENABLED}
 
+
   wxo-server-worker:
     image: ${WORKER_REGISTRY:-us.icr.io/watson-orchestrate-private}/wxo-server-conversation_controller:${WORKER_TAG:-latest}
     platform: linux/amd64
@@ -450,6 +451,7 @@ services:
       STORAGE_S3_REGION: us-east-1
       AWS_ACCESS_KEY_ID: ${MINIO_ROOT_USER:-minioadmin}
       AWS_SECRET_ACCESS_KEY: ${MINIO_ROOT_PASSWORD:-watsonxorchestrate}
+      TEMPUS_HOST_NAME: http://wxo-tempus-runtime:9044
     extra_hosts:
       - "host.docker.internal:host-gateway"
 

ibm_watsonx_orchestrate/docker/default.env

@@ -53,38 +53,37 @@ 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=22-05-2025
+SERVER_TAG=05-06-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=22-05-2025
+WORKER_TAG=03-06-2025
 WORKER_REGISTRY=
 
-AI_GATEWAY_TAG=20-05-2025
+AI_GATEWAY_TAG=03-06-2025
 AI_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=21-05-2025
-AMDDBTAG=21-05-2025
-ARM64DBTAG=21-05-2025
+DBTAG=07-06-2025
+AMDDBTAG=07-06-2025
+ARM64DBTAG=07-06-2025
 
 UI_REGISTRY=
-UITAG=23-05-2025
+UITAG=03-06-2025
 
 CM_REGISTRY=
 CM_TAG=13-05-2025
 
-TRM_TAG=23-05-2025
+TRM_TAG=11-06-2025-1-5-0
 TRM_REGISTRY=
 
-TR_TAG=23-05-2025
+TR_TAG=11-06-2025-1-5-0
 TR_REGISTRY=
 
-BUILDER_TAG=21-05-2025
+BUILDER_TAG=03-06-2025
 BUILDER_REGISTRY=
 
-
 FLOW_RUNTIME_TAG=13-05-2025
 FLOW_RUMTIME_REGISTRY=
 

ibm_watsonx_orchestrate/experimental/flow_builder/data_map.py

@@ -0,0 +1,19 @@
+from typing import Any, Optional, Self
+from pydantic import BaseModel, Field, SerializeAsAny
+
+from .types import (
+    Assignment
+)
+
+
+class DataMap(BaseModel):
+    maps: Optional[list[Assignment]] = Field(default_factory=list)
+
+    def to_json(self) -> dict[str, Any]:
+        model_spec = {}
+        if self.maps and len(self.maps) > 0:
+            model_spec["maps"] = [assignment.model_dump() for assignment in self.maps]
+
+    def add(self, line: Assignment) -> Self:
+        self.maps.append(line)
+

ibm_watsonx_orchestrate/experimental/flow_builder/flows/__init__.py

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

ibm_watsonx_orchestrate/experimental/flow_builder/flows/constants.py

@@ -7,11 +7,13 @@ START = sys.intern("__start__")
 END = sys.intern("__end__")
 
 ANY_USER = sys.intern("__any_user__")
+CURRENT_USER = sys.intern("__current_user__")
 FLOW_CONTEXT = sys.intern("FlowContext")
 
 RESERVED = {
     START,
     END,
     FLOW_CONTEXT,
-    ANY_USER
+    ANY_USER,
+    CURRENT_USER
 }

ibm_watsonx_orchestrate/experimental/flow_builder/flows/decorators.py

@@ -27,8 +27,8 @@ class FlowWrapper:
             raise ValueError("Return value must be of type Flow")
         return result
     
-def user(*args, name: str|None=None, description: str|None=None, owners: Sequence[str] = ()):
-    """Decorator to mark a function as a task specification."""
+def user(*args, name: str|None=None, description: str|None=None, owners: Sequence[str]|None = None, message: str | None = None):
+    """Decorator to mark a function as a user node specification."""
 
     def decorator(func: Callable):
         node_spec = extract_node_spec(func, name, description)
@@ -39,6 +39,7 @@ def user(*args, name: str|None=None, description: str|None=None, owners: Sequenc
                                           input_schema = node_spec.input_schema,
                                           output_schema = node_spec.output_schema,
                                           output_schema_object = node_spec.output_schema_object,
+                                          text=message,
                                           owners=owners)
 
         @wraps(func)