bulltrackers-module 1.0.313 → 1.0.315

package/functions/computation-system/context/ManifestBuilder.js

@@ -26,6 +26,39 @@ const LAYER_GROUPS = {
     'validators':  ValidatorsLayer
 };
 
+/**
+ * Heuristic to estimate the "weight" of a calculation based on its output structure.
+ */
+function estimateComplexity(Class, metadata) {
+    let weight = 1.0; // Base weight (for single aggregate values)
+
+    try {
+        const schema = typeof Class.getSchema === 'function' ? Class.getSchema() : {};
+        
+        // 1. Detect Map-like outputs (per-ticker, per-sector, per-user)
+        // If the schema uses patternProperties, it's likely a dynamic map.
+        if (schema.patternProperties || (schema.type === 'object' && !schema.properties)) {
+            weight *= 5.0; // Higher weight for dynamic maps (e.g., Per Sector/Ticker)
+        }
+
+        // 2. Metadata hints
+        const name = Class.name.toLowerCase();
+        if (name.includes('perstock') || name.includes('perticker')) weight *= 2.0;
+        if (name.includes('peruser')) weight *= 10.0; // Very high cost
+
+        // 3. Dependency hints
+        if (metadata.rootDataDependencies && metadata.rootDataDependencies.includes('portfolio')) {
+            // Portfolio-based calcs usually iterate over all users in the StandardExecutor
+            weight *= 1.5;
+        }
+
+    } catch (e) {
+        // Fallback to base weight if schema is missing/broken
+    }
+
+    return weight;
+}
+
 function generateLayerHashes(layerExports, layerName) {
     const hashes = {};
     const keys = Object.keys(layerExports).sort(); 
@@ -170,6 +203,7 @@ function buildManifest(productLinesToRun = [], calculations) {
         if (typeof Class.getDependencies !== 'function') { log.fatal(`Calculation "${normalizedName}" missing static getDependencies().`); hasFatalError = true; return; }
         
         const metadata     = Class.getMetadata();
+        const weight = estimateComplexity(Class, metadata)
         const dependencies = Class.getDependencies().map(normalizeName);
         const codeStr      = Class.toString();
         const selfCodeHash = generateCodeHash(codeStr);
@@ -222,6 +256,7 @@ function buildManifest(productLinesToRun = [], calculations) {
             dependencies: dependencies,
             pass: 0,
             hash: intrinsicHash,
+            weight: weight,
             composition: {
                 epoch: SYSTEM_EPOCH,
                 code: selfCodeHash,

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

@@ -12,7 +12,7 @@ const { checkRootDataAvailability } = require('../data/AvailabilityChecker');
 const crypto = require('crypto'); 
 
 const OOM_THRESHOLD_MB = 1500; 
-const SECONDS_PER_CALC_MARGIN = 25; 
+const BASE_SECONDS_PER_WEIGHT_UNIT = 15;
 
 async function getHighMemReroutes(db, date, pass, tasks) {
     const reroutes = [];
@@ -47,6 +47,8 @@ async function dispatchComputationPass(config, dependencies, computationManifest
     const passes          = groupByPass(computationManifest);
     const calcsInThisPass = passes[passToRun] || [];
 
+    const manifestWeightMap = new Map(computationManifest.map(c => [normalizeName(c.name), c.weight || 1.0]));
+
     if (!calcsInThisPass.length) {
         logger.log('WARN', `[Dispatcher] 🛑 No calculations found for Pass ${passToRun}.`);
         return { status: 'MOVE_TO_NEXT_PASS', dispatched: 0 };
@@ -117,21 +119,27 @@ async function dispatchComputationPass(config, dependencies, computationManifest
         return { status: 'MOVE_TO_NEXT_PASS', dispatched: 0, etaSeconds: 0 };
     }
 
+    const totalweight = selectedTasks.reduce((sum, t) => {
+        const weight = manifestWeightMap.get(normalizeName(t.name)) || 1.0;
+        return sum + weight;
+    }, 0);
+
     // 2. Prepare Payload and Telemetry
     const currentDispatchId = crypto.randomUUID();
-    const etaSeconds = Math.max(20, selectedTasks.length * SECONDS_PER_CALC_MARGIN);
+    const etaSeconds = Math.max(20, Math.ceil(totalweight * BASE_SECONDS_PER_WEIGHT_UNIT));
     const remainingDatesCount = Math.max(0, dirtyDates.length - targetCursorN);
 
     const computationNames = selectedTasks.map(t => t.name);
 
     logger.log('INFO', `[Dispatcher] ✅ Dispatching ${selectedTasks.length} tasks for ${selectedDate}. ETA: ${etaSeconds}s. [Mode: ${isSweep ? 'RECOVERY' : 'NORMAL'}]`, {
-        date: selectedDate,
-        pass: passToRun,
-        dispatchedCount: selectedTasks.length,
+        date:                 selectedDate,
+        pass:                 passToRun,
+        dispatchedCount:      selectedTasks.length,
         remainingCursorDates: remainingDatesCount,
-        etaSeconds: etaSeconds,
-        dispatchId: currentDispatchId,
-        tasks: computationNames 
+        totalweight:          totalweight,
+        etaSeconds:           etaSeconds,
+        dispatchId:           currentDispatchId,
+        tasks:                computationNames 
     });
 
     const mapToTaskPayload = (t) => ({

package/package.json

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