agentstack-cli 0.4.2rc8__tar.gz → 0.4.2rc9__tar.gz

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agentstack-cli
-Version: 0.4.2rc8
+Version: 0.4.2rc9
 Summary: Agent Stack CLI
 Author: IBM Corp.
 Requires-Dist: anyio~=4.10.0

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentstack-cli"
-version = "0.4.2-rc8"
+version = "0.4.2-rc9"
 description = "Agent Stack CLI"
 readme = "README.md"
 authors = [{ name = "IBM Corp." }]

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/__init__.py

@@ -33,13 +33,14 @@ Usage: agentstack [OPTIONS] COMMAND [ARGS]...
 ╰────────────────────────────────────────────────────────────────────────────╯
 
 ╭─ Agent Management ─────────────────────────────────────────────────────────╮
-│ add                               Install an agent (Docker, GitHub, local) │
+│ add                               Install an agent (Docker, GitHub)        │
 │ remove                            Uninstall an agent                       │
+│ update                            Update an agent                          │
 │ info                              Show agent details                       │
 │ logs                              Stream agent execution logs              │
-│ build                             Build an agent container image           │
 │ env                               Manage agent environment variables       │
-│ server-side-build [EXPERIMENTAL]  Build agents remotely                    │
+│ build                             Build an agent remotely                  │
+│ client-side-build                 Build an agent container image locally   │
 ╰────────────────────────────────────────────────────────────────────────────╯
 
 ╭─ Platform & Configuration ─────────────────────────────────────────────────╮
@@ -92,7 +93,9 @@ app.add_typer(agent_alias, name="", no_args_is_help=True)
 
 
 @app.command("version")
-async def version(verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False):
+async def version(
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
+):
     """Print version of the Agent Stack CLI."""
     import agentstack_cli.commands.self
 

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/agent.py

@@ -61,7 +61,7 @@ from agentstack_sdk.a2a.extensions.common.form import (
     TextField,
     TextFieldValue,
 )
-from agentstack_sdk.platform import ModelProvider, Provider
+from agentstack_sdk.platform import BuildState, ModelProvider, Provider
 from agentstack_sdk.platform.context import Context, ContextPermissions, ContextToken, Permissions
 from agentstack_sdk.platform.model_provider import ModelCapability
 from InquirerPy import inquirer
@@ -73,7 +73,7 @@ from rich.console import ConsoleRenderable, Group, NewLine
 from rich.panel import Panel
 from rich.text import Text
 
-from agentstack_cli.commands.build import build
+from agentstack_cli.commands.build import _server_side_build
 from agentstack_cli.commands.model import ensure_llm_provider
 from agentstack_cli.configuration import Configuration
 
@@ -87,7 +87,6 @@ if sys.platform != "win32":
 from collections.abc import Callable
 from pathlib import Path
 from typing import Any
-from urllib.parse import urlparse
 
 import jsonschema
 import rich.json
@@ -101,11 +100,11 @@ from agentstack_cli.utils import (
     announce_server_action,
     confirm_server_action,
     generate_schema_example,
+    is_github_url,
     parse_env_var,
     print_log,
     prompt_user,
     remove_nullable,
-    run_command,
     status,
     verbosity,
 )
@@ -153,49 +152,67 @@ configuration = Configuration()
 
 @app.command("add")
 async def add_agent(
-    location: typing.Annotated[
-        str, typer.Argument(help="Agent location (public docker image, local path or github url)")
-    ],
+    location: typing.Annotated[str, typer.Argument(help="Agent location (public docker image or github url)")],
     dockerfile: typing.Annotated[str | None, typer.Option(help="Use custom dockerfile path")] = None,
-    vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
     yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ) -> None:
-    """Install discovered agent or add public docker image or github repository [aliases: install]"""
+    """Add a docker image or GitHub repository [aliases: install]"""
     url = announce_server_action(f"Installing agent '{location}' for")
     await confirm_server_action("Proceed with installing this agent on", url=url, yes=yes)
-    agent_card = None
     with verbosity(verbose):
