hcs-core 0.1.317__tar.gz → 0.1.319__tar.gz

{hcs_core-0.1.317 → hcs_core-0.1.319}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.317
+Version: 0.1.319
 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
@@ -35,10 +35,9 @@ Requires-Dist: rich>=14.0.0
 Requires-Dist: schedule>=1.1.0
 Requires-Dist: tabulate>=0.9.0
 Requires-Dist: websocket-client>=1.2.3
-Requires-Dist: yumako>=0.1.36
+Requires-Dist: yumako>=0.1.37
 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: hatch; extra == 'dev'
@@ -47,8 +46,9 @@ Requires-Dist: pylint; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
 Requires-Dist: twine; extra == 'dev'
+Requires-Dist: vulture; extra == 'dev'
 Requires-Dist: wheel; extra == 'dev'
+Requires-Dist: yamlfix; extra == 'dev'
 Description-Content-Type: text/markdown
 
 hcs-cli core component.
-

{hcs_core-0.1.317 → hcs_core-0.1.319}/README.md

@@ -1,2 +1 @@
 hcs-cli core component.
-

hcs_core-0.1.319/hcs_core/__init__.py

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

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/cli_options.py

@@ -76,7 +76,18 @@ 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.")
+
+def limit(func=None, *, default=100):
+    decorator = click.option(
+        "--limit", "-l", type=int, required=False, default=default, help="Optionally, specify the number of records to fetch."
+    )
+    if func is not None:
+        # Called as @limit (without parentheses)
+        return decorator(func)
+    else:
+        # Called as @limit() or @limit(default=...)
+        return decorator
+
 
 ids = click.option(
     "--ids",

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/cli_processor.py

@@ -167,7 +167,6 @@ def _import_cmd_file(mod_path: Path, parent: click.core.Group):
 
 # Create a new decorator that combines the individual decorators
 def _default_io(cmd: click.Command):
-
     from .cli_options import exclude_field, field, first, ids, output
 
     cmd = output(cmd)

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/context.py

@@ -81,8 +81,7 @@ class Context:
             self._store.save(key=self.name, data=self.data)
         return False
 
-    def apply_variables(self, object: any, additional_vars: dict = None):
-
+    def apply_variables(self, object: Any, additional_vars: dict = None):
         mapping = self._data.copy()
         if additional_vars:
             mapping.update(additional_vars)

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/data_util.py

@@ -16,7 +16,6 @@ def load_data(file_name: str, class_type: str):
 
 
 def load_data_file(file, default=None, format="auto"):
-
     if isinstance(file, TextIOWrapper):
         text = file.read(-1)
         text = text.strip()
@@ -259,7 +258,6 @@ def process_variables(obj: dict, fn_get_var=None, use_env: bool = True):
         fn_get_var = _fn_get_var
 
     if use_env:
-
         prev_fn_get_var = fn_get_var
 
         def _fn_get_var_from_env(name: str):

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/dispatcher.py

@@ -1,4 +1,5 @@
 import logging
+from typing import Callable
 from weakref import WeakSet
 
 log = logging.getLogger(__name__)
@@ -7,7 +8,7 @@ log = logging.getLogger(__name__)
 class Dispatcher:
     _registry: dict = {}
 
-    def register(self, key: str, fn: callable):
+    def register(self, key: str, fn: Callable):
         listeners = self._registry.get(key)
         if not listeners:
             listeners = WeakSet()
@@ -20,7 +21,7 @@ class Dispatcher:
             self.register(k, v)
         return self
 
-    def unregister(self, key: str, fn: callable):
+    def unregister(self, key: str, fn: Callable):
         listeners = self._registry.get(key)
         if listeners:
             listeners.remove(fn)
@@ -52,7 +53,7 @@ class StrictDispatcher:
         self._impl = impl
         self._events = events
 
-    def register(self, key: str, fn: callable):
+    def register(self, key: str, fn: Callable):
         self._validate(key)
         self._impl.register(key, fn)
         return self
@@ -62,7 +63,7 @@ class StrictDispatcher:
             self.register(k, v)
         return self
 
-    def unregister(self, key: str, fn: callable):
+    def unregister(self, key: str, fn: Callable):
         self._validate(key)
         self._impl.unregister(key, fn)
         return self

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/fstore.py

@@ -234,7 +234,6 @@ class fstore:
             if depth == 0:
                 return [f for f in listdir(self._path) if path.isdir(path.join(self._path, f))]
             else:
-
                 return _list_sub_dirs(self._path, depth)
 
         raise Exception("TODO: list children for RAM store")

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/profile.py

@@ -164,7 +164,6 @@ def get(profile_name: str, reload: bool = False, default=None) -> dotdict:
 
 
 def _load_data_file_with_env_overrides(profile_name: str, default: dict) -> dict:
-
     from ._init import app_name
 
     my_name = app_name()

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/task_schd.py

@@ -3,6 +3,7 @@ import threading
 from copy import deepcopy
 from dataclasses import dataclass
 from time import sleep, time
+from typing import Callable
 
 import schedule
 
@@ -78,7 +79,7 @@ def _task_wrapper_once(fn_impl, kwargs):
     return schedule.CancelJob
 
 
-def submit(fn_task: callable, initial_delay: str = None, repeat_interval: str = None, **kwargs):
+def submit(fn_task: Callable, initial_delay: str = None, repeat_interval: str = None, **kwargs):
     if initial_delay:
         initial_delay_seconds = duration.to_seconds(initial_delay)
     else:

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/telemetry.py

@@ -127,7 +127,6 @@ def _fix_missing_commands(record):
 
 
 def _injest(doc):
-
     # print('TELEMETRY end', json.dumps(doc, indent=4), flush=True)
 
     try:

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/ctxp/util.py

@@ -21,7 +21,7 @@ import subprocess
 import sys
 import traceback
 import types
-from typing import Any, Callable
+from typing import Any, Callable, Union
 
 import click
 import httpx
@@ -34,7 +34,7 @@ class CtxpException(Exception):
     pass
 
 
-def error(reason: any, return_code: int = 1) -> tuple[CtxpException, int]:
+def error(reason: Any, return_code: int = 1) -> tuple[CtxpException, int]:
     # Shortcut if the reason is an Exception already
     if isinstance(reason, Exception):
         return reason, return_code
@@ -49,7 +49,7 @@ def error(reason: any, return_code: int = 1) -> tuple[CtxpException, int]:
     return CtxpException(reason), return_code
 
 
-def validate_error_return(reason, return_code):
+def validate_error_return(reason: Any, return_code: int):
     if return_code == 0:
         raise CtxpException("Invalid return code. return_code must not be 0 (success) in error situation.")
     if not isinstance(return_code, int):
@@ -391,7 +391,7 @@ def format_table(data: list, fields_mapping: dict, columns_to_sum: list = None):
     return tabulate(table, headers=headers) + "\n"
 
 
-def colorize(data: dict, name: str, mapping: dict):
+def colorize(data: dict, name: str, mapping: Union[dict, str, Callable]):
     if os.environ.get("TERM_COLOR") == "0":
         return
 
@@ -413,6 +413,8 @@ def colorize(data: dict, name: str, mapping: dict):
         c = mapping(s)
         if c:
             data[name] = click.style(s, fg=c)
+    elif isinstance(mapping, str):
+        data[name] = click.style(s, fg=mapping)
     else:
         raise Exception(f"Unexpected mapping type: {type(mapping)} {mapping}")
 

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/plan/core.py

@@ -415,7 +415,6 @@ def _handle_resource(name, res, state, for_deploy: bool, fn_process: typing.Call
 
     kop_mode = KOP.MODE.create if for_deploy else KOP.MODE.delete
     with KOP(state, kind, name, kop_mode) as kop:
-
         conditions = res.get("conditions")
         if conditions:
             conditions = deepcopy(conditions)

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/plan/provider/dev/fibonacci.py

@@ -13,13 +13,15 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+from typing import Any, Optional
 
-def process(data: dict, state: dict) -> dict:
+
+def process(data: dict, state: dict) -> Any:
     n = data["n"]
     return _fibonacci(n)
 
 
-def _fibonacci(n: int):
+def _fibonacci(n: int) -> int:
     if n <= 0:
         raise ValueError("n must be a positive integer.")
     if n == 1:
@@ -33,9 +35,9 @@ def _fibonacci(n: int):
     return curr
 
 
-def destroy(data: dict, state: dict, force: bool) -> dict:
+def destroy(data: dict, state: dict, force: bool) -> Optional[dict]:
     return None
 
 
-def eta(action: str, data: dict, state: dict):
+def eta(action: str, data: dict, state: dict) -> str:
     return "10s"

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/sglib/client_util.py

@@ -316,7 +316,7 @@ def wait_for_res_deleted(
         time.sleep(sleep_seconds)
 
 
-# flake8: noqa=E731
+# flake8: noqa: E731
 def wait_for_res_status(
     resource_name: str,
     fn_get: Callable,

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/sglib/ez_client.py

@@ -175,6 +175,7 @@ class EzClient:
                 self._init_client(base_url, client)
                 self._lazy_init = None
 
+            self._client_impl.follow_redirects = True
             self._client_impl.ensure_token()
             return self._client_impl
         finally:
@@ -193,9 +194,29 @@ class EzClient:
         # import json as jsonlib
         # 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)
+            resp = self._client().post(url, json=json, content=text, files=files, headers=headers, timeout=timeout, follow_redirects=True)
         except httpx.HTTPStatusError as e:
-            _raise_http_error(e)
+            # the follow_redirects does not work for 307
+            if e.response.status_code in [301, 302, 307]:
+                target = e.response.headers.get("Location")
+                if target:
+                    client_base_url = str(self._client().base_url)
+                    default_is_https = client_base_url.startswith("https://")
+                    target_is_https = target.startswith("https://")
+                    if default_is_https and not target_is_https:
+                        target = target.replace("http://", "https://", 1)
+                    elif not default_is_https and target_is_https:
+                        target = target.replace("https://", "http://", 1)
+                    try:
+                        resp = self._client().post(
+                            target, json=json, content=text, files=files, headers=headers, timeout=timeout, follow_redirects=True
+                        )
+                    except httpx.HTTPStatusError as e:
+                        _raise_http_error(e)
+                else:
+                    _raise_http_error(e)
+            else:
+                _raise_http_error(e)
         data = _parse_resp(resp)
         if data and type:
             try:
@@ -209,7 +230,7 @@ class EzClient:
     def get(self, url: str, headers: dict = None, raise_on_404: bool = False, type: Optional[Type[BaseModel]] = None):
         try:
             # print("->", self._client().base_url, url)
-            resp = self._client().get(url, headers=headers)
+            resp = self._client().get(url, headers=headers, follow_redirects=True)
             data = _parse_resp(resp)
             if data and type:
                 try:
@@ -230,7 +251,7 @@ class EzClient:
 
     def patch(self, url: str, json: dict = None, text=None, headers: dict = None):
         try:
-            resp = self._client().patch(url, json=json, content=text, headers=headers)
+            resp = self._client().patch(url, json=json, content=text, headers=headers, follow_redirects=True)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             _raise_http_error(e)
@@ -238,7 +259,7 @@ class EzClient:
 
     def delete(self, url: str, headers: dict = None, raise_on_404: bool = False):
         try:
-            resp = self._client().delete(url, headers=headers)
+            resp = self._client().delete(url, headers=headers, follow_redirects=True)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             if _is_404(e):
@@ -251,7 +272,7 @@ class EzClient:
 
     def put(self, url: str, json: dict = None, text=None, headers: dict = None):
         try:
-            resp = self._client().put(url, json=json, content=text, headers=headers)
+            resp = self._client().put(url, json=json, content=text, headers=headers, follow_redirects=True)
             return _parse_resp(resp)
         except httpx.HTTPStatusError as e:
             _raise_http_error(e)

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/sglib/utils.py

@@ -65,7 +65,6 @@ def run_govc_guest_script(script, args):
 
 
 def waitForVmPowerOff(iPath):
-
     def current_millis():
         return int(round(time.time() * 1000))
 

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/util/duration.py

@@ -59,7 +59,6 @@ def to_seconds(duration_string: str) -> int:
 
 
 def to_duration(seconds: int, simple: bool = False) -> str:
-
     future = seconds < 0
     if future:
         seconds = -seconds

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/util/pki_util.py

@@ -173,7 +173,6 @@ def generate_CSR(nodename, sans=[], key_length: int = 2048):
 
 
 def generate_self_signed_cert(common_name: str):
-
     validity_days = 365
 
     private_key = rsa.generate_private_key(

{hcs_core-0.1.317 → hcs_core-0.1.319}/hcs_core/util/query_util.py

@@ -13,7 +13,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
-from typing import Any, Callable, Iterator, Tuple
+from typing import Any, Callable, Iterator, Optional, Tuple
 from urllib.parse import urlencode
 
 
@@ -38,7 +38,7 @@ def with_query(url: str, **kwargs: Any) -> str:
 
 
 class PageRequest:
-    def __init__(self, fn_get_page: Callable, fn_filter: Callable = None, **kwargs):
+    def __init__(self, fn_get_page: Callable, fn_filter: Optional[Callable] = None, **kwargs):
         limit = kwargs.get("limit")
         if limit is None or limit == "":
             limit = 10
@@ -52,7 +52,7 @@ class PageRequest:
             self.query["size"] = 20
 
     def get_page(self, page: int, size: int) -> list:
-        content, _ = self.get_page(page, size)
+        content, _ = self._get_page(page, size)
         return content
 
     def _get_page(self, page: int, size: int) -> Tuple[list, bool]:

{hcs_core-0.1.317 → hcs_core-0.1.319}/pyproject.toml

@@ -42,7 +42,7 @@ dependencies = [
     "websocket_client>=1.2.3",
     "psutil>=7.0.0",
     "schedule>=1.1.0",
-    "yumako>=0.1.36",
+    "yumako>=0.1.37",
     "pydantic>=2.11.7",
     "python-dotenv>=1.1.1",
 ]
@@ -50,7 +50,6 @@ dependencies = [
 [project.optional-dependencies]
 dev = [
     "build",
-    "black",
     "mypy",
     "bandit",
     "wheel",
@@ -60,6 +59,8 @@ dev = [
     "ruff",
     "flake8",
     "hatch",
+    "vulture",
+    "yamlfix",
 ]
 
 [project.urls]
@@ -79,15 +80,9 @@ exclude = [
     "tests/**",
 ]
 
-[tool.black]
+[tool.ruff]
 line-length = 140
-target-version = ['py39']
-include = '\.pyi?$'
-extend-exclude = '''
-# A regex preceded with ^/ will apply only to files and directories
-# in the root of the project.
-^/foo.py  # exclude a file named foo.py in the root of the project (in addition to the defaults)
-'''
+target-version = "py39"
 
 [tool.hatch.version]
 path = "hcs_core/__init__.py"

hcs_core-0.1.317/hcs_core/__init__.py

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