sycommon-python-lib 0.1.56b10__py3-none-any.whl → 0.1.56b12__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_service_consumer_manager.py

@@ -42,7 +42,9 @@ class RabbitMQConsumerManager(RabbitMQClientManager):
         # 创建并初始化客户端
         await cls.get_client(
             client_name=queue_name,
-            queue_name=queue_name, ** kwargs
+            client_type="listener",
+            queue_name=queue_name,
+            ** kwargs
         )
 
         # 注册消息处理器

sycommon/rabbitmq/rabbitmq_service_core.py

@@ -70,8 +70,8 @@ class RabbitMQCoreService:
                 virtualhost=cls._config.get('virtual-host', "/"),
                 app_name=cls._config.get("APP_NAME", ""),
                 prefetch_count=global_prefetch_count,
-                heartbeat=cls._config.get('heartbeat', 30),
-                connection_timeout=cls._config.get('connection_timeout', 30),
+                heartbeat=cls._config.get('heartbeat', 15),
+                connection_timeout=cls._config.get('connection_timeout', 15),
                 reconnect_interval=cls._config.get('reconnect_interval', 5),
             )
 

sycommon/rabbitmq/rabbitmq_service_producer_manager.py

@@ -24,7 +24,7 @@ class RabbitMQProducerManager(RabbitMQClientManager):
 
     @classmethod
     async def setup_senders(cls, senders: List[RabbitMQSendConfig], has_listeners: bool = False, **kwargs) -> None:
-        """设置消息发送器"""
+        """设置消息发送器（适配client_type参数，确保发送器不创建队列）"""
         if cls._is_shutdown:
             logger.warning("服务已关闭，无法设置发送器")
             return
@@ -42,33 +42,36 @@ class RabbitMQProducerManager(RabbitMQClientManager):
                 app_name = cls._config.get(
                     "APP_NAME", "") if cls._config else ""
 
-                # 处理发送器队列名称
+                # 处理发送器客户端名称（非队列名）
                 normalized_name = queue_name
                 if app_name and normalized_name.endswith(f".{app_name}"):
                     normalized_name = normalized_name[:-len(f".{app_name}")]
-                    logger.info(f"发送器队列名称移除app-name后缀: {normalized_name}")
+                    logger.info(f"发送器客户端名称移除app-name后缀: {normalized_name}")
 
                 # 检查是否已初始化
                 if normalized_name in cls._sender_client_names:
                     logger.info(f"发送客户端 '{normalized_name}' 已存在，跳过")
                     continue
 
-                # 获取或创建客户端
+                # ===== 处理已有客户端重连 =====
                 if normalized_name in cls._clients:
                     client = cls._clients[normalized_name]
                     if not await client.is_connected:
+                        client.queue_name = normalized_name
                         client.create_if_not_exists = False
                         await client.connect()
                 else:
                     client = await cls.get_client(
                         client_name=normalized_name,
+                        client_type="sender",
                         exchange_type=sender_config.exchange_type,
                         durable=sender_config.durable,
                         auto_delete=sender_config.auto_delete,
                         auto_parse_json=sender_config.auto_parse_json,
                         queue_name=queue_name,
                         create_if_not_exists=False,
-                        prefetch_count=prefetch_count, ** kwargs
+                        prefetch_count=prefetch_count,
+                        **kwargs
                     )
 
                 # 记录客户端

sycommon/synacos/nacos_config_manager.py

@@ -2,6 +2,7 @@ import json
 import threading
 import time
 from typing import Callable, Optional, Dict, List
+from sycommon.synacos.nacos_client_base import NacosClientBase
 import yaml
 from sycommon.logging.kafka_log import SYLogger
 
@@ -9,7 +10,7 @@ from sycommon.logging.kafka_log import SYLogger
 class NacosConfigManager:
     """Nacos配置管理类 - 负责配置读取、监听和更新"""
 
-    def __init__(self, client_base):
+    def __init__(self, client_base: NacosClientBase):
         self.client_base = client_base
 
         # 配置

sycommon/synacos/nacos_heartbeat_manager.py

