arpakitlib 1.8.227__tar.gz → 1.8.229__tar.gz

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.227
+Version: 1.8.229
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

arpakitlib-1.8.229/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -0,0 +1,4 @@
+{
+  "arpakitlib_project_template_version": "5",
+  "arpakitlib_project_template_subversion": "58"
+}

arpakitlib-1.8.227/arpakitlib/_arpakit_project_template_v_5/project/api/const.py → arpakitlib-1.8.229/arpakitlib/_arpakit_project_template_v_5/project/api/api_error_codes.py

@@ -7,6 +7,9 @@ class APIErrorCodes(Enumeration):
     error_in_request = "ERROR_IN_REQUEST"
     not_found = "NOT_FOUND"
 
+    class Common(Enumeration):
+        content_length_is_too_big = "content_length_is_too_big".upper()
+
 
 class APIErrorSpecificationCodes(Enumeration):
     pass

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/authorize.py

@@ -12,7 +12,7 @@ from sqlalchemy.orm import joinedload
 
 from arpakitlib.ar_func_util import is_async_func, is_sync_func
 from arpakitlib.ar_json_util import transfer_data_to_json_str_to_data
-from project.api.const import APIErrorCodes
+from project.api.api_error_codes import APIErrorCodes
 from project.api.exception import APIException
 from project.core.settings import get_cached_settings
 from project.sqlalchemy_db_.sqlalchemy_db import get_cached_sqlalchemy_db

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/create_api_app.py

@@ -8,6 +8,7 @@ from fastapi.staticfiles import StaticFiles
 
 from project.api.event import get_startup_api_events, get_shutdown_api_events
 from project.api.exception_handler import add_exception_handler_to_api_app
+from project.api.middleware.add_api_middlewares import add_api_middlewares
 from project.api.openapi_ui import add_local_openapi_ui_to_api_app
 from project.api.router.main_router import main_api_router
 from project.core.const import ProjectPaths
@@ -38,13 +39,7 @@ def create_api_app(*, prefix: str = "/api") -> FastAPI:
         },
     )
 
