sycommon-python-lib 0.1.43__py3-none-any.whl → 0.1.45__py3-none-any.whl

sycommon/rabbitmq/rabbitmq_service.py

@@ -118,10 +118,6 @@ class RabbitMQService:
                 username=cls._config.get('username', ""),
                 password=cls._config.get('password', ""),
                 virtualhost=cls._config.get('virtual-host', "/"),
-                connection_pool_size=cls._config.get(
-                    'connection_pool_size', 2),
-                channel_pool_size=cls._config.get('channel_pool_size', 5),
-                heartbeat=cls._config.get('heartbeat', 30),
                 app_name=cls._config.get("APP_NAME", "")
             )
 

sycommon/services.py

@@ -71,7 +71,8 @@ class Services(metaclass=SingletonMeta):
         app.state.config = {
             "host": cls._config.get('Host', '0.0.0.0'),
             "port": cls._config.get('Port', 8080),
-            "workers": cls._config.get('Workers', 1)
+            "workers": cls._config.get('Workers', 1),
+            "h11_max_incomplete_event_size": cls._config.get('H11MaxIncompleteEventSize', 1024 * 1024 * 1024)
         }
 
         # 立即配置非异步服务（在应用启动前）

sycommon/synacos/feign.py

@@ -97,7 +97,7 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
                     data=data,
                     timeout=timeout
                 ) as response:
-                    return await _handle_feign_response(response)
+                    return await _handle_feign_response(response, service_name, api_path)
             else:
                 # 普通JSON请求
                 async with session.request(
@@ -108,21 +108,21 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
                     json=body,
                     timeout=timeout
                 ) as response:
-                    return await _handle_feign_response(response)
+                    return await _handle_feign_response(response, service_name, api_path)
         except aiohttp.ClientError as e:
             SYLogger.error(
-                f"nacos:请求服务接口时出错ClientError path: {api_path} error:{e}")
+                f"nacos:请求服务接口时出错ClientError server: {service_name} path: {api_path} error:{e}")
             return None
     except Exception as e:
         import traceback
         SYLogger.error(
-            f"nacos:请求服务接口时出错 path: {api_path} error:{traceback.format_exc()}")
+            f"nacos:请求服务接口时出错 server: {service_name} path: {api_path} error:{traceback.format_exc()}")
         return None
     finally:
         await session.close()
 
 
-async def _handle_feign_response(response):
+async def _handle_feign_response(response, service_name: str, api_path: str):
     """
     处理Feign请求的响应，统一返回格式
     调整逻辑：先判断状态码，再处理内容
@@ -160,9 +160,9 @@ async def _handle_feign_response(response):
                     response_body = await response.text(encoding='utf-8', errors='ignore')
             except Exception:
                 binary_data = await response.read()
-                response_body = f"非200状态，响应无法解码：{binary_data[:100].hex()}"
+                response_body = f"非200状态，响应无法解码：{binary_data[:100].hex()} server: {service_name} path: {api_path}"
 
-            error_msg = f"请求失败，状态码: {status_code}，响应内容: {str(response_body)[:500]}"
+            error_msg = f"请求失败，状态码: {status_code}，响应内容: {str(response_body)[:500]} server: {service_name} path: {api_path}"
             SYLogger.error(error_msg)
             return {
                 "success": False,
@@ -174,5 +174,6 @@ async def _handle_feign_response(response):
     except Exception as e:
         import traceback
         error_detail = f"处理响应异常: {str(e)}\n{traceback.format_exc()}"
-        SYLogger.error(f"nacos:处理响应时出错: {error_detail}")
+        SYLogger.error(
+            f"nacos:处理响应时出错: {error_detail} server: {service_name} path: {api_path}")
         return None

sycommon/synacos/nacos_service.py

@@ -10,7 +10,6 @@ import yaml
 import time
 import atexit
 import random
-from concurrent.futures import ThreadPoolExecutor
 
 from sycommon.config.Config import SingletonMeta
 from sycommon.logging.kafka_log import SYLogger
@@ -34,22 +33,17 @@ class NacosService(metaclass=SingletonMeta):
             # 添加可重入锁用于状态同步
             self._state_lock = threading.RLock()
 
-            # 优化线程池配置，增加工作线程数量
-            self._executor = ThreadPoolExecutor(max_workers=1)  # 主线程池
-            self._heartbeat_executor = ThreadPoolExecutor(
-                max_workers=1)  # 增加心跳线程
-            self._monitor_executor = ThreadPoolExecutor(
-                max_workers=1)  # 增加监控线程
-
             # 配置参数
             self.max_retries = self.nacos_config.get('maxRetries', 5)
-            self.retry_delay = self.nacos_config.get('retryDelay', 1)
-            self.retry_backoff = self.nacos_config.get('retryBackoff', 1.5)
+            self.retry_delay = self.nacos_config.get('retryDelay', 5)
             self.max_retry_delay = self.nacos_config.get('maxRetryDelay', 30)
+            # 心跳间隔：优先从配置读取，默认15秒（可通过配置修改）
             self.heartbeat_interval = self.nacos_config.get(
                 'heartbeatInterval', 15)
+            # 心跳超时：固定设置为10秒（需求指定）
+            self.heartbeat_timeout = 15
             self.register_retry_interval = self.nacos_config.get(
-                'registerRetryInterval', 5)  # 注册重试间隔
+                'registerRetryInterval', 15)  # 注册重试间隔
 
             # 长期重试配置
             self.long_term_retry_delay = self.nacos_config.get(
@@ -57,11 +51,13 @@ class NacosService(metaclass=SingletonMeta):
             self.max_long_term_retries = self.nacos_config.get(
                 'maxLongTermRetries', -1)  # -1表示无限重试
 
-            # 注册验证配置
+            # 注册验证配置：优化默认值（增加次数+延长间隔）
             self.registration_verify_count = self.nacos_config.get(
                 'registrationVerifyCount', 1)  # 验证次数
             self.registration_verify_interval = self.nacos_config.get(
                 'registrationVerifyInterval', 1)  # 验证间隔
+            self.registration_post_delay = self.nacos_config.get(
+                'registrationPostDelay', 3)  # 注册后延迟3秒再开始验证
 
             self.real_ip = self.get_service_ip(self.host)
             self._long_term_retry_count = 0  # 长期重试计数器
@@ -129,8 +125,7 @@ class NacosService(metaclass=SingletonMeta):
                 self._client_initialized = True
                 return True
             except Exception as e:
-                delay = min(self.retry_delay * (self.retry_backoff **
-                            attempt), self.max_retry_delay)
+                delay = min(self.retry_delay, self.max_retry_delay)
                 SYLogger.error(
                     f"nacos:客户端初始化失败 (尝试 {attempt+1}/{self.max_retries}): {e}")
                 time.sleep(delay)
@@ -193,8 +188,7 @@ class NacosService(metaclass=SingletonMeta):
 
                 except Exception as e:
                     attempt += 1
-                    delay = min(self.retry_delay * (self.retry_backoff **
-                                (attempt - 1)), self.max_retry_delay)
+                    delay = min(self.retry_delay, self.max_retry_delay)
 
                     SYLogger.error(
                         f"nacos:客户端初始化失败 (尝试 {attempt}/{max_attempts}): {e}")
@@ -308,12 +302,12 @@ class NacosService(metaclass=SingletonMeta):
                 if not register_success:
                     raise RuntimeError("nacos:服务注册请求失败")
 
-                # 注册请求发送成功后，等待一小段时间让Nacos服务器处理
+                # 关键优化1：注册请求发送后，延迟一段时间再验证（默认3秒）
                 SYLogger.info(
-                    f"nacos:服务注册请求已发送，等待 {self.registration_verify_interval} 秒后验证")
-                time.sleep(self.registration_verify_interval)
+                    f"nacos:服务注册请求已发送，延迟 {self.registration_post_delay} 秒后开始验证（确保Nacos服务器完成实例写入）")
+                time.sleep(self.registration_post_delay)
 
-                # 多次验证服务是否真正注册成功
+                # 关键优化2：多次验证服务是否真正注册成功（默认3次，每次间隔2秒）
                 registered = self.verify_registration()
 
                 # 带锁更新注册状态
@@ -342,8 +336,7 @@ class NacosService(metaclass=SingletonMeta):
             except Exception as e:
                 last_error = str(e)
                 retry_count += 1
-                delay = min(self.register_retry_interval *
-                            (self.retry_backoff ** (retry_count - 1)), self.max_retry_delay)
+                delay = min(self.register_retry_interval, self.max_retry_delay)
 
                 SYLogger.warning(
                     f"nacos:服务注册尝试 {retry_count} 失败: {last_error}，{delay}秒后重试")
@@ -429,8 +422,13 @@ class NacosService(metaclass=SingletonMeta):
             timeout = 60  # 60秒超时
             start_time = time.time()
 
-            # 启动注册线程，不阻塞主线程
-            instance._executor.submit(instance.register_with_retry)
+            # 启动注册线程，不阻塞主线程（替换原线程池）
+            register_thread = threading.Thread(
+                target=instance.register_with_retry,
+                daemon=True,
+                name="NacosRegisterThread"
+            )
+            register_thread.start()
 
             # 等待注册完成或超时
             while True:
@@ -461,7 +459,7 @@ class NacosService(metaclass=SingletonMeta):
 
             # 启动连接监控线程
             threading.Thread(target=instance.monitor_connection,
-                             daemon=True).start()
+                             daemon=True, name="NacosConnectionMonitorThread").start()
         else:
             SYLogger.info("nacos:本地开发模式，跳过服务注册流程")
 
@@ -485,7 +483,11 @@ class NacosService(metaclass=SingletonMeta):
             )
             self._heartbeat_thread.daemon = True
             self._heartbeat_thread.start()
-            SYLogger.info(f"nacos:心跳线程启动，线程ID: {self._heartbeat_thread.ident}")
+            SYLogger.info(
+                f"nacos:心跳线程启动，线程ID: {self._heartbeat_thread.ident}，"
+                f"心跳间隔: {self.heartbeat_interval}秒，"
+                f"心跳超时: {self.heartbeat_timeout}秒"
+            )
 
     def _send_heartbeat_loop(self):
         """优化后的心跳发送循环，确保严格按间隔执行"""
@@ -493,7 +495,8 @@ class NacosService(metaclass=SingletonMeta):
         thread_ident = current_thread.ident
         SYLogger.info(
             f"nacos:心跳循环启动 - 线程ID: {thread_ident}, "
-            f"配置间隔: {self.heartbeat_interval}秒"
+            f"配置间隔: {self.heartbeat_interval}秒, "
+            f"超时时间: {self.heartbeat_timeout}秒"
         )
 
         consecutive_fail = 0  # 连续失败计数器
@@ -512,7 +515,7 @@ class NacosService(metaclass=SingletonMeta):
                         f"nacos:服务未注册，跳过心跳 - 线程ID: {thread_ident}")
                     consecutive_fail = 0
                 else:
-                    # 发送心跳
+                    # 发送心跳（10秒超时）
                     success = self.send_heartbeat()
                     if success:
                         consecutive_fail = 0
@@ -545,26 +548,46 @@ class NacosService(metaclass=SingletonMeta):
         SYLogger.info(f"nacos:心跳循环已停止 - 线程ID: {thread_ident}")
 
     def send_heartbeat(self):
-        """发送心跳并添加超时控制"""
+        """发送心跳并添加10秒超时控制（替换线程池实现）"""
         if not self.ensure_client_connected():
             SYLogger.warning("nacos:客户端未连接，心跳发送失败")
             return False
 
-        try:
-            # 严格控制心跳超时（3秒）
-            future = self._heartbeat_executor.submit(
-                self._send_heartbeat_internal)
-            result = future.result(timeout=3)  # 超时后抛出异常
-
-            if result:
-                # 只有确认成功才更新时间戳
-                self._last_successful_heartbeat = time.time()
-            return result
-        except Exception as e:
-            SYLogger.error(f"nacos:发送心跳时发生异常: {e}")
+        # 用线程+join实现10秒超时控制
+        result_list = []  # 用于线程间传递结果
+
+        def heartbeat_task():
+            """心跳实际执行任务"""
+            try:
+                result = self._send_heartbeat_internal()
+                result_list.append(result)
+            except Exception as e:
+                SYLogger.error(f"nacos:心跳任务执行异常: {e}")
+                result_list.append(False)
+
+        # 启动心跳任务线程
+        task_thread = threading.Thread(
+            target=heartbeat_task,
+            daemon=True,
+            name="NacosHeartbeatTaskThread"
+        )
+        task_thread.start()
+
+        # 等待线程完成，最多等待10秒
+        task_thread.join(timeout=self.heartbeat_timeout)
+
+        # 处理结果
+        if not result_list:
+            # 超时未返回
+            SYLogger.error(f"nacos:心跳发送超时（{self.heartbeat_timeout}秒）")
             self._client_initialized = False  # 强制重连
             return False
 
+        # 检查心跳结果
+        if result_list[0]:
+            self._last_successful_heartbeat = time.time()
+        return result_list[0]
+
     def _send_heartbeat_internal(self):
         """实际的心跳发送逻辑"""
         result = self.nacos_client.send_heartbeat(
@@ -620,9 +643,13 @@ class NacosService(metaclass=SingletonMeta):
                         else:
                             self.registered = False
                             SYLogger.warning(f"nacos:服务实例未注册，尝试重新注册")
-                            # 不在锁内调用可能耗时的操作
-                            self._monitor_executor.submit(
-                                self.register_with_retry)
+                            # 启动临时线程执行重新注册（替换原线程池）
+                            retry_thread = threading.Thread(
+                                target=self.register_with_retry,
+                                daemon=True,
+                                name="NacosRetryRegisterThread"
+                            )
+                            retry_thread.start()
 
                 # 20%的概率执行深度检查
                 if random.random() < 0.2:
@@ -673,13 +700,6 @@ class NacosService(metaclass=SingletonMeta):
             SYLogger.error(f"nacos:注销服务时发生错误: {e}")
         finally:
             self._shutdown_event.set()
-            # 优雅地关闭线程池
-            if self._executor and not self._executor._shutdown:
-                self._executor.shutdown(wait=True)
-            if self._heartbeat_executor and not self._heartbeat_executor._shutdown:
-                self._heartbeat_executor.shutdown(wait=True)
-            if self._monitor_executor and not self._monitor_executor._shutdown:
-                self._monitor_executor.shutdown(wait=True)
 
     def handle_signal(self, signum, frame):
         """处理退出信号"""
@@ -751,7 +771,8 @@ class NacosService(metaclass=SingletonMeta):
                 for data_id, callback in list(self._config_listeners.items()):
                     new_config = self.get_config(data_id)
                     if new_config and new_config != self._config_cache.get(data_id):
-                        self._executor.submit(callback, new_config)
+                        # 直接执行回调（替换原线程池，配置回调通常为轻量操作）
+                        callback(new_config)
                         self._config_cache[data_id] = new_config
             except Exception as e:
                 SYLogger.error(f"nacos:配置监视线程异常: {str(e)}")

{sycommon_python_lib-0.1.43.dist-info → sycommon_python_lib-0.1.45.dist-info}/METADATA

@@ -1,22 +1,22 @@
 Metadata-Version: 2.4
 Name: sycommon-python-lib
-Version: 0.1.43
+Version: 0.1.45
 Summary: Add your description here
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: aio-pika>=9.5.7
-Requires-Dist: aiohttp>=3.13.1
+Requires-Dist: aio-pika>=9.5.8
+Requires-Dist: aiohttp>=3.13.2
 Requires-Dist: decorator>=5.2.1
-Requires-Dist: fastapi>=0.120.0
-Requires-Dist: kafka-python>=2.2.15
+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: pydantic>=2.12.3
+Requires-Dist: pydantic>=2.12.4
 Requires-Dist: python-dotenv>=1.2.1
 Requires-Dist: pyyaml>=6.0.3
 Requires-Dist: sqlalchemy>=2.0.44
-Requires-Dist: starlette>=0.48.0
+Requires-Dist: starlette>=0.49.3
 Requires-Dist: uuid>=1.30
 Requires-Dist: uvicorn>=0.38.0
 

{sycommon_python_lib-0.1.43.dist-info → sycommon_python_lib-0.1.45.dist-info}/RECORD

@@ -1,6 +1,6 @@
 command/cli.py,sha256=bP2LCLkRvfETIwWkVD70q5xFxMI4D3BpH09Ws1f-ENc,5849
 sycommon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-sycommon/services.py,sha256=e9odPBLUoAAUkFU4s8ITIQUbr1GH7dqb9qSHyUhN4A8,11258
+sycommon/services.py,sha256=LHMRxxRvLAiekkVspaQClBgAR_jLKqiJpd5hqF74MIE,11369
 sycommon/config/Config.py,sha256=9yO5b8WfvEDvkyrGrlwrLFasgh_-MjcEvGF20Gz5Xo4,3041
 sycommon/config/DatabaseConfig.py,sha256=ILiUuYT9_xJZE2W-RYuC3JCt_YLKc1sbH13-MHIOPhg,804
 sycommon/config/EmbeddingConfig.py,sha256=gPKwiDYbeu1GpdIZXMmgqM7JqBIzCXi0yYuGRLZooMI,362
@@ -35,25 +35,25 @@ sycommon/models/mqlistener_config.py,sha256=vXp2uMmd0XQ5B9noSRXWHewTy-juQ2y7IsWt
 sycommon/models/mqmsg_model.py,sha256=cxn0M5b0utQK6crMYmL-1waeGYHvK3AlGaRy23clqTE,277
 sycommon/models/mqsend_config.py,sha256=NQX9dc8PpuquMG36GCVhJe8omAW1KVXXqr6lSRU6D7I,268
 sycommon/models/sso_user.py,sha256=i1WAN6k5sPcPApQEdtjpWDy7VrzWLpOrOQewGLGoGIw,2702
-sycommon/rabbitmq/rabbitmq_client.py,sha256=aRS7sYN4RAJ210Bl-Bh0qR7mXpaag_5YygNXz6ryhtQ,19677
-sycommon/rabbitmq/rabbitmq_pool.py,sha256=j4zmmyxFbkeJ9-VsTo3-JqjpvHnfxA8omvp7zNei4yA,16758
-sycommon/rabbitmq/rabbitmq_service.py,sha256=i9SLammld_oMRQskSGw9UGOTuRBdZcuCFUq0YObME-Y,40012
+sycommon/rabbitmq/rabbitmq_client.py,sha256=dKpiptV892VbW3fErAoRZSE9UVVBZvbVPM3qPu8rQIk,21573
+sycommon/rabbitmq/rabbitmq_pool.py,sha256=ckHEpvPXS4TdHRS_2eGyiQ7kej3P7Wnyk3nttAjk04o,17724
+sycommon/rabbitmq/rabbitmq_service.py,sha256=L7SKf8Ws2wZvF0YGU1ZUiqg3z_viSNmMR0Zz4_5jBSY,39775
 sycommon/sse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sycommon/sse/event.py,sha256=k_rBJy23R7crtzQeetT0Q73D8o5-5p-eESGSs_BPOj0,2797
 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=0cmnyExXcr1qIV0B_POdQ-_u4-t5K3LjJD_8rDaXwSE,7467
+sycommon/synacos/feign.py,sha256=-2tuGCqoSM3ddSoSz7h1RJTB06hn8K26v_1ev4qLsTU,7728
 sycommon/synacos/feign_client.py,sha256=JxzxohrsscQNlAjRVo_3ZQrMQSfVHFOtRYyEnP6sDGk,15205
-sycommon/synacos/nacos_service.py,sha256=QG1lShrVZNKbExYV_IUwGXTHDnU09RYXooVy_llhW6c,34661
+sycommon/synacos/nacos_service.py,sha256=2m1ZxIii3r657kQJfp7C7I5bxBUEGDweYMfloUUmBSw,35389
 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=DdEj3T5r5OEvikp3puxqmmmz6BrggxomoSlnsRFb5dM,1174
 sycommon/tools/timing.py,sha256=OiiE7P07lRoMzX9kzb8sZU9cDb0zNnqIlY5pWqHcnkY,2064
-sycommon_python_lib-0.1.43.dist-info/METADATA,sha256=tC87wV6W1tA6pPVBv1TjUBUV0ZlBeCMUclUt06ANu_g,7037
-sycommon_python_lib-0.1.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.43.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.43.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.43.dist-info/RECORD,,
+sycommon_python_lib-0.1.45.dist-info/METADATA,sha256=z1pOqekth0xbqc4RfCkk5CHHm3b4FS4R0Tcy3BxUYus,7037
+sycommon_python_lib-0.1.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.45.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.45.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.45.dist-info/RECORD,,