ibm-watsonx-orchestrate 1.9.0.dev0__py3-none-any.whl → 1.10.0__py3-none-any.whl

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/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/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):
@@ -72,6 +78,21 @@ class KnowledgeBaseController:
 
         knowledge_bases = parse_file(file=file)
         
+        if app_id:
+            connections_client = get_connections_client()
+            connection_id = None
+                
+            connections = connections_client.get_draft_by_app_id(app_id=app_id)
+            if not connections:
+                logger.error(f"No connection exists with the app-id '{app_id}'")
+                exit(1)
+
+            connection_id = connections.connection_id
+
+            for kb in knowledge_bases:
+                if kb.conversational_search_tool and kb.conversational_search_tool.index_config and len(kb.conversational_search_tool.index_config) > 0:
+                    kb.conversational_search_tool.index_config[0].connection_id = connection_id
+        
         existing_knowledge_bases = client.get_by_names([kb.name for kb in knowledge_bases])
         
         for kb in knowledge_bases:
@@ -86,32 +107,32 @@ 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)}.")
                     
-                    
-                    if app_id:
-                        connections_client = get_connections_client()
-                        connection_id = None
-                        if app_id is not None:
-                            connections = connections_client.get_draft_by_app_id(app_id=app_id)
-                            if not connections:
-                                logger.error(f"No connection exists with the app-id '{app_id}'")
-                                exit(1)
-
-                            connection_id = connections.connection_id
-                            kb.conversational_search_tool.index_config[0].connection_id = connection_id
+                    if (kb.conversational_search_tool.index_config[0].milvus or \
+                        kb.conversational_search_tool.index_config[0].elastic_search) and \
+                            not kb.conversational_search_tool.index_config[0].connection_id:
+                        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:
@@ -144,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...')
@@ -155,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")
 

ibm_watsonx_orchestrate/cli/commands/server/server_command.py

@@ -332,7 +332,6 @@ def write_merged_env_file(merged_env: dict, target_path: str = None) -> Path:
             file.write(f"{key}={val}\n")
     return Path(file.name)
 
-
 def get_dbtag_from_architecture(merged_env_dict: dict) -> str:
     """Detects system architecture and returns the corresponding DBTAG."""
     arch = platform.machine()
@@ -370,9 +369,14 @@ def get_persisted_user_env() -> dict | None:
     user_env = cfg.get(USER_ENV_CACHE_HEADER) if cfg.get(USER_ENV_CACHE_HEADER) else None
     return user_env
 
-def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False, experimental_with_ibm_telemetry=False, with_doc_processing=False) -> None:
-    
-    
+def run_compose_lite(
+        final_env_file: Path, 
+        experimental_with_langfuse=False, 
+        experimental_with_ibm_telemetry=False, 
+        with_doc_processing=False,
+        with_voice=False,
+        experimental_with_langflow=False,
+    ) -> None:
     compose_path = get_compose_file()
 
     compose_command = ensure_docker_compose_installed()
@@ -400,7 +404,11 @@ def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False, exp
     logger.info("Database container started successfully. Now starting other services...")
 
 
-    # Step 2: Start all remaining services (except DB)
+    # Step 2: Create Langflow DB (if enabled)
+    if experimental_with_langflow:
+        create_langflow_db()
+
+    # Step 3: Start all remaining services (except DB)
     profiles = []
     if experimental_with_langfuse:
         profiles.append("langfuse")
@@ -408,6 +416,10 @@ def run_compose_lite(final_env_file: Path, experimental_with_langfuse=False, exp
         profiles.append("ibm-telemetry")
     if with_doc_processing:
         profiles.append("docproc")
+    if with_voice:
+        profiles.append("voice")
+    if experimental_with_langflow:
+        profiles.append("langflow")
 
     command = compose_command[:]
     for profile in profiles:
@@ -659,7 +671,6 @@ def run_compose_lite_down(final_env_file: Path, is_reset: bool = False) -> None:
         )
         sys.exit(1)
 
-
 def run_compose_lite_logs(final_env_file: Path, is_reset: bool = False) -> None:
     compose_path = get_compose_file()
     compose_command = ensure_docker_compose_installed()
@@ -855,6 +866,17 @@ def server_start(
         '--compose-file', '-f',
         help='Provide the path to a custom docker-compose file to use instead of the default compose file'
     ),  
+    with_voice: bool = typer.Option(
+        False,
+        '--with-voice', '-v',
+        help='Enable voice controller to interact with the chat via voice channels'
+    ),
+    experimental_with_langflow: bool = typer.Option(
+        False,
+        '--experimental-with-langflow',
+        help='(Experimental) Enable Langflow UI, available at http://localhost:7861',
+        hidden=True
+    ),
 ):
     confirm_accepts_license_agreement(accept_terms_and_conditions)
 
