Merge pull request #54 from igorbenav/folder-structure

Core Folder Restructured

Author: igorbenav

README.md

@@ -12,10 +12,10 @@
 )
 
 from app.api.exceptions import credentials_exception, privileges_exception
-from app.core.database import async_get_db
+from app.core.db.database import async_get_db
 from app.core.logger import logging
-from app.core.models import TokenData
-from app.core.rate_limit import is_rate_limited
+from app.core.schemas import TokenData
+from app.core.utils.rate_limit import is_rate_limited
 from app.core.security import verify_token
 from app.crud.crud_rate_limit import crud_rate_limits
 from app.crud.crud_tier import crud_tiers

src/app/api/dependencies.py

@@ -6,8 +6,8 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 import fastapi
 
-from app.core.database import async_get_db
-from app.core.models import Token
+from app.core.db.database import async_get_db
+from app.core.schemas import Token
 from app.core.security import ACCESS_TOKEN_EXPIRE_MINUTES, create_access_token, authenticate_user
 from app.api.exceptions import credentials_exception
 

src/app/api/v1/login.py

@@ -5,9 +5,9 @@
 from jose import jwt, JWTError
 
 from app.core.security import oauth2_scheme, SECRET_KEY, ALGORITHM
-from app.core.database import async_get_db
-from app.crud.crud_token_blacklist import crud_token_blacklist
-from app.schemas.token_blacklist import TokenBlacklistCreate
+from app.core.db.database import async_get_db
+from app.core.db.crud_token_blacklist import crud_token_blacklist
+from app.core.schemas import TokenBlacklistCreate
 
 router = APIRouter(tags=["login"])
 

src/app/api/v1/logout.py

@@ -7,11 +7,11 @@
 from app.schemas.post import PostCreate, PostUpdate, PostRead, PostCreateInternal
 from app.schemas.user import UserRead
 from app.api.dependencies import get_current_user, get_current_superuser
-from app.core.database import async_get_db
+from app.core.db.database import async_get_db
 from app.crud.crud_posts import crud_posts
 from app.crud.crud_users import crud_users
 from app.api.exceptions import privileges_exception
-from app.core.cache import cache
+from app.core.utils.cache import cache
 from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
 
 router = fastapi.APIRouter(tags=["posts"])

src/app/api/v1/posts.py

@@ -6,7 +6,7 @@
 
 from app.api.dependencies import get_current_superuser
 from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
-from app.core.database import async_get_db
+from app.core.db.database import async_get_db
 from app.crud.crud_rate_limit import crud_rate_limits
 from app.crud.crud_tier import crud_tiers
 from app.schemas.rate_limit import (

src/app/api/v1/rate_limits.py

@@ -1,7 +1,7 @@
 from arq.jobs import Job as ArqJob
 from fastapi import APIRouter, Depends
 
-from app.core import queue
+from app.core.utils import queue
 from app.schemas.job import Job
 from app.api.dependencies import rate_limiter
 

src/app/api/v1/tasks.py

@@ -11,7 +11,7 @@
     TierUpdate
 )
 from app.api.dependencies import get_current_superuser
-from app.core.database import async_get_db
+from app.core.db.database import async_get_db
 from app.crud.crud_tier import crud_tiers
 from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
 

src/app/api/v1/tiers.py

@@ -8,7 +8,7 @@
 from app.api.dependencies import get_current_user, get_current_superuser
 from app.api.exceptions import privileges_exception
 from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
-from app.core.database import async_get_db
+from app.core.db.database import async_get_db
 from app.core.security import get_password_hash
 from app.crud.crud_users import crud_users
 from app.crud.crud_tier import crud_tiers