bulltrackers-module 1.0.88 → 1.0.90

package/functions/computation-system/helpers/orchestration_helpers.js

@@ -78,7 +78,6 @@ async function runComputationOrchestrator(config, dependencies) {
     const existingDateIds = new Set(insightDocs.docs.map(d => d.id).filter(id => /^\d{4}-\d{2}-\d{2}$/.test(id)));
 
     // --- PASS 1 ---
-    // (Existing Pass 1 code ... no changes here)
     const missingDates = allExpectedDates.filter(dateStr => !existingDateIds.has(dateStr));
     const pass1Jobs = missingDates.map(date => ({ 
         date, 
@@ -100,7 +99,6 @@ async function runComputationOrchestrator(config, dependencies) {
 
 
     // --- PASS 2 ---
-    // (Existing Pass 2 code ... no changes here)
     const pass2Jobs = [];
     const updatedInsightDocs = await withRetry(() => dependencies.db.collection(config.resultsCollection).get(), "ListAllInsightDocs-Pass2");
     updatedInsightDocs.forEach(doc => {
@@ -199,7 +197,6 @@ async function runComputationOrchestrator(config, dependencies) {
  * Internal sub-pipe: Initializes calculator instances.
  */
 function initializeCalculators(calculationsToRun, sourcePackage, logger) {
-    // ... (existing code unchanged) ...
     const state = {};
     for (const { category, calcName } of calculationsToRun) {
         const CalculationClass = sourcePackage[category]?.[calcName];
@@ -230,7 +227,6 @@ async function streamAndProcess(
     todaySocialPostInsights = null,
     yesterdaySocialPostInsights = null
 ) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     logger.log('INFO', `[${passName}] Streaming ${todayRefs.length} 'today' part docs for ${dateStr}...`);
 
@@ -341,10 +337,8 @@ async function streamAndProcess(
 
 /**
  * Internal sub-pipe: Runs computations for a single date.
- * (Existing code ... no changes here)
  */
 async function runUnifiedComputation(dateToProcess, calculationsToRun, passName, sourcePackage, config, dependencies) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     const dateStr = dateToProcess.toISOString().slice(0, 10);
     logger.log('INFO', `[${passName}] Starting run for ${dateStr} with ${calculationsToRun.length} calcs.`);
@@ -364,7 +358,7 @@ async function runUnifiedComputation(dateToProcess, calculationsToRun, passName,
         let yesterdayInsightsData = null; 
         let yesterdaySocialPostInsightsData = null; 
         
-        const requiresYesterdayPortfolio = calculationsToRun.some(c => sourcePackage[c.category]?.[c.calcName]?.prototype?.process.length >= 3);
+        const requiresYesterdayPortfolio = calculationsToRun.some(c => HISTORICAL_CALC_NAMES.has(c.calcName)); // Use historical cals to determine need FIX from const requiresYesterdayPortfolio = calculationsToRun.some(c => sourcePackage[c.category]?.[c.calcName]?.prototype?.process.length >= 3);
         const requiresYesterdayInsights = calculationsToRun.some(c => c.category === 'insights');
         const requiresYesterdaySocialPosts = calculationsToRun.some(c => c.category === 'socialPosts');
 

package/functions/computation-system/utils/data_loader.js

@@ -13,7 +13,6 @@ const { FieldPath } = require('@google-cloud/firestore'); // <<< --- ADD FieldPa
  * @returns {Promise<Firestore.DocumentReference[]>} An array of DocumentReferences.
  */
 async function getPortfolioPartRefs(config, dependencies, dateString) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     logger.log('INFO', `Getting portfolio part references for date: ${dateString}`);
     const allPartRefs = [];
@@ -53,7 +52,6 @@ async function getPortfolioPartRefs(config, dependencies, dateString) {
  * @returns {Promise<object>} A single map of { [userId]: portfolioData }.
  */
 async function loadDataByRefs(config, dependencies, refs) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     if (!refs || refs.length === 0) { return {}; }
     const mergedPortfolios = {};
@@ -88,7 +86,6 @@ async function loadDataByRefs(config, dependencies, refs) {
  * @returns {Promise<object>} A single map of { [userId]: portfolioData }.
  */
 async function loadFullDayMap(config, dependencies, partRefs) {
-    // ... (existing code unchanged) ...
     const { logger } = dependencies;
     if (partRefs.length === 0) return {};
     logger.log('TRACE', `Loading full day map from ${partRefs.length} references...`);
@@ -100,7 +97,6 @@ async function loadFullDayMap(config, dependencies, partRefs) {
 }
 
 /**
- * --- (EXISTING) ---
  * Sub-pipe: pipe.computationSystem.dataLoader.loadDailyInsights
  * Fetches the daily instrument insights document for a specific date.
  * @param {object} config - The computation system configuration object.
@@ -173,5 +169,5 @@ module.exports = {
     loadDataByRefs,
     loadFullDayMap,
     loadDailyInsights,
-    loadDailySocialPostInsights, // Export the new function
+    loadDailySocialPostInsights, 
 };

package/functions/computation-system/utils/utils.js

@@ -20,24 +20,30 @@ const HISTORICAL_CALC_NAMES = new Set([
     'asset-crowd-flow'
 ]);
 
-// --- NEW: Add a set for meta calculation names ---
-const META_CALC_NAMES = new Set([
-    'cash-flow-deployment'
-]);
-// --- END NEW ---
+// --- Set for meta calculation names (Generated Dynamically) ---
+const META_CALC_NAMES = new Set(); // This will be populated dynamically
+
 
 const historicalCalculations = {};
 const dailyCalculations = {};
-const metaCalculations = {}; // <-- NEW: Add object for meta calcs
+const metaCalculations = {}; 
 
 for (const category in calculations) {
     for (const calcName in calculations[category]) {
-        if (HISTORICAL_CALC_NAMES.has(calcName)) {
-            if (!historicalCalculations[category]) historicalCalculations[category] = {};
-            historicalCalculations[category][calcName] = calculations[category][calcName];
-        } else if (META_CALC_NAMES.has(calcName)) { // <-- NEW: Add else-if block
+        
+        // --- UPDATED LOGIC ---
+        // 1. Check if it's a 'meta' calculation by its category
+        if (category === 'meta') {
             if (!metaCalculations[category]) metaCalculations[category] = {};
             metaCalculations[category][calcName] = calculations[category][calcName];
+            META_CALC_NAMES.add(calcName); // Add to the set for export
+        
+        // 2. Check if it's a historical calculation
+        } else if (HISTORICAL_CALC_NAMES.has(calcName)) {
+            if (!historicalCalculations[category]) historicalCalculations[category] = {};
+            historicalCalculations[category][calcName] = calculations[category][calcName];
+        
+        // 3. Otherwise, it's a standard daily calculation
         } else {
             if (!dailyCalculations[category]) dailyCalculations[category] = {};
             dailyCalculations[category][calcName] = calculations[category][calcName];
@@ -55,7 +61,6 @@ for (const category in calculations) {
  * @param {string} operationName - Name for logging.
  */
 async function commitBatchInChunks(config, dependencies, writes, operationName) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     const batchSizeLimit = config.batchSizeLimit || 450;
     
@@ -83,7 +88,6 @@ async function commitBatchInChunks(config, dependencies, writes, operationName)
  * (Stateless)
  */
 function getExpectedDateStrings(startDate, endDate) {
-    // ... (existing code unchanged) ...
     const dateStrings = [];
     if (startDate <= endDate) {
         const startUTC = new Date(Date.UTC(startDate.getUTCFullYear(), startDate.getUTCMonth(), startDate.getUTCDate()));
@@ -101,7 +105,6 @@ function getExpectedDateStrings(startDate, endDate) {
  * (Stateless, as taskFunction will receive dependencies)
  */
 async function processJobsInParallel(jobs, taskFunction, passName, config) {
-    // ... (existing code unchanged) ...
     // This function itself doesn't need dependencies, 
     // but the 'taskFunction' it calls *will* receive them from its caller.
     const { logger } = require("sharedsetup")(__filename); // Use local logger for this static util
@@ -125,7 +128,6 @@ async function processJobsInParallel(jobs, taskFunction, passName, config) {
  * Internal helper: Finds the earliest date document in a collection.
  */
 async function getFirstDateFromCollection(config, dependencies, collectionName) {
-    // ... (existing code unchanged) ...
     const { db, logger } = dependencies;
     let earliestDate = null;
     try {
@@ -171,7 +173,6 @@ async function getFirstDateFromCollection(config, dependencies, collectionName)
  * @returns {Promise<Date>} The earliest date found or a default fallback date.
  */
 async function getFirstDateFromSourceData(config, dependencies) {
-    // ... (existing code unchanged) ...
     const { logger } = dependencies;
     logger.log('INFO', 'Querying for the earliest date from source portfolio data...');
     
@@ -198,11 +199,9 @@ async function getFirstDateFromSourceData(config, dependencies) {
 
 module.exports = {
     FieldValue, FieldPath,
-    // --- MODIFIED: Export meta calculations ---
     historicalCalculations, dailyCalculations, metaCalculations, 
     unifiedUtils: utils, 
     HISTORICAL_CALC_NAMES, META_CALC_NAMES,
-    // --- END MODIFIED ---
     withRetry, commitBatchInChunks,
     getExpectedDateStrings, processJobsInParallel, getFirstDateFromSourceData,
 };

package/index.js

@@ -5,7 +5,7 @@
  */
 
 // --- Core Utilities (Classes and Stateless Helpers) ---
-// ... (no changes here) ...
+
 const core = {
     IntelligentHeaderManager: require('./functions/core/utils/intelligent_header_manager').IntelligentHeaderManager,
     IntelligentProxyManager: require('./functions/core/utils/intelligent_proxy_manager').IntelligentProxyManager,
@@ -15,7 +15,7 @@ const core = {
 };
 
 // --- Pipe 1: Orchestrator ---
-// ... (no changes here) ...
+
 const orchestrator = {
     // Main Pipes (Entry points for Cloud Functions)
     runDiscoveryOrchestrator: require('./functions/orchestrator/index').runDiscoveryOrchestrator,
@@ -32,7 +32,7 @@ const orchestrator = {
 };
 
 // --- Pipe 2: Dispatcher ---
-// ... (no changes here) ...
+
 const dispatcher = {
     // Main Pipe
     handleRequest: require('./functions/dispatcher/index').handleRequest,
@@ -42,7 +42,7 @@ const dispatcher = {
 };
 
 // --- Pipe 3: Task Engine ---
-// ... (no changes here) ...
+
 const taskEngine = {
     // Main Pipe
     handleRequest: require('./functions/task-engine/handler_creator').handleRequest,
@@ -54,7 +54,6 @@ const taskEngine = {
 };
 
 // --- Pipe 4: Computation System ---
-// ... (no changes here) ...
 const computationSystem = {
     // Main Pipe
     runOrchestration: require('./functions/computation-system/helpers/orchestration_helpers').runComputationOrchestrator,
@@ -65,7 +64,7 @@ const computationSystem = {
 };
 
 // --- Pipe 5: API ---
-// ... (no changes here) ...
+
 const api = {
     // Main Pipe
     createApiApp: require('./functions/generic-api/index').createApiApp,
@@ -75,27 +74,21 @@ const api = {
 };
 
 // --- Pipe 6: Maintenance ---
-// Standalone cleanup and utility functions
+// Standalone cleanup and utility functions TODO -- Some of these are not really maintenance pipes, socials could do with its own pipe..?
 const maintenance = {
     runSpeculatorCleanup: require('./functions/speculator-cleanup-orchestrator/helpers/cleanup_helpers').runCleanup,
     handleInvalidSpeculator: require('./functions/invalid-speculator-handler/helpers/handler_helpers').handleInvalidSpeculator,
     runFetchInsights: require('./functions/fetch-insights/helpers/handler_helpers').fetchAndStoreInsights,
     runFetchPrices: require('./functions/etoro-price-fetcher/helpers/handler_helpers').fetchAndStorePrices,
-    
-    // --- UPDATED ---
     runUserActivitySamplerOrchestrator: require('./functions/user-activity-sampler/helpers/sampler_helpers').runUserActivitySamplerOrchestrator, 
     handleSampleBlockTask: require('./functions/user-activity-sampler/helpers/sampler_helpers').handleSampleBlockTask, 
-    // --- END UPDATE ---
-    
-    // --- NEW SOCIAL SENTIMENT FUNCTIONS ---
     runSocialOrchestrator: require('./functions/social-orchestrator/helpers/orchestrator_helpers').runSocialOrchestrator,
     handleSocialTask: require('./functions/social-task-handler/helpers/handler_helpers').handleSocialTask,
     runBackfillAssetPrices: require('./functions/price-backfill/helpers/handler_helpers').runBackfillAssetPrices,
-    // --- END NEW ---
 };
 
 // --- Pipe 7: Proxy ---
-// ... (no changes here) ...
+
 const proxy = {
     handlePost: require('./functions/appscript-api/index').handlePost,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.88",
+  "version": "1.0.90",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [
@@ -32,7 +32,7 @@
     "@google-cloud/firestore": "^7.11.3",
     "sharedsetup": "latest",
     "require-all": "^3.0.0",
-    "aiden-shared-calculations-unified": "1.0.13",
+    "aiden-shared-calculations-unified": "1.0.15",
     "@google-cloud/pubsub": "latest",
     "express": "^4.19.2",
     "cors": "^2.8.5",