ibm-watsonx-orchestrate 2.3.4.dev0__tar.gz → 2.3.4.dev1__tar.gz

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/PKG-INFO

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

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "2.3.4.dev0"
+__version__ = "2.3.4.dev1"
 
 
 from ibm_watsonx_orchestrate.utils.logging.logger import setup_logging

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/agent_builder/agents/types.py

@@ -142,6 +142,7 @@ class AgentStyle(str, Enum):
     REACT = "react"
     PLANNER = "planner"
     CUSTOM = "custom"
+    REACT_INTRINSIC = "react_intrinsic"
 
     def __str__(self):
         return self.value 

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/agent_builder/models/types.py

@@ -4,6 +4,7 @@ from pydantic import Field, BaseModel, ConfigDict, model_validator
 
 class  ModelProvider(str, Enum):
     OPENAI = 'openai'
+    OPENAI_OAUTH2_CLIENT_CREDS = 'openai-oauth2-client-creds'
     A21 = 'a21'
     ANTHROPIC = 'anthropic'
     ANYSCALE = 'anyscale'

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py

@@ -39,13 +39,6 @@ def agent_import(
             help='The app id of the connection to associate with this external agent. An application connection represents the server authentication credentials needed to connection to this agent (for example Api Keys, Basic, Bearer or OAuth credentials).'
         )
     ] = None,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Enable safe mode: prompt for confirmation before updating existing agents"
-        )
-    ] = False
 ):
     
     # Validate that either file or experimental_package_root is provided
@@ -83,7 +76,7 @@ def agent_import(
         if not os.path.exists(file):
             raise ValueError(f"File not found: {file}")
     
-    agents_controller = AgentsController(safe_mode=safe)
+    agents_controller = AgentsController()
     agent_specs = agents_controller.import_agent(
         file=file,
         app_id=app_id,
@@ -250,13 +243,6 @@ def agent_create(
             help="A list of context variable names the agent can access. Format: --context-variable var1 --context-variable var2 ... or -v var1 -v var2 ...",
         ),
     ] = None,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Enable safe mode: prompt for confirmation before updating existing agents"
-        )
-    ] = False
 ):
     
     chat_params_dict = json.loads(chat_params) if chat_params else {}
