sycommon-python-lib 0.1.52a0__py3-none-any.whl → 0.1.54__py3-none-any.whl

sycommon/logging/kafka_log.py

@@ -459,7 +459,7 @@ class SYLogger:
 
     @staticmethod
     def _log(msg: any, level: str = "INFO"):
-        trace_id = SYLogger.get_trace_id()
+        trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
 
         if isinstance(msg, dict) or isinstance(msg, list):
             msg_str = json.dumps(msg, ensure_ascii=False)
@@ -521,7 +521,7 @@ class SYLogger:
     @staticmethod
     def exception(msg: any, *args, **kwargs):
         """记录异常信息，包括完整堆栈"""
-        trace_id = SYLogger.get_trace_id()
+        trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
 
         if isinstance(msg, dict) or isinstance(msg, list):
             msg_str = json.dumps(msg, ensure_ascii=False)

sycommon/middleware/middleware.py

@@ -27,7 +27,7 @@ class Middleware:
         # app = setup_monitor_memory_middleware(app)
 
         # 设置cors
-        # app = setup_cors_handler(app)
+        app = setup_cors_handler(app)
 
         # 健康检查
         app = setup_health_handler(app)

sycommon/synacos/feign.py

@@ -2,6 +2,8 @@ import io
 import os
 import time
 
+from sycommon.tools.snowflake import Snowflake
+
 import aiohttp
 from sycommon.logging.kafka_log import SYLogger
 from sycommon.synacos.nacos_service import NacosService
@@ -23,7 +25,7 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
         # 初始化headers，确保是可修改的字典
         headers = headers.copy() if headers else {}
         if "x-traceId-header" not in headers:
-            headers["x-traceId-header"] = SYLogger.get_trace_id()
+            headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.next_id()
 
         # 处理JSON请求的Content-Type
         is_json_request = method.upper() in ["POST", "PUT", "PATCH"] and not (

sycommon/synacos/feign_client.py

@@ -5,6 +5,8 @@ import inspect
 from typing import Any, Dict, Optional, Literal, Type, TypeVar
 from urllib.parse import urljoin
 
+from sycommon.tools.snowflake import Snowflake
+
 import aiohttp
 from pydantic import BaseModel
 from sycommon.synacos.param import Body, Cookie, File, Form, Header, Param, Path, Query
@@ -26,7 +28,7 @@ def feign_client(
     default_headers: Optional[Dict[str, str]] = None
 ):
     default_headers = default_headers or {}
-    default_headers["x-traceId-header"] = SYLogger.get_trace_id()
+    default_headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.next_id()
 
     def decorator(cls):
         class FeignClient:
@@ -153,7 +155,7 @@ def feign_client(
             def _build_headers(self, param_meta: Dict[str, Param], bound_args: Dict[str, Any], method_headers: Dict[str, str]) -> Dict[str, str]:
                 headers = self.default_headers.copy()
                 headers.update(method_headers)
-                headers["x-traceId-header"] = SYLogger.get_trace_id()
+                headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.next_id()
                 for name, meta in param_meta.items():
                     if isinstance(meta, Header) and name in bound_args:
                         value = bound_args[name]

{sycommon_python_lib-0.1.52a0.dist-info → sycommon_python_lib-0.1.54.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.52a0
+Version: 0.1.54
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -11,7 +11,7 @@ Requires-Dist: fastapi>=0.121.2
 Requires-Dist: kafka-python>=2.2.16
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.5.0
-Requires-Dist: nacos-sdk-python>=2.0.9
+Requires-Dist: nacos-sdk-python<3.0,>=2.0.9
 Requires-Dist: pydantic>=2.12.4
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3

{sycommon_python_lib-0.1.52a0.dist-info → sycommon_python_lib-0.1.54.dist-info}/RECORD

@@ -15,7 +15,7 @@ sycommon/health/health_check.py,sha256=EhfbhspRpQiKJaxdtE-PzpKQO_ucaFKtQxIm16F5M
 sycommon/health/metrics.py,sha256=fHqO73JuhoZkNPR-xIlxieXiTCvttq-kG-tvxag1s1s,268
 sycommon/health/ping.py,sha256=FTlnIKk5y1mPfS1ZGOeT5IM_2udF5aqVLubEtuBp18M,250
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/logging/kafka_log.py,sha256=qHq4sU42aGrTm9DWYKxGDp1pe9ENfYSbzI4iPDPNvJQ,21128
+sycommon/logging/kafka_log.py,sha256=Ctjpch9clULhRcSKFVlAjXDmEZ63KVHqch4xzXAQZdQ,21174
 sycommon/logging/logger_wrapper.py,sha256=TiHsrIIHiQMzXgXK12-0KIpU9GhwQJOoHslakzmq2zc,357
 sycommon/logging/sql_logger.py,sha256=aEU3OGnI_51Tjyuuf4FpUi9KPTceFRuKAOyQbPzGhzM,2021
 sycommon/middleware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -23,7 +23,7 @@ sycommon/middleware/context.py,sha256=_5ghpv4u_yAvjkgM-XDx8OnO-YI1XtntHrXsHJHZkw
 sycommon/middleware/cors.py,sha256=0B5d_ovD56wcH9TfktRs88Q09R9f8Xx5h5ALWYvE8Iw,600
 sycommon/middleware/docs.py,sha256=bVdDBIHXGVBv562MQLSroa1DgHoObxR9gFzv71PIejg,1187
 sycommon/middleware/exception.py,sha256=Bk8IchNND1wg6tUX9hf4xWeEJhvA-E_zE9ysBpRZrqE,3010
-sycommon/middleware/middleware.py,sha256=zRa8vn5BIjI_hIGTwHhDAIFbBUkCPTPfxKfAKDLQJ5Q,1449
+sycommon/middleware/middleware.py,sha256=SzZ4wufSNdwC4Ppw99TE7a6AVGkrZRc55NHSrA3PiC8,1447
 sycommon/middleware/monitor_memory.py,sha256=pYRK-wRuDd6enSg9Pf8tQxPdYQS6S0AyjyXeKFRLKEs,628
 sycommon/middleware/mq.py,sha256=4wBqiT5wJGcrfjk2GSr0_U3TStBxoNpHTzcRxVlMEHE,183
 sycommon/middleware/timeout.py,sha256=fImlAPLm4Oa8N9goXtT_0os1GZPCi9F92OgXU81DgDU,656
@@ -44,16 +44,16 @@ sycommon/sse/sse.py,sha256=__CfWEcYxOxQ-HpLor4LTZ5hLWqw9-2X7CngqbVHsfw,10128
 sycommon/synacos/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/synacos/example.py,sha256=61XL03tU8WTNOo3FUduf93F2fAwah1S0lbH1ufhRhRk,5739
 sycommon/synacos/example2.py,sha256=adUaru3Hy482KrOA17DfaC4nwvLj8etIDS_KrWLWmCU,4811
-sycommon/synacos/feign.py,sha256=xlC88_X0bM7C0FJlyRrZetzkC1OJSLBk3BEsGVbTcKk,7840
-sycommon/synacos/feign_client.py,sha256=UxdYNW-oZVYIEwNBfIfVNPl_gppiYzPxp9ApDgQu0PY,15341
+sycommon/synacos/feign.py,sha256=oRc6f_dc0G1nhx9Hf36VBgZ44wT6WrqZ_W1-XbyBWcA,7911
+sycommon/synacos/feign_client.py,sha256=qEJNQFX5irDnD6VwN79im42h9FKzoELPmdEAXzgwPT0,15435
 sycommon/synacos/nacos_service.py,sha256=2m1ZxIii3r657kQJfp7C7I5bxBUEGDweYMfloUUmBSw,35389
 sycommon/synacos/param.py,sha256=KcfSkxnXOa0TGmCjY8hdzU9pzUsA8-4PeyBKWI2-568,1765
 sycommon/tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/tools/docs.py,sha256=OPj2ETheuWjXLyaXtaZPbwmJKfJaYXV5s4XMVAUNrms,1607
 sycommon/tools/snowflake.py,sha256=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.52a0.dist-info/METADATA,sha256=YH2I7_srWCFERY9nRgwk1-H8DsL3vD-StIuRQiYEj4E,7039
-sycommon_python_lib-0.1.52a0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.52a0.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.52a0.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.52a0.dist-info/RECORD,,
+sycommon_python_lib-0.1.54.dist-info/METADATA,sha256=KIB7K7bDqU0GKNM_p_PW6X547vqe4RM_hoaVi65C5aA,7042
+sycommon_python_lib-0.1.54.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.54.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.54.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.54.dist-info/RECORD,,