Merge pull request 'feat: add Jobs and Runners commands with SSE event wiring' (#24) from feat/worker-client-ui into feat/dag-activity-display

Reviewed-on: #24

freecad/silo_commands.py

@@ -7,7 +7,6 @@ import socket
 import urllib.error
 import urllib.parse
 import urllib.request
-from datetime import datetime
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 
@@ -32,25 +31,6 @@ SILO_PROJECTS_DIR = os.environ.get(
 )
 
 
-def _relative_time(dt):
-    """Format a datetime as a human-friendly relative string."""
-    now = datetime.now()
-    diff = now - dt
-    seconds = int(diff.total_seconds())
-    if seconds < 60:
-        return "just now"
-    minutes = seconds // 60
-    if minutes < 60:
-        return f"{minutes}m ago"
-    hours = minutes // 60
-    if hours < 24:
-        return f"{hours}h ago"
-    days = hours // 24
-    if days < 30:
-        return f"{days}d ago"
-    return dt.strftime("%Y-%m-%d")
-
-
 # ---------------------------------------------------------------------------
 # FreeCAD settings adapter
 # ---------------------------------------------------------------------------
@@ -2555,8 +2535,6 @@ class SiloAuthDockWidget:
 
         self.widget = QtGui.QWidget()
         self._event_listener = None
-        self._activity_events = []  # list of (datetime, text, part_number)
-        self._activity_seeded = False
         self._build_ui()
         self._refresh_status()
 
@@ -2564,11 +2542,6 @@ class SiloAuthDockWidget:
         self._timer.timeout.connect(self._refresh_status)
         self._timer.start(30000)
 
-        # Refresh relative timestamps every 60s
-        self._ts_timer = QtCore.QTimer(self.widget)
-        self._ts_timer.timeout.connect(self._rebuild_activity_feed)
-        self._ts_timer.start(60000)
-
     # -- UI construction ----------------------------------------------------
 
     def _build_ui(self):
@@ -2667,11 +2640,7 @@ class SiloAuthDockWidget:
         btn_row.addWidget(settings_btn)
 
         layout.addLayout(btn_row)
-
-        # Keep the auth panel compact so the Activity panel below gets more space
-        self.widget.setSizePolicy(
-            QtGui.QSizePolicy.Preferred, QtGui.QSizePolicy.Maximum
-        )
+        layout.addStretch()
 
     # -- Status refresh -----------------------------------------------------
 
@@ -2783,7 +2752,6 @@ class SiloAuthDockWidget:
             self._sse_label.setStyleSheet("font-size: 11px; color: #4CAF50;")
             self._sse_label.setToolTip("")
             FreeCAD.Console.PrintMessage("Silo: SSE connected\n")
-            self._seed_activity_feed()
         elif status == "disconnected":
             self._sse_label.setText(
                 f"Reconnecting ({retry}/{SiloEventListener._MAX_RETRIES})..."
@@ -2808,8 +2776,6 @@ class SiloAuthDockWidget:
         global _server_mode
         _server_mode = mode
         self._update_mode_banner()
-        if mode != "normal":
-            self._append_activity_event(f"Server mode: {mode}")
 
     def _update_mode_banner(self):
         _MODE_BANNERS = {
@@ -2840,7 +2806,7 @@ class SiloAuthDockWidget:
         mw = FreeCADGui.getMainWindow()
         if mw is not None:
             mw.statusBar().showMessage(f"Silo: {part_number} updated on server", 5000)
-        self._append_activity_event(f"{part_number} updated", part_number)
+        self._refresh_activity_panel()
 
     def _on_remote_revision(self, part_number, revision):
         FreeCAD.Console.PrintMessage(
@@ -2851,48 +2817,89 @@ class SiloAuthDockWidget:
             mw.statusBar().showMessage(
                 f"Silo: {part_number} rev {revision} available", 5000
             )
-        self._append_activity_event(
-            f"{part_number} Rev {revision} created", part_number
+        self._refresh_activity_panel()
+
+    def _on_dag_updated(self, part_number, node_count, edge_count):
+        FreeCAD.Console.PrintMessage(
+            f"Silo: DAG updated for {part_number}"
+            f" ({node_count} nodes, {edge_count} edges)\n"
+        )
+        self._add_activity_entry(
+            f"\u25b6 {part_number} \u2013 DAG synced"
+            f" ({node_count} nodes, {edge_count} edges)",
+            part_number,
         )
 
-    def _append_activity_event(self, text, pn=""):
-        """Prepend an event to the activity feed and rebuild the display."""
-        self._activity_events.insert(0, (datetime.now(), text, pn))
-        self._activity_events = self._activity_events[:50]
-        self._rebuild_activity_feed()
+    def _on_dag_validated(self, part_number, valid, failed_count):
+        if valid:
+            status = "\u2713 PASS"
+            FreeCAD.Console.PrintMessage(f"Silo: Validation passed for {part_number}\n")
+        else:
+            status = f"\u2717 FAIL ({failed_count} failed)"
+            FreeCAD.Console.PrintWarning(
+                f"Silo: Validation failed for {part_number}"
+                f" ({failed_count} features failed)\n"
+            )
+        self._add_activity_entry(f"{status} \u2013 {part_number}", part_number)
 
-    def _seed_activity_feed(self):
-        """One-time: populate the feed with recent items from the database."""
-        if self._activity_seeded:
+    def _on_job_created(self, job_id, definition_name, part_number):
+        FreeCAD.Console.PrintMessage(
+            f"Silo: Job {definition_name} created for {part_number}\n"
+        )
+        self._add_activity_entry(
+            f"\u23f3 {part_number} \u2013 {definition_name} queued",
+            part_number,
+        )
+
+    def _on_job_completed(self, job_id):
+        FreeCAD.Console.PrintMessage(f"Silo: Job {job_id} completed\n")
+        self._refresh_activity_panel()
+
+    def _on_job_failed(self, job_id, error):
+        FreeCAD.Console.PrintError(f"Silo: Job {job_id} failed: {error}\n")
+        self._add_activity_entry(f"\u2717 Job {job_id[:8]} failed: {error}", None)
+
+    def _on_job_claimed(self, job_id, runner_id):
+        FreeCAD.Console.PrintMessage(
+            f"Silo: Job {job_id[:8]} claimed by runner {runner_id}\n"
+        )
+
+    def _on_job_progress(self, job_id, progress, message):
+        FreeCAD.Console.PrintMessage(
+            f"Silo: Job {job_id[:8]} progress {progress}%: {message}\n"
+        )
+
+    def _on_job_cancelled(self, job_id):
+        FreeCAD.Console.PrintMessage(f"Silo: Job {job_id[:8]} cancelled\n")
+        self._add_activity_entry(f"\u2718 Job {job_id[:8]} cancelled", None)
+
+    def _add_activity_entry(self, text, part_number):
+        """Insert a live event entry at the top of the Activity panel."""
+        from PySide import QtCore, QtGui, QtWidgets
+
+        mw = FreeCADGui.getMainWindow()
+        if mw is None:
+            return
+        panel = mw.findChild(QtWidgets.QDockWidget, "SiloDatabaseActivity")
+        if panel is None:
+            return
+        activity_list = panel.findChild(QtWidgets.QListWidget)
+        if activity_list is None:
             return
-        self._activity_seeded = True
-        try:
-            items = _client.list_items()
-            if isinstance(items, list):
-                for item in reversed(items[:10]):
-                    pn = item.get("part_number", "")
-                    desc = item.get("description", "")
-                    if desc and len(desc) > 40:
-                        desc = desc[:37] + "..."
-                    text = f"{pn} \u2013 {desc}" if desc else pn
-                    updated = item.get("updated_at", "")
-                    ts = datetime.now()
-                    if updated:
-                        try:
-                            ts = datetime.fromisoformat(
-                                updated.replace("Z", "+00:00")
-                            ).replace(tzinfo=None)
-                        except (ValueError, AttributeError):
-                            pass
-                    self._activity_events.insert(0, (ts, text, pn))
-                self._activity_events = self._activity_events[:50]
-        except Exception:
-            pass
-        self._rebuild_activity_feed()
 
-    def _rebuild_activity_feed(self):
-        """Render _activity_events into the Database Activity QListWidget."""
-        from PySide import QtCore, QtWidgets
+        item = QtWidgets.QListWidgetItem(text)
+        if part_number:
+            item.setData(QtCore.Qt.UserRole, part_number)
+        item.setForeground(QtGui.QColor("#89b4fa"))
+        activity_list.insertItem(0, item)
+
+        # Cap the list at 50 entries
+        while activity_list.count() > 50:
+            activity_list.takeItem(activity_list.count() - 1)
+
+    def _refresh_activity_panel(self):
+        """Refresh the Database Activity panel if it exists."""
+        from PySide import QtCore, QtGui, QtWidgets
 
         mw = FreeCADGui.getMainWindow()
         if mw is None:
@@ -2914,72 +2921,66 @@ class SiloAuthDockWidget:
             )
             activity_list._silo_connected = True
 
-        if not self._activity_events:
-            item = QtWidgets.QListWidgetItem("(No activity yet)")
-            item.setFlags(QtCore.Qt.NoItemFlags)
-            activity_list.addItem(item)
-            return
+        # Collect local part numbers for badge
+        local_pns = set()
+        try:
+            for lf in search_local_files():
+                local_pns.add(lf.get("part_number", ""))
+        except Exception:
+            pass
 
-        for ts, text, pn in self._activity_events:
-            label = f"{text}  \u00b7  {_relative_time(ts)}"
-            list_item = QtWidgets.QListWidgetItem(label)
-            if pn:
-                list_item.setData(QtCore.Qt.UserRole, pn)
-            activity_list.addItem(list_item)
+        try:
+            items = _client.list_items()
+            if isinstance(items, list):
+                for item in items[:20]:
+                    pn = item.get("part_number", "")
+                    desc = item.get("description", "")
+                    updated = item.get("updated_at", "")
+                    if updated:
+                        updated = updated[:10]
 
-    def _on_dag_updated(self, part_number, node_count, edge_count):
-        FreeCAD.Console.PrintMessage(
-            f"Silo: DAG updated for {part_number}"
-            f" ({node_count} nodes, {edge_count} edges)\n"
-        )
-        self._append_activity_event(
-            f"\u25b6 {part_number} \u2013 DAG synced"
-            f" ({node_count} nodes, {edge_count} edges)",
-            part_number,
-        )
+                    # Fetch latest revision info
+                    rev_num = ""
+                    comment = ""
+                    try:
+                        revs = _client.get_revisions(pn)
+                        if revs:
+                            latest = revs[0] if isinstance(revs, list) else revs
+                            rev_num = str(latest.get("revision_number", ""))
+                            comment = latest.get("comment", "") or ""
+                    except Exception:
+                        pass
 
-    def _on_dag_validated(self, part_number, valid, failed_count):
-        if valid:
-            status = "\u2713 PASS"
-            FreeCAD.Console.PrintMessage(f"Silo: Validation passed for {part_number}\n")
-        else:
-            status = f"\u2717 FAIL ({failed_count} failed)"
-            FreeCAD.Console.PrintWarning(
-                f"Silo: Validation failed for {part_number}"
-                f" ({failed_count} features failed)\n"
-            )
-        self._append_activity_event(f"{status} \u2013 {part_number}", part_number)
+                    # Truncate long descriptions
+                    desc_display = desc
+                    if len(desc_display) > 40:
+                        desc_display = desc_display[:37] + "..."
 
-    def _on_job_created(self, job_id, definition_name, part_number):
-        FreeCAD.Console.PrintMessage(
-            f"Silo: Job {definition_name} created for {part_number}\n"
-        )
-        self._append_activity_event(
-            f"\u23f3 {part_number} \u2013 {definition_name} queued",
-            part_number,
-        )
+                    # Build display text
+                    rev_part = f" \u2013 Rev {rev_num}" if rev_num else ""
+                    date_part = f" \u2013 {updated}" if updated else ""
+                    local_badge = " \u25cf local" if pn in local_pns else ""
+                    line1 = (
+                        f"{pn} \u2013 {desc_display}{rev_part}{date_part}{local_badge}"
+                    )
 
-    def _on_job_completed(self, job_id):
-        FreeCAD.Console.PrintMessage(f"Silo: Job {job_id} completed\n")
-        self._rebuild_activity_feed()
+                    if comment:
+                        line1 += f'\n  "{comment}"'
+                    else:
+                        line1 += "\n  (no comment)"
 
-    def _on_job_failed(self, job_id, error):
-        FreeCAD.Console.PrintError(f"Silo: Job {job_id} failed: {error}\n")
-        self._append_activity_event(f"\u2717 Job {job_id[:8]} failed: {error}")
+                    list_item = QtWidgets.QListWidgetItem(line1)
+                    list_item.setData(QtCore.Qt.UserRole, pn)
+                    if desc and len(desc) > 40:
+                        list_item.setToolTip(desc)
+                    if pn in local_pns:
+                        list_item.setForeground(QtGui.QColor("#4CAF50"))
+                    activity_list.addItem(list_item)
 
-    def _on_job_claimed(self, job_id, runner_id):
-        FreeCAD.Console.PrintMessage(
-            f"Silo: Job {job_id[:8]} claimed by runner {runner_id}\n"
-        )
-
-    def _on_job_progress(self, job_id, progress, message):
-        FreeCAD.Console.PrintMessage(
-            f"Silo: Job {job_id[:8]} progress {progress}%: {message}\n"
-        )
-
-    def _on_job_cancelled(self, job_id):
-        FreeCAD.Console.PrintMessage(f"Silo: Job {job_id[:8]} cancelled\n")
-        self._append_activity_event(f"\u2718 Job {job_id[:8]} cancelled")
+            if activity_list.count() == 0:
+                activity_list.addItem("(No items in database)")
+        except Exception:
+            activity_list.addItem("(Unable to refresh activity)")
 
     def _on_activity_double_click(self, item):
         """Open/checkout item from activity pane."""