crackerjack 0.33.0__py3-none-any.whl → 0.33.1__py3-none-any.whl

crackerjack/mcp/file_monitor.py

@@ -1,6 +1,7 @@
 import asyncio
 import json
 import time
+import typing as t
 from collections.abc import Callable
 from pathlib import Path
 
@@ -10,9 +11,10 @@ try:
 
     WATCHDOG_AVAILABLE = True
 except ImportError:
-    FileSystemEvent = None
-    FileSystemEventHandler = None
-    Observer = None
+    # Type stubs for when watchdog is not available
+    FileSystemEvent = t.Any
+    FileSystemEventHandler = t.Any
+    Observer = t.Any
     WATCHDOG_AVAILABLE = False
 
 import contextlib
@@ -28,7 +30,7 @@ if WATCHDOG_AVAILABLE:
 
     class ProgressFileHandler(FileSystemEventHandler):
         def __init__(
-            self, callback: Callable[[str, dict], None], progress_dir: Path
+            self, callback: Callable[[str, dict[str, t.Any]], None], progress_dir: Path
         ) -> None:
             super().__init__()
             self.callback = callback
@@ -43,7 +45,6 @@ if WATCHDOG_AVAILABLE:
             try:
                 file_path = Path(event.src_path)
 
-                # Validate that the file path is within our allowed progress directory
                 validated_path = SecurePathValidator.validate_safe_path(
                     file_path, self.progress_dir
                 )
@@ -66,11 +67,9 @@ if WATCHDOG_AVAILABLE:
 
                 job_id = validated_path.stem.replace("job-", "")
             except Exception:
-                # If path validation fails, skip processing this file
                 return
 
             try:
-                # Validate file size before reading
                 SecurePathValidator.validate_file_size(validated_path)
 
                 with validated_path.open() as f:
@@ -88,7 +87,7 @@ if WATCHDOG_AVAILABLE:
 else:
 
     class ProgressFileHandler:
-        def __init__(self, callback: Callable[[str, dict], None]) -> None:
+        def __init__(self, callback: Callable[[str, dict[str, t.Any]], None]) -> None:
             pass
 
 
@@ -96,7 +95,7 @@ class AsyncProgressMonitor:
     def __init__(self, progress_dir: Path) -> None:
         self.progress_dir = SecurePathValidator.validate_safe_path(progress_dir)
         self.observer: Observer | None = None
-        self.subscribers: dict[str, set[Callable[[dict], None]]] = {}
+        self.subscribers: dict[str, set[Callable[[dict[str, t.Any]], None]]] = {}
         self._running = False
 
         self.progress_dir.mkdir(exist_ok=True)
@@ -132,14 +131,18 @@ class AsyncProgressMonitor:
 
         console.print("[yellow]📁 Stopped progress directory monitoring[/ yellow]")
 
-    def subscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
+    def subscribe(
+        self, job_id: str, callback: Callable[[dict[str, t.Any]], None]
+    ) -> None:
         if job_id not in self.subscribers:
             self.subscribers[job_id] = set()
 
         self.subscribers[job_id].add(callback)
         console.print(f"[cyan]📋 Subscribed to job updates: {job_id}[/ cyan]")
 
-    def unsubscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
+    def unsubscribe(
+        self, job_id: str, callback: Callable[[dict[str, t.Any]], None]
+    ) -> None:
         if job_id in self.subscribers:
             self.subscribers[job_id].discard(callback)
 
@@ -148,7 +151,7 @@ class AsyncProgressMonitor:
 
         console.print(f"[cyan]📋 Unsubscribed from job updates: {job_id}[/ cyan]")
 
-    def _on_file_changed(self, job_id: str, progress_data: dict) -> None:
+    def _on_file_changed(self, job_id: str, progress_data: dict[str, t.Any]) -> None:
         if job_id in self.subscribers:
             for callback in self.subscribers[job_id].copy():
                 try:
@@ -160,7 +163,7 @@ class AsyncProgressMonitor:
 
                     self.subscribers[job_id].discard(callback)
 
-    async def get_current_progress(self, job_id: str) -> dict | None:
+    async def get_current_progress(self, job_id: str) -> dict[str, t.Any] | None:
         progress_file = self.progress_dir / f"job-{job_id}.json"
 
         if not progress_file.exists():
@@ -168,7 +171,8 @@ class AsyncProgressMonitor:
 
         try:
             with progress_file.open() as f:
-                return json.load(f)
+                json_result = json.load(f)
+                return t.cast(dict[str, t.Any] | None, json_result)
         except (json.JSONDecodeError, OSError):
             return None
 
@@ -208,9 +212,9 @@ class AsyncProgressMonitor:
 class PollingProgressMonitor:
     def __init__(self, progress_dir: Path) -> None:
         self.progress_dir = SecurePathValidator.validate_safe_path(progress_dir)
