cloudwright-ai-cli 1.2.1__tar.gz → 1.3.0__tar.gz

{cloudwright_ai_cli-1.2.1 → cloudwright_ai_cli-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudwright-ai-cli
-Version: 1.2.1
+Version: 1.3.0
 Summary: CLI for Cloudwright architecture intelligence
 Project-URL: Homepage, https://github.com/xmpuspus/cloudwright
 Project-URL: Repository, https://github.com/xmpuspus/cloudwright

cloudwright_ai_cli-1.3.0/cloudwright_cli/__init__.py

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

{cloudwright_ai_cli-1.2.1 → cloudwright_ai_cli-1.3.0}/cloudwright_cli/commands/chat.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 import logging
-import sys
+import os
 import time
 from typing import Annotated
 
 import typer
 from cloudwright import ArchSpec, ConversationSession
 from cloudwright.ascii_diagram import render_ascii
+from cloudwright.logging import configure_logging
 from cloudwright.session_store import SessionStore
 from rich.console import Console
 from rich.live import Live
@@ -23,21 +24,27 @@ from .chat_ui import _HELP, print_cost_summary, print_diff, run_validate
 
 console = Console()
 
+DEFAULT_WEB_PORT = 8765
+
 
 def chat(
     web: Annotated[bool, typer.Option("--web", help="Launch web UI instead of terminal chat")] = False,
     resume: Annotated[str | None, typer.Option("--resume", help="Resume a saved session by ID")] = None,
     debug: Annotated[bool, typer.Option("--debug", help="Log LLM requests/responses to stderr")] = False,
+    port: Annotated[
+        int,
+        typer.Option("--port", help=f"Port for --web (default: {DEFAULT_WEB_PORT})"),
+    ] = DEFAULT_WEB_PORT,
 ) -> None:
     """Interactive architecture design chat."""
     if web:
-        _launch_web()
+        _launch_web(port=port)
         return
 
     _run_terminal_chat(resume=resume, debug=debug)
 
 
-def _launch_web() -> None:
+def _launch_web(port: int = DEFAULT_WEB_PORT) -> None:
     try:
         import cloudwright_web  # type: ignore
         import uvicorn
@@ -49,18 +56,19 @@ def _launch_web() -> None:
 
     import socket
 
-    port = 8000
-    for candidate in range(8000, 8100):
-        with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
-            if s.connect_ex(("127.0.0.1", candidate)) != 0:
-                port = candidate
-                break
+    with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
+        if s.connect_ex(("127.0.0.1", port)) == 0:
+            console.print(
+                f"[red]Error:[/red] port {port} is already in use. "
+                f"Pass --port to choose another (e.g. --port {port + 1})."
+            )
+            raise typer.Exit(1)
 
     import threading
     import webbrowser
 
     url = f"http://127.0.0.1:{port}"
-    console.print(f"[cyan]Launching Cloudwright web UI on {url}[/cyan]")
+    console.print(f"\n[bold cyan]Cloudwright web UI:[/bold cyan] {url}\n")
 
     def _open_browser():
         time.sleep(1.5)
@@ -71,8 +79,14 @@ def _launch_web() -> None:
 
 
 def _run_terminal_chat(resume: str | None = None, debug: bool = False) -> None:
-    if debug:
-        logging.basicConfig(stream=sys.stderr, level=logging.DEBUG)
+    configure_logging()
+    env_level = os.environ.get("CLOUDWRIGHT_LOG_LEVEL", "").upper()
+    if debug or env_level == "DEBUG":
+        logging.getLogger().setLevel(logging.DEBUG)
+        logging.getLogger("cloudwright").setLevel(logging.DEBUG)
+    elif env_level in {"INFO", "WARNING", "ERROR", "CRITICAL"}:
+        logging.getLogger().setLevel(getattr(logging, env_level))
+        logging.getLogger("cloudwright").setLevel(getattr(logging, env_level))
 
     console.print(
         Panel(

cloudwright_ai_cli-1.3.0/tests/test_chat_debug.py

@@ -0,0 +1,74 @@
+from __future__ import annotations
+
+import logging
+from unittest.mock import patch
+
+
+class TestDebugMode:
+    def test_debug_enables_logging(self):
+        """--debug flag should set the cloudwright logger to DEBUG level.
+
+        Audit fix v1.3: previously called logging.basicConfig() which is a
+        no-op against the structlog-configured root logger. Now it sets
+        DEBUG on the root + cloudwright logger directly.
+        """
+        cloudwright_logger = logging.getLogger("cloudwright")
+        prior_level = cloudwright_logger.level
+        try:
+            with (
+                patch("cloudwright_cli.commands.chat.ConversationSession"),
+                patch("cloudwright_cli.commands.chat.SessionStore"),
+                patch("cloudwright_cli.commands.chat.Prompt.ask", side_effect=[KeyboardInterrupt]),
+            ):
+                from cloudwright_cli.commands.chat import _run_terminal_chat
+
+                _run_terminal_chat(debug=True)
+
+            assert cloudwright_logger.level == logging.DEBUG
+        finally:
+            cloudwright_logger.setLevel(prior_level)
+
+    def test_debug_flag_via_chat_entrypoint(self):
+        with (
+            patch("cloudwright_cli.commands.chat._run_terminal_chat") as mock_run,
+            patch("cloudwright_cli.commands.chat._launch_web"),
+        ):
+            from cloudwright_cli.commands.chat import chat
+
+            chat(web=False, resume=None, debug=True)
+
+        # The chat() entrypoint may pass extra args (port). Just assert debug=True.
+        assert mock_run.call_count == 1
+        kwargs = mock_run.call_args.kwargs
+        assert kwargs.get("debug") is True
+
+    def test_no_debug_flag_via_chat_entrypoint(self):
+        with (
+            patch("cloudwright_cli.commands.chat._run_terminal_chat") as mock_run,
+            patch("cloudwright_cli.commands.chat._launch_web"),
+        ):
+            from cloudwright_cli.commands.chat import chat
+
+            chat(web=False, resume=None, debug=False)
+
+        assert mock_run.call_count == 1
+        assert mock_run.call_args.kwargs.get("debug") is False
+
+    def test_log_level_env_var_debug(self, monkeypatch):
+        """CLOUDWRIGHT_LOG_LEVEL=DEBUG should also set DEBUG even without --debug."""
+        monkeypatch.setenv("CLOUDWRIGHT_LOG_LEVEL", "DEBUG")
+        cloudwright_logger = logging.getLogger("cloudwright")
+        prior_level = cloudwright_logger.level
+        try:
+            with (
+                patch("cloudwright_cli.commands.chat.ConversationSession"),
+                patch("cloudwright_cli.commands.chat.SessionStore"),
+                patch("cloudwright_cli.commands.chat.Prompt.ask", side_effect=[KeyboardInterrupt]),
+            ):
+                from cloudwright_cli.commands.chat import _run_terminal_chat
+
+                _run_terminal_chat(debug=False)
+
+            assert cloudwright_logger.level == logging.DEBUG
+        finally:
+            cloudwright_logger.setLevel(prior_level)

cloudwright_ai_cli-1.2.1/cloudwright_cli/__init__.py

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

cloudwright_ai_cli-1.2.1/tests/test_chat_debug.py

@@ -1,55 +0,0 @@
-from __future__ import annotations
-
-import logging
-import sys
-from unittest.mock import patch
-
-
-class TestDebugMode:
-    def test_debug_enables_logging(self):
-        with (
-            patch("cloudwright_cli.commands.chat.ConversationSession"),
-            patch("cloudwright_cli.commands.chat.SessionStore"),
-            patch("cloudwright_cli.commands.chat.Prompt.ask", side_effect=[KeyboardInterrupt]),
-            patch("logging.basicConfig") as mock_basic,
-        ):
-            from cloudwright_cli.commands.chat import _run_terminal_chat
-
-            _run_terminal_chat(debug=True)
-
-        mock_basic.assert_called_once_with(stream=sys.stderr, level=logging.DEBUG)
-
-    def test_no_debug_by_default(self):
-        with (
-            patch("cloudwright_cli.commands.chat.ConversationSession"),
-            patch("cloudwright_cli.commands.chat.SessionStore"),
-            patch("cloudwright_cli.commands.chat.Prompt.ask", side_effect=[KeyboardInterrupt]),
-            patch("logging.basicConfig") as mock_basic,
-        ):
-            from cloudwright_cli.commands.chat import _run_terminal_chat
-
-            _run_terminal_chat(debug=False)
-
-        mock_basic.assert_not_called()
-
-    def test_debug_flag_via_chat_entrypoint(self):
-        with (
-            patch("cloudwright_cli.commands.chat._run_terminal_chat") as mock_run,
-            patch("cloudwright_cli.commands.chat._launch_web"),
-        ):
-            from cloudwright_cli.commands.chat import chat
-
-            chat(web=False, resume=None, debug=True)
-
-        mock_run.assert_called_once_with(resume=None, debug=True)
-
-    def test_no_debug_flag_via_chat_entrypoint(self):
-        with (
-            patch("cloudwright_cli.commands.chat._run_terminal_chat") as mock_run,
-            patch("cloudwright_cli.commands.chat._launch_web"),
-        ):
-            from cloudwright_cli.commands.chat import chat
-
-            chat(web=False, resume=None, debug=False)
-
-        mock_run.assert_called_once_with(resume=None, debug=False)