hcs-core 0.1.319__py3-none-any.whl → 0.1.321__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.319"
+__version__ = "0.1.321"

hcs_core/ctxp/_init.py

@@ -20,6 +20,7 @@ from pathlib import Path
 import click
 
 from . import cli_processor, config, profile, state, telemetry
+from .util import is_program_error
 
 
 def _get_store_path():
@@ -55,7 +56,7 @@ def init(app_name: str, store_path: str = user_home, config_path: str = "./confi
 
     except Exception as e:
         # critical errors, must print stack trace.
-        if _need_stack_trace(e):
+        if is_program_error(e):
             raise e
         else:
             # Other errors, no stack.
@@ -86,26 +87,10 @@ def init_cli(main_cli: click.Group, commands_dir: str = "./cmds"):
         return ret
     except BaseException as e:
         telemetry.end(error=e)
-        if _need_stack_trace(e):
+
+        if is_program_error(e):
             raise e
         else:
             from .util import panic
 
             panic(e)
-
-
-def _need_stack_trace(e) -> bool:
-    program_errors = [
-        LookupError,
-        TypeError,
-        ValueError,
-        ArithmeticError,
-        NameError,
-        SyntaxError,
-        KeyError,
-        AttributeError,
-    ]
-    for t in program_errors:
-        if isinstance(e, t):
-            return True
-    return False

hcs_core/ctxp/util.py

@@ -128,12 +128,30 @@ def print_output(data: Any, args: dict, file=sys.stdout):
     print(text, end="", file=file, flush=True)
 
 
+def is_program_error(e: Exception) -> bool:
+    program_errors = [
+        ArithmeticError,
+        IndexError,
+        NameError,
+        SyntaxError,
+        LookupError,
+        KeyError,
+        TypeError,
+        AttributeError,
+        ValueError,
+        IndentationError,
+        ImportError,
+        AssertionError,
+    ]
+    for ex in program_errors:
+        if isinstance(e, ex):
+            return True
+    return False
+
+
 def print_error(error):
-    critical_errors = [KeyError, TypeError, AttributeError, ValueError, IndentationError, ImportError]
-    for ex in critical_errors:
-        if isinstance(error, ex):
-            traceback.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
-            break
+    if is_program_error(error):
+        traceback.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
     msg = error_details(error)
     print(msg, file=sys.stderr, flush=True)
 

hcs_core/plan/core.py

@@ -242,7 +242,8 @@ def _get_res_text(handler, res_state: dict) -> str:
 def _deploy_res(name, res, state):
     def fn_deploy1(handler, res_data: dict, res_state: dict, fn_set_state: typing.Callable, kop: KOP):
         if _is_runtime(res):
-            kop.start(KOP.MODE.create, handler.eta("create", res_data, state))
+            eta = res.get("eta") or handler.eta(actions.create, res_data, state)
+            kop.start(KOP.MODE.create, eta)
             new_state = handler.process(res_data, deepcopy(state))
             if new_state:
                 fn_set_state(new_state)
@@ -266,7 +267,8 @@ def _deploy_res(name, res, state):
 
         new_state = None
         if action == actions.create or action is None:
-            kop.start(KOP.MODE.create, handler.eta(actions.create, res_data, res_state))
+            eta = res.get("eta") or handler.eta(actions.create, res_data, state)
+            kop.start(KOP.MODE.create, eta)
             if _has_save_state(handler.deploy):
 
                 def _hook_set_state(data):

hcs_core/sglib/ez_client.py

@@ -229,7 +229,7 @@ class EzClient:
 
     def get(self, url: str, headers: dict = None, raise_on_404: bool = False, type: Optional[Type[BaseModel]] = None):
         try:
-            # print("->", self._client().base_url, url)
+            # print("->", str(self._client().base_url) + url)
             resp = self._client().get(url, headers=headers, follow_redirects=True)
             data = _parse_resp(resp)
             if data and type:

{hcs_core-0.1.319.dist-info → hcs_core-0.1.321.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.319
+Version: 0.1.321
 Summary: Horizon Cloud Service CLI module.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues

{hcs_core-0.1.319.dist-info → hcs_core-0.1.321.dist-info}/RECORD

@@ -1,6 +1,6 @@
-hcs_core/__init__.py,sha256=W9Fz99Q0Wv3fne72V8P_I2LyTJ4mUrOkqMl0yDI2wHw,24
+hcs_core/__init__.py,sha256=iXs2IMJx0ljkuqcZCqNL837J3kjahgbbvSBpJmrBzXo,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
-hcs_core/ctxp/_init.py,sha256=fMcRMPfJx-N0c-u0Zj2sFVKQL1-lWQd28gooAZETGUA,2933
+hcs_core/ctxp/_init.py,sha256=EY5V6LY9REjlMBPn8oBatp3pScg82wcsC2Cajx5CCVc,2636
 hcs_core/ctxp/cli_options.py,sha256=9atW8J_BiENzREhENHGRZU9lX48YmGp8JebELULO1eg,3356
 hcs_core/ctxp/cli_processor.py,sha256=-BhmODOrPDm8TNnyeOaRqiTyo1DHRkyWiFbEAeqKovM,7755
 hcs_core/ctxp/cmd_util.py,sha256=_-VwQSmkfi52qWC3uHQI06mSiIPfsZroDruTDYHXiMA,3119
@@ -22,7 +22,7 @@ hcs_core/ctxp/task_schd.py,sha256=d_vsR0j-WruW6N4iU7bMvhNvJ62jLjQKhDjWLL61agE,46
 hcs_core/ctxp/telemetry.py,sha256=7ZdOodQUiMvqRBWux2RstDD3q-iQgpeLCJT50YaZkH0,3475
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
-hcs_core/ctxp/util.py,sha256=DvqLZFpr9CJhswaxNWA9r27vTTs02IWRNLVDWy7xNgM,14532
+hcs_core/ctxp/util.py,sha256=27Pd2ZFQkyGvaurxKvikcsHWW-2nWqyDodnUh-Kn504,14808
 hcs_core/ctxp/var_template.py,sha256=cTjj1UJ58ac6s5z4Oh5hSDQwKixq-rdbCF1D8akjAo0,3219
 hcs_core/ctxp/built_in_cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_core/ctxp/built_in_cmds/_ut.py,sha256=e50XBmPim2qRe0RYk_XAuRz1HWYyLJuMu-6dVxWR_fQ,3356
@@ -32,7 +32,7 @@ hcs_core/plan/__init__.py,sha256=5klVuXXLQLn2Hj6Gz2Hc-1XSyDXKE9o-BjQ82oXekiI,465
 hcs_core/plan/actions.py,sha256=UvCynzApJUxi39HUoPIQ_uownlbvFbJ4aAs6pmulrLY,125
 hcs_core/plan/base_provider.py,sha256=CSJFN8lopWTUblw8CW78Epnef9BbJVLhPLk9bPfZceM,1299
 hcs_core/plan/context.py,sha256=5NI5Otk0jGKtBGvO8Sc1xdOHUCu_lXQYNrSctT3Hyq8,116
-hcs_core/plan/core.py,sha256=5DWYM-ihW3D7ZjYiVBKHoyy5AyLvWmfMZnYZSiNn2qc,21621
+hcs_core/plan/core.py,sha256=qk1A1HuZ9kNdmzpUdHu8aQ88MEflWrhoPoGkMTipR9U,21703
 hcs_core/plan/dag.py,sha256=McvJnOIJOQzfa1TMdG3Nvw2tV12JBhNKaeJ_Fk8iEXA,12909
 hcs_core/plan/helper.py,sha256=__b8tlzLBT1Rm3vgiS-pWnZImaoZbsmKSRJtt_1gj8E,7763
 hcs_core/plan/kop.py,sha256=iDnRbYHFCtS3Rs95UVvRgZdSzs-NMwdyr8SztIQQqyg,5774
@@ -46,7 +46,7 @@ hcs_core/sglib/auth.py,sha256=r9zgLdnybuHsf3_j6nTP4SGoS2dD3keYZ-c25o2Mx64,6766
 hcs_core/sglib/cli_options.py,sha256=GBJ59u9iWiCfJt-5F8qw_JGfMRfB-LcLeiKAQkmMh_c,2548
 hcs_core/sglib/client_util.py,sha256=XoxVRGA4MCnesi1R-jcu3zNXmuBp2cM-eH_wArPLs34,14618
 hcs_core/sglib/csp.py,sha256=UcO68YtLOPDQWiTjPVIPwQ2Z-Mywc-154aoIkLdyzwE,10991
-hcs_core/sglib/ez_client.py,sha256=kz136budKkOIj-xFFzaQtkrEl4BEBwyhiKWXYaT6NSQ,9686
+hcs_core/sglib/ez_client.py,sha256=X6Xx1yLAO1iVcSMF7gZ4Ylj6IqOzyBiyPfOc5mAGPe4,9692
 hcs_core/sglib/hcs_client.py,sha256=pjrAVQDEy2tiQMypMpOzODFntT6aNHXjje8or_mkL2U,804
 hcs_core/sglib/init.py,sha256=w_0ZU70Q1TGbSZsqSi7ewKQqpExFlepOT7mIqH0wnho,310
 hcs_core/sglib/login_support.py,sha256=tniRhn4V5eUAgixi_FLTemzBnOrruLgvx6NsLLx3hTA,8077
@@ -64,6 +64,6 @@ hcs_core/util/query_util.py,sha256=AHTV7nRZXLL5CwK_ip1ZKub8Xvfn2C8PqjUg3UpHQEk,3
 hcs_core/util/scheduler.py,sha256=bPpCmGUL1UctJMfLPAg-h4Hl2YZr96FiI78-G_Usn08,2958
 hcs_core/util/ssl_util.py,sha256=MvU102fGwWWh9hhSmLnn1qQIWuD6TjZnN0iH0MXUtW0,1239
 hcs_core/util/versions.py,sha256=6nyyZzi3P69WQfioPc2_YWZQcUc13mC1eKoK58b3WUQ,1709
-hcs_core-0.1.319.dist-info/METADATA,sha256=yzhus48JO-L5JXQxmjtHoppYny0nM0mI16Q-aQIkcq0,1958
-hcs_core-0.1.319.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_core-0.1.319.dist-info/RECORD,,
+hcs_core-0.1.321.dist-info/METADATA,sha256=PpNipnISPDZxKFyrEcijqJ0AN5Rsh2smf6YymsJE5pc,1958
+hcs_core-0.1.321.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_core-0.1.321.dist-info/RECORD,,