-        if (
-            process := await run_command(
-                ["docker", "inspect", location], check=False, message="Inspecting docker images"
-            )
-        ).returncode == 0:
-            console.success(f"Found local image [bold]{location}[/bold]")
-            manifest = base64.b64decode(
-                json.loads(process.stdout)[0]["Config"]["Labels"]["beeai.dev.agent.json"]
-            ).decode()
-            agent_card = json.loads(manifest)
-        elif (
-            Path(location).expanduser().exists()
-            or location.startswith("git@")
-            or location.startswith("github.com/")
-            or location.startswith("www.github.com/")
-            or location.endswith(".git")
-            or ((u := urlparse(location)).scheme.startswith("http") and u.netloc.endswith("github.com"))
-            or u.scheme in {"ssh", "git", "git+ssh"}
-        ):
-            console.info(f"Assuming build context, attempting to build agent from [bold]{location}[/bold]")
-            location, agent_card = await build(location, dockerfile, tag=None, vm_name=vm_name, import_image=True)
+        if is_github_url(location):
+            console.info(f"Assuming GitHub repository, attempting to build agent from [bold]{location}[/bold]")
+            with status("Building agent"):
+                build = await _server_side_build(location, dockerfile, add=True, verbose=verbose)
+            if build.status != BuildState.COMPLETED:
+                error = build.error_message or "see logs above for details"
+                raise RuntimeError(f"Agent build failed: {error}")
         else:
-            console.info(f"Assuming public docker image, attempting to pull {location}")
+            if dockerfile:
+                raise ValueError("Dockerfile can be specified only if location is a GitHub url")
+            console.info(f"Assuming public docker image or network address, attempting to add {location}")
+            with status("Registering agent to platform"):
+                async with configuration.use_platform_client():
+                    await Provider.create(location=location)
+        console.success(f"Agent [bold]{location}[/bold] added to platform")
+        await list_agents()
 
