agentstack-cli 0.5.2rc3__py3-none-any.whl → 0.6.0rc1__py3-none-any.whl

agentstack_cli/__init__.py

@@ -10,11 +10,13 @@ import typer
 
 import agentstack_cli.commands.agent
 import agentstack_cli.commands.build
+import agentstack_cli.commands.connector
 import agentstack_cli.commands.model
 import agentstack_cli.commands.platform
 import agentstack_cli.commands.self
 import agentstack_cli.commands.server
-import agentstack_cli.commands.user
+
+# import agentstack_cli.commands.user
 from agentstack_cli.async_typer import AsyncTyper
 from agentstack_cli.configuration import Configuration
 
@@ -43,6 +45,7 @@ Usage: agentstack [OPTIONS] COMMAND [ARGS]...
 ╰────────────────────────────────────────────────────────────────────────────╯
 
 ╭─ Platform & Configuration ─────────────────────────────────────────────────╮
+| connector       Manage connectors to external services                     │
 │ model           Configure 15+ LLM providers [Admin only]                   │
 │ platform        Start, stop, or delete local platform [Local only]         │
 │ server          Connect to remote Agent Stack servers                      │
@@ -82,6 +85,12 @@ app.add_typer(
     no_args_is_help=True,
     help="Manage agents. Some commands are [Admin only].",
 )
+app.add_typer(
+    agentstack_cli.commands.connector.app,
+    name="connector",
+    no_args_is_help=True,
+    help="Manage connectors to external services.",
+)
 app.add_typer(
     agentstack_cli.commands.platform.app,
     name="platform",
@@ -102,12 +111,13 @@ app.add_typer(
     help="Manage Agent Stack installation.",
     hidden=True,
 )
-app.add_typer(
-    agentstack_cli.commands.user.app,
-    name="user",
-    no_args_is_help=True,
-    help="Manage users. [Admin only]",
-)
+# TODO: Implement keycloak integration
+# app.add_typer(
+#     agentstack_cli.commands.user.app,
+#     name="user",
+#     no_args_is_help=True,
+#     help="Manage users. [Admin only]",
+# )
 
 
 agent_alias = deepcopy(agentstack_cli.commands.agent.app)

agentstack_cli/auth_manager.py

@@ -80,6 +80,7 @@ class AuthManager:
         """
         This method exchanges a refresh token for a new access token.
         """
+
         async with httpx.AsyncClient(headers={"Accept": "application/json"}) as client:
             resp = None
             try:
@@ -107,8 +108,8 @@ class AuthManager:
                         "refresh_token": token.refresh_token,
                         "scope": token.scope,
                         "client_id": client_id,
-                        "client_secret": client_secret,
-                    },
+                    }
+                    | ({"client_secret": client_secret} if client_secret else {}),
                 )
                 resp.raise_for_status()
                 new_token = resp.json()

agentstack_cli/commands/connector.py