@@ -301,7 +287,7 @@ def agent_create(
             # The directory path will be passed and zipped in the controller
             custom_agent_file_path = experimental_package_root
 
-    agents_controller = AgentsController(safe_mode=safe)
+    agents_controller = AgentsController()
     
     # For custom agents, name and description are optional (read from config.yaml by backend)
     # For other agent types, they are required

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py

@@ -56,7 +56,6 @@ from ibm_watsonx_orchestrate.client.voice_configurations.voice_configurations_cl
 from ibm_watsonx_orchestrate.utils.exceptions import BadRequest
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 from ibm_watsonx_orchestrate.utils.utils import check_file_in_zip
-from ibm_watsonx_orchestrate.cli.common import check_safe_mode_and_prompt
 
 logger = logging.getLogger(__name__)
 
@@ -259,14 +258,13 @@ def _raise_guidelines_warning(response: AgentUpsertResponse) -> None:
         logger.warning(f"Agent Configuration Issue: {response.warning}")
 
 class AgentsController:
-    def __init__(self, safe_mode: bool = False):
+    def __init__(self):
         self.native_client = None
         self.external_client = None
         self.assistant_client = None
         self.tool_client = None
         self.knowledge_base_client = None
         self.voice_configuration_client = None
-        self.safe_mode = safe_mode
 
     def get_native_client(self):
         if not self.native_client:
@@ -899,18 +897,6 @@ class AgentsController:
                     if agent_kind != existing_agent.kind:
                         logger.error(f"An agent with the name '{agent_name}' already exists with a different kind. Failed to create agent")
                         sys.exit(1)
-                    
-                    # Check safe mode and prompt for confirmation if needed
-                    agent_type_name = "agent" if isinstance(existing_agent, Agent) else ("external agent" if isinstance(existing_agent, ExternalAgent) else "assistant agent")
-                    if not check_safe_mode_and_prompt(
-                        safe_mode=self.safe_mode,
-                        resource_exists=True,
-                        resource_type=agent_type_name,
-                        resource_name=agent_name
-                    ):
-                        logger.info(f"Skipping {agent_type_name} '{agent_name}'")
-                        continue
-                    
                     agent_id = existing_agent.id
                     self.update_agent(agent_id=agent_id, agent=agent)
             else:

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/channels/channels_command.py

@@ -28,7 +28,6 @@ def import_channel(
         agent_name: str = typer.Option(..., "--agent-name", help="Agent name"),
         env: EnvironmentType = typer.Option(..., "--env", "-e", help="Environment name (draft or live)"),
         file: str = typer.Option(..., "--file", "-f", help="Path to channel configuration file (YAML, JSON, or Python)"),
-        safe: bool = typer.Option(False, "--safe", help="Prompt for confirmation before updating existing channels"),
         enable_developer_mode: bool = typer.Option(False, "--enable-developer-mode", hidden=True)
 ):
     """Import channel(s) from a configuration file (creates or updates by name)."""
@@ -38,7 +37,7 @@ def import_channel(
 
     # Import all channels from the file
     for channel in channels:
-        controller.publish_or_update_channel(agent_id, environment_id, channel, safe_mode=safe, enable_developer_mode=enable_developer_mode)
+        controller.publish_or_update_channel(agent_id, environment_id, channel, enable_developer_mode=enable_developer_mode)
 
 
 
@@ -83,7 +82,6 @@ def create_channel(
         description: Optional[str] = typer.Option(None, "--description", "-d", help="Channel description"),
         field: Optional[list[str]] = typer.Option(None, "--field", "-f", help="Channel-specific field in key=value format (can be used multiple times). Examples: --field account_sid=ACxxx --field twilio_authentication_token=xxx"),
         output_file: Optional[str] = typer.Option(None, "--output", "-o", help="Write the channel spec to a file instead of creating it"),
-        safe: bool = typer.Option(False, "--safe", help="Prompt for confirmation before updating existing channels"),
         enable_developer_mode: bool = typer.Option(False, "--enable-developer-mode", hidden=True)
 ):
     """Create a new channel using CLI arguments.
@@ -114,7 +112,7 @@ def create_channel(
 
     if not output_file:
         environment_id = controller.get_environment_id(agent_name, env)
-        controller.publish_or_update_channel(agent_id, environment_id, channel, safe_mode=safe, enable_developer_mode=enable_developer_mode)
+        controller.publish_or_update_channel(agent_id, environment_id, channel, enable_developer_mode=enable_developer_mode)
 
 
 @channel_app.command(name="export", help="Export a channel to a YAML file by ID or name")

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/channels/channels_controller.py

@@ -11,7 +11,7 @@ from pydantic import ValidationError
 from ibm_watsonx_orchestrate.agent_builder.channels import TwilioWhatsappChannel, TwilioSMSChannel, SlackChannel, \
     BaseChannel, ChannelLoader, GenesysBotConnectorChannel, FacebookChannel, TeamsChannel
 from ibm_watsonx_orchestrate.agent_builder.channels.types import ChannelType
-from ibm_watsonx_orchestrate.cli.common import ListFormats, check_safe_mode_and_prompt
+from ibm_watsonx_orchestrate.cli.common import ListFormats
 from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient
 from ibm_watsonx_orchestrate.client.channels.channels_client import ChannelsClient
 from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_local_dev, is_saas_env
@@ -587,8 +587,7 @@ class ChannelsController:
         self,
         agent_id: str,
         environment_id: str,
-        channel: BaseChannel,
-        safe_mode: bool = False,
+        channel: BaseChannel
     ) -> str:
         """Create or update a channel.
 
@@ -599,7 +598,6 @@ class ChannelsController:
             agent_id: Agent identifier
             environment_id: Environment identifier
             channel: Channel configuration
-            safe_mode: If True, prompt for confirmation before updating existing channels
 
         Returns:
             Event URL for the channel
@@ -631,12 +629,6 @@ class ChannelsController:
             except Exception as e:
                 logger.warning(f"Could not list existing channels: {e}")
 
-        # Check safe mode and prompt if needed
-        resource_exists = existing_channel is not None
-        if not check_safe_mode_and_prompt(safe_mode, resource_exists, "channel", channel.name):
-            logger.info(f"Skipping channel '{channel.name}'")
-            return ""
-
         if existing_channel:
             logger.info(f"Found existing channel '{channel.name}', updating...")
             self.update_channel(

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_command.py

@@ -17,15 +17,8 @@ def knowledge_base_import(
             help='The app id of the connection to associate with this knowledge base. A application connection represents the authentication credentials needed to connection to the external Milvus or Elasticsearch instance (for example Api Keys, Basic, Bearer or OAuth credentials).'
         )
     ] = None,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Enable safe mode: prompt for confirmation before updating existing knowledge bases"
-        )
-    ] = False
 ):
