ibm-watsonx-orchestrate 1.5.0b1__tar.gz → 1.6.0b0__tar.gz

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.5.0b1
+Version: 1.6.0b0
 Summary: IBM watsonx.orchestrate SDK
 Author-email: IBM <support@ibm.com>
 License: MIT License
@@ -11,6 +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.22.0
+Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.2
 Requires-Dist: jsonref==1.1.0
 Requires-Dist: jsonschema<5.0.0,>=4.23.0
 Requires-Dist: langchain-community<1.0.0,>=0.3.12

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/pyproject.toml

@@ -36,7 +36,8 @@ dependencies = [
     "urllib3>=2.2.3",
     "munch>=4.0.0",
     "pytz>=2025.2",
-    "redis>=6.0.0"
+    "redis>=6.0.0",
+    "ibm_watsonx_orchestrate_evaluation_framework==1.0.2"
 ]
 
 [project.optional-dependencies]

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.5.0b1"
+__version__ = "1.6.0b0"
 
 
 

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/agents/__init__.py

@@ -2,4 +2,4 @@ from .agent import Agent, AgentSpec
 from .external_agent import ExternalAgent, ExternalAgentSpec
 from .assistant_agent import AssistantAgent, AssistantAgentSpec
 # from .types import AgentKind, AgentStyle, ExternalAgentConfig, AssistantAgentConfig, SpecVersion
-from .types import AgentKind, AgentStyle, SpecVersion, ExternalAgentAuthScheme, AgentProvider, AssistantAgentConfig
+from .types import AgentKind, AgentStyle, SpecVersion, ExternalAgentAuthScheme, AgentProvider, AssistantAgentConfig, AgentGuideline

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/agents/types.py

@@ -4,7 +4,7 @@ from enum import Enum
 from typing import List, Optional, Dict
 from pydantic import BaseModel, model_validator, ConfigDict
 from ibm_watsonx_orchestrate.agent_builder.tools import BaseTool, PythonTool
-from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import KnowledgeBaseSpec
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import KnowledgeBaseSpec, KnowledgeBaseBuiltInVectorIndexConfig, HAPFiltering, HAPFilteringConfig, CitationsConfig, ConfidenceThresholds, QueryRewriteConfig, GenerationConfiguration
 from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.knowledge_base import KnowledgeBase
 from pydantic import Field, AliasChoices
 from typing import Annotated
@@ -50,6 +50,8 @@ class BaseAgentSpec(BaseModel):
     name: Annotated[str, Field(json_schema_extra={"min_length_str":1})]
     display_name: Annotated[Optional[str], Field(json_schema_extra={"min_length_str":1})] = None
     description: Annotated[str, Field(json_schema_extra={"min_length_str":1})]
+    context_access_enabled: bool = True
+    context_variables: Optional[List[str]] = []
 
     def dump_spec(self, file: str) -> None:
         dumped = self.model_dump(mode='json', exclude_unset=True, exclude_none=True)
@@ -69,11 +71,34 @@ class BaseAgentSpec(BaseModel):
 #      NATIVE AGENT TYPES
 # ===============================
 
+class ChatWithDocsConfig(BaseModel):
+    enabled: Optional[bool] = None
+    vector_index: Optional[KnowledgeBaseBuiltInVectorIndexConfig] = None
+    generation:  Optional[GenerationConfiguration] = None
+    query_rewrite:  Optional[QueryRewriteConfig] = None
+    confidence_thresholds: Optional[ConfidenceThresholds] =None
+    citations:  Optional[CitationsConfig] = None
+    hap_filtering: Optional[HAPFiltering] = None
+    
 class AgentStyle(str, Enum):
     DEFAULT = "default"
     REACT = "react"
     PLANNER = "planner"
 
+class AgentGuideline(BaseModel):
+    model_config = ConfigDict(arbitrary_types_allowed=True)
+
+    display_name: Optional[str] = None
+    condition: str
+    action: str
+    tool: Optional[BaseTool] | Optional[str] = None
+
+    def __init__(self, *args, **kwargs):
+        if "tool" in kwargs and kwargs["tool"]:
+            kwargs["tool"] = kwargs['tool'].__tool_spec__.name if isinstance(kwargs['tool'], BaseTool) else kwargs["tool"]
+
+        super().__init__(*args, **kwargs)
+
 class AgentSpec(BaseAgentSpec):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
