bulltrackers-module 1.0.311 → 1.0.312

package/functions/computation-system/helpers/computation_dispatcher.js

@@ -1,7 +1,7 @@
 /**
  * FILENAME: computation-system/helpers/computation_dispatcher.js
  * PURPOSE: Sequential Cursor-Based Dispatcher with Hyper-Verbose Telemetry.
- * FIX: Added dispatchId generation and triggerReason mapping.
+ * FIX: Added dispatchId, triggerReason, and detailed logging requirements.
  */
 
 const { getExpectedDateStrings, getEarliestDataDates, normalizeName, DEFINITIVE_EARLIEST_DATES } = require('../utils/utils.js');
@@ -9,7 +9,7 @@ const { groupByPass, analyzeDateExecution } = require('../WorkflowOrchestrator.j
 const { PubSubUtils } = require('../../core/utils/pubsub_utils');
 const { fetchComputationStatus } = require('../persistence/StatusRepository');
 const { checkRootDataAvailability } = require('../data/AvailabilityChecker');
-const crypto = require('crypto'); // [NEW] Required for dispatchId
+const crypto = require('crypto'); 
 
 const OOM_THRESHOLD_MB = 1500; 
 const SECONDS_PER_CALC_MARGIN = 25; 
@@ -43,14 +43,12 @@ async function dispatchComputationPass(config, dependencies, computationManifest
     const targetCursorN = parseInt(reqBody.cursorIndex || 1);
     const dateLimitStr  = reqBody.date || config.date || "2025-01-01"; 
 
-    logger.log('INFO', `[Dispatcher] 🚀 STARTING DISPATCH: Pass ${passToRun}, Cursor ${targetCursorN}, Limit ${dateLimitStr}`);
-
     const manifestMap     = new Map(computationManifest.map(c => [normalizeName(c.name), c]));
     const passes          = groupByPass(computationManifest);
     const calcsInThisPass = passes[passToRun] || [];
 
     if (!calcsInThisPass.length) {
-        logger.log('WARN', `[Dispatcher] 🛑 No calculations found for Pass ${passToRun}. Moving to next pass.`);
+        logger.log('WARN', `[Dispatcher] 🛑 No calculations found for Pass ${passToRun}.`);
         return { status: 'MOVE_TO_NEXT_PASS', dispatched: 0 };
     }
 
@@ -62,6 +60,7 @@ async function dispatchComputationPass(config, dependencies, computationManifest
         return { status: 'MOVE_TO_NEXT_PASS', dispatched: 0 };
     }
 
+    // 1. Identify all "Dirty" dates (dates that actually have work to do)
     const dirtyDates = [];
     for (const d of allDates) {
         const dailyStatus  = await fetchComputationStatus(d, config, dependencies);
@@ -82,10 +81,10 @@ async function dispatchComputationPass(config, dependencies, computationManifest
     let isReroute     = false;
     let isSweep       = false;
 
+    // Logic for Reroutes (OOM handling)
     if (targetCursorN > 1 && (targetCursorN - 2) < dirtyDates.length) {
         const prevEntry = dirtyDates[targetCursorN - 2];
         const reroutes  = await getHighMemReroutes(db, prevEntry.date, passToRun, prevEntry.tasks);
-        
         if (reroutes.length > 0) {
             selectedDate  = prevEntry.date;
             selectedTasks = reroutes;
@@ -93,6 +92,7 @@ async function dispatchComputationPass(config, dependencies, computationManifest
         }
     }
 
+    // Logic for standard cursor progression
     if (!selectedDate) {
         if (targetCursorN <= dirtyDates.length) {
             const entry   = dirtyDates[targetCursorN - 1];
@@ -106,11 +106,27 @@ async function dispatchComputationPass(config, dependencies, computationManifest
     }
 
     if (!selectedDate) {
+        logger.log('INFO', `[Dispatcher] 🏁 Pass ${passToRun} is fully satiated. No work remaining.`);
         return { status: 'MOVE_TO_NEXT_PASS', dispatched: 0, etaSeconds: 0 };
     }
 
-    // [FIX] Generate unique Dispatch ID for this wave and map triggerReason
+    // 2. Prepare Payload and Telemetry
     const currentDispatchId = crypto.randomUUID();
+    const etaSeconds = Math.max(20, selectedTasks.length * SECONDS_PER_CALC_MARGIN);
+    const remainingDatesCount = Math.max(0, dirtyDates.length - targetCursorN);
+
+    // requirement: condense computations into a log payload
+    const computationNames = selectedTasks.map(t => t.name);
+
+    logger.log('INFO', `[Dispatcher] ✅ Dispatching ${selectedTasks.length} tasks for ${selectedDate}. ETA: ${etaSeconds}s.`, {
+        date: selectedDate,
+        pass: passToRun,
+        dispatchedCount: selectedTasks.length,
+        remainingCursorDates: remainingDatesCount,
+        etaSeconds: etaSeconds,
+        dispatchId: currentDispatchId,
+        tasks: computationNames // Condensed into JSON payload
+    });
 
     const mapToTaskPayload = (t) => ({
         ...t,
@@ -118,8 +134,8 @@ async function dispatchComputationPass(config, dependencies, computationManifest
         computation: t.name,
         date: selectedDate,
         pass: passToRun,
-        dispatchId: currentDispatchId, // [NEW] Added for Worker Audit Lease
-        triggerReason: t.reason        // [NEW] Map 'reason' from Orchestrator to 'triggerReason'
+        dispatchId: currentDispatchId,
+        triggerReason: t.reason 
     });
 
     const standardTasks = selectedTasks.filter(t => t.resources !== 'high-mem').map(mapToTaskPayload);
@@ -142,14 +158,13 @@ async function dispatchComputationPass(config, dependencies, computationManifest
     }
     await Promise.all(pubPromises);
 
-    const etaSeconds = Math.max(20, selectedTasks.length * SECONDS_PER_CALC_MARGIN);
-    
     return {
         status          : isSweep ? 'RECOVERY' : 'CONTINUE_PASS',
         dateProcessed   : selectedDate,
         dispatched      : selectedTasks.length,
         n_cursor_ignored: isReroute,
-        etaSeconds      : etaSeconds
+        etaSeconds      : etaSeconds,
+        remainingDates  : remainingDatesCount // For Workflow consumption
     };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.311",
+  "version": "1.0.312",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [