codosdk 1.0.44__tar.gz → 1.0.46__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {codosdk-1.0.44 → codosdk-1.0.46}/PKG-INFO +1 -1
- {codosdk-1.0.44 → codosdk-1.0.46}/codosdk.egg-info/PKG-INFO +1 -1
- {codosdk-1.0.44 → codosdk-1.0.46}/setup.py +1 -1
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/mqhelper.py +8 -4
- {codosdk-1.0.44 → codosdk-1.0.46}/LICENSE +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/README.md +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/codosdk.egg-info/SOURCES.txt +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/codosdk.egg-info/dependency_links.txt +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/codosdk.egg-info/requires.txt +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/codosdk.egg-info/top_level.txt +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/opssdk/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/opssdk/utils/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/pyproject.toml +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/setup.cfg +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/api_set.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/admin_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/agent_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/cmdb_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/kerrigan_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/mgv4_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/notice_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/apis/task_apis.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/application.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/base_handler.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cache.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cache_context.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/client.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cloud/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cloud/qcloud_api.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cloud/ucloud_api.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/cloud_utils.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/configs.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/consts.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/crud_utils.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/db_context.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/error.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/fetch_coroutine.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/jwt_token.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/ldap.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/logger.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/model_utils.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/program.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/salt_api.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/sqlalchemy_pagination.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/tools.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/utils/__init__.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/utils/cc_crypto.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/utils/date_format.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/utils/pydantic_utils.py +0 -0
- {codosdk-1.0.44 → codosdk-1.0.46}/websdk2/web_logs.py +0 -0
|
@@ -9,7 +9,7 @@ desc : CODO SDK
|
|
|
9
9
|
import sys
|
|
10
10
|
from setuptools import setup, find_packages
|
|
11
11
|
|
|
12
|
-
VERSION = '1.0.
|
|
12
|
+
VERSION = '1.0.46'
|
|
13
13
|
|
|
14
14
|
if sys.version_info < (2, 7) or (3, 0) <= sys.version_info < (3, 6):
|
|
15
15
|
print('This program requires at least Python 2.7 or 3.6 to run.')
|
|
@@ -385,7 +385,8 @@ class MessageQueueBase:
|
|
|
385
385
|
# ==================== 发布消息接口 ====================
|
|
386
386
|
|
|
387
387
|
def publish(self, body: Any, routing_key: Optional[str] = None,
|
|
388
|
-
durable: bool = True, exchange_durable: bool = False
|
|
388
|
+
durable: bool = True, exchange_durable: bool = False,
|
|
389
|
+
queue_durable: bool = None) -> None: # 🔥 新增参数:允许单独控制队列持久性
|
|
389
390
|
"""发布消息"""
|
|
390
391
|
|
|
391
392
|
def _publish_operation():
|
|
@@ -402,7 +403,9 @@ class MessageQueueBase:
|
|
|
402
403
|
|
|
403
404
|
# 如果有队列名,声明并绑定队列
|
|
404
405
|
if self._queue_name:
|
|
405
|
-
|
|
406
|
+
# 🔥 修改:支持单独控制队列持久性,解决队列配置冲突问题
|
|
407
|
+
actual_queue_durable = queue_durable if queue_durable is not None else durable
|
|
408
|
+
channel.queue_declare(queue=self._queue_name, durable=actual_queue_durable)
|
|
406
409
|
channel.queue_bind(
|
|
407
410
|
exchange=self._exchange,
|
|
408
411
|
queue=self._queue_name,
|
|
@@ -530,9 +533,10 @@ class MessageQueueBase:
|
|
|
530
533
|
RabbitMQConnectionPool._connections[self._mq_key] = None
|
|
531
534
|
|
|
532
535
|
# 统一的向后兼容发布方法
|
|
533
|
-
def publish_message(self, body: Any, durable: bool = True, exchange_durable: bool = False
|
|
536
|
+
def publish_message(self, body: Any, durable: bool = True, exchange_durable: bool = False,
|
|
537
|
+
queue_durable: bool = None) -> None: # 🔥 新增参数:向后兼容方法也支持队列持久性控制
|
|
534
538
|
"""向后兼容的发布方法"""
|
|
535
|
-
self.publish(body, durable=durable, exchange_durable=exchange_durable)
|
|
539
|
+
self.publish(body, durable=durable, exchange_durable=exchange_durable, queue_durable=queue_durable)
|
|
536
540
|
|
|
537
541
|
def close_channel(self) -> None:
|
|
538
542
|
"""关闭连接(向后兼容)"""
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|