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

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.296"
+__version__ = "0.1.298"

hcs_core/ctxp/built_in_cmds/context.py

@@ -48,7 +48,7 @@ def get(name: str, key: str):
 @click.argument("name")
 @click.argument("key_value")  # 'key value pair, example: k1=v1'
 def set(name: str, key_value: str):
-    """Set a context object by name."""
+    """Set a context property by name."""
     parts = key_value.split("=")
     if len(parts) != 2:
         ctxp.panic("Invalid KEY_VALUE format. Valid example: key1=value1")
@@ -58,6 +58,20 @@ def set(name: str, key_value: str):
     ctxp.context.set(name, data)
 
 
+@context.command()
+@click.argument("name")
+@click.argument("key")
+def unset(name: str, key: str):
+    """Unset a context property by name."""
+    data = ctxp.context.get(name, default=None)
+    if data is None:
+        return
+    data.pop(key, None)
+    if len(data) == 0:
+        return ctxp.context.delete(name)
+    return ctxp.context.set(name, data)
+
+
 @context.command()
 @click.argument("name")
 def delete(name: str):

hcs_core/ctxp/built_in_cmds/profile.py

@@ -19,7 +19,7 @@ import sys
 import click
 import questionary
 
-from hcs_core.ctxp import cli_processor, panic, profile, util
+from hcs_core.ctxp import cli_options, cli_processor, panic, profile, util
 
 
 @click.group(name="profile", cls=cli_processor.LazyGroup)
@@ -62,8 +62,8 @@ def use(name: str):
 @profile_cmd_group.command()
 @click.option("--from-name", "-f", required=False)
 @click.option("--to-name", "-t", required=True)
-@click.option("--edit", "-e", required=False, is_flag=True, help="Edit the profile after copying.")
-def copy(from_name: str, to_name: str, edit: bool):
+@click.option("--no-edit", "-e", required=False, is_flag=True, help="Edit the profile after copying.")
+def copy(from_name: str, to_name: str, no_edit: bool):
     """Copy profile."""
 
     if not from_name:
@@ -76,10 +76,9 @@ def copy(from_name: str, to_name: str, edit: bool):
         panic("Profile already exists: " + to_name)
     data = profile.create(to_name, data, True)
 
-    if edit:
-        util.launch_text_editor(profile.file(to_name))
-    else:
+    if no_edit:
         return data
+    util.launch_text_editor(profile.file(to_name))
 
 
 @profile_cmd_group.command()
@@ -101,11 +100,20 @@ def get(name: str):
 
 
 @profile_cmd_group.command()
+@cli_options.confirm
 @click.argument("name", required=False)
-def delete(name: str):
+def delete(confirm: bool, name: str):
     """Delete a profile by name."""
     if not name:
         name = profile.name()
+
+    if not profile.exists(name):
+        return
+    if not confirm:
+        question = f"Are you sure to delete profile '{name}'?"
+        if not questionary.confirm(question, default=False).ask():
+            click.echo("Aborted")
+            return
     profile.delete(name)
 
 

hcs_core/ctxp/context.py

@@ -34,6 +34,8 @@ def get(name: str, reload: bool = False, default=None) -> jsondot.dotdict:
 
 
 def set(name: str, data: dict):
+    if data is None or len(data) == 0:
+        return _store().delete(name)
     return _store().save(name, data)
 
 

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

@@ -191,7 +191,7 @@ class EzClient:
         timeout: float = 30.0,
     ):
         # import json as jsonlib
-        # print(url, jsonlib.dumps(json, indent=4))
+        # print("->", self._client().base_url, url, jsonlib.dumps(json, indent=4))
         try:
             resp = self._client().post(url, json=json, content=text, files=files, headers=headers, timeout=timeout)
         except httpx.HTTPStatusError as e:
@@ -208,7 +208,7 @@ class EzClient:
 
     def get(self, url: str, headers: dict = None, raise_on_404: bool = False, type: Optional[Type[BaseModel]] = None):
         try:
-            # print("->", url)
+            # print("->", self._client().base_url, url)
             resp = self._client().get(url, headers=headers)
             data = _parse_resp(resp)
             if data and type:

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.296.dist-info → hcs_core-0.1.298.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.296
+Version: 0.1.298
 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.31
 Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'

{hcs_core-0.1.296.dist-info → hcs_core-0.1.298.dist-info}/RECORD

@@ -1,11 +1,11 @@
-hcs_core/__init__.py,sha256=tWega_C2IREoYz7O6B0hfh16qnFYyEpvEwZ0sfzXPxM,24
+hcs_core/__init__.py,sha256=iCAiJetE04YjkRvTLJlNnalMA2Qh13pOV7pEpnXQOBk,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/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/context.py,sha256=LafhucyGRGYLmnXoZLZOKRWXUwJ1KzP-6vjDTTrC8j4,3451
 hcs_core/ctxp/data_util.py,sha256=PECaLaAQoqTyuYILXm1Deg5iL96tBxgiBhggp-f-qVE,14933
 hcs_core/ctxp/dispatcher.py,sha256=GAK-jGXDpyX0C88oRDtDi4yeM0qlvID96k98z_vqJkg,2261
 hcs_core/ctxp/duration.py,sha256=_0mt8Ng5mzNzEdSXkOqExPOzQcw8HkQDUH_hwt5CMLM,2109
@@ -22,12 +22,12 @@ 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
-hcs_core/ctxp/built_in_cmds/context.py,sha256=bU-BG60DyA8rpv1sw3LpHnPQb1wQiZQCoIMYLW_g5_c,2389
-hcs_core/ctxp/built_in_cmds/profile.py,sha256=xTIHziDniMd-BXH2XymtP1HB4K9fkkU8STtLVqDuY1Y,4371
+hcs_core/ctxp/built_in_cmds/context.py,sha256=NbnsAaAkvnascSVqbh7BScXznvfPtTbgQWkU0GLYYGk,2747
+hcs_core/ctxp/built_in_cmds/profile.py,sha256=z9K4o1n7ugducPpOFjaDMS9xA2RVhWcIcgljKOCn200,4667
 hcs_core/plan/__init__.py,sha256=5klVuXXLQLn2Hj6Gz2Hc-1XSyDXKE9o-BjQ82oXekiI,465
 hcs_core/plan/actions.py,sha256=UvCynzApJUxi39HUoPIQ_uownlbvFbJ4aAs6pmulrLY,125
 hcs_core/plan/base_provider.py,sha256=CSJFN8lopWTUblw8CW78Epnef9BbJVLhPLk9bPfZceM,1299
@@ -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=M3BqAXizWbdE1mba0nPHZXC5qJ_t2k_Vurttpg_VqF4,8355
+hcs_core/sglib/ez_client.py,sha256=AgpWvB79NLWr_lyrZXbaY1iOyHg7hEgeM6Ll0SVCBmY,8411
 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
@@ -63,7 +63,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=urMtShfoBx_Eqq0D-450LP0i-rW447k9yX8q8j5H_qA,1721
-hcs_core-0.1.296.dist-info/METADATA,sha256=EOuDHFuN5KefNw_F2VCNdKQFTQvIkfUMORGB6UH-_Ko,1951
-hcs_core-0.1.296.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.296.dist-info/RECORD,,
+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,,