ibm-watsonx-orchestrate 1.6.0__tar.gz → 1.6.1__tar.gz

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ibm-watsonx-orchestrate
-Version: 1.6.0
+Version: 1.6.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.22.0
-Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.5
+Requires-Dist: ibm-watsonx-orchestrate-evaluation-framework==1.0.6
 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.6.0 → ibm_watsonx_orchestrate-1.6.1}/pyproject.toml

@@ -37,7 +37,7 @@ dependencies = [
     "munch>=4.0.0",
     "pytz>=2025.2",
     "redis>=6.0.0",
-    "ibm_watsonx_orchestrate_evaluation_framework==1.0.5"
+    "ibm_watsonx_orchestrate_evaluation_framework==1.0.6"
 ]
 
 [project.optional-dependencies]

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/__init__.py

@@ -5,7 +5,7 @@
 
 pkg_name = "ibm-watsonx-orchestrate"
 
-__version__ = "1.6.0"
+__version__ = "1.6.1"
 
 
 

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/agent_builder/connections/connections.py

@@ -8,6 +8,7 @@ from ibm_watsonx_orchestrate.agent_builder.connections.types import (
     OAuth2TokenCredentials,
     KeyValueConnectionCredentials,
     ConnectionType,
+    ConnectionSecurityScheme,
     CREDENTIALS,
     CONNECTION_TYPE_CREDENTIAL_MAPPING
 )
@@ -26,6 +27,18 @@ connection_type_requirements_mapping = {
     KeyValueConnectionCredentials: None
 }
 
+connection_type_security_schema_map = {
+    ConnectionType.API_KEY_AUTH: ConnectionSecurityScheme.API_KEY_AUTH,
+    ConnectionType.BASIC_AUTH: ConnectionSecurityScheme.BASIC_AUTH,
+    ConnectionType.BEARER_TOKEN: ConnectionSecurityScheme.BEARER_TOKEN,
+    ConnectionType.KEY_VALUE: ConnectionSecurityScheme.KEY_VALUE,
+    ConnectionType.OAUTH2_AUTH_CODE: ConnectionSecurityScheme.OAUTH2,
+    ConnectionType.OAUTH2_CLIENT_CREDS: ConnectionSecurityScheme.OAUTH2,
+    ConnectionType.OAUTH_ON_BEHALF_OF_FLOW: ConnectionSecurityScheme.OAUTH2,
+    # ConnectionType.OAUTH2_IMPLICIT: ConnectionSecurityScheme.OAUTH2,
+    # ConnectionType.OAUTH2_PASSWORD: ConnectionSecurityScheme.OAUTH2
+}
+
 def _clean_env_vars(vars: dict[str:str], requirements: List[str], app_id: str) -> dict[str,str]:
     base_prefix = _PREFIX_TEMPLATE.format(app_id=app_id)
 
