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

ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,8 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.4.2"
+__version__ = "1.5.0"
+
 
 
 

ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py

@@ -201,6 +201,7 @@ class ConversationalSearchConfig(BaseModel):
     confidence_thresholds: Optional[ConfidenceThresholds] = None
 
 class KnowledgeBaseBuiltInVectorIndexConfig(BaseModel):
+    embeddings_model_name: Optional[str] = None
     chunk_size: Optional[int] = None
     chunk_overlap: Optional[int] = None
     limit: Optional[int] = None

ibm_watsonx_orchestrate/cli/commands/models/models_command.py

@@ -14,7 +14,7 @@ from ibm_watsonx_orchestrate.client.model_policies.model_policies_client import
 from ibm_watsonx_orchestrate.client.model_policies.types import ModelPolicy, ModelPolicyInner, \
     ModelPolicyRetry, ModelPolicyStrategy, ModelPolicyStrategyMode, ModelPolicyTarget
 from ibm_watsonx_orchestrate.client.models.models_client import ModelsClient
-from ibm_watsonx_orchestrate.client.models.types import CreateVirtualModel, ANTHROPIC_DEFAULT_MAX_TOKENS
+from ibm_watsonx_orchestrate.client.models.types import CreateVirtualModel, ModelType, ANTHROPIC_DEFAULT_MAX_TOKENS
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
 
 logger = logging.getLogger(__name__)
@@ -156,6 +156,10 @@ def models_add(
         str,
         typer.Option('--display-name', help='What name should this llm appear as within the ui'),
     ] = None,
+    type: Annotated[
+        ModelType,
+        typer.Option('--type', help='What type of model is it'),
+    ] = ModelType.CHAT,
 
 ):
     from ibm_watsonx_orchestrate.cli.commands.models.env_file_model_provider_mapper import env_file_to_model_ProviderConfig # lazily import this because the lut building is expensive
@@ -178,7 +182,8 @@ def models_add(
         description=description,
         tags=[],
         provider_config=provider_config,
-        config=config
+        config=config,
+        model_type=type
     )
 
     models_client.create(model)

ibm_watsonx_orchestrate/client/models/types.py

@@ -29,6 +29,18 @@ class  ModelProvider(str, Enum):
 
     def __repr__(self):
         return self.value
+
+class  ModelType(str, Enum):
+    CHAT = 'chat'
+    CHAT_VISION = 'chat_vision'
+    COMPLETION = 'completion'
+    EMBEDDING = 'embedding'
+
+    def __str__(self):
+        return self.value
+
+    def __repr__(self):
+        return self.value
     
 
 class ProviderConfig(BaseModel):
@@ -158,7 +170,7 @@ class CreateVirtualModel(BaseModel):
     config: Optional[dict] = None
     provider_config: ProviderConfig
     tags: List[str]
-    model_type: str = 'chat'
+    model_type: str = ModelType.CHAT
 
 
 class ListVirtualModel(BaseModel):

ibm_watsonx_orchestrate/client/toolkit/toolkit_client.py

@@ -8,10 +8,10 @@ class ToolKitClient(BaseAPIClient):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        self.base_endpoint = "/orchestrate/toolkits" if is_local_dev(self.base_url) else "/toolkits"
 
     def get(self) -> dict:
-        return self._get(self.base_endpoint)
+        return self._get("/toolkits")
+
 
     # POST /toolkits/prepare/list-tools
     def list_tools(self, zip_file_path: str, command: str, args: List[str]) -> List[str]:
@@ -33,7 +33,8 @@ class ToolKitClient(BaseAPIClient):
                 "file": (filename, f, "application/zip"),
             }
 
-            response = self._post(f"{self.base_endpoint}/prepare/list-tools", files=files)
+            response = self._post("/toolkits/prepare/list-tools", files=files)
+
 
         return response.get("tools", [])
 
@@ -44,7 +45,8 @@ class ToolKitClient(BaseAPIClient):
         Creates new toolkit metadata
         """
         try:
-            return self._post(self.base_endpoint, data=payload)
+            return self._post("/toolkits", data=payload)
+
         except ClientAPIException as e:
             if e.response.status_code == 400 and "already exists" in e.response.text:
                 raise ClientAPIException(
@@ -63,25 +65,28 @@ class ToolKitClient(BaseAPIClient):
             files = {
                 "file": (filename, f, "application/zip", {"Expires": "0"})
             }
-            return self._post(f"{self.base_endpoint}/{toolkit_id}/upload", files=files)
+            return self._post(f"/toolkits/{toolkit_id}/upload", files=files)
         
     # DELETE /toolkits/{toolkit-id} 
     def delete(self, toolkit_id: str) -> dict:
-        return self._delete(f"{self.base_endpoint}/{toolkit_id}")
+        return self._delete(f"/toolkits/{toolkit_id}")
+
 
     def get_draft_by_name(self, toolkit_name: str) -> List[dict]:
         return self.get_drafts_by_names([toolkit_name])
 
     def get_drafts_by_names(self, toolkit_names: List[str]) -> List[dict]:
         formatted_toolkit_names = [f"names={x}" for x in toolkit_names]
-        return self._get(f"{self.base_endpoint}?{'&'.join(formatted_toolkit_names)}")
+
+        return self._get(f"/toolkits?{'&'.join(formatted_toolkit_names)}")
+
     
     def get_draft_by_id(self, toolkit_id: str) -> dict:
         if toolkit_id is None:
             return ""
         else:
             try:
-                toolkit = self._get(f"{self.base_endpoint}/{toolkit_id}")
+                toolkit = self._get(f"/toolkits/{toolkit_id}")
                 return toolkit
             except ClientAPIException as e:
                 if e.response.status_code == 404 and "not found with the given name" in e.response.text:

ibm_watsonx_orchestrate/docker/default.env

@@ -53,21 +53,21 @@ 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=30-05-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=22-05-2025
+WORKER_TAG=30-05-2025
 WORKER_REGISTRY=
 
-AI_GATEWAY_TAG=20-05-2025
+AI_GATEWAY_TAG=30-05-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=30-05-2025
+AMDDBTAG=30-05-2025
+ARM64DBTAG=30-05-2025
 
 UI_REGISTRY=
 UITAG=23-05-2025
@@ -75,13 +75,13 @@ UITAG=23-05-2025
 CM_REGISTRY=
 CM_TAG=13-05-2025
 
-TRM_TAG=23-05-2025
+TRM_TAG=25-05-2025
 TRM_REGISTRY=
 
-TR_TAG=23-05-2025
+TR_TAG=25-05-2025
 TR_REGISTRY=
 
-BUILDER_TAG=21-05-2025
+BUILDER_TAG=27-05-2025
 BUILDER_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)