aiden-shared-calculations-unified 1.0.36 → 1.0.37

package/calculations/behavioural/historical/dumb-cohort-flow.js

@@ -2,85 +2,59 @@
  * @fileoverview Calculates "Net Crowd Flow" and "Sector Rotation"
  * *only* for the "Dumb Cohort" (Bottom 20% of Investor Scores).
  *
- * This calc depends on 'user-investment-profile.js' being run first for the same day.
+ * --- META REFACTOR ---
+ * This calculation is now `type: "meta"` to consume in-memory dependencies.
+ * It runs ONCE per day, receives the in-memory cache, and must
+ * perform its own user data streaming.
  */
 
 const { Firestore } = require('@google-cloud/firestore');
 const firestore = new Firestore();
 const { loadAllPriceData, getDailyPriceChange } = require('../../../utils/price_data_provider');
 const { loadInstrumentMappings, getInstrumentSectorMap } = require('../../../utils/sector_mapping_provider');
+const { loadDataByRefs } = require('../../../../bulltrackers-module/functions/computation-system/utils/data_loader'); // Adjust path as needed
 
 const COHORT_PERCENTILE = 0.2; // Bottom 20%
 const PROFILE_CALC_ID = 'user-investment-profile'; // The calc to read IS scores from
 
 class DumbCohortFlow {
     constructor() {
-        // Asset Flow
-        this.asset_values = {}; // { instrumentId: { day1_value_sum: 0, day2_value_sum: 0 } }
-        // Sector Rotation
-        this.todaySectorInvestment = {};
-        this.yesterdaySectorInvestment = {};
-        
-        // --- START MODIFICATION ---
-        this.dumbCohortIds = null; // Set to null. Will be a Set on success.
-        // --- END MODIFICATION ---
-        
-        this.user_count = 0; // Number of *cohort* users
-        this.priceMap = null;
-        this.mappings = null;
-        this.sectorMap = null;
-        this.dates = {};
+        // Meta-calc, no constructor state needed
     }
 
     /**
      * Loads the Investor Scores, calculates the cohort threshold, and builds the Set of user IDs.
+     * --- MODIFIED: Reads from in-memory 'computedDependencies' ---
      */
-    async _loadCohort(context, dependencies) {
-        const { db, logger } = dependencies;
-        logger.log('INFO', '[DumbCohortFlow] Loading Investor Scores to build cohort...');
+    _loadCohort(logger, computedDependencies) {
+        logger.log('INFO', '[DumbCohortFlow] Loading Investor Scores from in-memory cache...');
         
-        try {
-            const scoreMapRef = db.collection(context.config.resultsCollection).doc(context.todayDateStr)
-                .collection(context.config.resultsSubcollection).doc('behavioural')
-                .collection(context.config.computationsSubcollection).doc(PROFILE_CALC_ID);
-                
-            const doc = await scoreMapRef.get();
-            
-            // --- START MODIFICATION ---
-            // Check for doc, data, and that the scores map isn't empty
-            if (!doc.exists || !doc.data().daily_investor_scores || Object.keys(doc.data().daily_investor_scores).length === 0) {
-                logger.log('WARN', '[DumbCohortFlow] Cannot find dependency: daily_investor_scores. Cohort will not be built. Returning null on getResult.');
-                // Keep this.dumbCohortIds = null
-                return; // Abort
-            }
-            // --- END MODIFICATION ---
-            
-            const scores = doc.data().daily_investor_scores;
-            const allScores = Object.entries(scores).map(([userId, score]) => ({ userId, score }));
-            allScores.sort((a, b) => a.score - b.score);
-            
-            const thresholdIndex = Math.floor(allScores.length * COHORT_PERCENTILE);
-            const thresholdScore = allScores[thresholdIndex]?.score || 0; // Get 20th percentile score
-            
-            // --- START MODIFICATION ---
-            // Successfully loaded, now create the Set
-            this.dumbCohortIds = new Set(
-                allScores.filter(s => s.score <= thresholdScore).map(s => s.userId) // Get users *at or below*
-            );
-            // --- END MODIFICATION ---
-            
-            logger.log('INFO', `[DumbCohortFlow] Cohort built. ${this.dumbCohortIds.size} users at or below ${thresholdScore.toFixed(2)} (20th percentile).`);
-            
-        } catch (e) {
-            logger.log('ERROR', '[DumbCohortFlow] Failed to load cohort.', { error: e.message });
-            // Keep this.dumbCohortIds = null on error
+        const profileData = computedDependencies[PROFILE_CALC_ID];
+        
+        if (!profileData || !profileData.daily_investor_scores || Object.keys(profileData.daily_investor_scores).length === 0) {
+            logger.log('WARN', `[DumbCohortFlow] Cannot find dependency in-memory: ${PROFILE_CALC_ID}. Cohort will not be built.`);
+            return null; // Return null to signal failure
         }
+            
+        const scores = profileData.daily_investor_scores;
+        const allScores = Object.entries(scores).map(([userId, score]) => ({ userId, score }));
+        allScores.sort((a, b) => a.score - b.score);
+        
+        const thresholdIndex = Math.floor(allScores.length * COHORT_PERCENTILE);
+        const thresholdScore = allScores[thresholdIndex]?.score || 0; // Get 20th percentile score
+        
+        const dumbCohortIds = new Set(
+            allScores.filter(s => s.score <= thresholdScore).map(s => s.userId) // Get users *at or below*
+        );
+        
+        logger.log('INFO', `[DumbCohortFlow] Cohort built. ${dumbCohortIds.size} users at or below ${thresholdScore.toFixed(2)} (20th percentile).`);
+        return dumbCohortIds;
     }
 
-    // --- Asset Flow Helpers ---
-    _initAsset(instrumentId) {
-        if (!this.asset_values[instrumentId]) {
-            this.asset_values[instrumentId] = { day1_value_sum: 0, day2_value_sum: 0 };
+    // --- Asset Flow Helpers (unchanged) ---
+    _initAsset(asset_values, instrumentId) {
+        if (!asset_values[instrumentId]) {
+            asset_values[instrumentId] = { day1_value_sum: 0, day2_value_sum: 0 };
         }
     }
     _sumAssetValue(positions) {
@@ -93,111 +67,117 @@ class DumbCohortFlow {
         }
         return valueMap;
     }
-    // --- Sector Rotation Helper ---
-    _accumulateSectorInvestment(portfolio, target) {
+    // --- Sector Rotation Helper (unchanged) ---
+    _accumulateSectorInvestment(portfolio, target, sectorMap) {
         if (portfolio && portfolio.AggregatedPositions) {
             for (const pos of portfolio.AggregatedPositions) {
-                const sector = this.sectorMap[pos.InstrumentID] || 'N/A';
+                const sector = sectorMap[pos.InstrumentID] || 'N/A';
                 target[sector] = (target[sector] || 0) + (pos.Invested || pos.Amount || 0);
             }
         }
     }
 
     /**
-     * PROCESS: Runs daily for each user.
+     * PROCESS: META REFACTOR
+     * This now runs ONCE, loads all data, streams users, and returns one big result.
      */
-    async process(todayPortfolio, yesterdayPortfolio, userId, context) {
-        // 1. Load cohort on first run
-        if (!this.dumbCohortIds) {
-            await this._loadCohort(context, context.dependencies);
-            this.dates.today = context.todayDateStr;
-            this.dates.yesterday = context.yesterdayDateStr;
-        }
-
-        // 2. Filter user
-        // --- START MODIFICATION ---
-        // If cohort failed to load, this.dumbCohortIds will be null, and this check will fail correctly.
-        if (!this.dumbCohortIds || !this.dumbCohortIds.has(userId) || !todayPortfolio || !yesterdayPortfolio || !todayPortfolio.AggregatedPositions || !yesterdayPortfolio.AggregatedPositions) {
-            return;
-        }
-        // --- END MODIFICATION ---
+    async process(dateStr, dependencies, config, computedDependencies) {
+        const { logger, db, rootData, calculationUtils } = dependencies;
+        const { portfolioRefs } = rootData;
+        logger.log('INFO', '[DumbCohortFlow] Starting meta-process...');
         
-        // 3. User is in the cohort, load maps if needed
-        if (!this.sectorMap) {
-            this.sectorMap = await getInstrumentSectorMap();
+        // 1. Load Cohort from in-memory dependency
+        const dumbCohortIds = this._loadCohort(logger, computedDependencies);
+        if (!dumbCohortIds) {
+            return null; // Dependency failed
         }
 
-        // --- 4. RUN ASSET FLOW LOGIC ---
-        const yesterdayValues = this._sumAssetValue(yesterdayPortfolio.AggregatedPositions);
-        const todayValues = this._sumAssetValue(todayPortfolio.AggregatedPositions);
-        const allInstrumentIds = new Set([...Object.keys(yesterdayValues), ...Object.keys(todayValues)]);
-        
-        for (const instrumentId of allInstrumentIds) {
-            this._initAsset(instrumentId);
-            this.asset_values[instrumentId].day1_value_sum += (yesterdayValues[instrumentId] || 0);
-            this.asset_values[instrumentId].day2_value_sum += (todayValues[instrumentId] || 0);
+        // 2. Load external dependencies (prices, sectors)
+        const [priceMap, mappings, sectorMap] = await Promise.all([
+            loadAllPriceData(),
+            loadInstrumentMappings(),
+            getInstrumentSectorMap()
+        ]);
+        if (!priceMap || !mappings || !sectorMap || Object.keys(priceMap).length === 0) {
+            logger.log('ERROR', '[DumbCohortFlow] Failed to load critical price/mapping/sector data. Aborting.');
+            return null; // Return null to trigger backfill
         }
 
-        // --- 5. RUN SECTOR ROTATION LOGIC ---
-        this._accumulateSectorInvestment(todayPortfolio, this.todaySectorInvestment);
-        this._accumulateSectorInvestment(yesterdayPortfolio, this.yesterdaySectorInvestment);
+        // 3. Load "yesterday's" portfolio data for comparison
+        const yesterdayDate = new Date(dateStr + 'T00:00:00Z');
+        yesterdayDate.setUTCDate(yesterdayDate.getUTCDate() - 1);
+        const yesterdayStr = yesterdayDate.toISOString().slice(0, 10);
+        const yesterdayRefs = await calculationUtils.getPortfolioPartRefs(config, dependencies, yesterdayStr);
+        const yesterdayPortfolios = await loadFullDayMap(config, dependencies, yesterdayRefs);
+        logger.log('INFO', `[DumbCohortFlow] Loaded ${yesterdayRefs.length} part refs for yesterday.`);
 
-        this.user_count++;
-    }
+        // 4. Stream "today's" portfolio data and process
+        
+        // --- Local state for this run ---
+        const asset_values = {};
+        const todaySectorInvestment = {};
+        const yesterdaySectorInvestment = {};
+        let user_count = 0;
+        // --- End Local state ---
+
+        const batchSize = config.partRefBatchSize || 10;
+        for (let i = 0; i < portfolioRefs.length; i += batchSize) {
+            const batchRefs = portfolioRefs.slice(i, i + batchSize);
+            const todayPortfoliosChunk = await loadDataByRefs(config, dependencies, batchRefs);
+
+            for (const uid in todayPortfoliosChunk) {
+                
+                // --- Filter user ---
+                if (!dumbCohortIds.has(uid)) {
+                    continue;
+                }
+                
+                const pToday = todayPortfoliosChunk[uid];
+                const pYesterday = yesterdayPortfolios[uid];
+                
+                if (!pToday || !pYesterday || !pToday.AggregatedPositions || !pYesterday.AggregatedPositions) {
+                    continue;
+                }
+                
+                // --- User is in cohort, run logic ---
+                
+                // 4a. RUN ASSET FLOW LOGIC
+                const yesterdayValues = this._sumAssetValue(pYesterday.AggregatedPositions);
+                const todayValues = this._sumAssetValue(pToday.AggregatedPositions);
+                const allInstrumentIds = new Set([...Object.keys(yesterdayValues), ...Object.keys(todayValues)]);
+                
+                for (const instrumentId of allInstrumentIds) {
+                    this._initAsset(asset_values, instrumentId);
+                    asset_values[instrumentId].day1_value_sum += (yesterdayValues[instrumentId] || 0);
+                    asset_values[instrumentId].day2_value_sum += (todayValues[instrumentId] || 0);
+                }
 
-    /**
-     * GETRESULT: Aggregates and returns the flow data for the cohort.
-     */
-    async getResult() {
-        // --- START MODIFICATION ---
-        // If cohort IDs were never loaded due to dependency failure, return null.
-        if (this.dumbCohortIds === null) {
-            console.warn('[DumbCohortFlow] Skipping getResult because dependency (user-investment-profile) failed to load.');
-            return null;
+                // 4b. RUN SECTOR ROTATION LOGIC
+                this._accumulateSectorInvestment(pToday, todaySectorInvestment, sectorMap);
+                this._accumulateSectorInvestment(pYesterday, yesterdaySectorInvestment, sectorMap);
+
+                user_count++;
+            }
         }
         
-        // If cohort loaded but no users were processed, also return null (or an empty object, but null is safer for backfill)
-        if (this.user_count === 0 || !this.dates.today) {
-            console.warn('[DumbCohortFlow] No users processed for dumb cohort. Returning null.');
+        logger.log('INFO', `[DumbCohortFlow] Processed ${user_count} users in cohort.`);
+        
+        // --- 5. GETRESULT LOGIC IS NOW INSIDE PROCESS ---
+        
+        if (user_count === 0) {
+            logger.warn('[DumbCohortFlow] No users processed for dumb cohort. Returning null.');
             return null;
         }
-        // --- END MODIFICATION ---
-
-        // 1. Load dependencies
-        if (!this.priceMap || !this.mappings) {
-            // --- START MODIFICATION ---
-            // Add error handling for this load, and check for empty priceMap
-            try {
-                const [priceData, mappingData] = await Promise.all([
-                    loadAllPriceData(),
-                    loadInstrumentMappings()
-                ]);
-                this.priceMap = priceData;
-                this.mappings = mappingData;
-
-                if (!this.priceMap || Object.keys(this.priceMap).length === 0) {
-                     console.error('[DumbCohortFlow] CRITICAL: Price map is empty or failed to load. Aborting calculation to allow backfill.');
-                    return null; // Return null to trigger backfill
-                }
-            } catch (e) {
-                 console.error('[DumbCohortFlow] Failed to load price/mapping dependencies:', e);
-                 return null;
-            }
-            // --- END MODIFICATION ---
-        }
 
-        // --- 2. Calculate Asset Flow ---
+        // 5a. Calculate Asset Flow
         const finalAssetFlow = {};
-        const todayStr = this.dates.today;
-        const yesterdayStr = this.dates.yesterday;
-
-        for (const instrumentId in this.asset_values) {
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
-            const avg_day1_value = this.asset_values[instrumentId].day1_value_sum / this.user_count;
-            const avg_day2_value = this.asset_values[instrumentId].day2_value_sum / this.user_count;
-            const priceChangePct = getDailyPriceChange(instrumentId, yesterdayStr, todayStr, this.priceMap);
+        for (const instrumentId in asset_values) {
+            const ticker = mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
+            const avg_day1_value = asset_values[instrumentId].day1_value_sum / user_count;
+            const avg_day2_value = asset_values[instrumentId].day2_value_sum / user_count;
+            const priceChangePct = getDailyPriceChange(instrumentId, yesterdayStr, dateStr, priceMap);
 
-            if (priceChangePct === null) continue; // Skip if price data missing
+            if (priceChangePct === null) continue;
 
             const expected_day2_value = avg_day1_value * (1 + priceChangePct);
             const net_crowd_flow_pct = avg_day2_value - expected_day2_value;
@@ -209,42 +189,30 @@ class DumbCohortFlow {
             };
         }
         
-        // --- 3. Calculate Sector Rotation ---
+        // 5b. Calculate Sector Rotation
         const finalSectorRotation = {};
-        const allSectors = new Set([...Object.keys(this.todaySectorInvestment), ...Object.keys(this.yesterdaySectorInvestment)]);
+        const allSectors = new Set([...Object.keys(todaySectorInvestment), ...Object.keys(yesterdaySectorInvestment)]);
         for (const sector of allSectors) {
-            const todayAmount = this.todaySectorInvestment[sector] || 0;
-            const yesterdayAmount = this.yesterdaySectorInvestment[sector] || 0;
+            const todayAmount = todaySectorInvestment[sector] || 0;
+            const yesterdayAmount = yesterdaySectorInvestment[sector] || 0;
             finalSectorRotation[sector] = todayAmount - yesterdayAmount;
         }
-        
-        // --- START MODIFICATION ---
-        // If no asset flow was calculated (e.g., all price data missing), fail
+
         if (Object.keys(finalAssetFlow).length === 0) {
-            console.warn('[DumbCohortFlow] No asset flow calculated (likely all price data missing). Returning null.');
+            logger.warn('[DumbCohortFlow] No asset flow calculated (likely all price data missing). Returning null.');
             return null;
         }
-        // --- END MODIFICATION ---
 
-        // 4. Return combined result
+        // 6. Return combined result
         return {
             asset_flow: finalAssetFlow,
             sector_rotation: finalSectorRotation,
-            user_sample_size: this.user_count
+            user_sample_size: user_count
         };
     }
 
-    reset() { 
-        this.asset_values = {};
-        this.todaySectorInvestment = {};
-        this.yesterdaySectorInvestment = {};
-        this.dumbCohortIds = null;
-        this.user_count = 0;
-        this.priceMap = null;
-        this.mappings = null;
-        this.sectorMap = null;
-        this.dates = {};
-    }
+    async getResult() { return null; }
+    reset() { }
 }
 
 module.exports = DumbCohortFlow;

package/calculations/behavioural/historical/smart-cohort-flow.js

@@ -2,85 +2,59 @@
  * @fileoverview Calculates "Net Crowd Flow" and "Sector Rotation"
  * *only* for the "Smart Cohort" (Top 20% of Investor Scores).
  *
- * This calc depends on 'user-investment-profile.js' being run first for the same day.
+ * --- META REFACTOR ---
+ * This calculation is now `type: "meta"` to consume in-memory dependencies.
+ * It runs ONCE per day, receives the in-memory cache, and must
+ * perform its own user data streaming.
  */
 
 const { Firestore } = require('@google-cloud/firestore');
 const firestore = new Firestore();
 const { loadAllPriceData, getDailyPriceChange } = require('../../../utils/price_data_provider');
 const { loadInstrumentMappings, getInstrumentSectorMap } = require('../../../utils/sector_mapping_provider');
+const { loadDataByRefs } = require('../../../../bulltrackers-module/functions/computation-system/utils/data_loader'); // Adjust path as needed
 
 const COHORT_PERCENTILE = 0.8; // Top 20%
 const PROFILE_CALC_ID = 'user-investment-profile'; // The calc to read IS scores from
 
 class SmartCohortFlow {
     constructor() {
-        // Asset Flow
-        this.asset_values = {}; // { instrumentId: { day1_value_sum: 0, day2_value_sum: 0 } }
-        // Sector Rotation
-        this.todaySectorInvestment = {};
-        this.yesterdaySectorInvestment = {};
-        
-        // --- START MODIFICATION ---
-        this.smartCohortIds = null; // Set to null. Will be a Set on success.
-        // --- END MODIFICATION ---
-        
-        this.user_count = 0; // Number of *cohort* users
-        this.priceMap = null;
-        this.mappings = null;
-        this.sectorMap = null;
-        this.dates = {};
+        // Meta-calc, no constructor state needed
     }
 
     /**
      * Loads the Investor Scores, calculates the cohort threshold, and builds the Set of user IDs.
+     * --- MODIFIED: Reads from in-memory 'computedDependencies' ---
      */
-    async _loadCohort(context, dependencies) {
-        const { db, logger } = dependencies;
-        logger.log('INFO', '[SmartCohortFlow] Loading Investor Scores to build cohort...');
+    _loadCohort(logger, computedDependencies) {
+        logger.log('INFO', '[SmartCohortFlow] Loading Investor Scores from in-memory cache...');
         
-        try {
-            const scoreMapRef = db.collection(context.config.resultsCollection).doc(context.todayDateStr)
-                .collection(context.config.resultsSubcollection).doc('behavioural')
-                .collection(context.config.computationsSubcollection).doc(PROFILE_CALC_ID);
-                
-            const doc = await scoreMapRef.get();
-
-            // --- START MODIFICATION ---
-            // Check for doc, data, and that the scores map isn't empty
-            if (!doc.exists || !doc.data().daily_investor_scores || Object.keys(doc.data().daily_investor_scores).length === 0) {
-                logger.log('WARN', '[SmartCohortFlow] Cannot find dependency: daily_investor_scores. Cohort will not be built. Returning null on getResult.');
-                // Keep this.smartCohortIds = null
-                return; // Abort
-            }
-            // --- END MODIFICATION ---
-            
-            const scores = doc.data().daily_investor_scores;
-            const allScores = Object.entries(scores).map(([userId, score]) => ({ userId, score }));
-            allScores.sort((a, b) => a.score - b.score);
-            
-            const thresholdIndex = Math.floor(allScores.length * COHORT_PERCENTILE);
-            const thresholdScore = allScores[thresholdIndex]?.score || 999;
-            
-            // --- START MODIFICATION ---
-            // Successfully loaded, now create the Set
-            this.smartCohortIds = new Set(
-                allScores.filter(s => s.score >= thresholdScore).map(s => s.userId)
-            );
-            // --- END MODIFICATION ---
-            
-            logger.log('INFO', `[SmartCohortFlow] Cohort built. ${this.smartCohortIds.size} users at or above ${thresholdScore.toFixed(2)} (80th percentile).`);
-            
-        } catch (e) {
-            logger.log('ERROR', '[SmartCohortFlow] Failed to load cohort.', { error: e.message });
-            // Keep this.smartCohortIds = null on error
+        const profileData = computedDependencies[PROFILE_CALC_ID];
+        
+        if (!profileData || !profileData.daily_investor_scores || Object.keys(profileData.daily_investor_scores).length === 0) {
+            logger.log('WARN', `[SmartCohortFlow] Cannot find dependency in-memory: ${PROFILE_CALC_ID}. Cohort will not be built.`);
+            return null; // Return null to signal failure
         }
+            
+        const scores = profileData.daily_investor_scores;
+        const allScores = Object.entries(scores).map(([userId, score]) => ({ userId, score }));
+        allScores.sort((a, b) => a.score - b.score);
+        
+        const thresholdIndex = Math.floor(allScores.length * COHORT_PERCENTILE);
+        const thresholdScore = allScores[thresholdIndex]?.score || 999;
+        
+        const smartCohortIds = new Set(
+            allScores.filter(s => s.score >= thresholdScore).map(s => s.userId)
+        );
+        
+        logger.log('INFO', `[SmartCohortFlow] Cohort built. ${smartCohortIds.size} users at or above ${thresholdScore.toFixed(2)} (80th percentile).`);
+        return smartCohortIds;
     }
 
-    // --- Asset Flow Helpers ---
-    _initAsset(instrumentId) {
-        if (!this.asset_values[instrumentId]) {
-            this.asset_values[instrumentId] = { day1_value_sum: 0, day2_value_sum: 0 };
+    // --- Asset Flow Helpers (unchanged) ---
+    _initAsset(asset_values, instrumentId) {
+        if (!asset_values[instrumentId]) {
+            asset_values[instrumentId] = { day1_value_sum: 0, day2_value_sum: 0 };
         }
     }
     _sumAssetValue(positions) {
@@ -93,110 +67,115 @@ class SmartCohortFlow {
         }
         return valueMap;
     }
-    // --- Sector Rotation Helper ---
-    _accumulateSectorInvestment(portfolio, target) {
+    // --- Sector Rotation Helper (unchanged) ---
+    _accumulateSectorInvestment(portfolio, target, sectorMap) {
         if (portfolio && portfolio.AggregatedPositions) {
             for (const pos of portfolio.AggregatedPositions) {
-                const sector = this.sectorMap[pos.InstrumentID] || 'N/A';
+                const sector = sectorMap[pos.InstrumentID] || 'N/A';
                 target[sector] = (target[sector] || 0) + (pos.Invested || pos.Amount || 0);
             }
         }
     }
 
     /**
-     * PROCESS: Runs daily for each user.
+     * PROCESS: META REFACTOR
+     * This now runs ONCE, loads all data, streams users, and returns one big result.
      */
-    async process(todayPortfolio, yesterdayPortfolio, userId, context) {
-        // 1. Load cohort on first run
-        if (!this.smartCohortIds) {
-            await this._loadCohort(context, context.dependencies);
-            this.dates.today = context.todayDateStr;
-            this.dates.yesterday = context.yesterdayDateStr;
-        }
-
-        // 2. Filter user
-        // --- START MODIFICATION ---
-        // If cohort failed to load, this.smartCohortIds will be null, and this check will fail correctly.
-        if (!this.smartCohortIds || !this.smartCohortIds.has(userId) || !todayPortfolio || !yesterdayPortfolio || !todayPortfolio.AggregatedPositions || !yesterdayPortfolio.AggregatedPositions) {
-            return;
-        }
-        // --- END MODIFICATION ---
+    async process(dateStr, dependencies, config, computedDependencies) {
+        const { logger, db, rootData, calculationUtils } = dependencies;
+        const { portfolioRefs } = rootData;
+        logger.log('INFO', '[SmartCohortFlow] Starting meta-process...');
         
-        // 3. User is in the cohort, load maps if needed
-        if (!this.sectorMap) {
-            this.sectorMap = await getInstrumentSectorMap();
+        // 1. Load Cohort from in-memory dependency
+        const smartCohortIds = this._loadCohort(logger, computedDependencies);
+        if (!smartCohortIds) {
+            return null; // Dependency failed
         }
 
-        // --- 4. RUN ASSET FLOW LOGIC ---
-        const yesterdayValues = this._sumAssetValue(yesterdayPortfolio.AggregatedPositions);
-        const todayValues = this._sumAssetValue(todayPortfolio.AggregatedPositions);
-        const allInstrumentIds = new Set([...Object.keys(yesterdayValues), ...Object.keys(todayValues)]);
-        
-        for (const instrumentId of allInstrumentIds) {
-            this._initAsset(instrumentId);
-            this.asset_values[instrumentId].day1_value_sum += (yesterdayValues[instrumentId] || 0);
-            this.asset_values[instrumentId].day2_value_sum += (todayValues[instrumentId] || 0);
+        // 2. Load external dependencies (prices, sectors)
+        const [priceMap, mappings, sectorMap] = await Promise.all([
+            loadAllPriceData(),
+            loadInstrumentMappings(),
+            getInstrumentSectorMap()
+        ]);
+        if (!priceMap || !mappings || !sectorMap || Object.keys(priceMap).length === 0) {
+            logger.log('ERROR', '[SmartCohortFlow] Failed to load critical price/mapping/sector data. Aborting.');
+            return null; // Return null to trigger backfill
         }
 
-        // --- 5. RUN SECTOR ROTATION LOGIC ---
-        this._accumulateSectorInvestment(todayPortfolio, this.todaySectorInvestment);
-        this._accumulateSectorInvestment(yesterdayPortfolio, this.yesterdaySectorInvestment);
+        // 3. Load "yesterday's" portfolio data for comparison
+        const yesterdayDate = new Date(dateStr + 'T00:00:00Z');
+        yesterdayDate.setUTCDate(yesterdayDate.getUTCDate() - 1);
+        const yesterdayStr = yesterdayDate.toISOString().slice(0, 10);
+        const yesterdayRefs = await calculationUtils.getPortfolioPartRefs(config, dependencies, yesterdayStr);
+        const yesterdayPortfolios = await loadFullDayMap(config, dependencies, yesterdayRefs);
+        logger.log('INFO', `[SmartCohortFlow] Loaded ${yesterdayRefs.length} part refs for yesterday.`);
 
-        this.user_count++;
-    }
+        // 4. Stream "today's" portfolio data and process
+        
+        // --- Local state for this run ---
+        const asset_values = {};
+        const todaySectorInvestment = {};
+        const yesterdaySectorInvestment = {};
+        let user_count = 0;
+        // --- End Local state ---
+
+        const batchSize = config.partRefBatchSize || 10;
+        for (let i = 0; i < portfolioRefs.length; i += batchSize) {
+            const batchRefs = portfolioRefs.slice(i, i + batchSize);
+            const todayPortfoliosChunk = await loadDataByRefs(config, dependencies, batchRefs);
+
+            for (const uid in todayPortfoliosChunk) {
+                
+                // --- Filter user ---
+                if (!smartCohortIds.has(uid)) {
+                    continue;
+                }
+                
+                const pToday = todayPortfoliosChunk[uid];
+                const pYesterday = yesterdayPortfolios[uid];
+                
+                if (!pToday || !pYesterday || !pToday.AggregatedPositions || !pYesterday.AggregatedPositions) {
+                    continue;
+                }
+                
+                // --- User is in cohort, run logic ---
+                
+                // 4a. RUN ASSET FLOW LOGIC
+                const yesterdayValues = this._sumAssetValue(pYesterday.AggregatedPositions);
+                const todayValues = this._sumAssetValue(pToday.AggregatedPositions);
+                const allInstrumentIds = new Set([...Object.keys(yesterdayValues), ...Object.keys(todayValues)]);
+                
+                for (const instrumentId of allInstrumentIds) {
+                    this._initAsset(asset_values, instrumentId);
+                    asset_values[instrumentId].day1_value_sum += (yesterdayValues[instrumentId] || 0);
+                    asset_values[instrumentId].day2_value_sum += (todayValues[instrumentId] || 0);
+                }
 
-    /**
-     * GETRESULT: Aggregates and returns the flow data for the cohort.
-     */
-    async getResult() {
-        // --- START MODIFICATION ---
-        // If cohort IDs were never loaded due to dependency failure, return null.
-        if (this.smartCohortIds === null) {
-            console.warn('[SmartCohortFlow] Skipping getResult because dependency (user-investment-profile) failed to load.');
-            return null;
+                // 4b. RUN SECTOR ROTATION LOGIC
+                this._accumulateSectorInvestment(pToday, todaySectorInvestment, sectorMap);
+                this._accumulateSectorInvestment(pYesterday, yesterdaySectorInvestment, sectorMap);
+
+                user_count++;
+            }
         }
         
-        // If cohort loaded but no users were processed, also return null (or an empty object, but null is safer for backfill)
-        if (this.user_count === 0 || !this.dates.today) {
-            console.warn('[SmartCohortFlow] No users processed for smart cohort. Returning null.');
+        logger.log('INFO', `[SmartCohortFlow] Processed ${user_count} users in cohort.`);
+        
+        // --- 5. GETRESULT LOGIC IS NOW INSIDE PROCESS ---
+        
+        if (user_count === 0) {
+            logger.warn('[SmartCohortFlow] No users processed for smart cohort. Returning null.');
             return null;
         }
-        // --- END MODIFICATION ---
-
-
-        // 1. Load dependencies
-        if (!this.priceMap || !this.mappings) {
-            // --- START MODIFICATION ---
-            // Add error handling for this load, and check for empty priceMap
-            try {
-                const [priceData, mappingData] = await Promise.all([
-                    loadAllPriceData(),
-                    loadInstrumentMappings()
-                ]);
-                this.priceMap = priceData;
-                this.mappings = mappingData;
-
-                if (!this.priceMap || Object.keys(this.priceMap).length === 0) {
-                     console.error('[SmartCohortFlow] CRITICAL: Price map is empty or failed to load. Aborting calculation to allow backfill.');
-                    return null; // Return null to trigger backfill
-                }
-            } catch (e) {
-                 console.error('[SmartCohortFlow] Failed to load price/mapping dependencies:', e);
-                 return null;
-            }
-            // --- END MODIFICATION ---
-        }
 
-        // --- 2. Calculate Asset Flow ---
+        // 5a. Calculate Asset Flow
         const finalAssetFlow = {};
-        const todayStr = this.dates.today;
-        const yesterdayStr = this.dates.yesterday;
-
-        for (const instrumentId in this.asset_values) {
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
-            const avg_day1_value = this.asset_values[instrumentId].day1_value_sum / this.user_count;
-            const avg_day2_value = this.asset_values[instrumentId].day2_value_sum / this.user_count;
-            const priceChangePct = getDailyPriceChange(instrumentId, yesterdayStr, todayStr, this.priceMap);
+        for (const instrumentId in asset_values) {
+            const ticker = mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
+            const avg_day1_value = asset_values[instrumentId].day1_value_sum / user_count;
+            const avg_day2_value = asset_values[instrumentId].day2_value_sum / user_count;
+            const priceChangePct = getDailyPriceChange(instrumentId, yesterdayStr, dateStr, priceMap);
 
             if (priceChangePct === null) continue;
 
@@ -210,42 +189,30 @@ class SmartCohortFlow {
             };
         }
         
-        // --- 3. Calculate Sector Rotation ---
+        // 5b. Calculate Sector Rotation
         const finalSectorRotation = {};
-        const allSectors = new Set([...Object.keys(this.todaySectorInvestment), ...Object.keys(this.yesterdaySectorInvestment)]);
+        const allSectors = new Set([...Object.keys(todaySectorInvestment), ...Object.keys(yesterdaySectorInvestment)]);
         for (const sector of allSectors) {
-            const todayAmount = this.todaySectorInvestment[sector] || 0;
-            const yesterdayAmount = this.yesterdaySectorInvestment[sector] || 0;
-            finalSectorRotation[sector] = todayAmount - yesterdayAmount; // Note: This is total $, not avg.
+            const todayAmount = todaySectorInvestment[sector] || 0;
+            const yesterdayAmount = yesterdaySectorInvestment[sector] || 0;
+            finalSectorRotation[sector] = todayAmount - yesterdayAmount;
         }
 
-        // --- START MODIFICATION ---
-        // If no asset flow was calculated (e.g., all price data missing), fail
         if (Object.keys(finalAssetFlow).length === 0) {
-            console.warn('[SmartCohortFlow] No asset flow calculated (likely all price data missing). Returning null.');
+            logger.warn('[SmartCohortFlow] No asset flow calculated (likely all price data missing). Returning null.');
             return null;
         }
-        // --- END MODIFICATION ---
 
-        // 4. Return combined result
+        // 6. Return combined result
         return {
             asset_flow: finalAssetFlow,
             sector_rotation: finalSectorRotation,
-            user_sample_size: this.user_count
+            user_sample_size: user_count
         };
     }
 
-    reset() { 
-        this.asset_values = {};
-        this.todaySectorInvestment = {};
-        this.yesterdaySectorInvestment = {};
-        this.smartCohortIds = null;
-        this.user_count = 0;
-        this.priceMap = null;
-        this.mappings = null;
-        this.sectorMap = null;
-        this.dates = {};
-    }
+    async getResult() { return null; }
+    reset() { }
 }
 
 module.exports = SmartCohortFlow;

package/calculations/behavioural/historical/user-investment-profile.js

@@ -1,19 +1,17 @@
 /**
  * @fileoverview Calculates a rolling 90-day "Investor Score" (IS) for each normal user.
- * Heuristic engine (not an academic finance model).  Outputs:
- * - sharded_user_profile: { <shardKey>: { profiles: { userId: [history...] }, lastUpdated } }
- * - daily_investor_scores: { userId: finalIS }
  *
- * Notes:
- * - NetProfit / ProfitAndLoss fields are assumed to be percent returns in decimal (e.g. 0.03 = +3%).
- * - The "Sharpe" used here is a cross-sectional dispersion proxy computed over position returns,
- * weighted by invested amounts. It's renamed/treated as a dispersionRiskProxy in comments.
+ * --- META REFACTOR ---
+ * This calculation is now `type: "meta"` to consume in-memory dependencies.
+ * It runs ONCE per day, receives the in-memory cache, and must
+ * perform its own user data streaming.
  */
 
 const { Firestore } = require('@google-cloud/firestore');
 const firestore = new Firestore();
-const { loadAllPriceData } = require('../../../utils/price_data_provider');
-const { getInstrumentSectorMap, loadInstrumentMappings } = require('../../../utils/sector_mapping_provider');
+const { loadAllPriceData, getDailyPriceChange } = require('../../../utils/price_data_provider');
+const { loadInstrumentMappings, getInstrumentSectorMap } = require('../../../utils/sector_mapping_provider');
+const { loadDataByRefs } = require('../../../../bulltrackers-module/functions/computation-system/utils/data_loader'); // Adjust path as needed
 
 // Config
 const NUM_SHARDS = 50; // Must match the number of shards to read/write
@@ -25,88 +23,30 @@ const PNL_TRACKER_CALC_ID = 'user-profitability-tracker'; // The calc to read PN
 function getShardIndex(id) {
     const n = parseInt(id, 10);
     if (!Number.isNaN(n)) return Math.abs(n) % NUM_SHARDS;
-    // simple deterministic string hash fallback for non-numeric IDs (UUIDs)
     let h = 0;
     for (let i = 0; i < id.length; i++) {
         h = ((h << 5) - h) + id.charCodeAt(i);
-        h |= 0; // keep 32-bit
+        h |= 0;
     }
     return Math.abs(h) % NUM_SHARDS;
 }
 
 class UserInvestmentProfile {
     constructor() {
-        // will hold today's per-user raw heuristic scores
-        this.dailyUserScores = {}; // { userId: { score_rd, score_disc, score_time } }
-
-        // cached dependencies
-        this.priceMap = null;
-        this.sectorMap = null;
-        this.pnlScores = null; // { userId: dailyPnlDecimal }
-        this.dates = {};
-        this.dependenciesLoaded = false;
-        
-        // --- START MODIFICATION ---
-        // Flag to track if dependencies loaded successfully
-        this.dependencyLoadedSuccess = false;
-        // --- END MODIFICATION ---
+        // --- META REFACTOR ---
+        // All state is now managed inside the `process` function.
+        // The constructor, getResult, and reset methods are no longer used
+        // by the meta-runner, but we leave them for compatibility.
+        // --- END REFACTOR ---
     }
 
-    /**
-     * Loads external dependencies once per run.
-     */
-    async _loadDependencies(context, dependencies) {
-        if (this.dependenciesLoaded) return;
-
-        const { db, logger } = dependencies;
-        const { todayDateStr } = context;
-
-        if (logger) logger.log('INFO', '[UserInvestmentProfile] Loading dependencies...');
-
-        // load price data and sector mapping in parallel
-        const [priceData, sectorData] = await Promise.all([
-            loadAllPriceData(),
-            getInstrumentSectorMap()
-        ]);
-        this.priceMap = priceData || {};
-        this.sectorMap = sectorData || {};
-
-        // load PNL map (daily percent returns per user) from PNL calc
-        this.pnlScores = {};
-        try {
-            const pnlCalcRef = db.collection(context.config.resultsCollection).doc(todayDateStr)
-                .collection(context.config.resultsSubcollection).doc('pnl')
-                .collection(context.config.computationsSubcollection).doc(PNL_TRACKER_CALC_ID);
-
-            const pnlSnap = await pnlCalcRef.get();
-            
-            // --- START MODIFICATION ---
-            // Check for existence of the doc AND the data within it
-            if (pnlSnap.exists && pnlSnap.data().daily_pnl_map) {
-                this.pnlScores = pnlSnap.data().daily_pnl_map || {};
-                if (logger) logger.log('INFO', `[UserInvestmentProfile] Loaded ${Object.keys(this.pnlScores).length} PNL scores.`);
-                this.dependencyLoadedSuccess = true; // Set success flag
-            } else {
-                if (logger) logger.log('WARN', `[UserInvestmentProfile] Could not find PNL scores dependency for ${todayDateStr}. PNL score will be 0. Aborting profile calculation.`);
-                this.dependencyLoadedSuccess = false; // Set failure flag
-            }
-            // --- END MODIFICATION ---
-
-        } catch (e) {
-            if (logger) logger.log('ERROR', `[UserInvestmentProfile] Failed to load PNL scores.`, { error: e.message });
-            this.dependencyLoadedSuccess = false; // Set failure flag on error
-        }
-
-        this.dependenciesLoaded = true;
-        if (logger) logger.log('INFO', '[UserInvestmentProfile] All dependencies loaded.');
-    }
-
-    // ... [Heuristic calculation functions _calculateRiskAndDivScore, _calculateDisciplineScore, _calculateMarketTimingScore are unchanged] ...
+    // ... [Heuristic calculation functions _calculateRiskAndDivScore, _calculateDisciplineScore, _calculateMarketTimingScore] ...
+    // These helper functions remain identical to your original file.
 
     /**
      * HEURISTIC 1: Risk & Diversification Score (0-10).
      */
-    _calculateRiskAndDivScore(todayPortfolio) {
+    _calculateRiskAndDivScore(todayPortfolio, sectorMap) {
         if (!todayPortfolio.AggregatedPositions || todayPortfolio.AggregatedPositions.length === 0) {
             return 5; // neutral
         }
@@ -128,7 +68,7 @@ class UserInvestmentProfile {
             totalInvested += invested;
             if (invested > maxPosition) maxPosition = invested;
 
-            sectors.add(this.sectorMap[pos.InstrumentID] || 'N/A');
+            sectors.add(sectorMap[pos.InstrumentID] || 'N/A');
         }
 
         // Weighted mean & variance of returns
@@ -215,7 +155,7 @@ class UserInvestmentProfile {
     /**
      * HEURISTIC 3: Market Timing Score (0-10).
      */
-    _calculateMarketTimingScore(yesterdayPortfolio = {}, todayPortfolio = {}) {
+    _calculateMarketTimingScore(yesterdayPortfolio = {}, todayPortfolio = {}, priceMap) {
         const yIds = new Set((yesterdayPortfolio.AggregatedPositions || []).map(p => p.PositionID));
         const newPositions = (todayPortfolio.AggregatedPositions || []).filter(p => !yIds.has(p.PositionID));
 
@@ -225,7 +165,7 @@ class UserInvestmentProfile {
         let timingCount = 0;
 
         for (const tPos of newPositions) {
-            const prices = this.priceMap[tPos.InstrumentID];
+            const prices = priceMap[tPos.InstrumentID];
             if (!prices) continue;
 
             // Accept prices as either array or {date:price} map; build sorted array of prices
@@ -267,98 +207,105 @@ class UserInvestmentProfile {
         const avg = (timingCount > 0) ? (timingPoints / timingCount) : 5;
         return Math.max(0, Math.min(10, avg));
     }
-    
-    /**
-     * PROCESS: called per-user per-day to compute and store today's heuristics.
-     */
-    async process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, todaySocial, yesterdaySocial) {
-        // run only for normal users with portfolios
-        if (!todayPortfolio || !todayPortfolio.AggregatedPositions) return;
 
-        if (!this.dependenciesLoaded) {
-            await this._loadDependencies(context, context.dependencies);
-            this.dates.today = context.todayDateStr;
-        }
-        
-        // --- START MODIFICATION ---
-        // If dependencies failed to load (e.g., PNL doc was missing), stop processing.
-        if (!this.dependencyLoadedSuccess) {
-            return;
-        }
-        // --- END MODIFICATION ---
 
-        const yPort = yesterdayPortfolio || {};
+    /**
+     * PROCESS: META REFACTOR
+     * This now runs ONCE, loads all data, streams users, and returns one big result.
+     */
+    async process(dateStr, dependencies, config, computedDependencies) {
+        const { logger, db, rootData, calculationUtils } = dependencies;
+        const { portfolioRefs } = rootData;
 
-        const score_rd = this._calculateRiskAndDivScore(todayPortfolio);
-        const score_disc = this._calculateDisciplineScore(yPort, todayPortfolio);
-        const score_time = this._calculateMarketTimingScore(yPort, todayPortfolio);
+        logger.log('INFO', '[UserInvestmentProfile] Starting meta-process...');
 
-        this.dailyUserScores[userId] = {
-            score_rd,
-            score_disc,
-            score_time
-        };
-    }
+        // 1. Get Pass 1 dependency from in-memory cache
+        const pnlTrackerResult = computedDependencies[PNL_TRACKER_CALC_ID];
+        if (!pnlTrackerResult || !pnlTrackerResult.daily_pnl_map) {
+            logger.log('WARN', `[UserInvestmentProfile] Missing in-memory dependency '${PNL_TRACKER_CALC_ID}'. Aborting.`);
+            return null; // Return null to signal failure
+        }
+        const pnlScores = pnlTrackerResult.daily_pnl_map;
+        logger.log('INFO', `[UserInvestmentProfile] Received ${Object.keys(pnlScores).length} PNL scores in-memory.`);
 
-    /**
-     * GETRESULT: Aggregate into rolling 90-day history, compute avg components and final IS.
-     */
-    async getResult() {
-        // --- START MODIFICATION ---
-        // If dependencies failed, return null to trigger backfill.
-        if (!this.dependencyLoadedSuccess) {
-            // Logger might not be available here, use console.warn
-            console.warn('[UserInvestmentProfile] Skipping getResult as dependency (pnl-tracker) failed.');
+        // 2. Load external dependencies (prices, sectors)
+        const [priceMap, sectorMap] = await Promise.all([
+            loadAllPriceData(),
+            getInstrumentSectorMap()
+        ]);
+        if (!priceMap || !sectorMap) {
+            logger.log('ERROR', '[UserInvestmentProfile] Failed to load priceMap or sectorMap.');
             return null;
         }
         
-        // If no users were processed (e.g., all were filtered out), return null.
-        if (Object.keys(this.dailyUserScores).length === 0) {
-            console.warn('[UserInvestmentProfile] No daily user scores were calculated. Returning null for backfill.');
-            return null;
+        // 3. Load "yesterday's" portfolio data for comparison
+        const yesterdayDate = new Date(dateStr + 'T00:00:00Z');
+        yesterdayDate.setUTCDate(yesterdayDate.getUTCDate() - 1);
+        const yesterdayStr = yesterdayDate.toISOString().slice(0, 10);
+        const yesterdayRefs = await calculationUtils.getPortfolioPartRefs(config, dependencies, yesterdayStr);
+        const yesterdayPortfolios = await loadFullDayMap(config, dependencies, yesterdayRefs);
+        logger.log('INFO', `[UserInvestmentProfile] Loaded ${yesterdayRefs.length} part refs for yesterday.`);
+
+        // 4. Stream "today's" portfolio data and process
+        const batchSize = config.partRefBatchSize || 10;
+        const dailyUserScores = {}; // Local state for this run
+
+        for (let i = 0; i < portfolioRefs.length; i += batchSize) {
+            const batchRefs = portfolioRefs.slice(i, i + batchSize);
+            const todayPortfoliosChunk = await loadDataByRefs(config, dependencies, batchRefs);
+
+            for (const uid in todayPortfoliosChunk) {
+                const pToday = todayPortfoliosChunk[uid];
+                if (!pToday || !pToday.AggregatedPositions) continue; // Skip speculators or empty
+
+                const pYesterday = yesterdayPortfolios[uid] || {};
+
+                // Run the heuristic calculations
+                const score_rd = this._calculateRiskAndDivScore(pToday, sectorMap);
+                const score_disc = this._calculateDisciplineScore(pYesterday, pToday);
+                const score_time = this._calculateMarketTimingScore(pYesterday, pToday, priceMap);
+
+                dailyUserScores[uid] = {
+                    score_rd,
+                    score_disc,
+                    score_time
+                };
+            }
         }
-        // --- END MODIFICATION ---
-
-        const todayStr = this.dates.today || (new Date()).toISOString().slice(0, 10);
+        logger.log('INFO', `[UserInvestmentProfile] Calculated daily scores for ${Object.keys(dailyUserScores).length} users.`);
+        
+        // --- 5. GETRESULT LOGIC IS NOW INSIDE PROCESS ---
+        // (This is the logic from your original getResult())
 
-        // prepare sharded output objects with profiles container (Option A)
         const shardedResults = {};
         for (let i = 0; i < NUM_SHARDS; i++) {
             const shardKey = `${SHARD_COLLECTION_NAME}_shard_${i}`;
-            shardedResults[shardKey] = { profiles: {}, lastUpdated: todayStr };
+            shardedResults[shardKey] = { profiles: {}, lastUpdated: dateStr };
         }
 
         const dailyInvestorScoreMap = {};
 
-        // fetch existing shards in parallel
+        // Fetch existing shards in parallel
         const shardPromises = [];
         for (let i = 0; i < NUM_SHARDS; i++) {
             const docRef = firestore.collection(SHARD_COLLECTION_NAME).doc(`${SHARD_COLLECTION_NAME}_shard_${i}`);
             shardPromises.push(docRef.get());
         }
         const shardSnapshots = await Promise.all(shardPromises);
-
-        // Build existingShards map of profiles for quick access
-        const existingShards = shardSnapshots.map((snap, idx) => {
-            if (!snap.exists) return {}; // no profiles
-            const data = snap.data() || {};
-            return data.profiles || {};
-        });
-
-        // process users
-        for (const userId of Object.keys(this.dailyUserScores)) {
+        const existingShards = shardSnapshots.map((snap) => (snap.exists ? snap.data().profiles : {}));
+        
+        // Process users
+        for (const userId of Object.keys(dailyUserScores)) {
             const shardIndex = getShardIndex(userId);
-            const scores = this.dailyUserScores[userId];
+            const scores = dailyUserScores[userId];
 
-            // fetch existing history for this user (if present)
             const existingProfiles = existingShards[shardIndex] || {};
-            // clone to avoid mutating snapshot data directly
-            const history = (existingProfiles[userId] || []).slice();
+            const history = (existingProfiles[userId] || []).slice(); // clone
 
             history.push({
-                date: todayStr,
+                date: dateStr,
                 ...scores,
-                pnl: (this.pnlScores && (userId in this.pnlScores)) ? this.pnlScores[userId] : 0
+                pnl: (pnlScores[userId] || 0)
             });
 
             const newHistory = history.slice(-ROLLING_DAYS);
@@ -377,36 +324,35 @@ class UserInvestmentProfile {
             avg_time /= N;
             avg_pnl /= N;
 
-            // Normalize PNL: avg_pnl is decimal percent (0.005 -> 0.5%). Map to 0-10 scale:
-            // multiply by 1000 (0.005 -> 5). Clamp to [-10, 10] to avoid outliers.
             const normalizedPnl = Math.max(-10, Math.min(10, avg_pnl * 1000));
-
-            // Final IS (weights): discipline 40%, risk/div 30%, timing 20%, pnl 10%
             const finalISRaw = (avg_disc * 0.4) + (avg_rd * 0.3) + (avg_time * 0.2) + (normalizedPnl * 0.1);
             const finalIS = Math.max(0, Math.min(10, finalISRaw));
 
-            // store in prepared shard result under 'profiles'
             const shardKey = `${SHARD_COLLECTION_NAME}_shard_${shardIndex}`;
             shardedResults[shardKey].profiles[userId] = newHistory;
-
-            // also set the daily investor score
             dailyInvestorScoreMap[userId] = finalIS;
         }
-
+        
+        logger.log('INFO', `[UserInvestmentProfile] Finalized IS scores for ${Object.keys(dailyInvestorScoreMap).length} users.`);
+        
+        // Return the final result object
         return {
             sharded_user_profile: shardedResults,
             daily_investor_scores: dailyInvestorScoreMap
         };
     }
 
+    /**
+     * getResult is no longer used by the meta-runner.
+     */
+    async getResult() { 
+        return null;
+    }
+
+    /**
+     * reset is no longer used by the meta-runner.
+     */
     reset() {
-        this.dailyUserScores = {};
-        this.dependenciesLoaded = false;
-        this.priceMap = null;
-        this.sectorMap = null;
-        this.pnlScores = null;
-        this.dates = {};
-        this.dependencyLoadedSuccess = false; // <-- MODIFICATION
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aiden-shared-calculations-unified",
-  "version": "1.0.36",
+  "version": "1.0.37",
   "description": "Shared calculation modules for the BullTrackers Computation System.",
   "main": "index.js",
   "files": [