Add database.py and update models to use centralized database session

app/database.py

@@ -0,0 +1,17 @@
+from sqlalchemy import create_engine
+from sqlalchemy.orm import sessionmaker
+from .settings import DATABASE_URL
+
+# Create SQLAlchemy engine
+engine = create_engine(DATABASE_URL)
+
+# Create session factory
+SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
+
+def get_db():
+    """Get database session"""
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close() 

app/models.py

@@ -1,19 +1,11 @@
 from sqlalchemy import Column, Integer, String, DateTime, ForeignKey, Boolean, create_engine, Text
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker, relationship
+from sqlalchemy.orm import relationship
 from datetime import datetime
-import os
-from dotenv import load_dotenv
-import json
 import requests
 from typing import Optional, List, Dict
-from .settings import DATABASE_URL, API_BASE_URL
-
-# Load environment variables
-load_dotenv()
-
-# Create SQLAlchemy engine
-engine = create_engine(DATABASE_URL)
+from .settings import API_BASE_URL
+from .database import get_db
 
 # Create declarative base
 Base = declarative_base()
@@ -29,32 +21,34 @@ class Customer(Base):
     is_active = Column(Boolean, default=True)
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-    
     # Database credentials for customer's own database
     db_host = Column(String(255))
     db_port = Column(Integer)
     db_name = Column(String(100))
     db_user = Column(String(100))
     db_password = Column(String(255))
-    
-    def get_db_url(self):
-        """Get the database URL for this customer"""
+
+    # Relationship with call records
+    call_records = relationship("CallRecord", back_populates="customer")
+
+    def get_db_url(self) -> Optional[str]:
+        """Get database URL if credentials are configured"""
         if all([self.db_host, self.db_port, self.db_name, self.db_user, self.db_password]):
             return f"mysql+pymysql://{self.db_user}:{self.db_password}@{self.db_host}:{self.db_port}/{self.db_name}"
         return None
 
     def get_db_engine(self):
-        """Get a SQLAlchemy engine for this customer's database"""
+        """Get SQLAlchemy engine for customer's database"""
         db_url = self.get_db_url()
         if db_url:
             return create_engine(db_url)
         return None
 
     def create_tables(self):
-        """Create necessary tables in customer's database"""
+        """Create tables in customer's database"""
         engine = self.get_db_engine()
         if engine:
-            CallRecord.metadata.create_all(engine)
+            Base.metadata.create_all(engine)
 
     def get_call_records(self, start_date: Optional[str] = None, end_date: Optional[str] = None) -> List[Dict]:
         """Get call records via API"""
@@ -94,9 +88,6 @@ class Customer(Base):
         response.raise_for_status()
         return response.json()
 
-    # Relationship with call records
-    call_records = relationship("CallRecord", back_populates="customer")
-
 class CallRecord(Base):
     __tablename__ = "call_records"
 
@@ -111,8 +102,7 @@ class CallRecord(Base):
     keywords = Column(Text)
     created_at = Column(DateTime, default=datetime.utcnow)
     updated_at = Column(DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
-    
-    # Relationship with customer
+
     customer = relationship("Customer", back_populates="call_records")
 
     @classmethod
@@ -128,18 +118,4 @@ class CallRecord(Base):
             summary=data.get('summary'),
             sentiment=data.get('sentiment'),
             keywords=data.get('keywords')
-        )
-
-# Create all tables in the main database
-Base.metadata.create_all(engine)
-
-# Create session factory
-SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
-
-# Dependency to get database session
-def get_db():
-    db = SessionLocal()
-    try:
-        yield db
-    finally:
-        db.close() 
+        )