@@ -83,10 +108,12 @@ class AgentSpec(BaseAgentSpec):
     custom_join_tool: str | PythonTool | None = None
     structured_output: Optional[JsonSchemaObject] = None
     instructions: Annotated[Optional[str], Field(json_schema_extra={"min_length_str":1})] = None
+    guidelines: Optional[List[AgentGuideline]] = None
     collaborators: Optional[List[str]] | Optional[List['BaseAgentSpec']] = []
     tools: Optional[List[str]] | Optional[List['BaseTool']] = []
     hidden: bool = False
     knowledge_base: Optional[List[str]] | Optional[List['KnowledgeBaseSpec']] = []
+    chat_with_docs: Optional[ChatWithDocsConfig] = None
 
 
     def __init__(self, *args, **kwargs):
@@ -122,11 +149,17 @@ def validate_agent_fields(values: dict) -> dict:
             raise ValueError(f"Circular reference detected. The agent '{name}' cannot contain itself as a collaborator")
 
     if values.get("style") == AgentStyle.PLANNER:
-        if not values.get("custom_join_tool") and not values.get("structured_output"):
-            raise ValueError("Either 'custom_join_tool' or 'structured_output' must be provided for planner style agents.")
         if values.get("custom_join_tool") and values.get("structured_output"):
             raise ValueError("Only one of 'custom_join_tool' or 'structured_output' can be provided for planner style agents.")
 
+    context_variables = values.get("context_variables")
+    if context_variables is not None:
+        if not isinstance(context_variables, list):
+            raise ValueError("context_variables must be a list")
+        for var in context_variables:
+            if not isinstance(var, str) or not var.strip():
+                raise ValueError("All context_variables must be non-empty strings")
+
     return values
 
 # ===============================
@@ -170,6 +203,14 @@ def validate_external_agent_fields(values: dict) -> dict:
         if value and not str(value).strip():
             raise ValueError(f"{field} cannot be empty or just whitespace")
 
+    context_variables = values.get("context_variables")
+    if context_variables is not None:
+        if not isinstance(context_variables, list):
+            raise ValueError("context_variables must be a list")
+        for var in context_variables:
+            if not isinstance(var, str) or not var.strip():
+                raise ValueError("All context_variables must be non-empty strings")
+
     return values
 
 # # ===============================
@@ -215,4 +256,13 @@ def validate_assistant_agent_fields(values: dict) -> dict:
         if value and not str(value).strip():
             raise ValueError(f"{field} cannot be empty or just whitespace")
 
+    # Validate context_variables if provided
+    context_variables = values.get("context_variables")
+    if context_variables is not None:
+        if not isinstance(context_variables, list):
+            raise ValueError("context_variables must be a list")
+        for var in context_variables:
+            if not isinstance(var, str) or not var.strip():
+                raise ValueError("All context_variables must be non-empty strings")
+
     return values

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/model_policies/types.py

@@ -17,7 +17,7 @@ class ModelPolicyRetry(BaseModel):
     on_status_codes: List[int] = None
 
 class ModelPolicyTarget(BaseModel):
-    weight: float = None
+    weight: float | None = None
     model_name: str = None
 
 class ModelPolicyInner(BaseModel):

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/models/types.py

@@ -146,7 +146,6 @@ class ProviderConfig(BaseModel):
 
     # Azure Inference
     azure_deployment_name: Optional[str] = Field(None, alias="azureDeploymentName")
-    azure_api_version: Optional[str] = Field(None, alias="azureApiVersion")
     azure_extra_params: Optional[str] = Field(None, alias="azureExtraParams")
     azure_foundry_url: Optional[str] = Field(None, alias="azureFoundryUrl")
 

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/tools/openapi_tool.py

@@ -14,7 +14,7 @@ from .types import ToolSpec
 from .base_tool import BaseTool
 from .types import HTTP_METHOD, ToolPermission, ToolRequestBody, ToolResponseBody, \
     OpenApiToolBinding, \
-    JsonSchemaObject, ToolBinding, OpenApiSecurityScheme
+    JsonSchemaObject, ToolBinding, OpenApiSecurityScheme, CallbackBinding
 
 import json
 
