sycommon-python-lib 0.1.11__tar.gz → 0.1.13__tar.gz

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/PKG-INFO

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

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sycommon-python-lib"
-version = "0.1.11"
+version = "0.1.13"
 description = "Add your description here"
 readme = "README.md"
 requires-python = ">=3.10"

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/src/sycommon/health/health_check.py

@@ -6,7 +6,7 @@ def setup_health_handler(app: FastAPI):
 
     @health_router.get("/actuator/health")
     async def health_check():
-        """返回应用的健康状态"""
+        """实现 Nacos 健康检查接口"""
         return {
             "status": "UP",
             "groups": ["liveness", "readiness"]

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/src/sycommon/rabbitmq/rabbitmq_client.py

@@ -47,10 +47,9 @@ class RabbitMQClient:
         app_name: str = "",
         reconnection_delay: int = 1,
         max_reconnection_attempts: int = 5,
-        heartbeat: int = 60,
+        heartbeat: int = 10,
         prefetch_count: int = 2,
-        message_process_timeout: int = 30,
-        consumption_stall_threshold: int = 120
+        consumption_stall_threshold: int = 10
     ):
         """
         初始化RabbitMQ客户端，支持集群多节点配置
@@ -75,7 +74,6 @@ class RabbitMQClient:
         :param max_reconnection_attempts: 最大重连尝试次数
         :param heartbeat: 心跳间隔(秒)
         :param prefetch_count: 预取消息数量
-        :param message_process_timeout: 消息处理超时时间(秒)
         :param consumption_stall_threshold: 消费停滞检测阈值(秒)
         """
         # 连接参数 - 支持多主机
@@ -109,7 +107,6 @@ class RabbitMQClient:
         self.heartbeat = heartbeat
 
         # 消息处理参数
-        self.message_process_timeout = message_process_timeout
         self.consumption_stall_threshold = consumption_stall_threshold
 
         # 连接和通道对象
@@ -263,6 +260,7 @@ class RabbitMQClient:
                     password=self.password,
                     virtualhost=self.virtualhost,
                     heartbeat=self.heartbeat,
+                    loop=asyncio.get_event_loop(),
                     client_properties={
                         "connection_name": f"{self.app_name}@{host}"
                     }
@@ -477,12 +475,13 @@ class RabbitMQClient:
                     if self._is_consuming:
                         current_time = asyncio.get_event_loop().time()
                         if current_time - self._last_message_processed > self.consumption_stall_threshold:
-                            logger.warning(
-                                f"检测到消费停滞超过 {self.consumption_stall_threshold} 秒 (主机: {self._active_host})，将重启消费者")
+                            # logger.warning(
+                            #     f"检测到消费停滞超过 {self.consumption_stall_threshold} 秒 (主机: {self._active_host})，将重启消费者")
                             if self._is_consuming and self.message_handler:
                                 await self.stop_consuming()
+                                await asyncio.sleep(1)
                                 await self.start_consuming()
-                                logger.info("消费者已重启以恢复消费")
+                                # logger.info("消费者已重启以恢复消费")
                 except Exception as e:
                     logger.error(f"监控任务出错: {str(e)}")
                     await asyncio.sleep(1)
@@ -832,17 +831,6 @@ class RabbitMQClient:
             # 解析消息
             parsed_data = await self._parse_message(message)
 
-            # 消息处理超时控制
-            # try:
-            #     await asyncio.wait_for(
-            #         self.message_handler(MQMsgModel(**parsed_data), message),
-            #         timeout=self.message_process_timeout
-            #     )
-            # except asyncio.TimeoutError:
-            #     logger.error(
-            #         f"消息 {message_id} 处理超时（超过 {self.message_process_timeout} 秒）(主机: {self._active_host})")
-            #     await message.ack()  # 超时也确认，避免无限重试
-            #     return
             await self.message_handler(MQMsgModel(**parsed_data), message)
 
             # 处理成功，确认消息

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/src/sycommon/rabbitmq/rabbitmq_service.py

@@ -129,11 +129,10 @@ class RabbitMQService:
             reconnection_delay=kwargs.get('reconnection_delay', 1),
             max_reconnection_attempts=kwargs.get(
                 'max_reconnection_attempts', 5),
-            heartbeat=kwargs.get('heartbeat', 60),
+            heartbeat=kwargs.get('heartbeat', 10),
             prefetch_count=kwargs.get('prefetch_count', 2),
-            message_process_timeout=kwargs.get('message_process_timeout', 30),
             consumption_stall_threshold=kwargs.get(
-                'consumption_stall_threshold', 120)
+                'consumption_stall_threshold', 10)
         )
 
     @classmethod

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/src/sycommon/synacos/nacos_service.py

@@ -66,6 +66,10 @@ class NacosService(metaclass=SingletonMeta):
             self.real_ip = self.get_service_ip(self.host)
             self._long_term_retry_count = 0  # 长期重试计数器
 
+            # 轮询索引，用于在所有实例中进行轮询选择
+            self._round_robin_index = 0
+            self._round_robin_lock = threading.Lock()  # 保护轮询索引的线程安全
+
             if self.enable_register_nacos:
                 # 初始化客户端（仅在首次调用时执行）
                 self._initialize_client()
@@ -361,7 +365,12 @@ class NacosService(metaclass=SingletonMeta):
                 self.registered = False
                 SYLogger.warning("nacos:本地状态显示已注册，但Nacos中未找到服务实例，准备重新注册")
 
-            metadata = {"ignore-metrics": "true"}
+            metadata = {
+                "ignore-metrics": "true",
+                "preserved.heart.beat.interval": "3000",  # 心跳间隔 3 秒
+                "preserved.heart.beat.timeout": "15000",  # 心跳超时 15 秒
+                "preserved.ip.delete.timeout": "30000"    # 实例删除超时 30 秒
+            }
             if self.version:
                 metadata["version"] = self.version
 
@@ -506,7 +515,11 @@ class NacosService(metaclass=SingletonMeta):
                             f"nacos:心跳发送失败，已持续{current_time - self._last_successful_heartbeat:.1f}秒")
                 else:
                     SYLogger.warning("nacos:服务未注册，尝试重新注册")
-                    self._executor.submit(self.register_with_retry)
+                    # 检查线程池是否已关闭
+                    if not self._executor._shutdown:
+                        self._executor.submit(self.register_with_retry)
+                    else:
+                        SYLogger.warning("nacos:线程池已关闭，无法提交注册任务")
             finally:
                 last_heartbeat_time = time.time()  # 更新上次执行时间
 
@@ -641,11 +654,11 @@ class NacosService(metaclass=SingletonMeta):
         finally:
             self._shutdown_event.set()
             # 优雅地关闭线程池
-            if self._executor:
+            if self._executor and not self._executor._shutdown:
                 self._executor.shutdown(wait=True)
-            if self._heartbeat_executor:
+            if self._heartbeat_executor and not self._heartbeat_executor._shutdown:
                 self._heartbeat_executor.shutdown(wait=True)
-            if self._monitor_executor:
+            if self._monitor_executor and not self._monitor_executor._shutdown:
                 self._monitor_executor.shutdown(wait=True)
 
     def handle_signal(self, signum, frame):
@@ -731,8 +744,13 @@ class NacosService(metaclass=SingletonMeta):
 
         return self.get_service_instances(service_name, group, version)
 
-    def get_service_instances(self, service_name: str, group: str = "DEFAULT_GROUP", version: str = None) -> List[Dict]:
-        """获取服务实例列表"""
+    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.nacos_config['namespaceId']
             instances = self.nacos_client.list_naming_instance(
@@ -741,13 +759,56 @@ class NacosService(metaclass=SingletonMeta):
                 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', [])
+            SYLogger.info(
+                f"nacos:共发现 {len(all_instances)} 个 {service_name} 服务实例")
+
+            # 确定要使用的目标版本，如果未指定则使用当前服务的版本
+            version_to_use = target_version or self.version
+
+            # 按规则筛选实例
+            if version_to_use:
+                # 1. 筛选相同版本号的实例
+                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
+
+                # 2. 如果没有相同版本的实例，筛选无版本号的实例
+                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
+
+            # 3. 如果没有指定版本或前两个规则都不满足，使用轮询方式选择所有健康实例
             SYLogger.info(
-                f"nacos:发现 {len(instances.get('hosts', []))} 个 {service_name} 服务实例")
+                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]]
 
-            return instances.get('hosts', [])
         except Exception as e:
             SYLogger.error(f"nacos:服务发现失败: {service_name}: {str(e)}")
             return []

{sycommon_python_lib-0.1.11 → sycommon_python_lib-0.1.13}/src/sycommon_python_lib.egg-info/PKG-INFO

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