Merge pull request #17 from hackclub/refactoring-api

Refactoring api

Author: ImShyMike

Dockerfile

@@ -12,6 +12,8 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/
 # Change the working directory to the `app` directory
 WORKDIR /app
 
+ENV PYTHONPATH=/app
+
 # Install dependencies
 RUN --mount=type=cache,target=/root/.cache/uv \
     --mount=type=bind,source=uv.lock,target=uv.lock \

main.py

@@ -4,11 +4,11 @@
 # from typing import Annotated
 # import asyncpg
 from contextlib import asynccontextmanager
+from typing import Any
 
 # import orjson
 # import os
 import dotenv
-from typing import Any
 from fastapi import Depends, FastAPI, HTTPException, Request  # , Form
 from fastapi.exceptions import RequestValidationError
 from fastapi.responses import FileResponse, HTMLResponse  # , RedirectResponse
@@ -24,13 +24,13 @@
 # from sqlalchemy.ext.asyncio import create_async_engine, AsyncSession
 # from sqlalchemy.ext.asyncio import AsyncSession
 # from sqlalchemy.ext.asyncio import async_sessionmaker
-from api.auth import require_auth  # , is_user_authenticated
-from api.auth import router as auth_router
-from api.auth.main import Permission, permission_dependency
-from api.projects import router as projects_router
-from api.users import router as users_router
-from db import engine  # , get_db
-from models.user import Base
+from v1.auth import require_auth  # , is_user_authenticated
+from v1.auth import router as auth_router
+from v1.auth.main import Permission, permission_dependency
+from v1.db import engine  # , get_db
+from v1.models.user import Base
+from v1.projects import router as projects_router
+from v1.users import router as users_router
 
 # from api.users import foo
 

api/__init__.py renamed to v1/__init__.py

@@ -23,8 +23,8 @@
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import select
 
-from db import get_db
-from models.user import User
+from v1.db import get_db
+from v1.models.user import User
 
 dotenv.load_dotenv()