layerbrain 0.2.1__tar.gz → 0.3.0__tar.gz

{layerbrain-0.2.1 → layerbrain-0.3.0}/.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -e ".[cli]"
+          pip install -e .
           pip install flake8
 
       - name: Lint

{layerbrain-0.2.1 → layerbrain-0.3.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: layerbrain
-Version: 0.2.1
-Summary: The official Python SDK for the Layerbrain API
+Version: 0.3.0
+Summary: The official Python SDK and CLI for the Layerbrain API
 Project-URL: Homepage, https://layerbrain.com
 Project-URL: Documentation, https://docs.layerbrain.com
-Project-URL: Repository, https://github.com/layerbrain/layerbrain-python
-Project-URL: Changelog, https://github.com/layerbrain/layerbrain-python/releases
+Project-URL: Repository, https://github.com/layerbrain/layerbrain
+Project-URL: Changelog, https://github.com/layerbrain/layerbrain/releases
 Author-email: Layerbrain <engineering@layerbrain.com>
 License-Expression: MIT
 License-File: LICENSE
@@ -21,32 +21,50 @@ Classifier: Typing :: Typed
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.27
 Requires-Dist: pydantic>=2.0
+Requires-Dist: rich>=13.0
 Requires-Dist: tomli-w>=1.0
 Requires-Dist: tomli>=2.0; python_version < '3.11'
+Requires-Dist: typer>=0.15
 Requires-Dist: websockets>=12.0
-Provides-Extra: cli
-Requires-Dist: rich>=13.0; extra == 'cli'
-Requires-Dist: typer>=0.15; extra == 'cli'
 Description-Content-Type: text/markdown
 
-# Layerbrain Python SDK
+# Layerbrain CLI
 
 [![PyPI version](https://img.shields.io/pypi/v/layerbrain.svg)](https://pypi.org/project/layerbrain/)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/layerbrain/layerbrain-python/blob/main/LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/layerbrain/layerbrain/blob/main/LICENSE)
 
 The official Python SDK and CLI for the [Layerbrain](https://layerbrain.com) API.
 
 ## Installation
 
 ```sh
-# SDK only
 pip install layerbrain
+```
+
+For a global CLI install with `uv`:
+
+```sh
+uv tool install layerbrain
+```
+
+For a `uv`-managed project dependency:
+
+```sh
+uv add layerbrain
+```
 
-# SDK + CLI
-pip install layerbrain[cli]
+For a one-off run without installing the tool globally:
+
+```sh
+uvx layerbrain --help
 ```
 
+All of these give you the same package. `layerbrain` includes both:
+
+- the Python SDK via `from layerbrain import Layerbrain`
+- the `layerbrain` command-line interface
+
 ## Quick Start
 
 ```python
@@ -55,6 +73,42 @@ from layerbrain import Layerbrain
 client = Layerbrain()
 ```
 
+## CLI
+
+```sh
+layerbrain login
+layerbrain whoami
+layerbrain models list
+layerbrain machines list
+layerbrain listen --events machine.created
+layerbrain webhooks list
+layerbrain networks list
+```
+
+You can also run the CLI via:
+
+```sh
+python -m layerbrain
+```
+
+To update a standalone install:
+
+```sh
+layerbrain upgrade
+```
+
+Or, if you installed it with `uv tool`:
+
+```sh
+uv tool upgrade layerbrain
+```
+
+If `layerbrain` is a dependency in a `uv` project:
+
+```sh
+uv add --upgrade-package layerbrain layerbrain
+```
+
 The client reads your API key from the `LAYERBRAIN_API_KEY` environment variable by default. You can also pass it explicitly:
 
 ```python
@@ -103,9 +157,9 @@ machine = client.machines.retrieve("mach_abc123")
 client.machines.delete("mach_abc123")
 ```
 
-### Machine Connect (WebSocket)
+### Connect to a Machine (WebSocket)
 
-Connect to a running machine via WebSocket for shell and filesystem access:
+Open a live machine session over WebSocket for shell and filesystem access:
 
 ```python
 import asyncio
@@ -114,7 +168,7 @@ from layerbrain import Layerbrain
 async def main():
     client = Layerbrain()
 
-    # Connect to a running machine via WebSocket
+    # Open a live machine session over WebSocket
     async with await client.machines.connect("mach_abc123") as conn:
         # Shell - execute commands
         result = await conn.shell.execute("ls -la ~/brain")
@@ -180,13 +234,9 @@ model = client.models.retrieve("meta-llama/llama-3.1-8b")
 
 ```python
 # Web search
-results = client.tools.search(query="python httpx tutorial", count=5)
+results = client.tools.web_search(query="python httpx tutorial", count=5)
 for r in results["results"]:
     print(r["title"], r["url"])
-
-# Fetch page content
-page = client.tools.fetch(url="https://example.com")
-print(page["content"])
 ```
 
 ### Secrets
@@ -258,59 +308,6 @@ except APIError as e:
 | N/A | `ConnectionError` |
 | N/A | `TimeoutError` |
 
-## CLI
-
-Requires `pip install layerbrain[cli]`.
-
-```sh
-# Account
-layerbrain login
-layerbrain whoami
-layerbrain logout
-layerbrain upgrade
-
-# AI
-layerbrain chat completions create --model meta-llama/llama-3.1-8b --message "Hello"
-layerbrain models list
-layerbrain models get meta-llama/llama-3.1-8b
-layerbrain embeddings create --model BAAI/bge-large-en-v1.5 --input "Hello world"
-layerbrain images generate --model black-forest-labs/flux-schnell --prompt "A cat"
-layerbrain audio speech --model hexgrad/kokoro --input "Hello world"
-
-# Tools
-layerbrain tools search --query "python httpx"
-layerbrain tools fetch --url "https://example.com"
-
-# Brain
-layerbrain brains create
-layerbrain engrams list
-layerbrain engrams create --name "my-session"
-
-# Compute & Machines
-layerbrain compute list
-layerbrain machines list
-layerbrain machines create --compute na-us-ca-sfo_s.small --duration 60
-layerbrain machines get mach_abc123
-layerbrain machines delete mach_abc123
-
-# SSH into a machine (interactive session)
-layerbrain machines ssh --id mach_abc123
-layerbrain machines ssh --id mach_abc123 --user root
-
-# Infrastructure
-layerbrain environments list
-layerbrain secrets list
-layerbrain secrets create --name HF_TOKEN --value "hf_..."
-layerbrain organizations list
-layerbrain api-keys list
-layerbrain api-keys create --name "production"
-
-# Config
-layerbrain config set default_output json
-```
-
-All list commands support `--output json` for JSON output.
-
 ## Configuration
 
 The client reads configuration from (in priority order):

{layerbrain-0.2.1 → layerbrain-0.3.0}/README.md

@@ -1,21 +1,40 @@
-# Layerbrain Python SDK
+# Layerbrain CLI
 
 [![PyPI version](https://img.shields.io/pypi/v/layerbrain.svg)](https://pypi.org/project/layerbrain/)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
-[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/layerbrain/layerbrain-python/blob/main/LICENSE)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/layerbrain/layerbrain/blob/main/LICENSE)
 
 The official Python SDK and CLI for the [Layerbrain](https://layerbrain.com) API.
 
 ## Installation
 
 ```sh
-# SDK only
 pip install layerbrain
+```
+
+For a global CLI install with `uv`:
+
+```sh
+uv tool install layerbrain
+```
+
+For a `uv`-managed project dependency:
+
+```sh
+uv add layerbrain
+```
 
-# SDK + CLI
-pip install layerbrain[cli]
+For a one-off run without installing the tool globally:
+
+```sh
+uvx layerbrain --help
 ```
 
+All of these give you the same package. `layerbrain` includes both:
+
+- the Python SDK via `from layerbrain import Layerbrain`
+- the `layerbrain` command-line interface
+
 ## Quick Start
 
 ```python
@@ -24,6 +43,42 @@ from layerbrain import Layerbrain
 client = Layerbrain()
 ```
 
+## CLI
+
+```sh
+layerbrain login
+layerbrain whoami
+layerbrain models list
+layerbrain machines list
+layerbrain listen --events machine.created
+layerbrain webhooks list
+layerbrain networks list
+```
+
+You can also run the CLI via:
+
+```sh
+python -m layerbrain
+```
+
+To update a standalone install:
+
+```sh
+layerbrain upgrade
+```
+
+Or, if you installed it with `uv tool`:
+
+```sh
+uv tool upgrade layerbrain
+```
+
+If `layerbrain` is a dependency in a `uv` project:
+
+```sh
+uv add --upgrade-package layerbrain layerbrain
+```
+
 The client reads your API key from the `LAYERBRAIN_API_KEY` environment variable by default. You can also pass it explicitly:
 
 ```python
@@ -72,9 +127,9 @@ machine = client.machines.retrieve("mach_abc123")
 client.machines.delete("mach_abc123")
 ```
 
-### Machine Connect (WebSocket)
+### Connect to a Machine (WebSocket)
 
-Connect to a running machine via WebSocket for shell and filesystem access:
+Open a live machine session over WebSocket for shell and filesystem access:
 
 ```python
 import asyncio
@@ -83,7 +138,7 @@ from layerbrain import Layerbrain
 async def main():
     client = Layerbrain()
 
-    # Connect to a running machine via WebSocket
+    # Open a live machine session over WebSocket
     async with await client.machines.connect("mach_abc123") as conn:
         # Shell - execute commands
         result = await conn.shell.execute("ls -la ~/brain")
@@ -149,13 +204,9 @@ model = client.models.retrieve("meta-llama/llama-3.1-8b")
 
 ```python
 # Web search
-results = client.tools.search(query="python httpx tutorial", count=5)
+results = client.tools.web_search(query="python httpx tutorial", count=5)
 for r in results["results"]:
     print(r["title"], r["url"])
-
-# Fetch page content
-page = client.tools.fetch(url="https://example.com")
-print(page["content"])
 ```
 
 ### Secrets
@@ -227,59 +278,6 @@ except APIError as e:
 | N/A | `ConnectionError` |
 | N/A | `TimeoutError` |
 
-## CLI
-
-Requires `pip install layerbrain[cli]`.
-
-```sh
-# Account
-layerbrain login
-layerbrain whoami
-layerbrain logout
-layerbrain upgrade
-
-# AI
-layerbrain chat completions create --model meta-llama/llama-3.1-8b --message "Hello"
-layerbrain models list
-layerbrain models get meta-llama/llama-3.1-8b
-layerbrain embeddings create --model BAAI/bge-large-en-v1.5 --input "Hello world"
-layerbrain images generate --model black-forest-labs/flux-schnell --prompt "A cat"
-layerbrain audio speech --model hexgrad/kokoro --input "Hello world"
-
-# Tools
-layerbrain tools search --query "python httpx"
-layerbrain tools fetch --url "https://example.com"
-
-# Brain
-layerbrain brains create
-layerbrain engrams list
-layerbrain engrams create --name "my-session"
-
-# Compute & Machines
-layerbrain compute list
-layerbrain machines list
-layerbrain machines create --compute na-us-ca-sfo_s.small --duration 60
-layerbrain machines get mach_abc123
-layerbrain machines delete mach_abc123
-
-# SSH into a machine (interactive session)
-layerbrain machines ssh --id mach_abc123
-layerbrain machines ssh --id mach_abc123 --user root
-
-# Infrastructure
-layerbrain environments list
-layerbrain secrets list
-layerbrain secrets create --name HF_TOKEN --value "hf_..."
-layerbrain organizations list
-layerbrain api-keys list
-layerbrain api-keys create --name "production"
-
-# Config
-layerbrain config set default_output json
-```
-
-All list commands support `--output json` for JSON output.
-
 ## Configuration
 
 The client reads configuration from (in priority order):

{layerbrain-0.2.1 → layerbrain-0.3.0}/layerbrain/__init__.py

@@ -1,4 +1,4 @@
-"""Layerbrain Python SDK + CLI.
+"""Layerbrain Python SDK.
 
 Usage::
 
@@ -10,6 +10,7 @@ Usage::
 """
 
 from layerbrain.sdk import Layerbrain
+
 from ._version import __version__
 
 __all__ = [

{layerbrain-0.2.1 → layerbrain-0.3.0}/layerbrain/__main__.py

@@ -1,5 +1,5 @@
 """Allow running the CLI via `python -m layerbrain`."""
 
-from layerbrain.cli.app import main
+from layerbrain.cli.main import main
 
 main()

layerbrain-0.3.0/layerbrain/_version.py

@@ -0,0 +1 @@
+__version__ = "0.3.0"

layerbrain-0.3.0/layerbrain/cli/__init__.py

@@ -0,0 +1 @@
+"""Layerbrain CLI package."""

layerbrain-0.3.0/layerbrain/cli/__main__.py

@@ -0,0 +1,3 @@
+from layerbrain.cli.main import main
+
+main()

layerbrain-0.3.0/layerbrain/cli/_auth_client.py

@@ -0,0 +1,84 @@
+"""Private CLI-only auth client.
+
+This keeps hidden auth endpoints out of the public SDK surface while still
+letting the CLI perform device login and logout flows.
+"""
+
+from __future__ import annotations
+
+from typing import Any
+
+import httpx
+
+from layerbrain.sdk._client import _default_user_agent
+from layerbrain.sdk._config import Config
+from layerbrain.sdk._exceptions import raise_for_status
+from layerbrain.sdk._types import AuthToken, DeviceAuthorization
+
+
+class CLIAuthClient:
+    """Private HTTP client for CLI authentication flows."""
+
+    def __init__(
+        self,
+        api_key: str | None = None,
+        *,
+        base_url: str | None = None,
+        timeout: float = 30.0,
+    ) -> None:
+        config = Config()
+        self._api_key = api_key or config.api_key
+        raw_url = (base_url or config.base_url).rstrip("/")
+        if raw_url.endswith("/v1"):
+            raw_url = raw_url[:-3]
+        self._base_url = raw_url
+        self._http = httpx.Client(
+            headers=self._build_headers(),
+            follow_redirects=True,
+            timeout=httpx.Timeout(timeout, connect=10.0),
+        )
+
+    def _build_headers(self) -> dict[str, str]:
+        headers = {
+            "Content-Type": "application/json",
+            "User-Agent": _default_user_agent(),
+        }
+        if self._api_key:
+            headers["Authorization"] = f"Bearer {self._api_key}"
+        return headers
+
+    def _full_url(self, path: str) -> str:
+        if not path.startswith("/"):
+            path = f"/{path}"
+        return f"{self._base_url}/v1/auth{path}"
+
+    def _post(self, path: str, *, json: dict[str, Any] | None = None) -> dict[str, Any]:
+        response = self._http.post(self._full_url(path), json=json)
+        body = response.json()
+        raise_for_status(response.status_code, body)
+        return body
+
+    def device(self, *, client_id: str) -> DeviceAuthorization:
+        """Start the CLI device authorization flow."""
+        data = self._post("/device", json={"client_id": client_id})
+        return DeviceAuthorization(**data)
+
+    def token_exchange(self, **kwargs: Any) -> AuthToken | dict[str, Any]:
+        """Exchange a device code grant for an auth token."""
+        data = self._post("/token", json=kwargs)
+        if data.get("object") == "token":
+            return AuthToken(**data)
+        return data
+
+    def logout(self) -> dict[str, Any]:
+        """Invalidate the current session if possible."""
+        return self._post("/logout", json={})
+
+    def close(self) -> None:
+        self._http.close()
+
+    def __enter__(self) -> CLIAuthClient:
+        return self
+
+    def __exit__(self, *args: Any) -> None:
+        self.close()

layerbrain-0.3.0/layerbrain/cli/_input.py

@@ -0,0 +1,32 @@
+"""Command input helpers for JSON request bodies."""
+
+from __future__ import annotations
+
+import json
+from pathlib import Path
+from typing import Any
+
+import typer
+
+
+def load_json_input(data: str | None, data_file: str | None) -> dict[str, Any]:
+    """Load a JSON object from inline data or a file path."""
+    if data and data_file:
+        raise typer.BadParameter("Use either --data or --data-file, not both.")
+
+    if data_file:
+        raw = Path(data_file).read_text()
+    elif data:
+        raw = data
+    else:
+        return {}
+
+    try:
+        payload = json.loads(raw)
+    except json.JSONDecodeError as exc:
+        raise typer.BadParameter(f"Invalid JSON: {exc}") from exc
+
+    if not isinstance(payload, dict):
+        raise typer.BadParameter("JSON input must be an object.")
+
+    return payload

{layerbrain-0.2.1 → layerbrain-0.3.0}/layerbrain/cli/_output.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import json
-from typing import Any, Dict, List, Tuple
+from typing import Any
 
 from rich.console import Console
 from rich.table import Table
@@ -41,7 +41,7 @@ def print_success(message: str) -> None:
 
 def build_table(
     title: str,
-    columns: List[Tuple[str, str]],
+    columns: list[tuple[str, str]],
     *,
     show_lines: bool = True,
 ) -> Table:
@@ -86,7 +86,7 @@ API_KEY_STATUS_COLORS = {
 }
 
 
-def status_text(status: str, color_map: Dict[str, str]) -> Text:
+def status_text(status: str, color_map: dict[str, str]) -> Text:
     """Create a colored Text object for a status string."""
     color = color_map.get(status, "white")
     return Text(status, style=color)

{layerbrain-0.2.1 → layerbrain-0.3.0}/layerbrain/cli/commands/accounts.py

@@ -6,12 +6,10 @@ on next regeneration.
 
 from __future__ import annotations
 
-from typing import Optional
-
 import typer
 
 from layerbrain import Layerbrain
-from layerbrain.exceptions import LayerbrainError
+from layerbrain.cli._input import load_json_input
 from layerbrain.cli._output import (
     build_table,
     console,
@@ -20,6 +18,7 @@ from layerbrain.cli._output import (
     print_success,
     validate_output_format,
 )
+from layerbrain.exceptions import LayerbrainError
 
 app = typer.Typer(help="Accounts", no_args_is_help=True)
 
@@ -47,20 +46,6 @@ def list_accounts(
     console.print(table)
 
 
-@app.command()
-def create() -> None:
-    """Create endpoint is not allowed for accounts."""
-    client = Layerbrain()
-    try:
-        result = client.accounts.create()
-    except LayerbrainError as e:
-        print_error(str(e))
-        raise typer.Exit(1) from e
-
-    print_success(f"Accounts created.")
-    print_json(result)
-
-
 @app.command()
 def delete(
     id: str = typer.Argument(..., help="Accounts ID"),
@@ -97,71 +82,13 @@ def get_accounts(
 @app.command("update")
 def update(
     id: str = typer.Argument(..., help="Accounts ID"),
+    data: str | None = typer.Option(None, "--data", help="Inline JSON request body."),
+    data_file: str | None = typer.Option(None, "--data-file", help="Path to a JSON request body."),
 ) -> None:
     """Handles PATCH requests to update account info."""
     client = Layerbrain()
     try:
-        result = client.accounts.update(id)
-    except LayerbrainError as e:
-        print_error(str(e))
-        raise typer.Exit(1) from e
-
-    print_json(result)
-
-
-@app.command("clear-data")
-def clear_data(
-    id: str = typer.Argument(..., help="Accounts ID"),
-) -> None:
-    """Clear all cloud storage data for the user's organization."""
-    client = Layerbrain()
-    try:
-        result = client.accounts.clear_data(id)
-    except LayerbrainError as e:
-        print_error(str(e))
-        raise typer.Exit(1) from e
-
-    print_json(result)
-
-
-@app.command("export")
-def export(
-    id: str = typer.Argument(..., help="Accounts ID"),
-) -> None:
-    """Generate presigned download URL for latest snapshot."""
-    client = Layerbrain()
-    try:
-        result = client.accounts.export(id)
-    except LayerbrainError as e:
-        print_error(str(e))
-        raise typer.Exit(1) from e
-
-    print_json(result)
-
-
-@app.command("onboard")
-def onboard(
-    id: str = typer.Argument(..., help="Accounts ID"),
-) -> None:
-    """Handle onboarding of a new account with activation code."""
-    client = Layerbrain()
-    try:
-        result = client.accounts.onboard(id)
-    except LayerbrainError as e:
-        print_error(str(e))
-        raise typer.Exit(1) from e
-
-    print_json(result)
-
-
-@app.command("switch")
-def switch(
-    id: str = typer.Argument(..., help="Accounts ID"),
-) -> None:
-    """Switch organization/membership endpoint - returns new token with specified or latest membership."""
-    client = Layerbrain()
-    try:
-        result = client.accounts.switch(id)
+        result = client.accounts.update(id, **load_json_input(data, data_file))
     except LayerbrainError as e:
         print_error(str(e))
         raise typer.Exit(1) from e