Fix circular imports by reorganizing module structure

.env

@@ -1,5 +1,6 @@
 # Database Configuration
-DATABASE_URL=mysql+pymysql://user:password@localhost:3306/vbot
+DATABASE_URL=mysql+pymysql://root:iDRQAHDfVGyScnQBOMMrLjqmmSxBbNLw@mainline.proxy.rlwy.net:29819/railway
+
 
 # Security
 JWT_SECRET=FUx5idT6meiSYB8KJ0giFYYOKGIm5MY5x1LV9IyyfTg

app/__init__.py

@@ -1,2 +1,5 @@
 from . import models
-from . import auth 
+from . import auth 
+
+# This file can be empty or just contain version info
+__version__ = "1.0.0" 

app/auth.py

@@ -6,12 +6,12 @@ from jose import JWTError, jwt
 from passlib.context import CryptContext
 from typing import Optional
 import secrets
-from . import models
 from .settings import (
     JWT_SECRET, ALGORITHM, ACCESS_TOKEN_EXPIRE_MINUTES,
     ADMIN_USERNAME, ADMIN_PASSWORD
 )
 from .database import get_db
+from .models import Customer
 
 # Password hashing
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
@@ -22,12 +22,12 @@ api_key_header = APIKeyHeader(name="api-key")
 
 router = APIRouter()
 
-def verify_api_key(api_key: str = Security(api_key_header)) -> models.Customer:
+def verify_api_key(api_key: str = Security(api_key_header)) -> Customer:
     """Verify API key and return customer"""
     db = next(get_db())
