shotgun-sh 0.4.7.dev2__tar.gz → 0.4.7.dev3__tar.gz

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.4.7.dev2
+Version: 0.4.7.dev3
 Summary: AI-powered research, planning, and task management CLI tool
 Project-URL: Homepage, https://shotgun.sh/
 Project-URL: Repository, https://github.com/shotgun-sh/shotgun
@@ -34,7 +34,7 @@ Requires-Dist: posthog>=3.0.0
 Requires-Dist: pydantic-ai>=1.26.0
 Requires-Dist: pydantic-settings>=2.0.0
 Requires-Dist: pyperclip>=1.10.0
-Requires-Dist: real-ladybug==0.12.2
+Requires-Dist: real-ladybug==0.14.0
 Requires-Dist: rich>=13.0.0
 Requires-Dist: sentencepiece>=0.2.0
 Requires-Dist: sentry-sdk[pure-eval]>=2.0.0

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shotgun-sh"
-version = "0.4.7.dev2"
+version = "0.4.7.dev3"
 description = "AI-powered research, planning, and task management CLI tool"
 readme = "README.md"
 license = { text = "MIT" }
@@ -34,7 +34,7 @@ dependencies = [
     "textual>=6.1.0",
     "textual-dev>=1.7.0",
     "textual-serve>=0.1.0",
-    "real_ladybug==0.12.2",  # Pinned: 0.14.0 has broken Windows DLL dependencies
+    "real_ladybug==0.14.0",
     "tree-sitter>=0.21.0",
     "tree-sitter-python>=0.23.0",
     "tree-sitter-javascript>=0.23.0",

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/src/shotgun/codebase/core/change_detector.py

@@ -1,16 +1,20 @@
 """Change detection for incremental graph updates."""
 
+from __future__ import annotations
+
 import hashlib
 import os
 from enum import Enum
 from pathlib import Path
-from typing import Any, cast
+from typing import TYPE_CHECKING, Any, cast
 
 import aiofiles
-import real_ladybug as kuzu
 
 from shotgun.logging_config import get_logger
 
+if TYPE_CHECKING:
+    import real_ladybug as kuzu
+
 logger = get_logger(__name__)
 
 

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/src/shotgun/codebase/core/ingestor.py

@@ -1,5 +1,7 @@
 """Kuzu graph ingestor for building code knowledge graphs."""
 
+from __future__ import annotations
+
 import asyncio
 import hashlib
 import os
@@ -8,12 +10,16 @@ import uuid
 from collections import defaultdict
 from collections.abc import Callable
 from pathlib import Path
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import aiofiles
-import real_ladybug as kuzu
 from tree_sitter import Node, Parser, QueryCursor
 
+from shotgun.codebase.core.kuzu_compat import get_kuzu
+
+if TYPE_CHECKING:
+    import real_ladybug as kuzu
+
 from shotgun.codebase.core.language_config import LANGUAGE_CONFIGS, get_language_config
 from shotgun.codebase.core.parser_loader import load_parsers
 from shotgun.logging_config import get_logger
@@ -1760,7 +1766,8 @@ class CodebaseIngestor:
             self.project_name = repo_path_obj.name
 
         try:
-            # Create database
+            # Create database (lazy import kuzu for Windows compatibility)
+            kuzu = get_kuzu()
             logger.info(f"Creating Kuzu database at: {self.db_path}")
             db = kuzu.Database(str(self.db_path))
             conn = kuzu.Connection(db)

shotgun_sh-0.4.7.dev3/src/shotgun/codebase/core/kuzu_compat.py

@@ -0,0 +1,98 @@
+"""Lazy import wrapper for kuzu (real_ladybug) with Windows compatibility handling."""
+
+from __future__ import annotations
+
+import sys
+from typing import Any
+
+_kuzu_module: Any = None
+_import_error: ImportError | None = None
+
+# Windows VC++ download URL
+_VC_REDIST_URL = "https://aka.ms/vs/17/release/vc_redist.x64.exe"
+
+# Windows VC++ installation instructions
+_WINDOWS_INSTALL_INSTRUCTIONS = f"""
+To fix this, install the Visual C++ Redistributable:
+
+1. Download from: {_VC_REDIST_URL}
+2. Run the installer and follow the prompts
+3. Restart your terminal and try again
+
+Or run this PowerShell command (as Administrator):
+  Invoke-WebRequest -Uri "{_VC_REDIST_URL}" -OutFile "$env:TEMP\\vc_redist.x64.exe"
+  Start-Process -FilePath "$env:TEMP\\vc_redist.x64.exe" -ArgumentList "/install", "/quiet", "/norestart" -Wait
+"""
+
+
+def copy_vcpp_instructions_to_clipboard() -> bool:
+    """Copy the VC++ Redistributable download URL to clipboard.
+
+    Returns:
+        True if successful, False otherwise
+    """
+    try:
+        import pyperclip  # type: ignore[import-untyped]
+
+        pyperclip.copy(_VC_REDIST_URL)
+        return True
+    except Exception:
+        return False
+
+
+class KuzuImportError(ImportError):
+    """Raised when kuzu cannot be imported, typically on Windows due to DLL issues."""
+
+    def __init__(self, original_error: ImportError) -> None:
+        self.original_error = original_error
+        if sys.platform == "win32":
+            message = (
+                "Failed to load the graph database library (real_ladybug).\n\n"
+                "This error typically occurs on Windows when the Visual C++ "
+                "Redistributable is not installed.\n"
+                f"{_WINDOWS_INSTALL_INSTRUCTIONS}\n"
+                f"Original error: {original_error}"
+            )
+        else:
+            message = f"Failed to import real_ladybug: {original_error}"
+        super().__init__(message)
+
+
+def get_kuzu() -> Any:
+    """Get the kuzu module, importing it lazily on first use.
+
+    Raises:
+        KuzuImportError: If kuzu cannot be imported (e.g., Windows DLL issues)
+
+    Returns:
+        The real_ladybug module
+    """
+    global _kuzu_module, _import_error
+
+    if _kuzu_module is not None:
+        return _kuzu_module
+
+    if _import_error is not None:
+        raise KuzuImportError(_import_error)
+
+    try:
+        import real_ladybug
+
+        _kuzu_module = real_ladybug
+        return _kuzu_module
+    except ImportError as e:
+        _import_error = e
+        raise KuzuImportError(e) from e
+
+
+def is_kuzu_available() -> bool:
+    """Check if kuzu is available without raising an error.
+
+    Returns:
+        True if kuzu can be imported, False otherwise
+    """
+    try:
+        get_kuzu()
+        return True
+    except KuzuImportError:
+        return False

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/src/shotgun/codebase/core/manager.py

@@ -9,13 +9,17 @@ import time
 import uuid
 from collections.abc import Awaitable, Callable
 from pathlib import Path
-from typing import Any, ClassVar
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import anyio
-import real_ladybug as kuzu
 from watchdog.events import FileSystemEvent, FileSystemEventHandler
 from watchdog.observers import Observer
 
+from shotgun.codebase.core.kuzu_compat import get_kuzu
+
+if TYPE_CHECKING:
+    import real_ladybug as kuzu
+
 from shotgun.codebase.models import (
     CodebaseGraph,
     FileChange,
@@ -265,7 +269,8 @@ class CodebaseGraphManager:
         """
         graph_path = self.storage_dir / f"{graph_id}.kuzu"
 
-        # Create database and connection
+        # Create database and connection (lazy import for Windows compatibility)
+        kuzu = get_kuzu()
         lock = await self._get_lock()
         async with lock:
             db = kuzu.Database(str(graph_path))
@@ -412,7 +417,8 @@ class CodebaseGraphManager:
         # Run build in thread pool
         await anyio.to_thread.run_sync(ingestor.build_graph_from_directory, repo_path)
 
-        # Get statistics
+        # Get statistics (lazy import for Windows compatibility)
+        kuzu = get_kuzu()
         lock = await self._get_lock()
         async with lock:
             db = kuzu.Database(str(graph_path))
@@ -554,6 +560,8 @@ class CodebaseGraphManager:
             "relationships_removed": 0,
         }
 
+        # Lazy import for Windows compatibility
+        kuzu = get_kuzu()
         lock = await self._get_lock()
         async with lock:
             if graph_id not in self._connections:
@@ -622,6 +630,8 @@ class CodebaseGraphManager:
         languages = build_options.get("languages")
         exclude_patterns = build_options.get("exclude_patterns")
 
+        # Lazy import for Windows compatibility
+        kuzu = get_kuzu()
         lock = await self._get_lock()
         async with lock:
             if graph_id not in self._connections:
@@ -1044,6 +1054,8 @@ class CodebaseGraphManager:
         self, graph_id: str, query: str, parameters: dict[str, Any] | None = None
     ) -> list[dict[str, Any]]:
         """Internal query execution with connection management."""
+        # Lazy import for Windows compatibility
+        kuzu = get_kuzu()
         lock = await self._get_lock()
         async with lock:
             if graph_id not in self._connections:
@@ -1264,6 +1276,7 @@ class CodebaseGraphManager:
 
                         # Try to open the database
                         def _open_and_query(g: str = gid, p: Path = db_path) -> bool:
+                            kuzu = get_kuzu()
                             db = kuzu.Database(str(p))
                             conn = kuzu.Connection(db)
                             try:

{shotgun_sh-0.4.7.dev2 → shotgun_sh-0.4.7.dev3}/src/shotgun/tui/screens/chat/chat_screen.py

@@ -58,6 +58,7 @@ from shotgun.agents.router.models import (
     RouterMode,
 )
 from shotgun.agents.runner import AgentRunner
+from shotgun.codebase.core.kuzu_compat import KuzuImportError
 from shotgun.codebase.core.manager import (
     CodebaseAlreadyIndexedError,
     CodebaseGraphManager,
@@ -111,6 +112,7 @@ from shotgun.tui.screens.chat_screen.messages import (
     SubAgentStarted,
 )
 from shotgun.tui.screens.confirmation_dialog import ConfirmationDialog
+from shotgun.tui.screens.kuzu_error_dialog import KuzuErrorDialog
 from shotgun.tui.screens.shared_specs import (
     CreateSpecDialog,
     ShareSpecsAction,
@@ -1517,6 +1519,12 @@ class ChatScreen(Screen[None]):
                 logger.error(f"Invalid path error: {exc}")
                 self.agent_manager.add_hint_message(HintMessage(message=f"❌ {exc}"))
                 return
+            except KuzuImportError as exc:
+                progress_timer.stop()
+                logger.error(f"Kuzu import error (Windows DLL issue): {exc}")
+                # Show dialog with copy button for Windows users
+                await self.app.push_screen_wait(KuzuErrorDialog())
+                return
 
             except Exception as exc:  # pragma: no cover - defensive UI path
                 # Check if this is a kuzu corruption error and we have retries left

shotgun_sh-0.4.7.dev3/src/shotgun/tui/screens/kuzu_error_dialog.py

@@ -0,0 +1,124 @@
+"""Error dialog for Windows kuzu/graph database import failures."""
+
+from __future__ import annotations
+
+from textual.app import ComposeResult
+from textual.containers import Container, Horizontal
+from textual.screen import ModalScreen
+from textual.widgets import Button, Label, Static
+
+from shotgun.codebase.core.kuzu_compat import (
+    _VC_REDIST_URL,
+    _WINDOWS_INSTALL_INSTRUCTIONS,
+    copy_vcpp_instructions_to_clipboard,
+)
+from shotgun.logging_config import get_logger
+
+logger = get_logger(__name__)
+
+
+class KuzuErrorDialog(ModalScreen[bool]):
+    """Error dialog for Windows kuzu import failures with copy button."""
+
+    DEFAULT_CSS = """
+        KuzuErrorDialog {
+            align: center middle;
+            background: rgba(0, 0, 0, 0.5);
+        }
+
+        KuzuErrorDialog > #dialog-container {
+            width: 80%;
+            max-width: 90;
+            height: auto;
+            max-height: 90%;
+            border: wide $error;
+            padding: 1 2;
+            layout: vertical;
+            background: $surface;
+        }
+
+        #error-title {
+            text-style: bold;
+            color: $error;
+            padding-bottom: 1;
+        }
+
+        #error-message {
+            padding: 1 0;
+        }
+
+        #instructions {
+            padding: 1 0;
+            color: $text-muted;
+        }
+
+        #url-display {
+            padding: 1;
+            background: $surface-darken-1;
+            border: round $primary;
+        }
+
+        #status-label {
+            color: $success;
+            padding: 1 0;
+        }
+
+        #dialog-buttons {
+            layout: horizontal;
+            align-horizontal: right;
+            height: auto;
+            padding-top: 1;
+        }
+
+        #dialog-buttons Button {
+            margin-left: 1;
+        }
+    """
+
+    BINDINGS = [
+        ("escape", "close", "Close"),
+    ]
+
+    def compose(self) -> ComposeResult:
+        with Container(id="dialog-container"):
+            yield Label("⚠ Graph Database Import Failed", id="error-title")
+            yield Static(
+                "The graph database library failed to load. "
+                "This typically occurs on Windows when the Visual C++ "
+                "Redistributable is not installed.\n\n"
+                "Install instructions:",
+                id="error-message",
+            )
+            yield Static(_WINDOWS_INSTALL_INSTRUCTIONS.strip(), id="instructions")
+            yield Static(f"Download URL: {_VC_REDIST_URL}", id="url-display")
+            yield Static("", id="status-label")
+            with Horizontal(id="dialog-buttons"):
+                yield Button("Copy Download URL", id="copy-btn", variant="primary")
+                yield Button("Close", id="close-btn")
+
+    def on_button_pressed(self, event: Button.Pressed) -> None:
+        """Handle button presses."""
+        event.stop()
+
+        if event.button.id == "copy-btn":
+            self._copy_url()
+        elif event.button.id == "close-btn":
+            self.dismiss(True)
+
+    def _copy_url(self) -> None:
+        """Copy the VC++ download URL to clipboard."""
+        status_label = self.query_one("#status-label", Static)
+
+        if copy_vcpp_instructions_to_clipboard():
+            status_label.update("✓ Copied URL to clipboard!")
+            self.query_one("#copy-btn", Button).label = "Copied!"
+            logger.debug(f"Copied VC++ URL to clipboard: {_VC_REDIST_URL}")
+        else:
+            status_label.update(
+                f"⚠ Could not copy. Please manually copy: {_VC_REDIST_URL}"
+            )
+            logger.warning("Failed to copy VC++ URL to clipboard")
+
+    def action_close(self) -> None:
+        """Close the dialog."""
+        self.dismiss(True)