hcs-core 0.1.293__py3-none-any.whl → 0.1.295__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.293"
+__version__ = "0.1.295"

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/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/ctxp/telemetry.py

@@ -12,7 +12,7 @@ log = logging.getLogger(__name__)
 
 _record = None
 _enabled = None
-_version = None
+_app_name = ""
 
 
 def disable():
@@ -28,65 +28,108 @@ def _is_disabled():
 
 
 def _get_version():
-    global _version
-    if _version is None:
-        try:
-            from importlib.metadata import 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"
 
-            _version = version("hcs-cli")
-        except Exception as e:
-            log.debug(f"Failed to get hcs-cli version: {e}")
-            _version = "unknown"
-    return _version
 
+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(cmd_path: str, params: dict):
+
+def start(app_name: str = None):
     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,
-        },
-    }
+    global _app_name
+    _app_name = app_name
+    _get_record()
 
 
-def end(return_code: int = 0, error: Exception = None):
+def update(cmd_path: str, params: dict):
     if _is_disabled():
         return
 
-    if _record is None:
+    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)
+            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)
+    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)
+    _fix_missing_commands(record)
+    _injest(record)
+    return 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",

{hcs_core-0.1.293.dist-info → hcs_core-0.1.295.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.293
+Version: 0.1.295
 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.293.dist-info → hcs_core-0.1.295.dist-info}/RECORD

@@ -1,8 +1,8 @@
-hcs_core/__init__.py,sha256=dpURb1M-NF0ulraHpSZhuqRQqVLMZL5u8ZeOnRNcw1M,24
+hcs_core/__init__.py,sha256=Cru0kvgt1VLfBCuVDXGLqKb3MgCs91b24AErV6yJlmQ,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
-hcs_core/ctxp/_init.py,sha256=QCIAHCue6KZQ-gq-dcxHsGW5QQQmhuGgBUm_E9x_Beg,2885
+hcs_core/ctxp/_init.py,sha256=fMcRMPfJx-N0c-u0Zj2sFVKQL1-lWQd28gooAZETGUA,2933
 hcs_core/ctxp/cli_options.py,sha256=cwlUgYXzIie9eRcu8fkBo_iFvC8LhflKGblWYtM2Hto,2739
-hcs_core/ctxp/cli_processor.py,sha256=pVfMLAJne34YY2EYz_Tz-8yUxUry60gooGm6EFPIieM,7652
+hcs_core/ctxp/cli_processor.py,sha256=uxWqDecENdO8xd7ghR0wz10qwsroCZ93OtZAqtIFuJ8,7655
 hcs_core/ctxp/cmd_util.py,sha256=_-VwQSmkfi52qWC3uHQI06mSiIPfsZroDruTDYHXiMA,3119
 hcs_core/ctxp/config.py,sha256=vRdzPxi3Yrt04cnR6b5mJwEOtYBh21qvmlSSsgyGoI4,931
 hcs_core/ctxp/context.py,sha256=y0ouOzXyYTg9MOuWjzjls9WfOKYaO31_MGJJ2S-Y9p4,3375
@@ -19,7 +19,7 @@ hcs_core/ctxp/profile_store.py,sha256=v4RvKSaKSJhAt5rEGbC6v-NfaI3N67YffPm-qlrQWd
 hcs_core/ctxp/recent.py,sha256=ER1HASPRm1k_3MIO-WVbj2vGipY565ZpBlmo-_V3vjo,1797
 hcs_core/ctxp/state.py,sha256=gjcMRVONKBq7WiFQo-xca1726ngZe90mnPrF3vbXDrU,1634
 hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,4586
-hcs_core/ctxp/telemetry.py,sha256=IpJF-BGqU_2nlZm2nfKzpSPwTQQPX_BESMIzR3nH3EM,2483
+hcs_core/ctxp/telemetry.py,sha256=iZv9x2n2aovpjYxNhnih_LS1fEJZjH_rbTsRKngv_Q0,3477
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
 hcs_core/ctxp/util.py,sha256=4vnaItrdkxCqMTdBf5bKDJ9dSSX9sraSP9XjGRq6xpU,11616
@@ -64,6 +64,6 @@ hcs_core/util/query_util.py,sha256=5bh3bUVIQuY9qerndfuyfyzkTExYJ8zD0_e3PSN7y-4,3
 hcs_core/util/scheduler.py,sha256=bPpCmGUL1UctJMfLPAg-h4Hl2YZr96FiI78-G_Usn08,2958
 hcs_core/util/ssl_util.py,sha256=MvU102fGwWWh9hhSmLnn1qQIWuD6TjZnN0iH0MXUtW0,1239
 hcs_core/util/versions.py,sha256=urMtShfoBx_Eqq0D-450LP0i-rW447k9yX8q8j5H_qA,1721
-hcs_core-0.1.293.dist-info/METADATA,sha256=wX5U-HdIKSqC2IdMHnJqQiVGs3UrnwrDtxvZNJHzv8k,1914
-hcs_core-0.1.293.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-hcs_core-0.1.293.dist-info/RECORD,,
+hcs_core-0.1.295.dist-info/METADATA,sha256=0ruALOs54xQC6ZbgrH6A18mf7AtY56dCVQCFBA2x2ng,1951
+hcs_core-0.1.295.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+hcs_core-0.1.295.dist-info/RECORD,,