hcs-core 0.1.295__tar.gz → 0.1.297__tar.gz

{hcs_core-0.1.295 → hcs_core-0.1.297}/.gitignore

@@ -180,3 +180,4 @@ ops/*.yml
 t.json
 t.py
 .ruff_cache/
+exp/

{hcs_core-0.1.295 → hcs_core-0.1.297}/PKG-INFO

@@ -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.297/hcs_core/__init__.py

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

{hcs_core-0.1.295 → hcs_core-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-0.1.295 → hcs_core-0.1.297}/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-0.1.295 → hcs_core-0.1.297}/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-0.1.295 → hcs_core-0.1.297}/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 → hcs_core-0.1.297}/pyproject.toml

@@ -43,7 +43,7 @@ dependencies = [
     "websocket_client>=1.2.3",
     "psutil>=7.0.0",
     "schedule>=1.1.0",
-    "yumako>=0.1.27",
+    "yumako>=0.1.30",
     "pydantic>=2.11.7",
     "python-dotenv>=1.1.1",
 ]

hcs_core-0.1.295/hcs_core/__init__.py

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