Merge pull request #2 from sumaro2101/develop

New features

Author: sumaro2101

.env.sample

@@ -14,4 +14,12 @@ DB_PORT=5432
 RMQ_HOST=rabbitmq
 RMQ_PORT=5672
 RABBITMQ_DEFAULT_USER=guest
-RABBITMQ_DEFAULT_PASS=guest
+RABBITMQ_DEFAULT_PASS=guest
+# ==================ORIGINS==================
+CURRENT_ORIGIN=http://locahost:8080
+# ==================GRAFANA==================
+GF_SECURITY_ADMIN_USER=admin
+GF_SECURITY_ADMIN_PASSWORD=admin
+# ==================CADDY==================
+ADMIN_USER=admin
+ADMIN_PASSWORD=admin

api_v1/__init__.py

@@ -1,3 +1,4 @@
-from .routers import router
+from .routers import register_routers
 
-__all__ = ('router',)
+
+__all__ = ('register_routers',)

api_v1/exeptions.py

@@ -0,0 +1,9 @@
+from starlette.exceptions import HTTPException
+
+
+class ValidationError(HTTPException):
+    """
+    Исключение вызванное проблемами с валидацией
+    """
+    
+    pass

api_v1/routers.py

@@ -1,4 +1,11 @@
-from fastapi import APIRouter
+from fastapi import FastAPI
 
+from config import settings
+from api_v1.users.views import router as users
 
-router = APIRouter(prefix='/api/v1')
+
+def register_routers(app: FastAPI) -> None:
+    app.include_router(
+        router=users,
+        prefix=settings.API_PREFIX,
+        )

config/rabbitmq/__init__.py api_v1/users/__init__.pyconfig/rabbitmq/__init__.py renamed to api_v1/users/__init__.py

@@ -0,0 +1,22 @@
+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',
+                   tags=['Users'],
+                   )
+
+
+@router.get(path='/get',
+            description='Test end point',
+            )
+async def get_user(
+    session: AsyncSession = Depends(db_connection.session_geter),
+    ):
+    session = session
+    raise ValidationError(status_code=status.HTTP_400_BAD_REQUEST,
+                          detail=dict(some='Some is wrong'))

api_v1/users/views.py

@@ -0,0 +1,9 @@
+from .logs_errors import register_errors
+from .middlewares import register_middlewares
+from .prometheus import register_prometheus
+
+
+__all__ = ('register_errors',
+           'register_middlewares',
+           'register_prometheus',
+           )

app_includes/__init__.py

@@ -0,0 +1,76 @@
+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.exeptions import ValidationError
+
+
+def register_errors(app: FastAPI) -> None:
+    @app.exception_handler(ValidationError)
+    async def validation_error_handler(
+        request: Request,
+        exc: ValidationError,
+        ):
+        """
+        Логирование всех ValidationError
+        """
+        logger.opt(exception=True).warning(exc)
+        response = dict(
+            status=False,
+            error_code=exc.status_code,
+            message=exc.detail,
+        )
+        return JSONResponse(response)
+
+    @app.exception_handler(HTTPException)
+    async def http_error_handler(
+        request: Request,
+        exc: HTTPException,
+        ):
+        """
+        Логирование всех HTTPException
+        """
+        logger.opt(exception=True).warning(exc)
+        response = dict(
+            status=False,
+            error_code=exc.status_code,
+            message=exc.detail,
+        )
+        return JSONResponse(response)
+
+    @app.exception_handler(Exception)
+    async def error_handler(
+        request: Request,
+        exc: Exception,
+        ):
+        """
+        Логирование всех Exception
+        """
+        logger.exception(exc)
+        response = dict(
+            status=False,
+            error_code=500,
+            message=HTTPStatus(500).phrase,
+        )
+        return JSONResponse(response)
+
+    @app.exception_handler(StarletteHTTPException)
+    async def validation_error_handler(
+        request: Request,
+        exc: StarletteHTTPException,
+        ):
+        """
+        Логирование всех StarletteHTTPException
+        """
+        logger.opt(exception=True).warning(exc)
+        response = dict(
+            status=False,
+            error_code=exc.status_code,
+            message=exc.detail,
+        )
+        return JSONResponse(response)

app_includes/logs_errors.py

@@ -0,0 +1,19 @@
+from fastapi.middleware.cors import CORSMiddleware
+from fastapi import FastAPI
+
+from config import settings
+
+
+def register_middlewares(app: FastAPI) -> None:
+    """
+    Регистрация middleware
+    """
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=[
+            settings.CURRENT_ORIGIN,
+        ],
+        allow_credentials=True,
+        allow_methods=['*'],
+        allow_headers=['*'],
+    )

app_includes/middlewares.py

@@ -0,0 +1,9 @@
+from fastapi import FastAPI
+from prometheus_fastapi_instrumentator import Instrumentator
+
+
+def register_prometheus(app: FastAPI) -> None:
+    """
+    Регистрация Промитеуса
+    """
+    Instrumentator().instrument(app=app).expose(app=app)