X

Author: iamh2o

MIGRATION_NOTES.md

@@ -32,10 +32,8 @@
   - removed response field: `uuid`
 - `GET /api/v1/templates...`
   - removed response field: `uuid`
-- `GET|POST /api/v1/workflows...`
-  - removed response field: `uuid`
-- `GET /api/v1/workflows/{euid}/steps`
-  - removed step field: `uuid`
+- `/api/v1/workflows/*`
+  - retired for queue-centric Bloom beta
 - `GET /api/v1/worksets/{euid}`
   - removed response field: `uuid`
 - `GET /api/v1/search/`
@@ -65,4 +63,4 @@
 ### `json_addl` backfill / tolerance
 
 - No persisted data migration is required.
-- Older lineage records may still have `relationship_type` duplicated in `json_addl`; API responses now read the canonical column value.
+- Older lineage records may still have `relationship_type` duplicated in `json_addl`; API responses now read the canonical column value.

bloom_lims/api/v1/stats.py

@@ -24,6 +24,16 @@
 router = APIRouter(prefix="/stats", tags=["Statistics"])
 
 
+def _props(instance: Any) -> Dict[str, Any]:
+    payload = instance.json_addl if isinstance(instance.json_addl, dict) else {}
+    props = payload.get("properties", {})
+    return props if isinstance(props, dict) else {}
+
+
+def _beta_kind(instance: Any) -> str:
+    return str(_props(instance).get("beta_kind") or "").strip()
+
+
 def get_bdb(username: str = "anonymous"):
     """Get database connection."""
     from bloom_lims.db import BLOOMdb3
@@ -44,19 +54,29 @@ async def get_dashboard_stats(user: APIUser = Depends(require_api_auth)):
 
         # Gather statistics
         stats = DashboardStatsSchema()
+        generic_rows: list[Any] = []
 
         try:
-            # Workflow/Assay counts
-            wf_class = bdb.Base.classes.workflow_instance
-            stats.workflows_total = (
-                bdb.session.query(wf_class).filter_by(is_deleted=False).count()
-            )
-            stats.assays_total = (
-                bdb.session.query(wf_class)
-                .filter_by(is_deleted=False, is_singleton=True)
-                .count()
+            generic_rows = (
+                bdb.session.query(bdb.Base.classes.generic_instance)
+                .filter_by(is_deleted=False)
+                .all()
             )
-            stats.workflows_active = stats.workflows_total
+            queue_definitions = [
+                row for row in generic_rows if _beta_kind(row) == "queue_definition"
+            ]
+            work_items = [
+                row for row in generic_rows if _beta_kind(row) == "beta_work_item"
+            ]
+            open_work_items = [
+                row
+                for row in work_items
+                if str(getattr(row, "bstatus", "") or "").strip().lower() in {"open", "active"}
+            ]
+
+            stats.assays_total = len(queue_definitions)
+            stats.workflows_total = len(work_items)
+            stats.workflows_active = len(open_work_items)
 
             # Equipment counts
             eq_class = bdb.Base.classes.equipment_instance
@@ -92,41 +112,33 @@ async def get_dashboard_stats(user: APIUser = Depends(require_api_auth)):
         recent_activity = RecentActivitySchema()
 
         try:
-            wf_class = bdb.Base.classes.workflow_instance
-
-            # Recent assays (singleton workflows)
-            recent_assays = (
-                bdb.session.query(wf_class)
-                .filter_by(is_deleted=False, is_singleton=True)
-                .order_by(wf_class.created_dt.desc())
-                .limit(5)
-                .all()
-            )
+            recent_assays = sorted(
+                [row for row in generic_rows if _beta_kind(row) == "queue_definition"],
+                key=lambda row: row.created_dt or datetime.min.replace(tzinfo=UTC),
+                reverse=True,
+            )[:5]
             recent_activity.recent_assays = [
                 RecentActivityItem(
                     euid=a.euid,
                     name=a.name,
-                    type=a.type or "workflow",
+                    type=a.type or "queue_runtime",
                     subtype=a.subtype,
                     status=a.bstatus,
                     created_dt=a.created_dt,
                 )
                 for a in recent_assays
             ]
 
-            # Recent workflows
-            recent_workflows = (
-                bdb.session.query(wf_class)
-                .filter_by(is_deleted=False)
-                .order_by(wf_class.created_dt.desc())
-                .limit(5)
-                .all()
-            )
+            recent_workflows = sorted(
+                [row for row in generic_rows if _beta_kind(row) == "beta_work_item"],
+                key=lambda row: row.created_dt or datetime.min.replace(tzinfo=UTC),
+                reverse=True,
+            )[:5]
             recent_activity.recent_workflows = [
                 RecentActivityItem(
                     euid=w.euid,
                     name=w.name,
-                    type=w.type or "workflow",
+                    type=w.type or "queue_runtime",
                     subtype=w.subtype,
                     status=w.bstatus,
                     created_dt=w.created_dt,