hcs-core 0.1.287__py3-none-any.whl → 0.1.288__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.287"
+__version__ = "0.1.288"

hcs_core/ctxp/cli_options.py

@@ -27,7 +27,7 @@ verbose = click.option(
 output = click.option(
     "--output",
     "-o",
-    type=click.Choice(["json", "json-compact", "yaml", "text", "table"]),
+    type=click.Choice(["json", "json-compact", "yaml", "text", "table"], case_sensitive=False),
     default=None,
     hidden=True,
     help="Specify output format",

hcs_core/ctxp/data_util.py

@@ -391,6 +391,25 @@ def get_common_items(iter1, iter2):
     return common_items
 
 
+def get_delta(dict_base, dict_update):
+    delta = {}
+    for k, v2 in dict_update.items():
+        v1 = dict_base.get(k)
+        if not deep_equals(v1, v2):
+            delta[k] = v2
+    return delta
+
+
+def deep_equals(v1, v2):
+    if v1 is None and v2 is None:
+        return True
+    if v1 is None or v2 is None:
+        return False
+    if v1 == v2:
+        return True
+    return json.dumps(v1) == json.dumps(v2)
+
+
 def _evaluate(value, smart_search):
     # If we found an exact match, return 2 immediately
     if value == smart_search:

hcs_core/ctxp/recent.py

@@ -79,9 +79,9 @@ def of(k: str):
 
 class helper:
     @staticmethod
-    def default_list(array: list, name: str):
+    def default_list(array: list, name: str, field_name: str = "id"):
         with of(name) as r:
             if len(array) == 1:
-                r.set(array[0]["id"])
+                r.set(array[0][field_name])
             else:
                 r.unset()

hcs_core/ctxp/util.py

@@ -89,7 +89,18 @@ def print_output(data: Any, args: dict, file=sys.stdout):
                 if isinstance(data, list):
                     text = ""
                     for i in data:
-                        line = i if type(i) is str else json.dumps(i)
+                        t = type(i)
+                        if t is str:
+                            line = i
+                        elif isinstance(i, dict):
+                            if len(i) == 0:
+                                continue
+                            if len(i) == 1:
+                                line = str(next(iter(i.values())))
+                            else:
+                                line = json.dumps(i)
+                        else:
+                            line = json.dumps(i)
                         text += line + "\n"
                 elif isinstance(data, dict):
                     text = json.dumps(data, indent=4)
@@ -319,10 +330,12 @@ def format_table(data: list, fields_mapping: dict, columns_to_sum: list = None):
                     if isinstance(v, str):
                         v = strip_ansi(v)
                         v = int(v)
-                    elif isinstance(v, int):
+                    elif isinstance(v, int) or isinstance(v, float):
                         pass
+                    elif v is None:
+                        continue
                     else:
-                        raise Exception(f"Unexpected cell value type. Type={type(v)}, value={v}")
+                        raise Exception(f"Unexpected cell value type. Type={type(v)}, value={v}, col={col_name}")
                     total += v
                 footer[col_index] = total
             separator = ["-" * len(header) for header in headers]

hcs_core/sglib/ez_client.py

@@ -173,11 +173,12 @@ class EzClient:
         files=None,
         headers: dict = None,
         type: Optional[Type[BaseModel]] = None,
+        timeout: float = 30.0,
     ):
         # import json as jsonlib
         # print(url, jsonlib.dumps(json, indent=4))
         try:
-            resp = self._client().post(url, json=json, content=text, files=files, headers=headers)
+            resp = self._client().post(url, json=json, content=text, files=files, headers=headers, timeout=timeout)
         except httpx.HTTPStatusError as e:
             _raise_http_error(e)
         data = _parse_resp(resp)

hcs_core/sglib/login_support.py

@@ -33,6 +33,7 @@ _callback_url = "/hcs-cli/oauth/callback"
 
 _public_client_ids = {
     "production": "ldjmWbBAUcSB1w3HSbzoYcdKoloYFqT2dWK",
+    # "production": "WbvEYXK4abljPJUuY2zODLpOaX5ddH2uhMX",    #collie mobile
     "staging": "BbwHlgWt0vFwPUZMJTb5IKltynXjDmb46IO",
 }
 

hcs_core/util/versions.py

@@ -15,9 +15,9 @@ limitations under the License.
 
 import logging
 import time
+from importlib.metadata import version
 
 import httpx
-import pkg_resources
 from packaging.version import Version
 
 import hcs_core
@@ -43,7 +43,7 @@ def check_upgrade():
 
 
 def get_version():
-    return pkg_resources.require("hcs-cli")[0].version
+    return version("hcs-cli")
 
 
 def get_latest_version() -> Version:

{hcs_core-0.1.287.dist-info → hcs_core-0.1.288.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.287
+Version: 0.1.288
 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.287.dist-info → hcs_core-0.1.288.dist-info}/RECORD

@@ -1,12 +1,12 @@
-hcs_core/__init__.py,sha256=QcbCKd-QO9eRF5w2FWOK-QGs0v1RFZihFd7Cm-DcOiY,24
+hcs_core/__init__.py,sha256=h2YaDwqNzDQolRs8e5QZZuOdmuGRXaYq2mLZASylOIc,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
 hcs_core/ctxp/_init.py,sha256=yq46VOty4zs_WcLt1SrtePxbW8S4RIz4YUCP3xIBvCA,2797
-hcs_core/ctxp/cli_options.py,sha256=g5JnzOtyWiGLCLcGp5x54MPFLW_NOfhfevXUlX5L8tM,2532
+hcs_core/ctxp/cli_options.py,sha256=5CkwKVIUNJxumBHUmrefawiIZR5Yf3bWEcpJBaEMuDU,2554
 hcs_core/ctxp/cli_processor.py,sha256=2RhBz7zFm2UDRwbMDwBpeAQQCt4sjZJzn1nePAcMA_o,7329
 hcs_core/ctxp/cmd_util.py,sha256=_-VwQSmkfi52qWC3uHQI06mSiIPfsZroDruTDYHXiMA,3119
 hcs_core/ctxp/config.py,sha256=vRdzPxi3Yrt04cnR6b5mJwEOtYBh21qvmlSSsgyGoI4,931
 hcs_core/ctxp/context.py,sha256=y0ouOzXyYTg9MOuWjzjls9WfOKYaO31_MGJJ2S-Y9p4,3375
-hcs_core/ctxp/data_util.py,sha256=_35eP_mXWnM6vje0qnz43NmCALUfwRLXpXF85OU5mC0,14393
+hcs_core/ctxp/data_util.py,sha256=v041qG3UH8ff4iLVY4oaeFDT1jBdFhUNOnGLraPMT-g,14812
 hcs_core/ctxp/dispatcher.py,sha256=GAK-jGXDpyX0C88oRDtDi4yeM0qlvID96k98z_vqJkg,2261
 hcs_core/ctxp/duration.py,sha256=xmAw-nKnul3VeSXzvbGZ-W2ByBwyK23KxLLm3_aFW_M,2117
 hcs_core/ctxp/extension.py,sha256=UqlDCXJMRKXcoceVak8hVGI_7HggjUWYSgKOFbGVetU,1636
@@ -16,12 +16,12 @@ hcs_core/ctxp/jsondot.py,sha256=U2_ToR8j3-hex75X3OSqTgADiw5cqjRDVO38-IbvapM,1136
 hcs_core/ctxp/logger.py,sha256=6Sh1WXUrjrQNU7K6zUlBzE34fIS6o6oMU3eqSknUOEo,6321
 hcs_core/ctxp/profile.py,sha256=DQUQXThHNZa49tDcyGfh-w658CJBE1YIKmNHWXSDaiw,7673
 hcs_core/ctxp/profile_store.py,sha256=v4RvKSaKSJhAt5rEGbC6v-NfaI3N67YffPm-qlrQWdg,1566
-hcs_core/ctxp/recent.py,sha256=Lbv1q6Ld-7FKFaA_FNyqI_WaFDp9zQAOFjFVzox5GoE,1767
+hcs_core/ctxp/recent.py,sha256=uKSEdU4L2szbyl-5nYLa3bigZSvSPW8G24Tuk_wYMck,1797
 hcs_core/ctxp/state.py,sha256=gjcMRVONKBq7WiFQo-xca1726ngZe90mnPrF3vbXDrU,1634
 hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,4586
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
-hcs_core/ctxp/util.py,sha256=67oR--oVZHzo2wgDbEGg_1mvbl32ReW5edEHjosOjA8,10308
+hcs_core/ctxp/util.py,sha256=FnJMbKMCnGDGc579VSrGsnWy-0H1GEnLioLcFvH6UcM,10869
 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
@@ -45,10 +45,10 @@ hcs_core/sglib/auth.py,sha256=otsiBEvKae3B0-bPt5Ggir7ceTRLWG1x7ZaSblHisdA,6443
 hcs_core/sglib/cli_options.py,sha256=NvdiHpX_o6IYPEM8cQYLb_R7T4aiXVvYLqn6Vk4Q2-Y,1761
 hcs_core/sglib/client_util.py,sha256=ZCXmNfmUL4_iry4yU2bPWL0dLLNIGu3zp541cFt6Or0,10876
 hcs_core/sglib/csp.py,sha256=anZqbQLIZw831PgW9Z4pweqfAeBH7rXPIAkwkyPkfGY,8054
-hcs_core/sglib/ez_client.py,sha256=6R_gnRRxxmJYg6oJTnUB7ZLvUTRlEEYuhRyLLOvMxWI,7592
+hcs_core/sglib/ez_client.py,sha256=iUhhKAeo-9Mm3JQdYJROXxvAkZypCLSNvraE5DaP3n8,7640
 hcs_core/sglib/hcs_client.py,sha256=pxRZQ79ABhOyihAI8oOeTxw2dXkce5-NyRkJAoo0OL0,888
 hcs_core/sglib/init.py,sha256=w_0ZU70Q1TGbSZsqSi7ewKQqpExFlepOT7mIqH0wnho,310
-hcs_core/sglib/login_support.py,sha256=5vU3MOGM00yUcjsoSJeTY0p5PVYOO76YVEggTB6i7U4,7484
+hcs_core/sglib/login_support.py,sha256=tSkfmThubbWDUFLfx0hzdHp_QW0TR3gYISzvw6FKpjs,7561
 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
@@ -62,7 +62,7 @@ hcs_core/util/pki_util.py,sha256=Lt3-IzIoGcaQKNE7KUszxR7JSZkpXduVZJ262TszsIs,668
 hcs_core/util/query_util.py,sha256=5bh3bUVIQuY9qerndfuyfyzkTExYJ8zD0_e3PSN7y-4,3142
 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=wwbcYFpxBohI-QjcrmxGsNghdnx4EWHBipMUL7vnpwM,1728
-hcs_core-0.1.287.dist-info/METADATA,sha256=0XqaqWNnewWHGoV9N-vTbCZH1vMhUKJ0pMw5vw3Vk70,1875
-hcs_core-0.1.287.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.287.dist-info/RECORD,,
+hcs_core/util/versions.py,sha256=urMtShfoBx_Eqq0D-450LP0i-rW447k9yX8q8j5H_qA,1721
+hcs_core-0.1.288.dist-info/METADATA,sha256=OfTNqAnTG99Mi9CeE9Sikd8DtFGU1BfNBjVb43CRM1M,1875
+hcs_core-0.1.288.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.288.dist-info/RECORD,,