diff --git a/backend/app/main.py b/backend/app/main.py index 2272ae5..2164464 100644 --- a/backend/app/main.py +++ b/backend/app/main.py @@ -1,12 +1,12 @@ -from fastapi import FastAPI, Depends +from contextlib import asynccontextmanager + +from fastapi import Depends, FastAPI from fastapi.middleware.cors import CORSMiddleware +from .middleware.authenticate import authenticate from .providers.db_provider import create_db_and_tables from .routers.houses import router as houses_router from .routers.owners import router as owners_router -from .middleware.authenticate import authenticate - -from contextlib import asynccontextmanager @asynccontextmanager diff --git a/backend/app/middleware/authenticate.py b/backend/app/middleware/authenticate.py index c4b0592..4dc1ea6 100644 --- a/backend/app/middleware/authenticate.py +++ b/backend/app/middleware/authenticate.py @@ -1,7 +1,9 @@ -from fastapi import Request, Depends from typing import Annotated -from ..settings import get_settings + +from fastapi import Depends, Request + from ..repositories.user_repository import UserRepository +from ..settings import get_settings async def authenticate( diff --git a/backend/app/models/house.py b/backend/app/models/house.py index b37da38..9bd08df 100644 --- a/backend/app/models/house.py +++ b/backend/app/models/house.py @@ -1,5 +1,6 @@ -from sqlmodel import SQLModel, Field -from uuid import uuid4, UUID +from uuid import UUID, uuid4 + +from sqlmodel import Field, SQLModel class House(SQLModel, table=True): diff --git a/backend/app/models/owner.py b/backend/app/models/owner.py index 6c54884..a2200b1 100644 --- a/backend/app/models/owner.py +++ b/backend/app/models/owner.py @@ -1,5 +1,6 @@ -from sqlmodel import SQLModel, Field -from uuid import uuid4, UUID +from uuid import UUID, uuid4 + +from sqlmodel import Field, SQLModel class Owner(SQLModel, table=True): diff --git a/backend/app/models/user.py b/backend/app/models/user.py index 929e744..8692ddd 100644 --- a/backend/app/models/user.py +++ b/backend/app/models/user.py @@ -1,5 +1,6 @@ -from sqlmodel import SQLModel, Field -from uuid import uuid4, UUID +from uuid import UUID, uuid4 + +from sqlmodel import Field, SQLModel class User(SQLModel, table=True): diff --git a/backend/app/providers/auth_provider.py b/backend/app/providers/auth_provider.py index 3e4c5c1..a2b0e89 100644 --- a/backend/app/providers/auth_provider.py +++ b/backend/app/providers/auth_provider.py @@ -1,11 +1,9 @@ +from fastapi import Request + from ..errors.not_authenticated import NotAuthenticatedError from ..models.user import User from ..settings import get_settings -from ..repositories.user_repository import UserRepository -from typing import Annotated -from fastapi import Depends, Request - class AuthContext: """ diff --git a/backend/app/providers/db_provider.py b/backend/app/providers/db_provider.py index fa64ff2..9ea4108 100644 --- a/backend/app/providers/db_provider.py +++ b/backend/app/providers/db_provider.py @@ -1,18 +1,13 @@ from collections.abc import AsyncGenerator from contextlib import asynccontextmanager + from sqlalchemy import Engine -from sqlalchemy.ext.asyncio import ( - AsyncConnection, - AsyncEngine, - AsyncSession, - async_sessionmaker, - create_async_engine, -) -from sqlmodel import create_engine, SQLModel +from sqlalchemy.ext.asyncio import (AsyncConnection, AsyncEngine, AsyncSession, + async_sessionmaker, create_async_engine) from sqlalchemy.orm import Session +from sqlmodel import SQLModel, create_engine from ..models.user import User - from ..settings import get_settings settings = get_settings() diff --git a/backend/app/repositories/house_repository.py b/backend/app/repositories/house_repository.py index bc7855d..65d06e2 100644 --- a/backend/app/repositories/house_repository.py +++ b/backend/app/repositories/house_repository.py @@ -1,11 +1,12 @@ -from sqlalchemy.ext.asyncio.session import AsyncSession from typing import Annotated +from uuid import UUID + from fastapi import Depends -from ..providers.db_provider import get_session -from ..models.house import House +from sqlalchemy.ext.asyncio.session import AsyncSession from sqlmodel import select -from uuid import UUID +from ..models.house import House +from ..providers.db_provider import get_session class HouseRepository: diff --git a/backend/app/repositories/user_repository.py b/backend/app/repositories/user_repository.py index 28351a4..6306f77 100644 --- a/backend/app/repositories/user_repository.py +++ b/backend/app/repositories/user_repository.py @@ -1,11 +1,12 @@ -from sqlalchemy.ext.asyncio.session import AsyncSession from typing import Annotated +from uuid import UUID + from fastapi import Depends -from ..providers.db_provider import get_session -from ..models.user import User +from sqlalchemy.ext.asyncio.session import AsyncSession from sqlmodel import select -from uuid import UUID +from ..models.user import User +from ..providers.db_provider import get_session class UserRepository: diff --git a/backend/app/routers/owners.py b/backend/app/routers/owners.py index b88b7e3..9eb9b98 100644 --- a/backend/app/routers/owners.py +++ b/backend/app/routers/owners.py @@ -1,11 +1,12 @@ -from fastapi import APIRouter, Depends from typing import Annotated + +from fastapi import APIRouter, Depends + +from ..dtos.owner_detail_response import OwnerDetailResponse +from ..dtos.owner_list_response import OwnerListResponse, OwnerResponse from ..repositories.owner_repository import OwnerRepository from ..repositories.user_repository import UserRepository -from ..dtos.owner_list_response import OwnerListResponse, OwnerResponse -from ..dtos.owner_detail_response import OwnerDetailResponse - router = APIRouter() diff --git a/backend/app/services/house_price_predictor.py b/backend/app/services/house_price_predictor.py index b6c66f7..bb23d33 100644 --- a/backend/app/services/house_price_predictor.py +++ b/backend/app/services/house_price_predictor.py @@ -1,6 +1,6 @@ import random -from typing import List from dataclasses import dataclass +from typing import List @dataclass diff --git a/backend/app/settings.py b/backend/app/settings.py index c6cd66d..887d7e1 100644 --- a/backend/app/settings.py +++ b/backend/app/settings.py @@ -1,11 +1,10 @@ +import os from functools import lru_cache +from dotenv import load_dotenv from pydantic import Field from pydantic_settings import BaseSettings -from dotenv import load_dotenv -import os - load_dotenv()