sycommon-python-lib 0.1.52a0__tar.gz → 0.1.54__tar.gz

{sycommon_python_lib-0.1.52a0 → sycommon_python_lib-0.1.54}/PKG-INFO

@@ -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 → sycommon_python_lib-0.1.54}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.52-alpha"
+version = "0.1.54"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -12,7 +12,7 @@ dependencies = [
     "kafka-python>=2.2.16",
     "loguru>=0.7.3",
     "mysql-connector-python>=9.5.0",
-    "nacos-sdk-python>=2.0.9",
+    "nacos-sdk-python>=2.0.9,<3.0",
     "pydantic>=2.12.4",
     "python-dotenv>=1.2.1",
     "pyyaml>=6.0.3",

{sycommon_python_lib-0.1.52a0 → sycommon_python_lib-0.1.54}/src/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_python_lib-0.1.52a0 → sycommon_python_lib-0.1.54}/src/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_python_lib-0.1.52a0 → sycommon_python_lib-0.1.54}/src/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_python_lib-0.1.52a0 → sycommon_python_lib-0.1.54}/src/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 → sycommon_python_lib-0.1.54}/src/sycommon_python_lib.egg-info/PKG-INFO

@@ -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 → sycommon_python_lib-0.1.54}/src/sycommon_python_lib.egg-info/requires.txt

@@ -5,7 +5,7 @@ fastapi>=0.121.2
 kafka-python>=2.2.16
 loguru>=0.7.3
 mysql-connector-python>=9.5.0
-nacos-sdk-python>=2.0.9
+nacos-sdk-python<3.0,>=2.0.9
 pydantic>=2.12.4
 python-dotenv>=1.2.1
 pyyaml>=6.0.3