hcs-core 0.1.293__tar.gz → 0.1.294__tar.gz

{hcs_core-0.1.293 → hcs_core-0.1.294}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.293
+Version: 0.1.294
 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
@@ -42,6 +42,7 @@ 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'
 Requires-Dist: mypy; extra == 'dev'
 Requires-Dist: pylint; extra == 'dev'
 Requires-Dist: pytest; extra == 'dev'

hcs_core-0.1.294/hcs_core/__init__.py

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

{hcs_core-0.1.293 → hcs_core-0.1.294}/hcs_core/ctxp/_init.py

@@ -43,6 +43,7 @@ def init(app_name: str, store_path: str = user_home, config_path: str = "./confi
     global _initialized_app_name
     if _initialized_app_name == app_name:
         return
+
     if _initialized_app_name is not None:
         raise ValueError(f"App {app_name} already initialized with {_initialized_app_name}")
     _initialized_app_name = app_name
@@ -79,6 +80,7 @@ def app_name():
 
 def init_cli(main_cli: click.Group, commands_dir: str = "./cmds"):
     try:
+        telemetry.start(_initialized_app_name)
         ret = cli_processor.init(main_cli, commands_dir)
         telemetry.end()
         return ret

{hcs_core-0.1.293 → hcs_core-0.1.294}/hcs_core/ctxp/cli_processor.py

@@ -188,9 +188,9 @@ def _default_io(cmd: click.Command):
             "exclude_field": kwargs.pop("exclude_field"),
         }
         ctx = click.get_current_context()
-        from .telemetry import start as telemetry_start
+        from .telemetry import update as telemetry_update
 
-        telemetry_start(ctx.command_path, ctx.params)
+        telemetry_update(ctx.command_path, ctx.params)
 
         if io_args["output"] == "table":
 

hcs_core-0.1.294/hcs_core/ctxp/telemetry.py

@@ -0,0 +1,145 @@
+import json
+import logging
+import sys
+import time
+from datetime import datetime, timezone
+
+import click
+import httpx
+from yumako import env
+
+log = logging.getLogger(__name__)
+
+_record = None
+_enabled = None
+_app_name = ""
+
+
+def disable():
+    global _enabled
+    _enabled = False
+
+
+def _is_disabled():
+    global _enabled
+    if _enabled is None:
+        _enabled = env.bool("HCS_CLI_TELEMETRY", True)
+    return not _enabled
+
+
+def _get_version():
+    try:
+        from importlib.metadata import version
+
+        return version("hcs-cli")
+    except Exception as e:
+        log.debug(f"Failed to get hcs-cli version: {e}")
+        return "unknown"
+
+
+def _get_record():
+    global _record
+    if _record is None:
+        _record = {
+            "@timestamp": datetime.now(timezone.utc).isoformat(timespec="milliseconds"),
+            "app": _app_name,
+            "command": None,
+            "options": [],
+            "return": -1,
+            "error": None,
+            "time_ms": -1,
+            "version": _get_version(),
+            "env": {
+                "python_version": sys.version,
+                "platform": sys.platform,
+                "executable": sys.executable,
+            },
+        }
+    return _record
+
+
+def start(app_name: str = None):
+    if _is_disabled():
+        return
+
+    global _app_name
+    _app_name = app_name
+    _get_record()
+
+
+def update(cmd_path: str, params: dict):
+    if _is_disabled():
+        return
+
+    record = _get_record()
+    record["command"] = cmd_path
+    record["options"] = [k.replace("_", "-") for k, v in params.items() if v]
+
+
+def end(return_code: int = 0, error: Exception = None):
+    if _is_disabled():
+        return
+
+    record = _get_record()
+    if error:
+        if isinstance(error, click.exceptions.Exit):
+            return_code = error.exit_code
+        elif isinstance(error, SystemExit):
+            return_code = error.code
+        else:
+            record["error"] = str(error)
+            if return_code == 0:
+                return_code = 1
+    record["return"] = return_code
+    record["time_ms"] = int((time.time() - datetime.fromisoformat(record["@timestamp"]).timestamp()) * 1000)
+
+    _fix_missing_commands(record)
+    _injest(record)
+    return record
+
+
+def _fix_missing_commands(record):
+    if record["command"]:
+        return
+
+    args = sys.argv[1:]
+
+    # this does not work for all cases, but only as best effort.
+    options_started = False
+    options = record["options"]
+    command = [_app_name]
+    for arg in args:
+        if arg.startswith("-"):
+            options_started = True
+
+        if options_started:
+            if arg.startswith("--"):
+                options.append(arg[2:])
+            elif arg.startswith("-"):
+                options.append(arg[1:])
+            else:
+                # value. For privacy no logging.
+                continue
+        else:
+            command.append(arg)
+
+    record["command"] = " ".join(command)
+
+
+def _injest(doc):
+
+    # print('TELEMETRY end', json.dumps(doc, indent=4), flush=True)
+
+    try:
+        response = httpx.post(
+            f"https://collie.omnissa.com/es/hcs-cli/_doc",
+            auth=("append_user", "public"),
+            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

{hcs_core-0.1.293 → hcs_core-0.1.294}/pyproject.toml

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

hcs_core-0.1.293/hcs_core/__init__.py

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

hcs_core-0.1.293/hcs_core/ctxp/telemetry.py

@@ -1,102 +0,0 @@
-import json
-import logging
-import sys
-import time
-from datetime import datetime, timezone
-
-import click
-import httpx
-from yumako import env
-
-log = logging.getLogger(__name__)
-
-_record = None
-_enabled = None
-_version = None
-
-
-def disable():
-    global _enabled
-    _enabled = False
-
-
-def _is_disabled():
-    global _enabled
-    if _enabled is None:
-        _enabled = env.bool("HCS_CLI_TELEMETRY", True)
-    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
-
-    global _record
-    _record = {
-        "@timestamp": datetime.now(timezone.utc).isoformat(timespec="milliseconds"),
-        "command": cmd_path,
-        "options": [k.replace("_", "-") for k, v in params.items() if v],
-        "return": -1,
-        "error": None,
-        "time_ms": -1,
-        "version": _get_version(),
-        "env": {
-            "python_version": sys.version,
-            "platform": sys.platform,
-            "executable": sys.executable,
-        },
-    }
-
-
-def end(return_code: int = 0, error: Exception = None):
-    if _is_disabled():
-        return
-
-    if _record is None:
-        return
-
-    if error:
-        if isinstance(error, click.exceptions.Exit):
-            return_code = error.exit_code
-        elif isinstance(error, SystemExit):
-            return_code = error.code
-        else:
-            _record["error"] = str(error)
-            if return_code == 0:
-                return_code = 1
-    _record["return"] = return_code
-    _record["time_ms"] = int((time.time() - datetime.fromisoformat(_record["@timestamp"]).timestamp()) * 1000)
-
-    # print('TELEMETRY end', json.dumps(_record, indent=4), flush=True)
-
-    _injest(_record)
-    return _record
-
-
-def _injest(doc):
-    try:
-        response = httpx.post(
-            f"https://collie.omnissa.com/es/hcs-cli/_doc",
-            auth=("append_user", "public"),
-            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