ibm-watsonx-orchestrate 1.9.0b1__tar.gz → 1.9.0b2__tar.gz

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.9.0b1
+Version: 1.9.0b2
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.9.0b1"
+__version__ = "1.9.0b2"
 
 
 

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py

@@ -86,11 +86,10 @@ class GenerationConfiguration(BaseModel):
     {
         "model_id": "meta-llama/llama-3-1-70b-instruct",
         "prompt_instruction": "When the documents are in different languages, you should respond in english.",
-        "retrieval_confidence_threshold": "Lowest",
         "generated_response_length": "Moderate",
-        "response_confidence_threshold": "Low",
         "display_text_no_results_found": "no docs found",
         "display_text_connectivity_issue": "conn failed",
+        "idk_message": "I dont know",
     }
     """
 
@@ -99,6 +98,7 @@ class GenerationConfiguration(BaseModel):
     generated_response_length: Optional[GeneratedResponseLength] = None
     display_text_no_results_found: Optional[str] = None
     display_text_connectivity_issue: Optional[str] = None
+    idk_message: Optional[str] = None
 
 class FieldMapping(BaseModel):
     """

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/agent_builder/models/types.py

@@ -87,6 +87,11 @@ class ProviderConfig(BaseModel):
     azure_entra_tenant_id: Optional[str] = Field(None, alias="azureEntraTenantId")
     azure_ad_token: Optional[str] = Field(None, alias="azureAdToken")
     azure_model_name: Optional[str] = Field(None, alias="azureModelName")
+    azure_inference_deployment_name: Optional[str] = Field(None, alias="azureDeploymentName")
+    azure_inference_api_version: Optional[str] = Field(None, alias="azureApiVersion")
+    azure_inference_extra_params: Optional[str] = Field(None, alias="azureExtraParams")
+    azure_inference_foundry_url: Optional[str] = Field(None, alias="azureFoundryUrl")
+
 
     # Workers AI specific
     workers_ai_account_id: Optional[str] = Field(None, alias="workersAiAccountId")

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/agent_builder/tools/types.py

@@ -36,6 +36,7 @@ class JsonSchemaObject(BaseModel):
     anyOf: Optional[List['JsonSchemaObject']] = None
     in_field: Optional[Literal['query', 'header', 'path', 'body']] = Field(None, alias='in')
     aliasName: str | None = None
+    wrap_data: Optional[bool] = True
     "Runtime feature where the sdk can provide the original name of a field before prefixing"
 
     @model_validator(mode='after')
@@ -48,9 +49,9 @@ class JsonSchemaObject(BaseModel):
 class ToolRequestBody(BaseModel):
     model_config = ConfigDict(extra='allow')
 
-    type: Literal['object']
-    properties: Dict[str, JsonSchemaObject]
-    required: Optional[List[str]] = None
+    type: Literal['object', 'string']
+    properties: Optional[Dict[str, JsonSchemaObject]] = {}
+    required: Optional[List[str]] = []
 
 
 class ToolResponseBody(BaseModel):
@@ -186,6 +187,7 @@ class ToolBinding(BaseModel):
 
 class ToolSpec(BaseModel):
     name: str
+    id: str | None = None
     display_name: str | None = None
     description: str
     permission: ToolPermission

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -404,8 +404,11 @@ def list_connections(environment: ConnectionEnvironment | None, verbose: bool =
                     "❌"
                 )
                 continue
