hcs-core 0.1.295__py3-none-any.whl → 0.1.297__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.295"
+__version__ = "0.1.297"

hcs_core/ctxp/util.py

@@ -368,3 +368,29 @@ def format_table(data: list, fields_mapping: dict, columns_to_sum: list = None):
         traceback.print_exc()
 
     return tabulate(table, headers=headers) + "\n"
+
+
+def colorize(data: dict, name: str, mapping: dict):
+    if os.environ.get("TERM_COLOR") == "0":
+        return
+
+    s = data.get(name)
+    if not s:
+        return
+
+    if isinstance(mapping, dict):
+        c = mapping.get(s)
+        if c:
+            if isinstance(c, str):
+                data[name] = click.style(s, fg=c)
+            elif callable(c):
+                color = c(data)
+                data[name] = click.style(s, fg=color)
+            else:
+                raise Exception(f"Unexpected color type: {type(c)} {c}")
+    elif callable(mapping):
+        c = mapping(s)
+        if c:
+            data[name] = click.style(s, fg=c)
+    else:
+        raise Exception(f"Unexpected mapping type: {type(mapping)} {mapping}")

hcs_core/sglib/ez_client.py

@@ -206,10 +206,10 @@ class EzClient:
                 raise
         return data
 
-    def get(self, url: str, raise_on_404: bool = False, type: Optional[Type[BaseModel]] = None):
+    def get(self, url: str, headers: dict = None, raise_on_404: bool = False, type: Optional[Type[BaseModel]] = None):
         try:
             # print("->", url)
-            resp = self._client().get(url)
+            resp = self._client().get(url, headers=headers)
             data = _parse_resp(resp)
             if data and type:
                 try:
@@ -228,17 +228,17 @@ class EzClient:
             else:
                 _raise_http_error(e)
 
-    def patch(self, url: str, json: dict):
+    def patch(self, url: str, json: dict = None, text=None, headers: dict = None):
         try:
-            resp = self._client().patch(url, json=json)
+            resp = self._client().patch(url, json=json, content=text, headers=headers)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             _raise_http_error(e)
             raise
 
-    def delete(self, url: str, raise_on_404: bool = False):
+    def delete(self, url: str, headers: dict = None, raise_on_404: bool = False):
         try:
-            resp = self._client().delete(url)
+            resp = self._client().delete(url, headers=headers)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             if _is_404(e):
@@ -249,9 +249,9 @@ class EzClient:
             else:
                 _raise_http_error(e)
 
-    def put(self, url: str, json: dict):
+    def put(self, url: str, json: dict = None, text=None, headers: dict = None):
         try:
-            resp = self._client().put(url, json=json)
+            resp = self._client().put(url, json=json, content=text, headers=headers)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             _raise_http_error(e)

hcs_core/util/job_view.py

@@ -134,6 +134,9 @@ def _timeout_to_seconds(timeout: str, default: int = 60) -> int:
     return t
 
 
+_NAME_WIDTH = 40
+
+
 class JobView:
     def __init__(self, auto_close: bool = True):
         self._map = {}
@@ -144,9 +147,9 @@ class JobView:
         self._view_exited = threading.Event()
 
         w, h = os.get_terminal_size()
-        msg_width = w - 40 - 1 - 1 - 1 - 10 - 1 - 5 - 1 - 1
+        msg_width = w - _NAME_WIDTH - 1 - 1 - 1 - 10 - 1 - 5 - 1 - 1
         self._job_ctl = Progress(
-            TextColumn("{task.description}", table_column=Column(max_width=40, min_width=10)),
+            TextColumn("{task.description}", table_column=Column(max_width=_NAME_WIDTH, min_width=10)),
             # SpinnerColumn(table_column=Column(min_width=1)),
             _MySpinnerColumn(table_column=Column(min_width=1)),
             # BarColumn(pulse_style='white'),
@@ -159,7 +162,7 @@ class JobView:
         )
 
     def add(self, id: str, name: str):
-        name = _shorten_package_name(name, 30)
+        name = _shorten_package_name(name, _NAME_WIDTH)
         self._map[id] = self._job_ctl.add_task(name, start=False, details="")
         self._todo.add(id)
 

hcs_core/util/versions.py

