nits

Author: User

backend/.env.example

@@ -0,0 +1,43 @@
+# Database
+DATABASE_URL=postgresql://postgres:postgres@localhost:5432/copilot
+ASYNC_DATABASE_URL=postgresql+asyncpg://postgres:postgres@localhost:5432/copilot
+
+# Security
+SECRET_KEY=your-secret-key-here
+ALGORITHM=HS256
+ACCESS_TOKEN_EXPIRE_MINUTES=30
+REFRESH_TOKEN_EXPIRE_DAYS=7
+
+# First superuser
+FIRST_SUPERUSER=[email protected]
+FIRST_SUPERUSER_PASSWORD=changeme
+
+# Email (for password reset, etc.)
+SMTP_TLS=True
+SMTP_PORT=587
+SMTP_HOST=smtp.example.com
+SMTP_USER=[email protected]
+SMTP_PASSWORD=your-email-password
+EMAILS_FROM_EMAIL=[email protected]
+EMAILS_FROM_NAME="Copilot"
+
+# OAuth (Google)
+GOOGLE_OAUTH_CLIENT_ID=your-google-client-id
+GOOGLE_OAUTH_CLIENT_SECRET=your-google-client-secret
+GOOGLE_OAUTH_REDIRECT_URI=http://localhost:8000/auth/google/callback
+
+# OAuth (Microsoft)
+MICROSOFT_OAUTH_CLIENT_ID=your-microsoft-client-id
+MICROSOFT_OAUTH_CLIENT_SECRET=your-microsoft-client-secret
+MICROSOFT_OAUTH_REDIRECT_URI=http://localhost:8000/auth/microsoft/callback
+MICROSOFT_OAUTH_TENANT=common
+
+# CORS (comma-separated list of origins, or * for all)
+BACKEND_CORS_ORIGINS=["http://localhost:3000", "http://localhost:8000"]
+
+# Logging
+LOG_LEVEL=INFO
+SQL_ECHO=False
+
+# Environment (development, staging, production)
+ENVIRONMENT=development

backend/app/api/deps.py

@@ -8,19 +8,21 @@
 from pydantic import ValidationError
 from sqlmodel import Session
 
-from app.core import security
-from app.core.config import settings
-from app.core.db import engine
+from app.core import security, SessionLocal, settings
+from app.core.config import settings as app_settings
 from app.models import TokenPayload, User
 
 reusable_oauth2 = OAuth2PasswordBearer(
-    tokenUrl=f"{settings.API_V1_STR}/login/access-token"
+    tokenUrl=f"{app_settings.API_V1_STR}/login/access-token"
 )
 
 
 def get_db() -> Generator[Session, None, None]:
-    with Session(engine) as session:
-        yield session
+    db = SessionLocal()
+    try:
+        yield db
+    finally:
+        db.close()
 
 
 SessionDep = Annotated[Session, Depends(get_db)]

backend/app/api/routes/login.py

@@ -10,7 +10,7 @@
 from app.core import security
 from app.core.config import settings
 from app.core.security import get_password_hash
-from app.models import Message, NewPassword, Token, UserPublic
+from app.models import Message, NewPassword, TokenPair as Token, UserPublic
 from app.utils import (
     generate_password_reset_token,
     generate_reset_password_email,

backend/app/core/__init__.py

@@ -17,6 +17,10 @@
     get_async_session,
     init_db,
     async_init_db,
+    sync_engine,
+    async_engine,
+    SessionLocal,
+    AsyncSessionLocal,
 )
 
 # Security

backend/app/core/config.py

@@ -39,6 +39,7 @@ def parse_cors(v: Any) -> list[str] | str:
 
 class DatabaseSettings(BaseSettings):
     """Database configuration settings."""
+    model_config = SettingsConfigDict(env_prefix="DATABASE_")
 
     POSTGRES_SERVER: str = "localhost"
     POSTGRES_USER: str = "postgres"
@@ -78,6 +79,7 @@ def ASYNC_SQLALCHEMY_DATABASE_URI(self) -> str:
 
 class AuthSettings(BaseSettings):
     """Authentication and authorization settings."""
+    model_config = SettingsConfigDict(env_prefix="AUTH_")
 
     SECRET_KEY: str = secrets.token_urlsafe(32)
     ALGORITHM: str = "HS256"
