hcs-core 0.1.298__py3-none-any.whl → 0.1.299__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.298"
+__version__ = "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/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/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/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/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/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/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/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/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/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/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/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.dist-info → hcs_core-0.1.299.dist-info}/METADATA

@@ -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.298.dist-info → hcs_core-0.1.299.dist-info}/RECORD

@@ -1,8 +1,8 @@
-hcs_core/__init__.py,sha256=iCAiJetE04YjkRvTLJlNnalMA2Qh13pOV7pEpnXQOBk,24
+hcs_core/__init__.py,sha256=GpdjEeALGMW6qJfqyqcdC69cW0JEVBcd54HdLO6cyNQ,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
 hcs_core/ctxp/_init.py,sha256=fMcRMPfJx-N0c-u0Zj2sFVKQL1-lWQd28gooAZETGUA,2933
 hcs_core/ctxp/cli_options.py,sha256=cwlUgYXzIie9eRcu8fkBo_iFvC8LhflKGblWYtM2Hto,2739
-hcs_core/ctxp/cli_processor.py,sha256=uxWqDecENdO8xd7ghR0wz10qwsroCZ93OtZAqtIFuJ8,7655
+hcs_core/ctxp/cli_processor.py,sha256=X4Qg5fXsg1HuDcdFCDZg7bdnxszGMJGdT3MhnP8LmUY,7656
 hcs_core/ctxp/cmd_util.py,sha256=_-VwQSmkfi52qWC3uHQI06mSiIPfsZroDruTDYHXiMA,3119
 hcs_core/ctxp/config.py,sha256=vRdzPxi3Yrt04cnR6b5mJwEOtYBh21qvmlSSsgyGoI4,931
 hcs_core/ctxp/context.py,sha256=LafhucyGRGYLmnXoZLZOKRWXUwJ1KzP-6vjDTTrC8j4,3451
@@ -12,17 +12,17 @@ hcs_core/ctxp/duration.py,sha256=_0mt8Ng5mzNzEdSXkOqExPOzQcw8HkQDUH_hwt5CMLM,210
 hcs_core/ctxp/extension.py,sha256=UqlDCXJMRKXcoceVak8hVGI_7HggjUWYSgKOFbGVetU,1636
 hcs_core/ctxp/fn_util.py,sha256=bEYmj5WgUkRE5S4oQjT_zutuViXWYU9q5MR-MlTA_bY,1573
 hcs_core/ctxp/fstore.py,sha256=lU6et0-w_QPYpQNjdA0QGEdnn7lsmBVuw9XbDvLjwso,8977
-hcs_core/ctxp/jsondot.py,sha256=U2_ToR8j3-hex75X3OSqTgADiw5cqjRDVO38-IbvapM,11369
+hcs_core/ctxp/jsondot.py,sha256=LuAejJTW2IJixNl4lLEc47yWX9MMKHgMcZmRugW4ftQ,11363
 hcs_core/ctxp/logger.py,sha256=xujPlxw7JGimI_u_sMXnqTOhOTCtrXzpc7501k3Dgm4,6323
-hcs_core/ctxp/profile.py,sha256=X9ZT3mV-0PwRaieQp58dfmL6-KTj0exthppnhipp6uk,7744
+hcs_core/ctxp/profile.py,sha256=scPibaqPzCD-wnSQ6nDq55nd4QppvzvVQ431n8kvRUg,7729
 hcs_core/ctxp/profile_store.py,sha256=v4RvKSaKSJhAt5rEGbC6v-NfaI3N67YffPm-qlrQWdg,1566
 hcs_core/ctxp/recent.py,sha256=ER1HASPRm1k_3MIO-WVbj2vGipY565ZpBlmo-_V3vjo,1797
 hcs_core/ctxp/state.py,sha256=gjcMRVONKBq7WiFQo-xca1726ngZe90mnPrF3vbXDrU,1634
 hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,4586
-hcs_core/ctxp/telemetry.py,sha256=iZv9x2n2aovpjYxNhnih_LS1fEJZjH_rbTsRKngv_Q0,3477
+hcs_core/ctxp/telemetry.py,sha256=tSjI_8OE2Ix3n--YHAO9sPmzi8ETbFHEPxzS52-usmM,3476
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
-hcs_core/ctxp/util.py,sha256=ckPyheoS08-bP4aixtBhYwi-C6syjFA6UHyIL6cUsPs,12350
+hcs_core/ctxp/util.py,sha256=NZrsFS5wi10_rIIC45go-nZOimB04_Npbwo7O7LIaoY,12699
 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