@@ -0,0 +1,301 @@
+# Copyright 2025 © BeeAI a Series of LF Projects, LLC
+# SPDX-License-Identifier: Apache-2.0
+import asyncio
+import typing
+
+import pydantic
+import typer
+from agentstack_sdk.platform.connector import Connector, ConnectorState
+from agentstack_sdk.platform.types import Metadata
+from InquirerPy import inquirer
+from InquirerPy.base.control import Choice
+
+from agentstack_cli import configuration
+from agentstack_cli.async_typer import AsyncTyper
+from agentstack_cli.configuration import Configuration
+from agentstack_cli.console import console
+from agentstack_cli.utils import (
+    announce_server_action,
+    confirm_server_action,
+)
+
+app = AsyncTyper()
+config = Configuration()
+
+
+@app.command("create")
+async def create_connector(
+    url: typing.Annotated[str, typer.Argument(help="Agent location (public docker image or github url)")],
+    client_id: typing.Annotated[
+        str | None,
+        typer.Option("--client-id", help="Client ID for authentication, acquired from env if not supplied"),
+    ] = None,
+    client_secret: typing.Annotated[
+        str | None,
+        typer.Option("--client-secret", help="Client secret for authentication, acquired from env if not supplied"),
+    ] = None,
+    metadata: typing.Annotated[str | None, typer.Option("--metadata", help="Metadata as JSON string")] = None,
+    match_preset: typing.Annotated[
+        bool, typer.Option("--match-preset", help="Use preset configuration for given url if it exists")
+    ] = True,
+) -> None:
+    """Create a connector to an external service."""
+    async with configuration.use_platform_client():
+        connector = await Connector.create(
+            url,
+            client_id=client_id if client_id else config.client_id,
+            client_secret=client_secret if client_secret else config.client_secret,
+            metadata=pydantic.TypeAdapter(Metadata).validate_json(metadata if metadata else "{}"),
+            match_preset=match_preset,
+        )
+        console.success(
+            f"Created connector for URL [blue]{connector.url}[/blue] with id: [green]{connector.id}[/green]\n"
+            f"Connector status: [yellow]{connector.state}[/yellow]"
+        )
+
+
+def search_path_match_connectors(search_path: str, connectors: list[Connector]) -> list[Connector]:
+    return [
+        c for c in connectors if (search_path in str(c.id) or search_path.lower() in c.url.unicode_string().lower())
+    ]
+
+
+async def select_connectors_multi(
+    search_path: str, connectors: list[Connector], operation_name: str = "remove"
+) -> list[Connector]:
+    """Select multiple connectors matching the search path."""
+    connector_candidates = search_path_match_connectors(search_path, connectors)
+    if not connector_candidates:
+        raise ValueError(f"No matching connectors found for '{search_path}'")
+
+    if len(connector_candidates) == 1:
+        return connector_candidates
+
+    # Multiple matches - show selection menu
+    choices = [Choice(value=c, name=f"{c.url} - {c.id} ({c.state})") for c in connector_candidates]
+
+    selected_connectors = await inquirer.checkbox(  # pyright: ignore[reportPrivateImportUsage]
+        message=f"Select connectors to {operation_name} (use ↑/↓ to navigate, Space to select):", choices=choices
+    ).execute_async()
+
+    return selected_connectors or []
+
+
+@app.command("remove | rm | delete")
+async def remove_connector(
+    search_path: typing.Annotated[
+        str, typer.Argument(help="Short ID or connector url, supports partial matching")
+    ] = "",
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
+    all: typing.Annotated[bool, typer.Option("--all", "-a", help="Remove all connectors without selection.")] = False,
+) -> None:
+    """Remove connectors."""
+
+    async def _delete_and_wait_for_completion(connector: Connector) -> None:
+        await connector.delete()
+        await connector.wait_for_deletion()
+
+    if search_path and all:
+        console.error(
+            "[red]Cannot specify both --all and a search path. Use --all to remove all connectors, or provide a search path for specific connectors.[/red]"
+        )
+        raise typer.Exit(1)
+
+    async with configuration.use_platform_client():
+        connectors_list = await Connector.list()
+        connectors = connectors_list.items
+        if len(connectors) == 0:
+            console.info("[yellow]No connectors found.[/yellow]")
+            return
+
+        if all:
+            selected_connectors = connectors
+        else:
+            selected_connectors = await select_connectors_multi(search_path, connectors, operation_name="remove")
+
+        if not selected_connectors:
+            console.info("[yellow]No connectors selected, exiting.[/yellow]")
+            return
+        else:
+            connector_names = "\n".join([f"  - {c.url} - {c.id}" for c in selected_connectors])
+
+        message = f"\n[bold]Selected connectors to remove:[/bold]\n{connector_names}\n from "
+
+        url = announce_server_action(message)
+        await confirm_server_action("Proceed with removing these connectors from", url=url, yes=yes)
+
+        with console.status("Removing connector(s)...", spinner="dots"):
+            delete_tasks = [_delete_and_wait_for_completion(connector) for connector in selected_connectors]
+            results = await asyncio.gather(*delete_tasks, return_exceptions=True)
+
+        # Check results for exceptions
+        successful_deletions = []
+        for connector, result in zip(selected_connectors, results, strict=True):
+            if isinstance(result, Exception):
+                console.error(f"[red]Failed to delete {connector.url}:[/red] {result}")
+            else:
+                successful_deletions.append(connector)
+
+        # Wait for successful deletions to complete
+        for connector in successful_deletions:
+            console.success(f"[green]Successfully deleted connector {connector.url}[/green]")
+
+
+@app.command("list")
+async def list_connectors() -> None:
+    """List all connectors."""
+    async with configuration.use_platform_client():
+        connectors = await Connector.list()
+        message = f"Found [green]{connectors.total_count}[/green] connectors"
+        if connectors.total_count > 0:
+            message += ":"
+        for item in connectors.items:
+            message += f"\n- {item.id}: {item.url} ({item.state})"
+
+    console.success(message)
+
+
+@app.command("list-presets")
+async def list_connector_presets() -> None:
+    """List connector presets."""
+    async with configuration.use_platform_client():
+        presets = await Connector.presets()
+        message = f"Found [green]{presets.total_count}[/green] connector presets:"
+        for item in presets.items:
+            message += f"\n- {item}"
+
+    console.success(message)
+
+
+def find_matching_connector(search_path: str, connectors: list[Connector]) -> Connector:
+    connector_candidates = search_path_match_connectors(search_path, connectors)
+    if len(connector_candidates) != 1:
+        message = f"Found {len(connector_candidates)} matching connectors"
+        connector_list = [f"  - {c.url} - {c.id} ({c.state})" for c in connector_candidates]
+        connectors_detail = ":\n" + "\n".join(connector_list) if connector_list else ""
+        raise ValueError(message + connectors_detail)
+    [selected_connector] = connector_candidates
+    return selected_connector
+
+
+async def select_connector(search_path: str) -> Connector | None:
+    connectors_list = await Connector.list()
+    connectors = connectors_list.items
+    if connectors_list.total_count == 0:
+        console.info("[yellow]No connectors found.[/yellow]")
+        return
+
+    try:
+        selected_connector = find_matching_connector(search_path, connectors)
+        return selected_connector
+    except ValueError as e:
+        console.error(e.__str__())
+        console.hint("Please refine your input to match exactly one connector id or url.")
+        raise typer.Exit(code=1) from None
+
+
+@app.command("get")
+async def get_connector(
+    search_path: typing.Annotated[str, typer.Argument(help="Short ID or connector url, supports partial matching")],
+) -> None:
+    """Get connector details."""
+    async with configuration.use_platform_client():
+        selected_connector = await select_connector(search_path)
+        if not selected_connector:
+            return
+
+        connector = await Connector.get(selected_connector.id)
+        connector_data = connector.model_dump()
+        message = "Connector details:"
+        for key, value in connector_data.items():
+            if key in ["auth_request"]:
+                continue  # Skip auth_request details
+            message += f"\n- {key}: {value}"
+
+    console.success(message)
+
+
+@app.command("connect")
+async def connect(
+    search_path: typing.Annotated[str, typer.Argument(help="Short ID or connector url, supports partial matching")],
+) -> None:
+    """Connect a connector (e.g., start OAuth flow)."""
+    async with configuration.use_platform_client():
+        selected_connector = await select_connector(search_path)
+        if not selected_connector:
+            return
+
+        try:
+            with console.status("Connecting connector...", spinner="dots"):
+                connector = await selected_connector.connect()
+                connector = await connector.wait_for_state(state=ConnectorState.connected)
+
+            console.success(
+                f"[green]Connector connected successfully:[/green] {connector.url} (state: {connector.state})"
+            )
+        except Exception as e:
+            console.error(f"[red]Failed to connect connector:[/red] {e}")
+            raise typer.Exit(code=1) from None
+
+
+@app.command("disconnect")
+async def disconnect(
+    search_path: typing.Annotated[
+        str, typer.Argument(help="Short ID or connector url, supports partial matching")
+    ] = "",
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
+    all: typing.Annotated[
+        bool, typer.Option("--all", "-a", help="Deisconnect all connectors without selection.")
+    ] = False,
+) -> None:
+    """Disconnect one or more connectors."""
+
+    async def _discionnect_and_wait_for_completion(connector: Connector) -> None:
+        await connector.disconnect()
+        await connector.wait_for_state(state=ConnectorState.disconnected)
+
+    if search_path and all:
+        console.error(
+            "[red]Cannot specify both --all and a search path. Use --all to remove all connectors, or provide a search path for specific connectors.[/red]"
+        )
+        raise typer.Exit(1)
+
+    async with configuration.use_platform_client():
+        connectors_list = await Connector.list()
+        connectors = connectors_list.items
+        if len(connectors) == 0:
+            console.info("[yellow]No connectors found.[/yellow]")
+            return
+
+        if all:
+            selected_connectors = connectors
+        else:
+            selected_connectors = await select_connectors_multi(search_path, connectors, operation_name="disconnect")
+
+        if not selected_connectors:
+            console.info("[yellow]No connectors selected, exiting.[/yellow]")
+            return
+        else:
+            connector_names = "\n".join([f"  - {c.url} - {c.id}" for c in selected_connectors])
+
+        message = f"\n[bold]Selected connectors to disconnect:[/bold]\n{connector_names}\n from "
+
+        url = announce_server_action(message)
+        await confirm_server_action("Proceed with disconnecting these connectors from", url=url, yes=yes)
+
+        with console.status("Disconnecting connectors...", spinner="dots"):
+            disconnect_tasks = [_discionnect_and_wait_for_completion(connector) for connector in selected_connectors]
+            results = await asyncio.gather(*disconnect_tasks, return_exceptions=True)
+
+        # Check results for exceptions
+        successful_disconnections = []
+        for connector, result in zip(selected_connectors, results, strict=True):
+            if isinstance(result, Exception):
+                console.error(f"[red]Failed to disconnect {connector.url}:[/red] {result}")
+                console.hint("Check that the selected connector is currently connected.")
+            else:
+                successful_disconnections.append(connector)
+
+        # Wait for successful disconnections to complete
+        for connector in successful_disconnections:
+            console.success(f"[green]Successfully disconnected connector[/green] {connector.url}")

