tfduck-bsd 0.18.8__tar.gz → 0.19.0__tar.gz

{tfduck-bsd-0.18.8/tfduck_bsd.egg-info → tfduck-bsd-0.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tfduck-bsd
-Version: 0.18.8
+Version: 0.19.0
 Summary: A small example package
 Home-page: UNKNOWN
 Author: yuanxiao

{tfduck-bsd-0.18.8 → tfduck-bsd-0.19.0}/setup.py

@@ -8,7 +8,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tfduck-bsd",
-    version="0.18.8",
+    version="0.19.0",
     author="yuanxiao",
     author_email="yuan6785@163.com",
     description="A small example package",

tfduck-bsd-0.19.0/tfduck/__init__.py

@@ -0,0 +1 @@
+__version__="0.19.0"

{tfduck-bsd-0.18.8 → tfduck-bsd-0.19.0}/tfduck/serverless_k8s/k8s_manage.py

@@ -10,27 +10,30 @@ pip install kubernetes==12.0.1 oss2==2.19.1
 """
 
 if 1:
-    # 解决 【CA_KEY_TOO_SMALL】的报错，利用猴子补丁[monkey Patching ] ，适用于urllib3==2.x版本
-    import urllib3
-    from urllib3.util.ssl_ import create_urllib3_context
-
-    # 创建自定义 SSL 上下文（复用 urllib3 默认配置基础上修改）
-    ctx = create_urllib3_context()
-    ctx.set_ciphers("DEFAULT@SECLEVEL=0")  # 例如降低安全级别
-    ctx.load_default_certs()  # 确保加载系统证书
-
-    # 保存原始 PoolManager 初始化方法（便于回滚）
-    _original_poolmanager_init = urllib3.PoolManager.__init__
-
-    def _patched_poolmanager_init(self, *args, **kwargs):
-        # 仅在未显式传递 ssl_context 时注入自定义上下文
-        if "ssl_context" not in kwargs:
-            kwargs["ssl_context"] = ctx
-        _original_poolmanager_init(self, *args, **kwargs)
-
-    # 应用补丁（确保只执行一次）
-    if urllib3.PoolManager.__init__ != _patched_poolmanager_init:
-        urllib3.PoolManager.__init__ = _patched_poolmanager_init
+    try:
+        # 解决 【CA_KEY_TOO_SMALL】的报错，利用猴子补丁[monkey Patching ] ，适用于urllib3==2.x版本
+        import urllib3
+        from urllib3.util.ssl_ import create_urllib3_context
+
+        # 创建自定义 SSL 上下文（复用 urllib3 默认配置基础上修改）
+        ctx = create_urllib3_context()
+        ctx.set_ciphers("DEFAULT@SECLEVEL=0")  # 例如降低安全级别
+        ctx.load_default_certs()  # 确保加载系统证书
+
+        # 保存原始 PoolManager 初始化方法（便于回滚）
+        _original_poolmanager_init = urllib3.PoolManager.__init__
+
+        def _patched_poolmanager_init(self, *args, **kwargs):
+            # 仅在未显式传递 ssl_context 时注入自定义上下文
+            if "ssl_context" not in kwargs:
+                kwargs["ssl_context"] = ctx
+            _original_poolmanager_init(self, *args, **kwargs)
+
+        # 应用补丁（确保只执行一次）
+        if urllib3.PoolManager.__init__ != _patched_poolmanager_init:
+            urllib3.PoolManager.__init__ = _patched_poolmanager_init
+    except Exception as _:
+        pass
 
 import json
 

{tfduck-bsd-0.18.8 → tfduck-bsd-0.19.0}/tfduck/serverless_k8s/k8s_task.py

@@ -72,6 +72,8 @@ class ServerlessTaskManage(object):
             "pvc_name": "tfduck-k8s-pvc",
             # pypi的源，如果为空字符串，则使用官方源
             "pypi_mirror": "https://pypi.tuna.tsinghua.edu.cn/simple",
+            # 执行python脚本参数---最好是base64编码的json字符串
+            "params": "xxx",
         },
         #
         is_debug=False,
@@ -86,6 +88,11 @@ class ServerlessTaskManage(object):
         code_path: 代码路径
         project_configs: 所有项目配置
         project_name: 项目名称，在project_configs里面找到对应的key
+        params: 用法
+        param_b64_content = base64.b64encode(json.dumps(self.task_params).encode(
+            'utf8')).decode()  # 将参数编辑为base64，防止出现特殊字符分割参数
+        # 解码
+        # ds = json.loads(base64.b64decode(param_b64_content).decode('utf8'))
         ######################################
         """
         """
@@ -213,7 +220,7 @@ class ServerlessTaskManage(object):
                                     pip install -U pip {pypi_i} && \
                                     pip install arrow {pypi_i} && \
                                     pip install -r requirements.txt {pypi_i} && \
-                                    python main.py
+                                    python main.py --params {self.task_config["params"]}
                             """
                         ],
                         "resources": {
@@ -278,7 +285,7 @@ class ServerlessTaskManage(object):
             wait_time = 0
             # 第一阶段判断--进入Running状态--
             pd_1 = 0
-            pd_1_status = ["Running"]
+            pd_1_status = ["Running", "Succeeded", "Failed"]
             max_pd_1 = 30  # 最大等待次数
             while pod_obj.status.phase not in pd_1_status and pd_1 < max_pd_1:
                 time.sleep(10)

{tfduck-bsd-0.18.8 → tfduck-bsd-0.19.0/tfduck_bsd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: tfduck-bsd
-Version: 0.18.8
+Version: 0.19.0
 Summary: A small example package
 Home-page: UNKNOWN
 Author: yuanxiao

tfduck-bsd-0.18.8/tfduck/__init__.py

@@ -1 +0,0 @@
-__version__="0.18.8"