hcs-cli 0.1.330__py3-none-any.whl → 0.1.332__py3-none-any.whl

hcs_cli/__init__.py

@@ -1,3 +1,3 @@
-__version__ = "0.1.330"
+__version__ = "0.1.332"
 
 from . import service as service  # noqa: F401

hcs_cli/cmds/hoc/log.py

@@ -0,0 +1,327 @@
+"""
+Copyright © 2025 Omnissa, LLC.
+"""
+
+import json
+import re
+import sys
+from datetime import timezone
+from typing import Optional
+
+import click
+import yumako
+from hcs_core.ctxp import util
+from hcs_core.sglib import cli_options as cli
+
+from hcs_cli.service import hoc
+from hcs_cli.support import predefined_payload
+
+_hdcs = ["US", "EU", "JP"]
+
+_regions = [
+    "eastus2",
+    "westus2",
+    "northcentralus",
+    "northeurope",
+    "germanywestcentral",
+    "uksouth",
+    "japaneast",
+    "australiaeast",
+    "centralindia",
+]
+_stacks = ["prod", "staging", "stress"]
+
+
+@click.command()
+@cli.org_id
+@click.option(
+    "--from",
+    "from_param",
+    type=str,
+    required=False,
+    default="-24h",
+    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
+)
+@click.option(
+    "--to",
+    type=str,
+    required=False,
+    default="now",
+    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
+)
+@click.option("--hdc", required=False, type=click.Choice(_hdcs, case_sensitive=False), help="The HDC location")
+@click.option("--region", required=False, type=click.Choice(_regions, case_sensitive=False), help="The region")
+@click.option("--stack", required=False, type=click.Choice(_stacks, case_sensitive=False), help="The stack")
+@click.option(
+    "--service",
+    required=False,
+    help="Filter by kubernetes.pod_labels.app. If multiple apps, use comma to separate, e.g. --service inventory,lcm",
+)
+@click.option("--raw", is_flag=True, default=False, help="If raw, output the raw result.")
+@click.argument("query", type=str, required=False)
+def log(org: str, from_param: str, to: str, hdc: str, region: str, stack: str, service: str, raw: bool, query: str):
+    """Search Kibana Log."""
+
+    # org_id = cli.get_org_id(org)
+
+    if not hdc:
+        hdc = "US"
+    else:
+        hdc = hdc.upper()
+    index_map = {
+        "US": "prod110-hdc-westus2-cp102-*",
+        # "US": "prod110-hdc-centralus-cp102-*",
+        "EU": "hoc-logs-eu-prod-*",
+        "JP": "hoc-logs-jp-prod-*",
+        "AUS": "",
+        "IND": "",
+        "GER": "",
+        "UK": "",
+        "US_APM": "prod110-hdc-westus2-cp102-*",
+        "EU_APM": "",
+        "JP_APM": "",
+    }
+    es_logs_search_index = index_map[hdc]
+
+    text = predefined_payload.load("hoc/logs.jsont")
+    replacements = {
+        "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
+        "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
+        "query": query or "",
+        "es_logs_search_index": es_logs_search_index,
+    }
+    try:
+        text = yumako.template.replace(
+            text=text,
+            mapping=replacements,
+            raise_on_unresolved_vars=True,
+            raise_on_unused_vars=True,
+        )
+    except ValueError as e:
+        return util.error_details(e), 1
+
+    parts = text.split("///", 2)
+    try:
+        first_line = json.loads(parts[0])
+    except Exception as e:
+        print(text, file=sys.stderr)
+        print(e, file=sys.stderr)
+        return
+    try:
+        second_line = json.loads(parts[1])
+    except Exception as e:
+        print(text, file=sys.stderr)
+        print(e, file=sys.stderr)
+        return
+
+    _update_query(second_line, any_apps=service)
+
+    payload_jsonp = json.dumps(first_line) + "\n" + json.dumps(second_line) + "\n"
+
+    hdc_location_mapping = {
+        # "US", "EU", "JP", "AUS", "IND", "GER", "UK", "US_APM", "EU_APM", "JP_APM"
+        "US": "US_APM",
+        "EU": "EU_APM",
+        "JP": "JP_APM",
+    }
+
+    # print(payload_jsonp)
+    result = hoc.es.raw_query(payload_jsonp, hdc_location=hdc_location_mapping[hdc])
+    if raw:
+        return result
+
+    # format the result to pure message array
+    ret = []
+    for item in result:
+        message = item["message"]
+        parsed = _parse_message(message)
+        ret.append(parsed)
+    return ret
+
+
+# Pattern 1: LCM / service-gateway style
+# "...INFO  [163053][mplateMonitor-119158] c.v.h.servicegateway.lcm.utils.KopLog..."
+_PATTERN_LCM = re.compile(
+    r"(?P<timestamp>\S+)"
+    r"\s+\[trace_id=(?P<trace_id>[^\]]*)\]"
+    r"\s+\[transaction_id=(?P<transaction_id>[^\]]*)\]"
+    r"\s+(?P<level>\S+)"
+    r"\s+\[(?P<thread_id>[^\]]*)\]\[(?P<thread_name>[^\]]*)\]"
+    r"\s+(?P<logger>\S+)"
+    r"\s+-\s+"
+    r"(?P<body>.*)",
+)
+
+# Pattern 2: clouddriver style (single thread bracket after level)
+# "...INFO          [http-nio-8080-exec-6] c.v.horizon.sg.clouddriver..."
+_PATTERN_CLOUDDRIVER = re.compile(
+    r"(?P<timestamp>\S+)"
+    r"\s+\[trace_id=(?P<trace_id>[^\]]*)\]"
+    r"\s+\[transaction_id=(?P<transaction_id>[^\]]*)\]"
+    r"\s+(?P<level>\S+)"
+    r"\s+\[(?P<thread_name>[^\]]*)\]"
+    r"\s+(?P<logger>\S+)"
+    r"\s+-\s+"
+    r"(?P<body>.*)",
+)
+
+# Pattern 3: task-service style (thread bracket before level)
+# "...[transaction_id=...] [tsch:iss-32521] INFO  c.v.h.s.t.service.TaskService..."
+_PATTERN_TASK = re.compile(
+    r"(?P<timestamp>\S+)"
+    r"\s+\[trace_id=(?P<trace_id>[^\]]*)\]"
+    r"\s+\[transaction_id=(?P<transaction_id>[^\]]*)\]"
+    r"\s+\[(?P<thread_name>[^\]]*)\]"
+    r"\s+(?P<level>\S+)"
+    r"\s+(?P<logger>\S+)"
+    r"\s+-\s+"
+    r"(?P<body>.*)",
+)
+
+# Pattern 4
+# "2026-04-10 00:24:26,559 [http-nio-8080-exec-10] WARN  co.elastic.apm.agent.impl.transaction.TraceState - sample rate already set to 1.0, trying to set it to 1.0 through header will be ignored"
+_PATTERN_ELASTIC = re.compile(
+    r"(?P<timestamp>\S+\s\S+)" r"\s+\[(?P<thread_name>[^\]]*)\]" r"\s+(?P<level>\S+)" r"\s+(?P<logger>\S+)" r"\s+-\s+" r"(?P<body>.*)",
+)
+
+# Pattern 5: JSON structured log (apm-server style)
+# "{\"log.level\":\"info\",\"@timestamp\":\"2026-04-10T00:24:26.596Z\",\"log.logger\":\"request\",...}"
+_PATTERN_JSON_LOG = re.compile(r"\s*\{.*\"@timestamp\".*\}")
+
+# Pattern 6: Envoy/Istio access log
+# "[2026-04-10T00:24:25.684Z] \"POST /ad-twin/v1/... HTTP/1.1\" 200 ..."
+_PATTERN_ENVOY = re.compile(
+    r"\[(?P<timestamp>[^\]]+)\]"
+    r"\s+\"(?P<method>\S+)\s+(?P<path>\S+)\s+(?P<protocol>[^\"]+)\""
+    r"\s+(?P<status_code>\d+)"
+    r"\s+(?P<body>.*)",
+)
+
+# Pattern 7 & 8: portal/pool style (empty transaction_id bracket)
+# "2026-04-10T00:27:57.372Z [trace_id=...] [] [kafka-consumer-listener-...] INFO  c.v.h.p.handler..."
+# "2026-04-10T00:27:57.376Z [trace_id=...] [] [http-nio-8080-exec-26] INFO  c.v.h.portal.service..."
+_PATTERN_PORTAL = re.compile(
+    r"(?P<timestamp>\S+)"
+    r"\s+\[trace_id=(?P<trace_id>[^\]]*)\]"
+    r"\s+\[(?P<transaction_id>[^\]]*)\]"
+    r"\s+\[(?P<thread_name>[^\]]*)\]"
+    r"\s+(?P<level>\S+)"
+    r"\s+(?P<logger>\S+)"
+    r"\s+-\s+"
+    r"(?P<body>.*)",
+)
+
+# Pattern 9: Spring Boot style (--- separator)
+# "2026-04-10 00:29:34.037  INFO 8 --- [istenerId-0-C-1] c.v.h.a.f.kafka.KafkaConsumerService     : Created ..."
+_PATTERN_SPRING = re.compile(
+    r"(?P<timestamp>\S+\s\S+)"
+    r"\s+(?P<level>\S+)"
+    r"\s+\S+"
+    r"\s+---"
+    r"\s+\[(?P<thread_name>[^\]]*)\]"
+    r"\s+(?P<logger>\S+)"
+    r"\s+:\s+"
+    r"(?P<body>.*)",
+)
+
+_PATTERNS = [_PATTERN_LCM, _PATTERN_CLOUDDRIVER, _PATTERN_TASK, _PATTERN_ELASTIC, _PATTERN_ENVOY, _PATTERN_PORTAL, _PATTERN_SPRING]
+
+
+def _parse_message(message: str) -> dict:
+    if _PATTERN_JSON_LOG.match(message):
+        try:
+            obj = json.loads(message)
+            return {
+                "timestamp": obj.get("@timestamp", ""),
+                "level": obj.get("log.level", ""),
+                "logger": obj.get("log.logger", ""),
+                "body": obj.get("message", ""),
+            }
+        except json.JSONDecodeError:
+            pass
+    for pattern in _PATTERNS:
+        m = pattern.match(message)
+        if m:
+            return m.groupdict()
+    return {"body": message}
+
+
+def _update_query(query_object: dict, any_apps: Optional[str]) -> dict:
+    # Example query object: query string "KOP" and "V1-CUSFP0101I", time range, and kubernetes.pod_labels.app=lcm
+    # {
+    # "query": {
+    #     "bool": {
+    #         "must": [],
+    #         "filter": [
+    #             {
+    #                 "bool": {
+    #                     "filter": [
+    #                         {
+    #                             "multi_match": {
+    #                                 "type": "phrase",
+    #                                 "query": "KOP",
+    #                                 "lenient": true
+    #                             }
+    #                         },
+    #                         {
+    #                             "multi_match": {
+    #                                 "type": "phrase",
+    #                                 "query": "V1-CUSFP0101I",
+    #                                 "lenient": true
+    #                             }
+    #                         }
+    #                     ]
+    #                 }
+    #             },
+    #             {
+    #                 "range": {
+    #                     "timestamp": {
+    #                         "format": "strict_date_optional_time",
+    #                         "gte": "2026-04-09T22:42:54.486Z",
+    #                         "lte": "2026-04-09T22:47:54.486Z"
+    #                     }
+    #                 }
+    #             },
+    #             {
+    #                 "match_phrase": {
+    #                     "kubernetes.pod_labels.app": "lcm"
+    #                 }
+    #             }
+    #         ],
+    #         "should": [],
+    #         "must_not": []
+    #     }
+    # }
+    # }
+
+    # example of the last match condition, if there are multiple app specified (is one of):
+    # {
+    #     "bool": {
+    #         "minimum_should_match": 1,
+    #         "should": [
+    #             {
+    #                 "match_phrase": {
+    #                     "kubernetes.pod_labels.app": "clouddriver"
+    #                 }
+    #             },
+    #             {
+    #                 "match_phrase": {
+    #                     "kubernetes.pod_labels.app": "lcm"
+    #                 }
+    #             }
+    #         ]
+    #     }
+    # }
+
+    filter_array = query_object["query"]["bool"]["filter"]
+
+    if any_apps:
+        apps = [a.strip() for a in any_apps.split(",") if a.strip()]
+        if len(apps) == 1:
+            filter_array.append({"match_phrase": {"kubernetes.pod_labels.app": apps[0]}})
+        elif len(apps) > 1:
+            filter_array.append(
+                {"bool": {"minimum_should_match": 1, "should": [{"match_phrase": {"kubernetes.pod_labels.app": app}} for app in apps]}}
+            )
+
+    return query_object

