internal 1.1.39__tar.gz → 1.1.39.2__tar.gz

{internal-1.1.39 → internal-1.1.39.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: internal
-Version: 1.1.39
+Version: 1.1.39.2
 Summary: 
 Author: Ray
 Author-email: ray@cruisys.com

{internal-1.1.39 → internal-1.1.39.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "internal"
-version = "1.1.39"
+version = "1.1.39.2"
 description = ""
 authors = [{ name = "Ray", email = "ray@cruisys.com" }]
 readme = "README.md"

{internal-1.1.39 → internal-1.1.39.2}/src/internal/common_enum/operator_type.py

@@ -7,3 +7,4 @@ class OperatorTypeEnum(str, Enum):
     CUSTOMER = "customer"
     PROVIDER = "provider"
     CLIENT = "client"
+    ADMIN = "admin"

{internal-1.1.39 → internal-1.1.39.2}/src/internal/middleware/log_request.py

@@ -1,3 +1,4 @@
+import json
 import logging
 import time
 
@@ -42,12 +43,48 @@ class LogRequestMiddleware(BaseHTTPMiddleware):
                 # 如果解碼失敗，顯示原始 bytes
                 body_str = str(body)
 
-        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body_str} \nHeaders: {headers} \nstart processing...")
+        request_info = {
+            "request_id": request_id,
+            "method": method,
+            "url": url,
+            "params": params,
+            "body": body_str,
+            "content_type": content_type,
+            "user_agent": headers.get("user-agent", "")
+        }
+        self.logger.info(f"Request started: {json.dumps(request_info, ensure_ascii=False)}")
 
         # 记录请求处理时间
         start_time = time.time()
-        response = await call_next(request)
-        process_time = time.time() - start_time
+        try:
+            response = await call_next(request)
+            process_time = time.time() - start_time
+            status_code = response.status_code
 
-        self.logger.info(f"[Request id: {request_id}] \nURL: {method} {url} \nParams: {params} \nBody: {body_str} \nCompleted in {process_time:.4f} seconds")
-        return response
+            # 记录成功响应
+            response_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "status_code": status_code,
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.info(f"Request completed: {json.dumps(response_info, ensure_ascii=False)}")
+
+            return response
+
+        except Exception as e:
+            process_time = time.time() - start_time
+
+            # 记录异常
+            error_info = {
+                "request_id": request_id,
+                "method": method,
+                "url": url,
+                "error": str(e),
+                "process_time": round(process_time, 4)
+            }
+
+            self.logger.error(f"Request failed: {json.dumps(error_info, ensure_ascii=False)}")
+            raise