@@ -1,12 +1,14 @@
 import threading
 import time
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.synacos.nacos_client_base import NacosClientBase
+from sycommon.synacos.nacos_service_registration import NacosServiceRegistration
 
 
 class NacosHeartbeatManager:
     """Nacos心跳管理类 - 负责心跳发送和监控"""
 
-    def __init__(self, client_base, registration, heartbeat_interval: int = 15):
+    def __init__(self, client_base: NacosClientBase, registration: NacosServiceRegistration, heartbeat_interval: int = 15):
         self.client_base = client_base
         self.registration = registration
 

sycommon/synacos/nacos_service.py

@@ -13,6 +13,7 @@ from sycommon.synacos.nacos_service_registration import NacosServiceRegistration
 from sycommon.synacos.nacos_heartbeat_manager import NacosHeartbeatManager
 from sycommon.synacos.nacos_config_manager import NacosConfigManager
 from sycommon.synacos.nacos_service_discovery import NacosServiceDiscovery
+from sycommon.tools.env import check_env_flag, get_env_var
 
 
 class NacosService(metaclass=SingletonMeta):
@@ -23,9 +24,9 @@ class NacosService(metaclass=SingletonMeta):
             self.service_name = config['Name']
             self.host = config['Host']
             self.port = config['Port']
-            self.version = os.getenv('VERSION')
-            self.enable_register_nacos = os.getenv(
-                'REGISTER-NACOS', 'true').lower() == 'true'
+            self.version = get_env_var('VERSION')
+            self.enable_register_nacos = check_env_flag(
+                ['REGISTER-NACOS'], 'true')
 
             # 初始化基础模块
             self.client_base = NacosClientBase(

sycommon/synacos/nacos_service_discovery.py

@@ -1,12 +1,14 @@
 import threading
 from typing import List, Dict
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.synacos.nacos_client_base import NacosClientBase
+from sycommon.synacos.nacos_service_registration import NacosServiceRegistration
 
 
 class NacosServiceDiscovery:
     """Nacos服务发现类 - 负责服务实例发现和轮询"""
 
-    def __init__(self, client_base):
+    def __init__(self, client_base: NacosClientBase):
         self.client_base = client_base
 
         # 轮询管理
@@ -91,7 +93,7 @@ class NacosServiceDiscovery:
             SYLogger.error(f"nacos:服务发现失败: {service_name}: {str(e)}")
             return []
 
-    def monitor_connection(self, registration):
+    def monitor_connection(self, registration: NacosServiceRegistration):
         """连接监控线程"""
         with self._monitor_thread_lock:
             if self.client_base._shutdown_event.is_set() or self._monitor_thread_started:

sycommon/synacos/nacos_service_registration.py

@@ -2,12 +2,13 @@ import threading
 import time
 import atexit
 from sycommon.logging.kafka_log import SYLogger
+from sycommon.synacos.nacos_client_base import NacosClientBase
 
 
 class NacosServiceRegistration:
     """Nacos服务注册类 - 负责服务注册、注销和状态验证"""
 
-    def __init__(self, client_base, service_name: str, real_ip: str, port: int, version: str):
+    def __init__(self, client_base: NacosClientBase, service_name: str, real_ip: str, port: int, version: str):
         self.client_base = client_base
         self.service_name = service_name
         self.real_ip = real_ip
@@ -182,6 +183,8 @@ class NacosServiceRegistration:
         retry_count = 0
         last_error = None
         self.registered = False
+        # 首次注册尝试标记
+        first_attempt = True
 
         while (not self.registered) and (self.max_long_term_retries < 0 or retry_count < self.max_long_term_retries):
             if self.registered:
@@ -193,27 +196,42 @@ class NacosServiceRegistration:
                     raise RuntimeError("nacos:服务注册请求失败")
 
                 SYLogger.info(
-                    f"nacos:服务注册请求已发送，延迟 {self.registration_post_delay} 秒后开始验证")
-                time.sleep(self.registration_post_delay)
+                    f"nacos:服务注册请求已发送，{'首次启动信任注册，跳过阻塞验证' if first_attempt else f'延迟 {self.registration_post_delay} 秒后开始验证'}")
 