-        with status("Registering agent to platform"):
-            async with configuration.use_platform_client():
-                await Provider.create(
-                    location=location,
-                    agent_card=AgentCard.model_validate(agent_card) if agent_card else None,
+
+@app.command("update")
+async def update_agent(
+    search_path: typing.Annotated[
+        str, typer.Argument(..., help="Short ID, agent name or part of the provider location of agent to replace")
+    ],
+    location: typing.Annotated[str, typer.Argument(help="Agent location (public docker image or github url)")],
+    dockerfile: typing.Annotated[str | None, typer.Option(help="Use custom dockerfile path")] = None,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
+    yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
+) -> None:
+    """Upgrade agent to a newer docker image or build from GitHub repository"""
+    with verbosity(verbose):
+        async with configuration.use_platform_client():
+            provider = select_provider(search_path, providers=await Provider.list())
+
+        url = announce_server_action(f"Upgrading agent from '{provider.source}' to {location}")
+        await confirm_server_action("Proceed with upgrading agent on", url=url, yes=yes)
+
+        if is_github_url(location):
+            console.info(f"Assuming GitHub repository, attempting to build agent from [bold]{location}[/bold]")
+            with status("Building agent"):
+                build = await _server_side_build(
+                    github_url=location, dockerfile=dockerfile, replace=provider.id, verbose=verbose
                 )
+            if build.status != BuildState.COMPLETED:
+                error = build.error_message or "see logs above for details"
+                raise RuntimeError(f"Agent build failed: {error}")
+        else:
+            if dockerfile:
+                raise ValueError("Dockerfile can be specified only if location is a GitHub url")
+            console.info(f"Assuming public docker image or network address, attempting to add {location}")
+            with status("Upgrading agent in the platform"):
+                async with configuration.use_platform_client():
+                    await provider.patch(location=location)
         console.success(f"Agent [bold]{location}[/bold] added to platform")
         await list_agents()
 
@@ -778,7 +795,7 @@ async def run_agent(
             metadata={"provider_id": provider.id, "agent_name": provider.agent_card.name},
         )
         context_token = await context.generate_token(
-            grant_global_permissions=Permissions(llm={"*"}, embeddings={"*"}, a2a_proxy={"*"}),
+            grant_global_permissions=Permissions(llm={"*"}, embeddings={"*"}, a2a_proxy={"*"}, providers={"read"}),
             grant_context_permissions=ContextPermissions(files={"*"}, vector_stores={"*"}, context_data={"*"}),
         )
 

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/build.py

@@ -8,6 +8,7 @@ import re
 import sys
 import typing
 import uuid
+from asyncio import CancelledError
 from contextlib import suppress
 from datetime import timedelta
 from pathlib import Path
@@ -17,13 +18,13 @@ import anyio.abc
 import typer
 from a2a.utils import AGENT_CARD_WELL_KNOWN_PATH
 from agentstack_sdk.platform import AddProvider, BuildConfiguration, Provider, UpdateProvider
-from agentstack_sdk.platform.provider_build import BuildState, ProviderBuild
+from agentstack_sdk.platform.provider_build import ProviderBuild
 from anyio import open_process
 from httpx import AsyncClient, HTTPError
 from tenacity import AsyncRetrying, retry_if_exception_type, stop_after_delay, wait_fixed
 
 from agentstack_cli.async_typer import AsyncTyper
-from agentstack_cli.console import console
+from agentstack_cli.console import console, err_console
 from agentstack_cli.utils import (
     announce_server_action,
     capture_output,
@@ -47,8 +48,8 @@ async def find_free_port():
 app = AsyncTyper()
 
 
-@app.command("build")
-async def build(
+@app.command("client-side-build")
+async def client_side_build(
     context: typing.Annotated[str, typer.Argument(help="Docker context for the agent")] = ".",
     dockerfile: typing.Annotated[str | None, typer.Option(help="Use custom dockerfile path")] = None,
     tag: typing.Annotated[str | None, typer.Option(help="Docker tag for the agent")] = None,
@@ -58,8 +59,9 @@ async def build(
         bool, typer.Option("--import/--no-import", is_flag=True, help="Import the image into Agent Stack platform")
     ] = True,
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
+    """Build agent locally using Docker."""
     with verbosity(verbose):
         await run_command(["which", "docker"], "Checking docker")
         image_id = "agentstack-agent-build-tmp:latest"
@@ -142,56 +144,67 @@ async def build(
         return tag, agent_card
 
 
-@app.command("server-side-build")
-async def server_side_build_experimental(
+async def _server_side_build(
+    github_url: str,
+    dockerfile: str | None = None,
+    replace: str | None = None,
+    add: bool = False,
+    verbose: bool = False,
+) -> ProviderBuild:
+    build = None
+    try:
+        from agentstack_cli.commands.agent import select_provider
+        from agentstack_cli.configuration import Configuration
+
+        if replace and add:
+            raise ValueError("Cannot specify both replace and add options.")
+
+        build_configuration = None
+        if dockerfile:
+            build_configuration = BuildConfiguration(dockerfile_path=Path(dockerfile))
+
+        async with Configuration().use_platform_client():
+            on_complete = None
+            if replace:
+                provider = select_provider(replace, await Provider.list())
+                on_complete = UpdateProvider(provider_id=uuid.UUID(provider.id))
+            elif add:
+                on_complete = AddProvider()
+
+            build = await ProviderBuild.create(
+                location=github_url,
+                on_complete=on_complete,
+                build_configuration=build_configuration,
+            )
+            with verbosity(verbose):
+                async for message in build.stream_logs():
+                    print_log(message, ansi_mode=True, out_console=err_console)
+            return await build.get()
+    except (KeyboardInterrupt, CancelledError):
+        if build:
+            await build.delete()
+        console.error("Build aborted.")
+        raise
+
+
+@app.command("build")
+async def server_side_build(
     github_url: typing.Annotated[
         str, typer.Argument(..., help="Github repository URL (public or private if supported by the platform instance)")
     ],
     dockerfile: typing.Annotated[
         str | None, typer.Option(help="Use custom dockerfile path, relative to github url sub-path")
     ] = None,
-    replace: typing.Annotated[
-        str | None, typer.Option(help="Short ID, agent name or part of the provider location")
-    ] = None,
-    add: typing.Annotated[bool, typer.Option(help="Add agent to the platform after build")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
     yes: typing.Annotated[bool, typer.Option("--yes", "-y", help="Skip confirmation prompts.")] = False,
 ):
-    """EXPERIMENTAL: Build agent from github repository in the platform."""
-    from agentstack_cli.commands.agent import select_provider
-    from agentstack_cli.configuration import Configuration
+    """Build agent from a GitHub repository in the platform."""
 
-    if replace and add:
-        raise ValueError("Cannot specify both replace and add options.")
-
-    build_configuration = None
-    if dockerfile:
-        build_configuration = BuildConfiguration(dockerfile_path=Path(dockerfile))
-
-    url = announce_server_action(f"Starting server-side build for '{github_url}' on")
+    url = announce_server_action(f"Starting build for '{github_url}' on")
     await confirm_server_action("Proceed with building this agent on", url=url, yes=yes)
 
-    async with Configuration().use_platform_client():
-        on_complete = None
-        if replace:
-            provider = select_provider(replace, await Provider.list())
-            on_complete = UpdateProvider(provider_id=uuid.UUID(provider.id))
-        elif add:
-            on_complete = AddProvider()
-
-        build = await ProviderBuild.create(
-            location=github_url,
-            on_complete=on_complete,
-            build_configuration=build_configuration,
-        )
-        async for message in build.stream_logs():
-            print_log(message, ansi_mode=True)
-        build = await build.get()
-        if build.status == BuildState.COMPLETED:
-            if add:
-                message = "Agent added successfully. List agents using [green]agentstack list[/green]"
-            else:
-                message = f"Agent built successfully, add it to the platform using: [green]agentstack add {build.destination}[/green]"
-            console.success(message)
-        else:
-            error = build.error_message or "see logs above for details"
-            console.error(f"Agent build failed: {error}")
+    build = await _server_side_build(github_url=github_url, dockerfile=dockerfile, verbose=verbose)
+
+    console.success(
+        f"Agent built successfully, add it to the platform using: [green]agentstack add {build.destination}[/green]"
+    )

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/model.py

@@ -413,7 +413,7 @@ async def _reset_configuration(existing_providers: list[ModelProvider] | None =
 @app.command("setup")
 async def setup(
     use_true_localhost: typing.Annotated[bool, typer.Option(hidden=True)] = False,
-    verbose: typing.Annotated[bool, typer.Option("-v")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Interactive setup for LLM and embedding provider environment variables"""
     announce_server_action("Configuring model providers for")

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/platform/__init__.py

@@ -72,7 +72,7 @@ async def start(
         pathlib.Path | None, typer.Option("-f", help="Set Helm chart values using yaml values file")
     ] = None,
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Start Agent Stack platform."""
     import agentstack_cli.commands.server
@@ -127,7 +127,7 @@ async def start(
 @app.command("stop")
 async def stop(
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Stop Agent Stack platform."""
     with verbosity(verbose):
@@ -142,7 +142,7 @@ async def stop(
 @app.command("delete")
 async def delete(
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Delete Agent Stack platform."""
     with verbosity(verbose):
@@ -155,7 +155,7 @@ async def delete(
 async def import_image_cmd(
     tag: typing.Annotated[str, typer.Argument(help="Docker image tag to import")],
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Import a local docker image into the Agent Stack platform."""
     with verbosity(verbose):
@@ -170,7 +170,7 @@ async def import_image_cmd(
 async def exec_cmd(
     command: typing.Annotated[list[str] | None, typer.Argument()] = None,
     vm_name: typing.Annotated[str, typer.Option(hidden=True)] = "agentstack",
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """For debugging -- execute a command inside the Agent Stack platform VM."""
     with verbosity(verbose, show_success_status=False):

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/platform/base_driver.py

@@ -117,6 +117,8 @@ class BaseDriver(abc.ABC):
                 "generateConversationTitle": False,  # TODO: enable when UI implementation is ready
                 "uiLocalSetup": True,
             },
+            "providerBuilds": {"enabled": True},
+            "localDockerRegistry": {"enabled": True},
             "auth": {"enabled": False},
         }
         if values_file:

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/commands/self.py

@@ -40,7 +40,9 @@ def _path() -> str:
 
 
 @app.command("version")
-async def version(verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False):
+async def version(
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
+):
     """Print version of the Agent Stack CLI."""
     with verbosity(verbose=verbose):
         cli_version = importlib.metadata.version("agentstack-cli")
@@ -78,7 +80,7 @@ async def version(verbose: typing.Annotated[bool, typer.Option("-v", help="Show
 
 @app.command("install")
 async def install(
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Install Agent Stack platform pre-requisites."""
     with verbosity(verbose=verbose):
@@ -171,7 +173,9 @@ async def install(
 
 
 @app.command("upgrade")
-async def upgrade(verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False):
+async def upgrade(
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
+):
     """Upgrade Agent Stack CLI and Platform to the latest version."""
     if not shutil.which("uv", path=_path()):
         console.error("Can't self-upgrade because 'uv' was not found.")
@@ -189,7 +193,7 @@ async def upgrade(verbose: typing.Annotated[bool, typer.Option("-v", help="Show
 
 @app.command("uninstall")
 async def uninstall(
-    verbose: typing.Annotated[bool, typer.Option("-v", help="Show verbose output")] = False,
+    verbose: typing.Annotated[bool, typer.Option("-v", "--verbose", help="Show verbose output")] = False,
 ):
     """Uninstall Agent Stack CLI and Platform."""
     if not shutil.which("uv", path=_path()):

{agentstack_cli-0.4.2rc8 → agentstack_cli-0.4.2rc9}/src/agentstack_cli/utils.py

@@ -5,6 +5,7 @@ import contextlib
 import functools
 import json
 import os
+import re
 import subprocess
 import sys
 from collections.abc import AsyncIterator
@@ -26,7 +27,7 @@ from jsf import JSF
 from prompt_toolkit import PromptSession
 from prompt_toolkit.shortcuts import CompleteStyle
 from pydantic import BaseModel
-from rich.console import Capture
+from rich.console import Capture, Console
 from rich.text import Text
 
 from agentstack_cli.configuration import Configuration
@@ -296,7 +297,7 @@ def verbosity(verbose: bool, show_success_status: bool = True):
         SHOW_SUCCESS_STATUS.reset(token_command_status)
 
 
-def print_log(line, ansi_mode=False):
+def print_log(line, ansi_mode=False, out_console: Console | None = None):
     if "error" in line:
 
         class CustomError(Exception): ...
@@ -309,6 +310,28 @@ def print_log(line, ansi_mode=False):
         return Text.from_ansi(text) if ansi_mode else text
 
     if line["stream"] == "stderr":
-        err_console.print(decode(line["message"]))
+        (out_console or err_console).print(decode(line["message"]))
     elif line["stream"] == "stdout":
-        console.print(decode(line["message"]))
+        (out_console or console).print(decode(line["message"]))
+
+
+def is_github_url(url: str) -> bool:
+    """This pattern is taken from agentstack_server.utils.github.GithubUrl, make sure to keep it in sync"""
+
+    pattern = r"""
+        ^
+        (?:git\+)?                              # Optional git+ prefix
+        https?://(?P<host>github(?:\.[^/]+)+)/  # GitHub host (github.com or github.enterprise.com)
+        (?P<org>[^/]+)/                         # Organization
+        (?P<repo>
+            (?:                                 # Non-capturing group for repo name
+                (?!\.git(?:$|[@#]))             # Negative lookahead for .git at end or followed by @#
+                [^/@#]                          # Any char except /@#
+            )+                                  # One or more of these chars
+        )
+        (?:\.git)?                              # Optional .git suffix
+        (?:@(?P<version>[^#]+))?                # Optional version after @
+        (?:\#path=(?P<path>.+))?                # Optional path after #path=
+        $
+    """
+    return bool(re.match(pattern, url, re.VERBOSE))