bulltrackers-module 1.0.700 → 1.0.701

package/functions/computation-system/data/DependencyFetcher.js

@@ -226,6 +226,7 @@ async function fetchDependencies(date, calcs, config, deps, manifestLookup = {},
 async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config, deps, lookbackDays) {
     const { db, logger } = deps;
     const results = {}; // normalizedName -> { date -> data }
+    const { resultsCollection = 'computation_results', resultsSubcollection = 'results', computationsSubcollection = 'computations' } = config;
     
     // Initialize results structure
     calcNames.forEach(n => results[normalizeName(n)] = {});
@@ -238,6 +239,15 @@ async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config,
         dates.push(d.toISOString().slice(0, 10));
     }
 
+    // [DEBUG] Log the manifest lookup and resolved categories
+    logger.log('INFO', `[DependencyFetcher] 🔍 ManifestLookup has ${Object.keys(manifestLookup).length} entries`);
+    for (const rawName of calcNames) {
+        const norm = normalizeName(rawName);
+        const category = manifestLookup[norm] || 'analytics';
+        const samplePath = `${resultsCollection}/${dates[0]}/${resultsSubcollection}/${category}/${computationsSubcollection}/${rawName}`;
+        logger.log('INFO', `[DependencyFetcher] 📍 '${rawName}' -> category='${category}' -> Path: ${samplePath}`);
+    }
+
     // Build Fetch Operations
     const ops = [];
     for (const dateStr of dates) {
@@ -260,6 +270,13 @@ async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config,
     for (let i = 0; i < ops.length; i += BATCH_SIZE) {
         await Promise.all(ops.slice(i, i + BATCH_SIZE).map(fn => fn()));
     }
+    
+    // [DEBUG] Log results summary
+    for (const rawName of calcNames) {
+        const norm = normalizeName(rawName);
+        const foundDates = Object.keys(results[norm] || {});
+        logger.log('INFO', `[DependencyFetcher] ✅ '${rawName}' found data for ${foundDates.length}/${lookbackDays} days`);
+    }
 
     return results;
 }

package/functions/computation-system/executors/MetaExecutor.js

@@ -9,14 +9,11 @@ const { commitResults }     = require('../persistence/ResultCommitter');
 const { fetchResultSeries } = require('../data/DependencyFetcher');
 const { getManifest }       = require('../topology/ManifestLoader');
 
-// [FIX] Load calculations package directly for manifest building during force runs
-let _calculations = null;
-function getCalculations() {
-    if (!_calculations) {
-        try { _calculations = require('aiden-shared-calculations-unified').calculations; } 
-        catch (e) { _calculations = {}; }
-    }
-    return _calculations;
+// Helper to get calculations - prefer config.calculations, fallback to direct require
+function getCalculations(config) {
+    if (config && config.calculations) return config.calculations;
+    try { return require('aiden-shared-calculations-unified').calculations; } 
+    catch (e) { return {}; }
 }
 
 class MetaExecutor {
@@ -29,8 +26,8 @@ class MetaExecutor {
         const dStr = date.toISOString().slice(0, 10);
         const loader = new CachedDataLoader(config, deps);
 
-        // 1. Setup Manifest Lookup
-        const allManifests = getManifest(config.productLines, config.calculationsDirectory, deps); 
+        // 1. Setup Manifest Lookup (use activeProductLines and calculations from config)
+        const allManifests = getManifest(config.activeProductLines || [], getCalculations(config), deps); 
         const manifestLookup = Object.fromEntries(allManifests.map(m => [normalizeName(m.name), m.category]));
 
         // 2. Load Base Data (Always Required)
@@ -104,8 +101,8 @@ class MetaExecutor {
         const { logger } = deps;
         const calcs = [metadata]; // Treat single as list for helpers
 
-        // [FIX] Build manifestLookup using the actual calculations package (not config.calculationsDirectory)
-        const allManifests = getManifest([], getCalculations(), deps);
+        // Build manifestLookup using calculations from config (set in index.js)
+        const allManifests = getManifest(config.activeProductLines || [], getCalculations(config), deps);
         const manifestLookup = Object.fromEntries(allManifests.map(m => [normalizeName(m.name), m.category]));
 
         // 1. Load Data using Shared Helpers

package/functions/computation-system/executors/StandardExecutor.js

@@ -13,14 +13,11 @@ const mathLayer = require('../layers/index');
 const { performance } = require('perf_hooks');
 const v8 = require('v8');
 
-// [FIX] Load calculations package directly for manifest building
-let _calculations = null;
-function getCalculations() {
-    if (!_calculations) {
-        try { _calculations = require('aiden-shared-calculations-unified').calculations; } 
-        catch (e) { _calculations = {}; }
-    }
-    return _calculations;
+// Helper to get calculations - prefer config.calculations, fallback to direct require
+function getCalculations(config) {
+    if (config && config.calculations) return config.calculations;
+    try { return require('aiden-shared-calculations-unified').calculations; } 
+    catch (e) { return {}; }
 }
 
 class StandardExecutor {
@@ -420,14 +417,13 @@ async function loadSeriesData(loader, dateStr, calcs, config, deps) {
         if (rootMap[key]) series.root[key] = (await loader.loadSeries(rootMap[key], dateStr, days)).data;
     }));
 
-    // [FIX] Use getCalculations() to load ALL computations for proper category lookup
+    // Build lookup from ALL computations using config.calculations
     const depEntries = Object.values(depReqs);
     if (depEntries.length) {
         const depOriginalNames = depEntries.map(e => e.originalName);
         const maxDays = Math.max(...depEntries.map(e => e.days));
         
-        // Build lookup from ALL computations (empty productLines = load all)
-        const allManifests = getManifest([], getCalculations(), deps);
+        const allManifests = getManifest(config.activeProductLines || [], getCalculations(config), deps);
         const lookup = Object.fromEntries(allManifests.map(m => [normalizeName(m.name), m.category]));
         
         series.results = await fetchResultSeries(dateStr, depOriginalNames, lookup, config, deps, maxDays);

package/package.json

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