hcs-core 0.1.319__tar.gz → 0.1.321__tar.gz

{hcs_core-0.1.319 → hcs_core-0.1.321}/PKG-INFO

@@ -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.321/hcs_core/__init__.py

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

{hcs_core-0.1.319 → hcs_core-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-0.1.319 → hcs_core-0.1.321}/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-0.1.319 → hcs_core-0.1.321}/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-0.1.319 → hcs_core-0.1.321}/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/hcs_core/__init__.py

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