This commit is contained in:
2025-12-31 22:05:25 -08:00
parent 807ea7f53a
commit cfd791d415
12 changed files with 248 additions and 175 deletions

View File

@@ -35,20 +35,45 @@ def _try_import(module: str) -> bool:
return False
_FLORENCEVISION_DEPENDENCIES: List[Tuple[str, str]] = [
("transformers", "transformers>=4.45.0"),
("torch", "torch>=2.4.0"),
("PIL", "Pillow>=10.0.0"),
("einops", "einops>=0.8.0"),
("timm", "timm>=1.0.0"),
]
_PROVIDER_DEPENDENCIES: Dict[str, List[Tuple[str, str]]] = {
"telegram": [("telethon", "telethon>=1.36.0")],
"soulseek": [("aioslsk", "aioslsk>=1.6.0")],
}
def florencevision_missing_modules() -> List[str]:
missing: List[str] = []
# pillow is already in requirements, but keep the check for robustness.
if not _try_import("transformers"):
missing.append("transformers")
if not _try_import("torch"):
missing.append("torch")
if not _try_import("PIL"):
missing.append("pillow")
# Florence-2 remote code frequently requires these extras.
if not _try_import("einops"):
missing.append("einops")
if not _try_import("timm"):
missing.append("timm")
return [
requirement
for import_name, requirement in _FLORENCEVISION_DEPENDENCIES
if not _try_import(import_name)
]
def _provider_missing_modules(config: Dict[str, Any]) -> Dict[str, List[str]]:
missing: Dict[str, List[str]] = {}
provider_cfg = (config or {}).get("provider")
if not isinstance(provider_cfg, dict):
return missing
for provider_name, requirements in _PROVIDER_DEPENDENCIES.items():
block = provider_cfg.get(provider_name)
if not isinstance(block, dict) or not block:
continue
missing_for_provider = [
requirement
for import_name, requirement in requirements
if not _try_import(import_name)
]
if missing_for_provider:
missing[provider_name] = missing_for_provider
return missing
@@ -73,47 +98,51 @@ def _pip_install(requirements: List[str]) -> Tuple[bool, str]:
return False, str(exc)
def _install_requirements(label: str, requirements: List[str]) -> None:
if not requirements:
return
names = ", ".join(requirements)
status_text = f"Installing {label} dependencies: {names}"
try:
with stdout_console().status(status_text, spinner="dots"):
ok, detail = _pip_install(requirements)
except Exception:
log(f"[startup] {label} dependencies missing ({names}). Attempting auto-install...")
ok, detail = _pip_install(requirements)
if ok:
log(f"[startup] {label} dependency install OK")
else:
log(f"[startup] {label} dependency auto-install failed. {detail}")
def maybe_auto_install_configured_tools(config: Dict[str, Any]) -> None:
"""Best-effort dependency auto-installer for configured tools.
"""Best-effort dependency auto-installer for configured tools and providers.
This is intentionally conservative:
- Only acts when a tool block is enabled.
- Only acts when a configuration block is present/enabled.
- Skips under pytest.
Current supported tool(s): florencevision
Current supported features: FlorenceVision tool, Telegram provider, Soulseek provider
"""
if _is_pytest():
return
tool_cfg = (config or {}).get("tool")
if not isinstance(tool_cfg, dict):
return
if isinstance(tool_cfg, dict):
fv = tool_cfg.get("florencevision")
if isinstance(fv, dict) and _as_bool(fv.get("enabled"), False):
auto_install = _as_bool(fv.get("auto_install"), True)
if auto_install:
missing = florencevision_missing_modules()
if missing:
_install_requirements("FlorenceVision", missing)
fv = tool_cfg.get("florencevision")
if isinstance(fv, dict) and _as_bool(fv.get("enabled"), False):
auto_install = _as_bool(fv.get("auto_install"), True)
if not auto_install:
return
missing = florencevision_missing_modules()
if not missing:
return
names = ", ".join(missing)
try:
with stdout_console().status(
f"Installing FlorenceVision dependencies: {names}",
spinner="dots",
):
ok, detail = _pip_install(missing)
except Exception:
log(f"[startup] FlorenceVision dependencies missing ({names}). Attempting auto-install...")
ok, detail = _pip_install(missing)
if ok:
log("[startup] FlorenceVision dependency install OK")
else:
log(f"[startup] FlorenceVision dependency auto-install failed. {detail}")
provider_missing = _provider_missing_modules(config)
for provider_name, requirements in provider_missing.items():
label = f"{provider_name.title()} provider"
_install_requirements(label, requirements)
__all__ = ["maybe_auto_install_configured_tools", "florencevision_missing_modules"]