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

sycommon/synacos/nacos_service_discovery.py

@@ -0,0 +1,138 @@
+import threading
+from typing import List, Dict
+from sycommon.logging.kafka_log import SYLogger
+
+
+class NacosServiceDiscovery:
+    """Nacos服务发现类 - 负责服务实例发现和轮询"""
+
+    def __init__(self, client_base):
+        self.client_base = client_base
+
+        # 轮询管理
+        self._round_robin_index = 0
+        self._round_robin_lock = threading.Lock()
+
+        # 连接监控配置
+        self.connection_check_interval = self.client_base.nacos_config.get(
+            'connectionCheckInterval', 30)
+        self._monitor_thread_started = False
+        self._monitor_thread_lock = threading.Lock()
+
+    def discover_services(self, service_name: str, group: str = "DEFAULT_GROUP", version: str = None) -> List[Dict]:
+        """发现服务实例列表 (与Java格式兼容)"""
+        if not self.client_base.ensure_client_connected():
+            return []
+
+        return self.get_service_instances(service_name, group, version)
+
+    def get_service_instances(self, service_name: str, group: str = "DEFAULT_GROUP", target_version: str = None) -> List[Dict]:
+        """
+        获取服务实例列表，并按照以下优先级规则筛选：
+        1. 相同版本号的实例
+        2. 无版本号的实例
+        3. 所有实例中轮询
+        """
+        try:
+            namespace_id = self.client_base.nacos_config['namespaceId']
+            instances = self.client_base.nacos_client.list_naming_instance(
+                service_name,
+                namespace_id=namespace_id,
+                group_name=group,
+                healthy_only=True,
+            )
+
+            if not instances or 'hosts' not in instances:
+                SYLogger.info(f"nacos:未发现 {service_name} 的服务实例")
+                return []
+
+            all_instances = instances.get('hosts', [])
+            all_instances = [
+                instance for instance in all_instances
+                if instance.get('enabled', True)
+            ]
+            SYLogger.info(
+                f"nacos:共发现 {len(all_instances)} 个 {service_name} 服务实例")
+
+            version_to_use = target_version
+
+            if version_to_use:
+                same_version_instances = [
+                    instance for instance in all_instances
+                    if instance.get('metadata', {}).get('version') == version_to_use
+                ]
+
+                if same_version_instances:
+                    SYLogger.info(
+                        f"nacos:筛选出 {len(same_version_instances)} 个与当前版本({version_to_use})匹配的实例")
+                    return same_version_instances
+
+                no_version_instances = [
+                    instance for instance in all_instances
+                    if 'version' not in instance.get('metadata', {})
+                ]
+
+                if no_version_instances:
+                    SYLogger.info(
+                        f"nacos:未找到相同版本({version_to_use})的实例，筛选出 {len(no_version_instances)} 个无版本号的实例")
+                    return no_version_instances
+
+            SYLogger.info(
+                f"nacos:使用轮询方式从 {len(all_instances)} 个实例中选择")
+
+            with self._round_robin_lock:
+                selected_index = self._round_robin_index % len(all_instances)
+                self._round_robin_index = (
+                    selected_index + 1) % len(all_instances)
+
+            return [all_instances[selected_index]]
+
+        except Exception as e:
+            SYLogger.error(f"nacos:服务发现失败: {service_name}: {str(e)}")
+            return []
+
+    def monitor_connection(self, registration):
+        """连接监控线程"""
+        with self._monitor_thread_lock:
+            if self.client_base._shutdown_event.is_set() or self._monitor_thread_started:
+                SYLogger.warning("nacos:监控线程已启动/已关闭，拒绝重复启动")
+                return
+            self._monitor_thread_started = True
+
+        check_interval = self.connection_check_interval
+        SYLogger.info(
+            f"nacos:连接监控线程启动 - 线程ID: {threading.current_thread().ident}")
+
+        while not self.client_base._shutdown_event.is_set():
+            try:
+                if not self.client_base.is_connected:
+                    SYLogger.warning("nacos:客户端未连接，尝试重新初始化")
+                    self.client_base.ensure_client_connected()
+                else:
+                    current_registered = registration.check_service_registered()
+
+                    if current_registered != registration.registered:
+                        registration.registered = current_registered
+                        if not current_registered:
+                            SYLogger.warning("nacos:服务实例未注册，触发单次重新注册")
+                            retry_thread = threading.Thread(
+                                target=registration.register,
+                                args=(True,),
+                                daemon=True,
+                                name="NacosSingleRetryThread"
+                            )
+                            retry_thread.start()
+                        else:
+                            SYLogger.info("nacos:服务实例已注册，触发单次验证")
+                            registration.verify_registration()
+
+                self.client_base._shutdown_event.wait(check_interval)
+
+            except Exception as e:
+                SYLogger.error(f"nacos:连接监控异常: {str(e)}")
+                self.client_base._shutdown_event.wait(5)
+
+        with self._monitor_thread_lock:
+            self._monitor_thread_started = False
+        SYLogger.info(
+            f"nacos:连接监控线程退出 - 线程ID: {threading.current_thread().ident}")

