market cap fixes

main_app.py

@@ -11,11 +11,12 @@ import pandas as pd
 from datetime import datetime, timezone
 
 from logging_utils import setup_logging
-# --- Using the high-performance WebSocket utility for live prices ---
+# --- Using the new high-performance WebSocket utility for live prices ---
 from live_market_utils import start_live_feed
 
 # --- Configuration ---
 WATCHED_COINS = ["BTC", "ETH", "SOL", "BNB", "HYPE", "ASTER", "ZEC", "PUMP", "SUI"]
+# --- FIX: Replaced old data_fetcher with the new live_candle_fetcher ---
 LIVE_CANDLE_FETCHER_SCRIPT = "live_candle_fetcher.py"
 RESAMPLER_SCRIPT = "resampler.py" 
 MARKET_CAP_FETCHER_SCRIPT = "market_cap_fetcher.py" 
@@ -26,9 +27,6 @@ MARKET_CAP_SUMMARY_FILE = os.path.join("_data", "market_cap_data.json")
 LOGS_DIR = "_logs"
 TRADE_EXECUTOR_STATUS_FILE = os.path.join(LOGS_DIR, "trade_executor_status.json")
 
-# --- ADDED: Standard list of timeframes for the resampler to generate ---
-STANDARD_RESAMPLING_TIMEFRAMES = ["3m", "5m", "15m", "30m", "37m", "148m", "1h", "2h", "4h", "8h", "12h", "1d", "3d", "1w", "1M"]
-
 
 def format_market_cap(mc_value):
     """Formats a large number into a human-readable market cap string."""
@@ -49,6 +47,7 @@ def run_live_candle_fetcher():
     while True:
         try:
             with open(log_file, 'a') as f:
+                # We can't get coins from strategies.json here, so we pass the default list
                 command = [sys.executable, LIVE_CANDLE_FETCHER_SCRIPT, "--coins"] + WATCHED_COINS + ["--log-level", "off"]
                 f.write(f"\n--- Starting {LIVE_CANDLE_FETCHER_SCRIPT} at {datetime.now()} ---\n")
                 subprocess.run(command, check=True, stdout=f, stderr=subprocess.STDOUT)
@@ -73,13 +72,12 @@ def run_resampler_job(timeframes_to_generate: list):
             f.write(f"Failed to run resampler.py job: {e}\n")
 
 
-def resampler_scheduler():
-    """Schedules the resampler.py script to run at the start of every minute."""
+def resampler_scheduler(timeframes_to_generate: list):
+    """Schedules the resampler.py script."""
     setup_logging('off', 'ResamplerScheduler')
-    # Run once at startup
-    run_resampler_job(STANDARD_RESAMPLING_TIMEFRAMES)
+    run_resampler_job(timeframes_to_generate)
     # Schedule to run every minute at the :01 second mark
-    schedule.every().minute.at(":01").do(run_resampler_job, timeframes_to_generate=STANDARD_RESAMPLING_TIMEFRAMES)
+    schedule.every().minute.at(":01").do(run_resampler_job, timeframes_to_generate=timeframes_to_generate)
     logging.info("Resampler scheduled to run every minute at :01.")
     while True:
         schedule.run_pending()
@@ -90,7 +88,7 @@ def run_market_cap_fetcher_job():
     """Defines the job for the market cap fetcher, redirecting output."""
     log_file = os.path.join(LOGS_DIR, "market_cap_fetcher.log")
     try:
-        command = [sys.executable, MARKET_CAP_FETCHER_SCRIPT, "--coins"] + WATCHED_COINS + ["--log-level", "off"]
+        command = [sys.executable, MARKET_CAP_FETCHER_SCRIPT, "--log-level", "off"]
         with open(log_file, 'a') as f:
             f.write(f"\n--- Starting {MARKET_CAP_FETCHER_SCRIPT} job at {datetime.now()} ---\n")
             subprocess.run(command, check=True, stdout=f, stderr=subprocess.STDOUT)
@@ -319,13 +317,22 @@ if __name__ == "__main__":
         logging.error(f"Could not load strategies from '{STRATEGY_CONFIG_FILE}': {e}")
         sys.exit(1)
         
+    required_timeframes = set()
+    for name, config in strategy_configs.items():
+        if config.get("enabled", False):
+            tf = config.get("parameters", {}).get("timeframe")
+            if tf:
+                required_timeframes.add(tf)
+    
+    if not required_timeframes:
+        logging.warning("No timeframes required by any enabled strategy.")
+
     with multiprocessing.Manager() as manager:
         shared_prices = manager.dict()
 
         processes["Live Market Feed"] = multiprocessing.Process(target=start_live_feed, args=(shared_prices, 'off'), daemon=True)
         processes["Live Candle Fetcher"] = multiprocessing.Process(target=run_live_candle_fetcher, daemon=True)
-        # --- FIX: The resampler now uses a fixed list of TFs and a new schedule ---
-        processes["Resampler"] = multiprocessing.Process(target=resampler_scheduler, daemon=True)
+        processes["Resampler"] = multiprocessing.Process(target=resampler_scheduler, args=(list(required_timeframes),), daemon=True)
         processes["Market Cap Fetcher"] = multiprocessing.Process(target=market_cap_fetcher_scheduler, daemon=True)
         processes["Trade Executor"] = multiprocessing.Process(target=run_trade_executor, daemon=True)