sycommon-python-lib 0.1.33__py3-none-any.whl → 0.1.35__py3-none-any.whl

sycommon/services.py

@@ -22,6 +22,7 @@ class Services(metaclass=SingletonMeta):
     _instance: Optional['Services'] = None
     _app: Optional[FastAPI] = None
     _user_lifespan: Optional[Callable] = None
+    _shutdown_lock: asyncio.Lock = asyncio.Lock()
 
     def __init__(self, config: dict, app: FastAPI):
         if not Services._config:
@@ -66,8 +67,12 @@ class Services(metaclass=SingletonMeta):
         if not cls._config:
             config = yaml.safe_load(open('app.yaml', 'r', encoding='utf-8'))
             cls._config = config
-        app.host = cls._config.get('Host')
-        app.post = cls._config.get('Port')
+        # 使用config
+        app.state.config = {
+            "host": cls._config.get('Host', '0.0.0.0'),
+            "port": cls._config.get('Port', 8080),
+            "workers": cls._config.get('Workers', 1)
+        }
 
         # 立即配置非异步服务（在应用启动前）
         if middleware:
@@ -139,10 +144,18 @@ class Services(metaclass=SingletonMeta):
         has_listeners: bool = False,
         has_senders: bool = False,
     ):
-        """异步设置MQ相关服务"""
+        """异步设置MQ相关服务（适配新的RabbitMQService）"""
         # 初始化RabbitMQ服务，传递状态
         RabbitMQService.init(self._config, has_listeners, has_senders)
 
+        # 等待RabbitMQ连接池初始化完成（最多等待30秒）
+        start_time = asyncio.get_event_loop().time()
+        while not RabbitMQService._connection_pool and not RabbitMQService._is_shutdown:
+            if asyncio.get_event_loop().time() - start_time > 30:
+                raise TimeoutError("RabbitMQ连接池初始化超时")
+            logging.info("等待RabbitMQ连接池初始化...")
+            await asyncio.sleep(1)
+
         # 设置发送器，传递是否有监听器的标志
         if rabbitmq_senders:
             # 判断是否有监听器，如果有遍历监听器列表，队列名一样将prefetch_count属性设置到发送器对象中
@@ -159,20 +172,25 @@ class Services(metaclass=SingletonMeta):
 
         # 验证初始化结果
         if has_listeners:
+            # 异步获取客户端数量（适配新的RabbitMQService）
             listener_count = len(RabbitMQService._clients)
             logging.info(f"监听器初始化完成，共启动 {listener_count} 个消费者")
             if listener_count == 0:
                 logging.warning("未成功初始化任何监听器，请检查配置")
 
     async def _setup_senders_async(self, rabbitmq_senders, has_listeners: bool):
+        """设置发送器（适配新的RabbitMQService异步方法）"""
         Services._registered_senders = [
             sender.queue_name for sender in rabbitmq_senders]
 
-        # 将是否有监听器的信息传递给RabbitMQService
+        # 将是否有监听器的信息传递给RabbitMQService（异步调用）
         await RabbitMQService.setup_senders(rabbitmq_senders, has_listeners)
+        # 更新已注册的发送器（从RabbitMQService获取实际注册的名称）
+        Services._registered_senders = RabbitMQService._sender_client_names
         logging.info(f"已注册的RabbitMQ发送器: {Services._registered_senders}")
 
     async def _setup_listeners_async(self, rabbitmq_listeners, has_senders: bool):
+        """设置监听器（适配新的RabbitMQService异步方法）"""
         await RabbitMQService.setup_listeners(rabbitmq_listeners, has_senders)
 
     @classmethod
@@ -183,27 +201,30 @@ class Services(metaclass=SingletonMeta):
         max_retries: int = 3,
         retry_delay: float = 1.0, **kwargs
     ) -> None:
