codosdk 1.0.34__tar.gz → 1.0.36__tar.gz

{codosdk-1.0.34 → codosdk-1.0.36}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codosdk
-Version: 1.0.34
+Version: 1.0.36
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.34 → codosdk-1.0.36}/codosdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: codosdk
-Version: 1.0.34
+Version: 1.0.36
 Summary: CODO项目的Python SDK
 Home-page: https://github.com/ss1917/codo_sdk/
 Author: shenshuo

{codosdk-1.0.34 → codosdk-1.0.36}/setup.py

@@ -9,7 +9,7 @@ desc   : CODO SDK
 import sys
 from setuptools import setup, find_packages
 
-VERSION = '1.0.34'
+VERSION = '1.0.36'
 
 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.')

{codosdk-1.0.34 → codosdk-1.0.36}/websdk2/consts.py

@@ -158,7 +158,9 @@ const.APP_SETTINGS = 'APP_SETTINGS'
 const.USERS_INFO = 'USERS_INFO'
 
 # API GW
+const.CODO_API_GW = 'api_gw'
 const.WEBSITE_API_GW_URL = 'api_gw'
+const.CODO_OUTER_API_GW = 'outer_api_gw'
 const.API_AUTH_KEY = 'settings_auth_key'
 const.EMAILLOGIN_DOMAIN = 'EMAILLOGIN_DOMAIN'
 const.EMAILLOGIN_SERVER = 'EMAILLOGIN_SERVER'

{codosdk-1.0.34 → codosdk-1.0.36}/websdk2/tools.py

@@ -15,7 +15,6 @@ from shortuuid import uuid
 import subprocess
 from concurrent.futures import ThreadPoolExecutor
 from abc import ABC, abstractmethod
-from .cache_context import cache_conn
 from .consts import const
 
 
@@ -216,7 +215,18 @@ class LockClientV2(ABC):
 class RedisLockV2(LockClientV2):
     def __init__(self, key, **conf):
         # 注意: configs.import_dict(**settings) 是必须的
-        self.redis_client: redis.Redis = cache_conn()
+        if not conf:
+            from .configs import configs
+            redis_config = configs.get(const.REDIS_CONFIG_ITEM, {})
+            default_config = redis_config.get(const.DEFAULT_RD_KEY, {})
+
+            conf = {
+                'host': default_config.get(const.RD_HOST_KEY, 'localhost'),
+                'port': default_config.get(const.RD_PORT_KEY, 6379),
+                'db': default_config.get(const.RD_DB_KEY, 0),
+                'password': default_config.get(const.RD_PASSWORD_KEY)
+            }
+        self.redis_client: redis.Redis = redis.Redis(**conf)
         self._lock = 0
         self.lock_key = f"{key}_dynamic"
         self.uuid = str(uuid())