eggpool 0.2.0__tar.gz → 0.2.1__tar.gz

{eggpool-0.2.0 → eggpool-0.2.1}/CHANGELOG.md

@@ -7,6 +7,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.2.1] - 2026-06-24
+
+### Fixed
+
+- `eggpool serve` returning 500 with `TypeError: 'NoneType' object is not
+  callable` on Python 3.14 / spawn-based multiprocessing start methods.
+  Granian workers re-import `eggpool.cli` in a fresh interpreter, so the
+  module-level `_app` set by the parent process was `None` in the worker
+  and the `target_loader` returned `None` as the ASGI callback. `_app_loader`
+  now rebuilds the `FastAPI` app from the config path inside each worker.
+  Follow-up to the [0.1.4] module-level loader fix.
+
 ## [0.2.0] - 2026-06-24
 
 ### Added

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eggpool
-Version: 0.2.0
+Version: 0.2.1
 Summary: A lightweight proxy that aggregates multiple LLM provider accounts behind one OpenAI-compatible endpoint
 Project-URL: Homepage, https://github.com/eggstack/eggpool
 Project-URL: Repository, https://github.com/eggstack/eggpool

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

@@ -1,6 +1,6 @@
 [project]
 name = "eggpool"
-version = "0.2.0"
+version = "0.2.1"
 description = "A lightweight proxy that aggregates multiple LLM provider accounts behind one OpenAI-compatible endpoint"
 readme = "README.md"
 requires-python = ">=3.11"

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

@@ -91,16 +91,18 @@ class _ConfigPathGroup(click.Group):
 # Re-apply the group class after the decorator
 cli.__class__ = _ConfigPathGroup
 
-# Module-level app reference for Granian's multiprocessing pickling.
-# Granian spawns worker processes via multiprocessing which requires
-# serializable target_loader callables. Local functions (closures) cannot
-# be pickled, so _app_loader must live at module level.
-_app: Any = None
 
+def _app_loader(target: str) -> Any:
+    """Build the ASGI app for a Granian worker from the config-path target.
 
-def _app_loader(_target: str) -> Any:  # noqa: ARG001
-    """Return the pre-built ASGI app for Granian workers."""
-    return _app
+    Granian spawns worker subprocesses via multiprocessing, which produces
+    a fresh Python interpreter that re-imports ``eggpool.cli``. Module-level
+    mutable state set in the parent process is not inherited by the worker,
+    so the app must be reconstructed from the config path inside the worker.
+    """
+    from eggpool.app import create_app
+
+    return create_app(config_path=target)
 
 
 @cli.command()
@@ -132,23 +134,16 @@ def serve(ctx: click.Context) -> None:
 
     configure_logging(level=config.server.log_level)
 
-    from functools import partial
-
-    from eggpool.app import create_app
-
-    global _app  # noqa: PLW0603
-    _app = create_app(config, config_path=config_path)
-
     log_level = config.server.log_level.lower()
     Granian(
-        "unused",  # ignored when target_loader is provided
+        config_path,
         address=config.server.host,
         port=config.server.port,
         interface="asgi",  # type: ignore[reportArgumentType]
         workers=1,
         log_level=log_level,  # type: ignore[reportArgumentType]
         log_access=config.server.access_log,
-    ).serve(target_loader=partial(_app_loader))  # type: ignore[reportArgumentType]
+    ).serve(target_loader=_app_loader)  # type: ignore[reportArgumentType]
 
 
 @cli.group(invoke_without_command=True)

{eggpool-0.2.0 → eggpool-0.2.1}/src/eggpool/lifecycle/uninstall.py

@@ -176,9 +176,13 @@ def tomllib_load(blob: bytes) -> dict[str, object]:
 
 
 def _pipx_uninstall(env: dict[str, str]) -> subprocess.CompletedProcess[str]:
-    """Run ``pipx uninstall eggpool`` in the detected Python."""
-    python = env.get("EGGPOOL_PYTHON") or sys.executable
-    cmd = [python, "-m", "pipx", "uninstall", "eggpool"]
+    """Run ``pipx uninstall eggpool`` using the correct interpreter.
+
+    pipx is not installed inside the eggpool venv that pipx itself
+    manages, so we cannot use ``sys.executable`` directly. See
+    :func:`_find_pipx_invocation` for resolution details.
+    """
+    cmd = _find_pipx_invocation(env)
     return subprocess.run(  # noqa: S603
         cmd,
         capture_output=True,
@@ -188,6 +192,66 @@ def _pipx_uninstall(env: dict[str, str]) -> subprocess.CompletedProcess[str]:
     )
 
 
+def _find_pipx_invocation(env: dict[str, str]) -> list[str]:
+    """Resolve the command argv that runs ``pipx`` on this machine.
+
+    Resolution order:
+
+    1. The ``pipx`` binary on ``PATH`` (preferred — it has its own
+       shebang pointing at the Python pipx was installed under).
+    2. ``EGGPOOL_PYTHON`` env override (escape hatch for unusual setups).
+    3. A Python interpreter that has ``pipx`` importable, scanned from
+       common locations (``/usr/bin/python3``, ``/usr/local/bin/python3``,
+       then ``shutil.which`` fallbacks).
+    4. ``sys.executable`` as a last-resort fallback so we surface pipx's
+       own error instead of silently no-oping.
+    """
+    pipx_path = shutil.which("pipx")
+    if pipx_path:
+        return [pipx_path, "uninstall", "eggpool"]
+
+    override = env.get("EGGPOOL_PYTHON")
+    if override and Path(override).is_file():
+        return [override, "-m", "pipx", "uninstall", "eggpool"]
+
+    for candidate in _candidate_pythons():
+        if _python_has_pipx(candidate):
+            return [candidate, "-m", "pipx", "uninstall", "eggpool"]
+
+    return [sys.executable, "-m", "pipx", "uninstall", "eggpool"]
+
+
+def _candidate_pythons() -> list[str]:
+    """Return Python interpreters worth probing for a ``pipx`` install."""
+    found: list[str] = []
+    seen: set[str] = set()
+    for raw in ("/usr/bin/python3", "/usr/local/bin/python3"):
+        if Path(raw).is_file() and raw not in seen:
+            found.append(raw)
+            seen.add(raw)
+    for name in ("python3", "python"):
+        resolved = shutil.which(name)
+        if resolved and resolved not in seen:
+            found.append(resolved)
+            seen.add(resolved)
+    return found
+
+
+def _python_has_pipx(python: str) -> bool:
+    """Return True if ``python -m pipx --version`` exits 0."""
+    try:
+        proc = subprocess.run(  # noqa: S603
+            [python, "-m", "pipx", "--version"],
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=5,
+        )
+    except (OSError, subprocess.SubprocessError):
+        return False
+    return proc.returncode == 0
+
+
 def _uv_tool_uninstall(env: dict[str, str]) -> subprocess.CompletedProcess[str]:
     """Run ``uv tool uninstall eggpool``."""
     cmd = ["uv", "tool", "uninstall", "eggpool"]

{eggpool-0.2.0 → eggpool-0.2.1}/uv.lock

@@ -196,7 +196,7 @@ wheels = [
 
 [[package]]
 name = "eggpool"
-version = "0.2.0"
+version = "0.2.1"
 source = { editable = "." }
 dependencies = [
     { name = "aiosqlite" },