hcs-core 0.1.310__tar.gz → 0.1.311__tar.gz

{hcs_core-0.1.310 → hcs_core-0.1.311}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hcs-core
-Version: 0.1.310
+Version: 0.1.311
 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

hcs_core-0.1.311/hcs_core/__init__.py

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

{hcs_core-0.1.310 → hcs_core-0.1.311}/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-0.1.310 → hcs_core-0.1.311}/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
@@ -166,9 +167,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-0.1.310 → hcs_core-0.1.311}/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/hcs_core/__init__.py

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