ibm-watsonx-orchestrate 1.12.0b0__tar.gz → 1.12.1__tar.gz

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.12.0b0
+Version: 1.12.1
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -11,7 +11,7 @@ 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.24.2
-Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.1.2
+Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.1.3
 Requires-Dist: jsonref==1.1.0
 Requires-Dist: langchain-core<=0.3.63
 Requires-Dist: langsmith<=0.3.45

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/pyproject.toml

@@ -35,7 +35,7 @@ dependencies = [
     "urllib3>=2.2.3",
     "pytz>=2025.2",
     "redis>=6.0.0",
-    "ibm_watsonx_orchestrate_evaluation_framework==1.1.2"
+    "ibm_watsonx_orchestrate_evaluation_framework==1.1.3"
 ]
 
 [project.optional-dependencies]

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,8 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.12.0b0"
+
+__version__ = "1.12.1"
 
 
 from ibm_watsonx_orchestrate.utils.logging.logger import setup_logging

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/agents/types.py

@@ -88,7 +88,7 @@ class BaseAgentSpec(BaseModel):
         dumped = self.model_dump(mode='json', exclude_unset=True, exclude_none=True)
         with open(file, 'w') as f:
             if file.endswith('.yaml') or file.endswith('.yml'):
-                yaml.dump(dumped, f, sort_keys=False)
+                yaml.dump(dumped, f, sort_keys=False, allow_unicode=True)
             elif file.endswith('.json'):
                 json.dump(dumped, f, indent=2)
             else:
@@ -219,8 +219,8 @@ def validate_agent_fields(values: dict) -> dict:
 # ===============================
 
 class ExternalAgentConfig(BaseModel):
-    hidden: bool = False
-    enable_cot: bool = False
+    hidden: Optional[bool] = False
+    enable_cot: Optional[bool] = False
 
 class ExternalAgentSpec(BaseAgentSpec):
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -243,8 +243,8 @@ class ExternalAgentSpec(BaseAgentSpec):
         # The get api responds with a flat object with no config
         if values.get("config") is None:
             values["config"] = {}
-            values["config"]["enable_cot"] = values.get("enable_cot", None)
-            values["config"]["hidden"] = values.get("hidden", None)
+            values["config"]["enable_cot"] = values.get("enable_cot", False)
+            values["config"]["hidden"] = values.get("hidden", False)
         return validate_external_agent_fields(values)
 
     @model_validator(mode="after")

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/models/types.py

@@ -23,6 +23,7 @@ class  ModelProvider(str, Enum):
     STABILITY_AI = 'stability-ai'
     TOGETHER_AI = 'together-ai'
     WATSONX = 'watsonx'
+    X_AI='x-ai'
 
     def __str__(self):
         return self.value

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/toolkits/base_toolkit.py

@@ -18,7 +18,7 @@ class BaseToolkit:
         dumped = self.__toolkit_spec__.model_dump(mode='json', exclude_unset=True, exclude_none=True, by_alias=True)
         with open(file, 'w') as f:
             if file.endswith('.yaml') or file.endswith('.yml'):
-                yaml.dump(dumped, f)
+                yaml.dump(dumped, f, allow_unicode=True)
             elif file.endswith('.json'):
                 json.dump(dumped, f, indent=2)
             else:

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/tools/base_tool.py

@@ -19,7 +19,7 @@ class BaseTool:
         dumped = self.__tool_spec__.model_dump(mode='json', exclude_unset=True, exclude_none=True, by_alias=True)
         with open(file, 'w') as f:
             if file.endswith('.yaml') or file.endswith('.yml'):
-                yaml.dump(dumped, f)
+                yaml.dump(dumped, f, allow_unicode=True)
             elif file.endswith('.json'):
                 json.dump(dumped, f, indent=2)
             else:

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/tools/langflow_tool.py

@@ -2,8 +2,10 @@ import json
 import re
 
 from pydantic import BaseModel
+import rich
 
 from ibm_watsonx_orchestrate.agent_builder.connections.types import ConnectionSecurityScheme
+from ibm_watsonx_orchestrate.langflow.langflow_utils import parse_langflow_model
 from .base_tool import BaseTool
 from .types import LangflowToolBinding, ToolBinding, ToolPermission, ToolRequestBody, ToolResponseBody, ToolSpec
 from ibm_watsonx_orchestrate.utils.exceptions import BadRequest
