refactor: remove debug logging, fix unused imports and SDK/CLI boundary, ruff

Author: V2arK

centml/cli/shell.py

@@ -10,7 +10,7 @@
 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, setup_debug_log
+from centml.sdk.shell.session import build_ws_url, exec_session, interactive_session, resolve_pod
 
 
 @click.command(help="Open an interactive shell to a deployment pod")
@@ -19,7 +19,6 @@
 @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):
-    setup_debug_log()
     if not sys.stdin.isatty():
         raise click.ClickException("Interactive shell requires a terminal (TTY)")
 
@@ -29,7 +28,7 @@ def shell(deployment_id, pod, shell_type):
         except ShellError as exc:
             raise click.ClickException(str(exc)) from exc
     if warning:
-        click.echo(warning, err=True)
+        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()
@@ -44,14 +43,13 @@ 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):
-    setup_debug_log()
     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(warning, err=True)
+        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()

centml/sdk/shell/__init__.py

@@ -12,7 +12,6 @@
     forward_io,
     interactive_session,
     resolve_pod,
-    setup_debug_log,
 )
 
 __all__ = [
@@ -23,7 +22,6 @@
     "char_to_sgr",
     "render_dirty",
     "pyte_extract_text",
-    "setup_debug_log",
     "build_ws_url",
     "resolve_pod",
     "forward_io",

centml/sdk/shell/renderer.py

@@ -1,7 +1,5 @@
 """Pyte terminal screen renderer -- converts pyte's in-memory buffer to ANSI."""
 
-import pyte
-
 _PYTE_FG_TO_SGR = {
     "default": "39",
     "black": "30",

centml/sdk/shell/session.py

@@ -2,8 +2,6 @@
 
 import asyncio
 import json
-import logging
-import os
 import shutil
 import signal
 import sys
@@ -19,8 +17,6 @@
 from centml.sdk.shell.exceptions import NoPodAvailableError, PodNotFoundError
 from centml.sdk.shell.renderer import pyte_extract_text, render_dirty
 
-_log = logging.getLogger("centml.sdk.shell")
-
 BEGIN_MARKER = "__CENTML_BEGIN_5f3a__"
 END_MARKER = "__CENTML_END_5f3a__"
 
@@ -30,16 +26,6 @@
 PRINTF_END = r"\137\137CENTML_END_5f3a\137\137"
 
 
-def setup_debug_log():
-    """Configure file-based debug logging (stdout unusable in raw mode)."""
-    log_path = os.environ.get("CENTML_SHELL_DEBUG_LOG", "/tmp/centml_shell_debug.log")
-    handler = logging.FileHandler(log_path, mode="w")
-    handler.setFormatter(logging.Formatter("%(asctime)s.%(msecs)03d %(message)s", datefmt="%H:%M:%S"))
-    _log.addHandler(handler)
-    _log.setLevel(logging.DEBUG)
-    _log.debug("=== shell debug log started (pid=%d) ===", os.getpid())
-
-
 def build_ws_url(api_url, deployment_id, pod_name, shell_type=None):
     """Build the WebSocket URL for a terminal connection."""
     parsed = urllib.parse.urlparse(api_url)
@@ -84,9 +70,7 @@ def resolve_pod(cclient, deployment_id, pod_name=None) -> Tuple[str, Optional[st
 
     warning = None
     if len(running_pods) > 1:
-        warning = (
-            f"Multiple running pods found, connecting to {running_pods[0]}. " f"Use --pod to specify a different pod."
-        )
+        warning = f"Multiple running pods found, connecting to {running_pods[0]}."
     return running_pods[0], warning
 
 
@@ -114,38 +98,28 @@ async def forward_io(ws, screen, stream, shutdown):
     stdin_closed = asyncio.Event()
 
     async def _read_ws():
-        _log.debug("[read_ws] started")
-        msg_count = 0
         try:
             while True:
                 raw_msg = await ws.recv()
-                msg_count += 1
                 msg = json.loads(raw_msg)
-                keys = list(msg.keys())
                 data = msg.get("data", "")
-                data_snippet = repr(data[:120]) if data else ""
-                _log.debug("[read_ws] msg#%d keys=%s data=%s", msg_count, keys, data_snippet)
                 if data:
                     stream.feed(data.replace("\n", "\r\n"))
                     render_dirty(screen, sys.stdout.buffer)
                 elif msg.get("error"):
-                    _log.debug("[read_ws] error: %s", msg["error"])
                     stream.feed(f"Error: {msg['error']}\r\n")
                     render_dirty(screen, sys.stdout.buffer)
-        except websockets.ConnectionClosed as exc:
-            _log.debug("[read_ws] ConnectionClosed after %d msgs: %s", msg_count, exc)
+        except websockets.ConnectionClosed:
             return
 
     async def _read_stdin():
-        _log.debug("[read_stdin] started")
         read_queue = asyncio.Queue()
 
         def _on_stdin_ready():
             data = sys.stdin.buffer.read1(4096)
             if data:
                 read_queue.put_nowait(data)
             else:
-                _log.debug("[read_stdin] stdin EOF")
                 stdin_closed.set()
 
         loop.add_reader(stdin_fd, _on_stdin_ready)
@@ -155,7 +129,6 @@ def _on_stdin_ready():
                     data = await asyncio.wait_for(read_queue.get(), timeout=0.5)
                 except asyncio.TimeoutError:
                     continue
-                _log.debug("[read_stdin] sending %d bytes: %s", len(data), repr(data[:40]))
                 try:
                     await ws.send(
                         json.dumps(
@@ -168,29 +141,20 @@ def _on_stdin_ready():
                         )
                     )
                 except websockets.ConnectionClosed:
-                    _log.debug("[read_stdin] ws closed on send")
                     return
-            _log.debug(
-                "[read_stdin] loop exited: stdin_closed=%s shutdown=%s", stdin_closed.is_set(), shutdown.is_set()
-            )
         finally:
             loop.remove_reader(stdin_fd)
 
     async def _watch_shutdown():
         while not shutdown.is_set():
             await asyncio.sleep(0.2)
 
-    _log.debug("[forward_io] creating tasks")
     task_ws = asyncio.create_task(_read_ws())
     task_stdin = asyncio.create_task(_read_stdin())
     task_shutdown = asyncio.create_task(_watch_shutdown())
     tasks = [task_ws, task_stdin, task_shutdown]
-    task_names = {id(task_ws): "read_ws", id(task_stdin): "read_stdin", id(task_shutdown): "watch_shutdown"}
 
     done, pending = await asyncio.wait(tasks, return_when=asyncio.FIRST_COMPLETED)
-    done_names = [task_names[id(t)] for t in done]
-    pending_names = [task_names[id(t)] for t in pending]
-    _log.debug("[forward_io] first completed: done=%s pending=%s", done_names, pending_names)
 
     for t in pending:
         t.cancel()
@@ -201,9 +165,7 @@ async def _watch_shutdown():
             pass
     for t in done:
         if t.exception() is not None:
-            _log.debug("[forward_io] task exception: %s", t.exception())
             raise t.exception()
-    _log.debug("[forward_io] returning exit_code=0")
     return 0
 
 
@@ -234,9 +196,7 @@ async def interactive_session(ws_url, token):
         loop.add_signal_handler(signal.SIGHUP, shutdown.set)
 
         headers = {"Authorization": f"Bearer {token}"}
-        _log.debug("[session] connecting to %s", ws_url)
         async with websockets.connect(ws_url, additional_headers=headers, close_timeout=2) as ws:
-            _log.debug("[session] connected, sending resize %dx%d", cols, rows)
 
             def _send_resize():
                 c, r = shutil.get_terminal_size()
@@ -252,7 +212,6 @@ def _send_resize():
             finally:
                 loop.remove_signal_handler(signal.SIGWINCH)
 
-            _log.debug("[session] exiting with code %d", exit_code)
             return exit_code
     finally:
         loop.remove_signal_handler(signal.SIGTERM)
@@ -297,20 +256,15 @@ async def exec_session(ws_url, token, command):
         buffer = ""
         is_capturing = False
         is_done = False
-        msg_count = 0
         try:
             async for raw_msg in ws:
-                msg_count += 1
                 msg = json.loads(raw_msg)
-                keys = list(msg.keys())
-                _log.debug("[exec] msg#%d keys=%s data_len=%d", msg_count, keys, len(msg.get("data", "")))
                 if msg.get("data"):
                     buffer += msg["data"]
                     while "\n" in buffer:
                         line, buffer = buffer.split("\n", 1)
                         clean = pyte_extract_text(line_stream, line_screen, line.rstrip("\r"))
                         if BEGIN_MARKER in clean:
-                            _log.debug("[exec] BEGIN marker found")
                             is_capturing = True
                             continue
                         if END_MARKER in clean:
@@ -320,20 +274,16 @@ async def exec_session(ws_url, token, command):
                                     exit_code = int(parts[1].strip())
                                 except ValueError:
                                     pass
-                            _log.debug("[exec] END marker, exit_code=%d", exit_code)
                             is_done = True
                             break
                         if is_capturing:
                             sys.stdout.write(line + "\n")
                             sys.stdout.flush()
                 elif msg.get("error"):
-                    _log.debug("[exec] error: %s", msg["error"])
                     sys.stderr.write(f"Error: {msg['error']}\n")
                     return 1
                 if is_done:
-                    _log.debug("[exec] done, breaking")
                     break
-        except websockets.ConnectionClosed as exc:
-            _log.debug("[exec] ConnectionClosed: %s", exc)
-        _log.debug("[exec] returning exit_code=%d", exit_code)
+        except websockets.ConnectionClosed:
+            pass
         return exit_code

tests/test_cli_shell.py

@@ -2,9 +2,6 @@
 
 from unittest.mock import MagicMock, patch
 
-import click
-import pytest
-
 from centml.sdk.shell.exceptions import NoPodAvailableError, PodNotFoundError
 
 # ===========================================================================
@@ -26,16 +23,14 @@ def test_shell_option_forwarded(self):
         from centml.cli.shell import shell
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)), patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.auth") as mock_auth, patch(
-            "centml.cli.shell.settings"
-        ) as mock_settings, patch(
-            "centml.cli.shell.asyncio"
-        ) as mock_asyncio, patch(
-            "centml.cli.shell.sys"
-        ) as mock_sys:
-
+        with (
+            patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)),
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+            patch("centml.cli.shell.auth") as mock_auth,
+            patch("centml.cli.shell.settings") as mock_settings,
+            patch("centml.cli.shell.asyncio") as mock_asyncio,
+            patch("centml.cli.shell.sys") as mock_sys,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)
             mock_auth.get_centml_token.return_value = "token"
