diff --git a/components/charts.py b/components/charts.py index 0472465..ea49153 100644 --- a/components/charts.py +++ b/components/charts.py @@ -31,7 +31,7 @@ def get_supported_symbols(): if candles: from database.operations import get_database_operations from utils.logger import get_logger - logger = get_logger("default_logger") + logger = get_logger() try: db = get_database_operations(logger) @@ -52,7 +52,7 @@ def get_supported_timeframes(): if candles: from database.operations import get_database_operations from utils.logger import get_logger - logger = get_logger("default_logger") + logger = get_logger() try: db = get_database_operations(logger) @@ -109,7 +109,7 @@ def check_data_availability(symbol: str, timeframe: str): from utils.logger import get_logger try: - logger = get_logger("default_logger") + logger = get_logger() db = get_database_operations(logger) latest_candle = db.market_data.get_latest_candle(symbol, timeframe) diff --git a/components/charts/builder.py b/components/charts/builder.py index 968938a..e36c736 100644 --- a/components/charts/builder.py +++ b/components/charts/builder.py @@ -23,7 +23,7 @@ from .layers import ( ) # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class ChartBuilder: diff --git a/components/charts/chart_creation.py b/components/charts/chart_creation.py index c6dbcbf..f0b551b 100644 --- a/components/charts/chart_creation.py +++ b/components/charts/chart_creation.py @@ -7,7 +7,7 @@ from .utils import prepare_chart_data, format_price, format_volume from .error_handling import ChartErrorHandler, create_error_annotation from utils.logger import get_logger -logger = get_logger("charts_creation") +logger = get_logger() def create_candlestick_chart(symbol: str, timeframe: str, days_back: int = 7, **kwargs) -> go.Figure: """ diff --git a/components/charts/chart_data.py b/components/charts/chart_data.py index 7a4c1d0..aa6d1ca 100644 --- a/components/charts/chart_data.py +++ b/components/charts/chart_data.py @@ -9,7 +9,7 @@ from utils.timeframe_utils import load_timeframe_options from .builder import ChartBuilder from .utils import format_price, format_volume -logger = get_logger("charts_data") +logger = get_logger() def get_supported_symbols(): """Get list of symbols that have data in the database.""" diff --git a/components/charts/config/error_handling.py b/components/charts/config/error_handling.py index f3ec7cd..8314552 100644 --- a/components/charts/config/error_handling.py +++ b/components/charts/config/error_handling.py @@ -18,7 +18,7 @@ from .example_strategies import get_all_example_strategies from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class ErrorSeverity(str, Enum): diff --git a/components/charts/config/example_strategies.py b/components/charts/config/example_strategies.py index 5b5c329..db69558 100644 --- a/components/charts/config/example_strategies.py +++ b/components/charts/config/example_strategies.py @@ -21,7 +21,7 @@ from .defaults import TradingStrategy from utils.logger import get_logger # Initialize logger -logger = get_logger("example_strategies") +logger = get_logger() @dataclass diff --git a/components/charts/config/indicator_defs.py b/components/charts/config/indicator_defs.py index c077a2f..b724001 100644 --- a/components/charts/config/indicator_defs.py +++ b/components/charts/config/indicator_defs.py @@ -18,7 +18,7 @@ from data.common.data_types import OHLCVCandle from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class IndicatorType(str, Enum): diff --git a/components/charts/config/strategy_charts.py b/components/charts/config/strategy_charts.py index 07d39fd..163060f 100644 --- a/components/charts/config/strategy_charts.py +++ b/components/charts/config/strategy_charts.py @@ -22,7 +22,7 @@ from .defaults import ( from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class ChartLayout(str, Enum): diff --git a/components/charts/config/validation.py b/components/charts/config/validation.py index da21544..6461022 100644 --- a/components/charts/config/validation.py +++ b/components/charts/config/validation.py @@ -17,7 +17,7 @@ from .strategy_charts import StrategyChartConfig, SubplotConfig, ChartStyle, Cha from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class ValidationLevel(str, Enum): diff --git a/components/charts/data_integration.py b/components/charts/data_integration.py index e4df395..3f03356 100644 --- a/components/charts/data_integration.py +++ b/components/charts/data_integration.py @@ -19,7 +19,7 @@ from components.charts.config.indicator_defs import convert_database_candles_to_ from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/error_handling.py b/components/charts/error_handling.py index b9ce24d..fad32f0 100644 --- a/components/charts/error_handling.py +++ b/components/charts/error_handling.py @@ -15,7 +15,7 @@ from enum import Enum from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() class ErrorSeverity(Enum): diff --git a/components/charts/indicator_manager.py b/components/charts/indicator_manager.py index a83622b..5b47d85 100644 --- a/components/charts/indicator_manager.py +++ b/components/charts/indicator_manager.py @@ -18,7 +18,7 @@ from enum import Enum from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() # Base directory for indicators INDICATORS_DIR = Path("config/indicators") diff --git a/components/charts/layers/base.py b/components/charts/layers/base.py index 8786c22..e7e491c 100644 --- a/components/charts/layers/base.py +++ b/components/charts/layers/base.py @@ -20,7 +20,7 @@ from ..error_handling import ( ) # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass @@ -45,7 +45,7 @@ class BaseLayer: def __init__(self, config: LayerConfig): self.config = config - self.logger = get_logger('default_logger') + self.logger = get_logger() self.error_handler = ChartErrorHandler() self.traces = [] self._is_valid = False diff --git a/components/charts/layers/bot_enhanced_layers.py b/components/charts/layers/bot_enhanced_layers.py index d8cdbc1..7ad12d4 100644 --- a/components/charts/layers/bot_enhanced_layers.py +++ b/components/charts/layers/bot_enhanced_layers.py @@ -23,7 +23,7 @@ from .bot_integration import ( from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/layers/bot_integration.py b/components/charts/layers/bot_integration.py index 4e9a78d..832b642 100644 --- a/components/charts/layers/bot_integration.py +++ b/components/charts/layers/bot_integration.py @@ -17,7 +17,7 @@ from database.operations import DatabaseOperationError from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/layers/indicators.py b/components/charts/layers/indicators.py index 926be99..6533d38 100644 --- a/components/charts/layers/indicators.py +++ b/components/charts/layers/indicators.py @@ -23,7 +23,7 @@ from components.charts.utils import get_indicator_colors from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/layers/signals.py b/components/charts/layers/signals.py index 09e3848..e0a1da1 100644 --- a/components/charts/layers/signals.py +++ b/components/charts/layers/signals.py @@ -21,7 +21,7 @@ from .base import BaseLayer, LayerConfig from utils.logger import get_logger # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/layers/subplots.py b/components/charts/layers/subplots.py index fe69eac..a2e8133 100644 --- a/components/charts/layers/subplots.py +++ b/components/charts/layers/subplots.py @@ -25,7 +25,7 @@ from ..error_handling import ( ) # Initialize logger -logger = get_logger("default_logger") +logger = get_logger() @dataclass diff --git a/components/charts/utils.py b/components/charts/utils.py index 07bf1c6..8872bf8 100644 --- a/components/charts/utils.py +++ b/components/charts/utils.py @@ -12,26 +12,10 @@ from decimal import Decimal from tzlocal import get_localzone from utils.logger import get_logger +from config.constants.chart_constants import DEFAULT_CHART_COLORS # Initialize logger -logger = get_logger("default_logger") - -# Default color scheme for charts -DEFAULT_CHART_COLORS = { - 'bullish': '#00C851', # Green for bullish candles - 'bearish': '#FF4444', # Red for bearish candles - 'sma': '#007bff', # Blue for SMA - 'ema': '#ff6b35', # Orange for EMA - 'bb_upper': '#6f42c1', # Purple for Bollinger upper - 'bb_lower': '#6f42c1', # Purple for Bollinger lower - 'bb_middle': '#6c757d', # Gray for Bollinger middle - 'rsi': '#20c997', # Teal for RSI - 'macd': '#fd7e14', # Orange for MACD - 'macd_signal': '#e83e8c', # Pink for MACD signal - 'volume': '#6c757d', # Gray for volume - 'support': '#17a2b8', # Light blue for support - 'resistance': '#dc3545' # Red for resistance -} +logger = get_logger() def validate_market_data(candles: List[Dict[str, Any]]) -> bool: diff --git a/config/constants/chart_constants.py b/config/constants/chart_constants.py index c50f121..85776d4 100644 --- a/config/constants/chart_constants.py +++ b/config/constants/chart_constants.py @@ -30,4 +30,20 @@ UI_TEXT = { "cumulative_return_trace_name": "Cumulative Return", "returns_trace_name": "Returns (%)", "range_trace_name": "Range %" +} + +DEFAULT_CHART_COLORS = { + 'bullish': '#00C851', # Green for bullish candles + 'bearish': '#FF4444', # Red for bearish candles + 'sma': '#007bff', # Blue for SMA + 'ema': '#ff6b35', # Orange for EMA + 'bb_upper': '#6f42c1', # Purple for Bollinger upper + 'bb_lower': '#6f42c1', # Purple for Bollinger lower + 'bb_middle': '#6c757d', # Gray for Bollinger middle + 'rsi': '#20c997', # Teal for RSI + 'macd': '#fd7e14', # Orange for MACD + 'macd_signal': '#e83e8c', # Pink for MACD signal + 'volume': '#6c757d', # Gray for volume + 'support': '#17a2b8', # Light blue for support + 'resistance': '#dc3545' # Red for resistance } \ No newline at end of file diff --git a/dashboard/callbacks/charts.py b/dashboard/callbacks/charts.py index a9f6254..8845f7f 100644 --- a/dashboard/callbacks/charts.py +++ b/dashboard/callbacks/charts.py @@ -20,7 +20,7 @@ import pandas as pd import io from utils.time_range_utils import load_time_range_options -logger = get_logger("default_logger") +logger = get_logger() def calculate_time_range(time_range_quick, custom_start_date, custom_end_date, analysis_mode, n_intervals): diff --git a/dashboard/callbacks/data_analysis.py b/dashboard/callbacks/data_analysis.py index 24491e1..2c412df 100644 --- a/dashboard/callbacks/data_analysis.py +++ b/dashboard/callbacks/data_analysis.py @@ -15,7 +15,7 @@ from dashboard.components.data_analysis import ( from database.operations import get_database_operations from datetime import datetime, timezone, timedelta -logger = get_logger("data_analysis_callbacks") +logger = get_logger() def register_data_analysis_callbacks(app): diff --git a/dashboard/callbacks/indicators.py b/dashboard/callbacks/indicators.py index a2e90ab..589a3dc 100644 --- a/dashboard/callbacks/indicators.py +++ b/dashboard/callbacks/indicators.py @@ -18,7 +18,7 @@ from config.indicators.config_utils import ( reset_parameter_values ) -logger = get_logger("default_logger") +logger = get_logger() def register_indicator_callbacks(app): diff --git a/dashboard/callbacks/system_health.py b/dashboard/callbacks/system_health.py index 37e33e2..16076c1 100644 --- a/dashboard/callbacks/system_health.py +++ b/dashboard/callbacks/system_health.py @@ -14,7 +14,7 @@ from dashboard.callbacks.system_health_modules.database_callbacks import registe from dashboard.callbacks.system_health_modules.redis_callbacks import register_redis_callbacks from dashboard.callbacks.system_health_modules.system_performance_callbacks import register_system_performance_callbacks -logger = get_logger("default_logger") +logger = get_logger() def register_system_health_callbacks(app): diff --git a/dashboard/callbacks/system_health_modules/common_health_utils.py b/dashboard/callbacks/system_health_modules/common_health_utils.py index cd8ff47..3644e17 100644 --- a/dashboard/callbacks/system_health_modules/common_health_utils.py +++ b/dashboard/callbacks/system_health_modules/common_health_utils.py @@ -6,7 +6,7 @@ from datetime import datetime, timedelta import dash_bootstrap_components as dbc from dash import html -logger = get_logger("default_logger") +logger = get_logger() def _check_data_collection_service_running() -> bool: """Check if data collection service is running.""" diff --git a/dashboard/callbacks/system_health_modules/data_collection_callbacks.py b/dashboard/callbacks/system_health_modules/data_collection_callbacks.py index bef7e9d..0aa0e63 100644 --- a/dashboard/callbacks/system_health_modules/data_collection_callbacks.py +++ b/dashboard/callbacks/system_health_modules/data_collection_callbacks.py @@ -10,7 +10,7 @@ from config.constants.system_health_constants import ( DATA_FRESHNESS_STALE_HOURS ) -logger = get_logger("default_logger") +logger = get_logger() def register_data_collection_callbacks(app): diff --git a/dashboard/callbacks/system_health_modules/database_callbacks.py b/dashboard/callbacks/system_health_modules/database_callbacks.py index 2de42cc..45edc80 100644 --- a/dashboard/callbacks/system_health_modules/database_callbacks.py +++ b/dashboard/callbacks/system_health_modules/database_callbacks.py @@ -11,7 +11,7 @@ from config.constants.system_health_constants import ( ) from database.operations import get_database_operations -logger = get_logger("default_logger") +logger = get_logger() def register_database_callbacks(app): diff --git a/dashboard/callbacks/system_health_modules/quick_status_callbacks.py b/dashboard/callbacks/system_health_modules/quick_status_callbacks.py index ca29305..eb31b53 100644 --- a/dashboard/callbacks/system_health_modules/quick_status_callbacks.py +++ b/dashboard/callbacks/system_health_modules/quick_status_callbacks.py @@ -15,7 +15,7 @@ from config.constants.system_health_constants import ( MEMORY_GOOD_THRESHOLD, MEMORY_WARNING_THRESHOLD ) -logger = get_logger("default_logger") +logger = get_logger() def register_quick_status_callbacks(app): diff --git a/dashboard/callbacks/system_health_modules/redis_callbacks.py b/dashboard/callbacks/system_health_modules/redis_callbacks.py index 234b97a..2b77ca3 100644 --- a/dashboard/callbacks/system_health_modules/redis_callbacks.py +++ b/dashboard/callbacks/system_health_modules/redis_callbacks.py @@ -3,7 +3,7 @@ import dash_bootstrap_components as dbc from utils.logger import get_logger from database.redis_manager import get_sync_redis_manager -logger = get_logger("default_logger") +logger = get_logger() def register_redis_callbacks(app): diff --git a/dashboard/callbacks/system_health_modules/system_performance_callbacks.py b/dashboard/callbacks/system_health_modules/system_performance_callbacks.py index 4022ced..7fee0b0 100644 --- a/dashboard/callbacks/system_health_modules/system_performance_callbacks.py +++ b/dashboard/callbacks/system_health_modules/system_performance_callbacks.py @@ -11,7 +11,7 @@ from config.constants.system_health_constants import ( BYTE_TO_GB ) -logger = get_logger("default_logger") +logger = get_logger() def register_system_performance_callbacks(app): diff --git a/dashboard/components/chart_controls.py b/dashboard/components/chart_controls.py index 36057ae..9955a92 100644 --- a/dashboard/components/chart_controls.py +++ b/dashboard/components/chart_controls.py @@ -7,7 +7,7 @@ import dash_bootstrap_components as dbc from utils.logger import get_logger from utils.time_range_utils import load_time_range_options -logger = get_logger("default_logger") +logger = get_logger() def create_chart_config_panel(strategy_options, overlay_options, subplot_options): """Create the chart configuration panel with add/edit UI.""" diff --git a/dashboard/components/data_analysis.py b/dashboard/components/data_analysis.py index 052364b..c1f45b6 100644 --- a/dashboard/components/data_analysis.py +++ b/dashboard/components/data_analysis.py @@ -14,7 +14,7 @@ from database.connection import DatabaseManager from database.operations import DatabaseOperationError, get_database_operations from config.constants.chart_constants import CHART_COLORS, UI_TEXT -logger = get_logger("data_analysis") +logger = get_logger() class VolumeAnalyzer: diff --git a/dashboard/layouts/market_data.py b/dashboard/layouts/market_data.py index 52e77ca..0a24b4d 100644 --- a/dashboard/layouts/market_data.py +++ b/dashboard/layouts/market_data.py @@ -16,7 +16,7 @@ from dashboard.components.chart_controls import ( from utils.timeframe_utils import load_timeframe_options -logger = get_logger("default_logger") +logger = get_logger() def _create_dropdown_options(symbols, timeframes): """Creates symbol and timeframe dropdown options.""" diff --git a/data/exchanges/factory.py b/data/exchanges/factory.py index d0d3ecb..22fad81 100644 --- a/data/exchanges/factory.py +++ b/data/exchanges/factory.py @@ -23,7 +23,7 @@ from .exceptions import ( ) # Initialize logger -logger = get_logger('exchanges') +logger = get_logger('default_logger') @dataclass class ExchangeCollectorConfig: diff --git a/tests/data/collector/test_collector_manager.py b/tests/data/collector/test_collector_manager.py index d99e0a3..cbf34aa 100644 --- a/tests/data/collector/test_collector_manager.py +++ b/tests/data/collector/test_collector_manager.py @@ -74,7 +74,7 @@ class TestCollectorManager: @pytest.fixture def manager(self): """Create a test manager instance.""" - test_logger = get_logger("test_manager_logger") + test_logger = get_logger() return CollectorManager("test_manager", global_health_check_interval=1.0, logger=test_logger) @pytest.fixture