agentstack_cli/commands/platform/__init__.py

@@ -14,18 +14,20 @@ import typing
 
 import httpx
 import typer
-from agentstack_sdk.platform import Provider
 from tenacity import AsyncRetrying, retry_if_exception_type, stop_after_delay, wait_fixed
 
 from agentstack_cli.async_typer import AsyncTyper
 from agentstack_cli.commands.platform.base_driver import BaseDriver
 from agentstack_cli.commands.platform.lima_driver import LimaDriver
 from agentstack_cli.commands.platform.wsl_driver import WSLDriver
+from agentstack_cli.configuration import Configuration
 from agentstack_cli.console import console
 from agentstack_cli.utils import verbosity
 
 app = AsyncTyper()
 
+configuration = Configuration()
+
 
 @functools.cache
 def get_driver(vm_name: str = "agentstack") -> BaseDriver:
@@ -80,6 +82,9 @@ async def start(
     ] = None,
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
     verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
+    skip_pull: typing.Annotated[bool, typer.Option(hidden=True)] = False,
+    skip_restart_deployments: typing.Annotated[bool, typer.Option(hidden=True)] = False,
+    no_wait_for_platform: typing.Annotated[bool, typer.Option(hidden=True)] = False,
 ):
     import agentstack_cli.commands.server
 
@@ -98,23 +103,28 @@ async def start(
             values_file=values_file_path,
             import_images=import_images,
             pull_on_host=pull_on_host,
+            skip_pull=skip_pull,
+            skip_restart_deployments=skip_restart_deployments,
         )
 
