openbase-coder 0.1.2__tar.gz → 0.1.4__tar.gz

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: openbase-coder
-Version: 0.1.2
+Version: 0.1.4
 Summary: OpenBase Coder CLI with embedded server
 Project-URL: Repository, https://github.com/openbase-community/openbase-coder
 Project-URL: Issues, https://github.com/openbase-community/openbase-coder/issues
@@ -87,25 +87,35 @@ runtime.
 - macOS for full setup and launchd service management
 - Python 3.13+
 - Git
-- `uv` recommended for install and local development
+- `uv` for the recommended install/setup flow and local development
 - Node package tooling for the bundled console build
 - `livekit-server` on `PATH` for voice services
 
-## Install
+## Quick Start
 
-With `uv`:
+Recommended one-line setup with `uvx`:
 
 ```bash
-uv tool install openbase-coder
+uvx --python 3.13 openbase-coder setup
 ```
 
-With `pipx`:
+This runs the latest published `openbase-coder` package in an isolated `uv`
+tool environment and starts the normal first-time setup flow.
+
+For a persistent command on your `PATH` after setup, install with `uv tool`:
+
+```bash
+uv tool install --python 3.13 openbase-coder
+openbase-coder setup
+```
+
+`pipx` is also supported when you already manage Python tools that way:
 
 ```bash
-pipx install openbase-coder
+pipx install --python python3.13 openbase-coder
 ```
 
-Verify the install:
+Verify a persistent install:
 
 ```bash
 openbase-coder --version
@@ -113,7 +123,7 @@ openbase-coder --version
 
 ## First-Time Setup
 
-Run:
+If you already installed the persistent `openbase-coder` command, run:
 
 ```bash
 openbase-coder setup
@@ -127,8 +137,8 @@ used by voice sessions.
 After setup, check the local runtime:
 
 ```bash
-openbase-coder doctor
-openbase-coder services status
+uvx --python 3.13 openbase-coder doctor
+uvx --python 3.13 openbase-coder services status
 ```
 
 ## Run The Server
@@ -136,28 +146,30 @@ openbase-coder services status
 For foreground development:
 
 ```bash
-openbase-coder server --host 0.0.0.0 --port 7999
+uvx --python 3.13 openbase-coder server --host 0.0.0.0 --port 7999
 ```
 
 For normal macOS background operation:
 
 ```bash
-openbase-coder services start
-openbase-coder services status
+uvx --python 3.13 openbase-coder services start
+uvx --python 3.13 openbase-coder services status
 ```
 
 ## Common Commands
 
 ```bash
-openbase-coder setup
-openbase-coder doctor
-openbase-coder login
-openbase-coder services status
-openbase-coder services logs django-cli
-openbase-coder plugins list
-openbase-coder bootstrap --help
+uvx --python 3.13 openbase-coder setup
+uvx --python 3.13 openbase-coder doctor
+uvx --python 3.13 openbase-coder login
+uvx --python 3.13 openbase-coder services status
+uvx --python 3.13 openbase-coder services logs django-cli
+uvx --python 3.13 openbase-coder plugins list
+uvx --python 3.13 openbase-coder bootstrap --help
 ```
 
+If you installed with `uv tool`, omit `uvx --python 3.13` from those commands.
+
 ## Documentation
 
 - [Getting Started](docs/getting-started.md)

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/README.md

@@ -27,25 +27,35 @@ runtime.
 - macOS for full setup and launchd service management
 - Python 3.13+
 - Git
-- `uv` recommended for install and local development
+- `uv` for the recommended install/setup flow and local development
 - Node package tooling for the bundled console build
 - `livekit-server` on `PATH` for voice services
 
-## Install
+## Quick Start
 
-With `uv`:
+Recommended one-line setup with `uvx`:
 
 ```bash
-uv tool install openbase-coder
+uvx --python 3.13 openbase-coder setup
 ```
 
-With `pipx`:
+This runs the latest published `openbase-coder` package in an isolated `uv`
+tool environment and starts the normal first-time setup flow.
+
+For a persistent command on your `PATH` after setup, install with `uv tool`:
+
+```bash
+uv tool install --python 3.13 openbase-coder
+openbase-coder setup
+```
+
+`pipx` is also supported when you already manage Python tools that way:
 
 ```bash
-pipx install openbase-coder
+pipx install --python python3.13 openbase-coder
 ```
 
