From a58773d4d4b366c620c900c139f6168ee6c146a3 Mon Sep 17 00:00:00 2001 From: aitbc Date: Sat, 25 Apr 2026 07:12:27 +0200 Subject: [PATCH] Migrate exchange app to centralized aitbc package utilities - Migrate 2 files from logging to aitbc.get_logger - health_monitor.py, real_exchange_integration.py - Remove logging.basicConfig() from both files - Migrate 3 files with hardcoded paths to use DATA_DIR constant - simple_exchange_api.py, scripts/seed_market.py, database.py --- apps/exchange/database.py | 3 ++- apps/exchange/health_monitor.py | 6 ++---- apps/exchange/real_exchange_integration.py | 7 +++---- apps/exchange/scripts/seed_market.py | 3 ++- apps/exchange/simple_exchange_api.py | 3 ++- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/apps/exchange/database.py b/apps/exchange/database.py index c48ce065..2d467d31 100755 --- a/apps/exchange/database.py +++ b/apps/exchange/database.py @@ -7,10 +7,11 @@ import os from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker, Session from sqlalchemy.pool import StaticPool +from aitbc.constants import DATA_DIR from models import Base # Database configuration -DATABASE_URL = os.getenv("EXCHANGE_DATABASE_URL", "sqlite:////var/lib/aitbc/data/exchange/exchange.db") +DATABASE_URL = os.getenv("EXCHANGE_DATABASE_URL", f"sqlite:///{DATA_DIR}/data/exchange/exchange.db") # Create engine if DATABASE_URL.startswith("sqlite"): diff --git a/apps/exchange/health_monitor.py b/apps/exchange/health_monitor.py index 95fbc967..f632ef51 100755 --- a/apps/exchange/health_monitor.py +++ b/apps/exchange/health_monitor.py @@ -10,13 +10,11 @@ from datetime import datetime, timedelta from typing import Dict, List, Optional, Any from dataclasses import dataclass from enum import Enum -import logging +from aitbc import get_logger from real_exchange_integration import exchange_manager, ExchangeStatus, ExchangeHealth -# Setup logging -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) +logger = get_logger(__name__) class FailoverStrategy(str, Enum): """Failover strategies""" diff --git a/apps/exchange/real_exchange_integration.py b/apps/exchange/real_exchange_integration.py index fdb67daf..30ee558b 100755 --- a/apps/exchange/real_exchange_integration.py +++ b/apps/exchange/real_exchange_integration.py @@ -12,11 +12,10 @@ from datetime import datetime, timedelta from typing import Dict, List, Optional, Any, Tuple from dataclasses import dataclass from enum import Enum -import logging -# Setup logging -logging.basicConfig(level=logging.INFO) -logger = logging.getLogger(__name__) +from aitbc import get_logger + +logger = get_logger(__name__) class ExchangeStatus(str, Enum): """Exchange connection status""" diff --git a/apps/exchange/scripts/seed_market.py b/apps/exchange/scripts/seed_market.py index b04b7c25..d5d83a53 100755 --- a/apps/exchange/scripts/seed_market.py +++ b/apps/exchange/scripts/seed_market.py @@ -3,12 +3,13 @@ import sqlite3 from datetime import datetime +from aitbc.constants import DATA_DIR def seed_initial_price(): """Create initial trades to establish market price""" import os - db_path = os.getenv("EXCHANGE_DATABASE_URL", "sqlite:////var/lib/aitbc/data/exchange/exchange.db").replace("sqlite:///", "") + db_path = os.getenv("EXCHANGE_DATABASE_URL", f"sqlite:///{DATA_DIR}/data/exchange/exchange.db").replace("sqlite://///", "") conn = sqlite3.connect(db_path) cursor = conn.cursor() diff --git a/apps/exchange/simple_exchange_api.py b/apps/exchange/simple_exchange_api.py index 3dc6914a..081962e2 100755 --- a/apps/exchange/simple_exchange_api.py +++ b/apps/exchange/simple_exchange_api.py @@ -9,12 +9,13 @@ from datetime import datetime from http.server import HTTPServer, BaseHTTPRequestHandler import urllib.parse import random +from aitbc.constants import DATA_DIR # Database setup def get_db_path(): """Get database path and ensure directory exists""" import os - db_path = os.getenv("EXCHANGE_DATABASE_URL", "sqlite:////var/lib/aitbc/data/exchange/exchange.db").replace("sqlite:///", "") + db_path = os.getenv("EXCHANGE_DATABASE_URL", f"sqlite:///{DATA_DIR}/data/exchange/exchange.db").replace("sqlite://///", "") # Create directory if it doesn't exist db_dir = os.path.dirname(db_path)