superwise-sentinel-cli 0.2.0__tar.gz → 0.2.1__tar.gz

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/CLAUDE.md

@@ -40,11 +40,11 @@ Run manually: `pre-commit run --all-files`
 
 All source lives under `src/superwise_sentinel_cli/`:
 
-- **`cli.py`** — Click command tree: root group `main`, with subgroups `gateway` (start/stop) and `proxy` (on/off), plus top-level commands `auth` and `config`. Imports from `auth`, `runner`, `shell_profile`, and `config`.
+- **`cli.py`** — Click command tree: root group `main`, with subgroups `gateway` (start/stop/update) and `proxy` (on/off), plus top-level commands `auth` and `config`. Imports from `auth`, `controller`, `shell_profile`, and `config`.
 - **`config.py`** — `AppConfig` (pydantic-settings). Settings priority: env vars (`SENTINEL_*`) > `~/.config/sentinel/config.json` > field defaults. Also owns `_PROVIDER_CONFIG` (provider → env var + URL path mapping) and `VALID_PROVIDERS`. `AppConfig.load()` / `.save()` are the only intended access points.
 - **`auth.py`** — `authenticate()` hits the Superwise auth API and caches the token at `~/.config/sentinel/token`. Skips the network call on subsequent invocations unless `force=True`.
-- **`runner.py`** — `get_or_create_local_endpoint()` starts the Docker container and returns its base URL. `resolve_env_vars()` maps provider names to `(env_var, full_url)` pairs using `_PROVIDER_CONFIG` from `config.py`.
-- **`docker_manager.py`** — Manages the `sentinel-local` Docker container (image: `us-central1-docker.pkg.dev/admina33d6818/docker/platform/sentinel:<tag>`). `ensure_container_running()` pulls, starts, and returns a `ContainerEndpoint`; `stop_container()` stops and removes it. Falls back to `linux/amd64` when native platform image is unavailable.
+- **`controller.py`** — Business logic layer between `cli.py` and `docker_manager.py`/`shell_profile.py`. `get_or_create_local_endpoint()` starts the Docker container and returns its base URL. `resolve_env_vars()` maps provider names to `(env_var, full_url)` pairs using `_PROVIDER_CONFIG` from `config.py`. `update_gateway_image` is an alias for `docker_manager.pull_latest_image` — it only refreshes the local image, it does not touch a running container.
+- **`docker_manager.py`** — Manages the `sentinel-local` Docker container (image from `AppConfig.CONTAINER_IMAGE`). `ensure_container_running()` pulls (if not cached), starts, and returns a `ContainerEndpoint`; `stop_container()` stops and removes it; `pull_latest_image()` force-pulls the image regardless of local cache, for use by `gateway update`. Falls back to `linux/amd64` when native platform image is unavailable.
 - **`shell_profile.py`** — `ShellContext` abstraction with `_UnixShellContext` (bash/zsh, auto-detected) and `_WindowsShellContext` (PowerShell). `ensure_shell_integration()` / `remove_shell_integration()` patch the shell profile. `write_env_vars()` / `remove_env_vars()` manage `~/.config/sentinel/protected_vars.json` and a sourced env file. On macOS, also calls `launchctl setenv/unsetenv` for GUI app visibility. The module-level `SHELL` constant holds the current platform context.
 
 ## Config & state files

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: superwise-sentinel-cli
-Version: 0.2.0
+Version: 0.2.1
 Summary: Sentinel is an LLM proxy that intercepts traffic, enabling you to monitor, secure, and optimize your AI usage. This CLI tool helps you quickly set up traffic interception on this machine
 Requires-Python: <4.0,>=3.11
 Requires-Dist: click>=8.1

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/README.md