-    controller = KnowledgeBaseController(safe_mode=safe)
+    controller = KnowledgeBaseController()
     controller.import_knowledge_base(file=file, app_id=app_id)
 
 

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py

@@ -19,7 +19,7 @@ from ibm_watsonx_orchestrate.client.connections import get_connections_client
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import FileUpload, KnowledgeBaseListEntry
-from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown, check_safe_mode_and_prompt
+from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown
 from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import KnowledgeBaseKind, IndexConnection, SpecVersion
 from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller import export_connection
 
@@ -101,10 +101,9 @@ def get_kb_connection_id(kb: KnowledgeBase) -> str | None:
     return index_config.connection_id
 
 class KnowledgeBaseController:
-    def __init__(self, safe_mode: bool = False):
+    def __init__(self):
         self.client = None
         self.connections_client = None
-        self.safe_mode = safe_mode
 
     def get_client(self):
         if not self.client:
@@ -146,17 +145,6 @@ class KnowledgeBaseController:
 
                 existing = list(filter(lambda ex: ex.get('name') == kb.name, existing_knowledge_bases))
                 if len(existing) > 0:
-                    
-                    # Check safe mode and prompt for confirmation if needed
-                    if not check_safe_mode_and_prompt(
-                        safe_mode=self.safe_mode,
-                        resource_exists=True,
-                        resource_type="knowledge base",
-                        resource_name=kb.name
-                    ):
-                        logger.info(f"Skipping knowledge base '{kb.name}'")
-                        continue
-                    
                     logger.info(f"Existing knowledge base '{kb.name}' found. Updating...")
                     self.update_knowledge_base(existing[0].get("id"), kb=kb, file_dir=file_dir)
                     continue

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/models/model_provider_mapper.py

@@ -106,6 +106,7 @@ 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: [{'api_key', ('aws_secret_access_key', 'aws_access_key_id')}],
+    ModelProvider.OPENAI_OAUTH2_CLIENT_CREDS: ['custom_host'],
 })
 
 # def env_file_to_model_ProviderConfig(model_name: str, env_file_path: str) -> ProviderConfig | None:
@@ -189,6 +190,14 @@ def _validate_requirements(provider: ModelProvider, cfg: ProviderConfig, app_id:
             if not _check_credential_provided(cred, provided_credentials):
                 missing_credentials.append(cred)
 
+    if provider == ModelProvider.OPENAI_OAUTH2_CLIENT_CREDS:
+        if missing_credentials:
+            logger.error(f"Please provide these values in the provider config: {', '.join(missing_credentials)}")
+        if not app_id:
+            logger.error("Please create an oauth2 client credentials connection then bind it to the model with `--app-id`")
+        if missing_credentials or (not app_id):
+            sys.exit(1)
+
     if len(missing_credentials) > 0:
         if not app_id:
             missing_credentials_string = f"Missing configuration variable(s) required for the provider {provider}:"

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/models/models_command.py

@@ -42,13 +42,6 @@ def models_import(
             help='The app id of a key_value connection containing authentications details for the model provider.'
         )
     ] = None,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Prompt for confirmation before updating existing models"