@@ -108,9 +110,9 @@ class AuthSettings(BaseSettings):
     SESSION_COOKIE_DOMAIN: Optional[str] = None
 
     # CORS
-    BACKEND_CORS_ORIGINS: list[AnyUrl] = [
-        "http://localhost:3000",
-        "http://localhost:8000",
+    BACKEND_CORS_ORIGINS: list[HttpUrl] = [
+        HttpUrl("http://localhost:3000"),
+        HttpUrl("http://localhost:8000"),
     ]
 
     @property
@@ -121,6 +123,7 @@ def all_cors_origins(self) -> list[str]:
 
 class EmailSettings(BaseSettings):
     """Email configuration settings."""
+    model_config = SettingsConfigDict(env_prefix="EMAIL_")
 
     SMTP_TLS: bool = True
     SMTP_PORT: int = 587
@@ -138,6 +141,7 @@ def EMAILS_ENABLED(self) -> bool:
 
 class RedisSettings(BaseSettings):
     """Redis configuration settings."""
+    model_config = SettingsConfigDict(env_prefix="REDIS_")
 
     REDIS_HOST: str = "localhost"
     REDIS_PORT: int = 6379
@@ -159,10 +163,6 @@ def REDIS_URL(self) -> RedisDsn:
         )
 
 
-class Settings(DatabaseSettings, AuthSettings, EmailSettings, RedisSettings):
-    """Application settings."""
-
-
 def parse_cors(v: Any) -> list[str] | str:
     if isinstance(v, str) and not v.startswith("["):
         return [i.strip() for i in v.split(",")]
@@ -171,7 +171,8 @@ def parse_cors(v: Any) -> list[str] | str:
     raise ValueError(v)
 
 
