aiden-shared-calculations-unified 1.0.79 → 1.0.81

package/calculations/core/asset-pnl-status.js

@@ -7,68 +7,46 @@
  * This provides a crowd-wide P&L status for each instrument.
  *
  * --- FIX ---
- * This version is modified to only store user *IDs* in the arrays,
- * not the full user P&L objects, to prevent exceeding the
- * 1 MiB Firestore document size limit.
+ * This version is modified to *only* store counts. The
+ * `users_in_profit` and `users_in_loss` arrays are removed
+ * to prevent exceeding the 1 MiB Firestore document size limit.
  */
 const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
 
 class AssetPnlStatus {
     constructor() {
-        // We will store { [instrumentId]: { in_profit: Map(), in_loss: Map() } }
-        // The maps will store <userId, pnl> but only the keys (userIds) will be saved.
+        // We will store { [instrumentId]: { in_profit_count: 0, in_loss_count: 0 } }
+        // We no longer store the user maps, just the counts.
         this.assets = new Map();
         this.mappings = null;
+        this.seenUsers = new Map(); // Map<instrumentId, Set<userId>>
     }
 
     /**
      * Defines the output schema for this calculation.
      * --- MODIFIED ---
-     * The `users_in_profit` and `users_in_loss` schemas are changed
-     * from `items: userSchema` to `items: { "type": "string" }`.
+     * Removed the `users_in_profit` and `users_in_loss` arrays.
      * @returns {object} JSON Schema object
      */
     static getSchema() {
-        /*
-        // The userSchema is no longer needed in the output
-        const userSchema = {
-            "type": "object",
-            "properties": {
-                "userId": { "type": "string" },
-                "pnl": { "type": "number" }
-            },
-            "required": ["userId", "pnl"]
-        };
-        */
-
         const tickerSchema = {
             "type": "object",
             "description": "P&L status for a specific asset.",
             "properties": {
                 "in_profit_count": {
                     "type": "number",
-                    "description": "Count of users currently in profit on this asset."
+                    "description": "Count of unique users currently in profit on this asset."
                 },
                 "in_loss_count": {
                     "type": "number",
-                    "description": "Count of users currently in loss on this asset."
+                    "description": "Count of unique users currently in loss on this asset."
                 },
                 "profit_ratio": {
                     "type": "number",
                     "description": "Percentage of users in profit (In Profit / Total)."
-                },
-                "users_in_profit": {
-                    "type": "array",
-                    "description": "List of user IDs in profit.",
-                    "items": { "type": "string" } // <-- MODIFIED
-                },
-                "users_in_loss": {
-                    "type": "array",
-                    "description": "List of user IDs in loss.",
-                    "items": { "type": "string" } // <-- MODIFIED
                 }
             },
-            "required": ["in_profit_count", "in_loss_count", "profit_ratio", "users_in_profit", "users_in_loss"]
+            "required": ["in_profit_count", "in_loss_count", "profit_ratio"]
         };
 
         return {
@@ -104,8 +82,8 @@ class AssetPnlStatus {
     _initAsset(instrumentId) {
         if (!this.assets.has(instrumentId)) {
             this.assets.set(instrumentId, {
-                in_profit: new Map(), // Map<userId, pnl>
-                in_loss: new Map()   // Map<userId, pnl>
+                in_profit: new Set(),
+                in_loss: new Set()
             });
         }
     }
@@ -124,18 +102,20 @@ class AssetPnlStatus {
             const asset = this.assets.get(instrumentId);
             const pnl = pos.NetProfit || 0;
 
+            // Only count one user once per asset
             if (pnl > 0) {
-                asset.in_profit.set(userId, pnl);
+                asset.in_profit.add(userId);
+                asset.in_loss.delete(userId); // Ensure user isn't in both
             } else if (pnl < 0) {
-                asset.in_loss.set(userId, pnl);
+                asset.in_loss.add(userId);
+                asset.in_profit.delete(userId); // Ensure user isn't in both
             }
         }
     }
 
     /**
      * --- MODIFIED ---
-     * This now saves an array of strings (user IDs) instead of
-     * an array of {userId, pnl} objects to save space.
+     * This now saves only counts.
      */
     async getResult() {
         if (!this.mappings) {
@@ -154,10 +134,8 @@ class AssetPnlStatus {
                 result[ticker] = {
                     in_profit_count: profitCount,
                     in_loss_count: lossCount,
-                    profit_ratio: (profitCount / total) * 100,
-                    // Convert Maps to arrays of *keys* (user IDs)
-                    users_in_profit: Array.from(data.in_profit.keys()), // <-- MODIFIED
-                    users_in_loss: Array.from(data.in_loss.keys())   // <-- MODIFIED
+                    profit_ratio: (profitCount / total) * 100
+                    // Removed the user arrays
                 };
             }
         }
@@ -167,6 +145,7 @@ class AssetPnlStatus {
     reset() {
         this.assets.clear();
         this.mappings = null;
+        this.seenUsers.clear();
     }
 }
 

package/calculations/core/social-sentiment-aggregation.js

@@ -4,6 +4,10 @@
  * This metric answers: "What is the aggregated social media
  * sentiment (bullish, bearish, neutral) globally and
  * for each ticker?"
+ *
+ * --- MODIFIED ---
+ * Changed `process` method to read from `dependencies.rootData.todaySocialPostInsights`
+ * instead of a non-existent `calculationUtils.loadSocialData`.
  */
 class SocialSentimentAggregation {
     constructor() {
@@ -90,19 +94,21 @@ class SocialSentimentAggregation {
 
     /**
      * @param {string} dateStr - Today's date.
-     * @param {object} dependencies - db, logger.
+     * @param {object} dependencies - db, logger, calculationUtils, AND rootData.
      * @param {object} config - Computation config.
      * @param {object} fetchedDependencies - (UNUSED) In-memory results.
      */
     async process(dateStr, dependencies, config, fetchedDependencies) {
-        const { calculationUtils } = dependencies;
-        // This helper should exist on calculationUtils, loaded by the runner
-        const todaySocialPosts = await calculationUtils.loadSocialData(dateStr); 
+        // --- MODIFIED ---
+        // 'meta' calcs get rootData injected into the dependencies object.
+        const todaySocialPosts = dependencies.rootData?.todaySocialPostInsights || {}; 
+        // --- END MODIFIED ---
 
-        for (const post of todaySocialPosts) {
+        for (const post of Object.values(todaySocialPosts)) {
             // This logic assumes 'sentiment' is a simple string,
             // not the object from gemini. This is correct for this calc.
-            const sentiment = post.sentiment || 'neutral'; // 'bullish', 'bearish', 'neutral'
+            // --- MODIFIED: Read from structured sentiment object ---
+            const sentiment = post.sentiment?.overallSentiment?.toLowerCase() || 'neutral';
             
             // 1. Aggregate global sentiment
             if (sentiment === 'bullish') {

package/calculations/gauss/cohort-capital-flow.js

@@ -14,7 +14,8 @@
  * from the new dependency.
  * --------------------------
  */
-const { loadInstrumentMappings } = require('../../../utils/sector_mapping_provider');
+const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+
 
 class CohortCapitalFlow {
     constructor() {

package/calculations/gauss/cohort-definer.js

@@ -8,7 +8,8 @@
  * It then buckets these users into our final, named sub-cohorts
  * (e.g., "Smart Investors", "FOMO Chasers").
  */
-const { loadInstrumentMappings } = require('../../../utils/sector_mapping_provider');
+const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+
 
 class CohortDefiner {
     constructor() {

package/calculations/helix/winner-loser-flow.js

@@ -5,11 +5,10 @@
  * of *unique users* into the 'Winner' (in-profit) and 'Loser'
  * (in-loss) cohorts?"
  *
- * e.g., "Today, 150 losers capitulated (closed) on AAPL,
- * while 25 winners joined (opened)."
- *
- * This is a 'standard' calc because it must iterate over all
- * users to compare their T-1 vs T portfolios.
+ * --- MODIFIED ---
+ * Removed dependency on 'asset-pnl-status' to fix 1MiB limit.
+ * This calculation now determines "winner/loser" status internally
+ * by reading the user's portfolio P&L directly.
  */
 const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
 
@@ -18,7 +17,6 @@ class WinnerLoserFlow {
     constructor() {
         // We will store { [ticker]: { winners_joined: 0, ... } }
         this.assetFlows = new Map();
-        this.cohorts = null; // Caches cohort data
         this.mappings = null; // Caches mappings
     }
 
@@ -76,46 +74,30 @@ class WinnerLoserFlow {
 
     /**
      * Statically declare dependencies.
+     * --- MODIFIED ---
+     * Removed 'asset-pnl-status' dependency.
      */
     static getDependencies() {
-        return [
-            'asset-pnl-status' // from core
-        ];
-    }
-
-    /**
-     * Helper to load cohort data from the dependency (runs once).
-     */
-    _loadCohorts(fetchedDependencies) {
-        if (this.cohorts) return;
-        
-        const pnlStatusData = fetchedDependencies['asset-pnl-status'];
-        if (!pnlStatusData) {
-            this.cohorts = { winnerMap: new Map(), loserMap: new Map() };
-            return;
-        }
-
-        const winnerMap = new Map();
-        const loserMap = new Map();
-        
-        for (const [ticker, data] of Object.entries(pnlStatusData)) {
-            // 'users_in_profit' and 'users_in_loss' are arrays of user IDs
-            winnerMap.set(ticker, new Set(data.users_in_profit || []));
-            loserMap.set(ticker, new Set(data.users_in_loss || []));
-        }
-        
-        this.cohorts = { winnerMap, loserMap };
+        return [];
     }
 
     /**
-     * Helper to get a user's holdings (Instrument IDs)
+     * --- MODIFIED ---
+     * Helper to get a user's holdings (Instrument IDs) AND their P&L.
+     * @returns {Map<InstrumentID, {pnl: number}>}
      */
-    _getHoldings(portfolio) {
+    _getHoldingsWithPnl(portfolio) {
         const positions = portfolio?.AggregatedPositions || portfolio?.PublicPositions;
         if (!positions || !Array.isArray(positions)) {
-            return new Set();
+            return new Map();
+        }
+        const map = new Map();
+        for (const pos of positions) {
+            if (pos.InstrumentID) {
+                map.set(pos.InstrumentID, { pnl: pos.NetProfit || 0 });
+            }
         }
-        return new Set(positions.map(p => p.InstrumentID).filter(Boolean));
+        return map;
     }
     
     /**
@@ -132,21 +114,19 @@ class WinnerLoserFlow {
         }
     }
 
-    process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
+    process(todayPortfolio, yesterdayPortfolio, userId, context) {
         if (!todayPortfolio || !yesterdayPortfolio) {
             return;
         }
 
-        // Load mappings and cohort data on the first user
         if (!this.mappings) {
             this.mappings = context.mappings;
         }
-        this._loadCohorts(fetchedDependencies);
 
-        const yHoldings = this._getHoldings(yesterdayPortfolio); // Set<InstrumentID>
-        const tHoldings = this._getHoldings(todayPortfolio); // Set<InstrumentID>
+        const yHoldings = this._getHoldingsWithPnl(yesterdayPortfolio); // Map<InstID, {pnl}>
+        const tHoldings = this._getHoldingsWithPnl(todayPortfolio); // Map<InstID, {pnl}>
 
-        const allInstrumentIds = new Set([...yHoldings, ...tHoldings]);
+        const allInstrumentIds = new Set([...yHoldings.keys(), ...tHoldings.keys()]);
         if (allInstrumentIds.size === 0) {
             return;
         }
@@ -155,8 +135,12 @@ class WinnerLoserFlow {
             const ticker = this.mappings.instrumentToTicker[instrumentId];
             if (!ticker) continue;
             
-            const isWinner = this.cohorts.winnerMap.get(ticker)?.has(userId) || false;
-            const isLoser = this.cohorts.loserMap.get(ticker)?.has(userId) || false;
+            // --- MODIFIED ---
+            // Determine cohort status from today's portfolio.
+            const tPnl = tHoldings.get(instrumentId)?.pnl;
+            const isWinner = tPnl > 0;
+            const isLoser = tPnl < 0;
+            // --- END MODIFIED ---
             
             // We only care about users who are *currently* in a cohort
             if (!isWinner && !isLoser) {
@@ -199,7 +183,6 @@ class WinnerLoserFlow {
 
     reset() {
         this.assetFlows.clear();
-        this.cohorts = null;
         this.mappings = null;
     }
 }

package/calculations/legacy/in_loss_asset_crowd_flow.js

@@ -1,13 +1,10 @@
 /**
  * @fileoverview Calculation (Pass 3) for "In Loss" cohort asset flow.
  *
- * This metric calculates the "Net Crowd Flow Percentage" for each asset,
- * but *only* for the cohort of users who are currently *at a loss*
- * on that specific asset.
- *
- * This helps identify if losers are capitulating or doubling down.
- *
- * This calculation *depends* on 'asset_pnl_status' to identify the cohort.
+ * --- MODIFIED ---
+ * Removed dependency on 'asset_pnl_status' to fix 1MiB limit.
+ * This calculation now determines "in loss" status internally
+ * by reading the *yesterday's* portfolio P&L directly.
  */
 const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
 
@@ -15,7 +12,8 @@ class InLossAssetCrowdFlow {
     constructor() {
         this.assetData = new Map();
         this.mappings = null;
-        this.inLossCohorts = null; // Map<ticker, Set<userId>>
+        // No longer need this:
+        // this.inLossCohorts = null; 
     }
 
     /**
@@ -57,9 +55,11 @@ class InLossAssetCrowdFlow {
 
     /**
      * Statically declare dependencies.
+     * --- MODIFIED ---
+     * Removed 'asset_pnl-status'
      */
     static getDependencies() {
-        return ['asset_pnl_status'];
+        return [];
     }
 
     _getPortfolioPositions(portfolio) {
@@ -77,31 +77,8 @@ class InLossAssetCrowdFlow {
         }
     }
 
-    /**
-     * Helper to get the cohort data from the dependency.
-     * --- MODIFIED ---
-     * Reads `data.users_in_loss` as a string array, not an object array.
-     */
-    _getInLossCohorts(fetchedDependencies) {
-        if (this.inLossCohorts) {
-            return this.inLossCohorts;
-        }
-        
-        const pnlStatusData = fetchedDependencies['asset_pnl_status'];
-        if (!pnlStatusData) {
-            return new Map();
-        }
-
-        // Re-structure the data for efficient lookup
-        // Map<ticker, Set<userId>>
-        this.inLossCohorts = new Map();
-        for (const [ticker, data] of Object.entries(pnlStatusData)) {
-            // `data.users_in_loss` is now a string[], so no .map() is needed.
-            const userSet = new Set(data.users_in_loss || []); // <-- MODIFIED
-            this.inLossCohorts.set(ticker, userSet);
-        }
-        return this.inLossCohorts;
-    }
+    // --- MODIFIED ---
+    // Removed _getInLossCohorts helper
 
     process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
         if (!todayPortfolio || !yesterdayPortfolio) {
@@ -109,15 +86,9 @@ class InLossAssetCrowdFlow {
         }
 
         if (!this.mappings) {
-            // Context contains the mappings loaded in Pass 1
             this.mappings = context.mappings;
         }
         
-        const cohorts = this._getInLossCohorts(fetchedDependencies);
-        if (cohorts.size === 0) {
-            return; // No dependency data
-        }
-
         const yPos = this._getPortfolioPositions(yesterdayPortfolio);
         const tPos = this._getPortfolioPositions(todayPortfolio);
 
@@ -129,22 +100,22 @@ class InLossAssetCrowdFlow {
         for (const instrumentId of allInstrumentIds) {
             if (!instrumentId) continue;
             
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
-            const cohort = cohorts.get(ticker);
+            const yP = yPosMap.get(instrumentId);
+            const tP = tPosMap.get(instrumentId);
 
-            // This user is not in the "in loss" cohort for this asset, skip.
-            if (!cohort || !cohort.has(userId)) {
-                continue;
+            // --- MODIFIED ---
+            // Check P&L from YESTERDAY's position to define cohort
+            const yPnl = yP?.NetProfit || 0;
+            if (yPnl >= 0) {
+                continue; // User was not in loss yesterday, skip.
             }
+            // --- END MODIFIED ---
             
             // User *is* in the cohort, process their data
             this._initAsset(instrumentId);
             const asset = this.assetData.get(instrumentId);
             asset.cohort.add(userId); // Track cohort size
 
-            const yP = yPosMap.get(instrumentId);
-            const tP = tPosMap.get(instrumentId);
-
             const yInvested = yP?.InvestedAmount || yP?.Amount || 0;
             const tInvested = tP?.InvestedAmount || tP?.Amount || 0;
 
@@ -191,7 +162,6 @@ class InLossAssetCrowdFlow {
     reset() {
         this.assetData.clear();
         this.mappings = null;
-        this.inLossCohorts = null;
     }
 }
 

package/calculations/legacy/in_profit_asset_crowd_flow.js

@@ -1,13 +1,10 @@
 /**
  * @fileoverview Calculation (Pass 3) for "In Profit" cohort asset flow.
  *
- * This metric calculates the "Net Crowd Flow Percentage" for each asset,
- * but *only* for the cohort of users who are currently *in profit*
- * on that specific asset.
- *
- * This helps identify if winners are taking profit or adding to positions.
- *
- * This calculation *depends* on 'asset_pnl_status' to identify the cohort.
+ * --- MODIFIED ---
+ * Removed dependency on 'asset_pnl_status' to fix 1MiB limit.
+ * This calculation now determines "in profit" status internally
+ * by reading the *yesterday's* portfolio P&L directly.
  */
 const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
 
@@ -15,7 +12,8 @@ class InProfitAssetCrowdFlow {
     constructor() {
         this.assetData = new Map();
         this.mappings = null;
-        this.inProfitCohorts = null; // Map<ticker, Set<userId>>
+        // No longer need this:
+        // this.inProfitCohorts = null; 
     }
 
     /**
@@ -57,9 +55,11 @@ class InProfitAssetCrowdFlow {
 
     /**
      * Statically declare dependencies.
+     * --- MODIFIED ---
+     * Removed 'asset_pnl-status'
      */
     static getDependencies() {
-        return ['asset_pnl_status'];
+        return [];
     }
 
     _getPortfolioPositions(portfolio) {
@@ -77,31 +77,8 @@ class InProfitAssetCrowdFlow {
         }
     }
 
-    /**
-     * Helper to get the cohort data from the dependency.
-     * --- MODIFIED ---
-     * Reads `data.users_in_profit` as a string array, not an object array.
-     */
-    _getInProfitCohorts(fetchedDependencies) {
-        if (this.inProfitCohorts) {
-            return this.inProfitCohorts;
-        }
-        
-        const pnlStatusData = fetchedDependencies['asset_pnl_status'];
-        if (!pnlStatusData) {
-            return new Map();
-        }
-
-        // Re-structure the data for efficient lookup
-        // Map<ticker, Set<userId>>
-        this.inProfitCohorts = new Map();
-        for (const [ticker, data] of Object.entries(pnlStatusData)) {
-            // `data.users_in_profit` is now a string[], so no .map() is needed.
-            const userSet = new Set(data.users_in_profit || []); // <-- MODIFIED
-            this.inProfitCohorts.set(ticker, userSet);
-        }
-        return this.inProfitCohorts;
-    }
+    // --- MODIFIED ---
+    // Removed _getInProfitCohorts helper
 
     process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
         if (!todayPortfolio || !yesterdayPortfolio) {
@@ -109,15 +86,9 @@ class InProfitAssetCrowdFlow {
         }
 
         if (!this.mappings) {
-            // Context contains the mappings loaded in Pass 1
             this.mappings = context.mappings;
         }
         
-        const cohorts = this._getInProfitCohorts(fetchedDependencies);
-        if (cohorts.size === 0) {
-            return; // No dependency data
-        }
-
         const yPos = this._getPortfolioPositions(yesterdayPortfolio);
         const tPos = this._getPortfolioPositions(todayPortfolio);
 
@@ -129,22 +100,22 @@ class InProfitAssetCrowdFlow {
         for (const instrumentId of allInstrumentIds) {
             if (!instrumentId) continue;
             
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
-            const cohort = cohorts.get(ticker);
+            const yP = yPosMap.get(instrumentId);
+            const tP = tPosMap.get(instrumentId);
 
-            // This user is not in the "in profit" cohort for this asset, skip.
-            if (!cohort || !cohort.has(userId)) {
-                continue;
+            // --- MODIFIED ---
+            // Check P&L from YESTERDAY's position to define cohort
+            const yPnl = yP?.NetProfit || 0;
+            if (yPnl <= 0) {
+                continue; // User was not in profit yesterday, skip.
             }
-            
+            // --- END MODIFIED ---
+
             // User *is* in the cohort, process their data
             this._initAsset(instrumentId);
             const asset = this.assetData.get(instrumentId);
             asset.cohort.add(userId); // Track cohort size
 
-            const yP = yPosMap.get(instrumentId);
-            const tP = tPosMap.get(instrumentId);
-
             const yInvested = yP?.InvestedAmount || yP?.Amount || 0;
             const tInvested = tP?.InvestedAmount || tP?.Amount || 0;
 
@@ -191,7 +162,6 @@ class InProfitAssetCrowdFlow {
     reset() {
         this.assetData.clear();
         this.mappings = null;
-        this.inProfitCohorts = null;
     }
 }
 

package/package.json

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