-        )
-    ] = False,
 ):
     models_controller = ModelsController()
     models = models_controller.import_model(
@@ -56,7 +49,7 @@ def models_import(
         app_id=app_id
     )
     for model in models:
-        models_controller.publish_or_update_models(model=model, safe_mode=safe)
+        models_controller.publish_or_update_models(model=model)
 
 @models_app.command(name="add", help="Add an llm from a custom provider")
 def models_add(
@@ -89,13 +82,6 @@ def models_add(
         ModelType,
         typer.Option('--type', help='What type of model is it'),
     ] = ModelType.CHAT,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Prompt for confirmation before updating existing models"
-        )
-    ] = False,
 ):
     provider_config_dict = {}
     if provider_config:
@@ -114,7 +100,7 @@ def models_add(
         model_type=type,
         app_id=app_id,
     )
-    models_controller.publish_or_update_models(model=model, safe_mode=safe)
+    models_controller.publish_or_update_models(model=model)
 
 
 

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/models/models_controller.py

@@ -15,22 +15,22 @@ import requests
 import rich
 import rich.highlighter
 
+from ibm_watsonx_orchestrate.agent_builder.connections import ConnectionSecurityScheme
 from ibm_watsonx_orchestrate.cli.config import Config
 from ibm_watsonx_orchestrate.client.model_policies.model_policies_client import ModelPoliciesClient
 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, ModelListEntry
+from ibm_watsonx_orchestrate.agent_builder.models.types import VirtualModel, ProviderConfig, ModelType, ANTHROPIC_DEFAULT_MAX_TOKENS, ModelListEntry, ModelProvider
 from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_local_dev, is_saas_env
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 from ibm_watsonx_orchestrate.client.connections import get_connection_id, ConnectionType
 from ibm_watsonx_orchestrate.cli.commands.connections.connections_controller import export_connection, get_app_id_from_conn_id
 
 from ibm_watsonx_orchestrate.utils.environment import EnvService
-from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown, check_safe_mode_and_prompt
+from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown
 from ibm_watsonx_orchestrate.agent_builder.agents import SpecVersion
 
-
 logger = logging.getLogger(__name__)
 
 WATSONX_URL = os.getenv("WATSONX_URL")
@@ -320,7 +320,10 @@ class ModelsController:
                     model.config["max_tokens"] = ANTHROPIC_DEFAULT_MAX_TOKENS
 
             if app_id:
-                model.connection_id = get_connection_id(app_id, supported_schemas={ConnectionType.KEY_VALUE})
+                supported_schemas = {ConnectionType.KEY_VALUE}
+                if provider == ModelProvider.OPENAI_OAUTH2_CLIENT_CREDS:
+                    supported_schemas = {ConnectionSecurityScheme.OAUTH2}
+                model.connection_id = get_connection_id(app_id, supported_schemas=supported_schemas)
             validate_ProviderConfig(model.provider_config, app_id=app_id)
         return models
 
@@ -347,6 +350,9 @@ class ModelsController:
                 "max_tokens": ANTHROPIC_DEFAULT_MAX_TOKENS
             }
 
+        supported_schemas = {ConnectionType.KEY_VALUE}
+        if provider == ModelProvider.OPENAI_OAUTH2_CLIENT_CREDS:
+            supported_schemas = {ConnectionSecurityScheme.OAUTH2}
         model = VirtualModel(
             name=name,
             display_name=display_name,
@@ -355,12 +361,12 @@ class ModelsController:
             provider_config=provider_config,
             config=config,
             model_type=model_type,
-            connection_id=get_connection_id(app_id, supported_schemas={ConnectionType.KEY_VALUE})
+            connection_id=get_connection_id(app_id, supported_schemas=supported_schemas)
         )
 
         return model
 
