sycommon-python-lib 0.1.55a0__py3-none-any.whl → 0.1.55b0__py3-none-any.whl

sycommon/logging/kafka_log.py

@@ -114,7 +114,7 @@ class KafkaLogger(metaclass=SingletonMeta):
                     trace_id = None
 
                 if not trace_id:
-                    trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
+                    trace_id = SYLogger.get_trace_id() or Snowflake.id
 
                 # 获取线程/协程信息
                 thread_info = SYLogger._get_execution_context()
@@ -173,7 +173,7 @@ class KafkaLogger(metaclass=SingletonMeta):
                     "className": "",
                     "sqlCost": 0,
                     "size": len(str(message)),
-                    "uid": int(Snowflake.next_id())  # 独立新的id
+                    "uid": int(Snowflake.id)  # 独立新的id
                 }
 
                 # 智能队列管理
@@ -212,7 +212,7 @@ class KafkaLogger(metaclass=SingletonMeta):
             return
 
         # 获取当前的trace_id
-        trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
+        trace_id = SYLogger.get_trace_id() or Snowflake.id
 
         # 构建错误日志
         error_log = {
@@ -459,7 +459,7 @@ class SYLogger:
 
     @staticmethod
     def _log(msg: any, level: str = "INFO"):
-        trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
+        trace_id = SYLogger.get_trace_id() or Snowflake.id
 
         if isinstance(msg, dict) or isinstance(msg, list):
             msg_str = json.dumps(msg, ensure_ascii=False)
@@ -473,7 +473,7 @@ class SYLogger:
         request_log = {}
         if level == "ERROR":
             request_log = {
-                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "trace_id": str(trace_id) if trace_id else Snowflake.id,
                 "message": msg_str,
                 "traceback": traceback.format_exc(),
                 "level": level,
@@ -481,7 +481,7 @@ class SYLogger:
             }
         else:
             request_log = {
-                "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+                "trace_id": str(trace_id) if trace_id else Snowflake.id,
                 "message": msg_str,
                 "level": level,
                 "threadName": thread_info
@@ -521,7 +521,7 @@ class SYLogger:
     @staticmethod
     def exception(msg: any, *args, **kwargs):
         """记录异常信息，包括完整堆栈"""
-        trace_id = SYLogger.get_trace_id() or Snowflake.next_id()
+        trace_id = SYLogger.get_trace_id() or Snowflake.id
 
         if isinstance(msg, dict) or isinstance(msg, list):
             msg_str = json.dumps(msg, ensure_ascii=False)
@@ -533,7 +533,7 @@ class SYLogger:
 
         # 构建包含异常堆栈的日志
         request_log = {
-            "trace_id": str(trace_id) if trace_id else Snowflake.next_id(),
+            "trace_id": str(trace_id) if trace_id else Snowflake.id,
             "message": msg_str,
             "level": "ERROR",
             "threadName": thread_info

sycommon/middleware/traceid.py

@@ -12,7 +12,7 @@ def setup_trace_id_handler(app):
         # 生成或获取 traceId
         trace_id = request.headers.get("x-traceId-header")
         if not trace_id:
-            trace_id = Snowflake.next_id()
+            trace_id = Snowflake.id
 
         # 设置 trace_id 上下文
         token = SYLogger.set_trace_id(trace_id)
@@ -101,9 +101,11 @@ def setup_trace_id_handler(app):
                 if "application/json" in content_type and not content_disposition.startswith("attachment"):
                     try:
                         data = json.loads(response_body)
-                        data["traceId"] = trace_id
-                        new_body = json.dumps(
-                            data, ensure_ascii=False).encode()
+                        new_body = response_body
+                        if data:
+                            data["traceId"] = trace_id
+                            new_body = json.dumps(
+                                data, ensure_ascii=False).encode()
 
                         # 创建新响应，确保Content-Length正确
                         response = Response(

sycommon/synacos/feign.py

@@ -25,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() or Snowflake.next_id()
+            headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.id
 
         # 处理JSON请求的Content-Type
         is_json_request = method.upper() in ["POST", "PUT", "PATCH"] and not (

sycommon/synacos/feign_client.py

@@ -28,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() or Snowflake.next_id()
+    default_headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.id
 
     def decorator(cls):
         class FeignClient:
@@ -155,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() or Snowflake.next_id()
+                headers["x-traceId-header"] = SYLogger.get_trace_id() or Snowflake.id
                 for name, meta in param_meta.items():
                     if isinstance(meta, Header) and name in bound_args:
                         value = bound_args[name]

sycommon/tools/snowflake.py

@@ -3,11 +3,25 @@ import threading
 import socket
 import hashlib
 import random
-from typing import Optional
+from typing import Optional, Type, Any
 from os import environ
 import netifaces
 
 
+class ClassProperty:
+    """
+    自定义类属性描述符，替代 @classmethod + @property 的废弃写法
+    支持通过 类.属性 的方式访问，无需实例化
+    """
+
+    def __init__(self, func):
+        self.func = func
+
+    def __get__(self, instance: Any, cls: Type) -> str:
+        # 调用传入的函数，并传入类本身作为第一个参数
+        return self.func(cls)
+
+
 class Snowflake:
     """雪花算法生成器（无公网依赖，适配内网环境）"""
     START_TIMESTAMP = 1388534400000  # 2014-01-01 00:00:00
@@ -59,23 +73,16 @@ class Snowflake:
             local_ip = self._get_local_internal_ip()
             if local_ip:
                 return self._hash_to_machine_id(local_ip)
-            else:
-                # logger.warning("读取网卡信息成功，但未找到非回环内网IP")
-                pass
-        except Exception as e:
-            # logger.warning(f"读取本机网卡IP失败: {e}，尝试使用主机名")
+        except Exception:
             pass
 
         # 4. 兜底2：获取容器主机名（K8s中默认等于Pod名称，保证唯一）
         hostname = socket.gethostname()
         if hostname:
-            # logger.info(
-            #     f"未读取到POD_NAME/POD_IP/内网IP，使用主机名: {hostname}生成machine_id")
             return self._hash_to_machine_id(hostname)
 
-        # 5. 最终兜底：生成随机数（仅极端情况使用，日志告警）
+        # 5. 最终兜底：生成随机数（仅极端情况使用）
         random_id = random.randint(0, self.MAX_MACHINE_ID)
-        # logger.warning(f"所有方式均失败，使用随机数生成machine_id: {random_id}（可能重复！）")
         return random_id
 
     def _get_local_internal_ip(self) -> Optional[str]:
@@ -92,15 +99,12 @@ class Snowflake:
                 if netifaces.AF_INET in addrs:
                     for addr in addrs[netifaces.AF_INET]:
                         ip = addr.get('addr')
-                        # 过滤回环地址（127.0.0.1）和docker虚拟地址（172.17.0.0/16可选过滤）
+                        # 过滤回环地址（127.0.0.1）
                         if ip and not ip.startswith('127.'):
-                            # 可选：过滤docker0的默认地址段（根据实际内网段调整）
-                            # if not ip.startswith('172.17.'):
                             return ip
             return None
         except ImportError:
-            # 若未安装netifaces，降级为socket方式（仅尝试本地解析，无公网连接）
-            # logger.warning("未安装netifaces库，尝试降级方式获取IP")
+            # 若未安装netifaces，降级为socket方式
             return self._get_local_ip_fallback()
 
     def _get_local_ip_fallback(self) -> Optional[str]:
@@ -110,7 +114,6 @@ class Snowflake:
         try:
             # 创建socket但不连接任何地址，仅绑定到本地
             s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-            # 绑定到0.0.0.0:0（仅用于获取本机IP，不发送数据）
             s.bind(('', 0))
             local_ip = s.getsockname()[0]
             s.close()
@@ -194,28 +197,39 @@ class Snowflake:
         # 生成ID并转为字符串返回
         return str(cls._instance.generate_id())
 
+    @ClassProperty
+    def id(cls) -> str:
+        """
+        直接通过 `Snowflake.id` 属性生成雪花ID（兼容Python 3.11+）
+        :return: 雪花ID字符串
+        """
+        return cls.next_id()
+
 
 if __name__ == "__main__":
-    # 生成1000个ID并验证
-    id_set = set()  # 用于检测重复ID
+    print("=== 兼容Python 3.11+的属性方式生成雪花ID ===")
+    # 直接访问 Snowflake.id 即可生成，无废弃警告
+    id1 = Snowflake.id
+    id2 = Snowflake.id
+    id3 = Snowflake.id
+    print(f"生成ID1: {id1}")
+    print(f"生成ID2: {id2}")
+    print(f"生成ID3: {id3}")
+    print(f"ID是否唯一: {len({id1, id2, id3}) == 3}")
+
+    # 原有方式仍可正常使用
+    print("\n=== 原有方法方式生成 ===")
+    id4 = Snowflake.next_id()
+    print(f"生成ID4: {id4}")
+
+    # 批量验证（1000个唯一ID）
+    id_set = set()
     _MAX_JAVA_LONG = 9223372036854775807
-
     for i in range(1000):
-        id_str = Snowflake.next_id()
-        id_num = int(id_str)
-
-        # 验证ID不超过Java long最大值
+        snow_id = Snowflake.id  # 全程使用兼容版属性方式
+        id_num = int(snow_id)
         assert id_num <= _MAX_JAVA_LONG, f"ID超过Java long最大值: {id_num}"
+        assert snow_id not in id_set, f"重复生成ID: {snow_id}"
+        id_set.add(snow_id)
 
-        # 验证ID不重复
-        assert id_str not in id_set, f"重复生成ID: {id_str}"
-        id_set.add(id_str)
-
-        # 每100个ID打印一次解析结果
-        if i % 100 == 0:
-            parse_result = Snowflake.parse_id(id_num)
-            print(f"生成ID: {id_str}")
-            print(f"解析结果: {parse_result}")
-            print("-" * 50)
-
-    print(f"成功生成{len(id_set)}个唯一雪花ID，验证通过！")
+    print(f"\n成功生成{len(id_set)}个唯一雪花ID，兼容版属性访问方式验证通过！")

{sycommon_python_lib-0.1.55a0.dist-info → sycommon_python_lib-0.1.55b0.dist-info}/METADATA

@@ -1,25 +1,24 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.55a0
+Version: 0.1.55b0
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: aio-pika>=9.5.8
 Requires-Dist: aiohttp>=3.13.2
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.121.2
-Requires-Dist: kafka-python>=2.2.16
+Requires-Dist: fastapi>=0.127.0
+Requires-Dist: kafka-python>=2.3.0
 Requires-Dist: loguru>=0.7.3
 Requires-Dist: mysql-connector-python>=9.5.0
 Requires-Dist: nacos-sdk-python<3.0,>=2.0.9
 Requires-Dist: netifaces>=0.11.0
-Requires-Dist: pydantic>=2.12.4
+Requires-Dist: pydantic>=2.12.5
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
-Requires-Dist: sqlalchemy>=2.0.44
-Requires-Dist: starlette>=0.49.3
-Requires-Dist: uuid>=1.30
-Requires-Dist: uvicorn>=0.38.0
+Requires-Dist: sqlalchemy>=2.0.45
+Requires-Dist: starlette>=0.50.0
+Requires-Dist: uvicorn>=0.40.0
 
 # sycommon-python-lib
 

{sycommon_python_lib-0.1.55a0.dist-info → sycommon_python_lib-0.1.55b0.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=Ctjpch9clULhRcSKFVlAjXDmEZ63KVHqch4xzXAQZdQ,21174
+sycommon/logging/kafka_log.py,sha256=viqJ2hDqnyX5eUKkhIhU__kytIwe6nLuHIAFGcaRpUI,21118
 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
@@ -27,7 +27,7 @@ sycommon/middleware/middleware.py,sha256=SzZ4wufSNdwC4Ppw99TE7a6AVGkrZRc55NHSrA3
 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
-sycommon/middleware/traceid.py,sha256=ugqPgHdUydj7m481rM_RH-yrIK9hAdkLemdPSSOnQvw,6821
+sycommon/middleware/traceid.py,sha256=FLZTxVAIboZvqK_S69eReeIzZGUDIVy6KTA1kZBoRyI,6908
 sycommon/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/models/base_http.py,sha256=EICAAibx3xhjBsLqm35Mi3DCqxp0FME4rD_3iQVjT_E,3051
 sycommon/models/log.py,sha256=rZpj6VkDRxK3B6H7XSeWdYZshU8F0Sks8bq1p6pPlDw,500
@@ -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=U7RJFV8qPgWyFDpeIgmYpYnpXPrWj01kkigDf1k8sBY,8023
-sycommon/synacos/feign_client.py,sha256=qEJNQFX5irDnD6VwN79im42h9FKzoELPmdEAXzgwPT0,15435
+sycommon/synacos/feign.py,sha256=xvyH_1no6gsggO3YYB0_88NWNA26odbQ_G-2MjApif0,8016
+sycommon/synacos/feign_client.py,sha256=PYjTrnqMc_Jl6Wnpiz8-PFozCjPk6VGnPWv29JefL14,15421
 sycommon/synacos/nacos_service.py,sha256=tyh_JOjjoCGiKCr1xfU7MAmu7dDQCZmTzmYsSqNjiQY,35465
 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=S3KWKFUKhgZ9QnzLvvaGTt2MavF9RvjDQqeUM99u6Kk,8589
+sycommon/tools/snowflake.py,sha256=wSATJzWGb6HcaZ1u_fdzF6I5seRviQQm2KS3Jf45nm4,8520
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.55a0.dist-info/METADATA,sha256=hlbD-d9IAS0lnH_ZdWhyA3c0ewXabuEFjcxeFetwBJw,7077
-sycommon_python_lib-0.1.55a0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.55a0.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.55a0.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.55a0.dist-info/RECORD,,
+sycommon_python_lib-0.1.55b0.dist-info/METADATA,sha256=9K3VD62twbBtlxjoty9K0h96O74lp2NFfqtviimdqGM,7050
+sycommon_python_lib-0.1.55b0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.55b0.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.55b0.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.55b0.dist-info/RECORD,,