feat: Integrate ATR-EMA v2 scanner with updated menu and imports

This commit is contained in:
Bobby (aider) 2025-02-08 10:49:04 -08:00
parent ea96a07d17
commit 27ffc80432
2 changed files with 21 additions and 6 deletions

View File

@ -88,20 +88,25 @@ def main():
elif choice == "2": elif choice == "2":
print("\nTechnical Scanner Options:") print("\nTechnical Scanner Options:")
print("1. SunnyBands Scanner") 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": if scanner_choice == "1":
from screener.t_sunnyband import run_sunny_scanner 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) run_sunny_scanner(min_price, max_price, min_volume, portfolio_size)
elif scanner_choice == "2": elif scanner_choice == "2":
from screener.t_atr_ema import run_atr_ema_scanner from screener.t_atr_ema import run_atr_ema_scanner
min_price, max_price, min_volume, portfolio_size = get_scanner_parameters()
run_atr_ema_scanner(min_price, max_price, min_volume, portfolio_size) 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: else:
print("Invalid choice. Please try again.") print("Invalid choice. Returning to main menu.")
elif choice == "3": elif choice == "3":
from trading.main import main as trading_main from trading.main import main as trading_main

View File

@ -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'
]