@@ -30,14 +30,16 @@ def check_upgrade():
     checked_at = hcs_core.ctxp.state.get(last_upgrade_check_at, 0)
 
     now = time.time()
-    if now - checked_at > 24 * 60 * 60:
-        try:
-            latest = get_latest_version()
-            current = Version(get_version())
-            if current < latest:
-                log.warning(f"New version available: {latest}. Execute 'hcs upgrade' to upgrade.")
-        except Exception as e:
-            logging.debug(e)
+    if now - checked_at < 24 * 60 * 60:
+        return
+
+    try:
+        latest = get_latest_version()
+        current = Version(get_version())
+        if current < latest:
+            log.warning(f"New version available: {latest}. Execute 'hcs upgrade' to upgrade.")
+    except Exception as e:
+        logging.debug(e)
 
     hcs_core.ctxp.state.set(last_upgrade_check_at, now)
 

{hcs_core-0.1.295.dist-info → hcs_core-0.1.297.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.295
+Version: 0.1.297
 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
@@ -36,7 +36,7 @@ Requires-Dist: schedule>=1.1.0
 Requires-Dist: setuptools>=70.0.0
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: websocket-client>=1.2.3
-Requires-Dist: yumako>=0.1.27
+Requires-Dist: yumako>=0.1.30
 Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'

{hcs_core-0.1.295.dist-info → hcs_core-0.1.297.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_core/__init__.py,sha256=Cru0kvgt1VLfBCuVDXGLqKb3MgCs91b24AErV6yJlmQ,24
+hcs_core/__init__.py,sha256=niVeDT-oZbAKWXvYcymanePQGxWtGyYEm_NveVEXzSs,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
@@ -22,7 +22,7 @@ hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,45
 hcs_core/ctxp/telemetry.py,sha256=iZv9x2n2aovpjYxNhnih_LS1fEJZjH_rbTsRKngv_Q0,3477
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
-hcs_core/ctxp/util.py,sha256=4vnaItrdkxCqMTdBf5bKDJ9dSSX9sraSP9XjGRq6xpU,11616
+hcs_core/ctxp/util.py,sha256=ckPyheoS08-bP4aixtBhYwi-C6syjFA6UHyIL6cUsPs,12350
 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
@@ -46,7 +46,7 @@ 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/csp.py,sha256=UcO68YtLOPDQWiTjPVIPwQ2Z-Mywc-154aoIkLdyzwE,10991
-hcs_core/sglib/ez_client.py,sha256=_u9HvPXW5H8zDjaBr3bsTZqzveOlehq4EWDMeF_cwFY,8135
+hcs_core/sglib/ez_client.py,sha256=M3BqAXizWbdE1mba0nPHZXC5qJ_t2k_Vurttpg_VqF4,8355
 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
@@ -58,12 +58,12 @@ hcs_core/util/check_license.py,sha256=-ZBMVoVcEUwICZ0QRK-e2uMMla7gFbjP9upun93lPE
 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
-hcs_core/util/job_view.py,sha256=-cSqZpVecfcUskG9RYqIXcgg7pj0W6dKDAy2Lt1CPik,8378
+hcs_core/util/job_view.py,sha256=LpyihmDJLXm4DtTST7Z-WydyWNYCJETT_SxCWunvGOg,8424
 hcs_core/util/pki_util.py,sha256=Lt3-IzIoGcaQKNE7KUszxR7JSZkpXduVZJ262TszsIs,6685
 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=urMtShfoBx_Eqq0D-450LP0i-rW447k9yX8q8j5H_qA,1721
-hcs_core-0.1.295.dist-info/METADATA,sha256=0ruALOs54xQC6ZbgrH6A18mf7AtY56dCVQCFBA2x2ng,1951
-hcs_core-0.1.295.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.295.dist-info/RECORD,,
+hcs_core/util/versions.py,sha256=6nyyZzi3P69WQfioPc2_YWZQcUc13mC1eKoK58b3WUQ,1709
+hcs_core-0.1.297.dist-info/METADATA,sha256=rqaQNgZqiVd-wok1KFUcp9TB5-1sAsQaMpOSiEJngbU,1951
+hcs_core-0.1.297.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.297.dist-info/RECORD,,