bulltrackers-module 1.0.25 → 1.0.26

package/functions/computation-system/index.js

@@ -3,9 +3,9 @@
  */
 
 const { runComputationOrchestrator } = require('./helpers/orchestration_helpers.js');
-const { createComputationSystemHandler } = require('./handler_creator.js'); // <-- Import the new factory
+const { createComputationSystemHandler } = require('./handler_creator.js'); 
 
 module.exports = {
   runComputationOrchestrator,
-  createComputationSystemHandler, // <-- Export the factory
+  createComputationSystemHandler, 
 };

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

@@ -6,9 +6,7 @@
 const { logger } = require("sharedsetup")(__filename);
 const { withRetry } = require('aiden-shared-calculations-unified').utils;
 
-// REMOVE Constants like COLLECTIONS_TO_QUERY, PART_REF_BATCH_SIZE
 
-// Modify getPortfolioPartRefs to accept config
 /**
  * Gets a list of all portfolio "part" document references for a given date.
  *

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

@@ -6,17 +6,14 @@
 
 const { FieldValue, FieldPath } = require('@google-cloud/firestore');
 const { logger } = require("sharedsetup")(__filename);
-// Import calculations and utils from the unified package
 const { calculations, utils } = require('aiden-shared-calculations-unified');
 const { withRetry } = utils; // Get withRetry from the package utils
 
-// REMOVE Constants like BATCH_SIZE_LIMIT, MAX_CONCURRENT_DATES
 
 // --- Calculation Categorization ---
-// This relies on the structure exported by 'aiden-shared-calculations-unified'
 const HISTORICAL_CALC_NAMES = new Set([
     'paper-vs-diamond-hands', 'smart-money-flow', 'profitability-migration',
-    'user-profitability-tracker', 'sector-rotation', 'crowd-conviction-score',
+    'user-profitability-tracker', 'sector-rotation', 'crowd-conviction-score', // TODO Abstract these
     'risk-appetite-change', 'drawdown-response', 'gain-response',
     'tsl-effectiveness', 'position-count-pnl', 'diversification-pnl'
 ]);
@@ -24,7 +21,6 @@ const HISTORICAL_CALC_NAMES = new Set([
 const historicalCalculations = {};
 const dailyCalculations = {};
 
-// Assuming 'calculations' from the package has the same category structure
 for (const category in calculations) {
     for (const calcName in calculations[category]) {
         if (HISTORICAL_CALC_NAMES.has(calcName)) {

package/functions/core/utils/firestore_utils.js

@@ -6,7 +6,7 @@ const { logger } = require("sharedsetup")(__filename);
 
 const db = new Firestore();
 
-const MAX_FIRESTORE_BATCH_SIZE = 500; // Firestore batch limit
+const MAX_FIRESTORE_BATCH_SIZE = 400; // Firestore batch limit TODO Abstract this
 
 /**
  * Fetches and merges the most recent portfolio data for all normal users.

package/functions/dispatcher/helpers/dispatch_helpers.js

@@ -36,8 +36,6 @@ async function dispatchTasksInBatches(tasks, pubsubClient, config) {
             }
         } catch (publishError) {
             logger.log('ERROR', `[Module Dispatcher] Failed to publish batch ${Math.ceil((i + 1) / batchSize)}. Error: ${publishError.message}`, { errorStack: publishError.stack });
-            // Decide on error handling: continue to next batch or throw?
-            // For now, log and continue, but this might need adjustment based on requirements.
         }
     }
 

package/functions/dispatcher/index.js

@@ -40,7 +40,7 @@ function createDispatcherHandler(config, pubsubClient) {
         } catch (error) {
             // Catch errors during decoding or major setup issues
             logger.log('ERROR', '[Module Dispatcher] FATAL error processing message', { errorMessage: error.message, errorStack: error.stack });
-            // Re-throw to signal Pub/Sub to potentially retry (depending on subscription settings)
+            // Re-throw to signal Pub/Sub to potentially retry (depending on subscription settings) TODO - Do not retry? 
             throw error;
         }
     };

package/functions/etoro-price-fetcher/helpers/handler_helpers.js

@@ -109,7 +109,7 @@ exports.fetchAndStorePrices = async (firestore, logger, headerManager, proxyMana
                     batch = firestore.batch(); // Start new batch
                     batchCount = 0;
 
-                    // Optional: Add a small delay between large batch commits if needed
+                    // Add a small delay between large batch commits if needed
                     await new Promise(resolve => setTimeout(resolve, 50));
                 }
             }

package/functions/fetch-insights/helpers/handler_helpers.js

@@ -40,7 +40,7 @@ exports.fetchAndStoreInsights = async (firestore, logger, headerManager, proxyMa
         // Pass only the necessary parts of the selected header object
         const fetchOptions = {
              headers: selectedHeader.header, // Pass the actual header object
-             timeout: 30000 // 30 second timeout - Note: Proxy manager might have its own timeout logic
+             timeout: 30000 // 30 second timeout - Note: Proxy manager might have its own timeout logic TODO - Check if this is needed?
         };
         const { response } = await proxyManager.fetch(config.etoroInsightsUrl, fetchOptions);
 

package/functions/generic-api/helpers/api_helpers.js

@@ -78,7 +78,7 @@ const getDateStringsInRange = (startDate, endDate) => {
 const fetchUnifiedData = async (config, firestore, logger, calcKeys, dateStrings, calcMap) => {
     const response = {};
     // Use collection/subcollection names from config
-    const insightsCollection = config.unifiedInsightsCollection || 'unified_insights';
+    const insightsCollection = config.unifiedInsightsCollection || 'unified_insights'; //TODO - Decide if we remove the hardcoded backups
     const resultsSub = config.resultsSubcollection || 'results';
     const compsSub = config.computationsSubcollection || 'computations';
 

package/functions/invalid-speculator-handler/helpers/handler_helpers.js

@@ -37,7 +37,7 @@ exports.handleInvalidSpeculator = async (message, firestore, FieldValue, logger,
         let targetDocRef;
 
         if (!querySnapshot.empty) {
-            // Randomly select one of the available documents to reduce contention
+            // Randomly select one of the available documents to reduce contention TODO - This feels very shortcutty and inefficient
             const randomIndex = Math.floor(Math.random() * querySnapshot.docs.length);
             targetDocRef = querySnapshot.docs[randomIndex].ref;
         } else {

package/functions/orchestrator/helpers/discovery_helpers.js

@@ -5,8 +5,6 @@ const { logger } = require("sharedsetup")(__filename);
 const coreUtils = require('../../core/utils');
 const { firestore: firestoreUtils, pubsub: pubsubUtils } = coreUtils;
 
-// --- All Constants Removed ---
-
 /**
  * Checks if discovery is needed for a given user type based on block capacities.
  * @async
@@ -111,7 +109,7 @@ async function getDiscoveryCandidates(userType, blocksToFill, config) {
         pendingSpecCollection, 
         normalUserCollection, // Pass name for consistency, though fetch is skipped
         invalidSpecCollection,
-        existingNormalUserIds: existingNormalUserIds // <-- Pass pre-fetched IDs
+        existingNormalUserIds: existingNormalUserIds 
     });
 
     // --- Prioritization for Speculators ---
@@ -120,7 +118,7 @@ async function getDiscoveryCandidates(userType, blocksToFill, config) {
         const prioritizedCandidates = await firestoreUtils.getPrioritizedSpeculators(
             exclusionIds, 
             speculatorInstrumentSet,
-            latestNormalPortfolios // <-- Pass pre-fetched data
+            latestNormalPortfolios
         );
         logger.log('INFO', `Found ${prioritizedCandidates.length} potential new speculators from existing user pool.`);
 
@@ -148,7 +146,7 @@ async function getDiscoveryCandidates(userType, blocksToFill, config) {
 
             let randomId;
             let retryCount = 0;
-            const MAX_RETRIES = 50; // This can remain as it's algorithm-specific
+            const MAX_RETRIES = 50;
             do {
                 if (++retryCount > MAX_RETRIES) break;
                 randomId = String(Math.floor(Math.random() * 1000000) + block.startId);
@@ -188,7 +186,7 @@ async function dispatchDiscovery(userType, candidates, config) {
         topicName,
         dispatchBatchSize,
         pubsubBatchSize,
-        pendingSpecCollection, // <-- Change to singular
+        pendingSpecCollection, 
         pendingMaxFieldsPerDoc,
         pendingMaxWritesPerBatch
     } = config;
@@ -203,9 +201,9 @@ async function dispatchDiscovery(userType, candidates, config) {
     const cidsArray = Array.from(candidates);
 
     if (isSpeculator) {
-        await firestoreUtils.clearCollection(pendingSpecCollection); // <-- Change to singular
+        await firestoreUtils.clearCollection(pendingSpecCollection); 
         await firestoreUtils.batchWriteShardedIds(
-            pendingSpecCollection, // <-- And this line
+            pendingSpecCollection,
             cidsArray, 
             new Date(),
             pendingMaxFieldsPerDoc,

package/functions/orchestrator/index.js

@@ -55,9 +55,9 @@ async function runDiscovery(userType, config, globalConfig) {
 async function runUpdates(userType, config, globalConfig) {
     logger.log('INFO', `[Module Orchestrator] Collecting users for daily update (${userType})...`);
 
-    // Reset locks happens once per entry point, keep it there.
+    // Reset locks happens once per entry point
 
-    // 1. Define Thresholds (Remains the same logic as before)
+    // 1. Define Thresholds 
     const now = new Date();
     const startOfTodayUTC = new Date(Date.UTC(now.getUTCFullYear(), now.getUTCMonth(), now.getUTCDate()));
     const sevenDaysAgoUTC = new Date(Date.now() - 7 * 24 * 60 * 60 * 1000); // Speculator grace period

package/functions/orchestrator/utils/index.js

@@ -1,6 +1,6 @@
 /**
  * @fileoverview Exports Orchestrator-specific utility functions.
- * (Currently empty as per design, but structure is ready).
+ * (Is unused currently).
  */
 
 // Add Orchestrator-specific utils here if needed.

