ibm-watsonx-orchestrate 1.10.0b0__tar.gz → 1.10.0b1__tar.gz

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/PKG-INFO

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

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

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

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/agent_builder/connections/__init__.py

@@ -18,7 +18,7 @@ from .types import (
     OAuth2AuthCodeCredentials,
     OAuth2ClientCredentials,
     # OAuth2ImplicitCredentials,
-    # OAuth2PasswordCredentials,
+    OAuth2PasswordCredentials,
     OAuthOnBehalfOfCredentials,
     KeyValueConnectionCredentials,
     CONNECTION_KIND_SCHEME_MAPPING,

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/agent_builder/connections/connections.py

@@ -37,7 +37,7 @@ connection_type_security_schema_map = {
     ConnectionType.OAUTH2_CLIENT_CREDS: ConnectionSecurityScheme.OAUTH2,
     ConnectionType.OAUTH_ON_BEHALF_OF_FLOW: ConnectionSecurityScheme.OAUTH2,
     # ConnectionType.OAUTH2_IMPLICIT: ConnectionSecurityScheme.OAUTH2,
-    # ConnectionType.OAUTH2_PASSWORD: ConnectionSecurityScheme.OAUTH2
+    ConnectionType.OAUTH2_PASSWORD: ConnectionSecurityScheme.OAUTH2
 }
 
 def _clean_env_vars(vars: dict[str:str], requirements: List[str], app_id: str) -> dict[str,str]:

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/agent_builder/connections/types.py

@@ -8,7 +8,7 @@ class ConnectionKind(str, Enum):
     api_key = 'api_key'
     oauth_auth_code_flow = 'oauth_auth_code_flow'
     # oauth_auth_implicit_flow = 'oauth_auth_implicit_flow'
-    # oauth_auth_password_flow = 'oauth_auth_password_flow'
+    oauth_auth_password_flow = 'oauth_auth_password_flow'
     oauth_auth_client_credentials_flow = 'oauth_auth_client_credentials_flow'
     oauth_auth_on_behalf_of_flow = 'oauth_auth_on_behalf_of_flow'
     key_value = 'key_value'
@@ -34,7 +34,7 @@ class ConnectionPreference(str, Enum):
 class ConnectionAuthType(str, Enum):
     OAUTH2_AUTH_CODE = 'oauth2_auth_code'
     # OAUTH2_IMPLICIT = 'oauth2_implicit'
-    # OAUTH2_PASSWORD = 'oauth2_password'
+    OAUTH2_PASSWORD = 'oauth2_password'
     OAUTH2_CLIENT_CREDS = 'oauth2_client_creds'
     OAUTH_ON_BEHALF_OF_FLOW = 'oauth_on_behalf_of_flow'
 
@@ -65,7 +65,7 @@ class ConnectionType(str, Enum):
     API_KEY_AUTH = ConnectionSecurityScheme.API_KEY_AUTH.value
     OAUTH2_AUTH_CODE = ConnectionAuthType.OAUTH2_AUTH_CODE.value
     # OAUTH2_IMPLICIT = ConnectionAuthType.OAUTH2_IMPLICIT.value
-    # OAUTH2_PASSWORD = ConnectionAuthType.OAUTH2_PASSWORD.value
+    OAUTH2_PASSWORD = ConnectionAuthType.OAUTH2_PASSWORD.value
     OAUTH2_CLIENT_CREDS = ConnectionAuthType.OAUTH2_CLIENT_CREDS.value
     OAUTH_ON_BEHALF_OF_FLOW = ConnectionAuthType.OAUTH_ON_BEHALF_OF_FLOW.value
     KEY_VALUE = ConnectionSecurityScheme.KEY_VALUE.value
@@ -90,7 +90,7 @@ OAUTH_CONNECTION_TYPES = {
     ConnectionType.OAUTH2_AUTH_CODE,
     ConnectionType.OAUTH2_CLIENT_CREDS,
     # ConnectionType.OAUTH2_IMPLICIT,
-    # ConnectionType.OAUTH2_PASSWORD,
+    ConnectionType.OAUTH2_PASSWORD,
     ConnectionType.OAUTH_ON_BEHALF_OF_FLOW,
 }
 
@@ -193,11 +193,15 @@ class OAuth2AuthCodeCredentials(BaseModel):
 #     client_id: str
 #     authorization_url: str
 
-# class OAuth2PasswordCredentials(BaseModel):
-#     client_id: str
-#     client_secret: str
-#     token_url: str
-#     authorization_url: str
+class OAuth2PasswordCredentials(BaseModel):
+    username: str
+    password: str
+    client_id: str
+    client_secret: str
+    token_url: str
+    scope: Optional[str] = None
+    grant_type: str = "password"
+    
 
 class OAuth2ClientCredentials(BaseModel):
     client_id: str
@@ -226,7 +230,7 @@ CREDENTIALS_SET = Union[
     APIKeyAuthCredentials,
     OAuth2AuthCodeCredentials,
     # OAuth2ImplicitCredentials,
-    # OAuth2PasswordCredentials,
+    OAuth2PasswordCredentials,
     OAuth2ClientCredentials,
     OAuthOnBehalfOfCredentials,
     KeyValueConnectionCredentials
@@ -240,7 +244,7 @@ CONNECTION_KIND_SCHEME_MAPPING = {
     ConnectionKind.api_key: ConnectionSecurityScheme.API_KEY_AUTH,
     ConnectionKind.oauth_auth_code_flow: ConnectionSecurityScheme.OAUTH2,
     # ConnectionKind.oauth_auth_implicit_flow: ConnectionSecurityScheme.OAUTH2,
-    # ConnectionKind.oauth_auth_password_flow: ConnectionSecurityScheme.OAUTH2,
+    ConnectionKind.oauth_auth_password_flow: ConnectionSecurityScheme.OAUTH2,
     ConnectionKind.oauth_auth_client_credentials_flow: ConnectionSecurityScheme.OAUTH2,
     ConnectionKind.oauth_auth_on_behalf_of_flow: ConnectionSecurityScheme.OAUTH2,
     ConnectionKind.key_value: ConnectionSecurityScheme.KEY_VALUE,
@@ -250,7 +254,7 @@ CONNECTION_KIND_SCHEME_MAPPING = {
 CONNECTION_KIND_OAUTH_TYPE_MAPPING = {
     ConnectionKind.oauth_auth_code_flow: ConnectionAuthType.OAUTH2_AUTH_CODE,
     # ConnectionKind.oauth_auth_implicit_flow: ConnectionAuthType.OAUTH2_IMPLICIT,
-    # ConnectionKind.oauth_auth_password_flow: ConnectionAuthType.OAUTH2_PASSWORD,
+    ConnectionKind.oauth_auth_password_flow: ConnectionAuthType.OAUTH2_PASSWORD,
     ConnectionKind.oauth_auth_client_credentials_flow: ConnectionAuthType.OAUTH2_CLIENT_CREDS,
     ConnectionKind.oauth_auth_on_behalf_of_flow: ConnectionAuthType.OAUTH_ON_BEHALF_OF_FLOW,
 }

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/agent_builder/knowledge_bases/types.py

@@ -11,6 +11,7 @@ class SpecVersion(str, Enum):
 class KnowledgeBaseKind(str, Enum):
     KNOWLEDGE_BASE = "knowledge_base"
 class RetrievalConfidenceThreshold(str, Enum):
+    Off = "Off"
     Lowest = "Lowest"
     Low = "Low"
     High = "High"
@@ -24,6 +25,7 @@ class GeneratedResponseLength(str, Enum):
 
 
 class ResponseConfidenceThreshold(str, Enum):
+    Off = "Off"
     Lowest = "Lowest"
     Low = "Low"
     High = "High"
@@ -86,6 +88,8 @@ class GenerationConfiguration(BaseModel):
     {
         "model_id": "meta-llama/llama-3-1-70b-instruct",
         "prompt_instruction": "When the documents are in different languages, you should respond in english.",
+        "max_docs_passed_to_llm": 10,
+        "retrieval_confidence_threshold": "Lowest",
         "generated_response_length": "Moderate",
         "display_text_no_results_found": "no docs found",
         "display_text_connectivity_issue": "conn failed",
@@ -95,6 +99,7 @@ class GenerationConfiguration(BaseModel):
 
     model_id: Optional[str] = None
     prompt_instruction: Optional[str] = None
+    max_docs_passed_to_llm: Optional[int] = None
     generated_response_length: Optional[GeneratedResponseLength] = None
     display_text_no_results_found: Optional[str] = None
     display_text_connectivity_issue: Optional[str] = None
@@ -134,12 +139,13 @@ class MilvusConnection(BaseModel):
     }
     """
     grpc_host: Optional[str] = None
+    grpc_port: Optional[str] = None
+    server_cert: Optional[str] = None
     database: Optional[str] = None
     collection: Optional[str] = None
     index: Optional[str] = None
     embedding_model_id: Optional[str] = None
     limit : Optional[int] = None
-    grpc_port: Optional[str] = None
     filter: Optional[str] = None
     field_mapping: Optional[FieldMapping] = None
 
@@ -197,12 +203,46 @@ class CustomSearchConnection(BaseModel):
     filter: Optional[str] = None
     metadata: Optional[dict] = None
 
+class AstraDBConnection(BaseModel):
+    """
+    example:
+    {
+        "api_endpoint": "https://xxx-us-east-2.apps.astra.datastax.com",
+        "key_space": "default_keyspace",
+        "collection": "search_wa_docs",
+        "embedding_model_id": "sentence-transformers/all-minilm-l12-v2",
+        "port": "443",
+        "filter": "productType: \"boots\"",
+        "limit": 5,
+        "field_mapping": {
+                        "title": "title",
+                        "body": "text",
+                        "url": "some-url"
+                    }
+    }
+    """
+    api_endpoint: str
+    port: Optional[str] = None
+    server_cert: Optional[str] = None
+    keyspace: Optional[str]
+    data_type: str
+    collection: Optional[str]
+    table: Optional[str]
+    index_column: Optional[str]
+    embedding_mode: str
+    embedding_model_id: Optional[str]
+    credentials: dict
+    search_mode: str
+    limit: Optional[int] = 5
+    filter: Optional[str] = None
+    field_mapping: Optional[FieldMapping] = None
+
 class IndexConnection(BaseModel):
     connection_id: Optional[str] = None
     milvus: Optional[MilvusConnection] = None
     elastic_search: Optional[ElasticSearchConnection] = None
     custom_search: Optional[CustomSearchConnection] = None
-
+    astradb: Optional[AstraDBConnection] = None
     
 class ConversationalSearchConfig(BaseModel):
     language: Optional[str] = None
@@ -218,6 +258,10 @@ class KnowledgeBaseBuiltInVectorIndexConfig(BaseModel):
     chunk_size: Optional[int] = None
     chunk_overlap: Optional[int] = None
     limit: Optional[int] = None
+
+class FileUpload(BaseModel):
+    path: str
+    url: Optional[str] = None
     
 class KnowledgeBaseSpec(BaseModel):
     """Schema for a complete knowledge-base."""
@@ -236,4 +280,4 @@ class KnowledgeBaseSpec(BaseModel):
     created_on: Optional[datetime] = None 
     updated_at: Optional[datetime] = None
     # For import/update
-    documents: list[str] = None
+    documents: list[str] | list[FileUpload] = None

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/agent_builder/toolkits/types.py

@@ -1,27 +1,36 @@
-from typing import List, Dict, Optional
+from typing import List, Dict, Optional, Union
 from enum import Enum
-from pydantic import BaseModel, model_validator
+from pydantic import BaseModel 
 
 class ToolkitKind(str, Enum):
     MCP = "mcp"
 
-class Language(str, Enum):
-    NODE = "node"
-    PYTHON ="python"
-
 class ToolkitSource(str, Enum):
     FILES = "files"
     PUBLIC_REGISTRY = "public-registry"
 
+class ToolkitTransportKind(str, Enum):
+    STREAMABLE_HTTP = "streamable_http"
+    SSE = "sse"
 
+class Language(str, Enum):
+    NODE = "node"
+    PYTHON ="python"
 
-class McpModel(BaseModel):
-    source: str
+class LocalMcpModel(BaseModel):
+    source: ToolkitSource
     command: str
     args: List[str]
     tools: List[str]
     connections: Dict[str, str]
 
+class RemoteMcpModel(BaseModel):
+    server_url: str
+    transport: ToolkitTransportKind
+    tools: List[str]
+    connections: Dict[str, str]
+
+McpModel = Union[LocalMcpModel, RemoteMcpModel]
 
 class ToolkitSpec(BaseModel):
     id: str
@@ -33,10 +42,4 @@ class ToolkitSpec(BaseModel):
     created_by: str
     created_by_username: str
     tools: List[str] | None
-    mcp: McpModel
-
-    @model_validator(mode='after')
-    def validate_tools_and_mcp(self) -> 'ToolkitSpec':
-        if self.mcp.source not in {"files", "public-registry"}:
-            raise ValueError("MCP source must be either 'files' or 'public-registry'.")
-        return self
+    mcp: McpModel

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

@@ -152,7 +152,7 @@ class ClientSideToolBinding(BaseModel):
 
 class McpToolBinding(BaseModel):
     server_url: Optional[str] = None
-    source: str
+    source: str | None
     connections: Dict[str, str] | None
 
 class FlowToolBinding(BaseModel):

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/cli/commands/connections/connections_command.py

@@ -160,7 +160,7 @@ def set_credentials_connection_command(
         typer.Option(
             '--username',
             '-u',
-            help='For basic auth, the username to login with'
+            help='For basic auth and oauth_auth_password_flow, the username to login with'
         )
     ] = None,
     password: Annotated[
@@ -168,7 +168,7 @@ def set_credentials_connection_command(
         typer.Option(
             '--password',
             '-p',
-            help='For basic auth, the password to login with'
+            help='For basic auth and oauth_auth_password_flow, the password to login with'
         )
     ] = None,
     token: Annotated[
@@ -191,14 +191,14 @@ def set_credentials_connection_command(
         typer.Option(
             '--client-id',
             # help='For oauth_auth_on_behalf_of_flow, oauth_auth_code_flow, oauth_auth_implicit_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the client_id to authenticate against the application token server'
-            help='For oauth_auth_on_behalf_of_flow and oauth_auth_client_credentials_flow, the client_id to authenticate against the application token server'
+            help='For oauth_auth_on_behalf_of_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the client_id to authenticate against the application token server'
         )
     ] = None,
     client_secret: Annotated[
         str,
         typer.Option(
             '--client-secret',
-            help='For oauth_auth_client_credentials_flow, the client_secret to authenticate with'
+            help='For oauth_auth_client_credentials_flow and oauth_auth_password_flow, the client_secret to authenticate with'
         )
     ] = None,
     send_via: Annotated[
@@ -213,7 +213,7 @@ def set_credentials_connection_command(
         typer.Option(
             '--token-url',
             # help='For oauth_auth_on_behalf_of_flow, oauth_auth_code_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the url of the application token server'
-            help='For oauth_auth_on_behalf_of_flow and oauth_auth_client_credentials_flow, the url of the application token server'
+            help='For oauth_auth_on_behalf_of_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the url of the application token server'
         )
     ] = None,
     auth_url: Annotated[
@@ -227,14 +227,14 @@ def set_credentials_connection_command(
         str,
         typer.Option(
             '--grant-type',
-            help='For oauth_auth_on_behalf_of_flow and oauth_auth_client_credentials_flow, the grant type used by the application token server'
+            help='For oauth_auth_on_behalf_of_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the grant type used by the application token server'
         )
     ] = None,
     scope: Annotated[
         str,
         typer.Option(
             '--scope',
-            help='For oauth_auth_code_flow and oauth_auth_client_credentials_flow, the optional scopes used by the application token server. Should be in the form of a space seperated string.'
+            help='For oauth_auth_code_flow, oauth_auth_password_flow and oauth_auth_client_credentials_flow, the optional scopes used by the application token server. Should be in the form of a space seperated string.'
         )
     ] = None,
     entries: Annotated[

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

@@ -19,15 +19,15 @@ from ibm_watsonx_orchestrate.agent_builder.connections.types import (
     BasicAuthCredentials,
     BearerTokenAuthCredentials,
     APIKeyAuthCredentials,
-    # OAuth2AuthCodeCredentials,
+    OAuth2AuthCodeCredentials,
     OAuth2ClientCredentials,
     # OAuth2ImplicitCredentials,
-    # OAuth2PasswordCredentials,
+    OAuth2PasswordCredentials,
     OAuthOnBehalfOfCredentials,
     KeyValueConnectionCredentials,
     CREDENTIALS,
     IdentityProviderCredentials,
-    OAUTH_CONNECTION_TYPES, OAuth2AuthCodeCredentials
+    OAUTH_CONNECTION_TYPES
 
 )
 
@@ -115,7 +115,7 @@ def _format_token_headers(header_list: List) -> dict:
 
 def _validate_connection_params(type: ConnectionType, **args) -> None:
 
-    if type == ConnectionType.BASIC_AUTH and (
+    if type in {ConnectionType.BASIC_AUTH, ConnectionType.OAUTH2_PASSWORD} and (
             args.get('username') is None or args.get('password') is None
     ):
         raise typer.BadParameter(
@@ -136,7 +136,7 @@ def _validate_connection_params(type: ConnectionType, **args) -> None:
             f"Missing flags --api-key is required for type {type}"
         )
 
-    if type in {ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE} and args.get('client_secret') is None:
+    if type in {ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE, ConnectionType.OAUTH2_PASSWORD} and args.get('client_secret') is None:
         raise typer.BadParameter(
             f"Missing flags --client-secret is required for type {type}"
         )
@@ -146,14 +146,14 @@ def _validate_connection_params(type: ConnectionType, **args) -> None:
             f"Missing flags --auth-url is required for type {type}"
         )
 
-    if type in {ConnectionType.OAUTH_ON_BEHALF_OF_FLOW, ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE} and (
+    if type in {ConnectionType.OAUTH_ON_BEHALF_OF_FLOW, ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE, ConnectionType.OAUTH2_PASSWORD} and (
             args.get('client_id') is None
     ):
         raise typer.BadParameter(
             f"Missing flags --client-id is required for type {type}"
         )
     
-    if type in {ConnectionType.OAUTH_ON_BEHALF_OF_FLOW, ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE} and (
+    if type in {ConnectionType.OAUTH_ON_BEHALF_OF_FLOW, ConnectionType.OAUTH2_CLIENT_CREDS, ConnectionType.OAUTH2_AUTH_CODE, ConnectionType.OAUTH2_PASSWORD} and (
             args.get('token_url') is None
     ):
         raise typer.BadParameter(
@@ -209,13 +209,11 @@ def _get_credentials(type: ConnectionType, **kwargs):
         #         authorization_url=kwargs.get("auth_url"),
         #         client_id=kwargs.get("client_id"),
         #     )
-        # case ConnectionType.OAUTH2_PASSWORD:
-        #     return OAuth2PasswordCredentials(
-        #         authorization_url=kwargs.get("auth_url"),
-        #         client_id=kwargs.get("client_id"),
-        #         client_secret=kwargs.get("client_secret"),
-        #         token_url=kwargs.get("token_url")
-        #     )
+        case ConnectionType.OAUTH2_PASSWORD:
+            keys = ["username", "password", "client_id","client_secret","token_url","grant_type", "scope"]
+            filtered_args = { key_name: kwargs[key_name] for key_name in keys if kwargs.get(key_name) }
+            return OAuth2PasswordCredentials(**filtered_args)
+        
         case ConnectionType.OAUTH_ON_BEHALF_OF_FLOW:
             return OAuthOnBehalfOfCredentials(
                 client_id=kwargs.get("client_id"),
@@ -283,25 +281,24 @@ def add_configuration(config: ConnectionConfiguration) -> None:
         logger.error(response_text)
         exit(1)
 
-def add_credentials(app_id: str, environment: ConnectionEnvironment, use_app_credentials: bool, credentials: CREDENTIALS) -> None:
+def add_credentials(app_id: str, environment: ConnectionEnvironment, use_app_credentials: bool, credentials: CREDENTIALS, payload: dict = None) -> None:
     client = get_connections_client()
     try:
         existing_credentials = client.get_credentials(app_id=app_id, env=environment, use_app_credentials=use_app_credentials)
-        if use_app_credentials:
-            payload = {
-                "app_credentials": credentials.model_dump(exclude_none=True)
-            }
-        else:
-            payload = {
-                "runtime_credentials": credentials.model_dump(exclude_none=True)
-            }
+        if not payload:
+            if use_app_credentials:
+                payload = {
+                    "app_credentials": credentials.model_dump(exclude_none=True)
+                }
+            else:
+                payload = {
+                    "runtime_credentials": credentials.model_dump(exclude_none=True)
+                }
         
-        logger.info(f"Setting credentials for environment '{environment}' on connection '{app_id}'")
         if existing_credentials:
             client.update_credentials(app_id=app_id, env=environment, use_app_credentials=use_app_credentials, payload=payload)
         else:
             client.create_credentials(app_id=app_id,env=environment, use_app_credentials=use_app_credentials, payload=payload)
-        logger.info(f"Credentials successfully set for '{environment}' environment of connection '{app_id}'")
     except requests.HTTPError as e:
         response = e.response
         response_text = response.text
@@ -489,7 +486,20 @@ def set_credentials_connection(
     _validate_connection_params(type=conn_type, **kwargs)
     credentials = _get_credentials(type=conn_type, **kwargs)
 
-    add_credentials(app_id=app_id, environment=environment, use_app_credentials=use_app_credentials, credentials=credentials)
+    # Special handling for oauth2 password flow as it sends both app_creds and runtime_creds
+    logger.info(f"Setting credentials for environment '{environment}' on connection '{app_id}'")
+    if conn_type == ConnectionType.OAUTH2_PASSWORD:
+        credentials_model = credentials.model_dump(exclude_none=True)
+        runtime_cred_keys = {"username", "password"}
+        app_creds = {"app_credentials": {k: credentials_model[k] for k in credentials_model if k not in runtime_cred_keys}}
+        runtime_creds = {"runtime_credentials": {k: credentials_model[k] for k in credentials_model if k in runtime_cred_keys}}
+
+        add_credentials(app_id=app_id, environment=environment, use_app_credentials=True, credentials=credentials, payload=app_creds)
+        add_credentials(app_id=app_id, environment=environment, use_app_credentials=False, credentials=credentials, payload=runtime_creds)
+    else:
+        add_credentials(app_id=app_id, environment=environment, use_app_credentials=use_app_credentials, credentials=credentials)
+    
+    logger.info(f"Credentials successfully set for '{environment}' environment of connection '{app_id}'")
 
 def set_identity_provider_connection(
     app_id: str,

{ibm_watsonx_orchestrate-1.10.0b0 → ibm_watsonx_orchestrate-1.10.0b1}/src/ibm_watsonx_orchestrate/cli/commands/knowledge_bases/knowledge_bases_controller.py

@@ -13,6 +13,7 @@ from ibm_watsonx_orchestrate.client.knowledge_bases.knowledge_base_client import
 from ibm_watsonx_orchestrate.client.base_api_client import ClientAPIException
 from ibm_watsonx_orchestrate.client.connections import get_connections_client
 from ibm_watsonx_orchestrate.client.utils import instantiate_client
+from ibm_watsonx_orchestrate.agent_builder.knowledge_bases.types import FileUpload
 
 logger = logging.getLogger(__name__)
 
@@ -43,7 +44,8 @@ def parse_file(file: str) -> List[KnowledgeBase]:
 def to_column_name(col: str):
     return " ".join([word.capitalize() if not word[0].isupper() else word for word in col.split("_")])
 
-def get_file_name(path: str):
+def get_file_name(file: str | FileUpload):
+    path = file.path if isinstance(file, FileUpload) else file
     # This name prettifying currently screws up file type detection on ingestion
     # return to_column_name(path.split("/")[-1].split(".")[0]) 
     return path.split("/")[-1]
@@ -55,7 +57,11 @@ def get_relative_file_path(path, dir):
         return f"{dir}{path.removeprefix('.')}"
     else:
         return f"{dir}/{path}"
-
+    
+def build_file_object(file_dir: str, file: str | FileUpload):
+    if isinstance(file, FileUpload):
+        return ('files', (get_file_name(file.path), open(get_relative_file_path(file.path, file_dir), 'rb')))
+    return ('files', (get_file_name(file), open(get_relative_file_path(file, file_dir), 'rb')))
 
 class KnowledgeBaseController:
     def __init__(self):
@@ -101,13 +107,19 @@ class KnowledgeBaseController:
 
                 kb.validate_documents_or_index_exists()
                 if kb.documents:
-                    files = [('files', (get_file_name(file_path), open(get_relative_file_path(file_path, file_dir), 'rb'))) for file_path in kb.documents]
+                    files = [build_file_object(file_dir, file) for file in kb.documents]
+                    file_urls = { get_file_name(file): file.url for file in kb.documents if isinstance(file, FileUpload) and file.url }
                     
                     kb.prioritize_built_in_index = True
                     payload = kb.model_dump(exclude_none=True);
                     payload.pop('documents');
 
-                    client.create_built_in(payload=payload, files=files)
+                    data = {
+                        'knowledge_base': json.dumps(payload),
+                        'file_urls': json.dumps(file_urls)
+                    }
+
+                    client.create_built_in(payload=data, files=files)
                 else:
                     if len(kb.conversational_search_tool.index_config) != 1:
                         raise ValueError(f"Must provide exactly one conversational_search_tool.index_config. Provided {len(kb.conversational_search_tool.index_config)}.")
@@ -118,7 +130,9 @@ class KnowledgeBaseController:
                         raise ValueError(f"Must provide credentials (via --app-id) when using milvus or elastic_search.")
 
                     kb.prioritize_built_in_index = False
-                    client.create(payload=kb.model_dump(exclude_none=True))
+                    data = { 'knowledge_base': json.dumps(kb.model_dump(exclude_none=True)) }
+
+                    client.create(payload=data)
                 
                 logger.info(f"Successfully imported knowledge base '{kb.name}'")
             except ClientAPIException as e:
@@ -151,8 +165,8 @@ class KnowledgeBaseController:
             existing_docs = [doc.get("metadata", {}).get("original_file_name", "") for doc in status.get("documents", [])]
             
             removed_docs = existing_docs[:]
-            for filepath in kb.documents:
-                filename = get_file_name(filepath)
+            for file in kb.documents:
+                filename = get_file_name(file)
 
                 if filename in existing_docs:
                     logger.warning(f'Document \"{filename}\" already exists in knowledge base. Updating...')
@@ -162,17 +176,25 @@ class KnowledgeBaseController:
                 logger.warning(f'Document \"{filename}\" removed from knowledge base.')
 
 
-            files = [('files', (get_file_name(file_path), open(get_relative_file_path(file_path, file_dir), 'rb'))) for file_path in kb.documents]
+            files = [build_file_object(file_dir, file) for file in kb.documents]
+            file_urls = { get_file_name(file): file.url for file in kb.documents if isinstance(file, FileUpload) and file.url }
             
             kb.prioritize_built_in_index = True
             payload = kb.model_dump(exclude_none=True);
             payload.pop('documents');
 
-            self.get_client().update_with_documents(knowledge_base_id, payload=payload, files=files)
+            data = {
+                'knowledge_base': json.dumps(payload),
+                'file_urls': json.dumps(file_urls)
+            }
+
+            self.get_client().update_with_documents(knowledge_base_id, payload=data, files=files)
         else:
             if kb.conversational_search_tool and kb.conversational_search_tool.index_config:
                 kb.prioritize_built_in_index = False
-            self.get_client().update(knowledge_base_id, kb.model_dump(exclude_none=True))
+
+            data = { 'knowledge_base': json.dumps(kb.model_dump(exclude_none=True)) }
+            self.get_client().update(knowledge_base_id, payload=data)
 
         logger.info(f"Knowledge base '{kb.name}' updated successfully")