bulltrackers-module 1.0.750 → 1.0.751

package/functions/computation-system-v2/handlers/adminTest.js

@@ -31,7 +31,10 @@ async function adminTestHandler(req, res) {
             limit = 10,
             force = true,           // Default to force for testing
             useWorkerPool,          // Override: true/false/undefined (use config)
-            dryRun = false
+            dryRun = false,
+            // [NEW] Accept override parameters for infrastructure testing
+            outputTable,            // e.g., "computation_results_test"
+            workerUrl               // e.g., "https://...cloudfunctions.net/worker-test"
         } = req.body || {};
 
         console.log(`[AdminTest] Action: ${action}, Computation: ${computation}, Date: ${date}`);
@@ -93,38 +96,59 @@ async function adminTestHandler(req, res) {
                     });
                 }
 
-                // Log worker pool override if specified
-                if (useWorkerPool !== undefined) {
-                    console.log(`[AdminTest] Worker pool override: ${useWorkerPool ? 'ENABLED' : 'DISABLED'}`);
+                // Prepare Config Overrides
+                // We create this here so we can log what's happening
+                const baseConfig = system.config;
+                let customConfig = null;
+
+                // Check if we need to modify the configuration
+                if (outputTable || useWorkerPool !== undefined || workerUrl) {
+                    customConfig = { ...baseConfig }; // Shallow copy
+
+                    // 1. Override Output Table
+                    if (outputTable) {
+                        console.log(`[AdminTest] ⚠️ Redirecting output to: ${outputTable}`);
+                        // Fix for TS Error: Ensure baseConfig.resultStore exists before spreading
+                        const baseStore = baseConfig.resultStore;
+                        if (!baseStore) {
+                            throw new Error("System config is missing 'resultStore'");
+                        }
+                        
+                        customConfig.resultStore = {
+                            ...baseStore,
+                            table: outputTable
+                        };
+                    }
+
+                    // 2. Override Worker Pool Settings
+                    if (useWorkerPool !== undefined || workerUrl) {
+                        const basePool = baseConfig.workerPool || {};
+                        customConfig.workerPool = {
+                            ...basePool,
+                            // If useWorkerPool is explicitly provided, use it. Otherwise keep existing.
+                            enabled: useWorkerPool !== undefined ? useWorkerPool : basePool.enabled,
+                            // If workerUrl provided, override it.
+                            workerUrl: workerUrl || basePool.workerUrl
+                        };
+                        
+                        // Log the override state
+                        console.log(`[AdminTest] Worker Pool Override: Enabled=${customConfig.workerPool.enabled}, URL=${customConfig.workerPool.workerUrl || 'default'}`);
+                    }
                 }
 
                 console.log(`[AdminTest] Running ${computation} for ${date}...`);
                 console.log(`[AdminTest] Options: force=${force}, dryRun=${dryRun}, entityIds=${entityIds?.join(',') || 'all'}`);
 
-                // Prepare run options
                 const runOptions = {
                     date,
                     computation,
                     entityIds: entityIds || null,
                     dryRun,
                     force,
-                    useWorkerPool
+                    useWorkerPool,
+                    config: customConfig // Inject the modified config
                 };
 
-                // [FIX] If forcing worker pool, inject config to enable it dynamically
-                // This prevents Orchestrator from ignoring the request if default config has enabled: false
-                if (useWorkerPool) {
-                    const baseConfig = system.config; 
-                    runOptions.config = {
-                        ...baseConfig,
-                        workerPool: {
-                            ...(baseConfig.workerPool || {}),
-                            enabled: true 
-                        }
-                    };
-                    console.log('[AdminTest] Injecting config to FORCE enable RemoteTaskRunner');
-                }
-
                 const result = await system.runComputation(runOptions);
 
                 const duration = Date.now() - startTime;
@@ -169,27 +193,39 @@ async function adminTestHandler(req, res) {
 
                 console.log(`[AdminTest] Running LIMITED test: ${sampleEntities.length} entities`);
 
+                // Prepare Config Overrides (Same logic as 'run')
+                const baseConfig = system.config;
+                let customConfig = null;
+
+                if (outputTable || useWorkerPool !== undefined || workerUrl) {
+                    customConfig = { ...baseConfig };
+                    
+                    if (outputTable) {
+                        const baseStore = baseConfig.resultStore;
+                        if (!baseStore) throw new Error("System config missing 'resultStore'");
+                        customConfig.resultStore = { ...baseStore, table: outputTable };
+                    }
+
+                    if (useWorkerPool !== undefined || workerUrl) {
+                        const basePool = baseConfig.workerPool || {};
+                        customConfig.workerPool = {
+                            ...basePool,
+                            enabled: useWorkerPool !== undefined ? useWorkerPool : basePool.enabled,
+                            workerUrl: workerUrl || basePool.workerUrl
+                        };
+                    }
+                }
+
                 const runOptions = {
                     date,
                     computation,
                     entityIds: sampleEntities,
                     dryRun,
                     force,
-                    useWorkerPool
+                    useWorkerPool,
+                    config: customConfig
                 };
 
-                // Apply the same fix for run_limited if needed
-                if (useWorkerPool) {
-                    const baseConfig = system.config; 
-                    runOptions.config = {
-                        ...baseConfig,
-                        workerPool: {
-                            ...(baseConfig.workerPool || {}),
-                            enabled: true 
-                        }
-                    };
-                }
-
                 const result = await system.runComputation(runOptions);
 
                 const duration = Date.now() - startTime;

package/functions/computation-system-v2/scripts/test-admin.sh

@@ -0,0 +1,183 @@
+#!/bin/bash
+
+# ==============================================================================
+# Admin Test Endpoint Interactive Tool
+# Automates the admin.md testing procedures
+# ==============================================================================
+
+# Default Settings
+REGION="europe-west1"
+FUNCTION_NAME="compute-admin-test"
+DEFAULT_DATE=$(date +%Y-%m-%d)
+
+# Colors
+GREEN='\033[0;32m'
+BLUE='\033[0;34m'
+YELLOW='\033[1;33m'
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+echo -e "${BLUE}=================================================${NC}"
+echo -e "${BLUE}   BullTrackers Admin Test Interactive Tool      ${NC}"
+echo -e "${BLUE}=================================================${NC}"
+
+# ------------------------------------------------------------------------------
+# 1. Setup & Auth
+# ------------------------------------------------------------------------------
+echo -e "\n${YELLOW}[Setup] Retrieving Function URL and Auth Token...${NC}"
+
+# Get Function URL
+FUNCTION_URL=$(gcloud functions describe $FUNCTION_NAME \
+    --region=$REGION \
+    --format="value(serviceConfig.uri)" 2>/dev/null)
+
+if [ -z "$FUNCTION_URL" ]; then
+    echo -e "${RED}[Error] Could not retrieve Function URL for '$FUNCTION_NAME' in '$REGION'.${NC}"
+    echo "Please ensure you are authenticated (gcloud auth login) and the function is deployed."
+    exit 1
+fi
+
+# Get Identity Token
+TOKEN=$(gcloud auth print-identity-token 2>/dev/null)
+
+if [ -z "$TOKEN" ]; then
+    echo -e "${RED}[Error] Could not generate Identity Token.${NC}"
+    echo "Please run: gcloud auth login"
+    exit 1
+fi
+
+echo -e "${GREEN}[Success] Target: $FUNCTION_URL${NC}"
+
+# ------------------------------------------------------------------------------
+# 2. Helper Functions
+# ------------------------------------------------------------------------------
+
+# Function to prompt for variables with defaults
+ask_var() {
+    local prompt="$1"
+    local default="$2"
+    local var_name="$3"
+    
+    echo -ne "$prompt [${GREEN}$default${NC}]: "
+    read input
+    if [ -z "$input" ]; then
+        eval $var_name="$default"
+    else
+        eval $var_name="$input"
+    fi
+}
+
+# Function to execute the curl command
+run_test() {
+    local json_payload="$1"
+    
+    echo -e "\n${YELLOW}[Executing] Sending Request...${NC}"
+    echo -e "Payload: $json_payload"
+    
+    curl -X POST "$FUNCTION_URL" \
+        -H "Authorization: Bearer $TOKEN" \
+        -H "Content-Type: application/json" \
+        -d "$json_payload"
+        
+    echo -e "\n${BLUE}[Done]${NC}"
+}
+
+# ------------------------------------------------------------------------------
+# 3. Interactive Menu
+# ------------------------------------------------------------------------------
+
+while true; do
+    echo -e "\n${BLUE}Select an Action:${NC}"
+    echo "1) System Status (status)"
+    echo "2) Analyze Schedule (analyze)"
+    echo "3) Run Full Computation (run)"
+    echo "4) Run Limited Test (run_limited - safer)"
+    echo "5) Test Specific Entities (run with entityIds)"
+    echo "6) Test Worker Logic Directly (test_worker)"
+    echo "7) Test Worker Pool Offloading (run with useWorkerPool)"
+    echo "q) Quit"
+    
+    read -p "Enter choice: " choice
+    
+    case $choice in
+        1)
+            # Status
+            run_test '{"action": "status"}'
+            ;;
+            
+        2)
+            # Analyze
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            run_test "{\"action\": \"analyze\", \"date\": \"$TARGET_DATE\"}"
+            ;;
+            
+        3)
+            # Run Full
+            ask_var "Enter Computation Name" "UserPortfolioSummary" "COMP_NAME"
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            
+            # Confirm dangerous action
+            echo -e "${RED}WARNING: This will run '$COMP_NAME' for ALL entities.${NC}"
+            read -p "Are you sure? (y/N): " confirm
+            if [[ $confirm == "y" || $confirm == "Y" ]]; then
+                run_test "{\"action\": \"run\", \"computation\": \"$COMP_NAME\", \"date\": \"$TARGET_DATE\", \"force\": true}"
+            else
+                echo "Cancelled."
+            fi
+            ;;
+            
+        4)
+            # Run Limited
+            ask_var "Enter Computation Name" "UserPortfolioSummary" "COMP_NAME"
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            ask_var "Enter Limit (Num Entities)" "5" "LIMIT_NUM"
+            
+            run_test "{\"action\": \"run_limited\", \"computation\": \"$COMP_NAME\", \"date\": \"$TARGET_DATE\", \"limit\": $LIMIT_NUM}"
+            ;;
+            
+        5)
+            # Test Entities
+            ask_var "Enter Computation Name" "UserPortfolioSummary" "COMP_NAME"
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            ask_var "Enter Entity IDs (comma separated, no spaces)" "user-123,user-456" "RAW_IDS"
+            
+            # Format IDs into JSON array
+            IFS=',' read -r -a id_array <<< "$RAW_IDS"
+            JSON_IDS=$(printf '"%s",' "${id_array[@]}")
+            JSON_IDS="[${JSON_IDS%,}]"
+            
+            run_test "{\"action\": \"run\", \"computation\": \"$COMP_NAME\", \"date\": \"$TARGET_DATE\", \"entityIds\": $JSON_IDS, \"force\": true}"
+            ;;
+            
+        6)
+            # Test Worker Logic
+            ask_var "Enter Computation Name" "UserPortfolioSummary" "COMP_NAME"
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            ask_var "Enter Single Entity ID" "user-123" "ENTITY_ID"
+            
+            # Worker test expects array of entityIds
+            run_test "{\"action\": \"test_worker\", \"computation\": \"$COMP_NAME\", \"date\": \"$TARGET_DATE\", \"entityIds\": [\"$ENTITY_ID\"]}"
+            ;;
+            
+        7)
+            # Test Worker Pool
+            ask_var "Enter Computation Name" "UserPortfolioSummary" "COMP_NAME"
+            ask_var "Enter Date" "$DEFAULT_DATE" "TARGET_DATE"
+            
+            echo -e "${YELLOW}Running with Worker Pool enabled...${NC}"
+            run_test "{\"action\": \"run\", \"computation\": \"$COMP_NAME\", \"date\": \"$TARGET_DATE\", \"useWorkerPool\": true, \"force\": true}"
+            ;;
+            
+        q|Q)
+            echo "Exiting."
+            exit 0
+            ;;
+            
+        *)
+            echo -e "${RED}Invalid option.${NC}"
+            ;;
+    esac
+    
+    echo -e "\n-------------------------------------------------"
+    read -p "Press Enter to continue..."
+done

package/package.json

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