hcs-core 0.1.310__py3-none-any.whl → 0.1.312__py3-none-any.whl

hcs_core/__init__.py

@@ -1 +1 @@
-__version__ = "0.1.310"
+__version__ = "0.1.312"

hcs_core/ctxp/util.py

@@ -456,5 +456,9 @@ def default_table_formatter(data: Any, mapping: dict = None):
         )
         _restrict_readable_length(d, "name", 60)
     if mapping:
-        field_mapping.update(mapping)
+        for k, v in mapping.items():
+            if v is None:
+                field_mapping.pop(k, None)
+            else:
+                field_mapping[k] = v
     return format_table(data, fields_mapping=field_mapping)

hcs_core/sglib/login_support.py

@@ -17,6 +17,7 @@ limitations under the License.
 # PKCE with authlib: https://docs.authlib.org/en/latest/specs/rfc7636.html
 
 import logging
+import platform
 import secrets
 import threading
 import webbrowser
@@ -38,6 +39,7 @@ _public_client_ids = {
 }
 
 _auth_code_event = threading.Event()
+_auth_code_event.value = None
 _state = None
 
 _auth_success_html = """
@@ -64,7 +66,7 @@ _auth_success_html = """
     <h3>You have successfully logged into Omnissa 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/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>
+    <p><a href="https://github.com/euc-eng/hcs-cli/blob/dev/README.md">HCS CLI</a> is in tech preview. <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/>
@@ -166,9 +168,18 @@ def do_oauth2_pkce(csp_url: str, client_id: str, org_id: str):
     webbrowser.open(authorization_url, new=0, autoraise=True)
 
     try:
-        _auth_code_event.wait()
-    except:
-        log.info("Aborted")
+        # On Windows, wait() without timeout doesn't respond to CTRL+C properly
+        # Use a polling loop with timeout to allow KeyboardInterrupt to be caught
+        if platform.system() == "Windows":
+            while not _auth_code_event.wait(timeout=0.5):
+                pass  # Keep waiting until the event is set
+        else:
+            _auth_code_event.wait()
+    except KeyboardInterrupt:
+        log.info("Aborted by user")
+        return
+    except Exception as e:
+        log.error(f"Login error: {e}")
         return
     # Once the user is redirected back to your app with an authorization code, exchange it for an access token
     authorization_code = _auth_code_event.value

hcs_core/util/job_view.py

@@ -19,7 +19,7 @@ import threading
 from time import monotonic, sleep
 from typing import Optional
 
-from rich.console import RenderableType
+from rich.console import Console, RenderableType
 from rich.live import Live
 from rich.progress import Progress, ProgressBar, ProgressColumn, SpinnerColumn, Task, TextColumn, TimeRemainingColumn
 from rich.table import Column
@@ -27,6 +27,9 @@ from rich.text import Text
 
 import hcs_core.util.duration as duration
 
+# Detect if we're running on Windows
+_IS_WINDOWS = os.name == "nt"
+
 
 def _shorten_package_name(package_name, max_length):
     if len(package_name) <= max_length:
@@ -117,6 +120,13 @@ class _MyTimeRemainingColumn(ProgressColumn):
 
 
 class _MySpinnerColumn(SpinnerColumn):
+    def __init__(self, *args, **kwargs):
+        # Use ASCII spinner for Windows terminals
+        if _IS_WINDOWS and "spinner_name" not in kwargs:
+            # Use a simple ASCII spinner: | / - \
+            kwargs["spinner_name"] = "line"
+        super().__init__(*args, **kwargs)
+
     def render(self, task: "Task") -> RenderableType:
         if task.finished:
             text = self.finished_text
@@ -148,6 +158,11 @@ class JobView:
 
         w, h = os.get_terminal_size()
         msg_width = w - _NAME_WIDTH - 1 - 1 - 1 - 10 - 1 - 5 - 1 - 1
+
+        # Create a console with ASCII-only mode for Windows to avoid rendering issues
+        # We need to store it and pass it to Live as well
+        self._console = Console(legacy_windows=True) if _IS_WINDOWS else None
+
         self._job_ctl = Progress(
             TextColumn("{task.description}", table_column=Column(max_width=_NAME_WIDTH, min_width=10)),
             # SpinnerColumn(table_column=Column(min_width=1)),
@@ -158,6 +173,7 @@ class JobView:
             # TaskProgressColumn(show_speed=True),
             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)),
+            console=self._console,
             get_time=monotonic,
         )
 
@@ -232,7 +248,7 @@ class JobView:
 
     def show(self) -> None:
         try:
-            with Live(self._job_ctl, refresh_per_second=10):
+            with Live(self._job_ctl, refresh_per_second=10, console=self._console):
                 self._view_started.set()
                 while True:
                     self.refresh()