-Verify the install:
+Verify a persistent install:
 
 ```bash
 openbase-coder --version
@@ -53,7 +63,7 @@ openbase-coder --version
 
 ## First-Time Setup
 
-Run:
+If you already installed the persistent `openbase-coder` command, run:
 
 ```bash
 openbase-coder setup
@@ -67,8 +77,8 @@ used by voice sessions.
 After setup, check the local runtime:
 
 ```bash
-openbase-coder doctor
-openbase-coder services status
+uvx --python 3.13 openbase-coder doctor
+uvx --python 3.13 openbase-coder services status
 ```
 
 ## Run The Server
@@ -76,28 +86,30 @@ openbase-coder services status
 For foreground development:
 
 ```bash
-openbase-coder server --host 0.0.0.0 --port 7999
+uvx --python 3.13 openbase-coder server --host 0.0.0.0 --port 7999
 ```
 
 For normal macOS background operation:
 
 ```bash
-openbase-coder services start
-openbase-coder services status
+uvx --python 3.13 openbase-coder services start
+uvx --python 3.13 openbase-coder services status
 ```
 
 ## Common Commands
 
 ```bash
-openbase-coder setup
-openbase-coder doctor
-openbase-coder login
-openbase-coder services status
-openbase-coder services logs django-cli
-openbase-coder plugins list
-openbase-coder bootstrap --help
+uvx --python 3.13 openbase-coder setup
+uvx --python 3.13 openbase-coder doctor
+uvx --python 3.13 openbase-coder login
+uvx --python 3.13 openbase-coder services status
+uvx --python 3.13 openbase-coder services logs django-cli
+uvx --python 3.13 openbase-coder plugins list
+uvx --python 3.13 openbase-coder bootstrap --help
 ```
 
+If you installed with `uv tool`, omit `uvx --python 3.13` from those commands.
+
 ## Documentation
 
 - [Getting Started](docs/getting-started.md)

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.1.2'
-__version_tuple__ = version_tuple = (0, 1, 2)
+__version__ = version = '0.1.4'
+__version_tuple__ = version_tuple = (0, 1, 4)
 
 __commit_id__ = commit_id = None

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/cli/node.py

@@ -16,9 +16,15 @@ def run_workspace_package_command(workspace_dir: Path, package_dir: Path, *args:
         return False
 
     executable, command_prefix = package_manager
+    command_args = _normalize_package_manager_args(
+        executable,
+        workspace_dir,
+        args,
+    )
     subprocess.run(
-        [executable, *command_prefix, *args],
+        [executable, *command_prefix, *command_args],
         cwd=str(package_dir),
+        env=_package_manager_env(executable, command_args),
         check=True,
     )
     return True
@@ -81,3 +87,29 @@ def _which_node_binary(name: str) -> str | None:
             return str(candidate)
 
     return None
+
+
+def _normalize_package_manager_args(
+    executable: str,
+    workspace_dir: Path,
+    args: tuple[str, ...],
+) -> tuple[str, ...]:
+    """Avoid mutating or validating partial install-set lockfiles with pnpm."""
+    if (
+        Path(executable).name == "pnpm"
+        and args == ("install",)
+        and (workspace_dir / "pnpm-lock.yaml").is_file()
+    ):
+        return ("install", "--no-lockfile", "--shamefully-hoist")
+
+    return args
+
+
+def _package_manager_env(
+    executable: str,
+    args: tuple[str, ...],
+) -> dict[str, str] | None:
+    if Path(executable).name == "pnpm" and args and args[0] == "install":
+        return {**os.environ, "CI": "true"}
+
+    return None

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/cli/setup.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import json
 import platform
 import secrets
 import shlex
@@ -141,8 +142,10 @@ def _clone_workspace(workspace_dir: str) -> None:
     ws = Path(workspace_dir)
     if ws.exists() and (ws / ".git").is_dir():
         click.echo(f"Workspace already exists at {ws}, pulling latest...")
-        subprocess.run(["git", "-C", str(ws), "pull", "--ff-only"], check=True)
+        _update_existing_workspace(ws)
+        _remove_managed_repo_symlinks(ws)
         _multi_sync(ws)
+        _update_install_set_repos(ws)
         return
 
     click.echo(f"Cloning workspace to {ws}...")
@@ -151,6 +154,81 @@ def _clone_workspace(workspace_dir: str) -> None:
         check=True,
     )
     _multi_sync(ws)
