ibm-watsonx-orchestrate 1.12.0b0__py3-none-any.whl → 1.13.0b0__py3-none-any.whl

ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py

@@ -6,14 +6,15 @@ import logging
 import importlib
 import inspect
 from pathlib import Path
-from typing import List
+from typing import List, Any
 
 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
-from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import FileUpload
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import FileUpload, KnowledgeBaseListEntry
+from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown
 
 logger = logging.getLogger(__name__)
 
@@ -198,8 +199,7 @@ class KnowledgeBaseController:
 
         logger.info(f"Knowledge base '{kb.name}' updated successfully")
 
-
-    def knowledge_base_status( self, id: str, name: str) -> None:
+    def knowledge_base_status( self, id: str, name: str, format: ListFormats = None) ->  dict | str | None:
         knowledge_base_id = self.get_id(id, name)
         response = self.get_client().status(knowledge_base_id)
 
@@ -219,13 +219,25 @@ class KnowledgeBaseController:
 
             response["id"] = kbID
         
+        if format == ListFormats.JSON:
+            return response
+        
+
         [table.add_column(to_column_name(col), {}) for col in response.keys()]
         table.add_row(*[str(val) for val in response.values()])
         
+        if format == ListFormats.Table:
+            return rich_table_to_markdown(table)
+
         rich.print(table)
 
 
-    def list_knowledge_bases(self, verbose: bool=False):
+    def list_knowledge_bases(self, verbose: bool=False, format: ListFormats=None)-> List[dict[str, Any]] | List[KnowledgeBaseListEntry] | str | None:
+
+        if verbose and format:
+            logger.error("For knowledge base list, `--verbose` and `--format` are mutually exclusive options")
+            sys.exit(1)
+
         response = self.get_client().get()
         knowledge_bases = [KnowledgeBase.model_validate(knowledge_base) for knowledge_base in response]
 
@@ -234,7 +246,9 @@ class KnowledgeBaseController:
             for kb in knowledge_bases:
                 knowledge_base_list.append(json.loads(kb.model_dump_json(exclude_none=True)))
             rich.print(rich.json.JSON(json.dumps(knowledge_base_list, indent=4)))
+            return knowledge_base_list
         else:
+            knowledge_base_details=[]
             table = rich.table.Table(
                 show_header=True, 
                 header_style="bold white", 
@@ -251,6 +265,11 @@ class KnowledgeBaseController:
             for column in column_args:
                 table.add_column(column, **column_args[column])
             
+            connections_client = get_connections_client()
+            connections = connections_client.list()
+
+            connections_dict = {conn.connection_id: conn for conn in connections}
+            
             for kb in knowledge_bases:
                 app_id = ""
                 
@@ -258,18 +277,28 @@ class KnowledgeBaseController:
                    and kb.conversational_search_tool.index_config is not None \
                    and len(kb.conversational_search_tool.index_config) > 0 \
                    and kb.conversational_search_tool.index_config[0].connection_id is not None:
-                    connections_client = get_connections_client()
-                    app_id = str(connections_client.get_draft_by_id(kb.conversational_search_tool.index_config[0].connection_id))
-
-                table.add_row(
-                    kb.name,
-                    kb.description,
-                    app_id,
-                    str(kb.id)
+                    conn = connections_dict.get(kb.conversational_search_tool.index_config[0].connection_id)
+                    if conn:
+                        app_id = conn.app_id
+
+                entry = KnowledgeBaseListEntry(
+                    name=kb.name,
+                    id=str(kb.id),
+                    description=kb.description,
+                    app_id=app_id
                 )
-
-            rich.print(table)
-        
+                if format == ListFormats.JSON:
+                    knowledge_base_details.append(entry)
+                else:
+                    table.add_row(*entry.get_row_details())
+
+            match format:
+                case ListFormats.JSON:
+                    return knowledge_base_details
+                case ListFormats.Table:
+                    return rich_table_to_markdown(table)
+                case _:
+                    rich.print(table)   
 
     def remove_knowledge_base(self, id: str, name: str):
         knowledge_base_id = self.get_id(id, name)      

ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py

@@ -101,10 +101,11 @@ PROVIDER_EXTRA_PROPERTIES_LUT = {
 PROVIDER_REQUIRED_FIELDS = {k:['api_key'] for k in ModelProvider}
 # Update required fields for each provider
 # Use sets to denote when a requirement is 'or'
+# Tuples denote combined requirements like 'and'
 PROVIDER_REQUIRED_FIELDS.update({
     ModelProvider.WATSONX: PROVIDER_REQUIRED_FIELDS[ModelProvider.WATSONX] + [{'watsonx_space_id', 'watsonx_project_id', 'watsonx_deployment_id'}],
     ModelProvider.OLLAMA: PROVIDER_REQUIRED_FIELDS[ModelProvider.OLLAMA] + ['custom_host'],
-    ModelProvider.BEDROCK: [],
+    ModelProvider.BEDROCK: [{'api_key', ('aws_secret_access_key', 'aws_access_key_id')}],
 })
 
 # def env_file_to_model_ProviderConfig(model_name: str, env_file_path: str) -> ProviderConfig | None:
@@ -158,16 +159,34 @@ def _validate_extra_fields(provider: ModelProvider, cfg: ProviderConfig) -> None
         if  cfg.__dict__.get(attr) is not None and attr not in accepted_fields:
             logger.warning(f"The config option '{attr}' is not used by provider '{provider}'")
 
+def _check_credential_provided(cred: str | tuple, provided_creds: set) -> bool:
+    if isinstance(cred, tuple):
+        return all(item in provided_creds for item in cred)
+    else:
+        return cred in provided_creds
+
+def _format_missing_credential(missing_credential: set) -> str:
+    parts = []
+    for cred in missing_credential:
+        if isinstance(cred, tuple):
+            formatted = " and ".join(f"{x}" for x in cred)
+            parts.append(f"({formatted})")
+        else:
+            parts.append(f"{cred}")
+
+    return " or ".join(parts)
+
+
 def _validate_requirements(provider: ModelProvider, cfg: ProviderConfig, app_id: str = None) -> None:
     provided_credentials = set([k for k,v in dict(cfg).items() if v is not None])
     required_creds = PROVIDER_REQUIRED_FIELDS[provider]
     missing_credentials = []
     for cred in required_creds:
         if isinstance(cred, set):
-            if not any(c in provided_credentials for c in cred):
+            if not any(_check_credential_provided(c, provided_credentials) for c in cred):
                 missing_credentials.append(cred)
         else:
-            if cred not in provided_credentials:
+            if not _check_credential_provided(cred, provided_credentials):
                 missing_credentials.append(cred)
 
     if len(missing_credentials) > 0:
@@ -177,7 +196,7 @@ def _validate_requirements(provider: ModelProvider, cfg: ProviderConfig, app_id:
             missing_credentials_string = f"Be sure to include the following required fields for provider '{provider}' in the connection '{app_id}':"
         for cred in missing_credentials:
             if isinstance(cred, set):
-                cred_str = ' or '.join(list(cred))
+                cred_str = _format_missing_credential(cred)
             else:
                 cred_str = cred
             missing_credentials_string += f"\n\t  - {cred_str}"

ibm_watsonx_orchestrate/cli/commands/models/models_command.py

@@ -136,11 +136,11 @@ def models_policy_import(
 def models_policy_add(
         name: Annotated[
             str,
-            typer.Option("--name", "-n", help="The name of the model to remove"),
+            typer.Option("--name", "-n", help="The name of the model policy to add"),
         ],
         models: Annotated[
             List[str],
-            typer.Option('--model', '-m', help='The name of the model to add'),
+            typer.Option('--model', '-m', help='A list of model names the policy should contain'),
         ],
         strategy: Annotated[
             ModelPolicyStrategyMode,

ibm_watsonx_orchestrate/cli/commands/models/models_controller.py

@@ -6,7 +6,7 @@ import yaml
 import importlib
 import inspect
 from pathlib import Path
-from typing import List
+from typing import List, Optional
 
 import requests
 import rich
@@ -16,10 +16,11 @@ from ibm_watsonx_orchestrate.client.model_policies.model_policies_client import
 from ibm_watsonx_orchestrate.agent_builder.model_policies.types import ModelPolicy, ModelPolicyInner, \
     ModelPolicyRetry, ModelPolicyStrategy, ModelPolicyStrategyMode, ModelPolicyTarget
 from ibm_watsonx_orchestrate.client.models.models_client import ModelsClient
-from ibm_watsonx_orchestrate.agent_builder.models.types import VirtualModel, ProviderConfig, ModelType, ANTHROPIC_DEFAULT_MAX_TOKENS
+from ibm_watsonx_orchestrate.agent_builder.models.types import VirtualModel, ProviderConfig, ModelType, ANTHROPIC_DEFAULT_MAX_TOKENS, ModelListEntry
 from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_cpd_env
 from ibm_watsonx_orchestrate.client.connections import get_connection_id, ConnectionType
 from ibm_watsonx_orchestrate.utils.environment import EnvService
+from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown
 
 logger = logging.getLogger(__name__)
 
@@ -149,7 +150,7 @@ class ModelsController:
             self.model_policies_client = instantiate_client(ModelPoliciesClient)
         return self.model_policies_client
 
-    def list_models(self, print_raw: bool = False) -> None:
+    def list_models(self, print_raw: bool = False, format: Optional[ListFormats] = None) -> List[ModelListEntry] | str |None:
         models_client: ModelsClient = self.get_models_client()
         model_policies_client: ModelPoliciesClient = self.get_model_policies_client()
         global WATSONX_URL
@@ -224,6 +225,7 @@ class ModelsController:
 
                 console.print("[yellow]★[/yellow] [italic dim]indicates a supported and preferred model[/italic dim]\n[blue dim]✨️[/blue dim] [italic dim]indicates a model from a custom provider[/italic dim]" )
             else:
+                model_details = []
                 table = rich.table.Table(
                     show_header=True,
                     title="[bold]Available Models[/bold]",
@@ -234,15 +236,32 @@ class ModelsController:
                     table.add_column(col)
 
                 for model in (virtual_models + virtual_model_policies):
-                    table.add_row(f"✨️ {model.name}", model.description or 'No description provided.')
+                    entry = ModelListEntry(
+                        name=model.name,
+                        description=model.description,
+                        is_custom=True
+                    )
+                    model_details.append(entry)
+                    table.add_row(*entry.get_row_details())
 
                 for model in sorted_models:
-                    model_id = model.get("model_id", "N/A")
-                    short_desc = model.get("short_description", "No description provided.")
-                    marker = "★ " if any(pref in model_id.lower() for pref in preferred_list) else ""
-                    table.add_row(f"[yellow]{marker}[/yellow]watsonx/{model_id}", short_desc)
-            
-                rich.print(table)
+                    name = model.get("model_id", "N/A")
+                    entry = ModelListEntry(
+                        name=name,
+                        description=model.get("short_description"),
+                        is_custom=False,
+                        recommended=any(pref in name.lower() for pref in preferred_list)
+                    )
+                    model_details.append(entry)
+                    table.add_row(*entry.get_row_details())
+
+                match format:
+                    case ListFormats.JSON:
+                        return model_details
+                    case ListFormats.Table:
+                        return rich_table_to_markdown(table)
+                    case _: 
+                        rich.print(table)
 
     def import_model(self, file: str, app_id: str | None) -> List[VirtualModel]:
         from ibm_watsonx_orchestrate.cli.commands.models.model_provider_mapper import validate_ProviderConfig # lazily import this because the lut building is expensive

ibm_watsonx_orchestrate/cli/commands/partners/offering/partners_offering_controller.py

@@ -23,6 +23,7 @@ from ibm_watsonx_orchestrate.client.connections import get_connections_client
 from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionEnvironment
 from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller import export_connection
 from ibm_watsonx_orchestrate.cli.commands.tools.tools_controller import ToolsController
+from ibm_watsonx_orchestrate.utils.utils import sanitize_catalog_label
 from .types import *
 
 APPLICATIONS_FILE_VERSION = '1.16.0'
@@ -54,7 +55,7 @@ def get_tool_bindings(tool_names: list[str]) -> dict[str, dict]:
 
     return results
 
-def _patch_agent_yamls(project_root: Path, publisher_name: str):
+def _patch_agent_yamls(project_root: Path, publisher_name: str, parent_agent_name: str):
     agents_dir = project_root / "agents"
     if not agents_dir.exists():
         return
@@ -70,15 +71,18 @@ def _patch_agent_yamls(project_root: Path, publisher_name: str):
         if "language_support" not in agent_data:
             agent_data["language_support"] = ["English"]
         if "icon" not in agent_data:
-            agent_data["icon"] = "inline-svg-of-icon"
+            agent_data["icon"] = AGENT_CATALOG_ONLY_PLACEHOLDERS['icon']
         if "category" not in agent_data:
             agent_data["category"] = "agent"
         if "supported_apps" not in agent_data:
             agent_data["supported_apps"] = []
+        if "agent_role" not in agent_data:
+            agent_data["agent_role"] = "manager" if agent_data.get("name") == parent_agent_name else "collaborator"
 
         with open(agent_yaml, "w") as f:
             yaml.safe_dump(agent_data, f, sort_keys=False)
 
+
 def _create_applications_entry(connection_config: dict) -> dict:
     return {
         'app_id': connection_config.get('app_id'),
@@ -116,6 +120,15 @@ class PartnersOfferingController:
         sys.exit(1)
 
     def create(self, offering: str, publisher_name: str, agent_type: str, agent_name: str):
+
+        # Sanitize offering name
+        original_offering = offering
+        offering = sanitize_catalog_label(offering)
+
+        if offering != original_offering:
+            logger.warning("Offering name must contain only alpahnumeric characters or underscore")
+            logger.info(f"Offering '{original_offering}' has been updated to '{offering}'")
+
         # Create parent project folder
         project_root = self.root / offering
 
@@ -179,7 +192,7 @@ class PartnersOfferingController:
         output_zip.unlink(missing_ok=True)
 
         # Patch the agent yamls with publisher, tags, icon, etc.
-        _patch_agent_yamls(project_root, publisher_name)
+        _patch_agent_yamls(project_root=project_root, publisher_name=publisher_name, parent_agent_name=agent_name)
 
 
         # Create offering.yaml file -------------------------------------------------------
@@ -337,12 +350,16 @@ class PartnersOfferingController:
                             **agent_data
                         )
                         agent = Agent.model_validate(agent_details)
-                        AgentsController().persist_record(agent=agent)
                     case AgentKind.EXTERNAL:
                         agent_details = parse_create_external_args(
                             **agent_data
                         )
                         agent = ExternalAgent.model_validate(agent_details)
+                
+                # Placeholder detection
+                for label,placeholder in AGENT_CATALOG_ONLY_PLACEHOLDERS.items():
+                    if agent_data.get(label) == placeholder:
+                        logger.warning(f"Placeholder '{label}' detected for agent '{agent_name}', please ensure '{label}' is correct before packaging.")
 
                 agent_json_path = f"{top_level_folder}/agents/{agent_name}/config.json"
                 zf.writestr(agent_json_path, json.dumps(agent_data, indent=2))

ibm_watsonx_orchestrate/cli/commands/partners/offering/types.py

@@ -24,6 +24,10 @@ CATALOG_ONLY_FIELDS = [
     'supported_apps'
 ]
 
+AGENT_CATALOG_ONLY_PLACEHOLDERS = {
+    'icon': "inline-svg-of-icon",
+}
+
 class AgentKind(str, Enum):
     NATIVE = "native"
     EXTERNAL = "external"
@@ -87,21 +91,9 @@ class Offering(BaseModel):
         return values
     
     def validate_ready_for_packaging(self):
-        self.test_for_placeholder_values()
-    
-    def test_for_placeholder_values(self):
-        placholders = False
-        # part numbers
-        if not self.part_number:
-            raise ValueError(f"Offering '{self.name}' does not have valid part numbers")
-        
-        for (k,v) in self.part_number.model_dump().items():
-            if v == CATALOG_PLACEHOLDERS['part_number']:
-                logger.warning(f"Placeholder part number detected for platform '{k}', please ensure valid part numbers are entered before packaging.")
-                placholders = True
-        
-        if placholders:
-            raise ValueError(f"Offering '{self.name}' cannot be packaged with placeholder values")
+        # Leaving this fn here in case we want to reintroduce validation
+        pass
+
 
 
 

ibm_watsonx_orchestrate/cli/commands/partners/partners_command.py

@@ -3,7 +3,7 @@ import typer
 from ibm_watsonx_orchestrate.cli.commands.partners import partners_controller
 from ibm_watsonx_orchestrate.cli.commands.partners.offering.partners_offering_command import partners_offering
 
-partners_app = typer.Typer(no_args_is_help=True, hidden=True)
+partners_app = typer.Typer(no_args_is_help=True)
 
 partners_app.add_typer(
     partners_offering,

ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -16,7 +16,7 @@ from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ibm_watsonx_orchestrate.cli.commands.environment.environment_controller import _login
 
 from ibm_watsonx_orchestrate.cli.config import PROTECTED_ENV_NAME, clear_protected_env_credentials_token, Config, \
-    AUTH_CONFIG_FILE_FOLDER, AUTH_CONFIG_FILE, AUTH_MCSP_TOKEN_OPT, AUTH_SECTION_HEADER, USER_ENV_CACHE_HEADER, LICENSE_HEADER, \
+    AUTH_CONFIG_FILE_FOLDER, AUTH_CONFIG_FILE, AUTH_MCSP_TOKEN_OPT, AUTH_SECTION_HEADER, LICENSE_HEADER, \
     ENV_ACCEPT_LICENSE
 from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient
 from ibm_watsonx_orchestrate.utils.docker_utils import DockerLoginService, DockerComposeCore, DockerUtils
@@ -38,8 +38,12 @@ def refresh_local_credentials() -> None:
     """
     Refresh the local credentials
     """
-    clear_protected_env_credentials_token()
-    _login(name=PROTECTED_ENV_NAME, apikey=None)
+    try:
+        clear_protected_env_credentials_token()
+        _login(name=PROTECTED_ENV_NAME, apikey=None)
+
+    except:
+        logger.warning("Failed to refresh local credentials, please run `orchestrate env activate local`")
 
 def run_compose_lite(
         final_env_file: Path,
@@ -48,13 +52,14 @@ def run_compose_lite(
         experimental_with_ibm_telemetry=False, 
         with_doc_processing=False,
         with_voice=False,
+        with_connections_ui=False,
         with_langflow=False,
     ) -> None:
-    EnvService.prepare_clean_env(final_env_file)
-    db_tag = EnvService.read_env_file(final_env_file).get('DBTAG', None)
+    env_service.prepare_clean_env(final_env_file)
+    db_tag = env_service.read_env_file(final_env_file).get('DBTAG', None)
     logger.info(f"Detected architecture: {platform.machine()}, using DBTAG: {db_tag}")
 
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     # Step 1: Start only the DB container
     result = compose_core.service_up(service_name="wxo-server-db", friendly_name="WxO Server DB", final_env_file=final_env_file, compose_env=os.environ)
@@ -80,6 +85,8 @@ def run_compose_lite(
         profiles.append("docproc")
     if with_voice:
         profiles.append("voice")
+    if with_connections_ui:
+        profiles.append("connections-ui")
     if with_langflow:
         profiles.append("langflow")
 
@@ -194,7 +201,7 @@ def run_compose_lite_ui(user_env_file: Path) -> bool:
         logger.error("Healthcheck failed orchestrate server.  Make sure you start the server components with `orchestrate server start` before trying to start the chat UI")
         return False
 
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.service_up(service_name="ui", friendly_name="UI", final_env_file=final_env_file)
 
@@ -231,7 +238,7 @@ def run_compose_lite_down_ui(user_env_file: Path, is_reset: bool = False) -> Non
 
     cli_config = Config()
     env_service = EnvService(cli_config)
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.service_down(service_name="ui", friendly_name="UI", final_env_file=final_env_file, is_reset=is_reset)
 
@@ -252,7 +259,7 @@ def run_compose_lite_down(final_env_file: Path, is_reset: bool = False) -> None:
 
     cli_config = Config()
     env_service = EnvService(cli_config)
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.services_down(final_env_file=final_env_file, is_reset=is_reset)
 
@@ -273,7 +280,7 @@ def run_compose_lite_logs(final_env_file: Path) -> None:
 
     cli_config = Config()
     env_service = EnvService(cli_config)
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.services_logs(final_env_file=final_env_file, should_follow=True)
 
@@ -358,11 +365,14 @@ def server_start(
         '--with-voice', '-v',
         help='Enable voice controller to interact with the chat via voice channels'
     ),
+    with_connections_ui: bool = typer.Option(
+        False,
+        '--with-connections-ui', '-c',
+        help='Enables connections ui to facilitate OAuth connections and credential management via a UI'),
     with_langflow: bool = typer.Option(
         False,
         '--with-langflow',
-        help='Enable Langflow UI, available at http://localhost:7861',
-        hidden=True
+        help='Enable Langflow UI, available at http://localhost:7861'
     ),
 ):
     cli_config = Config()
@@ -389,7 +399,8 @@ def server_start(
     env_service.set_compose_file_path_in_env(custom_compose_file)
 
     user_env = env_service.get_user_env(user_env_file=user_env_file, fallback_to_persisted_env=False)
-    env_service.persist_user_env(user_env, include_secrets=persist_env_secrets)
+    developer_edition_source = env_service.get_dev_edition_source_core(user_env)
+    env_service.persist_user_env(user_env, include_secrets=persist_env_secrets, source=developer_edition_source)
     
     merged_env_dict = env_service.prepare_server_env_vars(user_env=user_env, should_drop_auth_routes=False)
 
@@ -425,6 +436,7 @@ def server_start(
                      experimental_with_ibm_telemetry=experimental_with_ibm_telemetry,
                      with_doc_processing=with_doc_processing,
                      with_voice=with_voice,
+                     with_connections_ui=with_connections_ui,
                      with_langflow=with_langflow, env_service=env_service)
     
     run_db_migration()
@@ -444,10 +456,7 @@ def server_start(
         )
         exit(1)
 
-    try:
-        refresh_local_credentials()
-    except:
-        logger.warning("Failed to refresh local credentials, please run `orchestrate env activate local`")
+    refresh_local_credentials()
 
     logger.info(f"You can run `orchestrate env activate local` to set your environment or `orchestrate chat start` to start the UI service and begin chatting.")
 
@@ -455,9 +464,10 @@ def server_start(
         logger.info(f"You can access the observability platform Langfuse at http://localhost:3010, username: orchestrate@ibm.com, password: orchestrate")
     if with_doc_processing:
         logger.info(f"Document processing in Flows (Public Preview) has been enabled.")
+    if with_connections_ui:
+        logger.info("Connections UI can be found at http://localhost:3412/connectors")
     if with_langflow:
         logger.info("Langflow has been enabled, the Langflow UI is available at http://localhost:7861")
-
 @server_app.command(name="stop")
 def server_stop(
     user_env_file: str = typer.Option(
@@ -562,7 +572,7 @@ def run_db_migration() -> None:
 
     cli_config = Config()
     env_service = EnvService(cli_config)
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.service_container_bash_exec(service_name="wxo-server-db",
                                                       log_message="Running Database Migration...",
@@ -616,7 +626,7 @@ def create_langflow_db() -> None:
 
     cli_config = Config()
     env_service = EnvService(cli_config)
-    compose_core = DockerComposeCore(env_service)
+    compose_core = DockerComposeCore(env_service=env_service)
 
     result = compose_core.service_container_bash_exec(service_name="wxo-server-db",
                                                       log_message="Preparing Langflow resources...",

ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py

@@ -47,11 +47,11 @@ def import_toolkit(
     ] = None,
     url: Annotated[
         Optional[str],
-        typer.Option("--url", "-u", help="The URL of the remote MCP server", hidden=True),
+        typer.Option("--url", "-u", help="The URL of the remote MCP server"),
     ] = None,
     transport: Annotated[
         ToolkitTransportKind,
-        typer.Option("--transport", help="The communication protocol to use for the remote MCP server. Only \"sse\" or \"streamable_http\" supported", hidden=True),
+        typer.Option("--transport", help="The communication protocol to use for the remote MCP server. Only \"sse\" or \"streamable_http\" supported"),
     ] = None,
     tools: Annotated[
         Optional[str],