@@ -52,16 +47,14 @@ def test_pod_option_forwarded(self):
         from centml.cli.shell import shell
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod") as mock_resolve, patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.auth") as mock_auth, patch(
-            "centml.cli.shell.settings"
-        ) as mock_settings, patch(
-            "centml.cli.shell.asyncio"
-        ) as mock_asyncio, patch(
-            "centml.cli.shell.sys"
-        ) as mock_sys:
-
+        with (
+            patch("centml.cli.shell.resolve_pod") as mock_resolve,
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+            patch("centml.cli.shell.auth") as mock_auth,
+            patch("centml.cli.shell.settings") as mock_settings,
+            patch("centml.cli.shell.asyncio") as mock_asyncio,
+            patch("centml.cli.shell.sys") as mock_sys,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)
             mock_resolve.return_value = ("my-pod", None)
@@ -79,10 +72,11 @@ def test_shell_error_converts_to_click_exception(self):
         from centml.cli.shell import shell
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod", side_effect=NoPodAvailableError("No running pods found")), patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.setup_debug_log"), patch("centml.cli.shell.sys") as mock_sys:
-
+        with (
+            patch("centml.cli.shell.resolve_pod", side_effect=NoPodAvailableError("No running pods found")),
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+            patch("centml.cli.shell.sys") as mock_sys,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)
             mock_sys.stdin.isatty.return_value = True