-        """发送消息，添加重试机制"""
+        """发送消息，添加重试机制（适配新的RabbitMQService异步API）"""
         if not cls._initialized or not cls._loop:
             logging.error("Services not properly initialized!")
             raise ValueError("服务未正确初始化")
 
+        if RabbitMQService._is_shutdown:
+            logging.error("RabbitMQService已关闭，无法发送消息")
+            raise RuntimeError("RabbitMQ服务已关闭")
+
         for attempt in range(max_retries):
             try:
+                # 验证发送器是否注册
                 if queue_name not in cls._registered_senders:
                     cls._registered_senders = RabbitMQService._sender_client_names
                     if queue_name not in cls._registered_senders:
                         raise ValueError(f"发送器 {queue_name} 未注册")
 
-                sender = RabbitMQService.get_sender(queue_name)
+                # 获取发送器（适配新的异步get_sender方法）
+                sender = await RabbitMQService.get_sender(queue_name)
                 if not sender:
-                    raise ValueError(f"发送器 '{queue_name}' 不存在")
+                    raise ValueError(f"发送器 '{queue_name}' 不存在或连接无效")
 
-                if not (sender.is_connected and sender.channel and not sender.channel.is_closed):
-                    logging.info(f"发送器 '{queue_name}' 连接无效，强制重连")
-                    await sender.connect(force_reconnect=True, declare_queue=False)
-
-                await RabbitMQService.send_message(data, queue_name, ** kwargs)
+                # 发送消息（调用RabbitMQService的异步send_message）
+                await RabbitMQService.send_message(data, queue_name, **kwargs)
                 logging.info(f"消息发送成功（尝试 {attempt+1}/{max_retries}）")
                 return
 
@@ -219,17 +240,28 @@ class Services(metaclass=SingletonMeta):
                 )
                 await asyncio.sleep(retry_delay)
 
-    @staticmethod
-    async def shutdown():
-        """关闭所有服务"""
-        # 取消所有MQ任务
-        for task in Services._mq_tasks:
-            if not task.done():
-                task.cancel()
-                try:
-                    await task
-                except asyncio.CancelledError:
-                    pass
-
-        # 关闭RabbitMQ服务
-        await RabbitMQService.shutdown()
+    @classmethod
+    async def shutdown(cls):
+        """关闭所有服务（线程安全，适配新的RabbitMQService关闭逻辑）"""
+        async with cls._shutdown_lock:
+            if RabbitMQService._is_shutdown:
+                logging.info("RabbitMQService已关闭，无需重复操作")
+                return
+
+            # 取消所有MQ任务
+            for task in Services._mq_tasks:
+                if not task.done():
+                    task.cancel()
+                    try:
+                        await task
+                    except asyncio.CancelledError:
+                        logging.info(f"MQ任务 {task.get_name()} 已取消")
+
+            # 关闭RabbitMQ服务（异步调用）
+            await RabbitMQService.shutdown()
+
+            # 清理全局状态
+            cls._initialized = False
+            cls._registered_senders.clear()
+            cls._mq_tasks.clear()
+            logging.info("所有服务已关闭")

sycommon/synacos/feign.py