-        self.subscribers: dict[str, set[Callable[[dict], None]]] = {}
+        self.subscribers: dict[str, set[Callable[[dict[str, t.Any]], None]]] = {}
         self._running = False
-        self._poll_task: asyncio.Task | None = None
+        self._poll_task: asyncio.Task[None] | None = None
         self._file_mtimes: dict[str, float] = {}
 
         self.progress_dir.mkdir(exist_ok=True)
@@ -252,7 +256,6 @@ class PollingProgressMonitor:
 
         for progress_file in self.progress_dir.glob("job-*.json"):
             try:
-                # Validate file path is within our allowed directory
                 validated_file = SecurePathValidator.validate_safe_path(
                     progress_file, self.progress_dir
                 )
@@ -267,7 +270,6 @@ class PollingProgressMonitor:
                     job_id = validated_file.stem.replace("job-", "")
 
                     try:
-                        # Validate file size before reading
                         SecurePathValidator.validate_file_size(validated_file)
                         with validated_file.open() as f:
                             progress_data = json.load(f)
@@ -284,7 +286,7 @@ class PollingProgressMonitor:
 
         self._file_mtimes = current_files
 
-    def _notify_subscribers(self, job_id: str, progress_data: dict) -> None:
+    def _notify_subscribers(self, job_id: str, progress_data: dict[str, t.Any]) -> None:
         if job_id in self.subscribers:
             for callback in self.subscribers[job_id].copy():
                 try:
@@ -295,14 +297,18 @@ class PollingProgressMonitor:
                     )
                     self.subscribers[job_id].discard(callback)
 
-    def subscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
+    def subscribe(
+        self, job_id: str, callback: Callable[[dict[str, t.Any]], None]
+    ) -> None:
         if job_id not in self.subscribers:
             self.subscribers[job_id] = set()
 
         self.subscribers[job_id].add(callback)
         console.print(f"[cyan]📋 Subscribed to job updates: {job_id} (polling)[/ cyan]")
 
-    def unsubscribe(self, job_id: str, callback: Callable[[dict], None]) -> None:
+    def unsubscribe(
+        self, job_id: str, callback: Callable[[dict[str, t.Any]], None]
+    ) -> None:
         if job_id in self.subscribers:
             self.subscribers[job_id].discard(callback)
 
@@ -313,7 +319,7 @@ class PollingProgressMonitor:
             f"[cyan]📋 Unsubscribed from job updates: {job_id} (polling)[/ cyan]",
         )
 
-    async def get_current_progress(self, job_id: str) -> dict | None:
+    async def get_current_progress(self, job_id: str) -> dict[str, t.Any] | None:
         progress_file = self.progress_dir / f"job-{job_id}.json"
 
         if not progress_file.exists():
@@ -321,7 +327,8 @@ class PollingProgressMonitor:
 
         try:
             with progress_file.open() as f:
-                return json.load(f)
+                json_result = json.load(f)
+                return t.cast(dict[str, t.Any] | None, json_result)
         except (json.JSONDecodeError, OSError):
             return None
 

crackerjack/mcp/progress_components.py

@@ -109,7 +109,7 @@ class JobDataCollector:
         status = data.get("status", "unknown")
         stage = data.get("current_stage", "Unknown")
         iteration = data.get("iteration", 0)
-        max_iterations = data.get("max_iterations", 10)
+        max_iterations = data.get("max_iterations", 5)
 
         status_emoji = {
             "running": "🚀 Running",
@@ -138,7 +138,7 @@ class JobDataCollector:
         )
 
     async def _discover_jobs_websocket(self) -> dict[str, Any]:
-        jobs_data = {
+        jobs_data: dict[str, Any] = {
             "active": 0,
             "completed": 0,
             "failed": 0,
@@ -155,11 +155,13 @@ class JobDataCollector:
         with suppress(Exception):
             async with timeout_manager.timeout_context(
                 "network_operations",
-                timeout=5.0,  # Short timeout for websocket discovery
+                timeout=5.0,
             ):
-                websocket_base = self.websocket_url.replace("ws://", "http://").replace(
-                    "wss://",
-                    "https://",
+                websocket_base = self.websocket_url.replace(
+                    "ws: //", "http: //"
+                ).replace(
+                    "wss: //",
+                    "https: //",
                 )
 
                 async with (
@@ -239,13 +241,13 @@ class ServiceHealthChecker:
         try:
             async with timeout_manager.timeout_context(
                 "network_operations",
-                timeout=3.0,  # Quick health check timeout
+                timeout=3.0,
             ):
                 async with (
                     aiohttp.ClientSession(
                         timeout=aiohttp.ClientTimeout(total=2),
                     ) as session,
-                    session.get("http://localhost:8675/") as response,
+                    session.get("http: //localhost: 8675/") as response,
                 ):
                     if response.status == 200:
                         data = await response.json()
@@ -267,7 +269,7 @@ class ServiceHealthChecker:
                 check=False,
                 capture_output=True,
                 text=True,
-                timeout=5.0,  # Add timeout protection
+                timeout=5.0,
             )
             if result.returncode == 0:
                 return ("MCP Server", "🟢 Process Active", "0")
@@ -284,7 +286,7 @@ class ServiceHealthChecker:
                 check=False,
                 capture_output=True,
                 text=True,
-                timeout=5.0,  # Add timeout protection
+                timeout=5.0,
             )
             if result.returncode == 0:
                 return ("Service Watchdog", "🟢 Active", "0")
@@ -300,7 +302,7 @@ class ErrorCollector:
         self.console = Console()
 
     async def collect_recent_errors(self) -> list[tuple[str, str, str, str]]:
-        errors = []
+        errors: list[tuple[str, str, str, str]] = []
 
         errors.extend(self._check_debug_logs())
 
@@ -320,7 +322,7 @@ class ErrorCollector:
         return errors[-5:]
 
     def _check_debug_logs(self) -> list[tuple[str, str, str, str]]:
-        errors = []
+        errors: list[tuple[str, str, str, str]] = []
 
         with suppress(Exception):
             debug_log = Path(tempfile.gettempdir()) / "tui_debug.log"
@@ -333,7 +335,7 @@ class ErrorCollector:
         self,
         debug_log: Path,
     ) -> list[tuple[str, str, str, str]]:
-        errors = []
+        errors: list[tuple[str, str, str, str]] = []
 
         with debug_log.open() as f:
             lines = f.readlines()[-10:]
@@ -362,7 +364,7 @@ class ErrorCollector:
         return message[:40] + "..." if len(message) > 40 else message
 
     def _check_crackerjack_logs(self) -> list[tuple[str, str, str, str]]:
-        errors = []
+        errors: list[tuple[str, str, str, str]] = []
 
         with suppress(Exception):
             for log_file in Path(tempfile.gettempdir()).glob(
@@ -380,7 +382,7 @@ class ErrorCollector:
         self,
         log_file: Path,
     ) -> list[tuple[str, str, str, str]]:
-        errors = []
+        errors: list[tuple[str, str, str, str]] = []
 
         with log_file.open() as f:
             lines = f.readlines()[-5:]
@@ -415,7 +417,7 @@ class ErrorCollector:
 
 class ServiceManager:
     def __init__(self) -> None:
-        self.started_services: list[tuple[str, subprocess.Popen]] = []
+        self.started_services: list[tuple[str, subprocess.Popen[bytes]]] = []
         self.console = Console()
 
     async def ensure_services_running(self) -> None:
@@ -446,12 +448,12 @@ class ServiceManager:
         with suppress(Exception):
             async with timeout_manager.timeout_context(
                 "network_operations",
-                timeout=3.0,  # Quick check timeout
+                timeout=3.0,
             ):
                 async with aiohttp.ClientSession(
                     timeout=aiohttp.ClientTimeout(total=2),
                 ) as session:
-                    async with session.get("http://localhost:8675/") as response:
+                    async with session.get("http: //localhost: 8675/") as response:
                         return response.status == 200
         return False
 
@@ -462,11 +464,19 @@ class ServiceManager:
                 check=False,
                 capture_output=True,
                 text=True,
-                timeout=5.0,  # Add timeout protection
+                timeout=5.0,
             )
             return result.returncode == 0
         return False
 
+    def collect_services_data(self) -> list[tuple[str, str, str]]:
+        """Check all services and return their status information."""
+        mcp_status = "running" if self._check_mcp_server() else "stopped"
+        return [
+            ("mcp_server", mcp_status, "localhost:8675"),
+            ("websocket_server", "unknown", "localhost:8676"),
+        ]
+
     async def _start_websocket_server(self) -> None:
         with suppress(Exception):
             process = subprocess.Popen(
@@ -496,7 +506,7 @@ class ServiceManager:
                 check=False,
                 capture_output=True,
                 text=True,
-                timeout=5.0,  # Add timeout protection
+                timeout=5.0,
             )
             if result.returncode == 0:
                 return
@@ -514,7 +524,7 @@ class ServiceManager:
             self._cleanup_single_service(process)
         self.started_services.clear()
 
-    def _cleanup_single_service(self, process: subprocess.Popen) -> None:
+    def _cleanup_single_service(self, process: subprocess.Popen[bytes]) -> None:
         with suppress(Exception):
             if process.poll() is not None:
                 return