-        with console.status("Waiting for Agent Stack platform to be ready...", spinner="dots"):
-            timeout = datetime.timedelta(minutes=20)
-            try:
-                async for attempt in AsyncRetrying(
-                    stop=stop_after_delay(timeout),
-                    wait=wait_fixed(datetime.timedelta(seconds=1)),
-                    retry=retry_if_exception_type((httpx.HTTPError, ConnectionError)),
-                    reraise=True,
-                ):
-                    with attempt:
-                        await Provider.list()
-            except Exception as ex:
-                raise ConnectionError(
-                    f"Server did not start in {timeout}. Please check your internet connection."
-                ) from ex
+        if not no_wait_for_platform:
+            with console.status("Waiting for Agent Stack platform to be ready...", spinner="dots"):
+                timeout = datetime.timedelta(minutes=20)
+                async with httpx.AsyncClient() as client:
+                    try:
+                        async for attempt in AsyncRetrying(
+                            stop=stop_after_delay(timeout),
+                            wait=wait_fixed(datetime.timedelta(seconds=1)),
+                            retry=retry_if_exception_type((httpx.HTTPError, ConnectionError)),
+                            reraise=True,
+                        ):
+                            with attempt:
+                                resp = await client.get("http://localhost:8333/healthcheck")
+                                resp.raise_for_status()
+                    except Exception as ex:
+                        raise ConnectionError(
+                            f"Server did not start in {timeout}. Please check your internet connection."
+                        ) from ex
 
         console.success("Agent Stack platform started successfully!")
 

agentstack_cli/commands/platform/base_driver.py

@@ -13,9 +13,8 @@ import anyio
 import yaml
 from tenacity import AsyncRetrying, stop_after_attempt
 
-import agentstack_cli.commands.platform.istio
 from agentstack_cli.configuration import Configuration
-from agentstack_cli.utils import run_command
+from agentstack_cli.utils import merge, run_command
 
 
 class BaseDriver(abc.ABC):
@@ -106,24 +105,33 @@ class BaseDriver(abc.ABC):
         values_file: pathlib.Path | None = None,
         import_images: list[str] | None = None,
         pull_on_host: bool = False,
+        skip_pull: bool = False,
+        skip_restart_deployments: bool = False,
     ) -> None:
-        await self.run_in_vm(
+        _ = await self.run_in_vm(
             ["sh", "-c", "mkdir -p /tmp/agentstack && cat >/tmp/agentstack/chart.tgz"],
             "Preparing Helm chart",
             input=(importlib.resources.files("agentstack_cli") / "data" / "helm-chart.tgz").read_bytes(),
         )
         values = {
             **{svc: {"service": {"type": "LoadBalancer"}} for svc in ["collector", "docling", "ui", "phoenix"]},
-            "hostNetwork": True,
+            "service": {"type": "LoadBalancer"},
             "externalRegistries": {"public_github": str(Configuration().agent_registry)},
             "encryptionKey": "Ovx8qImylfooq4-HNwOzKKDcXLZCB3c_m0JlB9eJBxc=",
+            "trustProxyHeaders": True,
+            "keycloak": {
+                "uiClientSecret": "agentstack-ui-secret",
+                "serverClientSecret": "agentstack-server-secret",
+                "service": {"type": "LoadBalancer"},
+                "auth": {"adminPassword": "admin"},
+            },
             "features": {"uiLocalSetup": True},
             "providerBuilds": {"enabled": True},
             "localDockerRegistry": {"enabled": True},
             "auth": {"enabled": False},
         }
         if values_file:
-            values.update(yaml.safe_load(values_file.read_text()))
+            values = merge(values, yaml.safe_load(values_file.read_text()))
         await self.run_in_vm(
             ["sh", "-c", "cat >/tmp/agentstack/values.yaml"],
             "Preparing Helm values",
@@ -150,29 +158,29 @@ class BaseDriver(abc.ABC):
         images_to_import = {canonify(tag) for tag in import_images or []}
         images_to_pull = required_images - images_to_import
 
-        if pull_on_host:
-            for image in images_to_pull:
-                await run_command(["docker", "pull", image], f"Pulling image {image} on host")
-            images_to_import = required_images
-            images_to_pull = set[str]()
+        if not skip_pull:
+            if pull_on_host:
+                for image in images_to_pull:
+                    await run_command(["docker", "pull", image], f"Pulling image {image} on host")
+                images_to_import = required_images
+                images_to_pull = set[str]()
 
-        if images_to_import:
-            await self.import_images(*images_to_import)
+            if images_to_import:
+                await self.import_images(*images_to_import)
 
-        for image in images_to_pull:
-            async for attempt in AsyncRetrying(stop=stop_after_attempt(5)):
-                with attempt:
-                    attempt_num = attempt.retry_state.attempt_number
-                    await self.run_in_vm(
-                        ["k3s", "ctr", "image", "pull", image],
-                        f"Pulling image {image}" + (f" (attempt {attempt_num})" if attempt_num > 1 else ""),
-                    )
+            for image in images_to_pull:
+                async for attempt in AsyncRetrying(stop=stop_after_attempt(5)):
+                    with attempt:
+                        attempt_num = attempt.retry_state.attempt_number
+                        await self.run_in_vm(
+                            ["k3s", "ctr", "image", "pull", image],
+                            f"Pulling image {image}" + (f" (attempt {attempt_num})" if attempt_num > 1 else ""),
+                        )
+        elif images_to_import:
+            await self.import_images(*images_to_import)
 
         self.loaded_images = required_images
 
-        if any("auth.oidc.enabled=true" in value.lower() for value in set_values_list):
-            await agentstack_cli.commands.platform.istio.install(driver=self)
-
         kubeconfig_path = anyio.Path(Configuration().lima_home) / self.vm_name / "copied-from-guest" / "kubeconfig.yaml"
         await kubeconfig_path.parent.mkdir(parents=True, exist_ok=True)
         await kubeconfig_path.write_text(
@@ -202,7 +210,7 @@ class BaseDriver(abc.ABC):
             "Deploying Agent Stack platform with Helm",
         )
 
-        if import_images:
+        if import_images and not skip_restart_deployments:
             await self.run_in_vm(
                 ["k3s", "kubectl", "rollout", "restart", "deployment"],
                 "Restarting deployments to load imported images",

agentstack_cli/commands/platform/wsl_driver.py

@@ -132,6 +132,8 @@ class WSLDriver(BaseDriver):
         values_file: pathlib.Path | None = None,
         import_images: list[str] | None = None,
         pull_on_host: bool = False,
+        skip_pull: bool = False,
+        skip_restart_deployments: bool = False,
     ) -> None:
         if pull_on_host:
             raise NotImplementedError("Pulling on host is not supported on this platform.")

agentstack_cli/commands/server.py

@@ -198,10 +198,13 @@ async def server_login(server: typing.Annotated[str | None, typer.Argument()] =
                         console.warning(f" Dynamic client registration failed. Proceed with manual input.  {e!s}")
 
             if not client_id:
-                client_id = await inquirer.text(  #  type: ignore
-                    message="Enter Client ID:",
-                    instruction=f"(Redirect URI: {REDIRECT_URI})",
-                ).execute_async()
+                client_id = (
+                    await inquirer.text(  #  type: ignore
+                        message="Enter Client ID (default agentstack-cli):",
+                        instruction=f"(Redirect URI: {REDIRECT_URI})",
+                    ).execute_async()
+                    or "agentstack-cli"
+                )
                 if not client_id:
                     raise RuntimeError("Client ID is mandatory. Action cancelled.")
                 client_secret = (

agentstack_cli/commands/user.py

@@ -43,21 +43,18 @@ async def list_users(
         Column("Email"),
         Column("Role"),
         Column("Created"),
-        Column("Role Updated"),
         no_wrap=True,
     ) as table:
         for user in items:
             role_display = ROLE_DISPLAY.get(user.role, user.role)
 
             created_at = _format_date(user.created_at)
-            role_updated_at = _format_date(user.role_updated_at) if user.role_updated_at else "-"
 
             table.add_row(
                 user.id,
                 user.email,
                 role_display,
                 created_at,
-                role_updated_at,
             )
 
     console.print()

agentstack_cli/configuration.py

@@ -35,7 +35,8 @@ class Configuration(pydantic_settings.BaseSettings):
     agent_registry: pydantic.AnyUrl = HttpUrl(
         f"https://github.com/i-am-bee/agentstack@v{version()}#path=agent-registry.yaml"
     )
-    admin_password: SecretStr | None = None
+    username: str = "admin"
+    password: SecretStr | None = None
     server_metadata_ttl: int = 86400
 
     oidc_enabled: bool = False
@@ -64,7 +65,7 @@ class Configuration(pydantic_settings.BaseSettings):
             )
             sys.exit(1)
         async with use_platform_client(
-            auth=("admin", self.admin_password.get_secret_value()) if self.admin_password else None,
+            auth=(self.username, self.password.get_secret_value()) if self.password else None,
             auth_token=await self.auth_manager.load_auth_token(),
             base_url=self.auth_manager.active_server + "/",
         ) as client:

agentstack_cli/utils.py

@@ -8,7 +8,8 @@ import os
 import re
 import subprocess
 import sys
-from collections.abc import AsyncIterator
+from collections import Counter
+from collections.abc import AsyncIterator, Mapping, MutableMapping
 from contextlib import asynccontextmanager
 from contextvars import ContextVar
 from copy import deepcopy
@@ -340,3 +341,49 @@ def is_github_url(url: str) -> bool:
         $
     """
     return bool(re.match(pattern, url, re.VERBOSE))
+
+
+# Inspired by: https://github.com/clarketm/mergedeep/blob/master/mergedeep/mergedeep.py
+
+
+def _is_recursive_merge(a: Any, b: Any) -> bool:
+    both_mapping = isinstance(a, Mapping) and isinstance(b, Mapping)
+    both_counter = isinstance(a, Counter) and isinstance(b, Counter)
+    return both_mapping and not both_counter
+
+
+def _handle_merge_replace(destination, source, key):
+    if isinstance(destination[key], Counter) and isinstance(source[key], Counter):
+        # Merge both destination and source `Counter` as if they were a standard dict.
+        _deepmerge(destination[key], source[key])
+    else:
+        # If a key exists in both objects and the values are `different`, the value from the `source` object will be used.
+        destination[key] = deepcopy(source[key])
+
+
+def _deepmerge(dst, src):
+    for key in src:
+        if key in dst:
+            if _is_recursive_merge(dst[key], src[key]):
+                # If the key for both `dst` and `src` are both Mapping types (e.g. dict), then recurse.
+                _deepmerge(dst[key], src[key])
+            elif dst[key] is src[key]:
+                # If a key exists in both objects and the values are `same`, the value from the `dst` object will be used.
+                pass
+            else:
+                _handle_merge_replace(dst, src, key)
+        else:
+            # If the key exists only in `src`, the value from the `src` object will be used.
+            dst[key] = deepcopy(src[key])
+    return dst
+
+
+def merge(destination: MutableMapping[str, Any], *sources: Mapping[str, Any]) -> MutableMapping[str, Any]:
+    """
+    A deep merge function for 🐍.
+
+    :param destination: The destination mapping.
+    :param sources: The source mappings.
+    :return:
+    """
+    return functools.reduce(_deepmerge, sources, destination)

{agentstack_cli-0.5.2rc3.dist-info → agentstack_cli-0.6.0rc1.dist-info}/METADATA

@@ -1,9 +1,9 @@
 Metadata-Version: 2.3
 Name: agentstack-cli
-Version: 0.5.2rc3
+Version: 0.6.0rc1
 Summary: Agent Stack CLI
 Author: IBM Corp.
-Requires-Dist: agentstack-sdk==0.5.2rc3
+Requires-Dist: agentstack-sdk==0.6.0rc1
 Requires-Dist: a2a-sdk==0.3.21
 Requires-Dist: annotated-doc==0.0.4
 Requires-Dist: annotated-types==0.7.0

agentstack_cli-0.6.0rc1.dist-info/RECORD

@@ -0,0 +1,25 @@
+agentstack_cli/__init__.py,sha256=VML7VgV0JvGJ4xDnQ-zPulWQKXZWe56Qd19Hp7moq-8,7019
+agentstack_cli/api.py,sha256=3bjdlSp2vaEWv94Aa5z_s0nW1euFP_etQ2bWZ4G7Gdg,5619
+agentstack_cli/async_typer.py,sha256=mTc1B6fMd4EAT60nj5KuJMuIKEfRGRbPHMFo_7fcVt0,4354
+agentstack_cli/auth_manager.py,sha256=kr4tIVGW-fUROU3oJT1l2B1bb1spRbL4iiSrh7u4ZIo,10076
+agentstack_cli/configuration.py,sha256=Na0lkoLw2RlfORb3x8QwHRfU8V3plPHlJF5NTTRj4mk,2734
+agentstack_cli/console.py,sha256=x7YdbrUtc6gnFMViI8gEVLjF2ns7EKNybanW3h8Q1qU,710
+agentstack_cli/utils.py,sha256=Cevvx7SAb-f07g_sfz8EXZoGnhodaLVUR20Tc4WHr0s,14187
+agentstack_cli/commands/__init__.py,sha256=jr8otByt8HFY9OWptuWdpq4WHE7A1srCSRXZV066FrI,94
+agentstack_cli/commands/agent.py,sha256=6wSPKvM3SYpJRkMpjl8iwpGaWCqtbRA8y-YaHVi_QZE,57685
+agentstack_cli/commands/build.py,sha256=7oRwd_2-vpUnKHvwykPHqqMBMyHGCZ99lIRdg1yDPVE,9002
+agentstack_cli/commands/connector.py,sha256=GnY0MeHnA53PlIti-iIibsIw6caOXyTgs8DVo1LZX6M,12497
+agentstack_cli/commands/model.py,sha256=9htp0J03u4Pg9qroxWAT-RF5ADPMpm264nzIhg13tso,30695
+agentstack_cli/commands/self.py,sha256=1zX9Qu0ma146LUiHWrNOXXIj32i44Cvi9O030PiGCXg,9363
+agentstack_cli/commands/server.py,sha256=IXjCWEKPqnwqQNVvEwBOFITEJ79WpcW1RSBp32sd88s,12157
+agentstack_cli/commands/user.py,sha256=6Hr_UIybDMJgM4QN73zM4J6mP_4BZnW_C2Neu0f2yPE,2893
+agentstack_cli/commands/platform/__init__.py,sha256=rzWgMds-aDA2wCxw3lEG4KywDpW1Wrb6AgLY8zYtM8M,8970
+agentstack_cli/commands/platform/base_driver.py,sha256=oyfqCjL5xsD9gzZ9QhF3U7MPF9RECDplg0CRIFUwjt8,7725
+agentstack_cli/commands/platform/lima_driver.py,sha256=a30flm1EEbsCPbzMugGHjShnljqS1kBu9aspJDY3SgY,11020
+agentstack_cli/commands/platform/wsl_driver.py,sha256=wbQaf9wyuVsXJfqTKddbcgB3KeRSZrO-kwSMi7DUyxE,9422
+agentstack_cli/data/.gitignore,sha256=W0urBl_DVtzJyKHGXo53wMVzMPJseiK9RMn46No6i70,14
+agentstack_cli/data/helm-chart.tgz,sha256=od7mjrLX7pa0pE6FBlHbdcdrIDNY1vhT2po9UW9IfOs,316477
+agentstack_cli-0.6.0rc1.dist-info/METADATA,sha256=_nGoPQUw9g7ezoNYHn62EDXc3GbyKx1141cZLcy0eTg,3766
+agentstack_cli-0.6.0rc1.dist-info/WHEEL,sha256=M6du7VZflc4UPsGphmOXHANdgk8zessdJG0DBUuoA-U,78
+agentstack_cli-0.6.0rc1.dist-info/entry_points.txt,sha256=g3RAenJ90a0mLfx8x-ETzsr3uEdFnvuhTX3Amy1AUbA,87
+agentstack_cli-0.6.0rc1.dist-info/RECORD,,

agentstack_cli/commands/platform/istio.py

@@ -1,186 +0,0 @@
-# Copyright 2025 © BeeAI a Series of LF Projects, LLC
-# SPDX-License-Identifier: Apache-2.0
-
-import typing
-
-import yaml
-
-if typing.TYPE_CHECKING:
-    from agentstack_cli.commands.platform.base_driver import BaseDriver
-
-
-async def install(driver: "BaseDriver"):
-    # Gateway API
-    await driver.run_in_vm(
-        [
-            "k3s",
-            "kubectl",
-            "apply",
-            "-f",
-            "https://github.com/kubernetes-sigs/gateway-api/releases/download/v1.3.0/standard-install.yaml",
-        ],
-        "Installing gateway CRDs",
-    )
-
-    # Cert Manager
-    await driver.run_in_vm(
-        [
-            "helm",
-            "--kubeconfig=/etc/rancher/k3s/k3s.yaml",
-            "install",
-            "cert-manager",
-            "oci://quay.io/jetstack/charts/cert-manager",
-            "--version",
-            "v1.18.2",
-            "--namespace",
-            "cert-manager",
-            "--create-namespace",
-            "--set",
-            "crds.enabled=true",
-            "--wait",
-        ],
-        "Installing cert-manager",
-    )
-
-    # Istio
-    await driver.run_in_vm(
-        ["helm", "repo", "add", "istio", "https://istio-release.storage.googleapis.com/charts"],
-        "Adding Istio repo to Helm",
-    )
-    await driver.run_in_vm(["helm", "repo", "update"], "Updating Helm repos")
-    for component in ["base", "istiod", "cni", "ztunnel"]:
-        await driver.run_in_vm(
-            [
-                "helm",
-                "--kubeconfig=/etc/rancher/k3s/k3s.yaml",
-                "install",
-                f"istio-{component}",
-                f"istio/{component}",
-                "--namespace",
-                "istio-system",
-                "--create-namespace",
-                "--set=profile=ambient",
-                "--set=global.platform=k3s",
-                "--wait",
-            ],
-            f"Installing Istio ({component})",
-        )
-    await driver.run_in_vm(
-        ["k3s", "kubectl", "label", "namespace", "default", "istio.io/dataplane-mode=ambient"],
-        "Labeling the default namespace",
-    )
-
-    # Configuration
-    Resource = typing.TypedDict(
-        "Resource", {"apiVersion": str, "kind": str, "metadata": dict[str, str], "spec": dict[str, typing.Any]}
-    )
-    resources: list[Resource] = [
-        {
-            "apiVersion": "cert-manager.io/v1",
-            "kind": "Issuer",
-            "metadata": {"name": "default-issuer", "namespace": "default"},
-            "spec": {"selfSigned": {}},
-        },
-        {
-            "apiVersion": "cert-manager.io/v1",
-            "kind": "Issuer",
-            "metadata": {"name": "istio-system-issuer", "namespace": "istio-system"},
-            "spec": {"selfSigned": {}},
-        },
-        {
-            "apiVersion": "cert-manager.io/v1",
-            "kind": "Certificate",
-            "metadata": {"name": "agentstack-tls", "namespace": "istio-system"},
-            "spec": {
-                "secretName": "agentstack-tls",
-                "commonName": "agentstack",
-                "dnsNames": ["agentstack", "agentstack.localhost"],
-                "issuerRef": {"name": "istio-system-issuer", "kind": "Issuer"},
-            },
-        },
-        {
-            "apiVersion": "cert-manager.io/v1",
-            "kind": "Certificate",
-            "metadata": {"name": "ingestion-svc", "namespace": "default"},
-            "spec": {
-                "secretName": "ingestion-svc-tls",
-                "commonName": "ingestion-svc",
-                "dnsNames": [
-                    "ingestion-svc",
-                    "ingestion-svc.default",
-                    "ingestion-svc.default.svc",
-                    "ingestion-svc.default.svc.cluster.local",
-                ],
-                "issuerRef": {"name": "default-issuer", "kind": "Issuer"},
-            },
-        },
-        {
-            "apiVersion": "gateway.networking.k8s.io/v1",
-            "kind": "Gateway",
-            "metadata": {"name": "agentstack-gateway", "namespace": "istio-system"},
-            "spec": {
-                "gatewayClassName": "istio",
-                "listeners": [
-                    {
-                        "name": "https",
-                        "hostname": "agentstack.localhost",
-                        "port": 8336,
-                        "protocol": "HTTPS",
-                        "tls": {"mode": "Terminate", "certificateRefs": [{"name": "agentstack-tls"}]},
-                        "allowedRoutes": {"namespaces": {"from": "All"}},
-                    }
-                ],
-            },
-        },
-        {
-            "apiVersion": "gateway.networking.k8s.io/v1",
-            "kind": "HTTPRoute",
-            "metadata": {"name": "agentstack-ui"},
-            "spec": {
-                "parentRefs": [{"name": "agentstack-gateway", "namespace": "istio-system"}],
-                "hostnames": ["agentstack.testing", "agentstack.localhost"],
-                "rules": [
-                    {
-                        "matches": [{"path": {"type": "PathPrefix", "value": "/"}}],
-                        "backendRefs": [{"name": "agentstack-ui-svc", "port": 8334}],
-                    }
-                ],
-            },
-        },
-    ]
-    for resource in resources:
-        await driver.run_in_vm(
-            ["k3s", "kubectl", "apply", "-f", "-"],
-            f"Applying {resource['metadata']['name']} ({resource['kind']})",
-            input=yaml.dump(resource, sort_keys=False).encode("utf-8"),
-        )
-
-    # Extra services
-    for addon in ["prometheus", "kiali"]:
-        await driver.run_in_vm(
-            [
-                "k3s",
-                "kubectl",
-                "apply",
-                "-f",
-                f"https://raw.githubusercontent.com/istio/istio/master/samples/addons/{addon}.yaml",
-            ],
-            f"Installing {addon.capitalize()}",
-        )
-    await driver.run_in_vm(
-        [
-            "k3s",
-            "kubectl",
-            "-n",
-            "istio-system",
-            "expose",
-            "deployment",
-            "kiali",
-            "--protocol=TCP",
-            "--port=20001",
-            "--target-port=20001",
-            "--type=LoadBalancer",
-            "--name=kiali-external",
-        ],
-        "Exposing Kiali service",
-    )

agentstack_cli-0.5.2rc3.dist-info/RECORD

@@ -1,25 +0,0 @@
-agentstack_cli/__init__.py,sha256=S5dAiaVo6QG_iir2KqVizsoHLKbNikjgRZ38CrxTM4s,6683
-agentstack_cli/api.py,sha256=3bjdlSp2vaEWv94Aa5z_s0nW1euFP_etQ2bWZ4G7Gdg,5619
-agentstack_cli/async_typer.py,sha256=mTc1B6fMd4EAT60nj5KuJMuIKEfRGRbPHMFo_7fcVt0,4354
-agentstack_cli/auth_manager.py,sha256=NIZPmyxh1iUkTnz60Ds8kJUhXelEC_iVGCCpo4BLKDo,10049
-agentstack_cli/configuration.py,sha256=8HClHaXZFA9Ri7xWvb4Fq6sufjVcBCVjLK2WR3y3lJI,2718
-agentstack_cli/console.py,sha256=x7YdbrUtc6gnFMViI8gEVLjF2ns7EKNybanW3h8Q1qU,710
-agentstack_cli/utils.py,sha256=_ka8dEdj1o7Am-hhKJTQvqfZzNIJSUfnHV7KyLnRefY,12326
-agentstack_cli/commands/__init__.py,sha256=jr8otByt8HFY9OWptuWdpq4WHE7A1srCSRXZV066FrI,94
-agentstack_cli/commands/agent.py,sha256=6wSPKvM3SYpJRkMpjl8iwpGaWCqtbRA8y-YaHVi_QZE,57685
-agentstack_cli/commands/build.py,sha256=7oRwd_2-vpUnKHvwykPHqqMBMyHGCZ99lIRdg1yDPVE,9002
-agentstack_cli/commands/model.py,sha256=9htp0J03u4Pg9qroxWAT-RF5ADPMpm264nzIhg13tso,30695
-agentstack_cli/commands/self.py,sha256=1zX9Qu0ma146LUiHWrNOXXIj32i44Cvi9O030PiGCXg,9363
-agentstack_cli/commands/server.py,sha256=VYGOEJDxFEF1BS2sbFWIDLQNtYVJDJHY287zCEaqrtY,12040
-agentstack_cli/commands/user.py,sha256=9eAwExLlW906BdhVynTGkw4NLpPg-Is9OzZbY38-7_8,3056
-agentstack_cli/commands/platform/__init__.py,sha256=p-jRVPZnsn6b0C521FTkK-fo3YW1189h-vYnoVIxd8I,8281
-agentstack_cli/commands/platform/base_driver.py,sha256=Qe2NV3DOH73DufS89qaHYSJbkO0Qeagaz7wbmAxUOWY,7306
-agentstack_cli/commands/platform/istio.py,sha256=RefHzR4G2Cl6mdHC37TTSXXc0kFFmNjXuKcIPIhFSZ0,6247
-agentstack_cli/commands/platform/lima_driver.py,sha256=a30flm1EEbsCPbzMugGHjShnljqS1kBu9aspJDY3SgY,11020
-agentstack_cli/commands/platform/wsl_driver.py,sha256=PaJju3sz6Go6AJ9Wu7tfiulvO3nX8Wym3csTRSv-vQk,9341
-agentstack_cli/data/.gitignore,sha256=W0urBl_DVtzJyKHGXo53wMVzMPJseiK9RMn46No6i70,14
-agentstack_cli/data/helm-chart.tgz,sha256=Z-ggF7FkG-kWSOwRslw4PRFySQJqrRAkSwmgQposAcI,306640
-agentstack_cli-0.5.2rc3.dist-info/METADATA,sha256=-t-7tlNhqQ-ZTX8UykvgUFQdy6K7BirW9IJvpf36F0s,3766
-agentstack_cli-0.5.2rc3.dist-info/WHEEL,sha256=M6du7VZflc4UPsGphmOXHANdgk8zessdJG0DBUuoA-U,78
-agentstack_cli-0.5.2rc3.dist-info/entry_points.txt,sha256=g3RAenJ90a0mLfx8x-ETzsr3uEdFnvuhTX3Amy1AUbA,87
-agentstack_cli-0.5.2rc3.dist-info/RECORD,,