-    def publish_or_update_models(self, model: VirtualModel, safe_mode: bool = False) -> None:
+    def publish_or_update_models(self, model: VirtualModel) -> None:
         models_client = self.get_models_client()
 
         existing_models = models_client.get_draft_by_name(model.name)
@@ -368,12 +374,6 @@ class ModelsController:
             logger.error(f"Multiple models with the name '{model.name}' found. Failed to update model")
             sys.exit(1)
 
-        # Check safe mode and prompt if needed
-        resource_exists = len(existing_models) == 1
-        if not check_safe_mode_and_prompt(safe_mode, resource_exists, "model", model.name):
-            logger.info(f"Skipping model '{model.name}'")
-            return
-
         if len(existing_models) == 1:
             self.update_model(model_id=existing_models[0].id, model=model)
         else:

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/phone/phone_command.py

@@ -22,7 +22,6 @@ def create_phone_config(
     description: Optional[str] = typer.Option(None, "--description", "-d", help="Phone config description"),
     field: Optional[list[str]] = typer.Option(None, "--field", "-f", help="Config-specific field in key=value format (can be used multiple times)."),
     output_file: Optional[str] = typer.Option(None, "--output", "-o", help="Write the config spec to a file instead of creating it"),
-    safe: bool = typer.Option(False, "--safe", help="Prompt for confirmation before updating existing phone configs"),
     enable_developer_mode: bool = typer.Option(False, "--enable-developer-mode", hidden=True)
 ):
     """Create a new phone config using CLI arguments."""
@@ -47,7 +46,7 @@ def create_phone_config(
     )
 
     if not output_file:
-        controller.create_or_update_phone_config(channel, safe_mode=safe, enable_developer_mode=enable_developer_mode)
+        controller.create_or_update_phone_config(channel, enable_developer_mode=enable_developer_mode)
 
 
 @phone_app.command(name="list-configs", help="List all phone configs")