package/functions/speculator-cleanup-orchestrator/helpers/cleanup_helpers.js

@@ -85,7 +85,6 @@ async function cleanupStaleSpeculators(firestore, logger, config, batch) {
         for (const doc of blocksSnapshot.docs) {
             const blockId = doc.id; // e.g., "19000000"
             const blockData = doc.data();
-            // Firestore map keys cannot contain '.', so the keys are likely 'users.123456'
             const users = blockData.users || {};
             let usersRemovedFromBlock = 0;
             const updates = {}; // Updates specific to this block document

package/functions/task-engine/handler_creator.js

@@ -4,7 +4,6 @@
 const { Firestore } = require('@google-cloud/firestore'); // Needed if db is not passed in
 const { PubSub } = require('@google-cloud/pubsub'); // Needed if pubsub is not passed in
 const { logger: defaultLogger } = require("sharedsetup")(__filename); // Use default logger if none provided
-// const { core } = require('../../'); // <-- REMOVE this top-level import
 
 // Import the managers directly from their source
 const { IntelligentHeaderManager, IntelligentProxyManager } = require('../../functions/core/utils');
@@ -84,18 +83,9 @@ function createTaskEngineHandler(config, dependencies = {}) {
                 // Acknowledge Pub/Sub by not throwing
             }
         } catch (error) {
-            // Log the error but crucially *do not re-throw* if you want Pub/Sub to ack the message
-            // Only re-throw if you want Pub/Sub to attempt redelivery based on its settings.
-            // Your existing logic logs but then re-throws - decide if that's the desired behavior.
             logger.log('ERROR', `[TaskEngine/${taskId}] Failed.`, { errorMessage: error.message, errorStack: error.stack });
-            // throw error; // Optional: Uncomment if you want Pub/Sub to retry
         } finally {
-             // Ensure batches are flushed eventually, though the batch manager handles timed flushes.
-             // A final flush here might be redundant if the instance stays alive, but could be useful
-             // if the instance might terminate immediately after processing.
              try {
-                // Consider if flushing on every single message is desired vs relying on timed flush
-                // await batchManager.flushBatches();
              } catch (flushError) {
                  logger.log('ERROR', `[TaskEngine/${taskId}] Error during final flush attempt.`, { error: flushError.message });
              }

package/functions/task-engine/index.js

@@ -4,10 +4,10 @@
 
 const helpers = require('./helpers');
 const utils = require('./utils');
-const { createTaskEngineHandler } = require('./handler_creator'); // <-- Import the new factory
+const { createTaskEngineHandler } = require('./handler_creator'); 
 
 module.exports = {
   helpers,
   utils,
-  createTaskEngineHandler, // <-- Export the factory
+  createTaskEngineHandler,
 };

package/index.js

@@ -4,26 +4,26 @@
  * to be shared across multiple Cloud Functions.
  */
 
-const core = require('./functions/core');
-const Orchestrator = require('./functions/orchestrator');
-const TaskEngine = require('./functions/task-engine');
-const ComputationSystem = require('./functions/computation-system');
-const GenericAPI = require('./functions/generic-api'); // <-- ADD THIS
-const Dispatcher = require('./functions/dispatcher'); // <-- ADD THIS
-const InvalidSpeculatorHandler = require('./functions/invalid-speculator-handler'); // <-- ADD THIS
-const SpeculatorCleanupOrchestrator = require('./functions/speculator-cleanup-orchestrator'); // <-- ADD THIS
-const FetchInsights = require('./functions/fetch-insights'); // <-- ADD THIS
-const EtoroPriceFetcher = require('./functions/etoro-price-fetcher'); // <-- ADD THIS
+const core                          = require('./functions/core');
+const Orchestrator                  = require('./functions/orchestrator');
+const TaskEngine                    = require('./functions/task-engine');
+const ComputationSystem             = require('./functions/computation-system');
+const GenericAPI                    = require('./functions/generic-api'); 
+const Dispatcher                    = require('./functions/dispatcher'); 
+const InvalidSpeculatorHandler      = require('./functions/invalid-speculator-handler'); 
+const SpeculatorCleanupOrchestrator = require('./functions/speculator-cleanup-orchestrator'); 
+const FetchInsights                 = require('./functions/fetch-insights'); 
+const EtoroPriceFetcher             = require('./functions/etoro-price-fetcher'); 
 
 module.exports = {
   core,
   Orchestrator,
   TaskEngine,
   ComputationSystem,
-  GenericAPI, // <-- AND ADD THIS
-  Dispatcher, // <-- AND ADD THIS
-  InvalidSpeculatorHandler, // <-- AND ADD THIS
-  SpeculatorCleanupOrchestrator, // <-- AND ADD THIS
-  FetchInsights, // <-- AND ADD THIS
-  EtoroPriceFetcher // <-- AND ADD THIS
+  GenericAPI, 
+  Dispatcher, 
+  InvalidSpeculatorHandler, 
+  SpeculatorCleanupOrchestrator, 
+  FetchInsights, 
+  EtoroPriceFetcher 
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bulltrackers-module",
-  "version": "1.0.25",
+  "version": "1.0.26",
   "description": "Helper Functions for Bulltrackers.",
   "main": "index.js",
   "files": [