@@ -33,7 +33,7 @@ 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=HI9uhZBzxngMTvum2GwzgLpx8bEe6M3JgAxl5CiJywU,21622
-hcs_core/plan/dag.py,sha256=pyyoMSmbhCsS8BMZI6hW6YDkHqBgjmJOwys9CUDrIts,12926
+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
 hcs_core/plan/provider/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -42,19 +42,19 @@ hcs_core/plan/provider/dev/_prepare.py,sha256=PvVnheEQwpj8sWYz2lDONQVTs4pHPYuo2c
 hcs_core/plan/provider/dev/dummy.py,sha256=zKEr9J4WHhlN5gFdmrFyEfCF0xlQlCJg0CC1dG9VaLA,1958
 hcs_core/plan/provider/dev/fibonacci.py,sha256=8WhDr5c9harNAlVPZomQJEqbWe0hUqbppO6ZkwEUcJ0,1104
 hcs_core/sglib/__init__.py,sha256=oT0etW7vsEbHlXiGL5x23ZXyyFqeLi81RxQQ5lfKSV0,654
-hcs_core/sglib/auth.py,sha256=x2LjNCOTf_OJYsNggTG2rVagnVartyDCOlK4lSpXfso,6773
-hcs_core/sglib/cli_options.py,sha256=NvdiHpX_o6IYPEM8cQYLb_R7T4aiXVvYLqn6Vk4Q2-Y,1761
-hcs_core/sglib/client_util.py,sha256=t7zCldRRWt5f0l4TTRhmX-ZIaEm6MzNs_3B2RlwtXfk,14119
+hcs_core/sglib/auth.py,sha256=r9zgLdnybuHsf3_j6nTP4SGoS2dD3keYZ-c25o2Mx64,6766
+hcs_core/sglib/cli_options.py,sha256=dEoUllUs_N97jGtc3mccNgbkVJILfuJR4FHSuVGmSf0,2438
+hcs_core/sglib/client_util.py,sha256=ia4krU7xrMH4G_enOu5xFXIHY8I2besKn6ubayPxi58,14157
 hcs_core/sglib/csp.py,sha256=UcO68YtLOPDQWiTjPVIPwQ2Z-Mywc-154aoIkLdyzwE,10991
-hcs_core/sglib/ez_client.py,sha256=AgpWvB79NLWr_lyrZXbaY1iOyHg7hEgeM6Ll0SVCBmY,8411
+hcs_core/sglib/ez_client.py,sha256=dWQx-EMTrySz1EVzsSu4ZezORR3_iEOAcZigtbuvIQ8,8404
 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=rHKZDAZXlo62IsjETyXxCSPxg1L4nV6ffZM_tulfe0A,7574
 hcs_core/sglib/payload_util.py,sha256=Hnj7rjzrQ1j5gpbrwZX34biN8MIZjy6dOJZ63ulmzdw,685
 hcs_core/sglib/requtil.py,sha256=O37DrD4VVBmmRkkHJLbDtPfFq8l6fLZwYZggt2FTEFc,920
-hcs_core/sglib/utils.py,sha256=FLgB8M5EiS3WhCzX5xUA9aFzB5jKQI8pqxtrmE4SsjQ,3164
+hcs_core/sglib/utils.py,sha256=8a-e-nUhAbulZtV05CB5loov6Kgq8_Q0TxYwfvu7Bj8,3178
 hcs_core/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-hcs_core/util/check_license.py,sha256=-ZBMVoVcEUwICZ0QRK-e2uMMla7gFbjP9upun93lPEc,2534
+hcs_core/util/check_license.py,sha256=KUPaphuntMhwqcBJ6V2L85ZJZulaz1Yq5Ysurx2Ren8,2498
 hcs_core/util/duration.py,sha256=e7Nw22aYXJK-pLM59QDel5atLZxShKBiVILFgrtLJks,4194
 hcs_core/util/exit.py,sha256=UStMZKlfCFN7GBouc1y3pPFGPFQ66qfcRZ_fYQXFD0E,838
 hcs_core/util/hcs_constants.py,sha256=Ic1Tx_UNJiQchfsdnRDzgiOaCjKHnsWXx997nElppm4,1755
@@ -64,6 +64,6 @@ hcs_core/util/query_util.py,sha256=5bh3bUVIQuY9qerndfuyfyzkTExYJ8zD0_e3PSN7y-4,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.298.dist-info/METADATA,sha256=id4wfYatf5BOeT96YpnWpGnoXpSt_cB3eTn56JDZVws,1951
-hcs_core-0.1.298.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.298.dist-info/RECORD,,
+hcs_core-0.1.299.dist-info/METADATA,sha256=e_XvO_Hb4AtU35-ZRwoPDcgWHpEdzszA_L5ebn9qXTg,1951
+hcs_core-0.1.299.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.299.dist-info/RECORD,,