aiden-shared-calculations-unified 1.0.82 → 1.0.84

package/calculations/core/profitability-skew-per-stock.js

@@ -7,16 +7,16 @@ _ This metric answers: "For each stock, what is the sum and
  * This helps determine if returns are skewed (e.g., many small
  * wins and a few huge losses).
  */
-const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+// --- STANDARD 0: REMOVED require('../../utils/sector_mapping_provider') ---
 
 class ProfitabilitySkewPerStock {
     constructor() {
         // { [instrumentId]: { profit_sum: 0, profit_count: 0, loss_sum: 0, loss_count: 0 } }
         this.assets = new Map();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
     }
 
-    // --- NEW ---
     /**
      * Statically defines all metadata for the manifest builder.
      */
@@ -30,7 +30,6 @@ class ProfitabilitySkewPerStock {
         };
     }
 
-    // --- NEW ---
     /**
      * Statically declare dependencies.
      */
@@ -40,7 +39,6 @@ class ProfitabilitySkewPerStock {
 
     /**
      * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
      */
     static getSchema() {
         const tickerSchema = {
@@ -80,10 +78,14 @@ class ProfitabilitySkewPerStock {
         }
     }
 
-    // --- REFACTORED ---
-    // Simplified signature
-    process(portfolioData) {
-        const positions = portfolioData.PublicPositions || portfolioData.AggregatedPositions;
+    // --- STANDARD 0: UPDATED SIGNATURE ---
+    process(todayPortfolio, yesterdayPortfolio, userId, context) {
+        // --- STANDARD 0: ADDED ---
+        if (!this.tickerMap) {
+             this.tickerMap = context.instrumentToTicker;
+        }
+
+        const positions = todayPortfolio.PublicPositions || todayPortfolio.AggregatedPositions;
         if (!positions || !Array.isArray(positions)) {
             return;
         }
@@ -107,13 +109,17 @@ class ProfitabilitySkewPerStock {
     }
 
     async getResult() {
-        if (!this.mappings) {
-            this.mappings = await loadInstrumentMappings();
+        // --- STANDARD 0: REMOVED forbidden data load ---
+
+        // Failsafe check
+        if (!this.tickerMap) {
+            return {}; // process() must run first
         }
 
         const result = {};
         for (const [instrumentId, data] of this.assets.entries()) {
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
+            // --- STANDARD 0: SIMPLIFIED ---
+            const ticker = this.tickerMap[instrumentId] || `id_${instrumentId}`;
             
             const avgProfit = (data.profit_count > 0) ? (data.profit_sum / data.profit_count) : 0;
             const avgLoss = (data.loss_count > 0) ? (Math.abs(data.loss_sum) / data.loss_count) : 0;
@@ -131,7 +137,8 @@ class ProfitabilitySkewPerStock {
 
     reset() {
         this.assets.clear();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
     }
 }
 

package/calculations/core/profitable-and-unprofitable-status.js

@@ -10,7 +10,6 @@ class ProfitableAndUnprofitableStatus {
         this.total_in_loss = 0;
     }
 
-    // --- NEW ---
     /**
      * Statically defines all metadata for the manifest builder.
      */
@@ -24,7 +23,6 @@ class ProfitableAndUnprofitableStatus {
         };
     }
 
-    // --- NEW ---
     /**
      * Statically declare dependencies.
      */
@@ -34,7 +32,6 @@ class ProfitableAndUnprofitableStatus {
 
     /**
      * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
      */
     static getSchema() {
         return {
@@ -58,15 +55,42 @@ class ProfitableAndUnprofitableStatus {
         };
     }
 
-    // --- REFACTORED ---
-    // Simplified signature
-    process(portfolioData) {
-        // Use the P&L from the summary, which is for the *day*
-        const dailyPnl = portfolioData.Summary?.NetProfit || 0;
+    // --- UPDATED SIGNATURE ---
+    process(todayPortfolio, yesterdayPortfolio, userId, context) {
         
-        if (dailyPnl > 0) {
+        // ---
+        // FIX: The 'data-generator.js' does not provide a 'Summary' object
+        // or a root-level 'NetProfit' field.
+        // We must derive the overall P&L from the individual positions,
+        // which *are* generated.
+        // ---
+        const positions = todayPortfolio.AggregatedPositions;
+        if (!positions || !Array.isArray(positions) || positions.length === 0) {
+            return; // No positions, no P&L status
+        }
+
+        let totalInvested = 0;
+        let weightedPnlSum = 0;
+
+        for (const pos of positions) {
+            const invested = pos.Invested;
+            const pnl = pos.NetProfit;
+
+            if (typeof invested === 'number' && typeof pnl === 'number') {
+                totalInvested += invested;
+                weightedPnlSum += (pnl * invested); // Weight the P&L by its size
+            }
+        }
+
+        if (totalInvested === 0) {
+            return; // No invested capital, no P&L status
+        }
+
+        const overallPnl = weightedPnlSum / totalInvested;
+        
+        if (overallPnl > 0) {
             this.total_in_profit++;
-        } else if (dailyPnl < 0) {
+        } else if (overallPnl < 0) {
             this.total_in_loss++;
         }
     }

package/calculations/core/sentiment-per-stock.js

@@ -4,18 +4,18 @@
  * This metric answers: "For each stock, what is the count
  * of long versus short positions?"
  */
-const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
+// --- STANDARD 0: REMOVED require('../../utils/sector_mapping_provider') ---
 
 class SentimentPerStock {
     constructor() {
         // { [instrumentId]: { long: 0, short: 0 } }
         this.assets = new Map();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
     }
 
     /**
      * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
      */
     static getSchema() {
         const tickerSchema = {
@@ -77,8 +77,14 @@ class SentimentPerStock {
         }
     }
 
-    process(portfolioData) {
-        const positions = portfolioData.PublicPositions || portfolioData.AggregatedPositions;
+    // --- STANDARD 0: UPDATED SIGNATURE ---
+    process(todayPortfolio, yesterdayPortfolio, userId, context) {
+        // --- STANDARD 0: ADDED ---
+        if (!this.tickerMap) {
+             this.tickerMap = context.instrumentToTicker;
+        }
+
+        const positions = todayPortfolio.PublicPositions || todayPortfolio.AggregatedPositions;
         if (!positions || !Array.isArray(positions)) {
             return;
         }
@@ -99,13 +105,17 @@ class SentimentPerStock {
     }
 
     async getResult() {
-        if (!this.mappings) {
-            this.mappings = await loadInstrumentMappings();
+        // --- STANDARD 0: REMOVED forbidden data load ---
+
+        // Failsafe check
+        if (!this.tickerMap) {
+            return {}; // process() must run first
         }
 
         const result = {};
         for (const [instrumentId, data] of this.assets.entries()) {
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
+            // --- STANDARD 0: SIMPLIFIED ---
+            const ticker = this.tickerMap[instrumentId] || `id_${instrumentId}`;
             
             if (data.long > 0 || data.short > 0) {
                 result[ticker] = {
@@ -120,7 +130,8 @@ class SentimentPerStock {
 
     reset() {
         this.assets.clear();
-        this.mappings = null;
+        // --- STANDARD 0: RENAMED ---
+        this.tickerMap = null;
     }
 }
 

package/calculations/core/short-position-per-stock.js

@@ -1,22 +1,16 @@
 /**
  * @fileoverview Calculation (Pass 1) for short positions per stock.
- *
- * This metric answers: "How many short ('sell') positions
- * are there for each stock?"
+ * --- FIX ---
+ * - Logic updated to check for *both* Speculator schema (pos.IsBuy === false)
+ * and Normal schema (pos.Direction === 'Sell') to match schema.md.
  */
-const { loadInstrumentMappings } = require('../../utils/sector_mapping_provider');
 
 class ShortPositionPerStock {
     constructor() {
-        // We will store { [instrumentId]: count }
         this.assets = new Map();
-        this.mappings = null;
+        this.tickerMap = null;
     }
 
-    // --- NEW ---
-    /**
-     * Statically defines all metadata for the manifest builder.
-     */
     static getMetadata() {
         return {
             type: 'standard',
@@ -27,32 +21,18 @@ class ShortPositionPerStock {
         };
     }
 
-    // --- NEW ---
-    /**
-     * Statically declare dependencies.
-     */
     static getDependencies() {
         return [];
     }
 
-    /**
-     * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
-     */
     static getSchema() {
         return {
             "type": "object",
             "description": "Calculates the total count of short ('sell') positions for each asset.",
             "patternProperties": {
-                // Ticker
-                "^.*$": {
-                    "type": "number",
-                    "description": "The total count of short positions for this asset."
-                }
+                "^.*$": { "type": "number" }
             },
-            "additionalProperties": {
-                "type": "number"
-            }
+            "additionalProperties": { "type": "number" }
         };
     }
 
@@ -62,20 +42,26 @@ class ShortPositionPerStock {
         }
     }
 
-    // --- REFACTORED ---
-    // Simplified signature
-    process(portfolioData) {
-        const positions = portfolioData.PublicPositions || portfolioData.AggregatedPositions;
+    process(todayPortfolio, yesterdayPortfolio, userId, context, todayInsights, yesterdayInsights, fetchedDependencies) {
+        if (!this.tickerMap) {
+             this.tickerMap = context.instrumentToTicker;
+        }
+
+        const positions = todayPortfolio.PublicPositions || todayPortfolio.AggregatedPositions;
         if (!positions || !Array.isArray(positions)) {
             return;
         }
 
         for (const pos of positions) {
-            // Only count 'sell' (short) positions
-            if (!pos.IsBuy) {
+            // --- THIS IS THE FIX ---
+            // Check for Speculator (IsBuy) OR Normal (Direction)
+            const isShort = (pos.IsBuy === false) || (pos.Direction === 'Sell');
+
+            if (isShort) {
+            // --- END FIX ---
                 const instrumentId = pos.InstrumentID;
                 if (!instrumentId) continue;
-                
+
                 this._initAsset(instrumentId);
                 this.assets.set(instrumentId, this.assets.get(instrumentId) + 1);
             }
@@ -83,13 +69,13 @@ class ShortPositionPerStock {
     }
 
     async getResult() {
-        if (!this.mappings) {
-            this.mappings = await loadInstrumentMappings();
+        if (!this.tickerMap) {
+            return {}; 
         }
 
         const result = {};
         for (const [instrumentId, count] of this.assets.entries()) {
-            const ticker = this.mappings.instrumentToTicker[instrumentId] || `id_${instrumentId}`;
+            const ticker = this.tickerMap[instrumentId] || `id_${instrumentId}`;
             result[ticker] = count;
         }
         return result;
@@ -97,7 +83,7 @@ class ShortPositionPerStock {
 
     reset() {
         this.assets.clear();
-        this.mappings = null;
+        this.tickerMap = null;
     }
 }
 

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

@@ -1,155 +1,81 @@
 /**
- * @fileoverview Social Calculation (Pass 1)
- *
- * This metric answers: "What is the total and average number
- * of likes and comments on social media posts, both globally
- * and per ticker?"
+ * @fileoverview Calculation (Pass 2 - Meta) for social activity.
+ * --- FIX ---
+ * 1. Changed 'process' signature to 5-arg 'meta' standard.
+ * 2. Changed data access to read 'dateStr.social' (Arg 1, the metaPayload).
+ * 3. Changed 'socialDoc.posts' to 'socialDoc' (which IS the map of posts).
+ * 4. Changed 'post.comments' to 'post.commentCount'.
+ * 5. Changed 'post.likes' to 'post.likeCount'.
  */
 class SocialActivityAggregation {
+
     constructor() {
-        this.global = {
-            total_posts: 0,
-            total_likes: 0,
-            total_comments: 0
-        };
-        // { [ticker]: { total_posts: 0, total_likes: 0, total_comments: 0 } }
-        this.perTicker = new Map();
+        this.result = {};
     }
 
-    // --- NEW ---
-    /**
-     * Statically defines all metadata for the manifest builder.
-     */
     static getMetadata() {
         return {
-            type: 'meta', // Runs once, not per-user
-            rootDataDependencies: ['social'], // Needs the social posts doc
+            type: 'meta',
+            rootDataDependencies: ['social'],
             isHistorical: false,
             userType: 'n/a',
             category: 'core_social'
         };
     }
 
-    // --- NEW ---
-    /**
-     * Statically declare dependencies.
-     */
     static getDependencies() {
         return [];
     }
 
-    /**
-     * Defines the output schema for this calculation.
-     * @returns {object} JSON Schema object
-     */
     static getSchema() {
-        const statsSchema = {
+        return {
             "type": "object",
+            "description": "Aggregates the total social activity for the day.",
             "properties": {
                 "total_posts": { "type": "number" },
-                "total_likes": { "type": "number" },
                 "total_comments": { "type": "number" },
-                "avg_likes_per_post": { "type": "number" },
-                "avg_comments_per_post": { "type": "number" }
-            },
-            "required": ["total_posts", "total_likes", "total_comments", "avg_likes_per_post", "avg_comments_per_post"]
-        };
-
-        return {
-            "type": "object",
-            "description": "Aggregates social activity (posts, likes, comments) globally and per ticker.",
-            "properties": {
-                "global_activity": {
-                    ...statsSchema,
-                    "description": "Aggregated activity across all posts."
-                },
-                "per_ticker": {
-                    "type": "object",
-                    "description": "Aggregated activity broken down by asset ticker.",
-                    "patternProperties": {
-                        "^.*$": {
-                            ...statsSchema,
-                            "description": "Aggregated activity for a specific ticker."
-                        } // Ticker
-                    },
-                    "additionalProperties": statsSchema
-                }
+                "total_likes": { "type": "number" }
             },
-            "required": ["global_activity", "per_ticker"]
+            "required": ["total_posts", "total_comments", "total_likes"]
         };
     }
 
-    _initTicker(ticker) {
-        if (!this.perTicker.has(ticker)) {
-            this.perTicker.set(ticker, {
-                total_posts: 0,
-                total_likes: 0,
-                total_comments: 0
-            });
+    // --- THIS IS THE FIX ---
+    async process(dateStr, rootData, dependencies, config, fetchedDependencies) {
+
+        // Get social data from Arg 1 (metaPayload)
+        const socialDoc = dateStr.social; // This IS the map of posts
+
+        if (!socialDoc || typeof socialDoc !== 'object') {
+            this.result = { total_posts: 0, total_comments: 0, total_likes: 0 };
+            return;
         }
-    }
 
-    // --- REFACTORED ---
-    /**
-     * This is a 'meta' calculation.
-     * @param {string} dateStr - Today's date.
-     * @param {object} rootData - The root data object.
-     * @param {object} dependencies - db, logger, calculationUtils.
-     */
-    async process(dateStr, rootData, dependencies) {
-        const { calculationUtils } = dependencies;
-        // The runner provides social data inside rootData
-        const todaySocialPosts = rootData.todaySocialPostInsights || {}; 
+        const postsArray = Object.values(socialDoc);
+        let totalPosts = postsArray.length;
+        let totalComments = 0;
+        let totalLikes = 0;
 
-        for (const post of Object.values(todaySocialPosts)) {
-            const likes = post.likeCount || 0;
-            const comments = post.commentCount || 0;
-            
-            // 1. Aggregate global stats
-            this.global.total_posts++;
-            this.global.total_likes += likes;
-            this.global.total_comments += comments;
-            
-            // 2. Aggregate per-ticker stats
-            const tickers = post.tickers || [];
-            for (const ticker of tickers) {
-                this._initTicker(ticker);
-                const data = this.perTicker.get(ticker);
-                data.total_posts++;
-                data.total_likes += likes;
-                data.total_comments += comments;
-            }
+        for (const post of postsArray) {
+            // Use schema.md fields
+            totalComments += post.commentCount || 0;
+            totalLikes += post.likeCount || 0;
         }
-    }
-    
-    _calculateAverages(data) {
-        const posts = data.total_posts;
-        return {
-            ...data,
-            avg_likes_per_post: (posts > 0) ? (data.total_likes / posts) : 0,
-            avg_comments_per_post: (posts > 0) ? (data.total_comments / posts) : 0
+
+        this.result = {
+            total_posts: totalPosts,
+            total_comments: totalComments,
+            total_likes: totalLikes
         };
     }
+    // --- END FIX ---
 
-    async getResult() {
-        // Calculate averages for global
-        const global_activity = this._calculateAverages(this.global);
-        
-        // Calculate averages for per-ticker
-        const per_ticker = {};
-        for (const [ticker, data] of this.perTicker.entries()) {
-            per_ticker[ticker] = this._calculateAverages(data);
-        }
-        
-        return {
-            global_activity,
-            per_ticker
-        };
+    async getResult(fetchedDependencies) {
+        return this.result;
     }
 
     reset() {
-        this.global = { total_posts: 0, total_likes: 0, total_comments: 0 };
-        this.perTicker.clear();
+        this.result = {};
     }
 }