hcs-core 0.1.298__tar.gz → 0.1.299__tar.gz

{hcs_core-0.1.298 → hcs_core-0.1.299}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.298
+Version: 0.1.299
 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.299/hcs_core/__init__.py

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

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/ctxp/cli_processor.py

@@ -181,7 +181,7 @@ def _default_io(cmd: click.Command):
     def inner(*args, **kwargs):
         io_args = {
             "output": kwargs.pop("output"),
-            #'verbose': kwargs.pop('verbose'),
+            # 'verbose': kwargs.pop('verbose'),
             "field": kwargs.pop("field"),
             "ids": kwargs.pop("ids"),
             "first": kwargs.pop("first"),

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/ctxp/jsondot.py

@@ -40,7 +40,7 @@ import json
 import os.path
 import random
 import time
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, Optional, Union
 
 
 class dotdict(dict):

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/ctxp/profile.py

@@ -20,7 +20,7 @@ from copy import deepcopy
 from typing import Any
 
 from . import state
-from .data_util import deep_get_attr, deep_set_attr, load_data_file, save_data_file
+from .data_util import deep_set_attr, load_data_file, save_data_file
 from .jsondot import dotdict, dotify
 from .util import CtxpException, panic
 

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/ctxp/telemetry.py

@@ -132,7 +132,7 @@ def _injest(doc):
 
     try:
         response = httpx.post(
-            f"https://collie.omnissa.com/es/hcs-cli/_doc",
+            "https://collie.omnissa.com/es/hcs-cli/_doc",
             auth=("append_user", "public"),
             headers={"Content-Type": "application/json"},
             content=json.dumps(doc),

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/ctxp/util.py

@@ -125,7 +125,7 @@ def print_output(data: Any, args: dict, file=sys.stdout):
 
 
 def print_error(error):
-    critical_errors = [KeyError, TypeError, AttributeError, ValueError]
+    critical_errors = [KeyError, TypeError, AttributeError, ValueError, IndentationError]
     for ex in critical_errors:
         if isinstance(error, ex):
             traceback.print_exception(type(error), error, error.__traceback__, file=sys.stderr)
@@ -219,7 +219,11 @@ def choose(prompt: str, items: list, fn_get_text: Callable = None, selected=None
         panic(prompt + " ERROR: no item available.")
 
     if fn_get_text is None:
-        fn_get_text = lambda t: str(t)
+
+        def _default_fn_get_text(t):
+            return str(t)
+
+        fn_get_text = _default_fn_get_text
 
     if select_by_default and len(items) == 1:
         ret = items[0]
@@ -258,24 +262,37 @@ def input_array(prompt: str, default: list[str] = None):
     return ret
 
 
-def error_details(e):
-    if isinstance(e, Exception):
-        if isinstance(e, CtxpException):
-            details = str(e)
-        else:
-            details = e.__class__.__name__
-            msg = str(e)
-            if msg:
-                details += ": " + msg
-        cause = e.__cause__
-        if cause and cause != e:
-            details += " | Caused by: " + error_details(cause)
+def error_details(ex):
+    if not isinstance(ex, Exception):
+        return str(ex)
+
+    collector = []
+
+    def _collect_details(e):
+        if isinstance(e, click.ClickException):
+            collector.append(str(e))
+            return
 
+        details = e.__class__.__name__
+        msg = str(e)
+        if msg:
+            details += ": " + msg
         if isinstance(e, httpx.HTTPStatusError):
             details += "\n" + e.response.text
-        return details
-    else:
-        return str(e)
+        collector.append(details)
+
+        cause = e.__cause__
+        if cause and cause != e:
+            _collect_details(cause)
+
+    _collect_details(ex)
+
+    # remove_consecutive_duplicates
+    result = [collector[0]]
+    for item in collector[1:]:
+        if item != result[-1]:
+            result.append(item)
+    return " | Caused by: ".join(result)
 
 
 def avoid_trace_for_ctrl_c():

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/plan/dag.py

@@ -15,7 +15,6 @@ limitations under the License.
 
 import threading
 import time
-import traceback
 from concurrent.futures import ThreadPoolExecutor
 from copy import deepcopy
 from graphlib import TopologicalSorter

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/sglib/auth.py

@@ -22,7 +22,7 @@ import time
 import jwt
 from authlib.integrations.httpx_client import OAuth2Client
 
-from hcs_core.ctxp import CtxpException, panic, profile
+from hcs_core.ctxp import CtxpException, profile
 from hcs_core.ctxp.jsondot import dotdict, dotify
 
 from .csp import CspClient

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/sglib/cli_options.py

@@ -18,7 +18,19 @@ import os
 import click
 
 from hcs_core.ctxp import CtxpException, recent
-from hcs_core.ctxp.cli_options import *
+from hcs_core.ctxp.cli_options import confirm as confirm
+from hcs_core.ctxp.cli_options import exclude_field as exclude_field
+from hcs_core.ctxp.cli_options import field as field
+from hcs_core.ctxp.cli_options import first as first
+from hcs_core.ctxp.cli_options import force as force
+from hcs_core.ctxp.cli_options import formatter as formatter
+from hcs_core.ctxp.cli_options import ids as ids
+from hcs_core.ctxp.cli_options import limit as limit
+from hcs_core.ctxp.cli_options import output as output
+from hcs_core.ctxp.cli_options import search as search
+from hcs_core.ctxp.cli_options import sort as sort
+from hcs_core.ctxp.cli_options import verbose as verbose
+from hcs_core.ctxp.cli_options import wait as wait
 
 org_id = click.option(
     "--org",

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/sglib/client_util.py

@@ -261,7 +261,10 @@ class default_crud:
 
     def wait_for_deleted(self, id: str, org_id: str, timeout: str, fn_is_error: Callable = None):
         name = self._resource_type_name + "/" + id
-        fn_get = lambda: self.get(id, org_id)
+
+        def fn_get():
+            return self.get(id, org_id)
+
         return wait_for_res_deleted(name, fn_get, timeout=timeout, fn_is_error=fn_is_error)
 
     def update(self, id: str, org_id: str, data: dict, **kwargs):
@@ -310,6 +313,7 @@ def wait_for_res_deleted(
         exit.sleep(sleep_seconds)
 
 
+# flake8: noqa=E731
 def wait_for_res_status(
     resource_name: str,
     fn_get: Callable,

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/sglib/ez_client.py

@@ -19,7 +19,7 @@ import os
 import sys
 import threading
 from http.client import HTTPResponse
-from typing import Callable, Optional, Type, Union
+from typing import Callable, Optional, Type
 
 import httpx
 from authlib.integrations.httpx_client import OAuth2Client

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/sglib/utils.py

@@ -65,7 +65,10 @@ def run_govc_guest_script(script, args):
 
 
 def waitForVmPowerOff(iPath):
-    current_millis = lambda: int(round(time.time() * 1000))
+
+    def current_millis():
+        return int(round(time.time() * 1000))
+
     start_time = current_millis()
     while current_millis() - start_time < 5 * 60 * 1000:
         p = subprocess.run(

{hcs_core-0.1.298 → hcs_core-0.1.299}/hcs_core/util/check_license.py

@@ -13,8 +13,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-#!/usr/bin/env -S python -W ignore
-
 import os
 import sys
 

hcs_core-0.1.298/hcs_core/__init__.py

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