hcs-core 0.1.286__tar.gz → 0.1.288__tar.gz

{hcs_core-0.1.286 → hcs_core-0.1.288}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.286
+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
@@ -40,6 +40,7 @@ Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'
 Requires-Dist: build; extra == 'dev'
+Requires-Dist: flake8; extra == 'dev'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pylint; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

hcs_core-0.1.288/hcs_core/__init__.py

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

{hcs_core-0.1.286 → hcs_core-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-0.1.286 → hcs_core-0.1.288}/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-0.1.286 → hcs_core-0.1.288}/hcs_core/ctxp/profile.py

@@ -98,7 +98,6 @@ def current(reload: bool = False, exit_on_failure: bool = True, exclude_secret:
 
 def save():
     """Save the current profile"""
-    global _data
     if _data is None:
         return
     write(name(), _data)

{hcs_core-0.1.286 → hcs_core-0.1.288}/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-0.1.286 → hcs_core-0.1.288}/hcs_core/ctxp/task_schd.py

@@ -111,7 +111,6 @@ def statistics(reset_cycle: bool = False):
 
 def _daemon_worker():
     log.info("task scheduler daemon thread start")
-    global _g_flag_stop_daemon
     while not _g_flag_stop_daemon.is_set():
         if _g_flag_running:
             schedule.run_pending()
@@ -149,7 +148,6 @@ def resume():
 
 
 def stop_daemon():
-    global _g_flag_stop_daemon
     global _g_worker_thread
     if _g_worker_thread:
         _g_flag_stop_daemon.set()

{hcs_core-0.1.286 → hcs_core-0.1.288}/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-0.1.286 → hcs_core-0.1.288}/hcs_core/sglib/auth.py

@@ -125,12 +125,17 @@ def _get_new_oauth_token(old_oauth_token, effective_profile):
 def refresh_oauth_token(old_oauth_token: dict, csp_url: str):
     with OAuth2Client(token=old_oauth_token) as client:
         log.debug("Refresh auth token...")
-        new_token = client.refresh_token(csp_url + "/csp/gateway/am/api/auth/token")
+        token_url = csp_url + "/csp/gateway/am/api/auth/token"
+        from .login_support import identify_client_id
+
+        csp_specific_req_not_oauth_standard = (identify_client_id(csp_url), "")
+        new_token = client.refresh_token(token_url, auth=csp_specific_req_not_oauth_standard)
         log.debug(f"New auth token: {new_token}")
         if not new_token:
             raise Exception("CSP auth refresh failed.")
         if "cspErrorCode" in new_token:
             raise Exception(f"CSP auth failed: {new_token.get('message')}")
+
     return new_token
 
 

{hcs_core-0.1.286 → hcs_core-0.1.288}/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-0.1.286 → hcs_core-0.1.288}/hcs_core/sglib/login_support.py

@@ -19,17 +19,13 @@ limitations under the License.
 import logging
 import secrets
 import threading
-import time
 import webbrowser
 from http.server import BaseHTTPRequestHandler, HTTPServer
-from typing import Callable
 from urllib.parse import parse_qs, urlparse
 
 from authlib.integrations.httpx_client import OAuth2Client
 from authlib.oauth2.rfc7636 import create_s256_code_challenge
 
-from hcs_core.util.scheduler import ThreadPoolScheduler
-
 log = logging.getLogger(__name__)
 
 _server_address = ("127.0.0.1", 10762)
@@ -37,6 +33,7 @@ _callback_url = "/hcs-cli/oauth/callback"
 
 _public_client_ids = {
     "production": "ldjmWbBAUcSB1w3HSbzoYcdKoloYFqT2dWK",
+    # "production": "WbvEYXK4abljPJUuY2zODLpOaX5ddH2uhMX",    #collie mobile
     "staging": "BbwHlgWt0vFwPUZMJTb5IKltynXjDmb46IO",
 }
 

{hcs_core-0.1.286 → hcs_core-0.1.288}/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.286 → hcs_core-0.1.288}/pyproject.toml

@@ -58,6 +58,7 @@ dev = [
     "pylint",
     "pytest",
     "ruff",
+    "flake8",
 ]
 
 [project.urls]

hcs_core-0.1.286/hcs_core/__init__.py

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