-                registered = self.verify_registration()
-                self.registered = registered
-
-                if self.registered:
+                # 核心逻辑：首次注册跳过阻塞验证，非首次按原逻辑
+                if first_attempt:
+                    # 首次注册：直接标记成功，不阻塞
+                    self.registered = True
                     self.client_base._client_initialized = True
                     self.client_base._shutdown_event.set()
                     self.client_base._shutdown_event.clear()
                     self._long_term_retry_count = 0
 
-                    SYLogger.info(
-                        f"nacos:服务注册成功并通过验证: {self.service_name}")
+                    SYLogger.info(f"nacos:首次启动信任注册成功: {self.service_name}")
+                    first_attempt = False  # 标记为非首次
                     return True
                 else:
-                    raise RuntimeError("nacos:服务注册验证失败")
+                    # 非首次/重试：保留原有阻塞验证逻辑
+                    time.sleep(self.registration_post_delay)
+                    registered = self.verify_registration()
+                    self.registered = registered
+
+                    if self.registered:
+                        self.client_base._client_initialized = True
+                        self.client_base._shutdown_event.set()
+                        self.client_base._shutdown_event.clear()
+                        self._long_term_retry_count = 0
+
+                        SYLogger.info(
+                            f"nacos:服务注册成功并通过验证: {self.service_name}")
+                        return True
+                    else:
+                        raise RuntimeError("nacos:服务注册验证失败")
 
             except Exception as e:
                 last_error = str(e)
                 retry_count += 1
+                first_attempt = False  # 失败后标记为非首次
                 delay = min(self.register_retry_interval,
                             self.client_base.max_retry_delay)
 

sycommon/tools/env.py

@@ -0,0 +1,62 @@
+import os
+
+
+def _normalize_env_key(key: str) -> str:
+    """
+    环境变量名标准化：
+    1. 转小写
+    2. 中划线(-)和下划线(_)统一替换为下划线(_)
+    :param key: 原始环境变量名
+    :return: 标准化后的key
+    """
+    return key.lower().replace('-', '_')
+
+
+def check_env_flag(target_keys: list, default: str = 'false') -> bool:
+    """
+    检查环境变量是否为"true"（自动兼容：大小写、中划线/下划线）
+    :param target_keys: 目标变量名列表（如 ['REGISTER-NACOS']，无需传双key）
+    :param default: 默认值（未找到变量时使用）
+    :return: 布尔值
+    """
+    # 1. 标准化目标key（小写+统一下划线）
+    target_keys_normalized = [_normalize_env_key(k) for k in target_keys]
+
+    # 2. 遍历所有环境变量，标准化后匹配
+    for env_key, env_val in os.environ.items():
+        env_key_normalized = _normalize_env_key(env_key)
+        if env_key_normalized in target_keys_normalized:
+            # 3. 值去空格 + 转小写 判断
+            return env_val.strip().lower() == 'true'
+
+    # 4. 未找到变量时，判断默认值
+    return default.strip().lower() == 'true'
+
+
+def get_env_var(key: str, default='', case_insensitive: bool = True) -> str:
+    """
+    获取环境变量值（自动兼容：大小写、中划线/下划线）
+    :param key: 目标环境变量名（如 'REGISTER-NACOS'/'version'）
+    :param default: 无匹配时的默认值，默认空字符串
+    :param case_insensitive: 是否忽略变量名大小写（默认True，建议保持）
+    :return: 匹配到的环境变量值 / 默认值
+    """
+    if case_insensitive:
+        # 标准化目标key（小写+统一下划线）
+        target_key_normalized = _normalize_env_key(key)
+
+        # 遍历环境变量，标准化后匹配
+        for env_key, env_val in os.environ.items():
+            env_key_normalized = _normalize_env_key(env_key)
+            if env_key_normalized == target_key_normalized:
+                return env_val
+        return default
+    else:
+        # 不忽略大小写时，仅自动兼容中划线/下划线
+        target_key_1 = key  # 原始key
+        target_key_2 = key.replace(
+            '-', '_') if '-' in key else key.replace('_', '-')  # 替换格式的key
+        val = os.getenv(target_key_1)
+        if val is not None:
+            return val
+        return os.getenv(target_key_2, default)