{hcs_core-0.1.310.dist-info → hcs_core-0.1.312.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.310
+Version: 0.1.312
 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
@@ -9,7 +9,7 @@ Project-URL: repository, https://github.com/euc-eng/hcs-cli
 Project-URL: changelog, https://github.com/euc-eng/hcs-cli/blob/main/CHANGELOG.md
 Author-email: Nanw1103 <nanw1103@gmail.com>
 Keywords: CLI,Horizon,Horizon Cloud,Horizon Cloud Service
-Classifier: Development Status :: 4 - Beta
+Classifier: Development Status :: 3 - Alpha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3

{hcs_core-0.1.310.dist-info → hcs_core-0.1.312.dist-info}/RECORD

@@ -1,4 +1,4 @@
-hcs_core/__init__.py,sha256=qNe_N_xOYVLW7IcTJNa4ZbiRGoqGLfwqhzHzTvVvWq0,24
+hcs_core/__init__.py,sha256=2LCS8KYJynrXugQ7FAsUblKtqbI8zazgWtvJiYq-ppg,24
 hcs_core/ctxp/__init__.py,sha256=bHVHhJP10Luz1a3Kk3zFx14dAO4SY6Q20Lrv8rNWWGc,1075
 hcs_core/ctxp/_init.py,sha256=fMcRMPfJx-N0c-u0Zj2sFVKQL1-lWQd28gooAZETGUA,2933
 hcs_core/ctxp/cli_options.py,sha256=KFu9_cRB1OyXaZJFLDCb3PpuQ0_5-ou2cdaL_q0_Lns,3098
@@ -22,7 +22,7 @@ hcs_core/ctxp/task_schd.py,sha256=mvZMeKDSSo2p7VidSoZY1XZj433TQn_YF9SGJEzl9lg,45
 hcs_core/ctxp/telemetry.py,sha256=tSjI_8OE2Ix3n--YHAO9sPmzi8ETbFHEPxzS52-usmM,3476
 hcs_core/ctxp/template_util.py,sha256=XslvIuRBlTVsUW0Y9M_D8gUPc1jWq6X2p4At2VAe1KU,731
 hcs_core/ctxp/timeutil.py,sha256=RyRrIRdFHbIghdB8wbC8VdABvc7hki2v51b1x2JvHgo,445
-hcs_core/ctxp/util.py,sha256=UTTtP-jjt3r5N-CTf0We64yLPWfFIl9dNSHkfsbFvLY,14225
+hcs_core/ctxp/util.py,sha256=29TnUNHmbwVDWUHHMdlVw-dk0c5ffT9n2uyOD6P6CiA,14348
 hcs_core/ctxp/var_template.py,sha256=cTjj1UJ58ac6s5z4Oh5hSDQwKixq-rdbCF1D8akjAo0,3219
 hcs_core/ctxp/built_in_cmds/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 hcs_core/ctxp/built_in_cmds/_ut.py,sha256=e50XBmPim2qRe0RYk_XAuRz1HWYyLJuMu-6dVxWR_fQ,3356
@@ -49,7 +49,7 @@ hcs_core/sglib/csp.py,sha256=UcO68YtLOPDQWiTjPVIPwQ2Z-Mywc-154aoIkLdyzwE,10991
 hcs_core/sglib/ez_client.py,sha256=dWQx-EMTrySz1EVzsSu4ZezORR3_iEOAcZigtbuvIQ8,8404
 hcs_core/sglib/hcs_client.py,sha256=pjrAVQDEy2tiQMypMpOzODFntT6aNHXjje8or_mkL2U,804
 hcs_core/sglib/init.py,sha256=w_0ZU70Q1TGbSZsqSi7ewKQqpExFlepOT7mIqH0wnho,310
-hcs_core/sglib/login_support.py,sha256=unwzx8_W8knWqSm-jN9wFzkQGpw4U5z4kfzKb_Sjlvw,7575
+hcs_core/sglib/login_support.py,sha256=tniRhn4V5eUAgixi_FLTemzBnOrruLgvx6NsLLx3hTA,8077
 hcs_core/sglib/payload_util.py,sha256=Hnj7rjzrQ1j5gpbrwZX34biN8MIZjy6dOJZ63ulmzdw,685
 hcs_core/sglib/requtil.py,sha256=O37DrD4VVBmmRkkHJLbDtPfFq8l6fLZwYZggt2FTEFc,920
 hcs_core/sglib/utils.py,sha256=8a-e-nUhAbulZtV05CB5loov6Kgq8_Q0TxYwfvu7Bj8,3178
@@ -58,12 +58,12 @@ hcs_core/util/check_license.py,sha256=KUPaphuntMhwqcBJ6V2L85ZJZulaz1Yq5Ysurx2Ren
 hcs_core/util/duration.py,sha256=e7Nw22aYXJK-pLM59QDel5atLZxShKBiVILFgrtLJks,4194
 hcs_core/util/exit.py,sha256=UStMZKlfCFN7GBouc1y3pPFGPFQ66qfcRZ_fYQXFD0E,838
 hcs_core/util/hcs_constants.py,sha256=Ic1Tx_UNJiQchfsdnRDzgiOaCjKHnsWXx997nElppm4,1755
-hcs_core/util/job_view.py,sha256=LpyihmDJLXm4DtTST7Z-WydyWNYCJETT_SxCWunvGOg,8424
+hcs_core/util/job_view.py,sha256=mEFs1cntO5Ws2KL9FzhKmMO9qiJxcqPPZ0s7C-kuy6A,9068
 hcs_core/util/pki_util.py,sha256=Lt3-IzIoGcaQKNE7KUszxR7JSZkpXduVZJ262TszsIs,6685
 hcs_core/util/query_util.py,sha256=uYfcEF_00eUs_S5OK64zpH0cnb6dwy91_J1OY5ZrFVs,3471
 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=6nyyZzi3P69WQfioPc2_YWZQcUc13mC1eKoK58b3WUQ,1709
-hcs_core-0.1.310.dist-info/METADATA,sha256=1tBWDUz8FAPMkCurFREuONeUiZ-udR5Jk8Mup3SH81g,1951
-hcs_core-0.1.310.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-hcs_core-0.1.310.dist-info/RECORD,,
+hcs_core-0.1.312.dist-info/METADATA,sha256=eDI2j9pfI1j1qfRo1728uv5YrQ9bv3XyAygXw1AwNHo,1952
+hcs_core-0.1.312.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+hcs_core-0.1.312.dist-info/RECORD,,