@@ -96,12 +95,11 @@ def delete_phone_config(
 @phone_app.command(name="import", help="Import a phone config from a file")
 def import_phone_config(
     file: str = typer.Option(..., "--file", "-f", help="Path to phone config file (YAML, JSON, or Python)"),
-    safe: bool = typer.Option(False, "--safe", help="Prompt for confirmation before updating existing phone configs"),
     enable_developer_mode: bool = typer.Option(False, "--enable-developer-mode", hidden=True)
 ):
     """Import phone config from a configuration file (creates or updates by name)."""
     channel = controller.import_phone_config(file)
-    controller.create_or_update_phone_config(channel, safe_mode=safe, enable_developer_mode=enable_developer_mode)
+    controller.create_or_update_phone_config(channel, enable_developer_mode=enable_developer_mode)
 
 
 @phone_app.command(name="export", help="Export a phone config to a YAML file by ID or name")

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/phone/phone_controller.py

@@ -18,7 +18,7 @@ from ibm_watsonx_orchestrate.client.utils import instantiate_client, is_local_de
 from ibm_watsonx_orchestrate.client.phone.phone_client import PhoneClient
 from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient
 from ibm_watsonx_orchestrate.utils.exceptions import BadRequest
-from ibm_watsonx_orchestrate.cli.common import ListFormats, check_safe_mode_and_prompt
+from ibm_watsonx_orchestrate.cli.common import ListFormats
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 from ibm_watsonx_orchestrate.cli.commands.channels.channels_common import (
     block_local_dev,
@@ -387,7 +387,7 @@ class PhoneController:
             sys.exit(1)
 
     @block_local_dev()
-    def create_or_update_phone_config(self, channel: BasePhoneChannel, safe_mode: bool = False, enable_developer_mode: bool = False) -> str | None:
+    def create_or_update_phone_config(self, channel: BasePhoneChannel, enable_developer_mode: bool = False) -> str | None:
         """Create or update a phone config.
         
         If a phone config with the same name exists, update it.
@@ -395,7 +395,6 @@ class PhoneController:
         
         Args:
             channel: Phone channel configuration object
-            safe_mode: If True, prompt for confirmation before updating existing configs
             
         Returns:
             Phone config ID
@@ -406,23 +405,6 @@ class PhoneController:
         client = self.get_phone_client()
 
         try:
-            # Only check if phone config exists when safe_mode is enabled
-            existing_config = None
-            if safe_mode:
-                try:
-                    configs = client.list_phone_channels()
-                    matching_configs = [c for c in configs if c.get('name') == channel.name]
-                    if matching_configs:
-                        existing_config = matching_configs[0]
-                except Exception:
-                    pass
-                
-                # Check safe mode and prompt if needed
-                resource_exists = existing_config is not None
-                if not check_safe_mode_and_prompt(safe_mode, resource_exists, "phone config", channel.name):
-                    logger.info(f"Skipping phone config '{channel.name}'")
-                    return None
-            
             result, was_created = client.create_or_update_phone_channel(channel)
             config_id = result.get('id')
             

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/tools/tools_command.py

@@ -85,16 +85,9 @@ relative to this package root folder or imported using relative imports from the
             "--function",
             help="Used to specify a function for autodiscover, all other functions will not be converted. (Default behavior is to convert all top level functions found)"
         )
-    ] = None,
-    safe: Annotated[
-        bool,
-        typer.Option(
-            "--safe",
-            help="Enable safe mode: prompt for confirmation before updating existing tools"
-        )
-    ] = False
+    ] = None
 ):
-    tools_controller = ToolsController(kind, file, requirements_file, safe_mode=safe)
+    tools_controller = ToolsController(kind, file, requirements_file)
     if auto_discover:
         if kind != ToolKindImport.python:
             raise typer.BadParameter(f"Auto-discover is only valid for python tools")

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -51,7 +51,7 @@ from ibm_watsonx_orchestrate.utils.exceptions import BadRequest
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 from ibm_watsonx_orchestrate.flow_builder.utils import get_all_tools_in_flow
 from ibm_watsonx_orchestrate.agent_builder.tools.types import PythonToolKind
-from ibm_watsonx_orchestrate.cli.common import check_safe_mode_and_prompt
+
 from  ibm_watsonx_orchestrate import __version__
 
 logger = logging.getLogger(__name__)
@@ -717,13 +717,12 @@ class DownloadResult(BaseModel):
     kind: ToolKind
 
 class ToolsController:
-    def __init__(self, tool_kind: ToolKind = None, file: str = None, requirements_file: Optional[str] = None, safe_mode: bool = False):
+    def __init__(self, tool_kind: ToolKind = None, file: str = None, requirements_file: Optional[str] = None):
         self.client = None
         self.tool_kind = tool_kind
         self.file = file
         self.cleanup_file = False
         self.requirements_file = requirements_file
-        self.safe_mode = safe_mode
 
     def get_client(self) -> ToolClient:
         if not self.client:
@@ -932,16 +931,6 @@ class ToolsController:
                     existing_tool = existing_tools[0]
                     exist = True
                     tool_id = existing_tool.get("id")
-                    
-                    # Check safe mode and prompt for confirmation if needed
-                    if not check_safe_mode_and_prompt(
-                        safe_mode=self.safe_mode,
-                        resource_exists=True,
-                        resource_type="tool",
-                        resource_name=tool.__tool_spec__.name
-                    ):
-                        logger.info(f"Skipping tool '{tool.__tool_spec__.name}'")
-                        continue
 
                 tool_artifact = None
                 if self.tool_kind == ToolKind.python:

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/voice_configurations/voice_configurations_command.py

@@ -20,17 +20,10 @@ def import_voice_config(
       help="YAML file with voice configuraton definition"
     )
   ],
-  safe: Annotated[
-    bool,
-    typer.Option(
-      "--safe",
-      help="Prompt for confirmation before updating existing voice configurations"
-    )
-  ] = False,
 ):
   voice_config_controller = VoiceConfigurationsController()
   imported_config = voice_config_controller.import_voice_config(file)
-  voice_config_controller.publish_or_update_voice_config(imported_config, safe_mode=safe)
+  voice_config_controller.publish_or_update_voice_config(imported_config)
 
 @voice_configurations_app.command(name="remove", help="Remove a voice configuration from the active environment")
 def remove_voice_config(

{ibm_watsonx_orchestrate-2.3.4.dev0 → ibm_watsonx_orchestrate-2.3.4.dev1}/src/ibm_watsonx_orchestrate/cli/commands/voice_configurations/voice_configurations_controller.py

@@ -9,7 +9,7 @@ from ibm_watsonx_orchestrate.agent_builder.voice_configurations import VoiceConf
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
 from ibm_watsonx_orchestrate.client.voice_configurations.voice_configurations_client import VoiceConfigurationsClient
 from ibm_watsonx_orchestrate.utils.exceptions import BadRequest
-from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown, check_safe_mode_and_prompt
+from ibm_watsonx_orchestrate.cli.common import ListFormats, rich_table_to_markdown
 from ibm_watsonx_orchestrate.utils.file_manager import safe_open
 
 logger = logging.getLogger(__name__)
@@ -155,26 +155,16 @@ class VoiceConfigurationsController:
 
     return config_id
 
-  def publish_or_update_voice_config(self, voice_config: VoiceConfiguration, safe_mode: bool = False) -> str | None:
+  def publish_or_update_voice_config(self, voice_config: VoiceConfiguration) -> str | None:
     client = self.get_voice_configurations_client()
     voice_config_name = voice_config.name
     existing_config = client.get_by_name(voice_config_name)
 
-    # Check safe mode and prompt if needed
-    resource_exists = existing_config and len(existing_config) > 0
-    if not check_safe_mode_and_prompt(safe_mode, resource_exists, "voice configuration", voice_config_name):
-      logger.info(f"Skipping voice configuration '{voice_config_name}'")
-      return None
-
-    if resource_exists:
-      logger.info(f"Found existing voice configuration '{voice_config_name}', updating...")
+    if existing_config and len(existing_config) > 0:
       config_id = existing_config[0].voice_configuration_id
-      client.update(config_id, voice_config)
-      logger.info(f"Voice configuration '{voice_config_name}' updated successfully")
+      client.update(config_id,voice_config)
     else:
-      logger.info(f"Creating new voice configuration '{voice_config_name}'...")
       client.create(voice_config)
-      logger.info(f"Voice configuration '{voice_config_name}' created successfully")
 
   def remove_voice_config_by_id(self, voice_config_id: str) -> None:
     client = self.get_voice_configurations_client()

ibm_watsonx_orchestrate-2.3.4.dev1/src/ibm_watsonx_orchestrate/cli/common.py

@@ -0,0 +1,26 @@
+from enum import Enum
+from rich.table import Table
+
+class ListFormats(str, Enum):
+    Table = "table"
+    JSON = "json"
+
+    def __str__(self):
+        return self.value 
+
+    def __repr__(self):
+        return repr(self.value)
+
+def rich_table_to_markdown(table: Table) -> str:
+    headers = [column.header for column in table.columns]
+    cols = [[cell for cell in col.cells] for col in table.columns]
+    rows = list(map(list, zip(*cols)))
+
+    # Header row
+    md = "| " + " | ".join(headers) + " |\n"
+    # Separator row
+    md += "| " + " | ".join(["---"] * len(headers)) + " |\n"
+    # # Data rows
+    for row in rows:
+        md += "| " + " | ".join(row) + " |\n"
+    return md