-
-            connection_type = get_connection_type(security_scheme=conn.security_scheme, auth_type=conn.auth_type)
+            
+            try:
+                connection_type = get_connection_type(security_scheme=conn.security_scheme, auth_type=conn.auth_type)
+            except:
+                connection_type = conn.auth_type
 
             if conn.environment == ConnectionEnvironment.DRAFT:
                 draft_table.add_row(

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/cli/commands/copilot/copilot_controller.py

@@ -10,10 +10,12 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 from requests import ConnectionError
 from typing import List
 from ibm_watsonx_orchestrate.client.base_api_client import ClientAPIException
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import KnowledgeBaseSpec
 from ibm_watsonx_orchestrate.agent_builder.tools import ToolSpec, ToolPermission, ToolRequestBody, ToolResponseBody
 from ibm_watsonx_orchestrate.cli.commands.agents.agents_controller import AgentsController, AgentKind, SpecVersion
 from ibm_watsonx_orchestrate.agent_builder.agents.types import DEFAULT_LLM, BaseAgentSpec
 from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient
+from ibm_watsonx_orchestrate.client.knowledge_bases.knowledge_base_client import KnowledgeBaseClient
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
 from ibm_watsonx_orchestrate.client.copilot.cpe.copilot_cpe_client import CPEClient
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
@@ -56,10 +58,16 @@ def _get_incomplete_tool_from_name(tool_name: str) -> dict:
                        "input_schema": input_schema, "output_schema": output_schema})
     return spec.model_dump()
 
+
 def _get_incomplete_agent_from_name(agent_name: str) -> dict:
     spec = BaseAgentSpec(**{"name": agent_name, "description": agent_name, "kind": AgentKind.NATIVE})
     return spec.model_dump()
 
+def _get_incomplete_knowledge_base_from_name(kb_name: str) -> dict:
+    spec = KnowledgeBaseSpec(**{"name": kb_name, "description": kb_name})
+    return spec.model_dump()
+
+
 def _get_tools_from_names(tool_names: List[str]) -> List[dict]:
     if not len(tool_names):
         return []
@@ -115,6 +123,34 @@ def _get_agents_from_names(collaborators_names: List[str]) -> List[dict]:
 
     return agents
 
+def _get_knowledge_bases_from_names(kb_names: List[str]) -> List[dict]:
+    if not len(kb_names):
+        return []
+
+    kb_client = get_knowledge_bases_client()
+
+    try:
+        with _get_progress_spinner() as progress:
+            task = progress.add_task(description="Fetching Knowledge Bases", total=None)
+            knowledge_bases = kb_client.get_by_names(kb_names)
+            found_kbs = {kb.get("name") for kb in knowledge_bases}
+            progress.remove_task(task)
+            progress.refresh()
+            for kb_name in kb_names:
+                if kb_name not in found_kbs:
+                    logger.warning(
+                        f"Failed to find knowledge base named '{kb_name}'. Falling back to incomplete knowledge base definition. Copilot performance maybe effected.")
+                    knowledge_bases.append(_get_incomplete_knowledge_base_from_name(kb_name))
+    except ConnectionError:
+        logger.warning(
+            f"Failed to fetch knowledge bases from server. For optimal results please start the server and import the relevant knowledge bases {', '.join(kb_names)}.")
+        knowledge_bases = []
+        for kb_name in kb_names:
+            knowledge_bases.append(_get_incomplete_knowledge_base_from_name(kb_name))
+
+    return knowledge_bases
+
+
 def get_cpe_client() -> CPEClient:
     url = os.getenv('CPE_URL', "http://localhost:8081")
     return instantiate_client(client=CPEClient, url=url)
@@ -124,6 +160,10 @@ def get_tool_client(*args, **kwargs):
     return instantiate_client(ToolClient)
 
 
+def get_knowledge_bases_client(*args, **kwargs):
+    return instantiate_client(KnowledgeBaseClient)
+
+
 def get_native_client(*args, **kwargs):
     return instantiate_client(AgentClient)
 
@@ -144,18 +184,34 @@ def gather_utterances(max: int) -> list[str]:
     return utterances
 
 
-def get_deployed_tools_agents():
+def get_knowledge_bases(client):
+    with _get_progress_spinner() as progress:
+        task = progress.add_task(description="Fetching Knowledge Bases", total=None)
+        try:
+            knowledge_bases = client.get()
+            progress.remove_task(task)
+        except ConnectionError:
+            knowledge_bases = []
+            progress.remove_task(task)
+            progress.refresh()
+            logger.warning("Failed to contact wxo server to fetch knowledge_bases. Proceeding with empty agent list")
+    return knowledge_bases
+
+
+def get_deployed_tools_agents_and_knowledge_bases():
     all_tools = find_tools_by_description(tool_client=get_tool_client(), description=None)
     # TODO: this brings only the "native" agents. Can external and assistant agents also be collaborators?
     all_agents = find_agents(agent_client=get_native_client())