{sycommon_python_lib-0.1.56b10.dist-info → sycommon_python_lib-0.1.56b12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.56b10
+Version: 0.1.56b12
 Summary: Add your description here
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{sycommon_python_lib-0.1.56b10.dist-info → sycommon_python_lib-0.1.56b12.dist-info}/RECORD

@@ -24,7 +24,7 @@ sycommon/llm/llm_logger.py,sha256=n4UeNy_-g4oHQOsw-VUzF4uo3JVRLtxaMp1FcI8FiEo,54
 sycommon/llm/llm_tokens.py,sha256=-udDyFcmyzx6UAwIi6_d_wwI5kMd5w0-WcS2soVPQxg,4309
 sycommon/logging/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/logging/async_sql_logger.py,sha256=_OY36XkUm__U3NhMgiecy-qd-nptZ_0gpE3J8lGAr58,2619
-sycommon/logging/kafka_log.py,sha256=1pUZ0N4FPRsTpg8PEY27iIa3xAMiLKYLBM3PDV804Lo,9934
+sycommon/logging/kafka_log.py,sha256=gfOqdZe0HJ3PkIFfnNWG4DZVadxsCKJ6AmelR7_Z1Xs,9960
 sycommon/logging/logger_levels.py,sha256=_-uQ_T1N8NkNgcAmLrMmJ83nHTDw5ZNvXFPvdk89XGY,1144
 sycommon/logging/logger_wrapper.py,sha256=TiHsrIIHiQMzXgXK12-0KIpU9GhwQJOoHslakzmq2zc,357
 sycommon/logging/sql_logger.py,sha256=aEU3OGnI_51Tjyuuf4FpUi9KPTceFRuKAOyQbPzGhzM,2021
@@ -47,14 +47,14 @@ sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
 sycommon/notice/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/notice/uvicorn_monitor.py,sha256=VryQYcAtjijJuGDBimbVurgwxlsLaLtkNnABPDY5Tao,7332
-sycommon/rabbitmq/rabbitmq_client.py,sha256=jClUm9Ao9vZ2IZg7IXIEaDbYYnV8qtmtm77vdmwpKE4,22599
-sycommon/rabbitmq/rabbitmq_pool.py,sha256=5ruFVViSCKA7ToZmR2dZIkP0zT0ZcfsnkSGbrdkg0Tk,16141
+sycommon/rabbitmq/rabbitmq_client.py,sha256=JZ73fc0Z8iMnayvRhRsnkEkBfzKF3wbxDKTE98RwVIA,17809
+sycommon/rabbitmq/rabbitmq_pool.py,sha256=BiFQgZPzSAFR-n5XhyIafoeWQXETF_31nFRDhMbe6aU,15577
 sycommon/rabbitmq/rabbitmq_service.py,sha256=XSHo9HuIJ_lq-vizRh4xJVdZr_2zLqeLhot09qb0euA,2025
-sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=VL6hGaU5VXldLn5bmn3N6Lu3tBDD0zYB6aWurKJpAFM,8270
+sycommon/rabbitmq/rabbitmq_service_client_manager.py,sha256=MM4r8Pa2rjAmzy_NpHFb4thGznr6AYk6m__IC8IIxEM,7852
 sycommon/rabbitmq/rabbitmq_service_connection_monitor.py,sha256=uvoMuJDzJ9i63uVRq1NKFV10CvkbGnTMyEoq2rgjQx8,3013
-sycommon/rabbitmq/rabbitmq_service_consumer_manager.py,sha256=qvq6dB30DkJrpk2OQ7PsWPXbp-7ILiMNt0sjZbfOzUs,11449
-sycommon/rabbitmq/rabbitmq_service_core.py,sha256=_9gqc7BOhrzfeYS557yIOfyCAraAKh-3ClMpKHn9ufY,4753
-sycommon/rabbitmq/rabbitmq_service_producer_manager.py,sha256=FKljvWhxuVq3QwBf-Ny7n5JvO3zyJ2B4K1SGb6fG2e0,9960
+sycommon/rabbitmq/rabbitmq_service_consumer_manager.py,sha256=489r1RKd5WrTNMAcWCxUZpt9yWGrNunZlLCCp-M_rzM,11497
+sycommon/rabbitmq/rabbitmq_service_core.py,sha256=6RMvIf78DmEOZmN8dA0duA9oy4ieNswdGrOeyJdD6tU,4753
+sycommon/rabbitmq/rabbitmq_service_producer_manager.py,sha256=TJrLbvsjF55P9lwr7aCm9uRIRuC3z4EZNx74KEVKBtU,10190
 sycommon/sentry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sentry/sy_sentry.py,sha256=e5Fbt9Gi2gIb048z0nuKbuhp3uCAEqYH2xXbF6qrZq4,1471
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -66,19 +66,20 @@ sycommon/synacos/example2.py,sha256=adUaru3Hy482KrOA17DfaC4nwvLj8etIDS_KrWLWmCU,
 sycommon/synacos/feign.py,sha256=frB3D5LeFDtT3pJLFOwFzEOrNAJKeQNGk-BzUg9T3WM,8295
 sycommon/synacos/feign_client.py,sha256=ExO7Pd5B3eFKDjXqBRc260K1jkI49IYguLwJJaD2R-o,16166
 sycommon/synacos/nacos_client_base.py,sha256=l5jpall6nEt0Hy07Wk-PVU0VN0BmD_Mmtldmtyvvksg,4526
-sycommon/synacos/nacos_config_manager.py,sha256=IzSOSocJJrLnvVUKOXE2bq0ZDm9Na9esZLomZzOFtGo,4319
-sycommon/synacos/nacos_heartbeat_manager.py,sha256=_87KaKRA7kkq39rOc4ViYd20H-Y7iu4jMrq_n-ul8wg,5381
-sycommon/synacos/nacos_service.py,sha256=EPDNBAPwPP4EPIEIjuvD9_CmLRNNmhd_heCpxJD6wbM,6068
-sycommon/synacos/nacos_service_discovery.py,sha256=wTkUgauO8aFHKotnm6mFHlY2_yXHfltlPlBzg2XBOGE,5837
-sycommon/synacos/nacos_service_registration.py,sha256=TwhBZsQszkaSDo_zVQmQxkFlC6K3YHBK8hXpChZ9if8,9872
+sycommon/synacos/nacos_config_manager.py,sha256=Cff-4gpp0aD7sQVi-nEvDO4BWqK9abEDDDJ9qXKFQgs,4399
+sycommon/synacos/nacos_heartbeat_manager.py,sha256=G80_pOn37WdO_HpYUiAfpwMqAxW0ff0Bnw0NEuge9v0,5568
+sycommon/synacos/nacos_service.py,sha256=BezQ1eDIYwBPE567Po_Qh1Ki_z9WmhZy1J1NiTPbdHY,6118
+sycommon/synacos/nacos_service_discovery.py,sha256=vE72BCLBv4fQ1H9CQJ8efC6R2SPMQlAWPPTb8Ae7i2g,6024
+sycommon/synacos/nacos_service_registration.py,sha256=plg2PmH8CWgmVnPtiIXBxtj-3BpyMdSzKr1wyWRdzh4,10968
 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/env.py,sha256=Ah-tBwG2C0_hwLGFebVQgKdWWXCjTzBuF23gCkLHYy4,2437
 sycommon/tools/merge_headers.py,sha256=HV_i52Q-9se3SP8qh7ZGYl8bP7Fxtal4CGVkyMwEdM8,4373
 sycommon/tools/snowflake.py,sha256=lVEe5mNCOgz5OqGQpf5_nXaGnRJlI2STX2s-ppTtanA,11947
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.56b10.dist-info/METADATA,sha256=vyV4lLpTKgbiPgOIBOgZFnACgzvrJk5s2Ghja70yztY,7270
-sycommon_python_lib-0.1.56b10.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.56b10.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.56b10.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.56b10.dist-info/RECORD,,
+sycommon_python_lib-0.1.56b12.dist-info/METADATA,sha256=dkuadRkMxJOl31ynqjcEezKtvoQ7On9qeGyGSnxCUZ0,7270
+sycommon_python_lib-0.1.56b12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.56b12.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.56b12.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.56b12.dist-info/RECORD,,