ibm-watsonx-orchestrate 1.2.0__tar.gz → 1.3.0__tar.gz

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.2.0
+Version: 1.3.0
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
 License-File: LICENSE
 Requires-Python: <3.14,>=3.11
 Requires-Dist: certifi>=2024.8.30
+Requires-Dist: click<8.2.0,>=8.0.0
 Requires-Dist: docstring-parser<1.0,>=0.16
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: ibm-cloud-sdk-core>=3.22.0
@@ -19,7 +20,7 @@ Requires-Dist: pydantic<3.0.0,>=2.10.3
 Requires-Dist: pyjwt<3.0.0,>=2.10.1
 Requires-Dist: python-dotenv>=1.0.0
 Requires-Dist: pyyaml<7.0.0,>=6.0.2
-Requires-Dist: requests>=2.32.3
+Requires-Dist: requests>=2.32.0
 Requires-Dist: rich<14.0.0,>=13.9.4
 Requires-Dist: typer<1.0.0,>=0.15.1
 Requires-Dist: urllib3>=2.2.3

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/pyproject.toml

@@ -17,6 +17,7 @@ requires-python = ">=3.11, <3.14"
 classifiers = []
 dependencies = [
     "certifi>=2024.8.30",
+    "click>=8.0.0,<8.2.0",
     "docstring-parser>=0.16,<1.0",
     "httpx>=0.28.1,<1.0.0",
     "ibm-cloud-sdk-core>=3.22.0",
@@ -29,7 +30,7 @@ dependencies = [
     "pyjwt>=2.10.1,<3.0.0",
     "python-dotenv>=1.0.0",
     "pyyaml>=6.0.2,<7.0.0",
-    "requests>=2.32.3",
+    "requests>=2.32.0",
     "rich>=13.9.4,<14.0.0",
     "typer>=0.15.1,<1.0.0",
     "urllib3>=2.2.3"

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.2.0"
+__version__ = "1.3.0"
 
 
 

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/agent_builder/agents/types.py

@@ -5,6 +5,7 @@ from typing import List, Optional, Dict
 from pydantic import BaseModel, model_validator, ConfigDict
 from ibm_watsonx_orchestrate.agent_builder.tools import BaseTool
 from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import KnowledgeBaseSpec
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.knowledge_base import KnowledgeBase
 from pydantic import Field, AliasChoices
 from typing import Annotated
 
@@ -85,6 +86,8 @@ class AgentSpec(BaseAgentSpec):
     def __init__(self, *args, **kwargs):
         if "tools" in kwargs and kwargs["tools"]:
             kwargs["tools"] = [x.__tool_spec__.name if isinstance(x, BaseTool) else x for x in kwargs["tools"]]
+        if "knowledge_base" in kwargs and kwargs["knowledge_base"]:
+            kwargs["knowledge_base"] = [x.name if isinstance(x, KnowledgeBase) else x for x in kwargs["knowledge_base"]]
         if "collaborators" in kwargs and kwargs["collaborators"]:
             kwargs["collaborators"] = [x.name if isinstance(x, BaseAgentSpec) else x for x in kwargs["collaborators"]]
         super().__init__(*args, **kwargs)
@@ -101,7 +104,7 @@ class AgentSpec(BaseAgentSpec):
 
 def validate_agent_fields(values: dict) -> dict:
     # Check for empty strings or whitespace
-    for field in ["id", "name", "kind", "description", "collaborators", "tools"]:
+    for field in ["id", "name", "kind", "description", "collaborators", "tools", "knowledge_base"]:
         value = values.get(field)
         if value and not str(value).strip():
             raise ValueError(f"{field} cannot be empty or just whitespace")

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base.py

@@ -1,7 +1,7 @@
 import json
 from ibm_watsonx_orchestrate.utils.utils import yaml_safe_load
-from .types import KnowledgeBaseSpec
-
+from .types import KnowledgeBaseSpec, KnowledgeBaseKind
+from pydantic import model_validator
 
 class KnowledgeBase(KnowledgeBaseSpec):
 
@@ -24,4 +24,17 @@ class KnowledgeBase(KnowledgeBaseSpec):
         return f"KnowledgeBase(id='{self.id}', name='{self.name}', description='{self.description}')"
 
     def __str__(self):
-        return self.__repr__()
+        return self.__repr__()
+    
+    # Not a model validator since we only want to validate this on import
+    def validate_documents_or_index_exists(self):
+        if self.documents and self.conversational_search_tool and self.conversational_search_tool.index_config or \
+            (not self.documents and (not self.conversational_search_tool or not self.conversational_search_tool.index_config)):
+            raise ValueError("Must provide either \"documents\" or \"conversational_search_tool.index_config\", but not both")
+        return self
+    
+    @model_validator(mode="after")
+    def validate_kind(self):
+        if self.kind != KnowledgeBaseKind.KNOWLEDGE_BASE:
+            raise ValueError(f"The specified kind '{self.kind}' cannot be used to create a knowledge base")
+        return self

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/agent_builder/knowledge_bases/knowledge_base_requests.py

@@ -1,12 +1,12 @@
 import json
 from ibm_watsonx_orchestrate.utils.utils import yaml_safe_load
-from .types import CreateKnowledgeBase, PatchKnowledgeBase, KnowledgeBaseKind
+from .types import KnowledgeBaseSpec, PatchKnowledgeBase, KnowledgeBaseKind
 
 
-class KnowledgeBaseCreateRequest(CreateKnowledgeBase):
+class KnowledgeBaseCreateRequest(KnowledgeBaseSpec):
 
     @staticmethod
-    def from_spec(file: str) -> 'CreateKnowledgeBase':
+    def from_spec(file: str) -> 'KnowledgeBaseSpec':
         with open(file, 'r') as f:
             if file.endswith('.yaml') or file.endswith('.yml'):
                 content = yaml_safe_load(f)
@@ -15,20 +15,10 @@ class KnowledgeBaseCreateRequest(CreateKnowledgeBase):
             else:
                 raise ValueError('file must end in .json, .yaml, or .yml')
             
-            if (content.get('documents') and content.get("conversational_search_tool", {}).get("index_config")) or \
-                  (not content.get('documents') and not content.get("conversational_search_tool", {}).get("index_config")):
-                raise ValueError("Must provide either \"documents\" or \"conversational_search_tool.index_config\", but not both")
-            
             if not content.get("spec_version"):
                 raise ValueError(f"Field 'spec_version' not provided. Please ensure provided spec conforms to a valid spec format")
             
-            if not content.get("kind"):
-                raise ValueError(f"Field 'kind' not provided. Should be 'knowledge_base'")
-
-            if content.get("kind") != KnowledgeBaseKind.KNOWLEDGE_BASE:
-                raise ValueError(f"Field 'kind' should be 'knowledge_base', but is set to '{content.get('kind')}'")
-            
-            knowledge_base = CreateKnowledgeBase.model_validate(content)
+            knowledge_base = KnowledgeBaseSpec.model_validate(content)
 
         return knowledge_base
     
@@ -48,12 +38,6 @@ class KnowledgeBaseUpdateRequest(PatchKnowledgeBase):
             if not content.get("spec_version"):
                 raise ValueError(f"Field 'spec_version' not provided. Please ensure provided spec conforms to a valid spec format")
             
-            if not content.get("kind"):
-                raise ValueError(f"Field 'kind' not provided. Should be 'knowledge_base'")
-
-            if content.get("kind") != KnowledgeBaseKind.KNOWLEDGE_BASE:
-                raise ValueError(f"Field 'kind' should be 'knowledge_base', but is set to '{content.get('kind')}'")
-            
             patch = PatchKnowledgeBase.model_validate(content)
 
         return patch

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py

@@ -206,16 +206,6 @@ class KnowledgeBaseBuiltInVectorIndexConfig(BaseModel):
     chunk_overlap: Optional[int] = None
     limit: Optional[int] = None
     
-class CreateKnowledgeBase(BaseModel):
-    """request payload schema"""
-    name: Optional[str] = None
-    description: Optional[str] = None
-    documents: list[str] = None
-    vector_index: Optional[KnowledgeBaseBuiltInVectorIndexConfig] = None
-    conversational_search_tool: Optional[ConversationalSearchConfig] = None
-    prioritize_built_in_index: Optional[bool] = None
-    
-    
 class PatchKnowledgeBase(BaseModel):
     """request payload schema"""
     description: Optional[str] = None
@@ -224,20 +214,21 @@ class PatchKnowledgeBase(BaseModel):
     prioritize_built_in_index: Optional[bool] = None
     representation: Optional[KnowledgeBaseRepresentation] = None
     
-    
 class KnowledgeBaseSpec(BaseModel):
     """Schema for a complete knowledge-base."""
     spec_version: SpecVersion = None
     kind: KnowledgeBaseKind = KnowledgeBaseKind.KNOWLEDGE_BASE
     id: Optional[UUID] = None 
     tenant_id: Optional[str] = None
-    name: Optional[str] = None
+    name: str
     description: Optional[str] = None
     vector_index: Optional[KnowledgeBaseBuiltInVectorIndexConfig] = None
     conversational_search_tool: Optional[ConversationalSearchConfig] | Optional[UUID] = None
     prioritize_built_in_index: Optional[bool] = None
+    representation: Optional[KnowledgeBaseRepresentation] = None
     vector_index_id: Optional[UUID] = None 
     created_by: Optional[str] = None
     created_on: Optional[datetime] = None 
     updated_at: Optional[datetime] = None
-
+    # For import/update
+    documents: list[str] = None

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py

@@ -115,17 +115,9 @@ def create_openapi_json_tool(
         raise ValueError(
             f"Path {http_path} did not have an http_method {http_method}. Available methods are {list(route.keys())}")
 
-    operation_id = (
-        re.sub(
-            '_+',
-            '_',
-            re.sub(
-                r'[^a-zA-Z_]',
-                '_',
-                route_spec.get('operationId', None)
-            )
-        )
-    ) if route_spec.get('operationId', None) is not None else None
+    operation_id = re.sub( r'(\W|_)+', '_', route_spec.get('operationId') ) \
+                     if route_spec.get('operationId', None) else None
+
     spec_name = name or operation_id
     spec_permission = permission or _action_to_perm(route_spec.get('x-ibm-operation', {}).get('action'))
     if spec_name is None:
@@ -142,7 +134,7 @@ def create_openapi_json_tool(
         description=spec_description,
         permission=spec_permission
     )
-    
+
     spec.input_schema = input_schema or ToolRequestBody(
         type='object',
         properties={},

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py

@@ -11,6 +11,7 @@ from copy import deepcopy
 
 from typing import Iterable, List
 from ibm_watsonx_orchestrate.cli.commands.tools.tools_controller import import_python_tool
+from ibm_watsonx_orchestrate.cli.commands.knowledge_bases.knowledge_bases_controller import import_python_knowledge_base
 
 from ibm_watsonx_orchestrate.agent_builder.agents import (
     Agent,
@@ -33,6 +34,7 @@ logger = logging.getLogger(__name__)
 def import_python_agent(file: str) -> List[Agent | ExternalAgent | AssistantAgent]:
     # Import tools
     import_python_tool(file)
+    import_python_knowledge_base(file)
 
     file_path = Path(file)
     file_directory = file_path.parent

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_command.py

@@ -9,7 +9,7 @@ knowledge_bases_app = typer.Typer(no_args_is_help=True)
 def knowledge_base_import(
     file: Annotated[
         str,
-        typer.Option("--file", "-f", help="YAML file with knowledge base definition"),
+        typer.Option("--file", "-f", help="YAML, JSON or Python file with knowledge base definition(s)"),
     ],
     app_id: Annotated[
         str, typer.Option(
@@ -25,7 +25,7 @@ def knowledge_base_import(
 def knowledge_base_patch(
     file: Annotated[
         str,
-        typer.Option("--file", "-f", help="YAML file with knowledge base definition"),
+        typer.Option("--file", "-f", help="YAML or JSON file with knowledge base definition"),
     ],
     name: Annotated[
         str,

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py

@@ -3,17 +3,44 @@ import json
 import rich
 import requests
 import logging
+import importlib
+import inspect
+from pathlib import Path
+from typing import List
 
-from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.knowledge_base_requests import KnowledgeBaseCreateRequest, KnowledgeBaseUpdateRequest
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.knowledge_base_requests import KnowledgeBaseUpdateRequest
 from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.knowledge_base import KnowledgeBase
 from ibm_watsonx_orchestrate.client.knowledge_bases.knowledge_base_client import KnowledgeBaseClient
 from ibm_watsonx_orchestrate.client.base_api_client import ClientAPIException
 from ibm_watsonx_orchestrate.client.connections import get_connections_client
-
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
 
 logger = logging.getLogger(__name__)
 
+def import_python_knowledge_base(file: str) -> List[KnowledgeBase]:
+    file_path = Path(file)
+    file_directory = file_path.parent
+    file_name = file_path.stem
+    sys.path.append(str(file_directory))
+    module = importlib.import_module(file_name)
+    del sys.path[-1]
+
+    knowledge_bases = []
+    for _, obj in inspect.getmembers(module):
+        if isinstance(obj, KnowledgeBase):
+            knowledge_bases.append(obj)
+    return knowledge_bases
+
+def parse_file(file: str) -> List[KnowledgeBase]:
+    if file.endswith('.yaml') or file.endswith('.yml') or file.endswith(".json"):
+        knowledge_base = KnowledgeBase.from_spec(file=file)
+        return [knowledge_base]
+    elif file.endswith('.py'):
+        knowledge_bases = import_python_knowledge_base(file)
+        return knowledge_bases
+    else:
+        raise ValueError("file must end in .json, .yaml, .yml or .py")
+
 def to_column_name(col: str):
     return " ".join([word.capitalize() if not word[0].isupper() else word for word in col.split("_")])
 
@@ -34,45 +61,43 @@ class KnowledgeBaseController:
     
     def import_knowledge_base(self, file: str, app_id: str):
         client = self.get_client()
-        create_request = KnowledgeBaseCreateRequest.from_spec(file=file)
 
-        try:
-            if create_request.documents:
-                try:
+        knowledge_bases = parse_file(file=file)
+        for kb in knowledge_bases:
+            try:
+                kb.validate_documents_or_index_exists()
+                if kb.documents:
                     file_dir = "/".join(file.split("/")[:-1])
-                    files = [('files', (get_file_name(file_path), open(file_path if file_path.startswith("/") else f"{file_dir}/{file_path}", 'rb'))) for file_path in create_request.documents]
-                except Exception as e:
-                    logger.error(f"Error importing knowledge base: {str(e).replace('[Errno 2] ', '')}")
-                    sys.exit(1);
-
-                payload = create_request.model_dump(exclude_none=True);
-                payload.pop('documents');
-
-                client.create_built_in(payload=payload, files=files)
-            else:
-                if len(create_request.conversational_search_tool.index_config) != 1:
-                    raise ValueError(f"Must provide exactly one conversational_search_tool.index_config. Provided {len(create_request.conversational_search_tool.index_config)}.")
+                    files = [('files', (get_file_name(file_path), open(file_path if file_path.startswith("/") else (file_path if not file_dir else f"{file_dir}/{file_path}"), 'rb'))) for file_path in kb.documents]
+                    
+                    payload = kb.model_dump(exclude_none=True);
+                    payload.pop('documents');
+
+                    client.create_built_in(payload=payload, files=files)
+                else:
+                    if len(kb.conversational_search_tool.index_config) != 1:
+                        raise ValueError(f"Must provide exactly one conversational_search_tool.index_config. Provided {len(kb.conversational_search_tool.index_config)}.")
+                    
+                    if app_id:
+                        connections_client = get_connections_client()
+                        connection_id = None
+                        if app_id is not None:
+                            connections = connections_client.get_draft_by_app_id(app_id=app_id)
+                            if not connections:
+                                logger.error(f"No connection exists with the app-id '{app_id}'")
+                                exit(1)
+
+                            connection_id = connections.connection_id
+                            kb.conversational_search_tool.index_config[0].connection_id = connection_id
+
+                    client.create(payload=kb.model_dump(exclude_none=True))
                 
-                if app_id:
-                    connections_client = get_connections_client()
-                    connection_id = None
-                    if app_id is not None:
-                        connections = connections_client.get_draft_by_app_id(app_id=app_id)
-                        if not connections:
-                            logger.error(f"No connection exists with the app-id '{app_id}'")
-                            exit(1)
-
-                        connection_id = connections.connection_id
-                        create_request.conversational_search_tool.index_config[0].connection_id = connection_id
-
-                client.create(payload=create_request.model_dump(exclude_none=True))
-            
-            logger.info(f"Successfully imported knowledge base '{create_request.name}'")
-        except ClientAPIException as e:
-            if "duplicate key value violates unique constraint" in e.response.text:
-                logger.error(f"A knowledge base with the name '{create_request.name}' already exists. Failed to import knowledge base")
-            else:
-                logger.error(f"Error importing knowledge base '{create_request.name}\n' {e.response.text}")
+                logger.info(f"Successfully imported knowledge base '{kb.name}'")
+            except ClientAPIException as e:
+                if "duplicate key value violates unique constraint" in e.response.text:
+                    logger.error(f"A knowledge base with the name '{kb.name}' already exists. Failed to import knowledge base")
+                else:
+                    logger.error(f"Error importing knowledge base '{kb.name}\n' {e.response.text}")
     
     def get_id(
         self, id: str, name: str

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -49,13 +49,13 @@ def validate_app_ids(kind: ToolKind, **args) -> None:
     app_ids = args.get("app_id")
     if not app_ids:
         return
-    
+
     if kind == ToolKind.openapi:
         if app_ids and len(app_ids) > 1:
             raise typer.BadParameter(
                 "Kind 'openapi' can only take one app-id"
             )
-    
+
     connections_client = get_connections_client()
 
     imported_connections_list = connections_client.list()
@@ -115,7 +115,7 @@ def get_connection_id(app_id: str) -> str:
 
 def parse_python_app_ids(app_ids: List[str]) -> dict[str,str]:
     app_id_dict = {}
-    for app_id in app_ids:        
+    for app_id in app_ids:
         # Split on = but not on \=
         split_pattern = re.compile(r"(?<!\\)=")
         split_id = re.split(split_pattern, app_id)
@@ -139,7 +139,7 @@ def parse_python_app_ids(app_ids: List[str]) -> dict[str,str]:
 def validate_python_connections(tool: BaseTool):
     if not tool.expected_credentials:
         return
-    
+
     connections_client = get_connections_client()
     connections = tool.__tool_spec__.binding.python.connections
 
@@ -158,13 +158,13 @@ def validate_python_connections(tool: BaseTool):
             expected_tool_conn_types = expected_cred.type
         else:
             expected_tool_conn_types = [expected_cred.type]
-        
+
         sanatized_expected_tool_app_id = sanatize_app_id(expected_tool_app_id)
         if sanatized_expected_tool_app_id in existing_sanatized_expected_tool_app_ids:
             logger.error(f"Duplicate App ID found '{expected_tool_app_id}'. Multiple expected app ids in the tool '{tool.__tool_spec__.name}' collide after sanaitization to '{sanatized_expected_tool_app_id}'. Please rename the offending app id in your tool.")
             sys.exit(1)
         existing_sanatized_expected_tool_app_ids.add(sanatized_expected_tool_app_id)
-        
+
         if sanatized_expected_tool_app_id not in provided_connections:
             logger.error(f"The tool '{tool.__tool_spec__.name}' requires an app-id '{expected_tool_app_id}'. Please use the `--app-id` flag to provide the required app-id")
             validation_failed = True
@@ -173,7 +173,7 @@ def validate_python_connections(tool: BaseTool):
             continue
 
         connection_id = connections.get(sanatized_expected_tool_app_id)
-        
+
         imported_connection = imported_connections.get(connection_id)
         imported_connection_auth_type = get_connection_type(security_scheme=imported_connection.security_scheme, auth_type=imported_connection.auth_type)
 
@@ -184,7 +184,7 @@ def validate_python_connections(tool: BaseTool):
         if imported_connection and len(expected_tool_conn_types) and imported_connection_auth_type not in expected_tool_conn_types:
             logger.error(f"The app-id '{imported_connection.app_id}' is of type '{imported_connection_auth_type.value}'. The tool '{tool.__tool_spec__.name}' accepts connections of the following types '{', '.join(expected_tool_conn_types)}'. Use `orchestrate connections list` to view current connections and use `orchestrate connections add` to create the relevent connection")
             validation_failed = True
-        
+
     if validation_failed:
         exit(1)
 
@@ -311,7 +311,7 @@ def import_python_tool(file: str, requirements_file: str = None, app_id: List[st
 
         validate_python_connections(obj)
         tools.append(obj)
-    
+
     return tools
 
 async def import_openapi_tool(file: str, connection_id: str) -> List[BaseTool]:
@@ -335,7 +335,7 @@ class ToolsController:
         # Ensure app_id is a list
         if args.get("app_id") and isinstance(args.get("app_id"), str):
             args["app_id"] = [args.get("app_id")]
-    
+
         validate_params(kind=kind, **args)
 
         match kind:
@@ -390,7 +390,7 @@ class ToolsController:
 
             for tool in tools:
                 tool_binding = tool.__tool_spec__.binding
-                
+
                 connection_ids = []
 
                 if tool_binding is not None:
@@ -403,7 +403,6 @@ class ToolsController:
                         for conn in tool_binding.mcp.connections:
                             connection_ids.append(tool_binding.mcp.connections[conn])
 
-
                 app_ids = []
                 for connection_id in connection_ids:
                     connection = connections_dict.get(connection_id)
@@ -463,7 +462,7 @@ class ToolsController:
                 if len(existing_tools) > 1:
                     logger.error(f"Multiple existing tools found with name '{tool.__tool_spec__.name}'. Failed to update tool")
                     sys.exit(1)
-                
+
                 if len(existing_tools) > 0:
                     existing_tool = existing_tools[0]
                     exist = True
@@ -569,7 +568,7 @@ class ToolsController:
             self.get_client().upload_tools_artifact(tool_id=tool_id, file_path=tool_artifact)
 
         logger.info(f"Tool '{tool.__tool_spec__.name}' updated successfully")
-    
+
     def remove_tool(self, name: str):
         try:
             client = self.get_client()

ibm_watsonx_orchestrate-1.3.0/src/ibm_watsonx_orchestrate/cli/init_helper.py

@@ -0,0 +1,43 @@
+import importlib.metadata
+from importlib import resources
+from typing import Optional
+from rich import print as pprint
+from dotenv import dotenv_values
+import typer
+
+from ibm_watsonx_orchestrate.cli.config import Config, PYTHON_REGISTRY_HEADER, \
+    PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT
+
+
+def version_callback(checkVersion: bool=True):
+    if checkVersion:
+        __version__ = importlib.metadata.version('ibm-watsonx-orchestrate')
+        default_env = dotenv_values(resources.files("ibm_watsonx_orchestrate.docker").joinpath("default.env"))
+        cfg = Config()
+        pypi_override = cfg.read(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT)
+
+        adk_version_str = f"[bold]ADK Version[/bold]: {__version__}"
+        if pypi_override is not None:
+            adk_version_str += f" [red bold](override: {pypi_override})[/red bold]"
+        pprint(adk_version_str)
+
+
+        pprint("[bold]Developer Edition Image Tags[/bold] [italic](if not overridden in env file)[/italic]")
+        for key, value in default_env.items():
+            if key.endswith('_TAG') or key == 'DBTAG':
+                pprint(f"  [bold]{key}[/bold]: {value}")
+
+        raise typer.Exit()
+
+    
+
+def init_callback(
+    ctx: typer.Context,
+    version: Optional[bool] = typer.Option(
+      None, 
+      "--version",
+      help="Show the installed version of the ADK and Developer Edition Tags",
+      callback=version_callback
+    )
+):
+    pass

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/cli/main.py

@@ -12,10 +12,12 @@ from ibm_watsonx_orchestrate.cli.commands.environment.environment_command import
 from ibm_watsonx_orchestrate.cli.commands.channels.channels_command import channel_app
 from ibm_watsonx_orchestrate.cli.commands.knowledge_bases.knowledge_bases_command import knowledge_bases_app
 from ibm_watsonx_orchestrate.cli.commands.toolkit.toolkit_command import toolkits_app
+from ibm_watsonx_orchestrate.cli.init_helper import init_callback
 
 app = typer.Typer(
     no_args_is_help=True,
-    pretty_exceptions_enable=False
+    pretty_exceptions_enable=False,
+    callback=init_callback
 )
 app.add_typer(login_app)
 app.add_typer(environment_app, name="env", help='Add, remove, or select the activate env other commands will interact with (either your local server or a production instance)')

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/client/connections/connections_client.py

@@ -51,7 +51,7 @@ class ConnectionsClient(BaseAPIClient):
     # DELETE api/v1/connections/applications/{app_id}
     def delete(self, app_id: str) -> dict:
         return self._delete(f"/connections/applications/{app_id}")
-    
+
     # GET /api/v1/connections/applications/{app_id}
     def get(self, app_id: str) -> GetConnectionResponse:
         try:
@@ -60,7 +60,7 @@ class ConnectionsClient(BaseAPIClient):
             if e.response.status_code == 404:
                 return None
             raise e
-    
+
 
     # GET api/v1/connections/applications
     def list(self) -> List[ListConfigsResponse]:
@@ -75,15 +75,15 @@ class ConnectionsClient(BaseAPIClient):
                 return []
             raise e
 
-    
+
     # POST /api/v1/connections/applications/{app_id}/configurations
     def create_config(self, app_id: str, payload: dict) -> None:
         self._post(f"/connections/applications/{app_id}/configurations", data=payload)
-    
+
     # PATCH /api/v1/connections/applications/{app_id}/configurations/{env}
     def update_config(self, app_id: str, env: ConnectionEnvironment, payload: dict) -> None:
         self._patch(f"/connections/applications/{app_id}/configurations/{env}", data=payload)
-    
+
     # `GET /api/v1/connections/applications/{app_id}/configurations/{env}'
     def get_config(self, app_id: str, env: ConnectionEnvironment) -> GetConfigResponse:
         try:
@@ -93,7 +93,7 @@ class ConnectionsClient(BaseAPIClient):
             if e.response.status_code == 404:
                 return None
             raise e
-    
+
     # 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:
@@ -101,7 +101,7 @@ class ConnectionsClient(BaseAPIClient):
             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:
@@ -109,7 +109,7 @@ class ConnectionsClient(BaseAPIClient):
             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:
@@ -122,7 +122,7 @@ class ConnectionsClient(BaseAPIClient):
             if e.response.status_code == 404:
                 return None
             raise e
-    
+
     # 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:
@@ -130,7 +130,7 @@ class ConnectionsClient(BaseAPIClient):
             self._delete(f"/connections/applications/{app_id}/configs/{env}/credentials")
         else:
             self._delete(f"/connections/applications/{app_id}/configs/{env}/runtime_credentials")
-    
+
     def get_draft_by_app_id(self, app_id: str) -> GetConnectionResponse:
         return self.get(app_id=app_id)
 
@@ -141,7 +141,7 @@ class ConnectionsClient(BaseAPIClient):
             if connection:
                 connections += connection
         return connections
-    
+
     def get_draft_by_id(self, conn_id) -> str:
         """Retrieve the app ID for a given connection ID."""
         if conn_id is None:
@@ -151,12 +151,12 @@ class ConnectionsClient(BaseAPIClient):
         except ClientAPIException as e:
             if e.response.status_code == 404:
                 logger.warning(f"Connections not found. Returning connection ID: {conn_id}")
-                return conn_id 
+                return conn_id
             raise
 
         app_id = next((conn.app_id for conn in connections if conn.connection_id == conn_id), None)
 
         if app_id is None:
             logger.warning(f"Connection with ID {conn_id} not found. Returning connection ID.")
-            return conn_id  
+            return conn_id
         return app_id

{ibm_watsonx_orchestrate-1.2.0 → ibm_watsonx_orchestrate-1.3.0}/src/ibm_watsonx_orchestrate/docker/default.env

@@ -49,10 +49,10 @@ EVENT_BROKER_TTL="-1"
 # THE VALUES FOR REGISTRY_URL AND *_REGISTRY ARE NOT SET HERE; THEY ARE EITHER PROVIDED BY THE USER OR DETERMINED AT RUNTIME BASED ON WO_DEVELOPER_EDITION_SOURCE.
 REGISTRY_URL=
 
-SERVER_TAG=03-05-2025
+SERVER_TAG=06-05-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=03-05-2025
+WORKER_TAG=06-05-2025
 WORKER_REGISTRY=
 
 DB_REGISTRY=