+    _update_install_set_repos(ws)
+
+
+def _update_existing_workspace(ws: Path) -> None:
+    if ws.resolve() == DEFAULT_WORKSPACE_DIR.resolve():
+        dirty = subprocess.run(
+            ["git", "-C", str(ws), "status", "--porcelain"],
+            check=True,
+            capture_output=True,
+            text=True,
+        ).stdout.strip()
+        if dirty:
+            click.echo(
+                "Resetting managed install workspace before update; "
+                "local generated changes are discarded."
+            )
+            subprocess.run(["git", "-C", str(ws), "fetch", "origin", "main"], check=True)
+            subprocess.run(
+                ["git", "-C", str(ws), "reset", "--hard", "origin/main"],
+                check=True,
+            )
+            return
+
+    subprocess.run(["git", "-C", str(ws), "pull", "--ff-only"], check=True)
+
+
+def _remove_managed_repo_symlinks(ws: Path) -> None:
+    if ws.resolve() != DEFAULT_WORKSPACE_DIR.resolve():
+        return
+
+    for repo_name in _install_set_repo_names(ws):
+        repo_path = ws / repo_name
+        if repo_path.is_symlink():
+            click.echo(f"Removing symlinked install repo at {repo_path}")
+            repo_path.unlink()
+
+
+def _update_install_set_repos(ws: Path) -> None:
+    for repo_name in _install_set_repo_names(ws):
+        repo_path = ws / repo_name
+        if not (repo_path / ".git").exists():
+            continue
+
+        if ws.resolve() == DEFAULT_WORKSPACE_DIR.resolve():
+            click.echo(f"Updating managed install repo {repo_name}...")
+            subprocess.run(
+                ["git", "-C", str(repo_path), "fetch", "origin", "main"],
+                check=True,
+            )
+            subprocess.run(
+                ["git", "-C", str(repo_path), "reset", "--hard", "origin/main"],
+                check=True,
+            )
+        else:
+            subprocess.run(["git", "-C", str(repo_path), "pull", "--ff-only"], check=True)
+
+
+def _install_set_repo_names(ws: Path) -> list[str]:
+    multi_json_path = ws / "multi.json"
+    if not multi_json_path.is_file():
+        return []
+
+    try:
+        multi_json = json.loads(multi_json_path.read_text(encoding="utf-8"))
+    except (OSError, json.JSONDecodeError):
+        return []
+
+    names = []
+    for repo in multi_json.get("repos", []):
+        install_sets = repo.get("installSets")
+        if install_sets is not None and WORKSPACE_INSTALL_SET not in install_sets:
+            continue
+        if name := repo.get("name"):
+            names.append(name)
+    return names
 
 
 def _multi_sync(ws_path: Path) -> None:

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/config/asgi.py

@@ -18,11 +18,11 @@ django_asgi_app = get_asgi_application()
 
 from channels.routing import ProtocolTypeRouter, URLRouter  # noqa: E402
 
