Pushing the run_id to the queue that feeds the live stream

Author: antonio-amjr

th_cli/test_run/log_stream_handler.py

@@ -77,9 +77,23 @@ def set_run_id(self, run_id: int) -> None:
         once the run has been created (its id isn't known when the server
         starts).
         """
-        if self.is_running:
-            self.http_server.set_run_id(run_id)
-    
+        if not self.is_running:
+            return
+
+        self.http_server.set_run_id(run_id)
+
+        # A viewer may already be connected (the run_id is typically set
+        # only *after* the viewer URL was printed and likely opened), so
+        # also push it through the existing SSE stream as a control message
+        # - a future/refreshed page load will pick it up from the HTTP
+        # server attribute above, but an already-open one only sees this.
+        try:
+            self.log_queue.put_nowait({"__event__": "run_id", "run_id": run_id})
+        except queue.Full:
+            # Best-effort: a future page load/refresh will still pick up
+            # the run id via the HTTP server attribute set above.
+            pass
+
     def stop(self):
         """Stop the log streaming HTTP server."""
         if not self.is_running:

th_cli/test_run/log_viewer.html

@@ -525,11 +525,15 @@
 
     <script>
         // Injected server-side: the run's id (or null if the run hasn't been
-        // created yet) and the backend's configured hostname (or null if it
-        // was just "localhost"/"127.0.0.1" - meaningless once embedded in a
-        // page that may be opened from a different device than the one
-        // running the CLI). See updateDownloadLink() below.
-        const RUN_ID = {run_id};
+        // created yet - reassigned later via the 'run_id' SSE event below if
+        // it arrives after this page has already loaded, which is the
+        // common case: the viewer URL is printed and typically opened
+        // before the run is created) and the backend's configured hostname
+        // (or null if it was just "localhost"/"127.0.0.1" - meaningless
+        // once embedded in a page that may be opened from a different
+        // device than the one running the CLI). See updateDownloadLink()
+        // below.
+        let RUN_ID = {run_id};
         const BACKEND_HOST = {backend_host};
 
         let eventSource = null;
@@ -572,6 +576,16 @@
                 statusText.textContent = 'Connected';
             }});
 
+            eventSource.addEventListener('run_id', function(e) {{
+                // Arrives once the run is created, which is typically after
+                // this page has already loaded (RUN_ID was baked in as null
+                // at that point) - re-resolve the download link now that
+                // it's known, without requiring a page reload.
+                const data = JSON.parse(e.data);
+                RUN_ID = data.run_id;
+                updateDownloadLink();
+            }});
+
             eventSource.addEventListener('log', function(e) {{
                 const logEntry = JSON.parse(e.data);
                 logBatchQueue.push(logEntry);

th_cli/test_run/logs_http_server.py

@@ -76,20 +76,30 @@ def stream_logs(self):
                 try:
                     # Get log entry from queue with timeout
                     log_entry = log_queue.get(timeout=1.0)
-                    
+
                     if log_entry is None:  # Signal to stop
                         logger.info("Received end-of-stream signal for logs")
                         self._send_sse_event("end", {"message": "Log stream ended"})
                         break
 
+                    if isinstance(log_entry, dict) and log_entry.get("__event__") == "run_id":
+                        # Control message, not a log line - lets an already-
+                        # connected viewer pick up the run id once it's
+                        # known, instead of only a fresh page load.
+                        if not self._send_sse_event("run_id", {"run_id": log_entry["run_id"]}):
+                            logger.debug("Client disconnected while streaming")
+                            client_disconnected = True
+                            break
+                        continue
+
                     # Send log entry as SSE event
                     if not self._send_sse_event("log", log_entry):
                         logger.debug("Client disconnected while streaming")
                         client_disconnected = True
                         break
-                        
+
                     sent_count += 1
-                    
+
                     if sent_count % 100 == 0:
                         logger.debug(f"Sent {sent_count} log entries to client")