@@ -14,6 +16,9 @@ LANGFLOW_CHAT_OUTPUT_LABEL = "ChatOutput"
 VALID_NAME_PATTERN = re.compile("^[a-zA-Z](\\w|_)+$")
 
 class LangflowTool(BaseTool):
+  # additional python module requirements for langflow based tools
+  requirements: list[str] = []
+
   def __init__(self,spec: ToolSpec):
     BaseTool.__init__(self,spec=spec)
 
@@ -103,6 +108,59 @@ def create_langflow_tool(
   if not validate_langflow_version(langflow_version):
     raise ValueError(f"Langflow version is below minimum requirements, found '{langflow_version}', miniumum required version '{'.'.join(map(str,MIN_LANGFLOW_VERSION))}'")
   
+  # find all the component in Langflow and display its credential
+  langflow_spec = parse_langflow_model(tool_definition)
+  if langflow_spec:
+    rich.print(f"[bold white]Langflow version used: {langflow_version}[/bold white]")
+    rich.print("Please ensure this flow is compatible with the Langflow version bundled in ADK.")
+    rich.print("\nLangflow components:")
+
+    table = rich.table.Table(show_header=True, header_style="bold white", show_lines=True)
+    column_args = {
+      "ID": {},
+      "Name": {},
+      "Credentials": {},
+      "Requirements": {}
+    }
+    for column in column_args:
+        table.add_column(column,**column_args[column])
+
+    requirements = set()
+    api_key_not_set = False
+    for component in langflow_spec.components:
+      if component.credentials and len(component.credentials) > 0:
+        # create a command separated list with newline
+        component_creds = None
+        for k, v in component.credentials.items():
+          if v is None or v == "":
+            v = 'NOT SET'
+            api_key_not_set = True
+          if component_creds is None:
+            component_creds = f"{k} {v}"
+          else:
+            component_creds += "\n" + f"{k} {v}"
+      else:
+        component_creds = "N/A"
+
+      if component.requirements and len(component.requirements) > 0:
+        # create a command separated list with newline
+        component_req = "\n".join([f"{k}" for k in component.requirements])
+        for r in component.requirements:
+          requirements.add(r)
+      else:
+        component_req = "N/A"
+      table.add_row(component.id,component.name,component_creds,component_req)
+    rich.print(table)
+
+    rich.print("[bold yellow]Tip:[/bold yellow] Langflow tool might require additional python modules.  Identified requirements will be added.")
+    rich.print("[bold yellow]Tip:[/bold yellow] Avoid hardcoding sensitive values. Use Orchestrate connections to manage secrets securely.")
+    if api_key_not_set:
+      rich.print("[bold yellow]Warning:[/bold yellow] Some required api key(s) were not set in the flow. Please adjust the flow to include them.")
+    rich.print("Ensure each credential follows the <app-id>_<variable> naming convention within the Langflow model.")
+
+    for connection in connections:
+        rich.print(f"* Connection: {connection} → Suggested naming: {connection}_<variable>")
+
   spec = ToolSpec(
     name=name,
     description=description,
@@ -121,4 +179,6 @@ def create_langflow_tool(
     )
   )
 
-  return LangflowTool(spec)
+  tool = LangflowTool(spec=spec)
+  tool.requirements = requirements
+  return tool

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py

@@ -80,6 +80,7 @@ def create_openapi_json_tool(
         http_success_response_code: int = 200,
         http_response_content_type='application/json',
         name: str = None,
+        display_name: str = None,
         description: str = None,
         permission: ToolPermission = None,
         input_schema: ToolRequestBody = None,
@@ -130,8 +131,10 @@ def create_openapi_json_tool(
         raise BadRequest(
             f"No description provided for tool. {http_method}: {http_path} did not specify a description field, and no description was provided")
 
+    spec_display_name = display_name if display_name else route_spec.get('summary')
     spec = ToolSpec(
         name=spec_name,
+        display_name=spec_display_name,
         description=spec_description,
         permission=spec_permission
     )
@@ -348,6 +351,7 @@ async def create_openapi_json_tool_from_uri(
         http_response_content_type='application/json',
         permission: ToolPermission = ToolPermission.READ_ONLY,
         name: str = None,
+        display_name: str = None,
         description: str = None,
         input_schema: ToolRequestBody = None,
         output_schema: ToolResponseBody = None,
@@ -362,6 +366,7 @@ async def create_openapi_json_tool_from_uri(
     :param http_success_response_code: Which http status code should be considered a successful call (defaults to 200)
     :param http_response_content_type: Which http response type should be considered successful (default to application/json)
     :param name: The name of the resulting tool (used to invoke the tool by the agent)
+    :param display_name: The name of the resulting tool to be displayed
     :param description: The description of the resulting tool (used as the semantic layer to help the agent with tool selection)
     :param permission: Which orchestrate permission level does a user need to have to invoke this tool
     :param input_schema: The JSONSchema of the inputs to the http request
@@ -379,6 +384,7 @@ async def create_openapi_json_tool_from_uri(
         http_response_content_type=http_response_content_type,
         permission=permission,
         name=name,
+        display_name=display_name,
         description=description,
         input_schema=input_schema,
         output_schema=output_schema,

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py

@@ -1330,7 +1330,7 @@ class AgentsController:
         if agent_only_flag:
             logger.info(f"Exported agent definition for '{name}' to '{output_path}'")
             with open(output_path, 'w') as outfile:
-                yaml.dump(agent_spec_file_content, outfile, sort_keys=False, default_flow_style=False)
+                yaml.dump(agent_spec_file_content, outfile, sort_keys=False, default_flow_style=False, allow_unicode=True)
             return
         
         close_file_flag = False
@@ -1340,7 +1340,7 @@ class AgentsController:
 
         logger.info(f"Exporting agent definition for '{name}'")
         
-        agent_spec_yaml = yaml.dump(agent_spec_file_content, sort_keys=False, default_flow_style=False)
+        agent_spec_yaml = yaml.dump(agent_spec_file_content, sort_keys=False, default_flow_style=False, allow_unicode=True)
         agent_spec_yaml_bytes = agent_spec_yaml.encode("utf-8")
         agent_spec_yaml_file = io.BytesIO(agent_spec_yaml_bytes)
 

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -575,7 +575,7 @@ def export_connection(output_file: str, app_id: str | None = None, connection_id
         case '.zip':
             zip_file = zipfile.ZipFile(output_path, "w")
                 
-            connection_yaml = yaml.dump(combined_connections, sort_keys=False, default_flow_style=False)
+            connection_yaml = yaml.dump(combined_connections, sort_keys=False, default_flow_style=False, allow_unicode=True)
             connection_yaml_bytes = connection_yaml.encode("utf-8")
             connection_yaml_file = io.BytesIO(connection_yaml_bytes)
 
@@ -588,7 +588,7 @@ def export_connection(output_file: str, app_id: str | None = None, connection_id
         case '.yaml' | '.yml':
             with open(output_path,'w') as yaml_file:
                 yaml_file.write(
-                    yaml.dump(combined_connections, sort_keys=False, default_flow_style=False)
+                    yaml.dump(combined_connections, sort_keys=False, default_flow_style=False, allow_unicode=True)
                 )
                 
     logger.info(f"Successfully exported connection file for {app_id}")

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py

@@ -43,9 +43,13 @@ def activate_env(
         test_package_version_override: Annotated[
             str,
             typer.Option("--test-package-version-override", help="Which prereleased package version to reference when using --registry testpypi", hidden=True),
+        ] = None,
+        skip_version_check: Annotated[
+            bool,
+            typer.Option('--skip-version-check/--enable-version-check', help='Use this flag to skip validating that adk version in use exists in pypi (for clients who mirror the ADK to a local registry and do not have local access to pypi).')
         ] = None
 ):
-    environment_controller.activate(name=name, apikey=apikey,username=username, password=password, registry=registry, test_package_version_override=test_package_version_override)
+    environment_controller.activate(name=name, apikey=apikey, username=username, password=password, registry=registry, test_package_version_override=test_package_version_override, skip_version_check=skip_version_check)
 
 
 @environment_app.command(name="add")

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py

@@ -18,8 +18,9 @@ from ibm_watsonx_orchestrate.cli.config import (
     ENV_IAM_URL_OPT,
     ENVIRONMENTS_SECTION_HEADER,
     PROTECTED_ENV_NAME,
-    ENV_AUTH_TYPE, PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT, BYPASS_SSL, VERIFY,
-    DEFAULT_CONFIG_FILE_CONTENT
+    ENV_AUTH_TYPE, PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT,
+    BYPASS_SSL, VERIFY,
+    DEFAULT_CONFIG_FILE_CONTENT, PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT
 )
 from ibm_watsonx_orchestrate.client.client import Client
 from ibm_watsonx_orchestrate.client.client_errors import ClientError
@@ -131,7 +132,7 @@ def _login(name: str, apikey: str = None, username: str = None, password: str =
     except ClientError as e:
         raise ClientError(e)
 
-def activate(name: str, apikey: str=None, username: str=None, password: str=None, registry: RegistryType=None, test_package_version_override=None) -> None:
+def activate(name: str, apikey: str=None, username: str=None, password: str=None, registry: RegistryType=None, test_package_version_override=None, skip_version_check=None) -> None:
     cfg = Config()
     auth_cfg = Config(AUTH_CONFIG_FILE_FOLDER, AUTH_CONFIG_FILE)
     env_cfg = cfg.read(ENVIRONMENTS_SECTION_HEADER, name)
@@ -159,6 +160,8 @@ def activate(name: str, apikey: str=None, username: str=None, password: str=None
         elif cfg.read(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT) is None:
             cfg.write(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TYPE_OPT, DEFAULT_CONFIG_FILE_CONTENT[PYTHON_REGISTRY_HEADER][PYTHON_REGISTRY_TYPE_OPT])
             cfg.write(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_TEST_PACKAGE_VERSION_OVERRIDE_OPT, test_package_version_override)
+        if skip_version_check is not None:
+            cfg.write(PYTHON_REGISTRY_HEADER, PYTHON_REGISTRY_SKIP_VERSION_CHECK_OPT, skip_version_check)
 
     logger.info(f"Environment '{name}' is now active")
     is_cpd = is_cpd_env(url)

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_command.py

@@ -54,7 +54,8 @@ def read_env_file(env_path: Path|str) -> dict:
 def validate_watsonx_credentials(user_env_file: str) -> bool:
     required_sets = [
         ["WATSONX_SPACE_ID", "WATSONX_APIKEY"],
-        ["WO_INSTANCE", "WO_API_KEY"]
+        ["WO_INSTANCE", "WO_API_KEY"],
+        ["WO_INSTANCE", "WO_PASSWORD", "WO_USERNAME"]
     ]
     
     def has_valid_keys(env: dict) -> bool:
@@ -75,7 +76,7 @@ def validate_watsonx_credentials(user_env_file: str) -> bool:
     user_env = read_env_file(user_env_file)
     
     if not has_valid_keys(user_env):
-        logger.error("Error: The environment file does not contain the required keys: either WATSONX_SPACE_ID and WATSONX_APIKEY or WO_INSTANCE and WO_API_KEY.")
+        logger.error("Error: The environment file does not contain the required keys: either WATSONX_SPACE_ID and WATSONX_APIKEY or WO_INSTANCE and WO_API_KEY or WO_INSTANCE and WO_USERNAME and WO_PASSWORD.")
         sys.exit(1)
 
     # Update os.environ with whichever set is present

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/evaluations/evaluations_controller.py

@@ -52,7 +52,7 @@ class EvaluationsController:
 
         if "WATSONX_SPACE_ID" in os.environ and "WATSONX_APIKEY" in os.environ:
             provider = "watsonx"
-        elif "WO_INSTANCE" in os.environ and "WO_API_KEY" in os.environ:
+        elif "WO_INSTANCE" in os.environ and ("WO_API_KEY" in os.environ or "WO_PASSWORD" in os.environ):
             provider = "model_proxy"
         else:
             logger.error(

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/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-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/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-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/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-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/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-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -48,6 +48,7 @@ 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)
@@ -80,6 +81,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")
 
@@ -358,11 +361,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()
@@ -425,6 +431,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()
@@ -455,9 +462,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(

{ibm_watsonx_orchestrate-1.12.0b0 → ibm_watsonx_orchestrate-1.12.1}/src/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],