-from openbase_coder_cli.openbase_coder_cli_app.middleware import (
-    TokenAuthMiddleware,  # noqa: E402
+from openbase_coder_cli.openbase_coder_cli_app.middleware import (  # noqa: E402
+    TokenAuthMiddleware,
 )
-from openbase_coder_cli.openbase_coder_cli_app.routing import (
-    websocket_urlpatterns,  # noqa: E402
+from openbase_coder_cli.openbase_coder_cli_app.routing import (  # noqa: E402
+    websocket_urlpatterns,
 )
 
 _inner = ProtocolTypeRouter(

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/config/authentication.py

@@ -7,9 +7,10 @@ import logging
 import httpx
 from django.conf import settings
 from django.contrib.auth import get_user_model
-from openbase_coder_cli.config.jwt_validation import InvalidTokenError, JWKSValidator
 from rest_framework import authentication, exceptions
 
+from openbase_coder_cli.config.jwt_validation import InvalidTokenError, JWKSValidator
+
 logger = logging.getLogger(__name__)
 
 _validator: JWKSValidator | None = None

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/livekit_agent/livekit.py

@@ -1688,20 +1688,19 @@ class SpeechFormattingSynthesizeStream:
         if self._buffer:
             spoken_text = format_for_speech(self._buffer)
             final_text = spoken_text or "Technical output omitted, shown on screen."
-            if LIVEKIT_VERBOSE_LOGGING:
-                logger.info(
-                    "dispatch_timing stage=tts_stream_flush role=%s voice_id=%s "
-                    "voice_name=%s flush_count=%d original_len=%d text_len=%d "
-                    "text_hash=%s text_excerpt=%r",
-                    self._role,
-                    self._voice_id or "",
-                    self._voice_name or "",
-                    self._flush_count,
-                    len(self._buffer),
-                    len(final_text),
-                    hashlib.sha256(final_text.encode("utf-8")).hexdigest()[:12],
-                    final_text[:160],
-                )
+            logger.info(
+                "dispatch_timing stage=tts_stream_flush role=%s voice_id=%s "
+                "voice_name=%s flush_count=%d original_len=%d text_len=%d "
+                "text_hash=%s text_excerpt=%r",
+                self._role,
+                self._voice_id or "",
+                self._voice_name or "",
+                self._flush_count,
+                len(self._buffer),
+                len(final_text),
+                hashlib.sha256(final_text.encode("utf-8")).hexdigest()[:12],
+                final_text[:160],
+            )
             self._stream.push_text(final_text)
             self._buffer = ""
         elif LIVEKIT_VERBOSE_LOGGING:

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/openbase_coder_cli_app/apps.py

@@ -4,8 +4,6 @@ Django app configuration for openbase_coder_cli_app.
 
 from __future__ import annotations
 
-import os
-
 from django.apps import AppConfig
 
 

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/openbase_coder_cli_app/middleware.py

@@ -8,6 +8,7 @@ from urllib.parse import parse_qs
 import httpx
 from channels.middleware import BaseMiddleware
 from django.conf import settings
+
 from openbase_coder_cli.config.jwt_validation import InvalidTokenError, JWKSValidator
 
 logger = logging.getLogger(__name__)

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/openbase_coder_cli_app/serializers.py

@@ -6,7 +6,6 @@ Add your DRF serializers here.
 
 from __future__ import annotations
 
-from openbase_coder_cli.config.serializers import TimestampedModelSerializer
 
 # Example serializer - replace with your own serializers
 # from openbase_coder_cli.openbase_coder_cli_app.models import Item

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/services/boilersync.py

@@ -9,7 +9,6 @@ from typing import Any
 
 from openbase_coder_cli.services.installation import InstallationConfig
 
-
 BOILERSYNC_TIMEOUT_SECONDS = 30
 
 

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/services/installation.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import json
 from dataclasses import asdict, dataclass
-from pathlib import Path
 
 from openbase_coder_cli.paths import INSTALLATION_JSON_PATH
 

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/openbase_coder_cli/services/tailnet_devices.py

@@ -3,8 +3,8 @@ from __future__ import annotations
 import json
 import shutil
 import subprocess
-from dataclasses import dataclass
 from concurrent.futures import ThreadPoolExecutor
+from dataclasses import dataclass
 from typing import Any
 
 import httpx

{openbase_coder-0.1.2 → openbase_coder-0.1.4}/pyproject.toml

@@ -95,10 +95,10 @@ version-file = "openbase_coder_cli/_version.py"
 
 [tool.ruff]
 target-version = "py313"
-select = ["E", "F", "I", "B", "W", "C90"]
-ignore = ["C901", "E501", "F821"]
 
 [tool.ruff.lint]
+select = ["E", "F", "I", "B", "W", "C90"]
+ignore = ["C901", "E501", "F821"]
 fixable = ["ALL"]
 unfixable = []