ibm-watsonx-orchestrate 1.6.0b0__py3-none-any.whl → 1.7.0a0__py3-none-any.whl

ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -240,6 +240,27 @@ def apply_llm_api_key_defaults(env_dict: dict) -> None:
         env_dict.setdefault("ASSISTANT_EMBEDDINGS_SPACE_ID", space_value)
         env_dict.setdefault("ROUTING_LLM_SPACE_ID", space_value)
 
+def _is_docker_container_running(container_name):
+    ensure_docker_installed()
+    command = [ "docker",
+                "ps",
+                "-f",
+                f"name={container_name}"
+            ]
+    result = subprocess.run(command, env=os.environ, capture_output=True)
+    if container_name in str(result.stdout):
+        return True
+    return False
+
+def _check_exclusive_observibility(langfuse_enabled: bool, ibm_tele_enabled: bool):
+    if langfuse_enabled and ibm_tele_enabled:
+        return False
+    if langfuse_enabled and _is_docker_container_running("docker-frontend-server-1"):
+        return False
+    if ibm_tele_enabled and _is_docker_container_running("docker-langfuse-web-1"):
+        return False
+    return True
+
 def write_merged_env_file(merged_env: dict) -> Path:
     tmp = tempfile.NamedTemporaryFile(mode="w", delete=False, suffix=".env")
     with tmp:
@@ -292,7 +313,7 @@ def get_persisted_user_env() -> dict | None:
     user_env = cfg.get(USER_ENV_CACHE_HEADER) if cfg.get(USER_ENV_CACHE_HEADER) else None
     return user_env
 
-def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False) -> None:
+def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False, experimental_with_ibm_telemetry=False, with_docproc=False) -> None:
     compose_path = get_compose_file()
     compose_command = ensure_docker_compose_installed()
     db_tag = read_env_file(final_env_file).get('DBTAG', None)
@@ -319,13 +340,17 @@ def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False) ->
 
 
     # Step 2: Start all remaining services (except DB)
+    profiles = []
     if experimental_with_langfuse:
-        command = compose_command + [
-            '--profile',
-            'langfuse'
-        ]
-    else:
-        command = compose_command
+        profiles.append("langfuse")
+    if experimental_with_ibm_telemetry:
+        profiles.append("ibm-telemetry")
+    if with_docproc:
+        profiles.append("docproc")
+
+    command = compose_command[:]
+    for profile in profiles:
+        command += ["--profile", profile]
 
     command += [
         "-f", str(compose_path),
@@ -444,6 +469,9 @@ def run_compose_lite_ui(user_env_file: Path) -> bool:
         # do nothing, as the docker login here is not mandatory
         pass
 
+    # Auto-configure callback IP for async tools
+    merged_env_dict = auto_configure_callback_ip(merged_env_dict)
+
     #These are to removed warning and not used in UI component
     if not 'WATSONX_SPACE_ID' in merged_env_dict:
         merged_env_dict['WATSONX_SPACE_ID']='X'
@@ -621,8 +649,80 @@ def confirm_accepts_license_agreement(accepts_by_argument: bool):
             logger.error('The terms and conditions were not accepted, exiting.')
             exit(1)
 
+def auto_configure_callback_ip(merged_env_dict: dict) -> dict:
+    """
+    Automatically detect and configure CALLBACK_HOST_URL if it's empty.
+
+    Args:
+        merged_env_dict: The merged environment dictionary
+
+    Returns:
+        Updated environment dictionary with CALLBACK_HOST_URL set
+    """
+    callback_url = merged_env_dict.get('CALLBACK_HOST_URL', '').strip()
+
+    # Only auto-configure if CALLBACK_HOST_URL is empty
+    if not callback_url:
+        logger.info("Auto-detecting local IP address for async tool callbacks...")
 
+        system = platform.system()
+        ip = None
 
+        try:
+            if system in ("Linux", "Darwin"):
+                result = subprocess.run(["ifconfig"], capture_output=True, text=True, check=True)
+                lines = result.stdout.splitlines()
+
+                for line in lines:
+                    line = line.strip()
+                    # Unix ifconfig output format: "inet 192.168.1.100 netmask 0xffffff00 broadcast 192.168.1.255"
+                    if line.startswith("inet ") and "127.0.0.1" not in line:
+                        candidate_ip = line.split()[1]
+                        # Validate IP is not loopback or link-local
+                        if (candidate_ip and
+                            not candidate_ip.startswith("127.") and
+                            not candidate_ip.startswith("169.254")):
+                            ip = candidate_ip
+                            break
+
+            elif system == "Windows":
+                result = subprocess.run(["ipconfig"], capture_output=True, text=True, check=True)
+                lines = result.stdout.splitlines()
+
+                for line in lines:
+                    line = line.strip()
+                    # Windows ipconfig output format: "   IPv4 Address. . . . . . . . . . . : 192.168.1.100"
+                    if "IPv4 Address" in line and ":" in line:
+                        candidate_ip = line.split(":")[-1].strip()
+                        # Validate IP is not loopback or link-local
+                        if (candidate_ip and
+                            not candidate_ip.startswith("127.") and
+                            not candidate_ip.startswith("169.254")):
+                            ip = candidate_ip
+                            break
+
+            else:
+                logger.warning(f"Unsupported platform: {system}")
+                ip = None
+
+        except Exception as e:
+            logger.debug(f"IP detection failed on {system}: {e}")
+            ip = None
+
+        if ip:
+            callback_url = f"http://{ip}:4321"
+            merged_env_dict['CALLBACK_HOST_URL'] = callback_url
+            logger.info(f"Auto-configured CALLBACK_HOST_URL to: {callback_url}")
+        else:
+            # Fallback for localhost
+            callback_url = "http://host.docker.internal:4321"
+            merged_env_dict['CALLBACK_HOST_URL'] = callback_url
+            logger.info(f"Using Docker internal URL: {callback_url}")
+            logger.info("For external tools, consider using ngrok or similar tunneling service.")
+    else:
+        logger.info(f"Using existing CALLBACK_HOST_URL: {callback_url}")
+
+    return merged_env_dict
 
 @server_app.command(name="start")
 def server_start(
@@ -636,6 +736,11 @@ def server_start(
         '--with-langfuse', '-l',
         help='Option to enable Langfuse support.'
     ),
+    experimental_with_ibm_telemetry: bool = typer.Option(
+        False,
+        '--with-ibm-telemetry', '-i',
+        help=''
+    ),
     persist_env_secrets: bool = typer.Option(
         False,
         '--persist-env-secrets', '-p',
@@ -647,6 +752,11 @@ def server_start(
         "--accept-terms-and-conditions",
         help="By providing this flag you accept the terms and conditions outlined in the logs on server start."
     ),
+    with_docproc: bool = typer.Option(
+        False,
+        '--with-docproc', '-d',
+        help='Enable IBM Document Processing to extract information from your business documents. Enabling this activates the Watson Document Understanding service.'
+    ),
 ):
     confirm_accepts_license_agreement(accept_terms_and_conditions)
 
@@ -675,10 +785,21 @@ def server_start(
 
     merged_env_dict = apply_server_env_dict_defaults(merged_env_dict)
 
-    # Add LANGFUSE_ENABLED into the merged_env_dict, for tempus to pick up.
+    # Auto-configure callback IP for async tools
+    merged_env_dict = auto_configure_callback_ip(merged_env_dict)
+    if not _check_exclusive_observibility(experimental_with_langfuse, experimental_with_ibm_telemetry):
+        logger.error("Please select either langfuse or ibm telemetry for observability not both")
+        sys.exit(1)
+
+    # Add LANGFUSE_ENABLED and DOCPROC_ENABLED into the merged_env_dict, for tempus to pick up.
     if experimental_with_langfuse:
         merged_env_dict['LANGFUSE_ENABLED'] = 'true'
 
+    if with_docproc:
+        merged_env_dict['DOCPROC_ENABLED'] = 'true'
+
+    if experimental_with_ibm_telemetry:
+        merged_env_dict['USE_IBM_TELEMETRY'] = 'true'
 
     try:
         docker_login_by_dev_edition_source(merged_env_dict, dev_edition_source)
@@ -690,7 +811,11 @@ def server_start(
 
 
     final_env_file = write_merged_env_file(merged_env_dict)
-    run_compose_lite(final_env_file=final_env_file, experimental_with_langfuse=experimental_with_langfuse)
+
+    run_compose_lite(final_env_file=final_env_file,
+                     experimental_with_langfuse=experimental_with_langfuse,
+                     experimental_with_ibm_telemetry=experimental_with_ibm_telemetry,
+                     with_docproc=with_docproc)
 
     run_db_migration()
 
@@ -718,6 +843,8 @@ def server_start(
 
     if experimental_with_langfuse:
         logger.info(f"You can access the observability platform Langfuse at http://localhost:3010, username: orchestrate@ibm.com, password: orchestrate")
+    if with_docproc:
+        logger.info(f"Document processing capabilities are now available for use in Flows (both ADK and runtime). Note: This option is currently available only in the Developer edition.")
 
 @server_app.command(name="stop")
 def server_stop(
@@ -825,4 +952,4 @@ def run_db_migration() -> None:
         sys.exit(1)
 
 if __name__ == "__main__":
-    server_app()
+    server_app()

ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_controller.py

@@ -243,9 +243,15 @@ class ToolkitController:
             rich.print(JSON(json.dumps(tools_list, indent=4)))
         else:
             table = rich.table.Table(show_header=True, header_style="bold white", show_lines=True)
-            columns = ["Name", "Kind", "Description", "Tools", "App ID"]
-            for column in columns:
-                table.add_column(column)
+            column_args = {
+                "Name": {"overflow": "fold"},
+                "Kind": {},
+                "Description": {},
+                "Tools": {},
+                "App ID": {"overflow": "fold"}
+            }
+            for column in column_args:
+                table.add_column(column,**column_args[column])
 
             tools_client = instantiate_client(ToolClient)
 

ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -24,6 +24,7 @@ from rich.console import Console
 from rich.panel import Panel
 
 from ibm_watsonx_orchestrate.agent_builder.tools import BaseTool, ToolSpec
+from ibm_watsonx_orchestrate.agent_builder.tools.flow_tool import create_flow_json_tool
 from ibm_watsonx_orchestrate.agent_builder.tools.openapi_tool import create_openapi_json_tools_from_uri,create_openapi_json_tools_from_content
 from ibm_watsonx_orchestrate.cli.commands.models.models_controller import ModelHighlighter
 from ibm_watsonx_orchestrate.cli.commands.tools.types import RegistryType
@@ -38,10 +39,9 @@ from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
 from ibm_watsonx_orchestrate.client.toolkit.toolkit_client import ToolKitClient
 from ibm_watsonx_orchestrate.client.connections import get_connections_client, get_connection_type
 from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_local_dev
+from ibm_watsonx_orchestrate.flow_builder.utils import import_flow_support_tools
 from ibm_watsonx_orchestrate.utils.utils import sanatize_app_id
 from ibm_watsonx_orchestrate.client.utils import is_local_dev
-from ibm_watsonx_orchestrate.client.tools.tempus_client import TempusClient
-from ibm_watsonx_orchestrate.flow_builder.utils import import_flow_model
 
 from  ibm_watsonx_orchestrate import __version__
 
@@ -345,17 +345,12 @@ The [bold]flow tool[/bold] is being imported from [green]`{file}`[/green].
     
 [bold cyan]Additional information:[/bold cyan]
 
-- The [bold green]get_flow_status[/bold green] tool is being imported to support flow tools. To get a flow's current status, ensure [bold]both this tools and the one you are importing are added to your agent[/bold] to retrieve the flow output. 
-- Include additional instructions in your agent to call the [bold green]get_flow_status[/bold green] tool to retrieve the flow output. For example: [green]"If you get an instance_id, use the tool get_flow_status to retrieve the current status of a flow."[/green]
+- The [bold green]Get flow status[/bold green] tool is being imported to support flow tools. This tool can query the status of a flow tool instance.  You can add it to your agent using the UI or including the following tool name in your agent definition: [green]i__get_flow_status_intrinsic_tool__[/green]. 
 
     """
 
     console.print(Panel(message,  title="[bold blue]Flow tool support information[/bold blue]", border_style="bright_blue"))
    
-
-    if not is_local_dev():
-        raise typer.BadParameter(f"Flow tools are only supported in local environment.")
-
     model = None
     
     # Load the Flow JSON model from the file
@@ -422,7 +417,16 @@ The [bold]flow tool[/bold] is being imported from [green]`{file}`[/green].
     except Exception as e:
         raise typer.BadParameter(f"Failed to load model from file {file}: {e}")
     
-    return await import_flow_model(model)
+    tool = create_flow_json_tool(name=model["spec"]["name"],
+                                 description=model["spec"]["description"], 
+                                 permission="read_only", 
+                                 flow_model=model)   
+    
+    tools = import_flow_support_tools()
+    
+    tools.append(tool)
+
+    return tools
 
 
 async def import_openapi_tool(file: str, connection_id: str) -> List[BaseTool]:
@@ -514,9 +518,16 @@ class ToolsController:
             rich.print(JSON(json.dumps(tools_list, indent=4)))
         else:
             table = rich.table.Table(show_header=True, header_style="bold white", show_lines=True)
-            columns = ["Name", "Description", "Permission", "Type", "Toolkit", "App ID"]
-            for column in columns:
-                table.add_column(column)
+            column_args = {
+                "Name": {"overflow": "fold"},
+                "Description": {},
+                "Permission": {}, 
+                "Type": {}, 
+                "Toolkit": {}, 
+                "App ID": {"overflow": "fold"}
+            }
+            for column in column_args:
+                table.add_column(column,**column_args[column])
 
             connections_client = get_connections_client()
             connections = connections_client.list()
@@ -558,6 +569,8 @@ class ToolsController:
                         tool_type=ToolKind.openapi
                 elif tool_binding.mcp is not None:
                         tool_type=ToolKind.mcp
+                elif tool_binding.flow is not None:
+                        tool_type=ToolKind.flow        
                 else:
                         tool_type="Unknown"
                 

ibm_watsonx_orchestrate/client/agents/agent_client.py

@@ -3,6 +3,74 @@ from typing_extensions import List, Optional
 from ibm_watsonx_orchestrate.client.utils import is_local_dev
 from pydantic import BaseModel
 
+def transform_agents_from_flat_agent_spec(agents: dict | list[dict] ) -> dict | list[dict]:
+    if isinstance(agents,list):
+        new_agents = []
+        for agent in agents:
+            new_agents.append(_transform_agent_from_flat_agent_spec(agent))
+        agents = new_agents
+    else:
+        agents = _transform_agent_from_flat_agent_spec(agents)
+    
+    return agents
+
+
+def _transform_agent_from_flat_agent_spec(agent_spec: dict ) -> dict:
+    transformed = {"additional_properties": {}}
+    for key,value in agent_spec.items():
+        if key == "starter_prompts":
+            if value:
+                value.pop("is_default_prompts",None)
+                value["customize"] = value.pop("prompts", [])
+
+            transformed["additional_properties"] |= { key: value }
+            
+        elif key == "welcome_content":
+            if value:
+                value.pop("is_default_message", None)
+
+            transformed["additional_properties"] |= { key: value }
+
+        else:
+            transformed |= { key: value }
+
+    return transformed
+
+def transform_agents_to_flat_agent_spec(agents: dict | list[dict] ) -> dict | list[dict]:
+    if isinstance(agents,list):
+        new_agents = []
+        for agent in agents:
+            new_agents.append(_transform_agent_to_flat_agent_spec(agent))
+        agents = new_agents
+    else:
+        agents = _transform_agent_to_flat_agent_spec(agents)
+
+    return agents
+
+def _transform_agent_to_flat_agent_spec(agent_spec: dict ) -> dict:
+    additional_properties = agent_spec.get("additional_properties", None)
+    if not additional_properties:
+        return agent_spec
+    
+    transformed = agent_spec
+    for key,value in additional_properties.items():
+        if key == "starter_prompts":
+            if value:
+                value["is_default_prompts"] = False
+                value["prompts"] = value.pop("customize", [])
+
+            transformed[key] = value
+            
+        elif key == "welcome_content":
+            if value:
+             value["is_default_message"] = False
+            
+            transformed[key] = value
+            
+    transformed.pop("additional_properties",None)
+
+    return transformed
+
 class AgentUpsertResponse(BaseModel):
     id: Optional[str] = None
     warning: Optional[str] = None
@@ -17,14 +85,14 @@ class AgentClient(BaseAPIClient):
 
 
     def create(self, payload: dict) -> AgentUpsertResponse:
-        response = self._post(self.base_endpoint, data=payload)
+        response = self._post(self.base_endpoint, data=transform_agents_from_flat_agent_spec(payload))
         return AgentUpsertResponse.model_validate(response)
 
     def get(self) -> dict:
-        return self._get(f"{self.base_endpoint}?include_hidden=true")
+        return transform_agents_to_flat_agent_spec(self._get(f"{self.base_endpoint}?include_hidden=true"))
 
     def update(self, agent_id: str, data: dict) -> AgentUpsertResponse:
-        response = self._patch(f"{self.base_endpoint}/{agent_id}", data=data)
+        response = self._patch(f"{self.base_endpoint}/{agent_id}", data=transform_agents_from_flat_agent_spec(data))
         return AgentUpsertResponse.model_validate(response)
 
     def delete(self, agent_id: str) -> dict:
@@ -35,14 +103,14 @@ class AgentClient(BaseAPIClient):
 
     def get_drafts_by_names(self, agent_names: List[str]) -> List[dict]:
         formatted_agent_names = [f"names={x}" for x  in agent_names]
-        return self._get(f"{self.base_endpoint}?{'&'.join(formatted_agent_names)}&include_hidden=true")
+        return transform_agents_to_flat_agent_spec(self._get(f"{self.base_endpoint}?{'&'.join(formatted_agent_names)}&include_hidden=true"))
     
     def get_draft_by_id(self, agent_id: str) -> List[dict]:
         if agent_id is None:
             return ""
         else:
             try:
-                agent = self._get(f"{self.base_endpoint}/{agent_id}")
+                agent = transform_agents_to_flat_agent_spec(self._get(f"{self.base_endpoint}/{agent_id}"))
                 return agent
             except ClientAPIException as e:
                 if e.response.status_code == 404 and "not found with the given name" in e.response.text:
@@ -51,5 +119,5 @@ class AgentClient(BaseAPIClient):
     
     def get_drafts_by_ids(self, agent_ids: List[str]) -> List[dict]:
         formatted_agent_ids = [f"ids={x}" for x  in agent_ids]
-        return self._get(f"{self.base_endpoint}?{'&'.join(formatted_agent_ids)}&include_hidden=true")
+        return transform_agents_to_flat_agent_spec(self._get(f"{self.base_endpoint}?{'&'.join(formatted_agent_ids)}&include_hidden=true"))
     

ibm_watsonx_orchestrate/client/base_api_client.py

@@ -36,6 +36,8 @@ class BaseAPIClient:
 
         if not self.is_local:
             self.base_url = f"{self.base_url}/v1/orchestrate"
+        else:
+            self.base_url = f"{self.base_url}/v1"
 
     def _get_headers(self) -> dict:
         headers = {}
@@ -46,7 +48,6 @@ class BaseAPIClient:
         return headers
 
     def _get(self, path: str, params: dict = None, data=None, return_raw=False) -> dict:
-
         url = f"{self.base_url}{path}"
         response = requests.get(url, headers=self._get_headers(), params=params, data=data, verify=self.verify)
         self._check_response(response)

ibm_watsonx_orchestrate/client/connections/connections_client.py

@@ -1,11 +1,12 @@
 from typing import List
 
+from ibm_cloud_sdk_core.authenticators import MCSPAuthenticator
 from pydantic import BaseModel, ValidationError
 from typing import Optional
 
 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
-from ibm_watsonx_orchestrate.client.utils import is_cpd_env
+from ibm_watsonx_orchestrate.client.utils import is_cpd_env, is_local_dev
 
 import logging
 logger = logging.getLogger(__name__)
@@ -42,6 +43,12 @@ class GetConnectionResponse(BaseModel):
 
 
 class ConnectionsClient(BaseAPIClient):
+    def __init__(self, base_url: str, api_key: str = None, is_local: bool = False, verify: str = None, authenticator: MCSPAuthenticator = None):
+        super(ConnectionsClient, self).__init__(base_url, api_key, is_local, verify, authenticator)
+        if is_local_dev(base_url):
+            self.base_url = f"{base_url.rstrip('/')}/api/v1/orchestrate"
+        else:
+            self.base_url = f"{base_url.rstrip('/')}/v1/orchestrate"
     """
     Client to handle CRUD operations for Connections endpoint
     """
@@ -77,6 +84,8 @@ class ConnectionsClient(BaseAPIClient):
                 else f"/connections/applications?include_details=true"
             )
             res = self._get(path)
+            import json
+            json.dumps(res)
             return [ListConfigsResponse.model_validate(conn) for conn in res.get("applications", [])]
         except ValidationError as e:
             logger.error("Recieved unexpected response from server")
@@ -107,25 +116,25 @@ class ConnectionsClient(BaseAPIClient):
 
     # POST /api/v1/connections/applications/{app_id}/configs/{env}/credentials
     # POST /api/v1/connections/applications/{app_id}/configs/{env}/runtime_credentials
-    def create_credentials(self, app_id: str, env: ConnectionEnvironment, payload: dict, use_sso: bool) -> None:
-        if use_sso:
+    def create_credentials(self, app_id: str, env: ConnectionEnvironment, payload: dict, use_app_credentials: bool) -> None:
+        if use_app_credentials:
             self._post(f"/connections/applications/{app_id}/configs/{env}/credentials", data=payload)
         else:
             self._post(f"/connections/applications/{app_id}/configs/{env}/runtime_credentials", data=payload)
 
     # PATCH /api/v1/connections/applications/{app_id}/configs/{env}/credentials
     # PATCH /api/v1/connections/applications/{app_id}/configs/{env}/runtime_credentials
-    def update_credentials(self, app_id: str, env: ConnectionEnvironment, payload: dict, use_sso: bool) -> None:
-        if use_sso:
+    def update_credentials(self, app_id: str, env: ConnectionEnvironment, payload: dict, use_app_credentials: bool) -> None:
+        if use_app_credentials:
             self._patch(f"/connections/applications/{app_id}/configs/{env}/credentials", data=payload)
         else:
             self._patch(f"/connections/applications/{app_id}/configs/{env}/runtime_credentials", data=payload)
 
     # GET /api/v1/connections/applications/{app_id}/configs/credentials?env={env}
     # GET /api/v1/connections/applications/{app_id}/configs/runtime_credentials?env={env}
-    def get_credentials(self, app_id: str, env: ConnectionEnvironment, use_sso: bool) -> dict:
+    def get_credentials(self, app_id: str, env: ConnectionEnvironment, use_app_credentials: bool) -> dict:
         try:
-            if use_sso:
+            if use_app_credentials:
                 path = (
                     f"/connections/applications/{app_id}/credentials?env={env}"
                     if is_cpd_env(self.base_url)
@@ -146,8 +155,8 @@ class ConnectionsClient(BaseAPIClient):
 
     # DELETE /api/v1/connections/applications/{app_id}/configs/{env}/credentials
     # DELETE /api/v1/connections/applications/{app_id}/configs/{env}/runtime_credentials
-    def delete_credentials(self, app_id: str, env: ConnectionEnvironment, use_sso: bool) -> None:
-        if use_sso:
+    def delete_credentials(self, app_id: str, env: ConnectionEnvironment, use_app_credentials: bool) -> None:
+        if use_app_credentials:
             self._delete(f"/connections/applications/{app_id}/configs/{env}/credentials")
         else:
             self._delete(f"/connections/applications/{app_id}/configs/{env}/runtime_credentials")

ibm_watsonx_orchestrate/client/connections/utils.py

@@ -17,14 +17,16 @@ def _get_connections_manager_url() -> str:
         url_parts = url.split(":")
         url_parts[-1] = str(LOCAL_CONNECTION_MANAGER_PORT)
         url = ":".join(url_parts)
-        url = url + "/api/v1/orchestrate"
         return url
     return None
 
 def get_connections_client() -> ConnectionsClient:
     return instantiate_client(client=ConnectionsClient, url=_get_connections_manager_url())
 
-def get_connection_type(security_scheme: ConnectionSecurityScheme, auth_type: ConnectionAuthType) -> ConnectionType:
+def get_connection_type(security_scheme: ConnectionSecurityScheme, auth_type: ConnectionAuthType) -> ConnectionType | None:
+    if security_scheme is None and auth_type is None:
+        return None
+
     if security_scheme != ConnectionSecurityScheme.OAUTH2:
         return ConnectionType(security_scheme)
     return ConnectionType(auth_type)

ibm_watsonx_orchestrate/client/local_service_instance.py

@@ -14,7 +14,7 @@ DEFAULT_TENANT = {
 DEFAULT_USER = {"username": "wxo.archer@ibm.com", "password": "watsonx"}
 DEFAULT_LOCAL_SERVICE_URL = "http://localhost:4321"
 DEFAULT_LOCAL_AUTH_ENDPOINT = f"{DEFAULT_LOCAL_SERVICE_URL}/api/v1/auth/token"
-DEFAULT_LOCAL_TENANT_URL = f"{DEFAULT_LOCAL_SERVICE_URL}/tenants"
+DEFAULT_LOCAL_TENANT_URL = f"{DEFAULT_LOCAL_SERVICE_URL}/api/v1/tenants"
 DEFAULT_LOCAL_TENANT_AUTH_ENDPOINT = "{}/api/v1/auth/token?tenant_id={}"
 
 

ibm_watsonx_orchestrate/client/service_instance.py

@@ -51,13 +51,13 @@ class ServiceInstance(BaseServiceInstance):
     def _create_token(self) -> str:
         if not self._credentials.auth_type:
             if ".cloud.ibm.com" in self._credentials.url:
-                logger.warning("Using IBM IAM Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mscp' or 'cpd")
+                logger.warning("Using IBM IAM Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mcsp' or 'cpd")
                 return self._authenticate(EnvironmentAuthType.IBM_CLOUD_IAM)
             elif is_cpd_env(self._credentials.url):
-                logger.warning("Using CPD Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mscp' or 'cpd")
+                logger.warning("Using CPD Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mcsp' or 'cpd")
                 return self._authenticate(EnvironmentAuthType.CPD)
             else:
-                logger.warning("Using MCSP Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mscp' or 'cpd' ")
+                logger.warning("Using MCSP Auth Type. If this is incorrect please use the '--type' flag to explicitly choose one of 'ibm_iam' or 'mcsp' or 'cpd' ")
                 return self._authenticate(EnvironmentAuthType.MCSP)
         else:
             return self._authenticate(self._credentials.auth_type)

ibm_watsonx_orchestrate/client/tools/tempus_client.py

@@ -29,12 +29,17 @@ class TempusClient(BaseAPIClient):
             authenticator=authenticator
         )
         
+    def get_tempus_endpoint(self) -> str:
+        """
+        Returns the Tempus endpoint URL
+        """
+        return self.base_url
     def create_update_flow_model(self, flow_id: str, model: dict) -> dict:
-        return self._post(f"/v1/flow-models/{flow_id}", data=model)
+        return self._post(f"/flow-models/{flow_id}", data=model)
     
     def run_flow(self, flow_id: str, input: dict) -> dict:
-        return self._post(f"/v1/flows/{flow_id}/versions/TIP/run", data=input)
+        return self._post(f"/flows/{flow_id}/versions/TIP/run", data=input)
     
     def arun_flow(self, flow_id: str, input: dict) -> dict:
-        return self._post(f"/v1/flows/{flow_id}/versions/TIP/run/async", data=input)
+        return self._post(f"/flows/{flow_id}/versions/TIP/run/async", data=input)
 

ibm_watsonx_orchestrate/client/utils.py

@@ -47,6 +47,16 @@ def is_local_dev(url: str | None = None) -> bool:
 
     return False
 
+def is_ibm_cloud():
+    cfg = Config()
+    active_env = cfg.read(CONTEXT_SECTION_HEADER, CONTEXT_ACTIVE_ENV_OPT)
+    url = cfg.get(ENVIRONMENTS_SECTION_HEADER, active_env, ENV_WXO_URL_OPT)
+
+    if url.__contains__("cloud.ibm.com"):
+        return True
+    return False
+
+
 def is_cpd_env(url: str) -> bool:
     if url.lower().startswith("https://cpd"):
         return True