Merge pull request #980 from yasinBursali/fix/bsd-sed-and-models-exception

fix: portable ANSI stripping and narrowed GPU exception

Author: Lightheartdevs

dream-server/dream-preflight.sh

@@ -80,7 +80,7 @@ WARN=0
 
 log() {
     echo -e "$1"
-    echo -e "$1" | sed 's/\x1b\[[0-9;]*m//g' >> "$LOG_FILE"
+    echo -e "$1" | sed $'s/\033\\[[0-9;]*m//g' >> "$LOG_FILE"
 }
 pass() { log "${GREEN}✓${NC} $1"; PASS=$((PASS+1)); }
 fail() { log "${RED}✗${NC} $1"; FAIL=$((FAIL+1)); }

dream-server/extensions/services/dashboard-api/routers/models.py

@@ -20,6 +20,20 @@
 _LIBRARY_PATH = Path(INSTALL_DIR) / "config" / "model-library.json"
 _MODELS_DIR = Path(DATA_DIR) / "models"
 _ENV_PATH = Path(INSTALL_DIR) / ".env"
+_GPU_VRAM_EXCEPTIONS = (
+    ImportError,
+    FileNotFoundError,
+    OSError,
+    KeyError,
+    AttributeError,
+)
+
+try:
+    import pynvml
+except ImportError:
+    pynvml = None
+else:
+    _GPU_VRAM_EXCEPTIONS = _GPU_VRAM_EXCEPTIONS + (pynvml.NVMLError,)
 
 
 def _load_library() -> list[dict]:
@@ -79,7 +93,8 @@ def _get_gpu_vram() -> Optional[ModelLibraryGpu]:
             vramUsed=round(used_gb, 1),
             vramFree=round(total_gb - used_gb, 1),
         )
-    except Exception:
+    except _GPU_VRAM_EXCEPTIONS as exc:
+        logger.warning("GPU VRAM detection failed: %s", exc)
         return None
 
 

dream-server/extensions/services/dashboard-api/tests/test_models.py

@@ -0,0 +1,40 @@
+"""Focused tests for the models router helpers."""
+
+from __future__ import annotations
+
+import importlib
+import sys
+import types
+
+
+def test_get_gpu_vram_returns_none_on_nvml_error(monkeypatch):
+    """Operational NVML failures should degrade to unknown GPU rather than 500."""
+
+    class FakeNVMLError(Exception):
+        pass
+
+    def _raise_nvml_error():
+        raise FakeNVMLError("driver not loaded")
+
+    real_gpu = sys.modules.get("gpu")
+    real_pynvml = sys.modules.get("pynvml")
+
+    monkeypatch.setitem(sys.modules, "gpu", types.SimpleNamespace(get_gpu_info=_raise_nvml_error))
+    monkeypatch.setitem(sys.modules, "pynvml", types.SimpleNamespace(NVMLError=FakeNVMLError))
+
+    import routers.models as models_router
+
+    importlib.reload(models_router)
+    assert models_router._get_gpu_vram() is None
+
+    if real_gpu is None:
+        monkeypatch.delitem(sys.modules, "gpu", raising=False)
+    else:
+        monkeypatch.setitem(sys.modules, "gpu", real_gpu)
+
+    if real_pynvml is None:
+        monkeypatch.delitem(sys.modules, "pynvml", raising=False)
+    else:
+        monkeypatch.setitem(sys.modules, "pynvml", real_pynvml)
+
+    importlib.reload(models_router)