@@ -123,15 +123,28 @@ async def feign(service_name, api_path, method='GET', params=None, headers=None,
 
 
 async def _handle_feign_response(response):
-    """处理Feign请求的响应"""
-    if response.status == 200:
-        content_type = response.headers.get('Content-Type')
+    """处理Feign请求的响应，统一返回格式"""
+    try:
+        content_type = response.headers.get('Content-Type', '')
         if 'application/json' in content_type:
-            return await response.json()
+            response_body = await response.json()
         else:
-            content = await response.read()
-            return io.BytesIO(content)
+            response_body = await response.text()
+    except Exception as e:
+        response_body = f"读取响应体失败: {str(e)}"
+        SYLogger.error(f"nacos:处理响应时出错: {response_body}")
+
+    if response.status == 200:
+        if 'application/octet-stream' in content_type:
+            return io.BytesIO(await response.read())  # 重新读取二进制内容
+        return response_body
     else:
-        error_msg = await response.text()
-        SYLogger.error(f"nacos:请求失败，状态码: {response.status}，响应内容: {error_msg}")
-        return None
+        # 失败：返回统一错误字典，包含状态码、响应体
+        error_msg = f"请求失败，状态码: {response.status}，响应内容: {response_body}"
+        SYLogger.error(error_msg)
+        return {
+            "success": False,
+            "code": response.status,
+            "message": error_msg,
+            "data": response_body
+        }

{sycommon_python_lib-0.1.33.dist-info → sycommon_python_lib-0.1.35.dist-info}/METADATA

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

{sycommon_python_lib-0.1.33.dist-info → sycommon_python_lib-0.1.35.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=cPLqMtTHMhCrvdrYJWyVAMrl4G8Wc9w4vFkgYcTz7LQ,9463
+sycommon/services.py,sha256=e9odPBLUoAAUkFU4s8ITIQUbr1GH7dqb9qSHyUhN4A8,11258
 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,16 +35,16 @@ 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=mI_e8iP2F9_oYMPvrP9wYW5x1wtLPLaxpNJ9719pDs4,27899
+sycommon/rabbitmq/rabbitmq_client.py,sha256=Zb3A1SFY7JTL0TtvZU2WwMoRDx3IDI28u7L1L9z8Rn4,41304
 sycommon/rabbitmq/rabbitmq_pool.py,sha256=_NMOO4CZy-I_anMqpzfYinz-8373_rg5FM9eqzdjGyU,3598
-sycommon/rabbitmq/rabbitmq_service.py,sha256=fP3kslCL_LfYHeM7D88C8hDFeq00bdipSh4q-LU23mo,30193
+sycommon/rabbitmq/rabbitmq_service.py,sha256=XW_TFWXCgmR8jKB7nZllpijFdj-9O5h80KWSOxhaMJA,35282
 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=i-e2TgzAho3HZosQnzNy8Xl-8Q8a4BWsGey1Y-Kr4_8,5518
+sycommon/synacos/feign.py,sha256=gD5r_H2ZhqdxjRIvYTt6l5DoKyGihyTzkQgrMVqbzlw,6057
 sycommon/synacos/feign_client.py,sha256=JxzxohrsscQNlAjRVo_3ZQrMQSfVHFOtRYyEnP6sDGk,15205
 sycommon/synacos/nacos_service.py,sha256=SO1s83Y8A5jyQNFhk7ZZ_BrGQyGZ8TXBKtzRYxI-uDQ,34661
 sycommon/synacos/param.py,sha256=KcfSkxnXOa0TGmCjY8hdzU9pzUsA8-4PeyBKWI2-568,1765
@@ -52,8 +52,8 @@ 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.33.dist-info/METADATA,sha256=UfJB9N7EShz-rTDuKzcQcVZ-Wx-4liFN9pgcBONggyk,7037
-sycommon_python_lib-0.1.33.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-sycommon_python_lib-0.1.33.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
-sycommon_python_lib-0.1.33.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
-sycommon_python_lib-0.1.33.dist-info/RECORD,,
+sycommon_python_lib-0.1.35.dist-info/METADATA,sha256=j34xKIYcABwKu196AEWCX6nMbRzDwpRSSpLdWPWGZ74,7037
+sycommon_python_lib-0.1.35.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+sycommon_python_lib-0.1.35.dist-info/entry_points.txt,sha256=q_h2nbvhhmdnsOUZEIwpuoDjaNfBF9XqppDEmQn9d_A,46
+sycommon_python_lib-0.1.35.dist-info/top_level.txt,sha256=98CJ-cyM2WIKxLz-Pf0AitWLhJyrfXvyY8slwjTXNuc,17
+sycommon_python_lib-0.1.35.dist-info/RECORD,,