cave-cli 3.6.0b2__tar.gz → 3.6.0b4__tar.gz

{cave_cli-3.6.0b2/cave_cli.egg-info → cave_cli-3.6.0b4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cave_cli
-Version: 3.6.0b2
+Version: 3.6.0b4
 Summary: CLI for creating and managing Docker-based CAVE web applications.
 Author-email: MIT-CAVE <cave-contact@mit.edu>
 License: Apache-2.0

{cave_cli-3.6.0b2 → cave_cli-3.6.0b4}/cave_cli/utils/display.py

@@ -178,11 +178,19 @@ class LogLine:
 # ── Log filtering ──────────────────────────────────────────────────────────
 
 _LEVEL_PREFIX_RE = re.compile(
-    r"^(INFO|WARNING|WARN|ERROR|DEBUG|CRITICAL):[ \t]?", re.IGNORECASE
+    r"^(INFO|WARNING|WARN|ERROR|DEBUG|CRITICAL):[ \t]*", re.IGNORECASE
 )
 
+# Uvicorn's own formatter prepends a level prefix to every message (e.g.
+# "INFO:     Started server process [1]"), and the container's run script
+# wraps that again with its own level prefix, producing nested prefixes such
+# as "INFO: INFO:     ...". strip_level_prefix() below strips these
+# iteratively so a fully-clean message is left either way.
+_ACCESS_LOG_RE = re.compile(r'"[A-Z]+ \S* HTTP/\d\.\d"')
+
 # Lines to silently drop in clean mode (very noisy, no user value).
-# WebSocket CONNECT/DISCONNECT are processed for client count but not displayed.
+# WebSocket CONNECT/DISCONNECT (old Channels runserver) and SOCKET CONNECTION
+# OPENED/CLOSED (custom markers) are processed for client count but not displayed.
 _SKIP_PATTERNS: tuple[str, ...] = (
     "WS RECEIVE  ",
     "HTTP ",
@@ -192,11 +200,34 @@ _SKIP_PATTERNS: tuple[str, ...] = (
     "Django version ",
     "Starting ASGI",
     "Starting development server",
-    "Quit the server with CONTROL-C", 
+    "Quit the server with CONTROL-C",
     "Watching for file changes",
     "Performing system checks",
     "System check identified no issues",
     "changed, reloading",
+
+    # Uvicorn Startup Lines
+    "Started server process ",
+    "Waiting for application startup",
+    "Waiting for application shutdown",
+    "Application startup complete",
+    "Application shutdown complete",
+    "Uvicorn running on",
+    "Shutting down",
+    "Finished server process ",
+    "detected changes in",
+    "connection open",
+    "connection closed",
+    "Will watch for changes in these directories",
+    "Started reloader process",
+    "StatReload",
+    "Reloading",
+    "reloading",
+
+    # Custom socket markers (processed for client count, not displayed)
+    "SOCKET CONNECTION OPENED",
+    "SOCKET CONNECTION CLOSED",
+
     # Current Date. EG:  April 28, 2026
     f"{time.strftime('%B %d, %Y')}",
 )
@@ -215,12 +246,34 @@ _VALIDATION_PATTERNS: tuple[str, ...] = (
     "RuntimeWarning",
 )
 
-_LOADING_TRIGGER = "Starting ASGI"
-_READY_TRIGGER = "Quit the server with CONTROL-C"
-_RELOAD_TRIGGER = "changed, reloading"
+# Django (old) and Uvicorn (new) status transition triggers, checked against
+# the fully level-prefix-stripped line. Uvicorn only prints its startup
+# banner ("Uvicorn running on ...") once per process, not on every autoreload
+# cycle, so "Application startup complete" -- which does reprint each
+# reload -- is used as the READY trigger instead.
+_LOADING_TRIGGERS = (
+    "Starting ASGI",
+    "Starting development server",
+    "Started server process ",
+    "Waiting for application startup",
+)
+_READY_TRIGGERS = (
+    "Quit the server with CONTROL-C",
+    "Application startup complete",
+    "Ready",
+    "App Ready",
+)
+_RELOAD_TRIGGERS = (
+    "changed, reloading",
+    "detected changes in",
+    "Reloading",
+    "reloading",
+)
 
 _WS_CONNECT = "WebSocket CONNECT "
 _WS_DISCONNECT = "WebSocket DISCONNECT "
+_SOCKET_OPENED = "SOCKET CONNECTION OPENED"
+_SOCKET_CLOSED = "SOCKET CONNECTION CLOSED"
 
 
 class LogFilter:
@@ -253,8 +306,19 @@ class LogFilter:
         - ``stripped``:
             - Type: str
             - What: The line with the level prefix removed.
+
+        Notes:
+
+        - Strips repeatedly so nested prefixes (e.g. a container run
+          script's "INFO: " wrapped around uvicorn's own "INFO:     "
+          formatter output) are fully removed, not just the outermost one.
         """
-        return _LEVEL_PREFIX_RE.sub("", line, count=1)
+        stripped = line
+        while True:
+            new = _LEVEL_PREFIX_RE.sub("", stripped, count=1)
+            if new == stripped:
+                return new
+            stripped = new
 
     @staticmethod
     def classify_status(stripped: str) -> str | None:
@@ -279,12 +343,12 @@ class LogFilter:
 
         - READY is checked first so a reload cycle correctly resets the status.
         """
-        if _READY_TRIGGER in stripped:
+        if any(t in stripped for t in _READY_TRIGGERS):
             return READY
-        if _LOADING_TRIGGER in stripped or "Starting development server" in stripped:
-            return LOADING
-        if _RELOAD_TRIGGER in stripped:
+        if any(t in stripped for t in _RELOAD_TRIGGERS):
             return RELOADING
+        if any(t in stripped for t in _LOADING_TRIGGERS):
+            return LOADING
         return None
 
     @staticmethod
@@ -305,10 +369,16 @@ class LogFilter:
         - ``event``:
             - Type: str | None
             - What: ``"connect"`` or ``"disconnect"``, or None if not a WS event.
+
+        Notes:
+
+        - Recognizes both the old Django Channels runserver format
+          ("WebSocket CONNECT "/"WebSocket DISCONNECT ") and the custom
+          uvicorn app markers ("SOCKET CONNECTION OPENED"/"CLOSED").
         """
-        if _WS_CONNECT in stripped:
+        if _WS_CONNECT in stripped or _SOCKET_OPENED in stripped:
             return "connect"
-        if _WS_DISCONNECT in stripped:
+        if _WS_DISCONNECT in stripped or _SOCKET_CLOSED in stripped:
             return "disconnect"
         return None
 
@@ -327,6 +397,8 @@ class LogFilter:
         """
         if not stripped.strip():
             return True
+        if _ACCESS_LOG_RE.search(stripped):
+            return True
         return any(p in stripped for p in _SKIP_PATTERNS)
 
     @staticmethod
@@ -350,7 +422,12 @@ class LogFilter:
 
         - Raw-line starts with WARNING:/ERROR: are always validation.
         - Indented lines are treated as traceback continuation frames.
+        - Uvicorn's autoreload notice ("WatchFiles detected changes in
+          ...") is logged at WARNING level but is a benign status message,
+          not an error, so reload triggers are excluded first.
         """
+        if any(t in stripped for t in _RELOAD_TRIGGERS):
+            return False
         raw_upper = raw.upper()
         if raw_upper.startswith("WARNING:") or raw_upper.startswith("ERROR:"):
             return True
@@ -715,20 +792,24 @@ class RunDashboard:
         # Status transitions (always checked)
         new_status = self._filter.classify_status(stripped)
         if new_status:
-            self._status = new_status
-            if new_status == RELOADING:
-                self._ws_clients = 0
-                reloading_entry = LogLine(timestamp=ts, text="Reloading", raw=f"INFO: {stripped}")
-                add_minimal(reloading_entry)
-                add_all(reloading_entry)
-                if self._show_all and self._scroll_offset > 0:
-                    self._scroll_offset += 1
-            elif new_status == READY:
-                ready_entry = LogLine(timestamp=ts, text="Ready", raw="INFO: Ready")
-                add_minimal(ready_entry)
-                add_all(ready_entry)
-                if self._show_all and self._scroll_offset > 0:
-                    self._scroll_offset += 1
+            # During reload, do not transition status back to LOADING when the new worker process starts
+            if self._status == RELOADING and new_status == LOADING:
+                pass
+            else:
+                self._status = new_status
+                if new_status == RELOADING:
+                    self._ws_clients = 0
+                    reloading_entry = LogLine(timestamp=ts, text="App Reloading", raw="INFO: App Reloading")
+                    add_minimal(reloading_entry)
+                    add_all(reloading_entry)
+                    if self._show_all and self._scroll_offset > 0:
+                        self._scroll_offset += 1
+                elif new_status == READY:
+                    ready_entry = LogLine(timestamp=ts, text="App Ready", raw="INFO: App Ready")
+                    add_minimal(ready_entry)
+                    add_all(ready_entry)
+                    if self._show_all and self._scroll_offset > 0:
+                        self._scroll_offset += 1
 
         # WebSocket client count (before noise filter so we never miss events)
         ws_ev = self._filter.ws_event(stripped)

{cave_cli-3.6.0b2 → cave_cli-3.6.0b4/cave_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cave_cli
-Version: 3.6.0b2
+Version: 3.6.0b4
 Summary: CLI for creating and managing Docker-based CAVE web applications.
 Author-email: MIT-CAVE <cave-contact@mit.edu>
 License: Apache-2.0

{cave_cli-3.6.0b2 → cave_cli-3.6.0b4}/cave_cli.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ cave_cli/utils/subprocess.py
 cave_cli/utils/sync.py
 cave_cli/utils/validate.py
 cave_cli/utils/version.py
+test/test_display.py
 test/test_env.py
 test/test_net.py
 test/test_sync.py

{cave_cli-3.6.0b2 → cave_cli-3.6.0b4}/pyproject.toml

@@ -12,7 +12,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cave_cli"
-version = "3.6.0b2"
+version = "3.6.0b4"
 description = "CLI for creating and managing Docker-based CAVE web applications."
 authors = [
     {name = "MIT-CAVE", email = "cave-contact@mit.edu"}

cave_cli-3.6.0b4/test/test_display.py

@@ -0,0 +1,64 @@
+import pytest
+from cave_cli.utils.display import LogFilter, RunDashboard, READY, LOADING, RELOADING
+
+class TestLogFilter:
+    def test_strip_level_prefix(self):
+        filter_obj = LogFilter()
+        assert filter_obj.strip_level_prefix("INFO:     Started server process [134449]") == "Started server process [134449]"
+        assert filter_obj.strip_level_prefix("INFO: INFO:     Started server process [134449]") == "Started server process [134449]"
+        assert filter_obj.strip_level_prefix("WARNING: Connection lost") == "Connection lost"
+        assert filter_obj.strip_level_prefix("connection open") == "connection open"
+
+    def test_ws_event(self):
+        filter_obj = LogFilter()
+        # Old Channels
+        assert filter_obj.ws_event("WebSocket CONNECT /ws/") == "connect"
+        assert filter_obj.ws_event("WebSocket DISCONNECT /ws/") == "disconnect"
+        
+        # Custom markers
+        assert filter_obj.ws_event("SOCKET CONNECTION OPENED") == "connect"
+        assert filter_obj.ws_event("SOCKET CONNECTION CLOSED") == "disconnect"
+        
+        # New Uvicorn vanilla markers should not be classified as events to avoid double counting
+        assert filter_obj.ws_event("connection open") is None
+        assert filter_obj.ws_event("connection closed") is None
+        
+        # Other logs
+        assert filter_obj.ws_event("some other message") is None
+
+    def test_classify_status(self):
+        filter_obj = LogFilter()
+        assert filter_obj.classify_status("Application startup complete.") == READY
+        assert filter_obj.classify_status("Started server process [134449]") == LOADING
+        assert filter_obj.classify_status("detected changes in 'app.py', reloading") == RELOADING
+        assert filter_obj.classify_status("StatReload detected file change in 'app.py' - Reloading...") == RELOADING
+        assert filter_obj.classify_status("Reloading...") == RELOADING
+        assert filter_obj.classify_status("Just some logging") is None
+
+    def test_is_noise(self):
+        filter_obj = LogFilter()
+        assert filter_obj.is_noise("connection open") is True
+        assert filter_obj.is_noise("connection closed") is True
+        assert filter_obj.is_noise("SOCKET CONNECTION OPENED") is True
+        assert filter_obj.is_noise("WebSocket CONNECT /ws/") is True
+        assert filter_obj.is_noise("Started server process ") is True
+        assert filter_obj.is_noise("Will watch for changes in these directories: ['/app']") is True
+        assert filter_obj.is_noise("Started reloader process [48] using StatReload") is True
+        assert filter_obj.is_noise("some actual log line") is False
+
+
+class TestRunDashboard:
+    def test_reload_log_entry(self):
+        dashboard = RunDashboard(app_name="test_app", url="http://localhost:8000")
+        assert len(dashboard._log_lines) == 1
+        assert dashboard._log_lines[0].text == "App Loading"
+
+        dashboard._process_line("INFO:     Application startup complete.")
+        assert dashboard._log_lines[-1].text == "App Ready"
+
+        dashboard._process_line("WARNING:  StatReload detected file change in 'app.py' - Reloading...")
+        assert dashboard._log_lines[-1].text == "App Reloading"
+        assert dashboard._log_lines[-1].raw == "INFO: App Reloading"
+
+        dashboard._process_line("INFO:     Application startup complete.")
+        assert dashboard._log_lines[-1].text == "App Ready"