bulltrackers-module 1.0.699 → 1.0.701

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

@@ -216,15 +216,22 @@ async function fetchDependencies(date, calcs, config, deps, manifestLookup = {},
 
 /**
  * Fetches result series (Historical data) for lookbacks.
+ * @param {string} endDateStr - The end date for the series
+ * @param {string[]} calcNames - Original (case-sensitive) computation names
+ * @param {Object} manifestLookup - Map of normalizedName -> category
+ * @param {Object} config - Configuration object
+ * @param {Object} deps - Dependencies (db, logger)
+ * @param {number} lookbackDays - Number of days to look back
  */
 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)] = {});
 
-    // Generate Date List
+    // Generate Date List (going backwards from endDate)
     const dates = [];
     const d = new Date(endDateStr);
     for (let i = 0; i < lookbackDays; i++) {
@@ -232,12 +239,22 @@ 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) {
         for (const rawName of calcNames) {
             const norm = normalizeName(rawName);
             const category = manifestLookup[norm] || 'analytics';
+            
             ops.push(async () => {
                 const val = await fetchSingleResult(db, { ...config, logger }, dateStr, rawName, category);
                 if (val && !isDataEmpty(val)) {
@@ -253,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,6 +9,13 @@ const { commitResults }     = require('../persistence/ResultCommitter');
 const { fetchResultSeries } = require('../data/DependencyFetcher');
 const { getManifest }       = require('../topology/ManifestLoader');
 
+// 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 {
 
     // =========================================================================
@@ -19,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)
@@ -94,13 +101,17 @@ class MetaExecutor {
         const { logger } = deps;
         const calcs = [metadata]; // Treat single as list for helpers
 
+        // 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
         const [mappings, rankings, variableRoots, seriesData, piMasterList] = await Promise.all([
             loader.loadMappings(),
             loader.loadRankings(dateStr),
             loadVariableRootData(loader, dateStr, calcs, logger),
-            loadSeriesData(loader, dateStr, calcs, {}, config, deps),
-            loader.loadPIMasterList() // <--- ADDED LOAD
+            loadSeriesData(loader, dateStr, calcs, manifestLookup, config, deps),
+            loader.loadPIMasterList()
         ]);
 
         let rankingsYesterday = null;
@@ -213,7 +224,7 @@ async function loadSeriesData(loader, dateStr, calcs, manifestLookup, config, de
     const rootRequests = {};
     const depRequests = {};        // norm -> { days, originalName }
 
-    // 1. Aggregate Lookback Depths
+    // 1. Aggregate Lookback Depths from dependencySeries config
     for (const c of calcs) {
         if (c.rootDataSeries) {
             Object.entries(c.rootDataSeries).forEach(([type, val]) => {
@@ -225,7 +236,6 @@ async function loadSeriesData(loader, dateStr, calcs, manifestLookup, config, de
             Object.entries(c.dependencySeries).forEach(([name, val]) => {
                 const days = typeof val === 'object' ? val.lookback : val;
                 const norm = normalizeName(name);
-                // [FIX] Track BOTH normalized name (for dedup) AND original name (for Firestore lookup)
                 if (!depRequests[norm] || depRequests[norm].days < days) {
                     depRequests[norm] = { days, originalName: name };
                 }
@@ -252,12 +262,12 @@ async function loadSeriesData(loader, dateStr, calcs, manifestLookup, config, de
         }
     });
 
-    // 3. Fetch Dependency Series
-    // [FIX] Use ORIGINAL names for Firestore document lookup (case-sensitive)
+    // 3. Fetch Dependency Series (category comes from manifestLookup)
     const depEntries = Object.values(depRequests);
     if (depEntries.length > 0) {
         const depOriginalNames = depEntries.map(e => e.originalName);
         const maxDays = Math.max(...depEntries.map(e => e.days));
+        
         deps.logger.log('INFO', `[MetaExecutor] Loading up to ${maxDays}-day series for Dependencies: ${depOriginalNames.join(', ')}`);
         seriesData.results = await fetchResultSeries(dateStr, depOriginalNames, manifestLookup, config, deps, maxDays);
     }

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

@@ -13,6 +13,13 @@ const mathLayer = require('../layers/index');
 const { performance } = require('perf_hooks');
 const v8 = require('v8');
 
+// 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 {
 
     // =========================================================================
@@ -383,17 +390,16 @@ async function loadGlobalRoots(loader, dateStr, calcs, deps) {
 
 async function loadSeriesData(loader, dateStr, calcs, config, deps) {
     const rootReqs = {};
-    const depReqs = {};  // norm -> { days, originalName }
+    const depReqs = {};  // norm -> { days, originalName, category }
 
     calcs.forEach(c => {
         if (c.manifest.rootDataSeries) {
             Object.entries(c.manifest.rootDataSeries).forEach(([k, v]) => rootReqs[k] = Math.max(rootReqs[k]||0, v.lookback||v));
         }
         if (c.manifest.dependencySeries) {
-            // [FIX] Track BOTH normalized name (for dedup) AND original name (for Firestore lookup)
             Object.entries(c.manifest.dependencySeries).forEach(([k, v]) => {
                 const norm = normalizeName(k);
-                const days = v.lookback || v;
+                const days = typeof v === 'object' ? v.lookback : v;
                 if (!depReqs[norm] || depReqs[norm].days < days) {
                     depReqs[norm] = { days, originalName: k };
                 }
@@ -411,14 +417,15 @@ async function loadSeriesData(loader, dateStr, calcs, config, deps) {
         if (rootMap[key]) series.root[key] = (await loader.loadSeries(rootMap[key], dateStr, days)).data;
     }));
 
-    // [FIX] Use ORIGINAL names for Firestore document lookup (case-sensitive)
+    // 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));
-        // Construct manifest lookup on the fly for fetched names
-        const allManifests = getManifest(config.productLines, config.calculationsDirectory, 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.699",
+  "version": "1.0.701",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [