codosdk 1.0.41__tar.gz → 1.0.43__tar.gz

{codosdk-1.0.41 → codosdk-1.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codosdk
-Version: 1.0.41
+Version: 1.0.43
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -23,7 +23,7 @@ Requires-Dist: fire==0.5.0
 Requires-Dist: shortuuid==1.0.11
 Requires-Dist: pymysql==0.9.3
 Requires-Dist: sqlalchemy==1.3.23
-Requires-Dist: pika==1.3.1
+Requires-Dist: pika==1.3.2
 Requires-Dist: PyJWT==2.0.1
 Requires-Dist: requests==2.28.2
 Requires-Dist: redis==4.5.1

{codosdk-1.0.41 → codosdk-1.0.43}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codosdk
-Version: 1.0.41
+Version: 1.0.43
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo
@@ -23,7 +23,7 @@ Requires-Dist: fire==0.5.0
 Requires-Dist: shortuuid==1.0.11
 Requires-Dist: pymysql==0.9.3
 Requires-Dist: sqlalchemy==1.3.23
-Requires-Dist: pika==1.3.1
+Requires-Dist: pika==1.3.2
 Requires-Dist: PyJWT==2.0.1
 Requires-Dist: requests==2.28.2
 Requires-Dist: redis==4.5.1

{codosdk-1.0.41 → codosdk-1.0.43}/codosdk.egg-info/requires.txt

@@ -2,7 +2,7 @@ fire==0.5.0
 shortuuid==1.0.11
 pymysql==0.9.3
 sqlalchemy==1.3.23
-pika==1.3.1
+pika==1.3.2
 PyJWT==2.0.1
 requests==2.28.2
 redis==4.5.1

{codosdk-1.0.41 → codosdk-1.0.43}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.41'
+VERSION = '1.0.43'
 
 if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
     print('This program requires at least Python 2.7 or 3.6 to run.')
@@ -24,7 +24,7 @@ def get_data_files():
 
 
 def get_install_requires():
-    requires = ['fire==0.5.0', 'shortuuid==1.0.11', 'pymysql==0.9.3', 'sqlalchemy==1.3.23', 'pika==1.3.1',
+    requires = ['fire==0.5.0', 'shortuuid==1.0.11', 'pymysql==0.9.3', 'sqlalchemy==1.3.23', 'pika==1.3.2',
                 'PyJWT==2.0.1', 'requests==2.28.2', 'redis==4.5.1', 'tornado>=6.0', 'loguru>=0.6.0',
                 'cryptography==42.0.4', 'ldap3==2.9', 'pydantic>=1.10.5']
     return requires

{codosdk-1.0.41 → codosdk-1.0.43}/websdk2/mqhelper.py

@@ -148,22 +148,31 @@ class RabbitMQConnectionPool:
             mq_config = configs[const.MQ_CONFIG_ITEM][mq_key]
             cls._validate_config(mq_config)
 
-            # 创建连接
+            # 创建连接参数，优化超时和重试设置
             credentials = pika.PlainCredentials(
                 mq_config[const.MQ_USER],
                 mq_config[const.MQ_PWD]
             )
-            connection = pika.BlockingConnection(
-                pika.ConnectionParameters(
-                    host=mq_config[const.MQ_ADDR],
-                    port=int(mq_config[const.MQ_PORT]),
-                    virtual_host=mq_config[const.MQ_VHOST],
-                    credentials=credentials,
-                    heartbeat=600,
-                    blocked_connection_timeout=300
-                )
+
+            connection_params = pika.ConnectionParameters(
+                host=mq_config[const.MQ_ADDR],
+                port=int(mq_config[const.MQ_PORT]),
+                virtual_host=mq_config[const.MQ_VHOST],
+                credentials=credentials,
+                heartbeat=300,  # 减少心跳间隔
+                blocked_connection_timeout=60,  # 减少阻塞超时
+                socket_timeout=30,  # 添加socket超时
+                connection_attempts=3,  # 连接重试次数
+                retry_delay=1,  # 重试延迟
+                stack_timeout=30  # 栈超时
             )
 
+            connection = pika.BlockingConnection(connection_params)
+
+            # 验证连接状态
+            if not connection.is_open:
+                raise Exception("Connection failed to open properly")
+
             cls._connections[mq_key] = connection
             logging.info(f"Created new RabbitMQ connection for key: {mq_key}")
 
@@ -255,12 +264,86 @@ class MessageQueueBase:
             )
 
     def _get_channel(self) -> Any:
-        """获取新的通道"""
-        connection = RabbitMQConnectionPool.get_connection(self._mq_key)
-        return connection.channel()
+        """获取新的通道 - 使用更安全的方式避免pika并发Bug"""
+        max_attempts = 2  # 减少重试次数避免过度重试
+
+        for attempt in range(max_attempts):
+            try:
+                # 每次都创建新连接，避免连接复用导致的并发问题
+                if attempt > 0:
+                    # 强制清理并等待
+                    with RabbitMQConnectionPool._connection_lock:
+                        try:
+                            if self._mq_key in RabbitMQConnectionPool._connections:
+                                RabbitMQConnectionPool._cleanup_connection(self._mq_key)
+                                RabbitMQConnectionPool._connections[self._mq_key] = None
+                        except:
+                            pass
+
+                    # 等待稍长时间让连接完全清理
+                    time.sleep(0.5)
+
+                connection = RabbitMQConnectionPool.get_connection(self._mq_key)
+                if not connection:
+                    raise Exception("Failed to get connection")
+
+                # 简化状态检查，避免触发pika内部Bug
+                if hasattr(connection, 'is_open') and not connection.is_open:
+                    raise Exception("Connection is not open")
+
+                # 直接创建channel，不做额外的心跳检查
+                channel = connection.channel()
+                if not channel:
+                    raise Exception("Failed to create channel")
+
+                if hasattr(channel, 'is_open') and not channel.is_open:
+                    raise Exception("Channel is not open")
+
+                return channel
+
+            except Exception as e:
+                self.logger.warning(f"Failed to get channel (attempt {attempt + 1}/{max_attempts}): {e}")
+                if attempt == max_attempts - 1:
+                    # 最后一次失败，创建一个临时连接
+                    try:
+                        return self._create_emergency_channel()
+                    except Exception as emergency_e:
+                        raise Exception(f"All channel attempts failed. Last error: {e}, Emergency error: {emergency_e}")
+
+        raise Exception("Unexpected error in channel creation")
+
+    def _create_emergency_channel(self) -> Any:
+        """创建紧急通道 - 直接连接，不使用连接池"""
+        try:
+            mq_config = configs[const.MQ_CONFIG_ITEM][self._mq_key]
+
+            credentials = pika.PlainCredentials(
+                mq_config[const.MQ_USER],
+                mq_config[const.MQ_PWD]
+            )
+
+            # 使用最简单的连接参数
+            connection_params = pika.ConnectionParameters(
+                host=mq_config[const.MQ_ADDR],
+                port=int(mq_config[const.MQ_PORT]),
+                virtual_host=mq_config[const.MQ_VHOST],
+                credentials=credentials,
+                heartbeat=0,  # 禁用心跳
+                socket_timeout=10
+            )
+
+            connection = pika.BlockingConnection(connection_params)
+            channel = connection.channel()
+
+            self.logger.info("Created emergency channel")
+            return channel
+
+        except Exception as e:
+            self.logger.error(f"Failed to create emergency channel: {e}")
+            raise
 
     def _with_retry(self, operation: Callable, *args, **kwargs) -> Any:
-        """带重试机制执行操作"""
+        """带重试机制执行操作 - 优化版本"""
         last_exception = None
 
         for attempt in range(self._max_retries + 1):
@@ -273,8 +356,24 @@ class MessageQueueBase:
                     break
                 else:
                     self.logger.warning(f"Attempt {attempt + 1} failed: {e}. Retrying...")
-                    # 触发连接重建
-                    RabbitMQConnectionPool._connections[self._mq_key] = None
+
+                    # 只在特定错误类型时清理连接
+                    error_str = str(e).lower()
+                    if any(keyword in error_str for keyword in [
+                        'connection', 'channel', 'socket', 'transport',
+                        'callback', 'deque', 'abort', 'closed', 'asynctransport'
+                    ]):
+                        # 安全地清理连接
+                        with RabbitMQConnectionPool._connection_lock:
+                            try:
+                                if self._mq_key in RabbitMQConnectionPool._connections:
+                                    RabbitMQConnectionPool._cleanup_connection(self._mq_key)
+                                    RabbitMQConnectionPool._connections[self._mq_key] = None
+                            except Exception as cleanup_e:
+                                self.logger.debug(f"Error during connection cleanup: {cleanup_e}")
+
+                    # 递增延迟重试，但不要太长
+                    time.sleep(min(0.1 * (2 ** attempt), 2.0))
 
         raise last_exception
 
@@ -302,7 +401,7 @@ class MessageQueueBase:
 
                 # 如果有队列名，声明并绑定队列
                 if self._queue_name:
-                    channel.queue_declare(queue=self._queue_name)
+                    channel.queue_declare(queue=self._queue_name, durable=True)
                     channel.queue_bind(
                         exchange=self._exchange,
                         queue=self._queue_name,
@@ -322,8 +421,11 @@ class MessageQueueBase:
                     f'Published message to exchange:{self._exchange}, routing_key:{actual_routing_key}')
 
             finally:
-                if channel and channel.is_open:
-                    channel.close()
+                if channel and hasattr(channel, 'is_open') and channel.is_open:
+                    try:
+                        channel.close()
+                    except:
+                        pass  # 忽略关闭时的错误
 
         self._with_retry(_publish_operation)
 
@@ -373,11 +475,17 @@ class MessageQueueBase:
 
             except KeyboardInterrupt:
                 self.logger.info("Received interrupt signal, stopping consumption")
-                if channel and channel.is_open:
-                    channel.stop_consuming()
+                if channel and hasattr(channel, 'is_open') and channel.is_open:
+                    try:
+                        channel.stop_consuming()
+                    except:
+                        pass
             finally:
-                if channel and channel.is_open:
-                    channel.close()
+                if channel and hasattr(channel, 'is_open') and channel.is_open:
+                    try:
+                        channel.close()
+                    except:
+                        pass
 
         self._with_retry(_consume_operation)
 
@@ -498,5 +606,5 @@ if __name__ == "__main__":
 
     # 示例3：向后兼容的使用方式
     print("=== 向后兼容使用 ===")
-    with MessageQueueBase('test_exchange', 'direct', routing_key='test.key') as old_mq:
+    with MessageQueueBase('test_exchange', 'direct', routing_key='test.key', queue_name='task_test_queue') as old_mq:
         old_mq.publish_message("Hello from old interface!")