fix python path

Author: notarious2

backend/auth.py

@@ -2,14 +2,15 @@
 from typing import Any
 
 import jwt
-from config import settings
-from database import get_async_session
 from fastapi import Depends, HTTPException, status
 from fastapi.security import OAuth2PasswordBearer
-from models import User
-from repositories.user_repo import UserRepository
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from backend.config import settings
+from backend.database import get_async_session
+from backend.models import User
+from backend.repositories.user_repo import UserRepository
+
 oauth2_scheme = OAuth2PasswordBearer(tokenUrl="user/jwt/create/", scheme_name="JWT")  # important path to get token
 
 

backend/database.py

@@ -1,13 +1,12 @@
 from typing import AsyncGenerator
 
-from sqlalchemy.ext.asyncio import AsyncSession, create_async_engine
-from sqlalchemy.orm import sessionmaker
+from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
 
 DATABASE_URL = "sqlite+aiosqlite:///./todo.db"
 
 
 engine = create_async_engine(DATABASE_URL)
-async_session_maker = sessionmaker(engine, class_=AsyncSession)
+async_session_maker = async_sessionmaker(engine, expire_on_commit=False)
 
 
 async def get_async_session() -> AsyncGenerator[AsyncSession, None]:

backend/main.py

@@ -1,10 +1,12 @@
 from contextlib import asynccontextmanager
 
-from database import engine
 from fastapi import FastAPI
 from fastapi.middleware.cors import CORSMiddleware
-from models import BaseModel
-from routers import authorization, task, user
+
+# sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), "..")))
+from backend.database import engine
+from backend.models import metadata
+from backend.routers import authorization, task, user
 
 
 @asynccontextmanager
@@ -29,5 +31,6 @@ async def lifespan(app: FastAPI):
 
 
 async def create_tables() -> None:
+    metadata.bind = engine
     async with engine.begin() as conn:
-        await conn.run_sync(BaseModel.metadata.create_all)
+        await conn.run_sync(metadata.create_all)

backend/repositories/task_repo.py

@@ -1,11 +1,12 @@
 from datetime import date
 
 from fastapi import HTTPException, status
-from models import Task, User
-from schemas import CreateTaskSchema, UpdateTaskSchema
 from sqlalchemy import and_, select, update
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from backend.models import Task, User
+from backend.schemas import CreateTaskSchema, UpdateTaskSchema
+
 
 class TaskRepository:
     def __init__(self, db_session: AsyncSession):

backend/repositories/user_repo.py

@@ -1,8 +1,9 @@
-from models import User
-from schemas import UserCreate
 from sqlalchemy import or_, select
 from sqlalchemy.ext.asyncio import AsyncSession
-from utils import get_hashed_password, verify_hashed_password
+
+from backend.models import User
+from backend.schemas import UserCreate
+from backend.utils import get_hashed_password, verify_hashed_password
 
 
 class UserRepository:

backend/routers/authorization.py

@@ -1,11 +1,12 @@
-from auth import create_access_token, create_refresh_token
-from database import get_async_session
 from fastapi import APIRouter, Depends, HTTPException, status
 from fastapi.encoders import jsonable_encoder
 from fastapi.security.oauth2 import OAuth2PasswordRequestForm
-from repositories.user_repo import UserRepository
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from backend.auth import create_access_token, create_refresh_token
+from backend.database import get_async_session
+from backend.repositories.user_repo import UserRepository
+
 router = APIRouter(prefix="/user", tags=["user"])
 
 

backend/routers/task.py

@@ -1,17 +1,18 @@
 from datetime import date
 
-from auth import get_current_user
-from database import get_async_session
 from fastapi import APIRouter, Depends, HTTPException, Response, status
-from models import User
-from repositories.task_repo import TaskRepository
-from schemas import (
+from sqlalchemy.ext.asyncio import AsyncSession
+
+from backend.auth import get_current_user
+from backend.database import get_async_session
+from backend.models import User
+from backend.repositories.task_repo import TaskRepository
+from backend.schemas import (
     CreateTaskSchema,
     DisplayTaskSchema,
     UpdateTaskPrioritiesSchema,
     UpdateTaskSchema,
 )
-from sqlalchemy.ext.asyncio import AsyncSession
 
 router = APIRouter(prefix="/task", tags=["task"])
 

backend/routers/user.py

@@ -1,9 +1,10 @@
-from database import get_async_session
 from fastapi import APIRouter, Depends, HTTPException, Response, status
-from repositories.user_repo import UserRepository
-from schemas import UserCreate, UserDisplay
 from sqlalchemy.ext.asyncio import AsyncSession
 
+from backend.database import get_async_session
+from backend.repositories.user_repo import UserRepository
+from backend.schemas import UserCreate, UserDisplay
+
 router = APIRouter(prefix="/users", tags=["user"])