-    api_app.add_middleware(
-        CORSMiddleware,
-        allow_origins=["*"],
-        allow_credentials=True,
-        allow_methods=["*"],
-        allow_headers=["*"],
-    )
+    add_api_middlewares(app=api_app)
 
     add_local_openapi_ui_to_api_app(
         app=api_app,

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/exception.py

@@ -2,7 +2,7 @@ from typing import Any
 
 import fastapi.security
 
-from project.api.const import APIErrorCodes
+from project.api.api_error_codes import APIErrorCodes
 from project.api.schema.out.common.error import ErrorCommonSO
 
 

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/exception_handler.py

@@ -11,7 +11,7 @@ from arpakitlib.ar_datetime_util import now_utc_dt
 from arpakitlib.ar_dict_util import combine_dicts
 from arpakitlib.ar_exception_util import exception_to_traceback_str
 from arpakitlib.ar_func_util import raise_if_not_async_func, is_async_func, is_sync_func
-from project.api.const import APIErrorCodes
+from project.api.api_error_codes import APIErrorCodes
 from project.api.exception import APIException
 from project.api.response import APIJSONResponse
 from project.api.schema.out.common.error import ErrorCommonSO
@@ -175,7 +175,7 @@ def logging_func_before_in_api_exception_handler(
             return
 
         if isinstance(exception, APIException):
-            if exception.kwargs_.get("logging") is False:
+            if exception.kwargs_.get("logging_full_error") is False:
                 return
 
         _logger.exception(exception)

arpakitlib-1.8.229/arpakitlib/_arpakit_project_template_v_5/project/api/middleware/add_api_middlewares.py

@@ -0,0 +1,15 @@
+from fastapi import FastAPI
+from starlette.middleware.cors import CORSMiddleware
+
+from project.api.middleware.limit_content_length import LimitContentLengthMiddleware
+
+
+def add_api_middlewares(*, app: FastAPI):
+    app.add_middleware(
+        CORSMiddleware,
+        allow_origins=["*"],
+        allow_credentials=True,
+        allow_methods=["*"],
+        allow_headers=["*"],
+    )
+    app.add_middleware(LimitContentLengthMiddleware, max_body_size=5 * 1024 * 1024)

arpakitlib-1.8.229/arpakitlib/_arpakit_project_template_v_5/project/api/middleware/limit_content_length.py

@@ -0,0 +1,53 @@
+import uvicorn
+from fastapi import FastAPI, Request
+from starlette import status
+from starlette.middleware.base import BaseHTTPMiddleware
+from starlette.responses import JSONResponse
+
+from project.api.api_error_codes import APIErrorCodes
+from project.api.schema.out.common.error import ErrorCommonSO
+
+
+class LimitContentLengthMiddleware(BaseHTTPMiddleware):
+    def __init__(
+            self,
+            *
+            app,
+            max_body_size: int = 10 * 1024 * 1024  # 10 mb
+    ):
+        super().__init__(app)
+        self.max_body_size = max_body_size
+
+    async def dispatch(self, request: Request, call_next):
+        content_length = request.headers.get("content-length")
+        if content_length is None:
+            return await call_next(request)
+        if isinstance(content_length, str) and not content_length.isdigit():
+            return await call_next(request)
+        content_length = int(content_length)
+        if content_length > self.max_body_size:
+            return JSONResponse(
+                status_code=status.HTTP_413_REQUEST_ENTITY_TOO_LARGE,
+                content=ErrorCommonSO(
+                    has_error=True,
+                    error_code=APIErrorCodes.Common.content_length_is_too_big
+                ).model_dump_json()
+            )
+
+        return await call_next(request)
+
+
+def __example():
+    app = FastAPI()
+    app.add_middleware(LimitContentLengthMiddleware)  # 5 MB
+
+    @app.post("/upload")
+    async def upload_file(request: Request):
+        data = await request.body()
+        return {"size": len(data)}
+
+    uvicorn.run(app)
+
+
+if __name__ == '__main__':
+    __example()

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/router/admin/raise_api_exception_3.py

@@ -35,6 +35,6 @@ async def _(
         error_specification_code="3",
         error_description="Simple, logging=False",
         kwargs_={
-            "logging": False
+            "logging_full_error": False
         }
     )

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/arpakitlib/_arpakit_project_template_v_5/project/api/router/general/get_errors_info.py

@@ -2,7 +2,7 @@ import fastapi.requests
 from fastapi import APIRouter
 
 from project.api.authorize import APIAuthorizeData, api_authorize, require_api_key_dbm_api_authorize_middleware
-from project.api.const import APIErrorCodes, APIErrorSpecificationCodes
+from project.api.api_error_codes import APIErrorCodes, APIErrorSpecificationCodes
 from project.api.schema.common import BaseSO
 from project.api.schema.out.common.error import ErrorCommonSO
 

arpakitlib-1.8.229/arpakitlib/_arpakit_project_template_v_5/project/more/api.nginx

@@ -0,0 +1,43 @@
+# main
+server {
+    listen 80;
+    listen [::]:80;
+    server_name api.site.com www.site.com;
+
+    client_max_body_size 10M;
+
+    location / {
+        proxy_pass http://127.0.0.1:8080;
+
+        # базовые прокси-заголовки
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_set_header X-Forwarded-Host $host;
+        proxy_set_header X-Forwarded-Port $server_port;
+
+        # буферизация запроса на стороне nginx (полезно для больших аплоадов)
+        proxy_request_buffering off;
+
+        # таймауты по вкусу (чтобы не висеть вечно)
+        proxy_connect_timeout 3s;
+        proxy_read_timeout 30s;
+        proxy_send_timeout 30s;
+
+        # (необязательно) меньше магии с Location/Redirect от апстрима
+        proxy_redirect off;
+        # proxy_redirect http://127.0.0.1:8080/ /;
+        # proxy_redirect http://backend.local/ https://site.com/;
+
+    }
+}
+
+
+# redirect
+server {
+    listen 80;
+    listen [::]:80;
+    server_name www.site.arpakit.com;
+    return 301 http://site.com$request_uri;
+}

{arpakitlib-1.8.227 → arpakitlib-1.8.229}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "arpakitlib"
-version = "1.8.227"
+version = "1.8.229"
 description = "arpakitlib"
 authors = [
     { name = "arpakit_support", email = "support@arpakit.com" }

arpakitlib-1.8.227/arpakitlib/_arpakit_project_template_v_5/arpakitlib_project_template_info.json

@@ -1,4 +0,0 @@
-{
-  "arpakitlib_project_template_version": "5",
-  "arpakitlib_project_template_subversion": "56"
-}