-    return {"tools": all_tools, "agents": all_agents}
+    all_knowledge_bases = get_knowledge_bases(get_knowledge_bases_client())
+
+    return {"tools": all_tools, "collaborators": all_agents, "knowledge_bases": all_knowledge_bases}
 
 
 def pre_cpe_step(cpe_client):
-    tools_agents = get_deployed_tools_agents()
+    tools_agents_and_knowledge_bases = get_deployed_tools_agents_and_knowledge_bases()
     user_message = ""
     with _get_progress_spinner() as progress:
-        task = progress.add_task(description="Initilizing Prompt Engine", total=None)
+        task = progress.add_task(description="Initializing Prompt Engine", total=None)
         response = cpe_client.submit_pre_cpe_chat(user_message=user_message)
         progress.remove_task(task)
 
@@ -165,15 +221,26 @@ def pre_cpe_step(cpe_client):
             rich.print('\n🤖 Copilot: ' + response["message"])
             user_message = Prompt.ask("\n👤 You").strip()
             message_content = {"user_message": user_message}
-        elif "description" in response and response["description"]:
+        elif "description" in response and response["description"]:  # after we have a description, we pass the all tools
             res["description"] = response["description"]
-            message_content = tools_agents
-        elif "metadata" in response:
-            res["agent_name"] = response["metadata"]["agent_name"]
-            res["agent_style"] = response["metadata"]["style"]
-            res["tools"] = [t for t in tools_agents["tools"] if t["name"] in response["metadata"]["tools"]]
-            res["collaborators"] = [a for a in tools_agents["agents"] if
-                                    a["name"] in response["metadata"]["collaborators"]]
+            message_content = {"tools": tools_agents_and_knowledge_bases['tools']}
+        elif "tools" in response and response[
+            'tools'] is not None:  # after tools were selected, we pass all collaborators
+            res["tools"] = [t for t in tools_agents_and_knowledge_bases["tools"] if
+                            t["name"] in response["tools"]]
+            message_content = {"collaborators": tools_agents_and_knowledge_bases['collaborators']}
+        elif "collaborators" in response and response[
+            'collaborators'] is not None:  # after we have collaborators, we pass all knowledge bases
+            res["collaborators"] = [a for a in tools_agents_and_knowledge_bases["collaborators"] if
+                                    a["name"] in response["collaborators"]]
+            message_content = {"knowledge_bases": tools_agents_and_knowledge_bases['knowledge_bases']}
+        elif "knowledge_bases" in response and response['knowledge_bases'] is not None:  # after we have knowledge bases, we pass selected=True to mark that all selection were done
+            res["knowledge_bases"] = [a for a in tools_agents_and_knowledge_bases["knowledge_bases"] if
+                                      a["name"] in response["knowledge_bases"]]
+            message_content = {"selected": True}
+        elif "agent_name" in response and response['agent_name'] is not None:  # once we have a name and style, this phase has ended
+            res["agent_name"] = response["agent_name"]
+            res["agent_style"] = response["agent_style"]
             return res
         with _get_progress_spinner() as progress:
             task = progress.add_task(description="Thinking...", total=None)
@@ -194,6 +261,7 @@ def find_tools_by_description(description, tool_client):
             logger.warning("Failed to contact wxo server to fetch tools. Proceeding with empty tool list")
     return tools
 
+
 def find_agents(agent_client):
     with _get_progress_spinner() as progress:
         task = progress.add_task(description="Fetching Agents", total=None)