hcs_cli/cmds/hoc/search.py

@@ -36,6 +36,17 @@ def _formalize_query_string(input_str):
     return " ".join(parts).strip()
 
 
+def _parse_kv_args(arg_list: list[str]) -> dict[str, str]:
+    result = {}
+    for arg in arg_list:
+        if "=" not in arg:
+            raise ValueError(f"Invalid argument: {arg}. Expected format: key=value")
+        key, value = arg.split("=", 1)
+        key = key.strip()
+        result[key] = value.strip()
+    return result
+
+
 @click.command()
 @cli.org_id
 @click.option(
@@ -167,100 +178,3 @@ def es(org: str, from_param: str, to: str, file, raw: bool, predefined: str, arg
 
     print(payload_jsonp)
     return hoc.es.raw_query(payload_jsonp)
-
-
-_hdcs = ["US", "EU", "JP"]
-_regions = [
-    "eastus2",
-    "westus2",
-    "northcentralus",
-    "northeurope",
-    "germanywestcentral",
-    "uksouth",
-    "japaneast",
-    "australiaeast",
-    "centralindia",
-]
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option("--hdc", required=False, type=click.Choice(_hdcs, case_sensitive=False), help="The HDC location")
-@click.option("--region", required=False, type=click.Choice(_regions, case_sensitive=False), help="The HDC location")
-@click.argument("query", type=str, required=False)
-def logs(org: str, from_param: str, to: str, hdc: str, region: str, query: str):
-    """Perform a raw ES query for HCS logs."""
-
-    # org_id = cli.get_org_id(org)
-
-    if not hdc:
-        hdc = "US"
-    else:
-        hdc = hdc.upper()
-    index_map = {
-        "US": "prod110-hdc-centralus-cp102-*",
-        "EU": "hoc-logs-eu-prod-*",
-        "JP": "hoc-logs-jp-prod-*",
-    }
-    es_logs_search_index = index_map[hdc]
-
-    text = predefined_payload.load("hoc/logs.jsont")
-    replacements = {
-        "from": int(yumako.time.of(from_param, tz=timezone.utc).timestamp() * 1000),
-        "to": int(yumako.time.of(to, tz=timezone.utc).timestamp() * 1000),
-        "query": query if query else "",
-        "es_logs_search_index": es_logs_search_index,
-    }
-    try:
-        text = yumako.template.replace(
-            text=text,
-            mapping=replacements,
-            raise_on_unresolved_vars=True,
-            raise_on_unused_vars=True,
-        )
-    except ValueError as e:
-        return util.error_details(e), 1
-
-    parts = text.split("///", 2)
-    try:
-        first_line = json.loads(parts[0])
-    except Exception as e:
-        print(text, file=sys.stderr)
-        print(e, file=sys.stderr)
-        return
-    try:
-        second_line = json.loads(parts[1])
-    except Exception as e:
-        print(text, file=sys.stderr)
-        print(e, file=sys.stderr)
-        return
-    payload_jsonp = json.dumps(first_line) + "\n" + json.dumps(second_line) + "\n"
-
-    print(payload_jsonp)
-    return hoc.es.raw_query(payload_jsonp)
-
-
-def _parse_kv_args(arg_list: list[str]) -> dict[str, str]:
-    result = {}
-    for arg in arg_list:
-        if "=" not in arg:
-            raise ValueError(f"Invalid argument: {arg}. Expected format: key=value")
-        key, value = arg.split("=", 1)
-        key = key.strip()
-        result[key] = value.strip()
-    return result

hcs_cli/cmds/task.py

@@ -495,12 +495,15 @@ def list_tasks(
 @cli.org_id
 @click.option("--namespace", "-n", type=str, required=False)
 @click.option("--group", "-g", type=str, required=False)
+@click.option(
+    "--location", hidden=True, type=str, required=False, help="Task location, only for global scheduler. E.g. US, JP, IN, AU, DE, IE."
+)  # to be removed later
 @click.argument("smart_path", type=str, required=False)
-def get(org: str, namespace: str, group: str, smart_path: str, **kwargs):
+def get(org: str, namespace: str, group: str, location: str, smart_path: str, **kwargs):
     """Get a task. E.g. 'task get [[<namespace>/]<group>/]<key>'."""
     namespace, group, key = _parse_task_param(namespace, group, smart_path)
     org_id = cli.get_org_id(org)
-    return task.get(org_id, namespace, group, key, **kwargs)
+    return task.get(org_id, namespace, group, key, location=location, **kwargs)
 
 
 @task_cmd_group.command()
@@ -551,7 +554,9 @@ def get_logs(org: str, namespace: str, group: str, smart_path: str, last: bool,
     if state and last:
         return "--state cannot be used with --last.", 1
 
-    if org == "all" or org is None:
+    if last and org is None:
+        org_id = cli.get_org_id(org)
+    elif org == "all" or org is None:
         org_id = None
     else:
         org_id = cli.get_org_id(org)
@@ -568,7 +573,7 @@ def get_logs(org: str, namespace: str, group: str, smart_path: str, last: bool,
             search = state_search
 
     if last:
-        t = task.last(org_id, namespace, group, key, **kwargs)
+        t = task.last(org_id, namespace, group, key)
         if t:
             return t.log
         else:

hcs_cli/cmds/vm/log.py

@@ -28,7 +28,7 @@ _DCT_FAILED = frozenset({"ERROR", "EXPIRED"})
     help="Whether to recreate the log if it already exists. By default, it will not recreate the log and just return the existing log.",
 )
 @click.option(
-    "--silent", is_flag=True, default=False, help="Whether to print progress messages. By default, it will print progress messages."
+    "--verbose", is_flag=True, default=False, help="Whether to print progress messages. By default, it will print progress messages."
 )
 @click.option(
     "--save-as",
@@ -39,15 +39,13 @@ _DCT_FAILED = frozenset({"ERROR", "EXPIRED"})
 )
 @click.argument("vm_path", type=str, required=False)
 @cli.org_id
-def log(recreate: bool, silent: bool, save_path, vm_path: str, org: str, **kwargs):
+def log(recreate: bool, verbose: bool, save_path, vm_path: str, org: str, **kwargs):
     """Download VM DCT log"""
     org_id = cli.get_org_id(org)
     template_id, vm_id = parse_vm_path(vm_path)
 
     is_ops = has_any_permission(["sgadm:supportw", "sgadm:supportlog", "sgadm:service", "sgadm:support"])
 
-    verbose = not silent
-
     dct_info = dct_service.latest(org_id, template_id, vm_id, is_ops)
     if not dct_info:
         if verbose:
@@ -102,6 +100,9 @@ def log(recreate: bool, silent: bool, save_path, vm_path: str, org: str, **kwarg
         return f"Failed to download archive: {e}", 1
 
     dct_info["file_path"] = file_path
+
+    if verbose:
+        click.secho("----- DCT log downloaded -----", fg="bright_black")
     return dct_info
 
 

hcs_cli/service/hoc/es.py

@@ -46,6 +46,7 @@ def query(
     to_date: Union[str, datetime] = "now",
     template_file: str = None,
     template: str = None,
+    hdc_location: str = None,
     **kwargs,
 ):
     if template_file:
@@ -87,8 +88,11 @@ def query(
         raise e
 
     payload_jsonp = json.dumps(payload_type) + "\n" + json.dumps(payload_query) + "\n"
-    return raw_query(payload_jsonp)
+    return raw_query(payload_jsonp, hdc_location=hdc_location)
 
 
-def raw_query(payload_jsonp: str):
-    return _client.post("/v1/data/query/search", text=payload_jsonp)
+def raw_query(payload_jsonp: str, hdc_location: str = None):
+    url = "/v1/data/query/search"
+    if hdc_location:
+        url = f"/v1/data/query/search?hdcLocation={hdc_location}"
+    return _client.post(url, text=payload_jsonp)

hcs_cli/service/task.py

@@ -312,7 +312,7 @@ def _get_v1(namespace: str, group: str, key: str) -> Optional[TaskModel]:
     return t
 
 
-def _get_v2(org_id: str, namespace: str, group: str, key: str) -> Optional[TaskModel]:
+def _get_v2(org_id: str, namespace: str, group: str, key: str, location: str = None) -> Optional[TaskModel]:
     url = f"/v1/tasks/{key}?"
     if org_id:
         url += f"&orgId={org_id}"
@@ -320,6 +320,8 @@ def _get_v2(org_id: str, namespace: str, group: str, key: str) -> Optional[TaskM
         url += f"&namespace={namespace}"
     if group:
         url += f"&group={group}"
+    if location:
+        url += f"&location={location}"
     t = _scm_client.get(url, type=TaskModel)
     if not t:
         return
@@ -333,14 +335,14 @@ def get(org_id: str, namespace: str, group: str, key: str, **kwargs) -> Optional
         t = _get_v1(namespace, group, key)
         t.log = _lastlog(org_id, namespace, group, key)
     elif version == "v2":
-        t = _get_v2(org_id, namespace, group, key)
+        t = _get_v2(org_id, namespace, group, key, location=kwargs.get("location"))
     else:
         t = _get_v1(namespace, group, key)
         if t:
             t.log = _lastlog(org_id, namespace, group, key)
             _task_temp_lru[_k] = "v1"
         else:
-            t = _get_v2(org_id, namespace, group, key)
+            t = _get_v2(org_id, namespace, group, key, location=kwargs.get("location"))
             if t:
                 _task_temp_lru[_k] = "v2"
 

hcs_cli/support/exec_util.py

@@ -2,7 +2,8 @@ import json
 import os
 import shlex
 import subprocess
-from typing import Any, List, Tuple, Union
+import threading
+from typing import Any, List, Optional, Tuple, Union
 
 import click
 
@@ -17,6 +18,13 @@ def _split_command(cmd: Union[str, List[str]]) -> Tuple[List[str], str]:
     raise TypeError("cmd must be a string or a list of strings")
 
 
+# ANSI bright black / grey (same family as click.style(..., fg="bright_black"))
+_STREAM_GREY = b"\x1b[90m"
+# Yellow (same family as click.style(..., fg="yellow"))
+_STREAM_YELLOW = b"\x1b[33m"
+_STREAM_RESET = b"\x1b[0m"
+
+
 def exec(
     cmd,
     log_error=True,
@@ -102,3 +110,132 @@ def run_cli(
             input=input,
             show_command=show_command,
         )
+
+
+def stream_cli(
+    cmd: str,
+    raise_on_error=True,
+    input: Union[str, dict[Any, Any], list[Any]] = None,
+    show_command: bool = True,
+    env: dict = None,
+    color: Optional[bool] = None,
+) -> str:
+    """Run ``hcs ...``, stream stdout and stderr as they arrive, return full stdout text.
+
+    Uses unbuffered binary reads from the pipes so data is forwarded as the OS delivers it
+    (``text=True`` would wrap pipes in a buffered ``TextIOWrapper`` and can delay reads).
+
+    The child ``hcs`` process is Python: ``PYTHONUNBUFFERED=1`` is set so its stdout is not
+    block-buffered when piped. If ``input`` is omitted, stdin is ``DEVNULL`` so the subprocess
+    does not inherit the parent's stdin and block waiting for input; otherwise stdin is a pipe
+    and the given payload is written (dict/list are JSON-encoded, same as :func:`exec`).
+
+    Output is written with :func:`click.get_binary_stream` so it matches what :func:`click.echo`
+    uses (not always identical to :data:`sys.stdout`).
+
+    ANSI wrapping (grey on stdout, yellow on stderr): if ``color`` is ``True`` or ``False``,
+    that choice always wins. If ``color`` is omitted (``None``), wrapping is applied per stream
+    only when that stream is a TTY (same as :meth:`~io.IOBase.isatty` on the binary stream).
+    """
+    child_env = os.environ.copy()
+    child_env["HCS_CLI_CHECK_UPGRADE"] = "false"
+    child_env["PYTHONUNBUFFERED"] = "1"
+    if env:
+        child_env.update(env)
+
+    commands, cmd_text = _split_command(cmd)
+    if show_command:
+        text = f"RUNNING: {cmd_text}"
+        if input:
+            text += " <input-redacted>"
+        click.echo(click.style(text, fg="bright_black"))
+
+    stdin_bytes: Union[bytes, None] = None
+    if input is not None:
+        if isinstance(input, dict) or isinstance(input, list):
+            stdin_bytes = json.dumps(input).encode("utf-8")
+        else:
+            stdin_bytes = str(input).encode("utf-8")
+
+    parts: list[bytes] = []
+    proc = subprocess.Popen(
+        commands,
+        stdout=subprocess.PIPE,
+        stderr=subprocess.PIPE,
+        stdin=subprocess.PIPE if stdin_bytes is not None else subprocess.DEVNULL,
+        env=child_env,
+        bufsize=0,
+    )
+    assert proc.stdout is not None
+    assert proc.stderr is not None
+
+    out_bin = click.get_binary_stream("stdout")
+    err_bin = click.get_binary_stream("stderr")
+
+    try:
+        stdout_is_tty = out_bin.isatty()
+    except OSError:
+        stdout_is_tty = False
+    try:
+        stderr_is_tty = err_bin.isatty()
+    except OSError:
+        stderr_is_tty = False
+
+    if color is None:
+        wrap_stdout = stdout_is_tty
+        wrap_stderr = stderr_is_tty
+    else:
+        wrap_stdout = color
+        wrap_stderr = color
+
+    def pump_stdin() -> None:
+        assert proc.stdin is not None
+        try:
+            if stdin_bytes is not None:
+                proc.stdin.write(stdin_bytes)
+                proc.stdin.flush()
+        finally:
+            proc.stdin.close()
+
+    def pump_stdout() -> None:
+        try:
+            while True:
+                chunk = proc.stdout.read(4096)
+                if not chunk:
+                    break
+                out = (_STREAM_GREY + chunk + _STREAM_RESET) if wrap_stdout else chunk
+                out_bin.write(out)
+                out_bin.flush()
+                parts.append(out)
+        finally:
+            proc.stdout.close()
+
+    def pump_stderr() -> None:
+        try:
+            while True:
+                chunk = proc.stderr.read(4096)
+                if not chunk:
+                    break
+                out = (_STREAM_YELLOW + chunk + _STREAM_RESET) if wrap_stderr else chunk
+                err_bin.write(out)
+                err_bin.flush()
+        finally:
+            proc.stderr.close()
+
+    threads: list[threading.Thread] = []
+    if stdin_bytes is not None:
+        threads.append(threading.Thread(target=pump_stdin))
+    threads.extend(
+        [
+            threading.Thread(target=pump_stdout),
+            threading.Thread(target=pump_stderr),
+        ]
+    )
+    for t in threads:
+        t.start()
+    for t in threads:
+        t.join()
+    rc = proc.wait()
+    if rc != 0 and raise_on_error:
+        raise click.ClickException(f"Command '{cmd_text}' failed with return code {rc}.")
+    return b"".join(parts).decode("utf-8", errors="replace")

{hcs_cli-0.1.330.dist-info → hcs_cli-0.1.332.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-cli
-Version: 0.1.330
+Version: 0.1.332
 Summary: Horizon Cloud Service CLI.
 Project-URL: Homepage, https://github.com/euc-eng/hcs-cli
 Project-URL: Bug Tracker, https://github.com/euc-eng/hcs-cli/issues
@@ -14,7 +14,7 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
-Requires-Dist: hcs-core>=0.1.330
+Requires-Dist: hcs-core>=0.1.332
 Requires-Dist: inquirerpy>=0.3.4
 Requires-Dist: matplotlib>=3.8.0
 Requires-Dist: paho-mqtt>=2.1.0

{hcs_cli-0.1.330.dist-info → hcs_cli-0.1.332.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_cli/__init__.py,sha256=8nL9E5vkCwIrdUGhotKiSE8r-WSQRjCE2L7yuQAfp_I,72
+hcs_cli/__init__.py,sha256=nPvtkDDB3R6Uz-e6LUQVWGRnxx8UYe4qTvGgMXtbZow,72
 hcs_cli/__main__.py,sha256=mReIxxxuvlcxzSdPfIgptZ_Qkrg0MPOgT37utukr65g,125
 hcs_cli/main.py,sha256=CzGoya6yabf5akJ3l0gEzxBmMKznIhxGRXbsngtuPWc,3014
 hcs_cli/cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -7,7 +7,7 @@ hcs_cli/cmds/inspect.py,sha256=QBhBOkf2mHlGhgAhY9FXCfvViL2p4D3BudoKjyADdfE,659
 hcs_cli/cmds/login.py,sha256=0j2VA4cy2pgy6-Rm3ys9JMKHbyrdvCS8tw3LdijM9gk,10606
 hcs_cli/cmds/logout.py,sha256=FDYXnie1jytnEsFj-XuVSU4sZL9VPzaLO1KHFProX4g,185
 hcs_cli/cmds/query.py,sha256=hh1TVeSkvRiB07fqIA3GGpEBtP3XMz5XCmAGTXD7FOM,9302
-hcs_cli/cmds/task.py,sha256=pHyJNn6YXIW0l1KQBwwWma-YH2b455AXEuCi5h7VsZw,28770
+hcs_cli/cmds/task.py,sha256=N9EYRGoTtCVF2yktD0bmSlugGykRaysdwjNoT2al9jY,29037
 hcs_cli/cmds/test.py,sha256=rBFbcpUtwxxm6thl7uZGqmZTyCyFRpMO-xa7wExEhuM,755
 hcs_cli/cmds/upgrade.py,sha256=p1QKlacY5kPIQecN6sFRDXgS-_HrsGu_0Hjb1DXbjgI,377
 hcs_cli/cmds/ad/__init__.py,sha256=oB4WrRdC96cMS2OXs-1ITr8U_3ylI3QQNKZk51KsMJI,82
@@ -113,13 +113,9 @@ hcs_cli/cmds/entitlement/delete.py,sha256=fcdpVtZKpDdEZ9TS11r6OwwbNOVeBIf0bjpK6n
 hcs_cli/cmds/entitlement/get.py,sha256=Ia4eG3Kh6plXc3f94MtrRC9g27U3Z4xHSqsB4Et3cRw,477
 hcs_cli/cmds/entitlement/list.py,sha256=xCahx0Sr4r5w2rhI9eBNmYPsc0NHEbivApLNcvuWTZY,420
 hcs_cli/cmds/hoc/__init__.py,sha256=OL0_-lSzNCCDefv2m_DIkUAvTnA2qDbLtUdPsN9lsPk,128
-hcs_cli/cmds/hoc/connect.py,sha256=GvXfbB1JhAZRnl1_H1oxCAhAMCP9jtJgAlhVy9ggYNc,576
-hcs_cli/cmds/hoc/oncall.py,sha256=yc7s94Ti21QDm6WZAbuzB21GsGwced5jLrfmvkV8J2c,575
-hcs_cli/cmds/hoc/org.py,sha256=fi2rjO4hLuJuLSinWG3s8-dTdAj9EIrIFcN82LM8mtI,570
-hcs_cli/cmds/hoc/search.py,sha256=TrmuXd0_Mr7HlQouktjdgUq9I2WJgeg2nfpB4nxXddA,7972
+hcs_cli/cmds/hoc/log.py,sha256=dDMm4kqoVUCdz9zrVwE9xX1vpbejCr-m4W_IAC9yT_M,10518
+hcs_cli/cmds/hoc/search.py,sha256=YNFRiNXqNQNYOC8QfocXDJTZeLOmNMgmmkGcPOGqG-E,5513
 hcs_cli/cmds/hoc/stats.py,sha256=QEnAULDIhvsEgMLJg4Ql9cI6wUqd0zQW2QjwBWwXdno,2641
-hcs_cli/cmds/hoc/template.py,sha256=M9bPYDuPfYQjjR8SYS4r4NknckSAfrMJGW6GeczCZvw,574
-hcs_cli/cmds/hoc/vm.py,sha256=YjijTxpSbnUKyCtsc9wIYDYZULM4RKo2JfROdilmNvk,664
 hcs_cli/cmds/hoc/util/__init__.py,sha256=AC-hl0F-5R4V2uejk5FzFDlvT7uKGfjQyWq0quSznQs,14
 hcs_cli/cmds/hoc/util/inv_cache.py,sha256=p1Y2MLlzdVvcmWUyBN-55X0irqTihjgGTgRGF-diw4Q,398
 hcs_cli/cmds/hst/__init__.py,sha256=tAbpunGkAG0fBOaOBQybQzv9r6Ij7kgp4SWUpBEB1e0,119
@@ -284,7 +280,7 @@ hcs_cli/cmds/vm/actions.py,sha256=PdwqGc8rjX7QabhnTZR6do4NaGjvDZotx22LeiE1HJw,33
 hcs_cli/cmds/vm/delete.py,sha256=n6e4pPc26nujJN93bwFBE4rV00hNJZEQhlRMdakJwLU,934
 hcs_cli/cmds/vm/get.py,sha256=IJqxnuIXEBTDxBS2-SbqNFU-sKKn0tzOX5blaVFpxrU,483
 hcs_cli/cmds/vm/list.py,sha256=tMFs7VcVE-7MphtiqTlwGP41JWjIsbFnQFc0wHKF-J0,6044
-hcs_cli/cmds/vm/log.py,sha256=NffHS8OnECePKYBtb_n-7vEr9iSP8_1phO5bqDNAYoM,5250
+hcs_cli/cmds/vm/log.py,sha256=ejWr_7KGIOnbFEFCIJsO1DE42eqDJR1199FCovtb_Ws,5316
 hcs_cli/cmds/vm/pairing_info.py,sha256=Oq4bXWXj_GP_ejnK5fouc7928PDFk11-vGUjRXQnT6w,623
 hcs_cli/cmds/vm/put.py,sha256=bOqwdEVqI3_6F6C_3WH7P4PZP0iAhkJmm6Y9RHBVgl8,645
 hcs_cli/cmds/vm/use.py,sha256=EONJqWcF176tUyQ9OnkSpR92HBzTgFNwB__Dt10WAVU,1276
@@ -402,7 +398,7 @@ hcs_cli/service/edge.py,sha256=YN5uWrXKARfuOnqCKZQYCVP2BrNiAEDdS2AIIAgQdEo,3714
 hcs_cli/service/graphql.py,sha256=Vqt4wMeRSPV_2YhGvb9vs0vlac0_fMAhg1BijKX6reg,468
 hcs_cli/service/pool.py,sha256=aWdW0bRGlE58z95HvdSs7i8kwM79_dzqsrGjtnLv7lA,712
 hcs_cli/service/site.py,sha256=CMKMAhKaXZ67tFGkg5bPPBHsD3Ud76mOZKh4Vw_nx5g,1014
-hcs_cli/service/task.py,sha256=M1P0zwEHSmgg0VH_lxbXwWwUkiZgjBmQLlEjNQMS8Xk,16768
+hcs_cli/service/task.py,sha256=uyewZ4FctrAcdEUbt_mxhcS4iCf3mXz_QAuqdAl8kCE,16912
 hcs_cli/service/template.py,sha256=qKJ09Toe5NmApgd2H0TcVIoFshz-8fh2j3hDtvMO7z4,2242
 hcs_cli/service/uag.py,sha256=HabShUiLzZN-VM_UlPbfb4cQiWcgvsn3eB4CVPOzee0,3193
 hcs_cli/service/vm.py,sha256=Aw1AKvFSPlNTh1VWCdQXf21Yu_tDDao2NhMj5muGzwc,4839
@@ -439,7 +435,7 @@ hcs_cli/service/edgehub/edgecontroller.py,sha256=O6tSOm2auxtgSgxLbmEyXTLEi2d1l_0
 hcs_cli/service/edgehub/edgetwin.py,sha256=Wk6mDzL0CldI8wASicJ8y6IQX3HKn44v8VioPD4G2mw,405
 hcs_cli/service/hoc/__init__.py,sha256=fHFaB2296HgzIKwMPkB9BDxezIYI6M4OD-woPsrtOts,48
 hcs_cli/service/hoc/diagnostic.py,sha256=3sS1Saydsy-kYuF4IQMlz4scv1O4nMjnHOM7Trqh9cY,1465
-hcs_cli/service/hoc/es.py,sha256=XCeYuhGMJE89uRiH49lolCnNWMEi0Ec7VRhxKbEvAO4,3491
+hcs_cli/service/hoc/es.py,sha256=91eEgOMLXAucsu8BksVlE_Gj9OsxpsC_fyzi4GyLum8,3675
 hcs_cli/service/ims/__init__.py,sha256=CTtPWRJqthcWW7jMyqD-4fP09xSGEfVEj75GbrtyDsA,86
 hcs_cli/service/ims/gold_pattern.py,sha256=Q2zltOH051cii_-WJxtFouuA_okqJpzcWCuAYcNO2j4,2606
 hcs_cli/service/ims/helper.py,sha256=kruncMu5bUUA4mNCdzgdcgrSu7h6ZRjoI02_Fj6dqC0,1794
@@ -486,7 +482,7 @@ hcs_cli/service/vmm/hoc_event.py,sha256=NSU8Wj2cc8vWod-YDTEMuUXD4ToEKhgIrj3u1lTv
 hcs_cli/support/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_cli/support/constant.py,sha256=dVOiIaiH4rhC-cZJhTruXyv5ieS1j32YUhF8wEFjbEw,171
 hcs_cli/support/debug_util.py,sha256=X8gOsXzDDPwJxLKPPW7j_j4mZ3Up9xNLu1TDVv_VBRE,2678
-hcs_cli/support/exec_util.py,sha256=Epa09iCouAky7NE17O5rG-q3vdw35XJzrIUitPStSsY,3098
+hcs_cli/support/exec_util.py,sha256=Njqu-pgSTCexJFypYKna8ZvngHhUVkSmJOq81tXw37c,7692
 hcs_cli/support/inspect_util.py,sha256=weLylRM1_3O6nz0yUOiJUEBfR9TpUe-jpghmrQblSjE,3192
 hcs_cli/support/param_util.py,sha256=CHXWJvBF9EwFLYPn_CTOpFWdSyCP3w6iLlYByiz-nvE,1492
 hcs_cli/support/patch_util.py,sha256=r4IjpLA5yGqKer-wuSMB7d93BGPVnse_FhHcAxwYg7A,1524
@@ -501,7 +497,7 @@ hcs_cli/support/vm_table.py,sha256=hqNUKLVUuBiuDwlqcAQ7uAT1-4z6ZYOIGRcFWn8lnAo,2
 hcs_cli/support/scm/html_util.py,sha256=clgMpM90HxRRs3D9ORYYNB57AYh7y_-UzJrB4KX3dsY,458
 hcs_cli/support/scm/plan-editor.html.template,sha256=HtXMmvIvTixVEYN1gblCeqFTt_F8JF6ltDC11Eb_GMw,46975
 hcs_cli/support/scm/plan_editor.py,sha256=TxfHyyozoQ_DCyaPrYXFG9n8AnBuUD8753009FUD0GU,8722
-hcs_cli-0.1.330.dist-info/METADATA,sha256=UY6eU0l46KfLmhSe9wx2FhHFSkZAHfyby4z2FnGH_R8,3222
-hcs_cli-0.1.330.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
-hcs_cli-0.1.330.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
-hcs_cli-0.1.330.dist-info/RECORD,,
+hcs_cli-0.1.332.dist-info/METADATA,sha256=HQSDAbv69tNoL5kWve6ZIWmoABWWaPiWx7Yd8zzEfw0,3222
+hcs_cli-0.1.332.dist-info/WHEEL,sha256=QccIxa26bgl1E6uMy58deGWi-0aeIkkangHcxk2kWfw,87
+hcs_cli-0.1.332.dist-info/entry_points.txt,sha256=5uH-af1WUETSBSer2bu4YMGQNY5RriJHsjepb8ACiX8,42
+hcs_cli-0.1.332.dist-info/RECORD,,

hcs_cli/cmds/hoc/connect.py

@@ -1,24 +0,0 @@
-import click
-from hcs_core.sglib import cli_options as cli
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-def connect(org: str, from_param: str, to: str):
-    """Analyse connect issue."""
-    pass

hcs_cli/cmds/hoc/oncall.py

@@ -1,24 +0,0 @@
-import click
-from hcs_core.sglib import cli_options as cli
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-def oncall(org: str, from_param: str, to: str):
-    """Perform on-call tasks."""
-    pass

hcs_cli/cmds/hoc/org.py

@@ -1,24 +0,0 @@
-import click
-from hcs_core.sglib import cli_options as cli
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-def template(org: str, from_param: str, to: str):
-    """Analyse an org."""
-    pass

hcs_cli/cmds/hoc/template.py

@@ -1,24 +0,0 @@
-import click
-from hcs_core.sglib import cli_options as cli
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-def template(org: str, from_param: str, to: str):
-    """Analyse a template."""
-    pass

hcs_cli/cmds/hoc/vm.py

@@ -1,27 +0,0 @@
-import click
-from hcs_core.sglib import cli_options as cli
-
-from hcs_cli.service import VM
-
-
-@click.command()
-@cli.org_id
-@click.option(
-    "--from",
-    "from_param",
-    type=str,
-    required=False,
-    default="-12h",
-    help="Sepcify the from date. E.g. '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-@click.option(
-    "--to",
-    type=str,
-    required=False,
-    default="now",
-    help="Sepcify the to date. E.g. 'now', or '-1d', or '-1h35m', or '-1w', or '2023-12-04T00:19:22.854Z'.",
-)
-def template(org: str, from_param: str, to: str):
-    """Analyse a VM."""
-    vm = VM(org, "688d055e4f363c64c9c56764", "az-1-m-001")
-    return vm