mirror of
https://github.com/headroomlabs-ai/headroom.git
synced 2026-08-10 14:27:00 -04:00
## Description Add `orjson` to the `[proxy]` extra so `uv tool install "headroom-ai[all]"` installs a runtime dependency required by LiteLLM provider backends (e.g. OpenRouter). ## Type of Change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature - [ ] Breaking change - [ ] Documentation update ## Changes Made - Add `orjson>=3.9.14; platform_python_implementation != 'PyPy'` to `[proxy]`. - Regression test in `tests/test_optional_dependencies.py`. - Minimal `uv.lock` update (proxy/all optional-deps + metadata only). ## Motivation Fixes #2056. `headroom-ai[all]` installs `litellm` (core dep) but not `orjson`. LiteLLM provider backends import `orjson` at runtime; LiteLLM only declares it under `litellm[proxy]`, not base deps. Headroom does not depend on `litellm[proxy]` (would pull the full LiteLLM proxy server stack). ## Testing - `uv run --extra dev python -m pytest tests/test_optional_dependencies.py -q` — 2 passed - `uvx --from ruff==0.15.17 ruff check tests/test_optional_dependencies.py` - `uvx --from ruff==0.15.17 ruff format --check tests/test_optional_dependencies.py` ## Real Behavior Proof - **Setup:** Ubuntu, Python 3.12.3 - **Verified:** dependency graph test confirms `orjson` is selected for `[proxy]` and `[all]` extras after this patch. - **Not tested locally:** full `uv tool install` end-to-end (local sdist build requires Rust/C++ toolchain unavailable in this environment). Reporter workaround `uv tool install ... --with orjson` confirms the missing transitive dep diagnosis. ## Review Readiness - [x] I have performed a self-review of my code - [x] This PR is ready for human review ## Notes - Reporter used Python 3.14.4; `litellm` is intentionally skipped on 3.14 (GH #956). This PR fixes the missing `orjson` install path for supported Python versions using `[all]`. Co-authored-by: syf2211 <syf2211@users.noreply.github.com> Co-authored-by: JerrettDavis <mxjerrett@gmail.com> Co-authored-by: Tejas Chopra <chopratejas@gmail.com>
129 lines
4.4 KiB
Python
129 lines
4.4 KiB
Python
from __future__ import annotations
|
|
|
|
from pathlib import Path
|
|
|
|
from packaging.markers import default_environment
|
|
from packaging.requirements import Requirement
|
|
|
|
try:
|
|
import tomllib
|
|
except ModuleNotFoundError: # pragma: no cover - Python 3.10 fallback
|
|
import tomli as tomllib # type: ignore[no-redef]
|
|
|
|
|
|
ROOT = Path(__file__).resolve().parents[1]
|
|
ALL_EXTRA = "all"
|
|
HEADROOM_PACKAGE_NAME = "headroom-ai"
|
|
MACOS_X86_64_TORCH_GUARD = "sys_platform != 'darwin' or platform_machine != 'x86_64'"
|
|
MACOS_X86_64_SYS_PLATFORM = "darwin"
|
|
MACOS_X86_64_PLATFORM_MACHINE = "x86_64"
|
|
PYPROJECT_FILE = "pyproject.toml"
|
|
SYS_PLATFORM_MARKER = "sys_platform"
|
|
PLATFORM_MACHINE_MARKER = "platform_machine"
|
|
TORCH_PACKAGE_NAME = "torch"
|
|
TORCH_TRANSITIVE_PACKAGE_NAMES = frozenset({"sentence-transformers"})
|
|
ORJSON_PACKAGE_NAME = "orjson"
|
|
PROXY_EXTRA = "proxy"
|
|
UV_LOCK_FILE = "uv.lock"
|
|
|
|
|
|
def _selected_dependency_names_for_extra(
|
|
optional_deps: dict[str, list[str]],
|
|
extra_name: str,
|
|
environment: dict[str, str],
|
|
visited: set[str] | None = None,
|
|
) -> set[str]:
|
|
selected: set[str] = set()
|
|
visited = visited or set()
|
|
if extra_name in visited:
|
|
return selected
|
|
visited.add(extra_name)
|
|
|
|
for dependency in optional_deps[extra_name]:
|
|
requirement = Requirement(dependency)
|
|
if requirement.marker is not None and not requirement.marker.evaluate(environment):
|
|
continue
|
|
if requirement.name == HEADROOM_PACKAGE_NAME:
|
|
for nested_extra in requirement.extras:
|
|
selected.update(
|
|
_selected_dependency_names_for_extra(
|
|
optional_deps,
|
|
nested_extra,
|
|
environment,
|
|
visited,
|
|
)
|
|
)
|
|
else:
|
|
selected.add(requirement.name)
|
|
|
|
return selected
|
|
|
|
|
|
def _locked_dependency_names(package_name: str) -> set[str]:
|
|
lock = tomllib.loads((ROOT / UV_LOCK_FILE).read_text(encoding="utf-8"))
|
|
for package in lock["package"]:
|
|
if package["name"] == package_name:
|
|
return {dependency["name"] for dependency in package.get("dependencies", [])}
|
|
raise AssertionError(f"{package_name} not found in {UV_LOCK_FILE}")
|
|
|
|
|
|
def test_all_extra_does_not_require_torch_on_macos_x86_64() -> None:
|
|
"""Keep `headroom-ai[all]` resolvable where PyTorch publishes no wheel."""
|
|
|
|
pyproject = tomllib.loads((ROOT / PYPROJECT_FILE).read_text(encoding="utf-8"))
|
|
optional_deps = pyproject["project"]["optional-dependencies"]
|
|
macos_x86_64_environment = default_environment()
|
|
macos_x86_64_environment.update(
|
|
{
|
|
SYS_PLATFORM_MARKER: MACOS_X86_64_SYS_PLATFORM,
|
|
PLATFORM_MACHINE_MARKER: MACOS_X86_64_PLATFORM_MACHINE,
|
|
}
|
|
)
|
|
|
|
assert "ml" in optional_deps[ALL_EXTRA][0]
|
|
assert "voice" in optional_deps[ALL_EXTRA][0]
|
|
|
|
torch_deps = [
|
|
dep
|
|
for extra_name in ("ml", "voice")
|
|
for dep in optional_deps[extra_name]
|
|
if dep.startswith(TORCH_PACKAGE_NAME)
|
|
]
|
|
selected_all_dependency_names = _selected_dependency_names_for_extra(
|
|
optional_deps,
|
|
ALL_EXTRA,
|
|
macos_x86_64_environment,
|
|
)
|
|
locked_torch_transitive_dependency_names = {
|
|
package_name
|
|
for package_name in TORCH_TRANSITIVE_PACKAGE_NAMES
|
|
if TORCH_PACKAGE_NAME in _locked_dependency_names(package_name)
|
|
}
|
|
|
|
assert torch_deps
|
|
assert all(MACOS_X86_64_TORCH_GUARD in dep for dep in torch_deps)
|
|
assert locked_torch_transitive_dependency_names
|
|
assert TORCH_PACKAGE_NAME not in selected_all_dependency_names
|
|
assert selected_all_dependency_names.isdisjoint(locked_torch_transitive_dependency_names)
|
|
|
|
|
|
def test_proxy_extra_includes_orjson_for_litellm_backends() -> None:
|
|
"""`headroom-ai[all]` must ship orjson for LiteLLM provider backends (GH #2056)."""
|
|
|
|
pyproject = tomllib.loads((ROOT / PYPROJECT_FILE).read_text(encoding="utf-8"))
|
|
optional_deps = pyproject["project"]["optional-dependencies"]
|
|
environment = default_environment()
|
|
|
|
selected_proxy_dependency_names = _selected_dependency_names_for_extra(
|
|
optional_deps,
|
|
PROXY_EXTRA,
|
|
environment,
|
|
)
|
|
selected_all_dependency_names = _selected_dependency_names_for_extra(
|
|
optional_deps,
|
|
ALL_EXTRA,
|
|
environment,
|
|
)
|
|
|
|
assert ORJSON_PACKAGE_NAME in selected_proxy_dependency_names
|
|
assert ORJSON_PACKAGE_NAME in selected_all_dependency_names
|