@@ -134,6 +134,7 @@ def create_openapi_json_tool(
         description=spec_description,
         permission=spec_permission
     )
+    spec.is_async = 'callbacks' in route_spec
 
     spec.input_schema = input_schema or ToolRequestBody(
         type='object',
@@ -203,13 +204,50 @@ def create_openapi_json_tool(
 
         security.append(security_schemes_map[name])
 
-    spec.binding = ToolBinding(openapi=OpenApiToolBinding(
+    # If it's an async tool, add callback binding
+    if spec.is_async:
+
+
+        callbacks = route_spec.get('callbacks', {})
+        callback_name = next(iter(callbacks.keys()))
+        callback_spec = callbacks[callback_name]
+        callback_path = next(iter(callback_spec.keys()))
+        callback_method = next(iter(callback_spec[callback_path].keys()))
+        
+        # Phase 1: Create a separate input schema for callback that excludes callbackUrl
+        # Note: Currently assuming the callback URL parameter will be named 'callbackUrl' in the OpenAPI spec
+        # Future phases will handle other naming conventions
+        callback_input_schema = ToolRequestBody(
+            type='object',
+            properties={k: v for k, v in spec.input_schema.properties.items() if not k.endswith('_callbackUrl')},
+            required=[r for r in spec.input_schema.required if not r.endswith('_callbackUrl')]
+        )
+
+        if callback_input_schema:
+            spec.input_schema = callback_input_schema
+
+        callback_binding = CallbackBinding(
+            callback_url=callback_path,
+            method=callback_method.upper(),
+            input_schema=callback_input_schema,
+            output_schema=spec.output_schema
+        )
+
+    else:
+        callback_binding = None
+
+    openapi_binding = OpenApiToolBinding(
         http_path=http_path,
         http_method=http_method,
         security=security,
         servers=servers,
         connection_id=connection_id
-    ))
+    )
+    
+    if callback_binding is not None:
+        openapi_binding.callback = callback_binding
+
+    spec.binding = ToolBinding(openapi=openapi_binding)
 
     return OpenAPITool(spec=spec)
 

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/tools/python_tool.py

@@ -95,7 +95,8 @@ def _fix_optional(schema):
 def _validate_input_schema(input_schema: ToolRequestBody) -> None:
     props = input_schema.properties
     for prop in props:
-        if not props.get(prop).type:
+        property_schema = props.get(prop)
+        if not (property_schema.type or property_schema.anyOf):
             logger.warning(f"Missing type hint for tool property '{prop}' defaulting to 'str'. To remove this warning add a type hint to the property in the tools signature. See Python docs for guidance: https://docs.python.org/3/library/typing.html")
 
 def _validate_join_tool_func(fn: Callable, sig: inspect.Signature | None = None, name: str | None = None) -> None:

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/agent_builder/tools/types.py

@@ -93,6 +93,11 @@ class OpenApiSecurityScheme(BaseModel):
 
 HTTP_METHOD = Literal['GET', 'POST', 'PUT', 'PATCH', 'DELETE']
 
+class CallbackBinding(BaseModel):
+    callback_url: str
+    method: HTTP_METHOD
+    input_schema: ToolRequestBody
+    output_schema: ToolResponseBody
 
 class OpenApiToolBinding(BaseModel):
     http_method: HTTP_METHOD
@@ -101,6 +106,7 @@ class OpenApiToolBinding(BaseModel):
     security: Optional[List[OpenApiSecurityScheme]] = None
     servers: Optional[List[str]] = None
     connection_id: str | None = None
+    callback: CallbackBinding = None
 
     @model_validator(mode='after')
     def validate_openapi_tool_binding(self):
@@ -175,6 +181,7 @@ class ToolSpec(BaseModel):
     output_schema: ToolResponseBody = None
     binding: ToolBinding = None
     toolkit_id: str | None = None
+    is_async: bool = False
 
     def is_custom_join_tool(self) -> bool:
         if self.binding.python is None:

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_command.py

@@ -137,7 +137,7 @@ def agent_create(
         List[str],
         typer.Option(
             "--knowledge-bases",
-            help="A list of knowlege bases names you wish for the agent to be able to utilise. Format --knowledge-bases base1 --knowledge-bases base2 ...",
+            help="A list of knowledge bases names you wish for the agent to be able to utilise. Format --knowledge-bases base1 --knowledge-bases base2 ...",
         ),
     ] = None,
     output_file: Annotated[
@@ -148,6 +148,21 @@ def agent_create(
             help="Write the agent definition out to a YAML (.yaml/.yml) file or a JSON (.json) file.",
         ),
     ] = None,
+    context_access_enabled: Annotated[
+        bool,
+        typer.Option(
+            "--context-access-enabled",
+            help="Whether the agent has access to context variables (default: True)",
+        ),
+    ] = True,
+    context_variables: Annotated[
+        List[str],
+        typer.Option(
+            "--context-variable",
+            "-v",
+            help="A list of context variable names the agent can access. Format: --context-variable var1 --context-variable var2 ... or -v var1 -v var2 ...",
+        ),
+    ] = None,
 ):
     chat_params_dict = json.loads(chat_params) if chat_params else {}
     config_dict = json.loads(config) if config else {}
@@ -177,6 +192,8 @@ def agent_create(
         nickname=nickname,
         app_id=app_id,
         output_file=output_file,
+        context_access_enabled=context_access_enabled,
+        context_variables=context_variables,
     )
     agents_controller.publish_or_update_agents([agent])
 

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/cli/commands/agents/agents_controller.py

@@ -25,7 +25,7 @@ from ibm_watsonx_orchestrate.agent_builder.agents import (
     AgentKind,
     SpecVersion
 )
-from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient
+from ibm_watsonx_orchestrate.client.agents.agent_client import AgentClient, AgentUpsertResponse
 from ibm_watsonx_orchestrate.client.agents.external_agent_client import ExternalAgentClient
 from ibm_watsonx_orchestrate.client.agents.assistant_agent_client import AssistantAgentClient
 from ibm_watsonx_orchestrate.client.tools.tool_client import ToolClient
@@ -99,6 +99,7 @@ def parse_create_native_args(name: str, kind: AgentKind, description: str | None
         "style": args.get("style"),
         "custom_join_tool": args.get("custom_join_tool"),
         "structured_output": args.get("structured_output"),
+        "context_access_enabled": args.get("context_access_enabled", True),
     }
 
     collaborators = args.get("collaborators", [])
@@ -116,6 +117,11 @@ def parse_create_native_args(name: str, kind: AgentKind, description: str | None
     knowledge_base = [x.strip() for x in knowledge_base if x.strip() != ""]
     agent_details["knowledge_base"] = knowledge_base
 
+    context_variables = args.get("context_variables", [])
+    context_variables = context_variables if context_variables else []
+    context_variables = [x.strip() for x in context_variables if x.strip() != ""]
+    agent_details["context_variables"] = context_variables
+
     return agent_details
 
 def parse_create_external_args(name: str, kind: AgentKind, description: str | None, **args) -> dict:
@@ -133,8 +139,14 @@ def parse_create_external_args(name: str, kind: AgentKind, description: str | No
         "config": args.get("config", {}),
         "nickname": args.get("nickname"),
         "app_id": args.get("app_id"),
+        "context_access_enabled": args.get("context_access_enabled", True),
     }
 
+    context_variables = args.get("context_variables", [])
+    context_variables = context_variables if context_variables else []
+    context_variables = [x.strip() for x in context_variables if x.strip() != ""]
+    agent_details["context_variables"] = context_variables
+
     return agent_details
 
 def parse_create_assistant_args(name: str, kind: AgentKind, description: str | None, **args) -> dict:
@@ -146,8 +158,14 @@ def parse_create_assistant_args(name: str, kind: AgentKind, description: str | N
         "tags": args.get("tags", []),
         "config": args.get("config", {}),
         "nickname": args.get("nickname"),
+        "context_access_enabled": args.get("context_access_enabled", True),
     }
 
+    context_variables = args.get("context_variables", [])
+    context_variables = context_variables if context_variables else []
+    context_variables = [x.strip() for x in context_variables if x.strip() != ""]
+    agent_details["context_variables"] = context_variables
+
     return agent_details
 
 def get_conn_id_from_app_id(app_id: str) -> str:
@@ -177,6 +195,10 @@ def get_agent_details(name: str, client: AgentClient | ExternalAgentClient | Ass
 
     return agent_specs[0]
 
+def _raise_guidelines_warning(response: AgentUpsertResponse) -> None:
+    if response.warning:
+        logger.warning(f"Agent Configuration Issue: {response.warning}")
+
 class AgentsController:
     def __init__(self):
         self.native_client = None
@@ -420,6 +442,72 @@ class AgentsController:
         ref_agent.knowledge_base = ref_knowledge_bases
         return ref_agent
     
+    def dereference_guidelines(self, agent: Agent) -> Agent:
+        tool_client = self.get_tool_client()
+        
+        guideline_tool_names = set()
+
+        for guideline in agent.guidelines:
+            if guideline.tool:
+                guideline_tool_names.add(guideline.tool)
+        
+        if len(guideline_tool_names) == 0:
+            return agent
+
+        deref_agent = deepcopy(agent)
+
+        matching_tools = tool_client.get_drafts_by_names(list(guideline_tool_names))
+
+        name_id_lookup = {}
+        for tool in matching_tools:
+            if tool.get("name") in name_id_lookup:
+                logger.error(f"Duplicate draft entries for tool '{tool.get('name')}'")
+                sys.exit(1)
+            name_id_lookup[tool.get("name")] = tool.get("id")
+        
+        for guideline in deref_agent.guidelines:
+            if guideline.tool:
+                id = name_id_lookup.get(guideline.tool)
+                if not id:
+                    logger.error(f"Failed to find guideline tool. No tools found with the name '{guideline.tool}'")
+                    sys.exit(1)
+                guideline.tool = id
+
+        return deref_agent
+    
+    def reference_guidelines(self, agent: Agent) -> Agent:
+        tool_client = self.get_tool_client()
+        
+        guideline_tool_ids = set()
+
+        for guideline in agent.guidelines:
+            if guideline.tool:
+                guideline_tool_ids.add(guideline.tool)
+        
+        if len(guideline_tool_ids) == 0:
+            return agent
+
+        ref_agent = deepcopy(agent)
+
+        matching_tools = tool_client.get_drafts_by_ids(list(guideline_tool_ids))
+
+        id_name_lookup = {}
+        for tool in matching_tools:
+            if tool.get("id") in id_name_lookup:
+                logger.error(f"Duplicate draft entries for tool '{tool.get('id')}'")
+                sys.exit(1)
+            id_name_lookup[tool.get("id")] = tool.get("name")
+        
+        for guideline in ref_agent.guidelines:
+            if guideline.tool:
+                name = id_name_lookup.get(guideline.tool)
+                if not name:
+                    logger.error(f"Failed to find guideline tool. No tools found with the id '{guideline.tool}'")
+                    sys.exit(1)
+                guideline.tool = name
+
+        return ref_agent
+
     @staticmethod
     def dereference_app_id(agent: ExternalAgent | AssistantAgent) -> ExternalAgent | AssistantAgent:
         if agent.kind == AgentKind.EXTERNAL:
@@ -448,6 +536,8 @@ class AgentsController:
             agent = self.dereference_tools(agent)
         if agent.knowledge_base and len(agent.knowledge_base):
             agent = self.dereference_knowledge_bases(agent)
+        if agent.guidelines and len(agent.guidelines):
+            agent = self.dereference_guidelines(agent)
 
         return agent
     
@@ -458,6 +548,8 @@ class AgentsController:
             agent = self.reference_tools(agent)
         if agent.knowledge_base and len(agent.knowledge_base):
             agent = self.reference_knowledge_bases(agent)
+        if agent.guidelines and len(agent.guidelines):
+            agent = self.reference_guidelines(agent)
 
         return agent
     
@@ -543,7 +635,8 @@ class AgentsController:
 
     def publish_agent(self, agent: Agent, **kwargs) -> None:
         if isinstance(agent, Agent):
-            self.get_native_client().create(agent.model_dump(exclude_none=True))
+            response = self.get_native_client().create(agent.model_dump(exclude_none=True))
+            _raise_guidelines_warning(response)
             logger.info(f"Agent '{agent.name}' imported successfully")
         if isinstance(agent, ExternalAgent):
             self.get_external_client().create(agent.model_dump(exclude_none=True))
@@ -557,7 +650,8 @@ class AgentsController:
     ) -> None:
         if isinstance(agent, Agent):
             logger.info(f"Existing Agent '{agent.name}' found. Updating...")
-            self.get_native_client().update(agent_id, agent.model_dump(exclude_none=True))
+            response = self.get_native_client().update(agent_id, agent.model_dump(exclude_none=True))
+            _raise_guidelines_warning(response)
             logger.info(f"Agent '{agent.name}' updated successfully")
         if isinstance(agent, ExternalAgent):
             logger.info(f"Existing External Agent '{agent.name}' found. Updating...")

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/cli/commands/channels/webchat/channels_webchat_controller.py

@@ -1,5 +1,4 @@
 import logging
-import logging
 import rich
 import jwt
 

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -80,7 +80,6 @@ def _create_connection_from_spec(content: dict) -> None:
         config = environments.get(environment)
         config["environment"] = environment
         config["app_id"] = app_id
-        config["environment"] = environment
         config = ConnectionConfiguration.model_validate(config)
         add_configuration(config)
     
@@ -437,6 +436,7 @@ def configure_connection(**kwargs) -> None:
         logger.error(f"Cannot create configuration for environment '{kwargs.get('environment')}'. Local development does not support any environments other than 'draft'.")
         sys.exit(1)
 
+    
     idp_config_body = None
     if kwargs.get("idp_token_type") or kwargs.get("idp_token_use"):
         idp_config_body = IdpConfigDataBody(

{ibm_watsonx_orchestrate-1.5.0b1 → ibm_watsonx_orchestrate-1.6.0b0}/src/ibm_watsonx_orchestrate/cli/commands/environment/environment_command.py

@@ -5,6 +5,7 @@ from ibm_watsonx_orchestrate.cli.commands.environment import environment_control
 from ibm_watsonx_orchestrate.cli.commands.environment.types import EnvironmentAuthType
 from ibm_watsonx_orchestrate.cli.commands.tools.types import RegistryType
 from ibm_watsonx_orchestrate.client.utils import is_local_dev
+import sys
 
 logger = logging.getLogger(__name__)
 
@@ -20,7 +21,19 @@ def activate_env(
         apikey: Annotated[
             str,
             typer.Option(
-                "--apikey", "-a", help="WXO API Key. Leave Blank if developing locally"
+                "--api-key", "-a", help="WXO or CPD API Key. Leave Blank if developing locally. For CPD, either a Passoword or Apikey is accepted for CPD, but not both."
+            ),
+        ] = None,
+        username: Annotated[
+            str,
+            typer.Option(
+                "--username", "-u", help="Username specifically for CPD Environments."
+            ),
+        ] = None,
+        password: Annotated[
+            str,
+            typer.Option(
+                "--password", "-p", help="Password specifically for CPD Environments. Either a Passoword or Apikey is accepted for CPD, but not both."
             ),
         ] = None,
         registry: Annotated[
@@ -32,7 +45,7 @@ def activate_env(
             typer.Option("--test-package-version-override", help="Which prereleased package version to reference when using --registry testpypi", hidden=True),
         ] = None
 ):
-    environment_controller.activate(name=name, apikey=apikey, 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)
 
 
 @environment_app.command(name="add")
@@ -58,9 +71,21 @@ def add_env(
         type: Annotated[
             EnvironmentAuthType,
             typer.Option("--type", "-t", help="The type of auth you wish to use"),
-        ] = None
+        ] = None,
+        insecure: Annotated[
+            bool,
+            typer.Option("--insecure", help="Ignore SSL validation errors. Used for CPD Environments only"),
+        ] = False,
+        verify: Annotated[
+            str,
+            typer.Option("--verify", help="Path to SSL Cert. Used for CPD Environments only"),
+        ] = None,
 ):
-    environment_controller.add(name=name, url=url, should_activate=activate, iam_url=iam_url, type=type)
+    if insecure and verify:
+        logger.error("Please choose either '--insecure' or '--verify' but not both.")
+        sys.exit(1)
+
+    environment_controller.add(name=name, url=url, should_activate=activate, iam_url=iam_url, type=type, insecure=insecure, verify=verify)
 
 
 @environment_app.command(name="remove")