@@ -75,10 +88,10 @@ def _build_credentials_model(credentials_type: type[CREDENTIALS], vars: dict[str
         )
 
 
-def _validate_schema_type(requested_type: ConnectionType, expected_type: ConnectionType) -> bool:
+def _validate_schema_type(requested_type: ConnectionSecurityScheme, expected_type: ConnectionSecurityScheme) -> bool:
         return expected_type == requested_type
 
-def _get_credentials_model(connection_type: ConnectionType, app_id: str) -> type[CREDENTIALS]:
+def _get_credentials_model(connection_type: ConnectionSecurityScheme, app_id: str) -> type[CREDENTIALS]:
     base_prefix = _PREFIX_TEMPLATE.format(app_id=app_id)
     variables = {}
     for key, value in os.environ.items():
@@ -93,7 +106,7 @@ def _get_credentials_model(connection_type: ConnectionType, app_id: str) -> type
 
     return _build_credentials_model(credentials_type=credentials_type, vars=variables, base_prefix=base_prefix)
 
-def get_connection_type(app_id: str) -> ConnectionType:
+def get_connection_type(app_id: str) -> ConnectionSecurityScheme:
     sanitized_app_id = sanatize_app_id(app_id=app_id)
     expected_schema_key = f"WXO_SECURITY_SCHEMA_{sanitized_app_id}"
     expected_schema = os.environ.get(expected_schema_key)
@@ -103,7 +116,7 @@ def get_connection_type(app_id: str) -> ConnectionType:
         logger.error(message)
         raise ValueError(message)
 
-    auth_types = {e.value for e in ConnectionType}
+    auth_types = {e.value for e in ConnectionSecurityScheme}
     if expected_schema not in auth_types:
         message = f"The expected type '{expected_schema}' cannot be resolved into a valid connection auth type ({', '.join(list(auth_types))})"
         logger.error(message)
@@ -114,10 +127,11 @@ def get_connection_type(app_id: str) -> ConnectionType:
 def get_application_connection_credentials(type: ConnectionType, app_id: str) -> CREDENTIALS:
     sanitized_app_id = sanatize_app_id(app_id=app_id)
     expected_schema = get_connection_type(app_id=app_id)
+    requested_schema = connection_type_security_schema_map.get(type)
 
-    if not _validate_schema_type(requested_type=type, expected_type=expected_schema):
-        message = f"The requested type '{type.__name__}' does not match the type '{expected_schema}' for the connection '{app_id}'"
+    if not _validate_schema_type(requested_type=requested_schema, expected_type=expected_schema):
+        message = f"The requested type '{requested_schema}' does not match the type '{expected_schema}' for the connection '{app_id}'"
         logger.error(message)
         raise ValueError(message)
 
-    return _get_credentials_model(connection_type=type, app_id=sanitized_app_id)
+    return _get_credentials_model(connection_type=requested_schema, app_id=sanitized_app_id)

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/agent_builder/connections/types.py

@@ -244,15 +244,11 @@ CONNECTION_KIND_OAUTH_TYPE_MAPPING = {
 }
 
 CONNECTION_TYPE_CREDENTIAL_MAPPING = {
-    ConnectionType.BASIC_AUTH: BasicAuthCredentials,
-    ConnectionType.BEARER_TOKEN: BearerTokenAuthCredentials,
-    ConnectionType.API_KEY_AUTH: APIKeyAuthCredentials,
-    ConnectionType.OAUTH2_AUTH_CODE: OAuth2TokenCredentials,
-    # ConnectionType.OAUTH2_IMPLICIT: OAuth2TokenCredentials,
-    # ConnectionType.OAUTH2_PASSWORD: OAuth2TokenCredentials,
-    ConnectionType.OAUTH2_CLIENT_CREDS: OAuth2TokenCredentials,
-    ConnectionType.OAUTH_ON_BEHALF_OF_FLOW: OAuth2TokenCredentials,
-    ConnectionType.KEY_VALUE: KeyValueConnectionCredentials,
+    ConnectionSecurityScheme.BASIC_AUTH: BasicAuthCredentials,
+    ConnectionSecurityScheme.BEARER_TOKEN: BearerTokenAuthCredentials,
+    ConnectionSecurityScheme.API_KEY_AUTH: APIKeyAuthCredentials,
+    ConnectionSecurityScheme.OAUTH2: OAuth2TokenCredentials,
+    ConnectionSecurityScheme.KEY_VALUE: KeyValueConnectionCredentials,
 }
 
 class IdentityProviderCredentials(BaseModel):

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_controller.py

@@ -346,7 +346,7 @@ def add_connection(app_id: str) -> None:
         status_code = response.status_code
         try:
             if status_code == 409:
-                response_text = f"Failed to create connection. A connection with the App ID '{app_id}' already exists. Please select a diffrent App ID or delete the existing resource."
+                response_text = f"Failed to create connection. A connection with the App ID '{app_id}' already exists. Please select a different App ID or delete the existing resource."
             else:
                 resp = json.loads(response_text)
                 response_text = resp.get('detail')

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/cli/commands/environment/environment_controller.py

@@ -167,7 +167,7 @@ def activate(name: str, apikey: str=None, username: str=None, password: str=None
 
 def add(name: str, url: str, should_activate: bool=False, iam_url: str=None, type: EnvironmentAuthType=None, insecure: bool=None, verify: str=None) -> None:
     if name == PROTECTED_ENV_NAME:
-        logger.error(f"The name '{PROTECTED_ENV_NAME}' is a reserved environment name. Please select a diffrent name or use `orchestrate env activate {PROTECTED_ENV_NAME}` to swap to '{PROTECTED_ENV_NAME}'")
+        logger.error(f"The name '{PROTECTED_ENV_NAME}' is a reserved environment name. Please select a different name or use `orchestrate env activate {PROTECTED_ENV_NAME}` to swap to '{PROTECTED_ENV_NAME}'")
         return
 
     cfg = Config()

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/cli/commands/tools/tools_controller.py

@@ -102,6 +102,10 @@ def validate_app_ids(kind: ToolKind, **args) -> None:
         if app_id not in imported_connections:
             logger.warning(f"No connection found for provided app-id '{app_id}'. Please create the connection using `orchestrate connections add`")
         else:
+            # Validate that the connection is not key_value when the tool in openapi
+            if kind != ToolKind.openapi:
+                continue
+
             environments = _get_connection_environments()
 
             imported_connection = imported_connections.get(app_id)
@@ -110,13 +114,15 @@ def validate_app_ids(kind: ToolKind, **args) -> None:
                 conn = imported_connection.get(conn_environment)
 
                 if conn is None or conn.security_scheme is None:
-                    logger.error(f"Connection '{app_id}' is not configured in the '{conn_environment}' environment.")
+                    message = f"Connection '{app_id}' is not configured in the '{conn_environment}' environment."
                     if conn_environment == ConnectionEnvironment.DRAFT:
+                        logger.error(message)
                         sys.exit(1)
-                    logger.error("If you deploy this tool without setting the live configuration the tool will error during execution.")
+                    else:
+                        logger.warning(message + " If you deploy this tool without setting the live configuration the tool will error during execution.")
                     continue
 
-                if kind == ToolKind.openapi and conn.security_scheme == ConnectionSecurityScheme.KEY_VALUE:
+                if conn.security_scheme == ConnectionSecurityScheme.KEY_VALUE:
                     logger.error(f"Key value application connections can not be bound to an openapi tool")
                     exit(1)
 
@@ -231,10 +237,12 @@ def validate_python_connections(tool: BaseTool):
             conn = imported_connection.get(conn_environment)
             conn_identifier = conn.app_id if conn is not None else connection_id
             if conn is None or conn.security_scheme is None:
-                logger.error(f"Connection '{conn_identifier}' is not configured in the '{conn_environment}' environment.")
+                message = f"Connection '{conn_identifier}' is not configured in the '{conn_environment}' environment."
                 if conn_environment == ConnectionEnvironment.DRAFT:
+                    logger.error(message)
                     sys.exit(1)
-                logger.error("If you deploy this tool without setting the live configuration the tool will error during execution.")
+                else:
+                    logger.warning(message + " If you deploy this tool without setting the live configuration the tool will error during execution.")
                 continue
 
             imported_connection_auth_type = get_connection_type(security_scheme=conn.security_scheme, auth_type=conn.auth_type)

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/docker/compose-lite.yml

@@ -120,7 +120,7 @@ services:
       TEMPUS_RUNTIME_ENDPOINT: http://wxo-tempus-runtime:9044
       CONNECTIONS_MANAGER_ENDPOINT: http://wxo-server-connection-manager:3001
       AGENT_OPS_API_KEY: ${AGENTOPS_API_KEY}
-      AGENTS_OPS_RUNTIME_ENDPOINT: https://host.docker.internal:8765
+      AGENTS_OPS_RUNTIME_ENDPOINT: https://frontend-server:443
       IS_OBSERVABILITY_FEATURE_ENABLED: "true"
       ALLOW_INSECURE_TLS: "true"
     command: 'npm start'

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/docker/default.env

@@ -53,13 +53,13 @@ EVENT_BROKER_TTL="-1"
 REGISTRY_URL=
 
 
-SERVER_TAG=27-06-2025
+SERVER_TAG=02-07-2025
 SERVER_REGISTRY=
 
-WORKER_TAG=27-06-2025
+WORKER_TAG=02-07-2025
 WORKER_REGISTRY=
 
-AI_GATEWAY_TAG=23-06-2025
+AI_GATEWAY_TAG=01-07-2025
 AI_GATEWAY_REGISTRY=
 
 AGENT_GATEWAY_TAG=23-06-2025
@@ -84,17 +84,17 @@ TRM_REGISTRY=
 TR_TAG=26-06-2025
 TR_REGISTRY=
 
-BUILDER_TAG=26-06-2025-a
+BUILDER_TAG=02-07-2025
 BUILDER_REGISTRY=
 
 FLOW_RUNTIME_TAG=23-06-2025
 FLOW_RUMTIME_REGISTRY=
 
 
-AGENT_ANALYTICS_TAG=27-06-2025-v2
+AGENT_ANALYTICS_TAG=02-07-2025-v1
 AGENT_ANALYTICS_REGISTRY=
 
-JAEGER_PROXY_TAG=27-06-2025
+JAEGER_PROXY_TAG=01-07-2025
 JAEGER_PROXY_REGISTRY=
 
 SOCKET_HANDLER_TAG=29-05-2025

{ibm_watsonx_orchestrate-1.6.0 → ibm_watsonx_orchestrate-1.6.1}/src/ibm_watsonx_orchestrate/flow_builder/utils.py

@@ -166,7 +166,7 @@ def import_flow_support_tools():
 
     if not is_local_dev():
         # we can't import support tools into non-local environments yet
-        return
+        return []
 
     client = instantiate_client(TempusClient)