shotgun-sh 0.1.16.dev2__py3-none-any.whl → 0.2.1__py3-none-any.whl

shotgun/build_constants.py

@@ -12,8 +12,8 @@ POSTHOG_API_KEY = ''
 POSTHOG_PROJECT_ID = '191396'
 
 # Logfire configuration embedded at build time (only for dev builds)
-LOGFIRE_ENABLED = 'true'
-LOGFIRE_TOKEN = 'pylf_v1_us_KZ5NM1pP3NwgJkbBJt6Ftdzk8mMhmrXcGJHQQgDJ1LfK'
+LOGFIRE_ENABLED = ''
+LOGFIRE_TOKEN = ''
 
 # Build metadata
 BUILD_TIME_ENV = "production" if SENTRY_DSN else "development"

shotgun/cli/config.py

@@ -9,6 +9,7 @@ from rich.table import Table
 
 from shotgun.agents.config import ProviderType, get_config_manager
 from shotgun.logging_config import get_logger
+from shotgun.utils.env_utils import is_shotgun_account_enabled
 
 logger = get_logger(__name__)
 console = Console()
@@ -43,11 +44,11 @@ def init(
         console.print()
 
         # Initialize with defaults
-        config = config_manager.initialize()
+        config_manager.initialize()
 
-        # Ask for default provider
+        # Ask for provider
         provider_choices = ["openai", "anthropic", "google"]
-        console.print("Choose your default AI provider:")
+        console.print("Choose your AI provider:")
         for i, provider in enumerate(provider_choices, 1):
             console.print(f"  {i}. {provider}")
 
@@ -55,7 +56,7 @@ def init(
             try:
                 choice = typer.prompt("Enter choice (1-3)", type=int)
                 if 1 <= choice <= 3:
-                    config.default_provider = ProviderType(provider_choices[choice - 1])
+                    provider = ProviderType(provider_choices[choice - 1])
                     break
                 else:
                     console.print(
@@ -65,7 +66,6 @@ def init(
                 console.print("❌ Please enter a valid number.", style="red")
 
         # Ask for API key for the selected provider
-        provider = config.default_provider
         console.print(f"\n🔑 Setting up {provider.upper()} API key...")
 
         api_key = typer.prompt(
@@ -75,9 +75,9 @@ def init(
         )
 
         if api_key:
+            # update_provider will automatically set selected_model for first provider
             config_manager.update_provider(provider, api_key=api_key)
 
-        config_manager.save()
         console.print(
             f"\n✅ [bold green]Configuration saved to {config_manager.config_path}[/bold green]"
         )
@@ -98,16 +98,12 @@ def set(
         str | None,
         typer.Option("--api-key", "-k", help="API key for the provider"),
     ] = None,
-    default: Annotated[
-        bool,
-        typer.Option("--default", "-d", help="Set this provider as default"),
-    ] = False,
 ) -> None:
     """Set configuration for a specific provider."""
     config_manager = get_config_manager()
 
-    # If no API key provided via option and not just setting default, prompt for it
-    if api_key is None and not default:
+    # If no API key provided via option, prompt for it
+    if api_key is None:
         api_key = typer.prompt(
             f"Enter your {provider.upper()} API key",
             hide_input=True,
@@ -118,11 +114,6 @@ def set(
         if api_key:
             config_manager.update_provider(provider, api_key=api_key)
 
-        if default:
-            config = config_manager.load()
-            config.default_provider = provider
-            config_manager.save(config)
-
         console.print(f"✅ Configuration updated for {provider}")
 
     except Exception as e:
@@ -130,41 +121,6 @@ def set(
         raise typer.Exit(1) from e
 
 
-@app.command()
-def set_default(
-    provider: Annotated[
-        ProviderType,
-        typer.Argument(
-            help="AI provider to set as default (openai, anthropic, google)"
-        ),
-    ],
-) -> None:
-    """Set the default AI provider without modifying API keys."""
-    config_manager = get_config_manager()
-
-    try:
-        config = config_manager.load()
-
-        # Check if the provider has an API key configured
-        provider_config = getattr(config, provider.value)
-        if not provider_config.api_key:
-            console.print(
-                f"⚠️  Warning: {provider.upper()} does not have an API key configured.",
-                style="yellow",
-            )
-            console.print(f"Use 'shotgun config set {provider}' to configure it.")
-
-        # Set as default
-        config.default_provider = provider
-        config_manager.save(config)
-
-        console.print(f"✅ Default provider set to: {provider}")
-
-    except Exception as e:
-        console.print(f"❌ Failed to set default provider: {e}", style="red")
-        raise typer.Exit(1) from e
-
-
 @app.command()
 def get(
     provider: Annotated[
@@ -201,16 +157,23 @@ def _show_full_config(config: Any) -> None:
     table.add_column("Setting", style="cyan")
     table.add_column("Value", style="white")
 
-    # Default provider
-    table.add_row("Default Provider", f"[bold]{config.default_provider}[/bold]")
+    # Selected model
+    selected_model = config.selected_model or "None (will auto-detect)"
+    table.add_row("Selected Model", f"[bold]{selected_model}[/bold]")
     table.add_row("", "")  # Separator
 
     # Provider configurations
-    for provider_name, provider_config in [
+    providers_to_show = [
         ("OpenAI", config.openai),
         ("Anthropic", config.anthropic),
         ("Google", config.google),
-    ]:
+    ]
+
+    # Only show Shotgun Account if feature flag is enabled
+    if is_shotgun_account_enabled():
+        providers_to_show.append(("Shotgun Account", config.shotgun))
+
+    for provider_name, provider_config in providers_to_show:
         table.add_row(f"[bold]{provider_name}[/bold]", "")
 
         # API Key
@@ -231,6 +194,8 @@ def _show_provider_config(provider: ProviderType, config: Any) -> None:
         provider_config = config.anthropic
     elif provider_str == "google":
         provider_config = config.google
+    elif provider_str == "shotgun":
+        provider_config = config.shotgun
     else:
         console.print(f"❌ Unknown provider: {provider}", style="red")
         return
@@ -248,7 +213,13 @@ def _show_provider_config(provider: ProviderType, config: Any) -> None:
 
 def _mask_secrets(data: dict[str, Any]) -> None:
     """Mask secrets in configuration data."""
-    for provider in ["openai", "anthropic", "google"]:
+    providers = ["openai", "anthropic", "google"]
+
+    # Only mask shotgun if feature flag is enabled
+    if is_shotgun_account_enabled():
+        providers.append("shotgun")
+
+    for provider in providers:
         if provider in data and isinstance(data[provider], dict):
             if "api_key" in data[provider] and data[provider]["api_key"]:
                 data[provider]["api_key"] = _mask_value(data[provider]["api_key"])
@@ -262,14 +233,14 @@ def _mask_value(value: str) -> str:
 
 
 @app.command()
-def get_user_id() -> None:
-    """Get the anonymous user ID from configuration."""
+def get_shotgun_instance_id() -> None:
+    """Get the anonymous shotgun instance ID from configuration."""
     config_manager = get_config_manager()
 
     try:
-        user_id = config_manager.get_user_id()
-        console.print(f"[green]User ID:[/green] {user_id}")
+        shotgun_instance_id = config_manager.get_shotgun_instance_id()
+        console.print(f"[green]Shotgun Instance ID:[/green] {shotgun_instance_id}")
     except Exception as e:
-        logger.error(f"Error getting user ID: {e}")
-        console.print(f"❌ Failed to get user ID: {str(e)}", style="red")
+        logger.error(f"Error getting shotgun instance ID: {e}")
+        console.print(f"❌ Failed to get shotgun instance ID: {str(e)}", style="red")
         raise typer.Exit(1) from e

shotgun/cli/feedback.py

@@ -30,7 +30,7 @@ def send_feedback(
     """Initialize Shotgun configuration."""
     config_manager = get_config_manager()
     config_manager.load()
-    user_id = config_manager.get_user_id()
+    shotgun_instance_id = config_manager.get_shotgun_instance_id()
 
     if not description:
         console.print(
@@ -39,7 +39,9 @@ def send_feedback(
         )
         raise typer.Exit(1)
 
-    feedback = Feedback(kind=kind, description=description, user_id=user_id)
+    feedback = Feedback(
+        kind=kind, description=description, shotgun_instance_id=shotgun_instance_id
+    )
 
     submit_feedback_survey(feedback)
 

shotgun/cli/models.py

@@ -1,9 +1,9 @@
 """Common models for CLI commands."""
 
-from enum import Enum
+from enum import StrEnum
 
 
-class OutputFormat(str, Enum):
+class OutputFormat(StrEnum):
     """Output format options for CLI commands."""
 
     TEXT = "text"

shotgun/codebase/core/ingestor.py

@@ -18,15 +18,12 @@ from shotgun.logging_config import get_logger
 logger = get_logger(__name__)
 
 
-# Default ignore patterns
-IGNORE_PATTERNS = {
+# Directories that should never be traversed during indexing
+BASE_IGNORE_DIRECTORIES = {
     ".git",
     "venv",
     ".venv",
     "__pycache__",
-    "node_modules",
-    "build",
-    "dist",
     ".eggs",
     ".pytest_cache",
     ".mypy_cache",
@@ -36,6 +33,46 @@ IGNORE_PATTERNS = {
     ".vscode",
 }
 
+# Well-known build output directories to skip when determining source files
+BUILD_ARTIFACT_DIRECTORIES = {
+    "node_modules",
+    ".next",
+    ".nuxt",
+    ".vite",
+    ".yarn",
+    ".svelte-kit",
+    ".output",
+    ".turbo",
+    ".parcel-cache",
+    ".vercel",
+    ".serverless",
+    "build",
+    "dist",
+    "out",
+    "tmp",
+    "coverage",
+}
+
+# Default ignore patterns combines base directories and build artifacts
+IGNORE_PATTERNS = BASE_IGNORE_DIRECTORIES | BUILD_ARTIFACT_DIRECTORIES
+
+# Directory prefixes that should always be ignored
+IGNORED_DIRECTORY_PREFIXES = (".",)
+
+
+def should_ignore_directory(name: str, ignore_patterns: set[str] | None = None) -> bool:
+    """Return True if the directory name should be ignored."""
+    patterns = IGNORE_PATTERNS if ignore_patterns is None else ignore_patterns
+    if name in patterns:
+        return True
+    return name.startswith(IGNORED_DIRECTORY_PREFIXES)
+
+
+def is_path_ignored(path: Path, ignore_patterns: set[str] | None = None) -> bool:
+    """Return True if any part of the path should be ignored."""
+    patterns = IGNORE_PATTERNS if ignore_patterns is None else ignore_patterns
+    return any(should_ignore_directory(part, patterns) for part in path.parts)
+
 
 class Ingestor:
     """Handles all communication and ingestion with the Kuzu database."""
@@ -607,7 +644,9 @@ class SimpleGraphBuilder:
         """First pass: Walk directory to find packages and folders."""
         dir_count = 0
         for root_str, dirs, _ in os.walk(self.repo_path, topdown=True):
-            dirs[:] = [d for d in dirs if d not in self.ignore_dirs]
+            dirs[:] = [
+                d for d in dirs if not should_ignore_directory(d, self.ignore_dirs)
+            ]
             root = Path(root_str)
             relative_root = root.relative_to(self.repo_path)
 
@@ -740,7 +779,7 @@ class SimpleGraphBuilder:
             root = Path(root_str)
 
             # Skip ignored directories
-            if any(part in self.ignore_dirs for part in root.parts):
+            if is_path_ignored(root, self.ignore_dirs):
                 continue
 
             for filename in files:
@@ -757,7 +796,7 @@ class SimpleGraphBuilder:
             root = Path(root_str)
 
             # Skip ignored directories
-            if any(part in self.ignore_dirs for part in root.parts):
+            if is_path_ignored(root, self.ignore_dirs):
                 continue
 
             for filename in files:

shotgun/codebase/core/manager.py

@@ -51,9 +51,13 @@ class CodebaseFileHandler(FileSystemEventHandler):
         self.pending_changes: list[FileChange] = []
         self._lock = anyio.Lock()
         # Import default ignore patterns from ingestor
-        from shotgun.codebase.core.ingestor import IGNORE_PATTERNS
+        from shotgun.codebase.core.ingestor import (
+            IGNORE_PATTERNS,
+            should_ignore_directory,
+        )
 
         self.ignore_patterns = ignore_patterns or IGNORE_PATTERNS
+        self._should_ignore_directory = should_ignore_directory
 
     def on_any_event(self, event: FileSystemEvent) -> None:
         """Handle any file system event."""
@@ -71,7 +75,7 @@ class CodebaseFileHandler(FileSystemEventHandler):
 
         # Check if any parent directory should be ignored
         for parent in path.parents:
-            if parent.name in self.ignore_patterns:
+            if self._should_ignore_directory(parent.name, self.ignore_patterns):
                 logger.debug(
                     f"Ignoring file in ignored directory: {parent.name} - path: {src_path_str}"
                 )
@@ -106,7 +110,7 @@ class CodebaseFileHandler(FileSystemEventHandler):
             )
             dest_path = Path(dest_path_str)
             for parent in dest_path.parents:
-                if parent.name in self.ignore_patterns:
+                if self._should_ignore_directory(parent.name, self.ignore_patterns):
                     logger.debug(
                         f"Ignoring move to ignored directory: {parent.name} - dest_path: {dest_path_str}"
                     )

shotgun/codebase/models.py

@@ -1,13 +1,13 @@
 """Data models for codebase service."""
 
 from collections.abc import Callable
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 from pydantic import BaseModel, Field
 
 
-class GraphStatus(str, Enum):
+class GraphStatus(StrEnum):
     """Status of a code knowledge graph."""
 
     READY = "READY"  # Graph is ready for queries
@@ -16,14 +16,14 @@ class GraphStatus(str, Enum):
     ERROR = "ERROR"  # Last operation failed
 
 
-class QueryType(str, Enum):
+class QueryType(StrEnum):
     """Type of query being executed."""
 
     NATURAL_LANGUAGE = "natural_language"
     CYPHER = "cypher"
 
 
-class ProgressPhase(str, Enum):
+class ProgressPhase(StrEnum):
     """Phase of codebase indexing progress."""
 
     STRUCTURE = "structure"  # Identifying packages and folders

shotgun/llm_proxy/__init__.py

@@ -0,0 +1,16 @@
+"""LiteLLM proxy client utilities and configuration."""
+
+from .clients import create_anthropic_proxy_client, create_litellm_provider
+from .constants import (
+    LITELLM_PROXY_ANTHROPIC_BASE,
+    LITELLM_PROXY_BASE_URL,
+    LITELLM_PROXY_OPENAI_BASE,
+)
+
+__all__ = [
+    "LITELLM_PROXY_BASE_URL",
+    "LITELLM_PROXY_ANTHROPIC_BASE",
+    "LITELLM_PROXY_OPENAI_BASE",
+    "create_litellm_provider",
+    "create_anthropic_proxy_client",
+]

shotgun/llm_proxy/clients.py

@@ -0,0 +1,39 @@
+"""Client creation utilities for LiteLLM proxy."""
+
+from anthropic import Anthropic
+from pydantic_ai.providers.litellm import LiteLLMProvider
+
+from .constants import LITELLM_PROXY_ANTHROPIC_BASE, LITELLM_PROXY_BASE_URL
+
+
+def create_litellm_provider(api_key: str) -> LiteLLMProvider:
+    """Create LiteLLM provider for Shotgun Account.
+
+    Args:
+        api_key: Shotgun API key
+
+    Returns:
+        Configured LiteLLM provider pointing to Shotgun's proxy
+    """
+    return LiteLLMProvider(
+        api_base=LITELLM_PROXY_BASE_URL,
+        api_key=api_key,
+    )
+
+
+def create_anthropic_proxy_client(api_key: str) -> Anthropic:
+    """Create Anthropic client configured for LiteLLM proxy.
+
+    This client will proxy token counting requests through the
+    LiteLLM proxy to Anthropic's actual token counting API.
+
+    Args:
+        api_key: Shotgun API key
+
+    Returns:
+        Anthropic client configured to use LiteLLM proxy
+    """
+    return Anthropic(
+        api_key=api_key,
+        base_url=LITELLM_PROXY_ANTHROPIC_BASE,
+    )

shotgun/llm_proxy/constants.py

@@ -0,0 +1,8 @@
+"""LiteLLM proxy constants and configuration."""
+
+# Shotgun's LiteLLM proxy base URL
+LITELLM_PROXY_BASE_URL = "https://litellm-701197220809.us-east1.run.app"
+
+# Provider-specific endpoints
+LITELLM_PROXY_ANTHROPIC_BASE = f"{LITELLM_PROXY_BASE_URL}/anthropic"
+LITELLM_PROXY_OPENAI_BASE = LITELLM_PROXY_BASE_URL

shotgun/main.py

@@ -1,5 +1,11 @@
 """Main CLI application for shotgun."""
 
+# NOTE: These are before we import any Google library to stop the noisy gRPC logs.
+import os  # noqa: I001
+
+os.environ["GRPC_VERBOSITY"] = "ERROR"
+os.environ["GLOG_minloglevel"] = "2"
+
 import logging
 
 # CRITICAL: Add NullHandler to root logger before ANY other imports.

shotgun/posthog_telemetry.py

@@ -1,6 +1,6 @@
 """PostHog analytics setup for Shotgun."""
 
-from enum import Enum
+from enum import StrEnum
 from typing import Any
 
 import posthog
@@ -51,14 +51,14 @@ def setup_posthog_observability() -> bool:
         # Store the client for later use
         _posthog_client = posthog
 
-        # Set user context with anonymous user ID from config
+        # Set user context with anonymous shotgun instance ID from config
         try:
             config_manager = get_config_manager()
-            user_id = config_manager.get_user_id()
+            shotgun_instance_id = config_manager.get_shotgun_instance_id()
 
             # Identify the user in PostHog
             posthog.identify(  # type: ignore[attr-defined]
-                distinct_id=user_id,
+                distinct_id=shotgun_instance_id,
                 properties={
                     "version": __version__,
                     "environment": environment,
@@ -69,7 +69,9 @@ def setup_posthog_observability() -> bool:
             posthog.disabled = False
             posthog.personal_api_key = None  # Not needed for event tracking
 
-            logger.debug("PostHog user identified with anonymous ID: %s", user_id)
+            logger.debug(
+                "PostHog user identified with anonymous ID: %s", shotgun_instance_id
+            )
         except Exception as e:
             logger.warning("Failed to set user context: %s", e)
 
@@ -99,9 +101,9 @@ def track_event(event_name: str, properties: dict[str, Any] | None = None) -> No
         return
 
     try:
-        # Get user ID for tracking
+        # Get shotgun instance ID for tracking
         config_manager = get_config_manager()
-        user_id = config_manager.get_user_id()
+        shotgun_instance_id = config_manager.get_shotgun_instance_id()
 
         # Add version and environment to properties
         if properties is None:
@@ -116,7 +118,7 @@ def track_event(event_name: str, properties: dict[str, Any] | None = None) -> No
 
         # Track the event using PostHog's capture method
         _posthog_client.capture(
-            distinct_id=user_id, event=event_name, properties=properties
+            distinct_id=shotgun_instance_id, event=event_name, properties=properties
         )
         logger.debug("Tracked PostHog event: %s", event_name)
     except Exception as e:
@@ -137,7 +139,7 @@ def shutdown() -> None:
             _posthog_client = None
 
 
-class FeedbackKind(str, Enum):
+class FeedbackKind(StrEnum):
     BUG = "bug"
     FEATURE = "feature"
     OTHER = "other"
@@ -146,7 +148,7 @@ class FeedbackKind(str, Enum):
 class Feedback(BaseModel):
     kind: FeedbackKind
     description: str
-    user_id: str
+    shotgun_instance_id: str
 
 
 SURVEY_ID = "01999f81-9486-0000-4fa6-9632959f92f3"
@@ -178,7 +180,9 @@ def submit_feedback_survey(feedback: Feedback) -> None:
             ],
             f"$survey_response_{Q_KIND_ID}": feedback.kind,
             f"$survey_response_{Q_DESCRIPTION_ID}": feedback.description,
-            "provider": config.default_provider.value,
+            "selected_model": config.selected_model.value
+            if config.selected_model
+            else None,
             "config_version": config.config_version,
             "last_10_messages": last_10_messages,  # last 10 messages
         },

shotgun/sentry_telemetry.py

@@ -59,13 +59,13 @@ def setup_sentry_observability() -> bool:
             profiles_sample_rate=0.1 if environment == "production" else 1.0,
         )
 
-        # Set user context with anonymous user ID from config
+        # Set user context with anonymous shotgun instance ID from config
         try:
             from shotgun.agents.config import get_config_manager
 
             config_manager = get_config_manager()
-            user_id = config_manager.get_user_id()
-            sentry_sdk.set_user({"id": user_id})
+            shotgun_instance_id = config_manager.get_shotgun_instance_id()
+            sentry_sdk.set_user({"id": shotgun_instance_id})
             logger.debug("Sentry user context set with anonymous ID")
         except Exception as e:
             logger.warning("Failed to set Sentry user context: %s", e)

shotgun/shotgun_web/__init__.py

@@ -0,0 +1,19 @@
+"""Shotgun Web API client for subscription and authentication."""
+
+from .client import ShotgunWebClient, check_token_status, create_unification_token
+from .models import (
+    TokenCreateRequest,
+    TokenCreateResponse,
+    TokenStatus,
+    TokenStatusResponse,
+)
+
+__all__ = [
+    "ShotgunWebClient",
+    "create_unification_token",
+    "check_token_status",
+    "TokenCreateRequest",
+    "TokenCreateResponse",
+    "TokenStatus",
+    "TokenStatusResponse",
+]