@@ -279,16 +347,25 @@ def prompt_tune(agent_spec: str, output_file: str | None, samples_file: str | No
     tools = _get_tools_from_names(agent.tools)
 
     collaborators = _get_agents_from_names(agent.collaborators)
+
+    knowledge_bases = _get_knowledge_bases_from_names(agent.knowledge_base)
     try:
-        new_prompt = talk_to_cpe(cpe_client=client, samples_file=samples_file,
-                                 context_data={"initial_instruction": instr, 'tools': tools, 'description': agent.description,
-                                               "collaborators": collaborators})
+        new_prompt = talk_to_cpe(cpe_client=client,
+                                samples_file=samples_file,
+                                context_data={
+                                    "initial_instruction": instr,
+                                    'tools': tools,
+                                    'description': agent.description,
+                                    "collaborators": collaborators,
+                                    "knowledge_bases": knowledge_bases
+                                })
     except ConnectionError:
         logger.error(
             "Failed to connect to Copilot server. Please ensure Copilot is running via `orchestrate copilot start`")
         sys.exit(1)
     except ClientAPIException:
-        logger.error("An unexpected server error has occur with in the Copilot server. Please check the logs via `orchestrate server logs`")
+        logger.error(
+            "An unexpected server error has occur with in the Copilot server. Please check the logs via `orchestrate server logs`")
         sys.exit(1)
 
     if new_prompt:
@@ -316,17 +393,21 @@ def create_agent(output_file: str, llm: str, samples_file: str | None, dry_run_f
             "Failed to connect to Copilot server. Please ensure Copilot is running via `orchestrate copilot start`")
         sys.exit(1)
     except ClientAPIException:
-        logger.error("An unexpected server error has occur with in the Copilot server. Please check the logs via `orchestrate server logs`")
+        logger.error(
+            "An unexpected server error has occur with in the Copilot server. Please check the logs via `orchestrate server logs`")
         sys.exit(1)
-        
+
     tools = res["tools"]
     collaborators = res["collaborators"]
+    knowledge_bases = res["knowledge_bases"]
     description = res["description"]
     agent_name = res["agent_name"]
     agent_style = res["agent_style"]
 
     # 4. discuss the instructions
-    instructions = talk_to_cpe(cpe_client, samples_file, {'description': description, 'tools': tools, 'collaborators': collaborators})
+    instructions = talk_to_cpe(cpe_client, samples_file,
+                               {'description': description, 'tools': tools, 'collaborators': collaborators,
+                                'knowledge_bases': knowledge_bases})
 
     # 6. create and save the agent
     llm = llm if llm else DEFAULT_LLM
@@ -334,7 +415,9 @@ def create_agent(output_file: str, llm: str, samples_file: str | None, dry_run_f
         'style': agent_style,
         'tools': [t['name'] for t in tools],
         'llm': llm,
-        'collaborators': [c['name'] for c in collaborators]
+        'collaborators': [c['name'] for c in collaborators],
+        'knowledge_base': [k['name'] for k in knowledge_bases]
+        # generate_agent_spec expects knowledge_base and not knowledge_bases
     }
     agent = AgentsController.generate_agent_spec(agent_name, AgentKind.NATIVE, description, **params)
     agent.instructions = instructions

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py

@@ -10,19 +10,23 @@ _BASIC_PROVIDER_CONFIG_KEYS = {'provider', 'api_key', 'custom_host', 'url_to_fet
 
 PROVIDER_EXTRA_PROPERTIES_LUT = {
     ModelProvider.ANTHROPIC: {'anthropic_beta', 'anthropic_version'},
-    # ModelProvider.AZURE_AI: {
-    #     'azure_resource_name',
-    #     'azure_deployment_id',
-    #     'azure_api_version',
-    #     'ad_auth',
-    #     'azure_auth_mode',
-    #     'azure_managed_client_id',
-    #     'azure_entra_client_id',
-    #     'azure_entra_client_secret',
-    #     'azure_entra_tenant_id',
-    #     'azure_ad_token',
-    #     'azure_model_name'
-    # },
+    ModelProvider.AZURE_AI: {
+        'azure_resource_name',
+        'azure_deployment_id',
+        'azure_api_version',
+        'ad_auth',
+        'azure_auth_mode',
+        'azure_managed_client_id',
+        'azure_entra_client_id',
+        'azure_entra_client_secret',
+        'azure_entra_tenant_id',
+        'azure_ad_token',
+        'azure_model_name',
+        'azure_inference_deployment_name',
+        'azure_inference_api_version',
+        'azure_inference_extra_params',
+        'azure_inference_foundry_url'
+    },
     ModelProvider.AZURE_OPENAI: {
         'azure_resource_name',
         'azure_deployment_id',

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -590,7 +590,7 @@ class ToolsController:
             for tool in tools:
                 tools_list.append(json.loads(tool.dumps_spec()))
 
-            rich.print(JSON(json.dumps(tools_list, indent=4)))
+            rich.print_json(json.dumps(tools_list, indent=4))
         else:
             table = rich.table.Table(show_header=True, header_style="bold white", show_lines=True)
             column_args = {

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/client/connections/connections_client.py

@@ -3,6 +3,7 @@ from typing import List
 from ibm_cloud_sdk_core.authenticators import MCSPAuthenticator
 from pydantic import BaseModel, ValidationError
 from typing import Optional
+from enum import Enum
 
 from ibm_watsonx_orchestrate.client.base_api_client import BaseAPIClient, ClientAPIException
 from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionEnvironment, ConnectionPreference, ConnectionAuthType, ConnectionSecurityScheme, IdpConfigData, AppConfigData, ConnectionType
@@ -12,12 +13,23 @@ import logging
 logger = logging.getLogger(__name__)
 
 
+class FetchConfigAuthTypes(str, Enum):
+    BASIC_AUTH = ConnectionType.BASIC_AUTH.value
+    BEARER_TOKEN = ConnectionType.BEARER_TOKEN.value
+    API_KEY_AUTH = ConnectionType.API_KEY_AUTH.value
+    OAUTH2_AUTH_CODE = ConnectionType.OAUTH2_AUTH_CODE.value
+    OAUTH2_IMPLICIT = 'oauth2_implicit'
+    OAUTH2_PASSWORD = 'oauth2_password'
+    OAUTH2_CLIENT_CREDS = ConnectionType.OAUTH2_CLIENT_CREDS.value
+    OAUTH_ON_BEHALF_OF_FLOW = ConnectionType.OAUTH_ON_BEHALF_OF_FLOW.value
+    KEY_VALUE = ConnectionType.KEY_VALUE.value
+
 class ListConfigsResponse(BaseModel):
     connection_id: str = None,
     app_id: str = None
     name: str = None
     security_scheme: ConnectionSecurityScheme | None = None,
-    auth_type: ConnectionAuthType | None = None,
+    auth_type: FetchConfigAuthTypes | None = None,
     environment:  ConnectionEnvironment | None = None,
     preference: ConnectionPreference | None = None,
     credentials_entered: bool | None = False
@@ -28,7 +40,7 @@ class GetConfigResponse(BaseModel):
     app_id: str = None
     environment: ConnectionEnvironment = None
     preference: ConnectionPreference = None
-    auth_type: ConnectionAuthType | None = None
+    auth_type: FetchConfigAuthTypes | None = None
     sso: bool = None
     security_scheme: ConnectionSecurityScheme = None
     server_url: str | None = None

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/client/copilot/cpe/copilot_cpe_client.py

@@ -21,13 +21,15 @@ class CPEClient(BaseAPIClient):
         }
 
 
-    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None, agents: Dict[str, Any] = None) -> dict:
+    def submit_pre_cpe_chat(self, user_message: str | None =None, tools: Dict[str, Any] = None, collaborators: Dict[str, Any] = None, knowledge_bases: Dict[str, Any] = None, selected:bool=False) -> dict:
         payload = {
             "message": user_message,
             "tools": tools,
-            "agents": agents,
+            "collaborators": collaborators,
+            "knowledge_bases": knowledge_bases,
             "chat_id": self.chat_id,
-            "chat_model_name": self.chat_model_name
+            "chat_model_name": self.chat_model_name,
+            'selected':selected
         }
 
         response = self._post_nd_json("/wxo-cpe/create-agent", data=payload)

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -122,6 +122,11 @@ services:
       CONNECTIONS_MANAGER_ENDPOINT: http://wxo-server-connection-manager:3001
       AGENT_OPS_API_KEY: ${AGENTOPS_API_KEY}
       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
+      DOCPROC_BASE_URL: http://wxo-doc-processing-infra-standalone:9080
+      BUILDER_ASYNC_CALLBACK_ENDPOINT: http://wxo-builder:4025
       IS_OBSERVABILITY_FEATURE_ENABLED: "true"
       ALLOW_INSECURE_TLS: "true"
     command: 'npm start'
@@ -165,7 +170,7 @@ services:
       "
 
   wxo-milvus-standalone:
-    image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/milvusdb/milvus:v2.5.6
+    image: ${OPENSOURCE_REGISTRY_PROXY:-docker.io}/milvusdb/milvus:v2.5.15
     command: ["milvus", "run", "standalone"]
     security_opt:
       - seccomp:unconfined
@@ -549,6 +554,7 @@ services:
       - TENANT_DEFAULT_PASSWORD=${ES_PASSWORD}
       - TENANT_DEFAULT_HOSTNAME=http://elasticsearch:9200
       - DEFAULT_TENANT_ID=${DEFAULT_TENANT_ID}
+      - FORCE_SINGLE_TENANT=${FORCE_SINGLE_TENANT:-true}
     ports:
       - "9202:9201" # Expose proxy on host port 9202
     networks:
@@ -644,6 +650,7 @@ services:
       - INBOUND_API_KEY=${AGENTOPS_API_KEY}
       - DEFAULT_TENANT_ID=${DEFAULT_TENANT_ID}
       - TENANT_DEFAULT_HOSTNAME=http://elasticsearch:9200
+      - FORCE_SINGLE_TENANT=${FORCE_SINGLE_TENANT:-true}
     ports:
       - "8765:443"
     networks:

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/docker/default.env

@@ -57,13 +57,13 @@ EVENT_BROKER_TTL="3600"
 REGISTRY_URL=
 
 
-SERVER_TAG=31-07-2025
+SERVER_TAG=01-08-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=31-07-2025
+WORKER_TAG=01-08-2025-v2
 WORKER_REGISTRY=
 
-AI_GATEWAY_TAG=21-07-2025
+AI_GATEWAY_TAG=01-08-2025-v1
 AI_GATEWAY_REGISTRY=
 
 AGENT_GATEWAY_TAG=29-07-2025
@@ -77,7 +77,7 @@ AMDDBTAG=29-07-2025-9f3661b
 ARM64DBTAG=29-07-2025-9f3661b
 
 UI_REGISTRY=
-UITAG=23-07-2025
+UITAG=31-07-2025
 
 CM_REGISTRY=
 CM_TAG=24-07-2025
@@ -88,23 +88,23 @@ TRM_REGISTRY=
 TR_TAG=23-07-2025-3c60549f0bac275de3e5736265a3fd49cdd3a203
 TR_REGISTRY=
 
-BUILDER_TAG=29-07-2025
+BUILDER_TAG=31-07-2025-d7145cb
 BUILDER_REGISTRY=
 
-FLOW_RUNTIME_TAG=28-07-2025-v2
+FLOW_RUNTIME_TAG=01-08-2025
 FLOW_RUMTIME_REGISTRY=
 
 
-AGENT_ANALYTICS_TAG=02-07-2025-v1
+AGENT_ANALYTICS_TAG=05-08-2025
 AGENT_ANALYTICS_REGISTRY=
 
-JAEGER_PROXY_TAG=01-07-2025
+JAEGER_PROXY_TAG=23-07-2025
 JAEGER_PROXY_REGISTRY=
 
 SOCKET_HANDLER_TAG=29-05-2025
 SOCKET_HANDLER_REGISTRY=
 
-CPE_TAG=17-07-2025
+CPE_TAG=06-08-2025-b0a20ad
 CPE_REGISTRY=
 
 # IBM Document Processing
@@ -114,7 +114,7 @@ WDU_REGISTRY=
 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_DPI_TAG=20250731-155328-257-06879e86
 DOCPROC_REGISTRY=
 
 # END -- IMAGE REGISTRIES AND TAGS
@@ -182,6 +182,7 @@ CALLBACK_HOST_URL=
 
 AGENTOPS_API_KEY_AUTH_ENABLED=true
 AGENTOPS_API_KEY=qwertyuiop
+FORCE_SINGLE_TENANT=true
 
 RUNTIME_MANAGER_API_KEY=example
 

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/flow_builder/flows/__init__.py

@@ -1,6 +1,6 @@
 from .constants import START, END, RESERVED
 
-from ..types import FlowContext, TaskData, TaskEventType, File, DecisionsCondition, DecisionsRule
+from ..types import FlowContext, TaskData, TaskEventType, DocProcInput, DecisionsCondition, DecisionsRule
 from ..node import UserNode, AgentNode, StartNode, EndNode, PromptNode, ToolNode, DecisionsNode
 
 from .flow import Flow, CompiledFlow, FlowRun, FlowEvent, FlowEventType, FlowFactory, MatchPolicy, WaitPolicy, ForeachPolicy, Branch, Foreach, Loop
@@ -16,7 +16,7 @@ __all__ = [
     "FlowContext",
     "TaskData",
     "TaskEventType",
-    "File",
+    "DocProcInput",
 
     "DocProcNode",
     "UserNode",

{ibm_watsonx_orchestrate-1.9.0b1 → ibm_watsonx_orchestrate-1.9.0b2}/src/ibm_watsonx_orchestrate/flow_builder/flows/flow.py

@@ -18,7 +18,7 @@ import pytz
 import os
 
 from typing_extensions import Self
-from pydantic import BaseModel, Field, SerializeAsAny, create_model
+from pydantic import BaseModel, Field, SerializeAsAny, create_model, TypeAdapter
 import yaml
 from ibm_watsonx_orchestrate.agent_builder.tools.python_tool import PythonTool
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
@@ -27,7 +27,7 @@ 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, DocExtSpec, LanguageCode
+    DocProcSpec, TextExtractionResponse, DocProcInput, DecisionsNodeSpec, DecisionsRule, DocExtSpec, File
 )
 from .constants import CURRENT_USER, START, END, ANY_USER
 from ..node import (
@@ -190,7 +190,7 @@ class Flow(Node):
     
     def _add_schema_ref(self, schema: JsonSchemaObject, title: str = None) -> SchemaRef:
         '''Create a schema reference'''
-        if schema and (schema.type == "object" or schema.type == "array"):
+        if schema and (schema.type == "object" or schema.type == "array" or schema.type == "string"):
             new_schema = self._add_schema(schema, title)
             return SchemaRef(ref=f"#/schemas/{new_schema.title}")
         raise AssertionError(f"schema is not a complex object: {schema}")
@@ -199,7 +199,7 @@ class Flow(Node):
         self._refactor_spec_to_schemaref(node.spec)
                 
     def _refactor_spec_to_schemaref(self, spec: NodeSpec):
-        if spec.input_schema:
+        if spec.input_schema and (spec.input_schema.type == "object" or spec.input_schema.type == "array") :
             if isinstance(spec.input_schema, ToolRequestBody):
                 spec.input_schema = self._add_schema_ref(JsonSchemaObject(type = spec.input_schema.type,
                                                                                 properties= spec.input_schema.properties,
@@ -535,7 +535,7 @@ class Flow(Node):
             "text_extraction" : TextExtractionResponse
         }
          # create input spec
-        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = File)
+        input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = DocProcInput)
         output_schema_obj = _get_json_schema_obj("output", output_schema_dict[task])
         if "$defs" in output_schema_obj.model_extra:
             output_schema_obj.model_extra.pop("$defs")
@@ -1060,8 +1060,8 @@ class FlowFactory(BaseModel):
                 raise ValueError("Only functions with @flow_spec can be used to create a Flow specification.")
             return Flow(spec = flow_spec)
 
-        # create input spec
         input_schema_obj = _get_json_schema_obj(parameter_name = "input", type_def = input_schema)
+        # create input spec
         output_schema_obj = _get_json_schema_obj("output", output_schema)
         if initiators is None:
             initiators = []