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
This commit is contained in:
@@ -7,10 +7,11 @@ import os
|
|||||||
from sqlalchemy import create_engine
|
from sqlalchemy import create_engine
|
||||||
from sqlalchemy.orm import sessionmaker, Session
|
from sqlalchemy.orm import sessionmaker, Session
|
||||||
from sqlalchemy.pool import StaticPool
|
from sqlalchemy.pool import StaticPool
|
||||||
|
from aitbc.constants import DATA_DIR
|
||||||
from models import Base
|
from models import Base
|
||||||
|
|
||||||
# Database configuration
|
# 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
|
# Create engine
|
||||||
if DATABASE_URL.startswith("sqlite"):
|
if DATABASE_URL.startswith("sqlite"):
|
||||||
|
|||||||
@@ -10,13 +10,11 @@ from datetime import datetime, timedelta
|
|||||||
from typing import Dict, List, Optional, Any
|
from typing import Dict, List, Optional, Any
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
import logging
|
|
||||||
|
|
||||||
|
from aitbc import get_logger
|
||||||
from real_exchange_integration import exchange_manager, ExchangeStatus, ExchangeHealth
|
from real_exchange_integration import exchange_manager, ExchangeStatus, ExchangeHealth
|
||||||
|
|
||||||
# Setup logging
|
logger = get_logger(__name__)
|
||||||
logging.basicConfig(level=logging.INFO)
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
|
|
||||||
class FailoverStrategy(str, Enum):
|
class FailoverStrategy(str, Enum):
|
||||||
"""Failover strategies"""
|
"""Failover strategies"""
|
||||||
|
|||||||
@@ -12,11 +12,10 @@ from datetime import datetime, timedelta
|
|||||||
from typing import Dict, List, Optional, Any, Tuple
|
from typing import Dict, List, Optional, Any, Tuple
|
||||||
from dataclasses import dataclass
|
from dataclasses import dataclass
|
||||||
from enum import Enum
|
from enum import Enum
|
||||||
import logging
|
|
||||||
|
|
||||||
# Setup logging
|
from aitbc import get_logger
|
||||||
logging.basicConfig(level=logging.INFO)
|
|
||||||
logger = logging.getLogger(__name__)
|
logger = get_logger(__name__)
|
||||||
|
|
||||||
class ExchangeStatus(str, Enum):
|
class ExchangeStatus(str, Enum):
|
||||||
"""Exchange connection status"""
|
"""Exchange connection status"""
|
||||||
|
|||||||
@@ -3,12 +3,13 @@
|
|||||||
|
|
||||||
import sqlite3
|
import sqlite3
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
from aitbc.constants import DATA_DIR
|
||||||
|
|
||||||
def seed_initial_price():
|
def seed_initial_price():
|
||||||
"""Create initial trades to establish market price"""
|
"""Create initial trades to establish market price"""
|
||||||
|
|
||||||
import os
|
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)
|
conn = sqlite3.connect(db_path)
|
||||||
cursor = conn.cursor()
|
cursor = conn.cursor()
|
||||||
|
|
||||||
|
|||||||
@@ -9,12 +9,13 @@ from datetime import datetime
|
|||||||
from http.server import HTTPServer, BaseHTTPRequestHandler
|
from http.server import HTTPServer, BaseHTTPRequestHandler
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
import random
|
import random
|
||||||
|
from aitbc.constants import DATA_DIR
|
||||||
|
|
||||||
# Database setup
|
# Database setup
|
||||||
def get_db_path():
|
def get_db_path():
|
||||||
"""Get database path and ensure directory exists"""
|
"""Get database path and ensure directory exists"""
|
||||||
import os
|
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
|
# Create directory if it doesn't exist
|
||||||
db_dir = os.path.dirname(db_path)
|
db_dir = os.path.dirname(db_path)
|
||||||
|
|||||||
Reference in New Issue
Block a user