fix little problems

Author: sumaro2101

api_v1/__init__.py

@@ -1,7 +1,4 @@
 from .routers import register_routers
-from exeptions import ValidationError
 
 
-__all__ = ('register_routers',
-           'ValidationError',
-           )
+__all__ = ('register_routers',)

api_v1/users/views.py

@@ -1,8 +1,9 @@
-from fastapi import APIRouter, Depends
+from fastapi import APIRouter, Depends, status
 
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from config import db_connection
+from api_v1.exeptions import ValidationError
 
 
 router = APIRouter(prefix='/users',
@@ -17,4 +18,5 @@ async def get_user(
     session: AsyncSession = Depends(db_connection.session_geter),
     ):
     session = session
-    return {'user': 'is_work'}
+    raise ValidationError(status_code=status.HTTP_400_BAD_REQUEST,
+                          detail=dict(some='Some is wrong'))

app_includes/logs_errors.py

@@ -1,12 +1,13 @@
 import json
 from fastapi import FastAPI, Request
+from fastapi.responses import JSONResponse
 from fastapi.exceptions import HTTPException
 from starlette.exceptions import HTTPException as StarletteHTTPException
 
 from http import HTTPStatus
 
 from config.setup_logs.logging import logger
-from api_v1 import ValidationError
+from api_v1.exeptions import ValidationError
 
 
 def register_errors(app: FastAPI) -> None:
@@ -24,8 +25,7 @@ async def validation_error_handler(
             error_code=422,
             message=exc.detail,
         )
-        json_response = json.dumps(response).encode(encoding='utf-8')
-        return json_response
+        return JSONResponse(response)
 
     @app.exception_handler(HTTPException)
     async def http_error_handler(
@@ -41,8 +41,7 @@ async def http_error_handler(
             error_code=exc.status_code,
             message=exc.detail,
         )
-        json_response = json.dumps(response).encode(encoding='utf-8')
-        return json_response
+        return JSONResponse(response)
 
     @app.exception_handler(Exception)
     async def error_handler(
@@ -58,8 +57,7 @@ async def error_handler(
             error_code=500,
             message=HTTPStatus(500).phrase,
         )
-        json_response = json.dumps(response).encode(encoding='utf-8')
-        return json_response
+        return JSONResponse(response)
 
     @app.exception_handler(StarletteHTTPException)
     async def validation_error_handler(
@@ -75,5 +73,4 @@ async def validation_error_handler(
             error_code=exc.status_code,
             message=exc.detail,
         )
-        json_response = json.dumps(response).encode(encoding='utf-8')
-        return json_response
+        return JSONResponse(response)

config/config.py

@@ -4,7 +4,7 @@
 from starlette.config import Config
 
 
-base_dir = Path(__file__).resolve().parent.parent.parent
+base_dir = Path(__file__).resolve().parent.parent
 log_dir = base_dir.joinpath('logs')
 
 

config/setup_logs/__init__.py

@@ -1,4 +0,0 @@
-from .logging import create_log_dirs
-
-
-__all__ = ('create_log_dirs',)

config/setup_logs/logging.py

@@ -4,21 +4,13 @@
 from config import settings
 
 
-log_dir = settings.LOG_DIR
-
-
-def create_log_dirs() -> None:
-    """
-    Создание корневой папки для логов
-    """    
-    log_directory = settings.LOG_DIR
-    log_directory.mkdir(parents=True, exist_ok=True)
-
+log_directory = settings.LOG_DIR
+log_directory.mkdir(parents=True, exist_ok=True)
 
 logger.remove()
 
 logger.add(
-    log_dir.joinpath('access.log'),
+    log_directory.joinpath('access.log'),
     rotation='15MB',
     format='{time:YYYY-MM-DD HH:mm:ss} - {level} - {message}',
     encoding='utf-8',
@@ -31,7 +23,7 @@ def create_log_dirs() -> None:
 )
 
 logger.add(
-    log_dir.joinpath('error.log'),
+    log_directory.joinpath('error.log'),
     rotation='15MB',
     format='{time:YYYY-MM-DD HH:mm:ss} - {level} - {message}',
     encoding='utf-8',

main.py

@@ -4,15 +4,13 @@
 from config import db_connection, BaseModel
 from api_v1 import register_routers
 from app_includes import register_errors
-from config.setup_logs import create_log_dirs
 
 
 
 def start_app() -> FastAPI:
     """
     Создание приложения со всеми настройками
     """
-    create_log_dirs()
     app = FastAPI(lifespan=lifespan)
     register_routers(app=app)
     register_errors(app=app)