internal 1.0.6__tar.gz → 1.0.8__tar.gz

{internal-1.0.6 → internal-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: internal
-Version: 1.0.6
+Version: 1.0.8
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.0.6 → internal-1.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "internal"
-version = "1.0.6"
+version = "1.0.8"
 description = ""
 authors = ["Ray <ray@cruisys.com>"]
 readme = "README.md"

{internal-1.0.6 → internal-1.0.8}/src/internal/base_config.py

@@ -8,6 +8,8 @@ class BaseConfig(BaseSettings):
 
     OPEN_API_URL: str = "/openapi.json"
 
+    LOGGER_REQUEST_ENABLE: bool = True
+
     # Request
     REQUEST_VERIFY_SSL: bool = True
     REQUEST_PROXY: str = ''

{internal-1.0.6 → internal-1.0.8}/src/internal/base_factory.py

@@ -18,6 +18,7 @@ from .exception.base_exception import InternalBaseException
 from .ext.amazon import aws
 from .http.requests import async_request
 from .http.responses import async_response
+from .middleware.log_request import LogRequestMiddleware
 from .utils import update_dict_with_cast
 
 
@@ -68,6 +69,9 @@ class BaseFactory(metaclass=ABCMeta):
         self.__setup_cloud_log(app)
         self.__load_cloud_config(app)
 
+        if self.get_app_config().LOGGER_REQUEST_ENABLE:
+            app.add_middleware(LogRequestMiddleware)
+
         mongodb = database.MongoDB(self.get_app_config().DATABASE_USERNAME, self.get_app_config().DATABASE_PASSWORD,
                                    self.get_app_config().DATABASE_HOST, self.get_app_config().DATABASE_PORT,
                                    self.get_app_config().DATABASE_NAME,

internal-1.0.8/src/internal/middleware/log_request.py

@@ -0,0 +1,25 @@
+import time
+
+from fastapi import FastAPI, Request
+from starlette.middleware.base import BaseHTTPMiddleware
+
+
+class LogRequestMiddleware(BaseHTTPMiddleware):
+    def __init__(self, app: FastAPI):
+        super().__init__(app)
+        self.app = app
+
+    async def dispatch(self, request: Request, call_next):
+        # 记录请求的URL和参数
+        url = request.url.path
+        params = dict(request.query_params)
+        body = await request.body()
+        self.app.state.logger.info(f"URL: {url} - Params: {params} - Body: {body}")
+
+        # 记录请求处理时间
+        start_time = time.time()
+        response = await call_next(request)
+        process_time = time.time() - start_time
+
+        self.app.state.logger.info(f"Completed in {process_time:.4f} seconds")
+        return response

{internal-1.0.6 → internal-1.0.8}/src/internal/model/base_model.py

@@ -50,7 +50,7 @@ class InternalBaseDocument(Document):
 
         return page_no, page_size, total_num, page_data
 
-    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[Operate, 'InternalBaseDocument']:
+    async def update_wrap(self, schema: Union[Dict, Type[BaseModel]]) -> Tuple[Operate, 'InternalBaseDocument', 'InternalBaseDocument']:
         if not issubclass(type(schema), dict) and not issubclass(type(schema), BaseModel):
             raise TypeError("Schema must be a subclass of BaseModel or dict")