internal 1.0.130__tar.gz → 1.1.2__tar.gz

{internal-1.0.130 → internal-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.0.130
+Version: 1.1.2
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com
@@ -16,6 +16,7 @@ Requires-Dist: dictdiffer (>=0.9.0,<0.10.0)
 Requires-Dist: fastapi (>=0.115.6,<0.116.0)
 Requires-Dist: httpx (>=0.28.1,<0.29.0)
 Requires-Dist: pydantic-settings (>=2.7.1,<3.0.0)
+Requires-Dist: pytest (>=8.4.1,<9.0.0)
 Requires-Dist: redis (>=5.2.1,<6.0.0)
 Requires-Dist: uvicorn (>=0.34.0,<0.35.0)
 Requires-Dist: watchtower (>=3.3.1,<4.0.0)

{internal-1.0.130 → internal-1.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.0.130"
+version = "1.1.2"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"
@@ -20,6 +20,7 @@ dictdiffer = "^0.9.0"
 redis = "^5.2.1"
 uvicorn = "^0.34.0"
 asgi-correlation-id = "^4.3.4"
+pytest = "^8.4.1"
 
 [build-system]
 requires = ["poetry-core"]

{internal-1.0.130 → internal-1.1.2}/src/internal/http/requests.py

@@ -44,10 +44,10 @@ async def async_request(app: FastAPI, method, url, current_user: dict = None,
             if "json" in kwargs:
                 kwargs["json"] = jsonable_encoder(kwargs["json"])
 
-            app.state.logger.info(f"async_request() request, url: {url}, method: {method}, kwargs: {kwargs}")
+            app.state.logger.info(f"async_request() request, url: {method} {url} \nkwargs: {kwargs}")
             response = await client.request(method, url, **kwargs)
             app.state.logger.info(
-                f"async_request() response, url: {url}, method: {method}, kwargs: {kwargs}, response: {response}, response.text: {response.text}")
+                f"async_request() response, url: {method} {url} \nkwargs: {kwargs} \n\nresponse.status_code: {response.status_code} \nresponse.text: {response.text}")
             return response
     except httpx.TimeoutException as exc:
         app.state.logger.warn(

{internal-1.0.130 → internal-1.1.2}/src/internal/middleware/log_request.py

@@ -28,14 +28,12 @@ class LogRequestMiddleware(BaseHTTPMiddleware):
         params = {k: v[0] if len(v) == 1 else v for k, v in temp.items()}
 
         body = await request.body()
-        self.logger.info(
-            f"[Request id: {request_id}] Method: {method}, URL: {url} - Headers: {headers} - Params: {params} - Body: {body} start processing...")
+        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nHeaders: {headers} \nstart processing...")
 
         # 记录请求处理时间
         start_time = time.time()
         response = await call_next(request)
         process_time = time.time() - start_time
 
-        self.logger.info(
-            f"[Request id: {request_id}] Method: {method}, URL: {url} - Headers: {headers} - Params: {params} - Body: {body}, Completed in {process_time:.4f} seconds")
+        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body} \nCompleted in {process_time:.4f} seconds")
         return response