sycommon/synacos/nacos_service_registration.py

@@ -0,0 +1,252 @@
+import threading
+import time
+import atexit
+from sycommon.logging.kafka_log import SYLogger
+
+
+class NacosServiceRegistration:
+    """Nacos服务注册类 - 负责服务注册、注销和状态验证"""
+
+    def __init__(self, client_base, 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
+        self.port = port
+        self.version = version
+
+        # 注册配置
+        self.register_retry_interval = self.client_base.nacos_config.get(
+            'registerRetryInterval', 15)
+        self.long_term_retry_delay = self.client_base.nacos_config.get(
+            'longTermRetryDelay', 30)
+        self.max_long_term_retries = self.client_base.nacos_config.get(
+            'maxLongTermRetries', -1)
+
+        # 验证配置
+        self.registration_verify_count = self.client_base.nacos_config.get(
+            'registrationVerifyCount', 1)
+        self.registration_verify_interval = self.client_base.nacos_config.get(
+            'registrationVerifyInterval', 1)
+        self.registration_post_delay = self.client_base.nacos_config.get(
+            'registrationPostDelay', 3)
+
+        # 状态管理
+        self.registered = False
+        self._long_term_retry_count = 0
+        self._verify_lock = threading.Lock()
+        self._last_verify_time = 0
+        self._atexit_registered = False
+
+    def _cleanup_stale_instance(self):
+        """清理可能存在的残留实例"""
+        if not self.client_base.is_connected:
+            return
+
+        try:
+            self.client_base.nacos_client.remove_naming_instance(
+                service_name=self.service_name,
+                ip=self.real_ip,
+                port=int(self.port),
+                cluster_name="DEFAULT"
+            )
+            SYLogger.warning(f"nacos:清理残留实例: {self.real_ip}:{self.port}")
+        except Exception as e:
+            SYLogger.error(f"nacos:清理残留实例异常: {e}")
+
+    def check_service_registered(self) -> bool:
+        """检查服务是否已注册（基于实例列表）"""
+        if not self.client_base.enable_register_nacos:
+            return True
+
+        if not self.client_base.ensure_client_connected():
+            return False
+
+        try:
+            namespace_id = self.client_base.nacos_config['namespaceId']
+            instances = self.client_base.nacos_client.list_naming_instance(
+                service_name=self.service_name,
+                namespace_id=namespace_id,
+                group_name="DEFAULT_GROUP",
+                healthy_only=True,
+            )
+
+            found = False
+            for instance in instances.get('hosts', []):
+                if (instance.get('ip') == self.real_ip and
+                        instance.get('port') == int(self.port)):
+                    SYLogger.info(f"nacos:找到已注册实例: {self.real_ip}:{self.port}")
+                    found = True
+                    break
+
+            if not found:
+                SYLogger.warning(f"nacos:未找到注册实例: {self.real_ip}:{self.port}")
+
+            self.registered = found
+            return found
+        except Exception as e:
+            SYLogger.error(f"nacos:检查服务注册状态失败: {e}")
+            return False
+
+    def verify_registration(self) -> bool:
+        """多次验证服务是否成功注册（加锁防止重复执行）"""
+        if self._verify_lock.locked():
+            SYLogger.warning("nacos:注册验证已在执行中，跳过重复调用")
+            return self.registered
+
+        with self._verify_lock:
+            current_time = time.time()
+            if current_time - self._last_verify_time < 15:  # 15秒冷却
+                return True
+
+            success_count = 0
+            verify_count = self.registration_verify_count
+            SYLogger.info(
+                f"nacos:开始验证服务注册状态，共验证 {verify_count} 次，间隔 {self.registration_verify_interval} 秒")
+
+            self._last_verify_time = current_time
+
+            for i in range(verify_count):
+                if self.check_service_registered():
+                    success_count += 1
+
+                if i < verify_count - 1:
+                    self.client_base._shutdown_event.wait(
+                        self.registration_verify_interval)
+                    if self.client_base._shutdown_event.is_set():
+                        SYLogger.warning("nacos:应用正在关闭，终止注册验证")
+                        break
+
+            pass_threshold = verify_count / 2
+            result = success_count >= pass_threshold
+
+            if result:
+                SYLogger.info(
+                    f"nacos:服务注册验证成功，{success_count}/{verify_count} 次验证通过")
+            else:
+                SYLogger.error(
+                    f"nacos:服务注册验证失败，仅 {success_count}/{verify_count} 次验证通过")
+
+            return result
+
+    def register(self, force: bool = False) -> bool:
+        """注册服务到Nacos"""
+        if self.registered and not force and self.check_service_registered():
+            return True
+
+        if self.registered and not force:
+            self.registered = False
+            SYLogger.warning("nacos:本地状态显示已注册，但Nacos中未找到服务实例，准备重新注册")
+
+        metadata = {
+            "ignore-metrics": "true",
+        }
+        if self.version:
+            metadata["version"] = self.version
+
+        for attempt in range(self.client_base.max_retries):
+            if not self.client_base.ensure_client_connected():
+                return False
+
+            try:
+                self.client_base.nacos_client.add_naming_instance(
+                    service_name=self.service_name,
+                    ip=self.real_ip,
+                    port=int(self.port),
+                    metadata=metadata,
+                    cluster_name="DEFAULT",
+                    healthy=True,
+                    ephemeral=True,
+                    heartbeat_interval=15  # 心跳间隔默认15秒
+                )
+                SYLogger.info(
+                    f"nacos:服务 {self.service_name} 注册请求已发送: {self.real_ip}:{self.port}")
+
+                if not self._atexit_registered:
+                    atexit.register(self.deregister_service)
+                    self._atexit_registered = True
+
+                return True
+            except Exception as e:
+                if "signal only works in main thread" in str(e):
+                    return True
+                elif attempt < self.client_base.max_retries - 1:
+                    SYLogger.warning(
+                        f"nacos:服务注册失败 (尝试 {attempt+1}/{self.client_base.max_retries}): {e}")
+                    time.sleep(self.client_base.retry_delay)
+                else:
+                    SYLogger.error(f"nacos:服务注册失败，已达到最大重试次数: {e}")
+                    return False
+
+    def register_with_retry(self) -> bool:
+        """带重试机制的服务注册（基于实例列表检查）"""
+        retry_count = 0
+        last_error = None
+        self.registered = False
+
+        while (not self.registered) and (self.max_long_term_retries < 0 or retry_count < self.max_long_term_retries):
+            if self.registered:
+                return True
+
+            try:
+                register_success = self.register(force=True)
+                if not register_success:
+                    raise RuntimeError("nacos:服务注册请求失败")
+
+                SYLogger.info(
+                    f"nacos:服务注册请求已发送，延迟 {self.registration_post_delay} 秒后开始验证")
+                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
+                delay = min(self.register_retry_interval,
+                            self.client_base.max_retry_delay)
+
+                SYLogger.warning(
+                    f"nacos:服务注册尝试 {retry_count} 失败: {last_error}，{delay}秒后重试")
+                time.sleep(delay)
+
+        if self.registered:
+            return True
+
+        if last_error:
+            SYLogger.error(f"nacos:服务注册失败，最终错误: {last_error}")
+        else:
+            SYLogger.error(f"nacos:服务注册失败，已达到最大重试次数: {self.service_name}")
+
+        return False
+
+    def deregister_service(self):
+        """从Nacos注销服务"""
+        if not self.registered or not self.client_base.is_connected:
+            return
+
+        SYLogger.info("nacos:正在注销服务...")
+        try:
+            self.client_base.nacos_client.remove_naming_instance(
+                service_name=self.service_name,
+                ip=self.real_ip,
+                port=int(self.port),
+                cluster_name="DEFAULT"
+            )
+            self.registered = False
+            SYLogger.info(f"nacos:服务 {self.service_name} 已注销")
+        except Exception as e:
+            SYLogger.error(f"nacos:注销服务时发生错误: {e}")
+        finally:
+            self.client_base._shutdown_event.set()

{sycommon_python_lib-0.1.56b7.dist-info → sycommon_python_lib-0.1.56b8.dist-info}/METADATA

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

{sycommon_python_lib-0.1.56b7.dist-info → sycommon_python_lib-0.1.56b8.dist-info}/RECORD

@@ -1,7 +1,7 @@
 command/cli.py,sha256=bP2LCLkRvfETIwWkVD70q5xFxMI4D3BpH09Ws1f-ENc,5849
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/services.py,sha256=vcO2vbe2U1CA4ykLdH1rnxgqUIouukE-wTRsjRl2kBI,11683
-sycommon/config/Config.py,sha256=-LzOgnpA0GKgNexG-tmpLspkJipjtq2GcToaZbyGncg,3854
+sycommon/config/Config.py,sha256=Q-HGp-10uTTCOAwnxwT4g-hrOWGDWl7bFPYZZHOmiOo,3742
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
 sycommon/config/LLMConfig.py,sha256=yU-aIqePIeF6msfRVEtGq7SXZVDfHyTi6JduKjhMO_4,371
@@ -49,7 +49,12 @@ 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_service.py,sha256=RkEWzCu2DkjV6G-hZ8FQTdewvkBiPAZezrO7GzKBkiI,39046
+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_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/sentry/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sentry/sy_sentry.py,sha256=S2Np_6WmWkI9X76Q67RWZthhCz02tKCfvdhKI57587w,1373
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -60,15 +65,20 @@ sycommon/synacos/example.py,sha256=61XL03tU8WTNOo3FUduf93F2fAwah1S0lbH1ufhRhRk,5
 sycommon/synacos/example2.py,sha256=adUaru3Hy482KrOA17DfaC4nwvLj8etIDS_KrWLWmCU,4811
 sycommon/synacos/feign.py,sha256=frB3D5LeFDtT3pJLFOwFzEOrNAJKeQNGk-BzUg9T3WM,8295
 sycommon/synacos/feign_client.py,sha256=ExO7Pd5B3eFKDjXqBRc260K1jkI49IYguLwJJaD2R-o,16166
-sycommon/synacos/nacos_service.py,sha256=8RFvOpeKFqYDj1kzzdjZqBBUZMf_VcFeIyeO9uPf_AU,37194
+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/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/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.56b7.dist-info/METADATA,sha256=LNeEx8_l2ZYTYjb3NE5Uh8Epgrywk-O_p4zt6_JNy-k,7269
-sycommon_python_lib-0.1.56b7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.56b7.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.56b7.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.56b7.dist-info/RECORD,,
+sycommon_python_lib-0.1.56b8.dist-info/METADATA,sha256=orC9Ba1jsx2gISka8fQbouH2xI2fc86ZlZm0bN-11MI,7269
+sycommon_python_lib-0.1.56b8.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.56b8.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.56b8.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.56b8.dist-info/RECORD,,