-class Settings(BaseSettings):
+class Settings(DatabaseSettings, AuthSettings, EmailSettings, RedisSettings):
+    """Application settings."""
     model_config = SettingsConfigDict(
         env_file=PROJECT_ROOT / ".env",
         env_file_encoding="utf-8",
@@ -184,6 +185,15 @@ class Settings(BaseSettings):
     PROJECT_NAME: str = "Copilot API"
     API_V1_STR: str = "/api/v1"
     ENVIRONMENT: Literal["local", "staging", "production"] = "local"
+    
+    # Allow development as an alias for local
+    @model_validator(mode='before')
+    @classmethod
+    def validate_environment(cls, data: Any) -> Any:
+        if isinstance(data, dict) and data.get('ENVIRONMENT') == 'development':
+            data['ENVIRONMENT'] = 'local'
+        return data
+    
     DEBUG: bool = False
 
     # Security
@@ -255,27 +265,36 @@ def set_debug(cls, v: str) -> str:
         return v
 
     @field_validator("BACKEND_CORS_ORIGINS", mode="before")
-    def assemble_cors_origins(cls, v: Union[str, list[str]]) -> list[str] | str:
+    def assemble_cors_origins(cls, v: Union[str, list[Union[str, HttpUrl]]]) -> list[HttpUrl]:
         """Parse CORS origins from a comma-separated string or list."""
-        if isinstance(v, str) and not v.startswith("["):
-            return [i.strip() for i in v.split(",")]
-        elif isinstance(v, list):
-            return v
-        raise ValueError(v)
-    
-    class Config:
-        case_sensitive = True
-        env_file = ".env"
-        env_file_encoding = "utf-8"
-
+        if isinstance(v, str):
+            if v.startswith("["):
+                # Handle JSON array string
+                import json
+                v = json.loads(v)
+            else:
+                # Handle comma-separated string
+                v = [i.strip() for i in v.split(",")]
+        
+        # Convert all items to HttpUrl objects
+        result = []
+        for item in v:
+            if isinstance(item, str):
+                result.append(HttpUrl(item))
+            elif isinstance(item, HttpUrl):
+                result.append(item)
+            else:
+                raise ValueError(f"Invalid CORS origin: {item}")
+        return result
+    
     PROJECT_NAME: str
     SENTRY_DSN: HttpUrl | None = None
-    POSTGRES_SERVER: str
+    POSTGRES_SERVER: str = "localhost"
+    POSTGRES_USER: str = "postgres"
+    POSTGRES_PASSWORD: str = "postgres"
+    POSTGRES_DB: str = "copilot"
     POSTGRES_PORT: int = 5432
-    POSTGRES_USER: str
-    POSTGRES_PASSWORD: str = ""
-    POSTGRES_DB: str = ""
-
+    
     @computed_field  # type: ignore[prop-decorator]
     @property
     def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
@@ -295,7 +314,7 @@ def SQLALCHEMY_DATABASE_URI(self) -> PostgresDsn:
     SMTP_USER: str | None = None
     SMTP_PASSWORD: str | None = None
     EMAILS_FROM_EMAIL: EmailStr | None = None
-    EMAILS_FROM_NAME: EmailStr | None = None
+    EMAILS_FROM_NAME: str | None = None
 
     @model_validator(mode="after")
     def _set_default_emails_from(self) -> Self:

backend/app/core/logging.py

@@ -8,7 +8,8 @@
 from typing import Any, Dict, Optional
 
 from loguru import logger
-from pydantic import BaseSettings, Field
+from pydantic import Field
+from pydantic_settings import BaseSettings
 
 
 class LoggingSettings(BaseSettings):

backend/app/core/utils.py

@@ -20,7 +20,7 @@
 from typing import Any, Callable, Dict, List, Optional, TypeVar, Union, cast
 
 import jwt
-from fastapi import HTTPException, status
+from fastapi import HTTPException, Request, status
 from jose import jwe
 from passlib.context import CryptContext
 from pydantic import BaseModel, EmailStr, ValidationError

backend/app/crud.py

@@ -33,7 +33,8 @@ def update_user(*, session: Session, db_user: User, user_in: UserUpdate) -> Any:
 
 def get_user_by_email(*, session: Session, email: str) -> User | None:
     statement = select(User).where(User.email == email)
-    session_user = session.exec(statement).first()
+    # Use execute() instead of exec() for SQLAlchemy compatibility
+    session_user = session.execute(statement).scalars().first()
     return session_user
 
 

backend/app/db/__init__.py

@@ -1 +1,24 @@
-# This file makes the db directory a Python package
+"""
+Database package.
+
+This package provides database session management and utilities.
+"""
+from app.core.db import (
+    get_db,
+    get_async_db,
+    get_sync_session,
+    get_async_session,
+    init_db,
+    async_init_db,
+    get_password_hash,
+)
+
+__all__ = [
+    'get_db',
+    'get_async_db',
+    'get_sync_session',
+    'get_async_session',
+    'init_db',
+    'async_init_db',
+    'get_password_hash',
+]

backend/app/models/__init__.py

@@ -1,12 +1,14 @@
 # Import all models here so they're properly registered with SQLAlchemy
+from sqlmodel import SQLModel
+
 from app.models.base import BaseDBModel, TimestampMixin
 from app.models.user import (
     UserRole,
     OAuthProvider,
     UserBase,
     UserCreate,
     UserUpdate,
-    UserInDB,
+    UserInDB as User,
     UserPublic,
     UserLogin,
     TokenPayload,
@@ -17,6 +19,21 @@
     RefreshTokenPublic,
     PasswordResetRequest,
     PasswordResetConfirm,
+    NewPassword,
+    UpdatePassword,
+    UserRegister,
+    UserUpdateMe,
+    UsersPublic,
+)
+
+from app.models.item import (
+    Item,
+    ItemBase,
+    ItemCreate,
+    ItemUpdate,
+    ItemPublic,
+    ItemsPublic,
+    Message,
 )
 
 # This ensures that SQLModel knows about all models for migrations
@@ -28,7 +45,7 @@
     'UserBase',
     'UserCreate',
     'UserUpdate',
-    'UserInDB',
+    'User',
     'UserPublic',
     'UserLogin',
     'TokenPayload',
@@ -39,4 +56,16 @@
     'RefreshTokenPublic',
     'PasswordResetRequest',
     'PasswordResetConfirm',
+    'NewPassword',
+    'UpdatePassword',
+    'UserRegister',
+    'UserUpdateMe',
+    'UsersPublic',
+    'Item',
+    'ItemBase',
+    'ItemCreate',
+    'ItemUpdate',
+    'ItemPublic',
+    'ItemsPublic',
+    'Message',
 ]