bulltrackers-module 1.0.644 → 1.0.646

package/functions/computation-system/context/ManifestBuilder.js

@@ -231,7 +231,8 @@ function buildManifest(productLinesToRun = [], calculations) {
         const manifestEntry = {
             name:          normalizedName,
             class:         Class,
-            category:      folderName === 'core' && metadata.category ? metadata.category : folderName,     
+            // [CHANGED] Strictly use the folderName as the category.
+            category:      folderName,     
             sourcePackage: folderName,   
             type:                 metadata.type,
             isPage:               metadata.isPage === true,

package/functions/computation-system/data/CachedDataLoader.js

@@ -84,6 +84,9 @@ class CachedDataLoader {
 
     async loadInsights(dateStr) { 
         if (this.cache.insights.has(dateStr)) return this.cache.insights.get(dateStr); 
+        const collectionName = this.config.insightsCollectionName || 'daily_instrument_insights';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'insights' from: ${path}`);
         const promise = loadDailyInsights(this.config, this.deps, dateStr); 
         this.cache.insights.set(dateStr, promise); 
         return promise; 
@@ -91,6 +94,9 @@ class CachedDataLoader {
 
     async loadSocial(dateStr) { 
         if (this.cache.social.has(dateStr)) return this.cache.social.get(dateStr); 
+        const collectionName = this.config.socialInsightsCollection || 'daily_social_insights';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'social' from: ${path}`);
         const promise = loadDailySocialPostInsights(this.config, this.deps, dateStr); 
         this.cache.social.set(dateStr, promise); 
         return promise; 
@@ -98,6 +104,9 @@ class CachedDataLoader {
 
     async loadVerifications() {
         if (this.cache.verifications) return this.cache.verifications;
+        const collectionName = this.config.verificationsCollection || 'verification_profiles';
+        const path = `${collectionName}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'verifications' from: ${path}`);
         const verifications = await loadVerificationProfiles(this.config, this.deps);
         this.cache.verifications = verifications;
         return verifications;
@@ -105,6 +114,9 @@ class CachedDataLoader {
 
     async loadRankings(dateStr) {
         if (this.cache.rankings.has(dateStr)) return this.cache.rankings.get(dateStr);
+        const collectionName = this.config.popularInvestorRankingsCollection || 'popular_investor_rankings';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'rankings' from: ${path}`);
         const promise = loadPopularInvestorRankings(this.config, this.deps, dateStr);
         this.cache.rankings.set(dateStr, promise);
         return promise;
@@ -112,6 +124,9 @@ class CachedDataLoader {
 
     async loadRatings(dateStr) {
         if (this.cache.ratings.has(dateStr)) return this.cache.ratings.get(dateStr);
+        const collectionName = this.config.piRatingsCollection || 'PIRatingsData';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'ratings' from: ${path}`);
         const promise = loadPIRatings(this.config, this.deps, dateStr);
         this.cache.ratings.set(dateStr, promise);
         return promise;
@@ -119,6 +134,9 @@ class CachedDataLoader {
 
     async loadPageViews(dateStr) {
         if (this.cache.pageViews.has(dateStr)) return this.cache.pageViews.get(dateStr);
+        const collectionName = this.config.piPageViewsCollection || 'PIPageViewsData';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'pageViews' from: ${path}`);
         const promise = loadPIPageViews(this.config, this.deps, dateStr);
         this.cache.pageViews.set(dateStr, promise);
         return promise;
@@ -126,6 +144,9 @@ class CachedDataLoader {
 
     async loadWatchlistMembership(dateStr) {
         if (this.cache.watchlistMembership.has(dateStr)) return this.cache.watchlistMembership.get(dateStr);
+        const collectionName = this.config.watchlistMembershipCollection || 'WatchlistMembershipData';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'watchlistMembership' from: ${path}`);
         const promise = loadWatchlistMembershipData(this.config, this.deps, dateStr);
         this.cache.watchlistMembership.set(dateStr, promise);
         return promise;
@@ -133,6 +154,9 @@ class CachedDataLoader {
 
     async loadAlertHistory(dateStr) {
         if (this.cache.alertHistory.has(dateStr)) return this.cache.alertHistory.get(dateStr);
+        const collectionName = this.config.piAlertHistoryCollection || 'PIAlertHistoryData';
+        const path = `${collectionName}/${dateStr}`;
+        this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Loading Root Data 'alertHistory' from: ${path}`);
         const promise = loadPIAlertHistory(this.config, this.deps, dateStr);
         this.cache.alertHistory.set(dateStr, promise);
         return promise;
@@ -243,6 +267,10 @@ class CachedDataLoader {
         let foundCount = 0;
 
         if (batchRefs.length > 0) {
+            // Log summary of all paths being loaded
+            const paths = batchRefs.map(ref => ref.path).join(', ');
+            this.deps.logger?.log('INFO', `[CachedDataLoader] 📂 Batch loading ${batchRefs.length} documents for '${loaderMethod}': ${paths}`);
+            
             try {
                 const snapshots = await this.deps.db.getAll(...batchRefs);
                 
@@ -279,12 +307,16 @@ class CachedDataLoader {
             }
         }
 
-        return {
+        const summary = {
             dates: Object.keys(results).sort(),
             data: results,
             found: foundCount,
             requested: lookbackDays
         };
+        
+        this.deps.logger?.log('INFO', `[CachedDataLoader] ✅ Loaded ${foundCount}/${lookbackDays} dates for '${loaderMethod}' (found: ${summary.dates.join(', ') || 'none'})`);
+        
+        return summary;
     }
 
     /**
@@ -300,6 +332,7 @@ class CachedDataLoader {
             d.setUTCDate(d.getUTCDate() - i);
             const dString = d.toISOString().slice(0, 10);
             
+            // Log path for legacy loader (will be logged by individual load methods)
             promises.push(
                 this[loaderMethod](dString)
                     .then(data => ({ date: dString, data }))

package/functions/computation-system/data/DependencyFetcher.js

@@ -65,7 +65,8 @@ async function fetchDependencies(date, calcs, config, deps, manifestLookup = {})
     
     if (needed.size === 0) return {};
     
-    logger.log('INFO', `[DependencyFetcher] Fetching ${needed.size} dependencies for ${dStr}`);
+    const calcNames = calcs.map(c => c.name || c.constructor?.name || 'unknown').join(', ');
+    logger.log('INFO', `[DependencyFetcher] Fetching ${needed.size} dependencies for computation(s): ${calcNames} (date: ${dStr})`);
     
     const results = {};
     // CHANGED: Iterate over the entries to access both normalized and original names
@@ -75,8 +76,11 @@ async function fetchDependencies(date, calcs, config, deps, manifestLookup = {})
             // Note: manifestLookup keys are expected to be normalized
             const category = manifestLookup[normName] || 'analytics'; 
             
+            // Pass logger in config for fetchSingleResult
+            const fetchConfig = { ...config, logger };
+            
             // Fetch using the normalized name (system standard)
-            const data = await fetchSingleResult(db, config, dStr, normName, category);
+            const data = await fetchSingleResult(db, fetchConfig, dStr, normName, category);
             
             // CHANGED: Store result using the ORIGINAL name so context.computed['CaseSensitive'] works
             if (data) results[originalName] = data;
@@ -110,7 +114,7 @@ async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config,
     // Initialize structure
     calcNames.forEach(name => { results[normalizeName(name)] = {}; });
     
-    logger.log('INFO', `[DependencyFetcher] Loading series for ${calcNames.length} calcs over ${lookbackDays} days.`);
+    logger.log('INFO', `[DependencyFetcher] Loading series for ${calcNames.length} computation dependencies over ${lookbackDays} days: ${calcNames.join(', ')}`);
 
     const fetchOps = [];
     
@@ -120,7 +124,8 @@ async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config,
             const category = manifestLookup[normName] || 'analytics';
             
             fetchOps.push(async () => {
-                const val = await fetchSingleResult(db, config, dateStr, rawName, category);
+                const fetchConfig = { ...config, logger };
+                const val = await fetchSingleResult(db, fetchConfig, dateStr, rawName, category);
                 if (val) {
                     if (!results[normName]) results[normName] = {};
                     results[normName][dateStr] = val;
@@ -142,11 +147,24 @@ async function fetchResultSeries(endDateStr, calcNames, manifestLookup, config,
  * Core Helper: Fetches a single result, handles Sharding & Compression.
  */
 async function fetchSingleResult(db, config, dateStr, name, category) {
-    const docRef = db.collection(config.resultsCollection)
+    const resultsCollection = config.resultsCollection || 'computation_results';
+    const resultsSubcollection = config.resultsSubcollection || 'results';
+    const computationsSubcollection = config.computationsSubcollection || 'computations';
+    
+    const path = `${resultsCollection}/${dateStr}/${resultsSubcollection}/${category}/${computationsSubcollection}/${name}`;
+    
+    // Log path - use console.log if logger not available (for backward compatibility)
+    if (config.logger) {
+        config.logger.log('INFO', `[DependencyFetcher] 📂 Loading Dependency '${name}' from: ${path}`);
+    } else {
+        console.log(`[DependencyFetcher] 📂 Loading Dependency '${name}' from: ${path}`);
+    }
+    
+    const docRef = db.collection(resultsCollection)
                      .doc(dateStr)
-                     .collection(config.resultsSubcollection)
+                     .collection(resultsSubcollection)
                      .doc(category)
-                     .collection(config.computationsSubcollection)
+                     .collection(computationsSubcollection)
                      .doc(name);
                      
     const snap = await docRef.get();
@@ -172,12 +190,23 @@ async function fetchSingleResult(db, config, dateStr, name, category) {
     
     // 2. Handle Sharding
     if (data._sharded) {
+        const shardPath = `${path}/_shards`;
+        if (config.logger) {
+            config.logger.log('INFO', `[DependencyFetcher] 📂 Loading Shards for '${name}' from: ${shardPath}`);
+        } else {
+            console.log(`[DependencyFetcher] 📂 Loading Shards for '${name}' from: ${shardPath}`);
+        }
+        
         const shardCol = docRef.collection('_shards');
         const shardSnaps = await shardCol.get();
         
         if (!shardSnaps.empty) {
             shardSnaps.forEach(shard => {
                 const shardData = shard.data();
+                const shardId = shard.id;
+                if (config.logger) {
+                    config.logger.log('TRACE', `[DependencyFetcher] 📂 Loading Shard '${shardId}' for '${name}' from: ${shardPath}/${shardId}`);
+                }
                 // Merge shard contents, ignoring internal metadata if it clashes
                 Object.entries(shardData).forEach(([k, v]) => {
                     if (!k.startsWith('_')) {

package/package.json

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