@@ -28,13 +28,22 @@ Authenticate with Superwise (prompts for Client ID and Client Secret). Pass `--a
 |---|---|
 | `sentinel gateway start` | Pull and start the local Docker gateway container |
 | `sentinel gateway stop` | Stop and remove the container |
+| `sentinel gateway update` | Pull the latest gateway image, without touching the running container |
 
-Pass `--sentinel-id <uuid>` to `start` to use an existing sentinel rather than creating a new one.
+Pass `--sentinel-id <uuid>` to `start` to use an existing sentinel rather than creating a new one. After `gateway update`, run `sentinel gateway start --force` to switch the running gateway over to the newly pulled image.
 
 ### `sentinel config`
 
 Configure the gateway URL and which LLM providers to intercept. Valid providers: `anthropic`, `openai`, `google`. Use `all` to select every provider.
 
+Run interactively via `sentinel config url` / `sentinel config providers`, or set both non-interactively in one line:
+
+```bash
+sentinel config --url "https://gateway.example.com" --providers "openai anthropic"
+```
+
+Each subcommand also accepts `--set` for setting just that one value non-interactively, e.g. `sentinel config url --set "https://gateway.example.com"` or `sentinel config providers --set all`.
+
 ### `sentinel proxy`
 
 | Command | Description |

superwise_sentinel_cli-0.2.1/build.env

@@ -0,0 +1 @@
+RELEASED_VERSION=0.2.1

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "superwise-sentinel-cli"
-version = "0.2.0"
+version = "0.2.1"
 description = "Sentinel is an LLM proxy that intercepts traffic, enabling you to monitor, secure, and optimize your AI usage. This CLI tool helps you quickly set up traffic interception on this machine"
 requires-python = ">=3.11, <4.0"
 dependencies = [

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/src/superwise_sentinel_cli/cli.py

@@ -25,7 +25,9 @@ from superwise_sentinel_cli.controller import save_providers
 from superwise_sentinel_cli.controller import stop_gateway_container
 from superwise_sentinel_cli.controller import update_client_id_and_secret
 from superwise_sentinel_cli.controller import update_env_vars
+from superwise_sentinel_cli.controller import update_gateway_image
 from superwise_sentinel_cli.exceptions import AuthenticationError
+from superwise_sentinel_cli.exceptions import BaseCLIException
 
 _SECRET_PLACEHOLDER = "********"
 
@@ -48,6 +50,20 @@ def echo_error(message: str) -> None:
     click.secho(message, fg="red", err=True)
 
 
+def _apply_url(cfg: AppConfig, url: str) -> None:
+    save_gateway_url(cfg, url)
+
+
+def _apply_providers(cfg: AppConfig, spec: str) -> None:
+    providers = parse_providers(spec.split())
+    invalid = check_invalid_providers(providers)
+    if invalid:
+        raise click.ClickException(
+            f"Unknown provider(s): {', '.join(invalid)}. Valid choices: {', '.join(VALID_PROVIDERS)}"
+        )
+    save_providers(cfg, providers)
+
+
 @click.group()
 @click.version_option(prog_name="superwise-sentinel-cli", help="Show the version and exit.")
 def main() -> None:
@@ -152,8 +168,13 @@ def gateway() -> None:
     default=None,
     help='JSON array of custom LLM providers, e.g. \'[{"provider_name":"myllm","base_url":"http://host:4000"}]\'',
 )
+@click.option(
+    "--force", is_flag=True, default=False, help="If a local gateway is already running, stop it and start a new one."
+)
 @click.pass_context
-def start_gateway(ctx, sentinel_id: uuid.UUID | None, new_sentinel: bool, custom_providers: str | None) -> None:
+def start_gateway(
+    ctx, sentinel_id: uuid.UUID | None, new_sentinel: bool, custom_providers: str | None, force: bool
+) -> None:
     """Bootstrap & run a local Sentinel gateway container."""
     cfg = AppConfig.load()
 
@@ -163,15 +184,19 @@ def start_gateway(ctx, sentinel_id: uuid.UUID | None, new_sentinel: bool, custom
         except Exception as exc:
             raise click.ClickException(f"Invalid --custom-providers: {exc}") from exc
 
-    running = get_running_gateway()
-    if running is not None:
-        base_url, running_sentinel_id = running
-        click.echo(
-            f"A local gateway is already running at {base_url} " f"(sentinel ID: {running_sentinel_id or 'unknown'})."
-        )
-        if not click.confirm("Stop it and start a new one?"):
-            return
+    if force:
         stop_gateway_container()
+    else:
+        running = get_running_gateway()
+        if running is not None:
+            base_url, running_sentinel_id = running
+            click.echo(
+                f"A local gateway is already running at {base_url} "
+                f"(sentinel ID: {running_sentinel_id or 'unknown'})."
+            )
+            if not click.confirm("Stop it and start a new one?"):
+                return
+            stop_gateway_container()
 
     if not sentinel_id and (new_sentinel or not cfg.sentinel_id):
         click.echo("Creating a new sentinel.")
@@ -211,23 +236,81 @@ def stop_gateway() -> None:
     click.echo(f"Gateway removed. Sentinel configuration remains available at {get_sentinel_url(cfg)}.")
 
 
-@main.group("config")
-def config() -> None:
-    """Configure gateway URL and LLM providers."""
+@gateway.command("update")
+def update_gateway() -> None:
+    """Pull the latest local gateway image."""
+    try:
+        result = update_gateway_image()
+    except BaseCLIException:
+        raise
+    except Exception:
+        raise click.ClickException("Failed to pull the latest sentinel image.")
+    if result.updated:
+        if get_running_gateway() is not None:
+            click.echo(
+                "Sentinel image updated. Run 'sentinel gateway start --force' to restart the running gateway using the new image."
+            )
+        else:
+            click.echo("Sentinel image updated.")
+    else:
+        click.echo("Image is up to date.")
+
+
+@main.group("config", invoke_without_command=True)
+@click.option("--url", "url_value", default=None, help="Set the gateway URL non-interactively.")
+@click.option(
+    "--providers",
+    "providers_value",
+    default=None,
+    help="Set providers non-interactively (space-separated, e.g. \"openai anthropic\", or 'all').",
+)
+@click.pass_context
+def config(ctx, url_value: str | None, providers_value: str | None) -> None:
+    """Configure gateway URL and LLM providers.
+
+    Run with --url/--providers for a non-interactive one-liner, e.g.
+    'sentinel config --url https://gateway.example.com --providers "openai anthropic"'.
+    """
+    if ctx.invoked_subcommand is not None:
+        return
+    if url_value is None and providers_value is None:
+        click.echo(ctx.get_help())
+        return
+    cfg = AppConfig.load()
+    if url_value is not None:
+        _apply_url(cfg, url_value)
+    if providers_value is not None:
+        _apply_providers(cfg, providers_value)
+    click.echo(f"Configuration updated.")
 
 
 @config.command("url")
-def config_url() -> None:
+@click.option("--set", "set_value", default=None, help="Set the gateway URL non-interactively.")
+def config_url(set_value: str | None) -> None:
     """Set the gateway URL."""
     cfg = AppConfig.load()
+    if set_value is not None:
+        _apply_url(cfg, set_value)
+        click.echo(f"Gateway URL updated.")
+        return
     url = click.prompt("Gateway url", default=cfg.gateway_url)
-    save_gateway_url(cfg, url)
+    _apply_url(cfg, url)
 
 
 @config.command("providers")
-def config_providers() -> None:
+@click.option(
+    "--set",
+    "set_value",
+    default=None,
+    help="Set providers non-interactively (space-separated, e.g. \"openai anthropic\", or 'all').",
+)
+def config_providers(set_value: str | None) -> None:
     """Set the LLM providers to intercept. Use 'all' to select all supported providers."""
     cfg = AppConfig.load()
+    if set_value is not None:
+        _apply_providers(cfg, set_value)
+        click.echo(f"Providers updated.")
+        return
     while True:
         providers = click.prompt(
             "Choose the providers you want to route to the configured gateway (space separated)",

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/src/superwise_sentinel_cli/config.py

@@ -31,7 +31,7 @@ CONFIG_FILE = CONFIG_DIR / "config.json"
 
 _PROVIDER_CONFIG: dict[str, tuple[str, str]] = {
     "anthropic": ("ANTHROPIC_BASE_URL", "anthropic"),
-    "openai": ("OPENAI_BASE_URL", "openai"),
+    "openai": ("OPENAI_BASE_URL", "openai/v1"),
     "google": ("GOOGLE_GEMINI_BASE_URL", "gemini"),
 }
 

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/src/superwise_sentinel_cli/controller.py

@@ -9,12 +9,18 @@ from superwise_sentinel_cli.config import AppConfig
 from superwise_sentinel_cli.config import VALID_PROVIDERS
 from superwise_sentinel_cli.docker_manager import ensure_container_running
 from superwise_sentinel_cli.docker_manager import get_running_gateway_info
+from superwise_sentinel_cli.docker_manager import pull_latest_image
 from superwise_sentinel_cli.docker_manager import stop_container
 from superwise_sentinel_cli.exceptions import AuthenticationError
 from superwise_sentinel_cli.shell_profile import remove_env_vars
 from superwise_sentinel_cli.shell_profile import write_env_vars
 
 
+stop_gateway_container = stop_container
+update_gateway_image = pull_latest_image
+clear_env_vars = remove_env_vars
+
+
 def check_invalid_providers(providers: list[str]) -> list[str]:
     return [p for p in providers if p not in VALID_PROVIDERS]
 
@@ -116,11 +122,6 @@ def get_running_gateway() -> tuple[str, str | None] | None:
     return endpoint.base_url, sentinel_id
 
 
-stop_gateway_container = stop_container
-
-clear_env_vars = remove_env_vars
-
-
 def update_env_vars(cfg: AppConfig) -> list[tuple[str, str]]:
     pairs = resolve_env_vars(cfg.providers, cfg.gateway_url)
     remove_env_vars()

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/src/superwise_sentinel_cli/docker_manager.py

@@ -7,6 +7,8 @@ import click
 import docker.errors
 from docker.models.containers import Container
 from superwise_sentinel_cli.config import AppConfig
+from superwise_sentinel_cli.exceptions import DockerError
+from superwise_sentinel_cli.exceptions import DockerUnavailableError
 
 cfg = AppConfig()
 CONTAINER_IMAGE = cfg.CONTAINER_IMAGE
@@ -30,7 +32,7 @@ def _docker_client() -> docker.DockerClient:
         client.ping()
         return client
     except docker.errors.DockerException as exc:
-        raise RuntimeError("Cannot connect to Docker daemon — is Docker running?") from exc
+        raise DockerUnavailableError() from exc
 
 
 def _running_container(client: docker.DockerClient) -> Container | None:
@@ -59,7 +61,7 @@ def _endpoint_from_container(container: Container) -> ContainerEndpoint:
 def get_running_gateway_info() -> tuple[ContainerEndpoint, str | None] | None:
     try:
         client = _docker_client()
-    except RuntimeError:
+    except DockerUnavailableError:
         return None
     container = _running_container(client)
     if container is None:
@@ -68,14 +70,11 @@ def get_running_gateway_info() -> tuple[ContainerEndpoint, str | None] | None:
 
 
 def stop_container() -> None:
-    try:
-        client = _docker_client()
-        matches = client.containers.list(all=True, filters={"name": CONTAINER_NAME})
-        for container in matches:
-            container.stop(timeout=5)
-            container.remove(force=True)
-    except RuntimeError as exc:
-        raise click.ClickException(str(exc)) from exc
+    client = _docker_client()
+    matches = client.containers.list(all=True, filters={"name": CONTAINER_NAME})
+    for container in matches:
+        container.stop(timeout=5)
+        container.remove(force=True)
 
 
 def _docker_pull(platform: str | None = None) -> subprocess.CompletedProcess:
@@ -83,30 +82,41 @@ def _docker_pull(platform: str | None = None) -> subprocess.CompletedProcess:
     if platform:
         cmd += ["--platform", platform]
     cmd.append(CONTAINER_IMAGE)
-    return subprocess.run(cmd, stderr=subprocess.PIPE, text=True)
+    return subprocess.run(cmd, capture_output=True, text=True)
 
 
-def _pull_image_if_needed() -> str | None:
-    client = _docker_client()
-    try:
-        client.images.get(CONTAINER_IMAGE)
-        return None
-    except docker.errors.ImageNotFound:
-        pass
+@dataclass(frozen=True)
+class PullResult:
+    platform: str | None
+    updated: bool
+
+
+def pull_latest_image() -> PullResult:
+    _docker_client()
 
     click.echo(f"Pulling sentinel image...")
     native = _docker_pull()
     if native.returncode == 0:
-        return None
+        return PullResult(None, "Status: Downloaded newer image" in native.stdout)
 
     if "no matching manifest" in native.stderr:
         click.echo("Native platform image not available, falling back to linux/amd64...")
         fallback = _docker_pull("linux/amd64")
         if fallback.returncode == 0:
-            return "linux/amd64"
-        raise RuntimeError(f"Failed to pull image {CONTAINER_IMAGE}:\n{fallback.stderr}") from None
+            return PullResult("linux/amd64", "Status: Downloaded newer image" in fallback.stdout)
+        raise DockerError(f"Failed to pull image {CONTAINER_IMAGE}:\n{fallback.stderr}") from None
+
+    raise DockerError(f"Failed to pull image {CONTAINER_IMAGE}:\n{native.stderr}") from None
 
-    raise RuntimeError(f"Failed to pull image {CONTAINER_IMAGE}:\n{native.stderr}") from None
+
+def _pull_image_if_needed() -> str | None:
+    client = _docker_client()
+    try:
+        client.images.get(CONTAINER_IMAGE)
+        return None
+    except docker.errors.ImageNotFound:
+        pass
+    return pull_latest_image().platform
 
 
 def ensure_container_running(environment: dict[str, str] | None = None) -> ContainerEndpoint:
@@ -138,6 +148,6 @@ def ensure_container_running(environment: dict[str, str] | None = None) -> Conta
             remove=False,
         )
     except docker.errors.APIError as exc:
-        raise RuntimeError(f"Failed to start sentinel container: {exc.explanation}") from exc
+        raise DockerError(f"Failed to start sentinel container: {exc.explanation}") from exc
 
     return _endpoint_from_container(container)

superwise_sentinel_cli-0.2.1/src/superwise_sentinel_cli/exceptions.py

@@ -0,0 +1,21 @@
+import sys
+
+import click
+
+
+class BaseCLIException(click.ClickException):
+    def show(self, file=None):
+        click.secho(f"Error: {self.message}", fg="red", file=file or sys.stderr)
+
+
+class AuthenticationError(BaseCLIException):
+    pass
+
+
+class DockerError(BaseCLIException):
+    """Base exception for docker-related failures."""
+
+
+class DockerUnavailableError(DockerError):
+    def __init__(self) -> None:
+        super().__init__("Cannot connect to Docker daemon — is Docker running?")

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/tests/test_controller.py

@@ -264,13 +264,13 @@ def test_create_sentinel_propagates_http_error(mock_auth, mock_post):
 
 
 def test_resolve_env_vars_returns_correct_pair():
-    assert resolve_env_vars(["openai"], "http://proxy") == [("OPENAI_BASE_URL", "http://proxy/openai")]
+    assert resolve_env_vars(["openai"], "http://proxy") == [("OPENAI_BASE_URL", "http://proxy/openai/v1")]
 
 
 def test_resolve_env_vars_handles_multiple_providers():
     pairs = resolve_env_vars(["openai", "anthropic"], "http://proxy")
 
-    assert ("OPENAI_BASE_URL", "http://proxy/openai") in pairs
+    assert ("OPENAI_BASE_URL", "http://proxy/openai/v1") in pairs
     assert ("ANTHROPIC_BASE_URL", "http://proxy/anthropic") in pairs
 
 

{superwise_sentinel_cli-0.2.0 → superwise_sentinel_cli-0.2.1}/tests/test_docker_manager.py

@@ -11,6 +11,8 @@ from superwise_sentinel_cli.docker_manager import CONTAINER_PORT
 from superwise_sentinel_cli.docker_manager import ensure_container_running
 from superwise_sentinel_cli.docker_manager import get_running_gateway_info
 from superwise_sentinel_cli.docker_manager import stop_container
+from superwise_sentinel_cli.exceptions import DockerError
+from superwise_sentinel_cli.exceptions import DockerUnavailableError
 
 
 @patch("superwise_sentinel_cli.docker_manager.docker.from_env")
@@ -25,12 +27,12 @@ def test_docker_client_returns_client_when_docker_running(mock_from_env):
 
 
 @patch("superwise_sentinel_cli.docker_manager.docker.from_env", side_effect=docker.errors.DockerException("down"))
-def test_docker_client_raises_runtime_error_when_docker_unavailable(mock_from_env):
-    with pytest.raises(RuntimeError, match="Cannot connect to Docker daemon"):
+def test_docker_client_raises_docker_error_when_docker_unavailable(mock_from_env):
+    with pytest.raises(DockerError, match="Cannot connect to Docker daemon"):
         _docker_client()
 
 
-@patch("superwise_sentinel_cli.docker_manager._docker_client", side_effect=RuntimeError("no docker"))
+@patch("superwise_sentinel_cli.docker_manager._docker_client", side_effect=DockerUnavailableError())
 def test_get_running_gateway_info_returns_none_when_docker_unavailable(mock_client):
     assert get_running_gateway_info() is None
 
@@ -90,7 +92,7 @@ def test_stop_container_noop_when_no_containers(mock_client):
     stop_container()
 
 
-@patch("superwise_sentinel_cli.docker_manager._docker_client", side_effect=RuntimeError("daemon down"))
+@patch("superwise_sentinel_cli.docker_manager._docker_client", side_effect=DockerUnavailableError())
 def test_stop_container_raises_click_exception_when_docker_unavailable(mock_client):
     with pytest.raises(click.ClickException):
         stop_container()
@@ -202,7 +204,7 @@ def test_ensure_container_running_raises_on_api_error(mock_client, mock_running,
     client.containers.list.return_value = []
     client.containers.run.side_effect = docker.errors.APIError("start failed")
 
-    with pytest.raises(RuntimeError, match="Failed to start sentinel container"):
+    with pytest.raises(DockerError, match="Failed to start sentinel container"):
         ensure_container_running()
 
 
@@ -243,7 +245,7 @@ def test_pull_image_if_needed_raises_when_amd64_fallback_fails(mock_client, mock
         MagicMock(returncode=1, stderr="amd64 also failed"),
     ]
 
-    with pytest.raises(RuntimeError, match="Failed to pull image"):
+    with pytest.raises(DockerError, match="Failed to pull image"):
         _pull_image_if_needed()
 
 
@@ -253,5 +255,5 @@ def test_pull_image_if_needed_raises_on_non_manifest_pull_error(mock_client, moc
     mock_client.return_value.images.get.side_effect = docker.errors.ImageNotFound("not found")
     mock_pull.return_value = MagicMock(returncode=1, stderr="network timeout")
 
-    with pytest.raises(RuntimeError, match="Failed to pull image"):
+    with pytest.raises(DockerError, match="Failed to pull image"):
         _pull_image_if_needed()

superwise_sentinel_cli-0.2.0/build.env

@@ -1 +0,0 @@
-RELEASED_VERSION=0.2.0

superwise_sentinel_cli-0.2.0/src/superwise_sentinel_cli/exceptions.py

@@ -1,12 +0,0 @@
-import sys
-
-import click
-
-
-class BaseCLIException(click.ClickException):
-    def show(self, file=None):
-        click.secho(f"Error: {self.message}", fg="red", file=file or sys.stderr)
-
-
-class AuthenticationError(BaseCLIException):
-    pass