hcs-core 0.1.291__tar.gz → 0.1.292__tar.gz

{hcs_core-0.1.291 → hcs_core-0.1.292}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.291
+Version: 0.1.292
 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
@@ -14,29 +14,29 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: authlib>=1.2.1
-Requires-Dist: click>=8.1.7
+Requires-Dist: authlib>=1.6.0
+Requires-Dist: click>=8.2.1
 Requires-Dist: coloredlogs>=15.0.1
-Requires-Dist: cryptography>=42.0.7
-Requires-Dist: graphviz>=0.20.3
-Requires-Dist: httpx>=0.27.0
-Requires-Dist: packaging>=24.0
-Requires-Dist: portalocker>=2.8.2
-Requires-Dist: psutil>=5.9.4
-Requires-Dist: pydantic>=2.0.0
-Requires-Dist: pyjwt>=2.8.0
-Requires-Dist: pyopenssl>=24.1.0
-Requires-Dist: python-dotenv>=1.1.0
+Requires-Dist: cryptography>=45.0.5
+Requires-Dist: graphviz>=0.21
+Requires-Dist: httpx>=0.28.0
+Requires-Dist: packaging>=25.0
+Requires-Dist: portalocker>=3.0.0
+Requires-Dist: psutil>=7.0.0
+Requires-Dist: pydantic>=2.11.7
+Requires-Dist: pyjwt>=2.10.1
+Requires-Dist: pyopenssl>=25.1.0
+Requires-Dist: python-dotenv>=1.1.1
 Requires-Dist: pyyaml>=6.0.1
 Requires-Dist: questionary>=2.0.1
-Requires-Dist: rel>=0.4.7
+Requires-Dist: rel>=0.4.9.20
 Requires-Dist: retry>=0.9.2
-Requires-Dist: rich>=13.7.1
+Requires-Dist: rich>=14.0.0
 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.24
+Requires-Dist: yumako>=0.1.27
 Provides-Extra: dev
 Requires-Dist: bandit; extra == 'dev'
 Requires-Dist: black; extra == 'dev'

hcs_core-0.1.292/hcs_core/__init__.py

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

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/built_in_cmds/profile.py

@@ -89,9 +89,7 @@ def get(name: str):
     if name:
         data = profile.get(name)
         if data is None:
-            panic(
-                "Profile not found. Use 'hcs profile list' to show available profiles, or 'hcs profile init' to create one."
-            )
+            panic("Profile not found. Use 'hcs profile list' to show available profiles, or 'hcs profile init' to create one.")
     else:
         data = profile.current()
         if data is None:

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/cli_options.py

@@ -74,9 +74,7 @@ sort = click.option(
     help="Ascending/Descending. Format is property,{asc|desc} and default is ascending",
 )
 
-limit = click.option(
-    "--limit", "-l", type=int, required=False, default=100, help="Optionally, specify the number of records to fetch."
-)
+limit = click.option("--limit", "-l", type=int, required=False, default=100, help="Optionally, specify the number of records to fetch.")
 
 ids = click.option(
     "--ids",
@@ -101,9 +99,7 @@ first = click.option(
 
 force = click.option("--force/--grace", type=bool, default=True, help="Specify deletion mode: forceful, or graceful.")
 
-confirm = click.option(
-    "--confirm/--prompt", "-y", type=bool, default=False, help="Confirm the operation without prompt."
-)
+confirm = click.option("--confirm/--prompt", "-y", type=bool, default=False, help="Confirm the operation without prompt.")
 
 
 def formatter(custom_fn):

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/data_util.py

@@ -100,9 +100,7 @@ def strict_dict_to_class(data: dict, class_type):
             value = strict_dict_to_class(value, field_type)
             setattr(inst, field_name, value)
             continue
-        raise ValueError(
-            f"Field '{class_type.__name__}.{field_name}' has an incorrect type. Declared: {field_type}, actual: {type(value)}"
-        )
+        raise ValueError(f"Field '{class_type.__name__}.{field_name}' has an incorrect type. Declared: {field_type}, actual: {type(value)}")
     return inst
 
 
@@ -341,9 +339,7 @@ def resolve_expression(expr, fn_get_value, referencing_attr_path) -> Tuple[Any,
                 f"Invalid variable value for expression. Expect list, actual {type(target_value).__name__}. attr_path={referencing_attr_path}, src_var_name={src_var_name}"
             )
         if not mapped_value.startswith(tmp_var_name + "."):
-            raise CtxpException(
-                f"Unsupported expression. attr_path={referencing_attr_path}, src_var_name={src_var_name}"
-            )
+            raise CtxpException(f"Unsupported expression. attr_path={referencing_attr_path}, src_var_name={src_var_name}")
         new_attr_path = mapped_value[len(tmp_var_name) + 1 :]
         ret = []
         for i in target_value:

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/duration.py

@@ -2,9 +2,7 @@
 
 import re
 
-PATTERN = (
-    "([-+]?)P(?:([-+]?[0-9]+)D)?(T(?:([-+]?[0-9]+)H)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)(?:[.,]([0-9]{0,9}))?S)?)?"
-)
+PATTERN = "([-+]?)P(?:([-+]?[0-9]+)D)?(T(?:([-+]?[0-9]+)H)?(?:([-+]?[0-9]+)M)?(?:([-+]?[0-9]+)(?:[.,]([0-9]{0,9}))?S)?)?"
 
 # Examples
 

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/logger.py

@@ -21,7 +21,9 @@ from logging.handlers import RotatingFileHandler
 import coloredlogs
 
 LOG_FORMAT_SIMPLE = "%(levelname).4s %(asctime)s %(name)-16s %(message)s"
-LOG_FORMAT_LONG = "%(color_on)s%(asctime)s.%(msecs)03d [%(process)-5d:%(threadName)-12s] %(levelname)-7s [%(name)-16s] %(message)s%(color_off)s"
+LOG_FORMAT_LONG = (
+    "%(color_on)s%(asctime)s.%(msecs)03d [%(process)-5d:%(threadName)-12s] %(levelname)-7s [%(name)-16s] %(message)s%(color_off)s"
+)
 DATE_FORMAT_SIMPLE = "%H:%M:%S"
 
 
@@ -133,9 +135,7 @@ def setup(
         )
 
 
-def setup_console_output(
-    logger, console_log_output, console_log_level, console_log_color, console_log_mask, log_line_template, date_fmt
-):
+def setup_console_output(logger, console_log_output, console_log_level, console_log_color, console_log_mask, log_line_template, date_fmt):
     if not date_fmt:
         date_fmt = coloredlogs.DEFAULT_DATE_FORMAT
     coloredlogs.install(

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/profile.py

@@ -82,9 +82,7 @@ def current(reload: bool = False, exit_on_failure: bool = True, exclude_secret:
     data = get(profile_name, reload)
 
     if data is None and exit_on_failure:
-        panic(
-            "Profile not set. Use 'hcs profile use [profile-name]' to choose one, or use 'hcs profile init' to create default profiles."
-        )
+        panic("Profile not set. Use 'hcs profile use [profile-name]' to choose one, or use 'hcs profile init' to create default profiles.")
 
     if exclude_secret:
         data = dotdict(dict(data))

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/recent.py

@@ -31,7 +31,7 @@ def all():
     return _recent
 
 
-def require(provided, k: str):
+def require(k: str, provided):
     if not k:
         raise Exception("Missing 'key' in recent.require(current, key).")
 

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/telemetry.py

@@ -12,6 +12,7 @@ log = logging.getLogger(__name__)
 
 _record = None
 _enabled = None
+_version = None
 
 
 def disable():
@@ -26,6 +27,19 @@ def _is_disabled():
     return not _enabled
 
 
+def _get_version():
+    global _version
+    if _version is None:
+        try:
+            from importlib.metadata import version
+
+            _version = version("hcs-cli")
+        except Exception as e:
+            log.debug(f"Failed to get hcs-cli version: {e}")
+            _version = "unknown"
+    return _version
+
+
 def start(cmd_path: str, params: dict):
     if _is_disabled():
         return
@@ -38,6 +52,7 @@ def start(cmd_path: str, params: dict):
         "return": -1,
         "error": None,
         "time_ms": -1,
+        "version": _get_version(),
         "env": {
             "python_version": sys.version,
             "platform": sys.platform,
@@ -79,10 +94,9 @@ def _injest(doc):
             headers={"Content-Type": "application/json"},
             content=json.dumps(doc),
             timeout=4,
+            verify=False,
         )
         response.raise_for_status()
     except Exception as e:
         log.debug(f"Telemetry ingestion failed: {e}", exc_info=True)
         return
-
-    log.debug(f"Telemetry ingestion successful: {response.status_code}")

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/ctxp/util.py

@@ -125,7 +125,7 @@ def print_output(data: Any, args: dict, file=sys.stdout):
 
 
 def print_error(error):
-    critical_errors = [KeyError, TypeError]
+    critical_errors = [KeyError, TypeError, AttributeError, ValueError]
     for ex in critical_errors:
         if isinstance(error, ex):
             traceback.print_exception(type(error), error, error.__traceback__, file=sys.stderr)

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/plan/core.py

@@ -41,19 +41,13 @@ def _prepare_data(data: dict, additional_context: dict, target_resource_name: st
         data.update(additional_context)
     blueprint, pending = process_template(data)
 
-    if (
-        target_resource_name
-        and target_resource_name not in blueprint["resource"]
-        and target_resource_name not in blueprint["runtime"]
-    ):
+    if target_resource_name and target_resource_name not in blueprint["resource"] and target_resource_name not in blueprint["runtime"]:
         raise PlanException("Target resource or runtime not found: " + target_resource_name)
 
     for k, v in pending.items():
         if v.startswith("default.") or v.startswith("var."):
             if not k.find(".conditions."):
-                raise PlanException(
-                    f"Invalid blueprint. Unresolved static references. Variable not found: {v}. Required by {k}"
-                )
+                raise PlanException(f"Invalid blueprint. Unresolved static references. Variable not found: {v}. Required by {k}")
     deployment_id = blueprint["deploymentId"]
     state_file = deployment_id + ".state.yml"
     prev = data_util.load_data_file(state_file, default={})
@@ -291,9 +285,7 @@ def _deploy_res(name, res, state):
             else:
                 new_state = handler.update(res_data, res_state)
         else:
-            raise PlanException(
-                f"Unknown action. This is a problem of the concrete plugin.decide function. Plugin={name}, action={action}"
-            )
+            raise PlanException(f"Unknown action. This is a problem of the concrete plugin.decide function. Plugin={name}, action={action}")
 
         if new_state:
             fn_set_state(new_state)

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/sglib/auth.py

@@ -38,9 +38,9 @@ def _is_auth_valid(auth_data):
 _login_lock = threading.Lock()
 
 
-def login(force_refresh: bool = False):
+def login(force_refresh: bool = False, verbose: bool = False):
     """Ensure login state, using credentials from the current profile. Return oauth token."""
-    return _populate_token_with_cache(profile.current().csp, force_refresh)
+    return _populate_token_with_cache(profile.current().csp, force_refresh, verbose)
 
 
 def refresh_oauth_token(old_oauth_token: dict, csp_url: str):
@@ -98,17 +98,22 @@ def save_auth_cache(auth_config: dict, token: dict):
     profile.auth.set(cache)
 
 
-def _populate_token_with_cache(auth_config: dict, force_refresh: bool = False):
-
+def _populate_token_with_cache(auth_config: dict, force_refresh: bool = False, verbose: bool = False):
+    if verbose:
+        print("_populate_token_with_cache")
     with _login_lock:
         cache, hash, token = _get_auth_cache(auth_config)
         if token and not force_refresh:
+            if verbose:
+                print("Using cached auth token.")
             return token
 
         # invalid token. Refresh or recreate it.
         if token:
             # try using refresh token if possible
             if auth_config.get("provider", "vmwarecsp") == "vmwarecsp":
+                if verbose:
+                    print("Provider: vmwarecsp.")
                 try:
                     token = refresh_oauth_token(token, auth_config.url)
                 except Exception as e:
@@ -116,11 +121,17 @@ def _populate_token_with_cache(auth_config: dict, force_refresh: bool = False):
                     token = None
             else:
                 # hcs auth-service. Does not support refresh token.
+                if verbose:
+                    print("Provider: hcs auth-service.")
                 token = None
 
         if not token:
             if _has_credential(auth_config):
+                if verbose:
+                    print("Config:", auth_config)
                 token = CspClient.create(**auth_config).oauth_token()
+                if verbose:
+                    print("Token:", json.dumps(token, indent=4))
             else:
                 if auth_config.get("browser"):
                     from .login_support import login_via_browser
@@ -129,9 +140,7 @@ def _populate_token_with_cache(auth_config: dict, force_refresh: bool = False):
                     if not token:
                         raise CtxpException("Browser auth failed.")
                 else:
-                    raise CtxpException(
-                        "Browser auth was never attempted and no client credentials or API token provided."
-                    )
+                    raise CtxpException("Browser auth was never attempted and no client credentials or API token provided.")
 
         if not token.get("expires_at"):
             token["expires_at"] = int(time.time() + token["expires_in"])

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/sglib/client_util.py

@@ -32,19 +32,31 @@ _caches = {}
 _client_instance_lock = threading.RLock()
 
 
-def _lazy_init(
-    service_name: str, hdc: str = None, region: str = None
-):  # make it deferred so no need to initialize profile
-    if region and hdc:
-        raise Exception("region and hdc cannot be specified at the same time.")
-
-    # check per-service override in profile
+def _get_service_override(service_name: str):
     profile_data = profile.current()
     override = profile_data.get("override", {})
     service_override = {}
     for k, v in override.items():
         if service_name == k.lower():
             service_override = v
+
+    if not service_override:
+        if service_name == "org-service":
+            service_override = override.get("org", {})
+        elif service_name.find("-") >= 0:
+            camel_name = "".join(word.capitalize() for word in service_name.split("-"))
+            camel_name = camel_name[0].lower() + camel_name[1:]
+            service_override = override.get(camel_name, {})
+    return service_override
+
+
+def _lazy_init(service_name: str, hdc: str = None, region: str = None):  # make it deferred so no need to initialize profile
+    if region and hdc:
+        raise Exception("region and hdc cannot be specified at the same time.")
+
+    profile_data = profile.current()
+
+    service_override = _get_service_override(service_name)
     service_override_url = service_override.get("url")
     if service_override_url:
         log.debug(f"Using per-service override for {service_name}: {service_override_url}")
@@ -83,7 +95,7 @@ def _lazy_init(
     if provider == "vmwarecsp":
         token_url = profile_data.csp.url
     elif provider == "auth-service":
-        token_url = profile_data.auth.tokenUrl
+        token_url = profile_data.auth["tokenUrl"]
     else:
         raise CtxpException(f"Unknown provider: {provider}. Supported providers: vmwarecsp, auth-service.")
 
@@ -164,9 +176,13 @@ def regional_service_client(service_name: str, region: str = None):
         return instance
 
 
-def service_client(service_name: str, region: str = None, hdc: str = None):
+def is_regional_service(service_name: str):
     regional_services = ["vmhub", "connection-service"]
-    if service_name in regional_services:
+    return service_name in regional_services
+
+
+def service_client(service_name: str, region: str = None, hdc: str = None):
+    if is_regional_service(service_name):
         return regional_service_client(service_name, region)
     else:
         return hdc_service_client(service_name, hdc)
@@ -358,9 +374,7 @@ def wait_for_res_status(
         if is_ready(status):
             return t
         if not is_transition(status):
-            raise CtxpException(
-                prefix + f"Unexpected status: {status}. If this is a transition, add it to status_map['transition']."
-            )
+            raise CtxpException(prefix + f"Unexpected status: {status}. If this is a transition, add it to status_map['transition'].")
 
         now = time.time()
         remaining_seconds = timeout_seconds - (now - start)

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/sglib/csp.py

@@ -112,9 +112,7 @@ class CspClient:
             "Accept": "application/json",
         }
         # <no org id for this API>
-        resp = self._client.post(
-            "/csp/gateway/am/api/auth/api-tokens/authorize", headers=headers, data=f"api_token={api_token}"
-        )
+        resp = self._client.post("/csp/gateway/am/api/auth/api-tokens/authorize", headers=headers, data=f"api_token={api_token}")
         self._oauth_token = resp.json()
         return self._oauth_token
 

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/sglib/login_support.py

@@ -64,7 +64,7 @@ _auth_success_html = """
     <h3>You have successfully logged into VMware Horizon Cloud Service.</h3>
     <p>You can close this window, and return to the terminal.</p>
     <br/>
-    <p><a href="https://github.com/euc-eng/hcs-cli">HCS CLI</a> is in beta phase. <a href="https://github.com/euc-eng/hcs-cli/blob/main/doc/hcs-cli-cheatsheet.md">Cheatsheet</a>:</p>
+    <p><a href="https://github.com/euc-eng/hcs-cli/blob/dev/README.md">HCS CLI</a> is in beta. <a href="https://github.com/euc-eng/hcs-cli/blob/main/doc/hcs-cli-cheatsheet.md">Cheatsheet</a>:</p>
     <code>
     # To get the login details: <br/>
     hcs login -d <br/><br/>

{hcs_core-0.1.291 → hcs_core-0.1.292}/hcs_core/util/job_view.py

@@ -153,9 +153,7 @@ class JobView:
             _MyPlainBarColumn(),
             # TextColumn("[white][progress.percentage][white]{task.percentage:>3.0f}%"),
             # TaskProgressColumn(show_speed=True),
-            TimeRemainingColumn(
-                compact=True, elapsed_when_finished=True, table_column=Column(style="white", min_width=5)
-            ),
+            TimeRemainingColumn(compact=True, elapsed_when_finished=True, table_column=Column(style="white", min_width=5)),
             TextColumn("{task.fields[details]}", table_column=Column(max_width=msg_width, no_wrap=True)),
             get_time=monotonic,
         )

{hcs_core-0.1.291 → hcs_core-0.1.292}/pyproject.toml

@@ -23,29 +23,29 @@ keywords = [
 dynamic = ["version"]
 
 dependencies = [
-    "Authlib>=1.2.1",
-    "click>=8.1.7",
+    "Authlib>=1.6.0",
+    "click>=8.2.1",
     "coloredlogs>=15.0.1",
-    "cryptography>=42.0.7",
-    "graphviz>=0.20.3",
-    "httpx>=0.27.0",
-    "packaging>=24.0",
-    "portalocker>=2.8.2",
-    "PyJWT>=2.8.0",
-    "pyOpenSSL>=24.1.0",
+    "cryptography>=45.0.5",
+    "graphviz>=0.21",
+    "httpx>=0.28.0",
+    "packaging>=25.0",
+    "portalocker>=3.0.0",
+    "PyJWT>=2.10.1",
+    "pyOpenSSL>=25.1.0",
     "PyYAML>=6.0.1",
     "questionary>=2.0.1",
-    "rich>=13.7.1",
+    "rich>=14.0.0",
     "setuptools>=70.0.0",
     "retry>=0.9.2",
     "tabulate>=0.9.0",
-    "rel>=0.4.7",
+    "rel>=0.4.9.20",
     "websocket_client>=1.2.3",
-    "psutil>=5.9.4",
+    "psutil>=7.0.0",
     "schedule>=1.1.0",
-    "yumako>=0.1.24",
-    "pydantic>=2.0.0",
-    "python-dotenv>=1.1.0",
+    "yumako>=0.1.27",
+    "pydantic>=2.11.7",
+    "python-dotenv>=1.1.1",
 ]
 
 [project.optional-dependencies]
@@ -80,7 +80,7 @@ exclude = [
 ]
 
 [tool.black]
-line-length = 120
+line-length = 140
 target-version = ['py39']
 include = '\.pyi?$'
 extend-exclude = '''

hcs_core-0.1.291/hcs_core/__init__.py

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