@@ -896,6 +918,10 @@ def server_start(
     if experimental_with_ibm_telemetry:
         merged_env_dict['USE_IBM_TELEMETRY'] = 'true'
 
+    if experimental_with_langflow:
+        merged_env_dict['LANGFLOW_ENABLED'] = 'true'
+    
+
     try:
         dev_edition_source = get_dev_edition_source(merged_env_dict)
         docker_login_by_dev_edition_source(merged_env_dict, dev_edition_source)
@@ -908,7 +934,9 @@ def server_start(
     run_compose_lite(final_env_file=final_env_file,
                      experimental_with_langfuse=experimental_with_langfuse,
                      experimental_with_ibm_telemetry=experimental_with_ibm_telemetry,
-                     with_doc_processing=with_doc_processing)
+                     with_doc_processing=with_doc_processing,
+                     with_voice=with_voice,
+                     experimental_with_langflow=experimental_with_langflow)
     
     run_db_migration()
 
@@ -938,6 +966,8 @@ def server_start(
         logger.info(f"You can access the observability platform Langfuse at http://localhost:3010, username: orchestrate@ibm.com, password: orchestrate")
     if with_doc_processing:
         logger.info(f"Document processing in Flows (Public Preview) has been enabled.")
+    if experimental_with_langflow:
+        logger.info("Langflow has been enabled, the Langflow UI is available at http://localhost:7861")
 
 @server_app.command(name="stop")
 def server_stop(
@@ -1018,15 +1048,11 @@ def run_db_migration() -> None:
     merged_env_dict['ROUTING_LLM_API_KEY'] = ''
     merged_env_dict['ASSISTANT_LLM_API_KEY'] = ''
     final_env_file = write_merged_env_file(merged_env_dict)
+    
 
-    command = compose_command + [
-        "-f", str(compose_path),
-        "--env-file", str(final_env_file),
-        "exec",
-        "wxo-server-db",
-        "bash",
-        "-c",
-        '''
+    pg_user = merged_env_dict.get("POSTGRES_USER","postgres")
+
+    migration_command = f'''
         APPLIED_MIGRATIONS_FILE="/var/lib/postgresql/applied_migrations/applied_migrations.txt"
         touch "$APPLIED_MIGRATIONS_FILE"
 
@@ -1037,7 +1063,7 @@ def run_db_migration() -> None:
                 echo "Skipping already applied migration: $filename"
             else
                 echo "Applying migration: $filename"
-                if psql -U postgres -d postgres -q -f "$file" > /dev/null 2>&1; then
+                if psql -U {pg_user} -d postgres -q -f "$file" > /dev/null 2>&1; then
                     echo "$filename" >> "$APPLIED_MIGRATIONS_FILE"
                 else
                     echo "Error applying $filename. Stopping migrations."
@@ -1046,6 +1072,15 @@ def run_db_migration() -> None:
             fi
         done
         '''
+
+    command = compose_command + [
+        "-f", str(compose_path),
+        "--env-file", str(final_env_file),
+        "exec",
+        "wxo-server-db",
+        "bash",
+        "-c",
+        migration_command
     ]
 
     logger.info("Running Database Migration...")
@@ -1060,6 +1095,65 @@ def run_db_migration() -> None:
         )
         sys.exit(1)
 
+def create_langflow_db() -> None:
+    compose_path = get_compose_file()
+    compose_command = ensure_docker_compose_installed()
+    default_env_path = get_default_env_file()
+    merged_env_dict = merge_env(default_env_path, user_env_path=None)
+    merged_env_dict['WATSONX_SPACE_ID']='X'
+    merged_env_dict['WATSONX_APIKEY']='X'
+    merged_env_dict['WXAI_API_KEY'] = ''
+    merged_env_dict['ASSISTANT_EMBEDDINGS_API_KEY'] = ''
+    merged_env_dict['ASSISTANT_LLM_SPACE_ID'] = ''
+    merged_env_dict['ROUTING_LLM_SPACE_ID'] = ''
+    merged_env_dict['USE_SAAS_ML_TOOLS_RUNTIME'] = ''
+    merged_env_dict['BAM_API_KEY'] = ''
+    merged_env_dict['ASSISTANT_EMBEDDINGS_SPACE_ID'] = ''
+    merged_env_dict['ROUTING_LLM_API_KEY'] = ''
+    merged_env_dict['ASSISTANT_LLM_API_KEY'] = ''
+    final_env_file = write_merged_env_file(merged_env_dict)
+
+    pg_timeout = merged_env_dict.get('POSTGRES_READY_TIMEOUT','10')
+
+    pg_user = merged_env_dict.get("POSTGRES_USER","postgres")
+
+    creation_command = f"""
+    echo 'Waiting for pg to initialize...'
+
+    timeout={pg_timeout}
+    while [[ -z `pg_isready | grep 'accepting connections'` ]] && (( timeout > 0 )); do
+      ((timeout-=1)) && sleep 1;
+    done
+
+    if psql -U {pg_user} -lqt | cut -d \\| -f 1 | grep -qw langflow; then
+        echo 'Existing Langflow DB found'
+    else
+        echo 'Creating Langflow DB'
+        createdb -U "{pg_user}" -O "{pg_user}" langflow;
+        psql -U {pg_user} -q -d postgres -c "GRANT CONNECT ON DATABASE langflow TO {pg_user}";
+    fi
+    """
+    command = compose_command + [
+        "-f", str(compose_path),
+        "--env-file", str(final_env_file),
+        "exec",
+        "wxo-server-db",
+        "bash",
+        "-c",
+        creation_command
+    ]
+
+    logger.info("Preparing Langflow resources...")
+    result = subprocess.run(command, capture_output=False)
+
+    if result.returncode == 0:
+        logger.info("Langflow resources sucessfully created")
+    else:
+        error_message = result.stderr.decode('utf-8') if result.stderr else "Error occurred."
+        logger.error(
+            f"Failed to create Langflow resources\n{error_message}"
+        )
+        sys.exit(1)
 
 def bump_file_iteration(filename: str) -> str:
     regex = re.compile(f"^(?P<name>[^\\(\\s\\.\\)]+)(\\((?P<num>\\d+)\\))?(?P<type>\\.(?:{'|'.join(_EXPORT_FILE_TYPES)}))?$")

ibm_watsonx_orchestrate/cli/commands/toolkit/toolkit_command.py

@@ -1,7 +1,7 @@
 import typer
 from typing import List
 from typing_extensions import Annotated, Optional
-from ibm_watsonx_orchestrate.agent_builder.toolkits.types import ToolkitKind, Language
+from ibm_watsonx_orchestrate.agent_builder.toolkits.types import ToolkitKind, Language, ToolkitTransportKind
 from ibm_watsonx_orchestrate.cli.commands.toolkit.toolkit_controller import ToolkitController
 import logging
 import sys
@@ -45,6 +45,14 @@ def import_toolkit(
                 "The first argument will be used as the executable, the rest as its arguments."
         ),
     ] = None,
+    url: Annotated[
+        Optional[str],
+        typer.Option("--url", "-u", help="The URL of the remote MCP server", hidden=True),
+    ] = None,
+    transport: Annotated[
+        ToolkitTransportKind,
+        typer.Option("--transport", help="The communication protocol to use for the remote MCP server. Only \"sse\" or \"streamable_http\" supported", hidden=True),
+    ] = None,
     tools: Annotated[
         Optional[str],
         typer.Option("--tools", "-t", help="Comma-separated list of tools to import. Or you can use \"*\" to use all tools"),
@@ -64,18 +72,41 @@ def import_toolkit(
     else:
         tool_list = None
 
-    if not package and not package_root and not command:
-        logger.error("You must provide either '--package', '--package-root' or '--command'.")
-        sys.exit(1)
+    if not url and not transport:
+        if not package and not package_root and not command:
+            logger.error("You must provide either '--package', '--package-root' or '--command'.")
+            sys.exit(1)
 
-    if package_root and not command:
-        logger.error("Error: '--command' flag must be provided when '--package-root' is specified.")
-        sys.exit(1)
-    
-    if package_root and package:
-        logger.error("Please choose either '--package-root' or '--package' but not both.")
+        if package_root and not command:
+            logger.error("Error: '--command' flag must be provided when '--package-root' is specified.")
+            sys.exit(1)
+        
+        if package_root and package:
+            logger.error("Please choose either '--package-root' or '--package' but not both.")
+            sys.exit(1)
+
+    if (url and not transport) or (transport and not url):
+        logger.error("Both '--url' and '--transport' must be provided together for remote MCP.")
         sys.exit(1)
 
+    if url and transport:
+        forbidden_local_opts = []
+        if package:
+            forbidden_local_opts.append("--package")
+        if package_root:
+            forbidden_local_opts.append("--package-root")
+        if language:
+            forbidden_local_opts.append("--language")
+        if command:
+            forbidden_local_opts.append("--command")
+        
+        if forbidden_local_opts:
+            logger.error(
+                f"When using '--url' and '--transport' for a remote MCP, you cannot specify: "
+                f"{', '.join(forbidden_local_opts)}"
+            )
+            sys.exit(1)
+
     if package and not package_root:
         if not command:
             if language == Language.NODE:
@@ -97,6 +128,8 @@ def import_toolkit(
     package_root=package_root,
     language=language,
     command=command,
+    url=url,
+    transport=transport
 )
     toolkit_controller.import_toolkit(tools=tool_list, app_id=app_id)