codosdk 1.0.35__tar.gz → 1.0.36__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.
Files changed (52) hide show
  1. {codosdk-1.0.35 → codosdk-1.0.36}/PKG-INFO +1 -1
  2. {codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/PKG-INFO +1 -1
  3. {codosdk-1.0.35 → codosdk-1.0.36}/setup.py +1 -1
  4. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/tools.py +12 -2
  5. {codosdk-1.0.35 → codosdk-1.0.36}/LICENSE +0 -0
  6. {codosdk-1.0.35 → codosdk-1.0.36}/README.md +0 -0
  7. {codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/SOURCES.txt +0 -0
  8. {codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/dependency_links.txt +0 -0
  9. {codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/requires.txt +0 -0
  10. {codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/top_level.txt +0 -0
  11. {codosdk-1.0.35 → codosdk-1.0.36}/opssdk/__init__.py +0 -0
  12. {codosdk-1.0.35 → codosdk-1.0.36}/opssdk/utils/__init__.py +0 -0
  13. {codosdk-1.0.35 → codosdk-1.0.36}/pyproject.toml +0 -0
  14. {codosdk-1.0.35 → codosdk-1.0.36}/setup.cfg +0 -0
  15. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/__init__.py +0 -0
  16. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/api_set.py +0 -0
  17. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/__init__.py +0 -0
  18. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/admin_apis.py +0 -0
  19. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/agent_apis.py +0 -0
  20. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/cmdb_apis.py +0 -0
  21. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/kerrigan_apis.py +0 -0
  22. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/mgv4_apis.py +0 -0
  23. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/notice_apis.py +0 -0
  24. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/apis/task_apis.py +0 -0
  25. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/application.py +0 -0
  26. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/base_handler.py +0 -0
  27. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cache.py +0 -0
  28. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cache_context.py +0 -0
  29. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/client.py +0 -0
  30. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cloud/__init__.py +0 -0
  31. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cloud/qcloud_api.py +0 -0
  32. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cloud/ucloud_api.py +0 -0
  33. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cloud_utils.py +0 -0
  34. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/configs.py +0 -0
  35. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/consts.py +0 -0
  36. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/crud_utils.py +0 -0
  37. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/db_context.py +0 -0
  38. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/error.py +0 -0
  39. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/fetch_coroutine.py +0 -0
  40. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/jwt_token.py +0 -0
  41. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/ldap.py +0 -0
  42. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/logger.py +0 -0
  43. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/model_utils.py +0 -0
  44. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/mqhelper.py +0 -0
  45. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/program.py +0 -0
  46. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/salt_api.py +0 -0
  47. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/sqlalchemy_pagination.py +0 -0
  48. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/utils/__init__.py +0 -0
  49. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/utils/cc_crypto.py +0 -0
  50. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/utils/date_format.py +0 -0
  51. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/utils/pydantic_utils.py +0 -0
  52. {codosdk-1.0.35 → codosdk-1.0.36}/websdk2/web_logs.py +0 -0
{codosdk-1.0.35 → codosdk-1.0.36}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: codosdk
3
- Version: 1.0.35
3
+ Version: 1.0.36
4
4
  Summary: CODO项目的Python SDK
5
5
  Home-page: https://github.com/ss1917/codo_sdk/
6
6
  Author: shenshuo
{codosdk-1.0.35 → codosdk-1.0.36}/codosdk.egg-info/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: codosdk
3
- Version: 1.0.35
3
+ Version: 1.0.36
4
4
  Summary: CODO项目的Python SDK
5
5
  Home-page: https://github.com/ss1917/codo_sdk/
6
6
  Author: shenshuo
{codosdk-1.0.35 → codosdk-1.0.36}/setup.py RENAMED
@@ -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.35'
12
+ VERSION = '1.0.36'
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.')
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/tools.py RENAMED
@@ -215,8 +215,18 @@ class LockClientV2(ABC):
215
215
  class RedisLockV2(LockClientV2):
216
216
  def __init__(self, key, **conf):
217
217
  # 注意: configs.import_dict(**settings) 是必须的
218
- from .cache_context import cache_conn
219
- self.redis_client: redis.Redis = cache_conn()
218
+ if not conf:
219
+ from .configs import configs
220
+ redis_config = configs.get(const.REDIS_CONFIG_ITEM, {})
221
+ default_config = redis_config.get(const.DEFAULT_RD_KEY, {})
222
+
223
+ conf = {
224
+ 'host': default_config.get(const.RD_HOST_KEY, 'localhost'),
225
+ 'port': default_config.get(const.RD_PORT_KEY, 6379),
226
+ 'db': default_config.get(const.RD_DB_KEY, 0),
227
+ 'password': default_config.get(const.RD_PASSWORD_KEY)
228
+ }
229
+ self.redis_client: redis.Redis = redis.Redis(**conf)
220
230
  self._lock = 0
221
231
  self.lock_key = f"{key}_dynamic"
222
232
  self.uuid = str(uuid())
{codosdk-1.0.35 → codosdk-1.0.36}/LICENSE RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/README.md RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/opssdk/__init__.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/pyproject.toml RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/setup.cfg RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/__init__.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/api_set.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/cache.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/client.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/configs.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/consts.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/crud_utils.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/db_context.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/error.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/jwt_token.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/ldap.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/logger.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/mqhelper.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/program.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/salt_api.py RENAMED
File without changes
{codosdk-1.0.35 → codosdk-1.0.36}/websdk2/web_logs.py RENAMED
File without changes