diff --git a/src/main.py b/src/main.py index 9b6b590..26a6f87 100644 --- a/src/main.py +++ b/src/main.py @@ -88,20 +88,25 @@ def main(): elif choice == "2": print("\nTechnical Scanner Options:") print("1. SunnyBands Scanner") - print("2. ATR-EMA Scanner") + print("2. Standard ATR-EMA Scanner") + print("3. Enhanced ATR-EMA v2 Scanner") # NEW OPTION - scanner_choice = input("\nEnter your choice (1-2): ") + scanner_choice = input("\nEnter your choice (1-3): ") + + # Get parameters first for all scanners + min_price, max_price, min_volume, portfolio_size = get_scanner_parameters() if scanner_choice == "1": from screener.t_sunnyband import run_sunny_scanner - min_price, max_price, min_volume, portfolio_size = get_scanner_parameters() run_sunny_scanner(min_price, max_price, min_volume, portfolio_size) elif scanner_choice == "2": - from screener.t_atr_ema import run_atr_ema_scanner - min_price, max_price, min_volume, portfolio_size = get_scanner_parameters() + from screener.t_atr_ema import run_atr_ema_scanner run_atr_ema_scanner(min_price, max_price, min_volume, portfolio_size) + elif scanner_choice == "3": # NEW CASE + from screener.t_atr_ema_v2 import run_atr_ema_target_scanner + run_atr_ema_target_scanner(min_price, max_price, min_volume, portfolio_size) else: - print("Invalid choice. Please try again.") + print("Invalid choice. Returning to main menu.") elif choice == "3": from trading.main import main as trading_main diff --git a/src/screener/__init__.py b/src/screener/__init__.py index e69de29..308eace 100644 --- a/src/screener/__init__.py +++ b/src/screener/__init__.py @@ -0,0 +1,10 @@ +# Add explicit imports for scanner modules +from .t_atr_ema import run_atr_ema_scanner +from .t_atr_ema_v2 import run_atr_ema_target_scanner +from .t_sunnyband import run_sunny_scanner + +__all__ = [ + 'run_atr_ema_scanner', + 'run_atr_ema_target_scanner', + 'run_sunny_scanner' +]