@@ -99,14 +93,13 @@ def test_passes_command(self):
         from centml.cli.shell import exec_cmd
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)), patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.auth") as mock_auth, patch(
-            "centml.cli.shell.settings"
-        ) as mock_settings, patch(
-            "centml.cli.shell.asyncio"
-        ) as mock_asyncio:
-
+        with (
+            patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)),
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+            patch("centml.cli.shell.auth") as mock_auth,
+            patch("centml.cli.shell.settings") as mock_settings,
+            patch("centml.cli.shell.asyncio") as mock_asyncio,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)
             mock_auth.get_centml_token.return_value = "token"
@@ -122,14 +115,13 @@ def test_shell_option_forwarded(self):
         from centml.cli.shell import exec_cmd
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)), patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.auth") as mock_auth, patch(
-            "centml.cli.shell.settings"
-        ) as mock_settings, patch(
-            "centml.cli.shell.asyncio"
-        ) as mock_asyncio:
-
+        with (
+            patch("centml.cli.shell.resolve_pod", return_value=("pod-a", None)),
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+            patch("centml.cli.shell.auth") as mock_auth,
+            patch("centml.cli.shell.settings") as mock_settings,
+            patch("centml.cli.shell.asyncio") as mock_asyncio,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)
             mock_auth.get_centml_token.return_value = "token"
@@ -145,10 +137,10 @@ def test_shell_error_converts_to_click_exception(self):
         from centml.cli.shell import exec_cmd
         from click.testing import CliRunner
 
-        with patch("centml.cli.shell.resolve_pod", side_effect=PodNotFoundError("Pod 'x' not found")), patch(
-            "centml.cli.shell.get_centml_client"
-        ) as mock_ctx, patch("centml.cli.shell.setup_debug_log"):
-
+        with (
+            patch("centml.cli.shell.resolve_pod", side_effect=PodNotFoundError("Pod 'x' not found")),
+            patch("centml.cli.shell.get_centml_client") as mock_ctx,
+        ):
             mock_ctx.return_value.__enter__ = MagicMock(return_value=MagicMock())
             mock_ctx.return_value.__exit__ = MagicMock(return_value=False)