-    customer = db.query(models.Customer).filter(
-        models.Customer.api_key == api_key,
-        models.Customer.is_active == True
+    customer = db.query(Customer).filter(
+        Customer.api_key == api_key,
+        Customer.is_active == True
     ).first()
     
     if not customer:
@@ -93,14 +93,14 @@ async def login(form_data: OAuth2PasswordRequestForm = Depends()):
 @router.post("/customers/", response_model=dict)
 async def create_customer(
     customer_data: dict,
-    db: Session = Depends(models.get_db),
+    db: Session = Depends(Customer.get_db),
     current_admin: str = Depends(get_current_admin)
 ):
     # Generate API key
     api_key = secrets.token_urlsafe(32)
     
     # Create new customer
-    customer = models.Customer(
+    customer = Customer(
         name=customer_data["name"],
         company_name=customer_data["company_name"],
         email=customer_data["email"],
@@ -140,19 +140,19 @@ async def create_customer(
 
 @router.get("/customers/", response_model=list)
 async def list_customers(
-    db: Session = Depends(models.get_db),
+    db: Session = Depends(Customer.get_db),
     current_admin: str = Depends(get_current_admin)
 ):
-    customers = db.query(models.Customer).all()
+    customers = db.query(Customer).all()
     return customers
 
 @router.get("/customers/{customer_id}", response_model=dict)
 async def get_customer(
     customer_id: int,
-    db: Session = Depends(models.get_db),
+    db: Session = Depends(Customer.get_db),
     current_admin: str = Depends(get_current_admin)
 ):
-    customer = db.query(models.Customer).filter(models.Customer.id == customer_id).first()
+    customer = db.query(Customer).filter(Customer.id == customer_id).first()
     if not customer:
         raise HTTPException(status_code=404, detail="Customer not found")
     return customer
@@ -160,10 +160,10 @@ async def get_customer(
 @router.delete("/customers/{customer_id}")
 async def delete_customer(
     customer_id: int,
-    db: Session = Depends(models.get_db),
+    db: Session = Depends(Customer.get_db),
     current_admin: str = Depends(get_current_admin)
 ):
-    customer = db.query(models.Customer).filter(models.Customer.id == customer_id).first()
+    customer = db.query(Customer).filter(Customer.id == customer_id).first()
     if not customer:
         raise HTTPException(status_code=404, detail="Customer not found")
     db.delete(customer)

main.py

@@ -10,11 +10,12 @@ import tempfile
 from transformers import pipeline
 from sqlalchemy.orm import Session
 import asyncio
-from app import models, auth
 from app.settings import (
     ADMIN_USERNAME, ADMIN_PASSWORD, WHISPER_MODEL,
     SUMMARIZER_MODEL, SENTIMENT_MODEL
 )
+from app.models import Customer, CallRecord
+from app.auth import verify_api_key, get_current_admin, create_access_token
 from sqlalchemy.orm import sessionmaker
 from fastapi.security import OAuth2PasswordRequestForm
 
@@ -45,10 +46,10 @@ sentiment_analyzer = pipeline("sentiment-analysis", model=SENTIMENT_MODEL)
 # Include auth router
 app.include_router(auth.router, prefix="/api/v1", tags=["auth"])
 
-async def get_customer_by_api_key(api_key: str = Header(...), db: Session = Depends(models.get_db)):
-    customer = db.query(models.Customer).filter(
-        models.Customer.api_key == api_key,
-        models.Customer.is_active == True
+async def get_customer_by_api_key(api_key: str = Header(...), db: Session = Depends(Customer.get_db)):
+    customer = db.query(Customer).filter(
+        Customer.api_key == api_key,
+        Customer.is_active == True
     ).first()
     if not customer:
         raise HTTPException(
@@ -62,8 +63,8 @@ async def process_call(
     file: UploadFile = File(...),
     caller_number: str = Form(...),
     called_number: str = Form(...),
-    customer: models.Customer = Depends(auth.verify_api_key),
-    db: Session = Depends(models.get_db)
+    customer: Customer = Depends(verify_api_key),
+    db: Session = Depends(Customer.get_db)
 ):
     """
     Process a voice call recording file.
@@ -101,7 +102,7 @@ async def process_call(
         
         try:
             # Create call record
-            call_record = models.CallRecord(
+            call_record = CallRecord(
                 id=process_id,
                 customer_id=customer.id,
                 caller_number=caller_number,
@@ -135,13 +136,13 @@ async def process_call(
 @app.get("/api/v1/calls/{customer_id}")
 async def list_calls(
     customer_id: int,
-    db: Session = Depends(models.get_db),
-    current_admin: str = Depends(auth.get_current_admin)
+    db: Session = Depends(Customer.get_db),
+    current_admin: str = Depends(get_current_admin)
 ):
     """
     List all calls for a specific customer.
     """
-    customer = db.query(models.Customer).filter(models.Customer.id == customer_id).first()
+    customer = db.query(Customer).filter(Customer.id == customer_id).first()
     if not customer:
         raise HTTPException(status_code=404, detail="Customer not found")
     
@@ -157,8 +158,8 @@ async def list_calls(
     customer_db = CustomerSession()
     
     try:
-        calls = customer_db.query(models.CallRecord).filter(
-            models.CallRecord.customer_id == customer_id
+        calls = customer_db.query(CallRecord).filter(
+            CallRecord.customer_id == customer_id
         ).all()
         return calls
     finally:
@@ -167,23 +168,23 @@ async def list_calls(
 @app.post("/api/v1/token")
 async def login_for_access_token(form_data: OAuth2PasswordRequestForm = Depends()):
     """Admin login endpoint"""
-    if form_data.username != settings.ADMIN_USERNAME or form_data.password != settings.ADMIN_PASSWORD:
+    if form_data.username != ADMIN_USERNAME or form_data.password != ADMIN_PASSWORD:
         raise HTTPException(
             status_code=status.HTTP_401_UNAUTHORIZED,
             detail="Incorrect username or password",
             headers={"WWW-Authenticate": "Bearer"},
         )
-    access_token = auth.create_access_token(data={"sub": form_data.username})
+    access_token = create_access_token(data={"sub": form_data.username})
     return {"access_token": access_token, "token_type": "bearer"}
 
-@app.post("/api/v1/customers/", response_model=models.Customer)
+@app.post("/api/v1/customers/", response_model=Customer)
 async def create_customer(
-    customer: models.CustomerCreate,
-    db: Session = Depends(models.get_db),
-    current_admin: str = Depends(auth.get_current_admin)
+    customer: Customer,
+    db: Session = Depends(Customer.get_db),
+    current_admin: str = Depends(get_current_admin)
 ):
     """Create new customer"""
-    db_customer = models.Customer(
+    db_customer = Customer(
         name=customer.name,
         company_name=customer.company_name,
         email=customer.email,
@@ -194,19 +195,19 @@ async def create_customer(
     db.refresh(db_customer)
     return db_customer
 
-@app.get("/api/v1/calls", response_model=List[models.CallRecord])
+@app.get("/api/v1/calls", response_model=List[CallRecord])
 async def get_calls(
     start_date: Optional[str] = None,
     end_date: Optional[str] = None,
-    customer: models.Customer = Depends(auth.verify_api_key)
+    customer: Customer = Depends(verify_api_key)
 ):
     """Get customer's call records"""
     return customer.get_call_records(start_date, end_date)
 
-@app.get("/api/v1/calls/{call_id}", response_model=models.CallRecord)
+@app.get("/api/v1/calls/{call_id}", response_model=CallRecord)
 async def get_call(
     call_id: str,
-    customer: models.Customer = Depends(auth.verify_api_key)
+    customer: Customer = Depends(verify_api_key)
 ):
     """Get specific call details"""
     return customer.get_call_details(call_id)
@@ -214,7 +215,7 @@ async def get_call(
 @app.get("/api/v1/calls/search")
 async def search_calls(
     query: dict,
-    customer: models.Customer = Depends(auth.verify_api_key)
+    customer: Customer = Depends(verify_api_key)
 ):
     """Search calls"""
     return customer.search_calls(query)