tests folder moved to core, all imports changed to relative imports

Author: igorbenav

README.md

@@ -427,6 +427,12 @@ First, you may want to take a look at the project structure and understand what
 ├── README.md                         # Project README providing information and instructions.
 ├── docker-compose.yml                # Docker Compose file for defining multi-container applications.
 │
+└── tests                             # Unit and integration tests for the application.
+│   ├── __init__.py
+│   ├── conftest.py                   # Configuration and fixtures for pytest.
+│   ├── helper.py                     # Helper functions for tests.
+│   └── test_user.py                  # Test cases for user-related functionality.
+│
 └── src                               # Source code directory.
     ├── __init__.py                   # Initialization file for the src package.
     ├── alembic.ini                   # Configuration file for Alembic (database migration tool).
@@ -517,16 +523,10 @@ First, you may want to take a look at the project structure and understand what
     │   └── versions                  # Individual migration scripts.
     │       └── README.MD
     │
-    ├── scripts                       # Utility scripts for the application.
-    │   ├── __init__.py
-    │   ├── create_first_superuser.py # Script to create the first superuser.
-    │   └── create_first_tier.py      # Script to create the first user tier.
-    │
-    └── tests                         # Unit and integration tests for the application.
+    └── scripts                       # Utility scripts for the application.
         ├── __init__.py
