flock-core 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

flock/dashboard/service.py

@@ -8,6 +8,7 @@ Provides real-time dashboard capabilities by:
 """
 
 import os
+from datetime import datetime, timedelta, timezone
 from importlib.metadata import PackageNotFoundError, version
 from pathlib import Path
 from typing import Any
@@ -201,7 +202,10 @@ class DashboardHTTPService(BlackboardHTTPService):
 
         @app.get("/api/agents")
         async def get_agents() -> dict[str, Any]:
-            """Get all registered agents.
+            """Get all registered agents with logic operations state.
+
+            Phase 1.2 Enhancement: Now includes logic_operations configuration
+            and waiting state for agents using JoinSpec or BatchSpec.
 
             Returns:
                 {
@@ -209,9 +213,18 @@ class DashboardHTTPService(BlackboardHTTPService):
                         {
                             "name": "agent_name",
                             "description": "...",
-                            "status": "ready",
+                            "status": "ready" | "waiting" | "active",
                             "subscriptions": ["TypeA", "TypeB"],
-                            "output_types": ["TypeC", "TypeD"]
+                            "output_types": ["TypeC", "TypeD"],
+                            "logic_operations": [  # NEW: Phase 1.2
+                                {
+                                    "subscription_index": 0,
+                                    "subscription_types": ["TypeA", "TypeB"],
+                                    "join": {...},  # JoinSpec config
+                                    "batch": {...},  # BatchSpec config
+                                    "waiting_state": {...}  # Current state
+                                }
+                            ]
                         },
                         ...
                     ]
@@ -228,15 +241,25 @@ class DashboardHTTPService(BlackboardHTTPService):
                 # Extract produced types from agent outputs
                 produced_types = [output.spec.type_name for output in agent.outputs]
 
-                agents.append(
-                    {
-                        "name": agent.name,
-                        "description": agent.description or "",
-                        "status": "ready",
-                        "subscriptions": consumed_types,
-                        "output_types": produced_types,
-                    }
-                )
+                # NEW Phase 1.2: Logic operations configuration
+                logic_operations = []
+                for idx, subscription in enumerate(agent.subscriptions):
+                    logic_config = _build_logic_config(agent, subscription, idx, orchestrator)
+                    if logic_config:  # Only include if has join/batch
+                        logic_operations.append(logic_config)
+
+                agent_data = {
+                    "name": agent.name,
+                    "description": agent.description or "",
+                    "status": _compute_agent_status(agent, orchestrator),  # NEW: Dynamic status
+                    "subscriptions": consumed_types,
+                    "output_types": produced_types,
+                }
+
+                if logic_operations:
+                    agent_data["logic_operations"] = logic_operations
+
+                agents.append(agent_data)
 
             return {"agents": agents}
 
@@ -693,10 +716,10 @@ class DashboardHTTPService(BlackboardHTTPService):
                     if time_range and time_range[0]:
                         # Convert nanoseconds to datetime
                         oldest_trace = datetime.fromtimestamp(
-                            time_range[0] / 1_000_000_000
+                            time_range[0] / 1_000_000_000, tz=timezone.utc
                         ).isoformat()
                         newest_trace = datetime.fromtimestamp(
-                            time_range[1] / 1_000_000_000
+                            time_range[1] / 1_000_000_000, tz=timezone.utc
                         ).isoformat()
 
                 # Get file size
@@ -988,4 +1011,330 @@ class DashboardHTTPService(BlackboardHTTPService):
         return self.app
 
 
+def _get_correlation_groups(
+    engine: "CorrelationEngine",  # noqa: F821
+    agent_name: str,
+    subscription_index: int,
+) -> list[dict[str, Any]]:
+    """Extract correlation group state from CorrelationEngine.
+
+    Returns waiting state for all correlation groups for the given agent subscription.
+    Used by enhanced /api/agents endpoint to expose JoinSpec waiting state.
+
+    Args:
+        engine: CorrelationEngine instance from orchestrator
+        agent_name: Name of the agent
+        subscription_index: Index of the subscription (for agents with multiple subscriptions)
+
+    Returns:
+        List of correlation group states with progress metrics:
+        [
+            {
+                "correlation_key": "patient_123",
+                "created_at": "2025-10-13T14:30:00Z",
+                "elapsed_seconds": 45.2,
+                "expires_in_seconds": 254.8,  # For time windows
+                "expires_in_artifacts": 7,     # For count windows
+                "collected_types": {"XRayImage": 1, "LabResults": 0},
+                "required_types": {"XRayImage": 1, "LabResults": 1},
+                "waiting_for": ["LabResults"],
+                "is_complete": False,
+                "is_expired": False
+            },
+            ...
+        ]
+    """
+
+    pool_key = (agent_name, subscription_index)
+    groups = engine.correlation_groups.get(pool_key, {})
+
+    if not groups:
+        return []
+
+    now = datetime.now(timezone.utc)
+    result = []
+
+    for corr_key, group in groups.items():
+        # Calculate elapsed time
+        if group.created_at_time:
+            created_at_time = group.created_at_time
+            if created_at_time.tzinfo is None:
+                created_at_time = created_at_time.replace(tzinfo=timezone.utc)
+            elapsed = (now - created_at_time).total_seconds()
+        else:
+            elapsed = 0
+
+        # Calculate time remaining (for time windows)
+        expires_in_seconds = None
+        if isinstance(group.window_spec, timedelta):
+            window_seconds = group.window_spec.total_seconds()
+            expires_in_seconds = max(0, window_seconds - elapsed)
+
+        # Calculate artifact count remaining (for count windows)
+        expires_in_artifacts = None
+        if isinstance(group.window_spec, int):
+            artifacts_passed = engine.global_sequence - group.created_at_sequence
+            expires_in_artifacts = max(0, group.window_spec - artifacts_passed)
+
+        # Determine what we're waiting for
+        collected_types = {
+            type_name: len(group.waiting_artifacts.get(type_name, []))
+            for type_name in group.required_types
+        }
+
+        waiting_for = [
+            type_name
+            for type_name, required_count in group.type_counts.items()
+            if collected_types.get(type_name, 0) < required_count
+        ]
+
+        result.append(
+            {
+                "correlation_key": str(corr_key),
+                "created_at": group.created_at_time.isoformat() if group.created_at_time else None,
+                "elapsed_seconds": round(elapsed, 1),
+                "expires_in_seconds": round(expires_in_seconds, 1)
+                if expires_in_seconds is not None
+                else None,
+                "expires_in_artifacts": expires_in_artifacts,
+                "collected_types": collected_types,
+                "required_types": dict(group.type_counts),
+                "waiting_for": waiting_for,
+                "is_complete": group.is_complete(),
+                "is_expired": group.is_expired(engine.global_sequence),
+            }
+        )
+
+    return result
+
+
+def _get_batch_state(
+    engine: "BatchEngine",  # noqa: F821
+    agent_name: str,
+    subscription_index: int,
+    batch_spec: "BatchSpec",  # noqa: F821
+) -> dict[str, Any] | None:
+    """Extract batch state from BatchEngine.
+
+    Returns current batch accumulator state for the given agent subscription.
+    Used by enhanced /api/agents endpoint to expose BatchSpec waiting state.
+
+    Args:
+        engine: BatchEngine instance from orchestrator
+        agent_name: Name of the agent
+        subscription_index: Index of the subscription
+        batch_spec: BatchSpec configuration (needed for metrics)
+
+    Returns:
+        Batch state dict or None if no batch or batch is empty:
+        {
+            "created_at": "2025-10-13T14:30:00Z",
+            "elapsed_seconds": 12.5,
+            "items_collected": 18,
+            "items_target": 25,
+            "items_remaining": 7,
+            "timeout_seconds": 30,
+            "timeout_remaining_seconds": 17.5,
+            "will_flush": "on_size" | "on_timeout" | "unknown"
+        }
+    """
+
+    batch_key = (agent_name, subscription_index)
+    accumulator = engine.batches.get(batch_key)
+
+    # Return None if no batch or batch is empty
+    if not accumulator or not accumulator.artifacts:
+        return None
+
+    now = datetime.now(timezone.utc)
+    # Ensure accumulator.created_at is timezone-aware
+    created_at = accumulator.created_at
+    if created_at.tzinfo is None:
+        created_at = created_at.replace(tzinfo=timezone.utc)
+    elapsed = (now - created_at).total_seconds()
+
+    # Calculate items collected (needed for all batch types)
+    items_collected = len(accumulator.artifacts)
+    # For group batching, use _group_count if available
+    if hasattr(accumulator, "_group_count"):
+        items_collected = accumulator._group_count
+
+    result = {
+        "created_at": accumulator.created_at.isoformat(),
+        "elapsed_seconds": round(elapsed, 1),
+        "items_collected": items_collected,  # Always include for all batch types
+    }
+
+    # Size-based metrics (only if size threshold configured)
+    if batch_spec.size:
+        result["items_target"] = batch_spec.size
+        result["items_remaining"] = max(0, batch_spec.size - items_collected)
+    else:
+        # Timeout-only batches: no target
+        result["items_target"] = None
+        result["items_remaining"] = None
+
+    # Timeout-based metrics
+    if batch_spec.timeout:
+        timeout_seconds = batch_spec.timeout.total_seconds()
+        timeout_remaining = max(0, timeout_seconds - elapsed)
+
+        result["timeout_seconds"] = int(timeout_seconds)
+        result["timeout_remaining_seconds"] = round(timeout_remaining, 1)
+
+    # Determine what will trigger flush
+    if batch_spec.size and batch_spec.timeout:
+        # Hybrid: predict which will fire first based on progress percentages
+        items_collected = result["items_collected"]
+        items_target = result.get("items_target", 1)
+        timeout_remaining = result.get("timeout_remaining_seconds", 0)
+
+        # Calculate progress toward each threshold
+        size_progress = items_collected / items_target if items_target > 0 else 0
+        timeout_elapsed = elapsed
+        timeout_total = batch_spec.timeout.total_seconds()
+        time_progress = timeout_elapsed / timeout_total if timeout_total > 0 else 0
+
+        # Predict based on which threshold we're progressing toward faster
+        # If we're closer to size threshold (percentage-wise), predict size
+        # Otherwise predict timeout
+        if size_progress > time_progress:
+            result["will_flush"] = "on_size"
+        else:
+            result["will_flush"] = "on_timeout"
+    elif batch_spec.size:
+        result["will_flush"] = "on_size"
+    elif batch_spec.timeout:
+        result["will_flush"] = "on_timeout"
+
+    return result
+
+
+def _compute_agent_status(agent: "Agent", orchestrator: "Flock") -> str:  # noqa: F821
+    """Determine agent status based on waiting state.
+
+    Checks if agent is waiting for correlation or batch completion.
+    Used by enhanced /api/agents endpoint to show agent status.
+
+    Args:
+        agent: Agent instance
+        orchestrator: Flock orchestrator instance
+
+    Returns:
+        "ready" - Agent not waiting for anything
+        "waiting" - Agent has correlation groups or batches accumulating
+        "active" - Agent currently executing (future enhancement)
+    """
+    # Check if any subscription is waiting for correlation or batching
+    for idx, subscription in enumerate(agent.subscriptions):
+        if subscription.join:
+            pool_key = (agent.name, idx)
+            if pool_key in orchestrator._correlation_engine.correlation_groups:
+                groups = orchestrator._correlation_engine.correlation_groups[pool_key]
+                if groups:  # Has waiting correlation groups
+                    return "waiting"
+
+        if subscription.batch:
+            batch_key = (agent.name, idx)
+            if batch_key in orchestrator._batch_engine.batches:
+                accumulator = orchestrator._batch_engine.batches[batch_key]
+                if accumulator and accumulator.artifacts:
+                    return "waiting"
+
+    return "ready"
+
+
+def _build_logic_config(  # noqa: F821
+    agent: "Agent",  # noqa: F821
+    subscription: "Subscription",  # noqa: F821
+    idx: int,
+    orchestrator: "Flock",
+) -> dict[str, Any] | None:
+    """Build logic operations configuration for a subscription.
+
+    Phase 1.2: Extracts JoinSpec and BatchSpec configuration plus current
+    waiting state for agents using logic operations.
+
+    Args:
+        agent: Agent instance
+        subscription: Subscription to analyze
+        idx: Subscription index (for agents with multiple subscriptions)
+        orchestrator: Flock orchestrator instance
+
+    Returns:
+        Logic operations config dict or None if no join/batch:
+        {
+            "subscription_index": 0,
+            "subscription_types": ["XRayImage", "LabResults"],
+            "join": {...},  # JoinSpec config (if present)
+            "batch": {...},  # BatchSpec config (if present)
+            "waiting_state": {...}  # Current state (if waiting)
+        }
+    """
+    if not subscription.join and not subscription.batch:
+        return None
+
+    config = {
+        "subscription_index": idx,
+        "subscription_types": list(subscription.type_names),
+    }
+
+    # JoinSpec configuration
+    if subscription.join:
+        join_spec = subscription.join
+        window_type = "time" if isinstance(join_spec.within, timedelta) else "count"
+        window_value = (
+            int(join_spec.within.total_seconds())
+            if isinstance(join_spec.within, timedelta)
+            else join_spec.within
+        )
+
+        config["join"] = {
+            "correlation_strategy": "by_key",
+            "window_type": window_type,
+            "window_value": window_value,
+            "window_unit": "seconds" if window_type == "time" else "artifacts",
+            "required_types": list(subscription.type_names),
+            "type_counts": dict(subscription.type_counts),
+        }
+
+        # Get waiting state from CorrelationEngine
+        correlation_groups = _get_correlation_groups(
+            orchestrator._correlation_engine, agent.name, idx
+        )
+        if correlation_groups:
+            config["waiting_state"] = {
+                "is_waiting": True,
+                "correlation_groups": correlation_groups,
+            }
+
+    # BatchSpec configuration
+    if subscription.batch:
+        batch_spec = subscription.batch
+        strategy = (
+            "hybrid"
+            if batch_spec.size and batch_spec.timeout
+            else "size"
+            if batch_spec.size
+            else "timeout"
+        )
+
+        config["batch"] = {
+            "strategy": strategy,
+        }
+        if batch_spec.size:
+            config["batch"]["size"] = batch_spec.size
+        if batch_spec.timeout:
+            config["batch"]["timeout_seconds"] = int(batch_spec.timeout.total_seconds())
+
+        # Get waiting state from BatchEngine
+        batch_state = _get_batch_state(orchestrator._batch_engine, agent.name, idx, batch_spec)
+        if batch_state:
+            if "waiting_state" not in config:
+                config["waiting_state"] = {"is_waiting": True}
+            config["waiting_state"]["batch_state"] = batch_state
+
+    return config
+
+
 __all__ = ["DashboardHTTPService"]

flock/frontend/package.json

@@ -1,6 +1,6 @@
 {
   "name": "flock-ui",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Flock Flow Real-Time Dashboard Frontend",
   "type": "module",
   "scripts": {

flock/frontend/src/components/controls/PublishControl.test.tsx

@@ -398,7 +398,7 @@ describe('PublishControl', () => {
   });
 
   // Auto-filter checkbox tests
-  it('should render auto-set filter checkbox checked by default', async () => {
+  it('should render auto-set filter checkbox unchecked by default', async () => {
     mockFetch.mockResolvedValueOnce({
       ok: true,
       json: async () => ({ artifact_types: mockArtifactTypes }),
@@ -412,7 +412,7 @@ describe('PublishControl', () => {
 
     const checkbox = screen.getByLabelText(/set filter to correlation id/i) as HTMLInputElement;
     expect(checkbox).toBeInTheDocument();
-    expect(checkbox.checked).toBe(true);
+    expect(checkbox.checked).toBe(false);
   });
 
   it('should set filter to correlation ID when checkbox is checked and publish succeeds', async () => {
@@ -439,7 +439,8 @@ describe('PublishControl', () => {
     const artifactTypeSelect = screen.getByLabelText(/artifact type/i);
     const checkbox = screen.getByLabelText(/set filter to correlation id/i) as HTMLInputElement;
 
-    // Checkbox should be checked by default
+    // Check the checkbox to enable auto-filter
+    fireEvent.click(checkbox);
     expect(checkbox.checked).toBe(true);
 
     fireEvent.change(artifactTypeSelect, { target: { value: 'Idea' } });
@@ -487,8 +488,7 @@ describe('PublishControl', () => {
     const artifactTypeSelect = screen.getByLabelText(/artifact type/i);
     const checkbox = screen.getByLabelText(/set filter to correlation id/i) as HTMLInputElement;
 
-    // Uncheck the checkbox
-    fireEvent.click(checkbox);
+    // Checkbox should already be unchecked by default
     expect(checkbox.checked).toBe(false);
 
     // Clear any existing filter
@@ -529,15 +529,15 @@ describe('PublishControl', () => {
 
     const checkbox = screen.getByLabelText(/set filter to correlation id/i) as HTMLInputElement;
 
-    // Initially checked
-    expect(checkbox.checked).toBe(true);
-
-    // Uncheck
-    fireEvent.click(checkbox);
+    // Initially unchecked
     expect(checkbox.checked).toBe(false);
 
-    // Check again
+    // Check
     fireEvent.click(checkbox);
     expect(checkbox.checked).toBe(true);
+
+    // Uncheck again
+    fireEvent.click(checkbox);
+    expect(checkbox.checked).toBe(false);
   });
 });

flock/frontend/src/components/controls/PublishControl.tsx

@@ -22,7 +22,7 @@ const PublishControl: React.FC = () => {
   const [errors, setErrors] = useState<ValidationErrors>({});
   const [successMessage, setSuccessMessage] = useState('');
   const [errorMessage, setErrorMessage] = useState('');
-  const [autoSetFilter, setAutoSetFilter] = useState(true); // Default: auto-set filter to correlation ID
+  const [autoSetFilter, setAutoSetFilter] = useState(false); // Default: unchecked (user can opt-in to auto-filter)
 
   const setShowControls = useSettingsStore((state) => state.setShowControls);
 

flock/frontend/src/components/graph/AgentNode.tsx

@@ -2,6 +2,7 @@ import { memo, useState, useEffect, useRef } from 'react';
 import { NodeProps, Handle, Position } from '@xyflow/react';
 import { useUIStore } from '../../store/uiStore';
 import { useSettingsStore } from '../../store/settingsStore';
+import LogicOperationsDisplay from './LogicOperationsDisplay';
 
 // UI Optimization Migration (Phase 4.1 - Spec 002): Backend GraphNode.data is Record<string, any>
 // Agent-specific properties populated by backend snapshot
@@ -16,6 +17,7 @@ const AgentNode = memo(({ data, selected }: NodeProps) => {
   const receivedByType = nodeData.receivedByType || {};
   const sentByType = nodeData.sentByType || {};
   const streamingTokens = nodeData.streamingTokens || [];
+  const logicOperations = nodeData.logicOperations || []; // Phase 1.4: Logic operations state
 
   // Merge known types with actual counts - show all types even with 0 count
   // Start with actual counts, then add known types that haven't happened yet
@@ -307,6 +309,8 @@ const AgentNode = memo(({ data, selected }: NodeProps) => {
               </div>
             </div>
           )}
+          {/* Phase 1.4: Logic Operations Display (JoinSpec/BatchSpec waiting states) */}
+          <LogicOperationsDisplay logicOperations={logicOperations} compactNodeView={compactNodeView} />
         </div>
       )}
       {compactNodeView && (

flock/frontend/src/components/graph/GraphCanvas.tsx

@@ -15,6 +15,8 @@ import AgentNode from './AgentNode';
 import MessageNode from './MessageNode';
 import MessageFlowEdge from './MessageFlowEdge';
 import TransformEdge from './TransformEdge';
+import PendingJoinEdge from './PendingJoinEdge';
+import PendingBatchEdge from './PendingBatchEdge';
 import MiniMap from './MiniMap';
 import { useGraphStore } from '../../store/graphStore';
 import { useFilterStore } from '../../store/filterStore';
@@ -78,6 +80,8 @@ const GraphCanvas: React.FC = () => {
     () => ({
       message_flow: MessageFlowEdge,
       transformation: TransformEdge,
+      pending_join: PendingJoinEdge,  // Phase 1.5: Pending edges for JoinSpec correlation groups
+      pending_batch: PendingBatchEdge, // Phase 1.5: Pending edges for BatchSpec accumulation
     }),
     []
   );