Harden orchestrator optional deps and packaging

Author: diazMelgarejo

orchestrator.py

@@ -17,6 +17,7 @@
 import json
 import asyncio
 import aiohttp
+import logging
 # Redis: Optional for MVP. PT uses file-based state (.state/agents.json) by default.
 # Redis enables distributed coordination for multi-instance deployments (v1.1+).
 # Soft import — app starts cleanly even if the redis package is not installed.
@@ -29,11 +30,37 @@
 from fastapi.middleware.trustedhost import TrustedHostMiddleware
 # fix(orchestrator): migrate from deprecated Pydantic V1 @validator to V2 @field_validator
 from pydantic import BaseModel, Field, field_validator
-from loguru import logger
-from dotenv import load_dotenv
-from slowapi import Limiter, _rate_limit_exceeded_handler
-from slowapi.util import get_remote_address
-from slowapi.errors import RateLimitExceeded
+try:
+    from loguru import logger
+except ImportError:
+    logger = logging.getLogger("perplexity_tools.orchestrator")
+try:
+    from dotenv import load_dotenv
+except ImportError:
+    def load_dotenv(*_args, **_kwargs):
+        return False
+try:
+    from slowapi import Limiter, _rate_limit_exceeded_handler
+    from slowapi.util import get_remote_address
+    from slowapi.errors import RateLimitExceeded
+except ImportError:
+    class RateLimitExceeded(Exception):
+        pass
+
+    def _rate_limit_exceeded_handler(*_args, **_kwargs):
+        raise RateLimitExceeded("slowapi is not installed")
+
+    def get_remote_address(_request):
+        return "local"
+
+    class Limiter:
+        def __init__(self, *args, **kwargs):
+            pass
+
+        def limit(self, _rule):
+            def decorator(fn):
+                return fn
+            return decorator
 
 load_dotenv()
 

orchestrator/fastapi_app.py

@@ -106,9 +106,9 @@ def ecc_sync(force: bool = Query(False)) -> Dict[str, Any]:
 
 @app.get("/health", tags=["system"])
 def health(
-    ollama_host: str = Query("http://127.0.0.1:11434"),
-    lm_studio_host: str = Query("http://127.0.0.1:1234"),
-    mlx_host: str = Query("http://127.0.0.1:8081"),
+    ollama_host: str = "http://127.0.0.1:11434",
+    lm_studio_host: str = "http://127.0.0.1:1234",
+    mlx_host: str = "http://127.0.0.1:8081",
 ) -> Dict[str, Any]:
     """Backend connectivity health check — supports Mac+Win+shared Ollama."""
     return {

orchestrator/lan_discovery.py

@@ -31,8 +31,7 @@
 try:
     import httpx
 except ImportError:
-    print("[lan_discovery] ERROR: httpx not installed. Run: pip install httpx")
-    sys.exit(1)
+    httpx = None
 
 # Common AI inference server ports
 DEFAULT_PORTS = [
@@ -114,6 +113,9 @@ async def _probe_endpoint(self, host: str, port: int) -> Optional[AIEndpoint]:
         Probe a single host:port for AI inference server.
         Returns AIEndpoint if found, None otherwise.
         """
+        if httpx is None:
+            raise RuntimeError("httpx not installed. Run: pip install httpx")
+
         base_url = f"http://{host}:{port}"
 
         try:

orchestrator/ultrathink_mcp_client.py

@@ -59,7 +59,7 @@ async def _start(self) -> None:
             "initialize",
             {
                 "protocolVersion": _MCP_PROTOCOL_VERSION,
-                "clientInfo": {"name": "perplexity-tools", "version": "1.0-rc"},
+                "clientInfo": {"name": "perplexity-tools", "version": "0.9.9.0"},
                 "capabilities": {},
             },
         )

pyproject.toml

@@ -5,11 +5,11 @@
 
 [build-system]
 requires = ["setuptools>=68", "wheel"]
-build-backend = "setuptools.backends.legacy:build"
+build-backend = "setuptools.build_meta"
 
 [project]
 name = "perplexity-tools"
-dynamic = ["version"]
+version = "0.9.9.0"
 description = "Top-level idempotent multi-agent orchestrator: per-device model selection, fallback routing, cost guard, and ultrathink-system integration."
 readme = "README.md"
 license = { text = "AGPL-3.0" }
@@ -84,9 +84,6 @@ pt-orchestrator = "orchestrator.fastapi_app:app"
 pt-setup = "setup_wizard:main"
 pt-launch = "agent_launcher:main"
 
-[tool.setuptools.dynamic]
-version = { attr = "orchestrator.__version__" }
-
 [tool.setuptools.packages.find]
 where = ["."]
 include = ["orchestrator*"]

tests/test_fastapi_health.py

@@ -0,0 +1,24 @@
+from __future__ import annotations
+
+from orchestrator import fastapi_app
+
+
+def test_health_uses_plain_string_defaults(monkeypatch):
+    captured = {}
+
+    def fake_backend_health_map(*, ollama_host, lm_studio_host, mlx_host):
+        captured["ollama_host"] = ollama_host
+        captured["lm_studio_host"] = lm_studio_host
+        captured["mlx_host"] = mlx_host
+        return {"ok": True}
+
+    monkeypatch.setattr(fastapi_app, "backend_health_map", fake_backend_health_map)
+
+    response = fastapi_app.health()
+
+    assert response["status"] == "ok"
+    assert captured == {
+        "ollama_host": "http://127.0.0.1:11434",
+        "lm_studio_host": "http://127.0.0.1:1234",
+        "mlx_host": "http://127.0.0.1:8081",
+    }

tests/test_lan_discovery.py

@@ -1,10 +1,13 @@
 from __future__ import annotations
 
+import asyncio
 import json
 import sys
 from datetime import datetime
 from pathlib import Path
 
+import pytest
+
 
 REPO_ROOT = Path(__file__).parent.parent
 sys.path.insert(0, str(REPO_ROOT))
@@ -48,3 +51,11 @@ def test_save_discovery_state_writes_timezone_aware_timestamp(tmp_path, monkeypa
 
     state = json.loads(state_file.read_text())
     _assert_timezone_aware_utc(state["discovered_at"])
+
+
+def test_probe_endpoint_requires_httpx(monkeypatch):
+    monkeypatch.setattr(lan_discovery, "httpx", None)
+    discovery = lan_discovery.LANDiscovery(subnet="127.0.0.0/30", ports=[11434])
+
+    with pytest.raises(RuntimeError, match="httpx not installed"):
+        asyncio.run(discovery._probe_endpoint("127.0.0.1", 11434))

tests/test_resilience.py

@@ -42,6 +42,7 @@ def raise_permission_error(self, *args, **kwargs):
 def test_sync_returns_structured_error_when_vendor_clone_unavailable(monkeypatch):
     import orchestrator.ecc_tools_sync as sync_mod
 
+    monkeypatch.setattr(sync_mod, "ECC_SYNC_ENABLED", True)
     monkeypatch.setattr(sync_mod, "_ensure_cloned", lambda: False)
     result = sync_mod.sync_ecc_tools(force=False)