-        ├── conftest.py               # Configuration and fixtures for pytest.
-        ├── helper.py                 # Helper functions for tests.
-        └── test_user.py              # Test cases for user-related functionality.
+        ├── create_first_superuser.py # Script to create the first superuser.
+        └── create_first_tier.py      # Script to create the first user tier.
 ```
 
 ### 5.2 Database Model

docker-compose.yml

@@ -50,7 +50,7 @@ services:
     expose:
       - "6379"
 
-  # #-------- uncomment to run with nginx --------
+  #-------- uncomment to run with nginx --------
   # nginx:
   #   image: nginx:latest
   #   ports:
@@ -60,7 +60,7 @@ services:
   #   depends_on:
   #     - web
 
-  # #-------- uncomment to create first superuser --------
+  #-------- uncomment to create first superuser --------
   # create_superuser:
   #   build: 
   #     context: .
@@ -80,16 +80,16 @@ services:
   #     context: .
   #     dockerfile: Dockerfile 
   #   env_file:
-  #     - ./src/.env 
+  #     - ./src/.env
   #   depends_on:
   #     - db
   #     - create_superuser
   #     - redis
-  #   command: python -m pytest
+  #   command: python -m pytest ./tests
   #   volumes:
-  #     - ./src:/code/src
+  #     - .:/code
 
-  # #-------- uncomment to create first tier --------
+  #-------- uncomment to create first tier --------
   # create_tier:
   #   build: 
   #     context: .

src/app/api/__init__.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter
 
-from app.api.v1 import router as v1_router
+from ..api.v1 import router as v1_router
 
 router = APIRouter(prefix="/api")
 router.include_router(v1_router)

src/app/api/dependencies.py

@@ -1,8 +1,5 @@
 from typing import Annotated, Union, Any
 
-from app.core.security import SECRET_KEY, ALGORITHM, oauth2_scheme
-from app.core.config import settings
-
 from sqlalchemy.ext.asyncio import AsyncSession
 from jose import JWTError, jwt
 from fastapi import (
@@ -11,17 +8,19 @@
     Request
 )
 
-from app.core.exceptions.http_exceptions import UnauthorizedException, ForbiddenException, RateLimitException
-from app.core.db.database import async_get_db
-from app.core.logger import logging
-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
-from app.crud.crud_users import crud_users
-from app.models.user import User
-from app.schemas.rate_limit import sanitize_path
+from ..core.security import oauth2_scheme
+from ..core.config import settings
+from ..core.exceptions.http_exceptions import UnauthorizedException, ForbiddenException, RateLimitException
+from ..core.db.database import async_get_db
+from ..core.logger import logging
+from ..core.schemas import TokenData
+from ..core.utils.rate_limit import is_rate_limited
+from ..core.security import verify_token
+from ..crud.crud_rate_limit import crud_rate_limits
+from ..crud.crud_tier import crud_tiers
+from ..crud.crud_users import crud_users
+from ..models.user import User
+from ..schemas.rate_limit import sanitize_path
 
 logger = logging.getLogger(__name__)
 

src/app/api/v1/__init__.py

@@ -1,12 +1,12 @@
 from fastapi import APIRouter
 
-from app.api.v1.login import router as login_router
-from app.api.v1.logout import router as logout_router
-from app.api.v1.users import router as users_router
-from app.api.v1.posts import router as posts_router
-from app.api.v1.tasks import router as tasks_router
-from app.api.v1.tiers import router as tiers_router
-from app.api.v1.rate_limits import router as rate_limits_router
+from .login import router as login_router
+from .logout import router as logout_router
+from .users import router as users_router
+from .posts import router as posts_router
+from .tasks import router as tasks_router
+from .tiers import router as tiers_router
+from .rate_limits import router as rate_limits_router
 
 router = APIRouter(prefix="/v1")
 router.include_router(login_router)

src/app/api/v1/login.py

@@ -1,16 +1,16 @@
 from typing import Annotated, Dict
-from datetime import timedelta, datetime, timezone
+from datetime import timedelta
 
 from fastapi import Response, Request, Depends
 from fastapi.security import OAuth2PasswordRequestForm
 from sqlalchemy.ext.asyncio import AsyncSession
 import fastapi
 
-from app.core.config import settings
-from app.core.db.database import async_get_db
-from app.core.exceptions.http_exceptions import UnauthorizedException
-from app.core.schemas import Token
-from app.core.security import (
+from ...core.config import settings
+from ...core.db.database import async_get_db
+from ...core.exceptions.http_exceptions import UnauthorizedException
+from ...core.schemas import Token
+from ...core.security import (
     ACCESS_TOKEN_EXPIRE_MINUTES, 
     create_access_token, 
     authenticate_user, 

src/app/api/v1/logout.py

@@ -4,9 +4,9 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from jose import JWTError
 
-from app.core.security import oauth2_scheme, blacklist_token
-from app.core.db.database import async_get_db
-from app.core.exceptions.http_exceptions import UnauthorizedException
+from ...core.security import oauth2_scheme, blacklist_token
+from ...core.db.database import async_get_db
+from ...core.exceptions.http_exceptions import UnauthorizedException
 
 router = APIRouter(tags=["login"])
 

src/app/api/v1/posts.py

@@ -1,18 +1,18 @@
-from typing import Annotated, Union, Dict, Any
+from typing import Annotated, Dict
 
 from fastapi import Request, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 import fastapi
 
-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.db.database import async_get_db
-from app.crud.crud_posts import crud_posts
-from app.crud.crud_users import crud_users
-from app.core.exceptions.http_exceptions import NotFoundException, ForbiddenException
-from app.core.utils.cache import cache
-from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
+from ...schemas.post import PostCreate, PostUpdate, PostRead, PostCreateInternal
+from ...schemas.user import UserRead
+from ...api.dependencies import get_current_user, get_current_superuser
+from ...core.db.database import async_get_db
+from ...crud.crud_posts import crud_posts
+from ...crud.crud_users import crud_users
+from ...core.exceptions.http_exceptions import NotFoundException, ForbiddenException
+from ...core.utils.cache import cache
+from ...api.paginated import PaginatedListResponse, paginated_response, compute_offset
 
 router = fastapi.APIRouter(tags=["posts"])
 

src/app/api/v1/rate_limits.py

@@ -1,16 +1,16 @@
 from typing import Annotated, Dict
 
-from fastapi import Request, Depends, HTTPException
+from fastapi import Request, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 import fastapi
 
-from app.api.dependencies import get_current_superuser
-from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
-from app.core.db.database import async_get_db
-from app.core.exceptions.http_exceptions import NotFoundException, DuplicateValueException, RateLimitException
-from app.crud.crud_rate_limit import crud_rate_limits
-from app.crud.crud_tier import crud_tiers
-from app.schemas.rate_limit import (
+from ...api.dependencies import get_current_superuser
+from ...api.paginated import PaginatedListResponse, paginated_response, compute_offset
+from ...core.db.database import async_get_db
+from ...core.exceptions.http_exceptions import NotFoundException, DuplicateValueException, RateLimitException
+from ...crud.crud_rate_limit import crud_rate_limits
+from ...crud.crud_tier import crud_tiers
+from ...schemas.rate_limit import (
     RateLimitRead,
     RateLimitCreate,
     RateLimitCreateInternal,

src/app/api/v1/tasks.py

@@ -1,11 +1,11 @@
 from typing import Dict, Optional, Any
 
 from arq.jobs import Job as ArqJob
-from fastapi import APIRouter, Depends, HTTPException
+from fastapi import APIRouter, Depends
 
-from app.core.utils import queue
-from app.schemas.job import Job
-from app.api.dependencies import rate_limiter
+from ...core.utils import queue
+from ...schemas.job import Job
+from ...api.dependencies import rate_limiter
 
 router = APIRouter(prefix="/tasks", tags=["tasks"])
 

src/app/api/v1/tiers.py

@@ -1,20 +1,20 @@
 from typing import Annotated, Dict
 
-from fastapi import Request, Depends, HTTPException
+from fastapi import Request, Depends
 from sqlalchemy.ext.asyncio import AsyncSession
 import fastapi
 
-from app.schemas.tier import (
+from ...schemas.tier import (
     TierRead,
     TierCreate,
     TierCreateInternal,
     TierUpdate
 )
-from app.api.dependencies import get_current_superuser
-from app.core.db.database import async_get_db
-from app.core.exceptions.http_exceptions import DuplicateValueException, NotFoundException
-from app.crud.crud_tier import crud_tiers
-from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
+from ...api.dependencies import get_current_superuser
+from ...core.db.database import async_get_db
+from ...core.exceptions.http_exceptions import DuplicateValueException, NotFoundException
+from ...crud.crud_tier import crud_tiers
+from ...api.paginated import PaginatedListResponse, paginated_response, compute_offset
 
 router = fastapi.APIRouter(tags=["tiers"])
 

src/app/api/v1/users.py

@@ -5,17 +5,17 @@
 from fastapi import Request
 import fastapi
 
-from app.api.dependencies import get_current_user, get_current_superuser
-from app.core.exceptions.http_exceptions import DuplicateValueException, NotFoundException, ForbiddenException
-from app.api.paginated import PaginatedListResponse, paginated_response, compute_offset
-from app.core.db.database import async_get_db
-from app.core.security import get_password_hash, blacklist_token, oauth2_scheme
-from app.crud.crud_users import crud_users
-from app.crud.crud_tier import crud_tiers
-from app.crud.crud_rate_limit import crud_rate_limits
-from app.models.tier import Tier
-from app.schemas.user import UserCreate, UserCreateInternal, UserUpdate, UserRead, UserTierUpdate
-from app.schemas.tier import TierRead
+from ...api.dependencies import get_current_user, get_current_superuser
+from ...core.exceptions.http_exceptions import DuplicateValueException, NotFoundException, ForbiddenException
+from ...api.paginated import PaginatedListResponse, paginated_response, compute_offset
+from ...core.db.database import async_get_db
+from ...core.security import get_password_hash, blacklist_token, oauth2_scheme
+from ...crud.crud_users import crud_users
+from ...crud.crud_tier import crud_tiers
+from ...crud.crud_rate_limit import crud_rate_limits
+from ...models.tier import Tier
+from ...schemas.user import UserCreate, UserCreateInternal, UserUpdate, UserRead, UserTierUpdate
+from ...schemas.tier import TierRead
 
 router = fastapi.APIRouter(tags=["users"])
 

src/app/core/db/crud_token_blacklist.py

@@ -1,6 +1,6 @@
-from app.crud.crud_base import CRUDBase
-from app.core.db.token_blacklist import TokenBlacklist
-from app.core.schemas import TokenBlacklistCreate, TokenBlacklistUpdate
+from ...crud.crud_base import CRUDBase
+from ..db.token_blacklist import TokenBlacklist
+from ..schemas import TokenBlacklistCreate, TokenBlacklistUpdate
 
 CRUDTokenBlacklist = CRUDBase[TokenBlacklist, TokenBlacklistCreate, TokenBlacklistUpdate, TokenBlacklistUpdate, None]
 crud_token_blacklist = CRUDTokenBlacklist(TokenBlacklist)

src/app/core/db/database.py

@@ -3,7 +3,7 @@
 from sqlalchemy.orm import DeclarativeBase, sessionmaker, MappedAsDataclass
 
 
-from app.core.config import settings
+from ..config import settings
 
 class Base(DeclarativeBase, MappedAsDataclass):
     pass

src/app/core/db/token_blacklist.py

@@ -3,7 +3,7 @@
 from sqlalchemy import String, DateTime
 from sqlalchemy.orm import Mapped, mapped_column
 
-from app.core.db.database import Base
+from .database import Base
 
 class TokenBlacklist(Base):
     __tablename__ = "token_blacklist"

src/app/core/security.py

@@ -6,10 +6,10 @@
 from jose import jwt, JWTError
 from fastapi.security import OAuth2PasswordBearer
 
-from app.core.config import settings
-from app.core.schemas import TokenData, TokenBlacklistCreate
-from app.core.db.crud_token_blacklist import crud_token_blacklist
-from app.crud.crud_users import crud_users
+from .config import settings
+from .schemas import TokenData, TokenBlacklistCreate
+from .db.crud_token_blacklist import crud_token_blacklist
+from ..crud.crud_users import crud_users
 
 SECRET_KEY = settings.SECRET_KEY
 ALGORITHM = settings.ALGORITHM

src/app/core/setup.py

@@ -9,12 +9,12 @@
 from arq.connections import RedisSettings
 import anyio
 
-from app.api.dependencies import get_current_superuser
-from app.core.utils import queue
-from app.core.config import settings
-from app.core.db.database import Base
-from app.core.db.database import async_engine as engine
-from app.core.config import (
+from ..api.dependencies import get_current_superuser
+from .utils import queue
+from .config import settings
+from .db.database import Base
+from .db.database import async_engine as engine
+from .config import (
     DatabaseSettings, 
     RedisCacheSettings, 
     AppSettings, 
@@ -24,8 +24,8 @@
     EnvironmentOption,
     EnvironmentSettings
 )
-from app.middleware.client_cache_middleware import ClientCacheMiddleware
-from app.core.utils import cache, rate_limit
+from ..middleware.client_cache_middleware import ClientCacheMiddleware
+from .utils import cache, rate_limit
 
 # -------------- database --------------
 async def create_tables() -> None:

src/app/core/utils/cache.py

@@ -7,7 +7,7 @@
 from fastapi.encoders import jsonable_encoder
 from redis.asyncio import Redis, ConnectionPool
 
-from app.core.exceptions.cache_exceptions import CacheIdentificationInferenceError, InvalidRequestError, MissingClientError
+from ..exceptions.cache_exceptions import CacheIdentificationInferenceError, InvalidRequestError, MissingClientError
 
 pool: ConnectionPool | None = None
 client: Redis | None = None

src/app/core/utils/rate_limit.py

@@ -3,8 +3,8 @@
 from redis.asyncio import Redis, ConnectionPool
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from app.core.logger import logging
-from app.schemas.rate_limit import sanitize_path
+from ...core.logger import logging
+from ...schemas.rate_limit import sanitize_path
 
 logger = logging.getLogger(__name__)