sycommon-python-lib 0.1.56b7__py3-none-any.whl → 0.1.56b9__py3-none-any.whl

sycommon/config/Config.py

@@ -15,10 +15,8 @@ class Config(metaclass=SingletonMeta):
         with open(config_file, 'r', encoding='utf-8') as f:
             self.config = yaml.safe_load(f)
         self.MaxBytes = self.config.get('MaxBytes', 209715200)
-        self.Timeout = self.config.get('Timeout', 300000)
+        self.Timeout = self.config.get('Timeout', 600000)
         self.MaxRetries = self.config.get('MaxRetries', 3)
-        self.OCR = self.config.get('OCR', None)
-        self.INVOICE_OCR = self.config.get('INVOICE_OCR', None)
         self.llm_configs = []
         self.embedding_configs = []
         self.reranker_configs = []

sycommon/middleware/traceid.py

@@ -11,8 +11,7 @@ def setup_trace_id_handler(app):
     @app.middleware("http")
     async def trace_id_and_log_middleware(request: Request, call_next):
         # ========== 1. 请求阶段：获取/生成 TraceID ==========
-        trace_id = request.headers.get(
-            "x-traceId-header") or request.headers.get("x-traceid-header")
+        trace_id = request.headers.get("x-traceid-header")
         if not trace_id:
             trace_id = Snowflake.id
 
@@ -101,15 +100,15 @@ def setup_trace_id_handler(app):
             # 处理 SSE (Server-Sent Events)
             if "text/event-stream" in response_content_type:
                 try:
-                    response.headers["x-traceId-header"] = trace_id
+                    response.headers["x-traceid-header"] = trace_id
                     expose_headers = response.headers.get(
                         "access-control-expose-headers", "")
                     if expose_headers:
-                        if "x-traceId-header" not in expose_headers.lower():
+                        if "x-traceid-header" not in expose_headers.lower():
                             response.headers[
-                                "access-control-expose-headers"] = f"{expose_headers}, x-traceId-header"
+                                "access-control-expose-headers"] = f"{expose_headers}, x-traceid-header"
                     else:
-                        response.headers["access-control-expose-headers"] = "x-traceId-header"
+                        response.headers["access-control-expose-headers"] = "x-traceid-header"
 
                     # SSE 必须移除 Content-Length
                     headers_lower = {
@@ -120,12 +119,12 @@ def setup_trace_id_handler(app):
                     # 流式响应头只读处理
                     new_headers = dict(response.headers) if hasattr(
                         response.headers, 'items') else {}
-                    new_headers["x-traceId-header"] = trace_id
+                    new_headers["x-traceid-header"] = trace_id
                     if "access-control-expose-headers" in new_headers:
-                        if "x-traceId-header" not in new_headers["access-control-expose-headers"].lower():
-                            new_headers["access-control-expose-headers"] += ", x-traceId-header"
+                        if "x-traceid-header" not in new_headers["access-control-expose-headers"].lower():
+                            new_headers["access-control-expose-headers"] += ", x-traceid-header"
                     else:
-                        new_headers["access-control-expose-headers"] = "x-traceId-header"
+                        new_headers["access-control-expose-headers"] = "x-traceid-header"
                     new_headers.pop("content-length", None)
                     response.init_headers(new_headers)
 
@@ -158,18 +157,18 @@ def setup_trace_id_handler(app):
                 delete_keys={'content-length', 'accept', 'content-type'}
             )
 
-            # 强制加入 x-traceId-header
-            merged_headers["x-traceId-header"] = trace_id
+            # 强制加入 x-traceid-header
+            merged_headers["x-traceid-header"] = trace_id
             merged_headers.update(cors_headers)
 
             # 更新暴露头
             expose_headers = merged_headers.get(
                 "access-control-expose-headers", "")
             if expose_headers:
-                if "x-traceId-header" not in expose_headers.lower():
-                    merged_headers["access-control-expose-headers"] = f"{expose_headers}, x-traceId-header"
+                if "x-traceid-header" not in expose_headers.lower():
+                    merged_headers["access-control-expose-headers"] = f"{expose_headers}, x-traceid-header"
             else:
-                merged_headers["access-control-expose-headers"] = "x-traceId-header"
+                merged_headers["access-control-expose-headers"] = "x-traceid-header"
 
             # 应用 Headers
             if hasattr(response.headers, 'clear'):
@@ -212,7 +211,7 @@ def setup_trace_id_handler(app):
                             media_type=response.media_type
                         )
                         response.headers["content-length"] = str(len(new_body))
-                        response.headers["x-traceId-header"] = trace_id
+                        response.headers["x-traceid-header"] = trace_id
                         # 恢复 CORS
                         for k, v in cors_headers.items():
                             response.headers[k] = v
@@ -226,7 +225,7 @@ def setup_trace_id_handler(app):
                         )
                         response.headers["content-length"] = str(
                             len(response_body))
-                        response.headers["x-traceId-header"] = trace_id
+                        response.headers["x-traceid-header"] = trace_id
                         for k, v in cors_headers.items():
                             response.headers[k] = v
                 else:
@@ -239,7 +238,7 @@ def setup_trace_id_handler(app):
                     )
                     response.headers["content-length"] = str(
                         len(response_body))
-                    response.headers["x-traceId-header"] = trace_id
+                    response.headers["x-traceid-header"] = trace_id
                     for k, v in cors_headers.items():
                         response.headers[k] = v
             except StopAsyncIteration:
@@ -255,11 +254,11 @@ def setup_trace_id_handler(app):
 
             # 兜底：确保 Header 必有 TraceId
             try:
-                response.headers["x-traceId-header"] = trace_id
+                response.headers["x-traceid-header"] = trace_id
             except AttributeError:
                 new_headers = dict(response.headers) if hasattr(
                     response.headers, 'items') else {}
-                new_headers["x-traceId-header"] = trace_id
+                new_headers["x-traceid-header"] = trace_id
                 if hasattr(response, "init_headers"):
                     response.init_headers(new_headers)