update redundancy

Author: michaelshin

centml/cli/shell.py

@@ -9,19 +9,11 @@
 from centml.sdk import auth
 from centml.sdk.api import get_centml_client
 from centml.sdk.config import settings
-from centml.sdk.shell import ShellError
-from centml.sdk.shell.session import build_ws_url, exec_session, interactive_session, resolve_pod
+from centml.sdk.shell import ShellError, build_ws_url, exec_session, interactive_session, resolve_pod
 
 
-@click.command(help="Open an interactive shell to a deployment pod")
-@click.argument("deployment_id", type=int)
-@click.option("--pod", default=None, help="Specific pod name (auto-selects first running pod)")
-@click.option("--shell", "shell_type", default=None, type=click.Choice(["bash", "sh", "zsh"]), help="Shell type")
-@handle_exception
-def shell(deployment_id, pod, shell_type):
-    if not sys.stdin.isatty():
-        raise click.ClickException("Interactive shell requires a terminal (TTY)")
-
+def _connect_args(deployment_id, pod, shell_type):
+    """Resolve pod, build WebSocket URL, and obtain auth token."""
     with get_centml_client() as cclient:
         try:
             pod_name, warning = resolve_pod(cclient, deployment_id, pod)
@@ -32,6 +24,19 @@ def shell(deployment_id, pod, shell_type):
 
     ws_url = build_ws_url(settings.CENTML_PLATFORM_API_URL, deployment_id, pod_name, shell_type)
     token = auth.get_centml_token()
+    return ws_url, token
+
+
+@click.command(help="Open an interactive shell to a deployment pod")
+@click.argument("deployment_id", type=int)
+@click.option("--pod", default=None, help="Specific pod name (auto-selects first running pod)")
+@click.option("--shell", "shell_type", default=None, type=click.Choice(["bash", "sh", "zsh"]), help="Shell type")
+@handle_exception
+def shell(deployment_id, pod, shell_type):
+    if not sys.stdin.isatty():
+        raise click.ClickException("Interactive shell requires a terminal (TTY)")
+
+    ws_url, token = _connect_args(deployment_id, pod, shell_type)
     exit_code = asyncio.run(interactive_session(ws_url, token))
     sys.exit(exit_code)
 
@@ -43,16 +48,6 @@ def shell(deployment_id, pod, shell_type):
 @click.option("--shell", "shell_type", default=None, type=click.Choice(["bash", "sh", "zsh"]), help="Shell type")
 @handle_exception
 def exec_cmd(deployment_id, command, pod, shell_type):
-    with get_centml_client() as cclient:
-        try:
-            pod_name, warning = resolve_pod(cclient, deployment_id, pod)
-        except ShellError as exc:
-            raise click.ClickException(str(exc)) from exc
-    if warning:
-        click.echo(f"{warning} Use --pod to specify a different pod.", err=True)
-
-    ws_url = build_ws_url(settings.CENTML_PLATFORM_API_URL, deployment_id, pod_name, shell_type)
-    token = auth.get_centml_token()
-    cmd_str = " ".join(command)
-    exit_code = asyncio.run(exec_session(ws_url, token, cmd_str))
+    ws_url, token = _connect_args(deployment_id, pod, shell_type)
+    exit_code = asyncio.run(exec_session(ws_url, token, " ".join(command)))
     sys.exit(exit_code)

centml/sdk/shell/__init__.py

@@ -1,34 +1,14 @@
 """SDK shell module -- reusable shell/exec session logic (no Click dependency)."""
 
 from centml.sdk.shell.exceptions import NoPodAvailableError, PodNotFoundError, ShellError
-from centml.sdk.shell.renderer import char_to_sgr, color_sgr, pyte_extract_text, render_dirty
-from centml.sdk.shell.session import (
-    BEGIN_MARKER,
-    END_MARKER,
-    PRINTF_BEGIN,
-    PRINTF_END,
-    build_ws_url,
-    exec_session,
-    forward_io,
-    interactive_session,
-    resolve_pod,
-)
+from centml.sdk.shell.session import build_ws_url, exec_session, interactive_session, resolve_pod
 
 __all__ = [
     "ShellError",
     "NoPodAvailableError",
     "PodNotFoundError",
-    "color_sgr",
-    "char_to_sgr",
-    "render_dirty",
-    "pyte_extract_text",
     "build_ws_url",
     "resolve_pod",
-    "forward_io",
     "interactive_session",
     "exec_session",
-    "BEGIN_MARKER",
-    "END_MARKER",
-    "PRINTF_BEGIN",
-    "PRINTF_END",
 ]

centml/sdk/shell/session.py

@@ -178,6 +178,8 @@ async def interactive_session(ws_url, token):
     """
     fd = sys.stdin.fileno()
     old_settings = termios.tcgetattr(fd)
+    loop = asyncio.get_running_loop()
+    signals_installed = False
     try:
         tty.setraw(fd)
         cols, rows = shutil.get_terminal_size()
@@ -189,11 +191,10 @@ async def interactive_session(ws_url, token):
         sys.stdout.buffer.write(b"\033[?1049h\033[2J\033[H")
         sys.stdout.buffer.flush()
 
-        loop = asyncio.get_running_loop()
-
         shutdown = asyncio.Event()
         loop.add_signal_handler(signal.SIGTERM, shutdown.set)
         loop.add_signal_handler(signal.SIGHUP, shutdown.set)
+        signals_installed = True
 
         headers = {"Authorization": f"Bearer {token}"}
         async with websockets.connect(ws_url, additional_headers=headers, close_timeout=2) as ws:
@@ -214,8 +215,9 @@ def _send_resize():
 
             return exit_code
     finally:
-        loop.remove_signal_handler(signal.SIGTERM)
-        loop.remove_signal_handler(signal.SIGHUP)
+        if signals_installed:
+            loop.remove_signal_handler(signal.SIGTERM)
+            loop.remove_signal_handler(signal.SIGHUP)
         termios.tcsetattr(fd, termios.TCSADRAIN, old_settings)
         # Leave alternate screen buffer, restore cursor and attributes.
         sys.stdout.buffer.write(b"\033[?1049l\033[?25h\033[0m")