shotgun-sh 0.2.3.dev1__tar.gz → 0.2.3.dev2__tar.gz

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.3.dev1
+Version: 0.2.3.dev2
 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

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "shotgun-sh"
-version = "0.2.3.dev1"
+version = "0.2.3.dev2"
 description = "AI-powered research, planning, and task management CLI tool"
 readme = "README.md"
 license = { text = "MIT" }

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/src/shotgun/agents/config/manager.py

@@ -81,6 +81,26 @@ class ConfigManager:
                     "Migrated config v2->v3: renamed user_id to shotgun_instance_id"
                 )
 
+            # Migration: Set shown_welcome_screen for existing BYOK users
+            # If shown_welcome_screen doesn't exist AND any BYOK provider has a key,
+            # set it to False so they see the welcome screen once
+            if "shown_welcome_screen" not in data:
+                has_byok_key = False
+                for section in ["openai", "anthropic", "google"]:
+                    if (
+                        section in data
+                        and isinstance(data[section], dict)
+                        and data[section].get("api_key")
+                    ):
+                        has_byok_key = True
+                        break
+
+                if has_byok_key:
+                    data["shown_welcome_screen"] = False
+                    logger.info(
+                        "Existing BYOK user detected: set shown_welcome_screen=False to show welcome screen"
+                    )
+
             # Convert plain text secrets to SecretStr objects
             self._convert_secrets_to_secretstr(data)
 

shotgun_sh-0.2.3.dev2/src/shotgun/api_endpoints.py

@@ -0,0 +1,11 @@
+"""Shotgun backend service API endpoints and URLs."""
+
+# Shotgun Web API base URL (for authentication/subscription)
+# Can be overridden with environment variable
+SHOTGUN_WEB_BASE_URL = "https://api-219702594231.us-east4.run.app"
+# Shotgun's LiteLLM proxy base URL (for AI model requests)
+LITELLM_PROXY_BASE_URL = "https://litellm-219702594231.us-east4.run.app"
+
+# Provider-specific LiteLLM proxy endpoints
+LITELLM_PROXY_ANTHROPIC_BASE = f"{LITELLM_PROXY_BASE_URL}/anthropic"
+LITELLM_PROXY_OPENAI_BASE = LITELLM_PROXY_BASE_URL

shotgun_sh-0.2.3.dev2/src/shotgun/llm_proxy/constants.py

@@ -0,0 +1,15 @@
+"""LiteLLM proxy constants and configuration."""
+
+# Import from centralized API endpoints module
+from shotgun.api_endpoints import (
+    LITELLM_PROXY_ANTHROPIC_BASE,
+    LITELLM_PROXY_BASE_URL,
+    LITELLM_PROXY_OPENAI_BASE,
+)
+
+# Re-export for backward compatibility
+__all__ = [
+    "LITELLM_PROXY_BASE_URL",
+    "LITELLM_PROXY_ANTHROPIC_BASE",
+    "LITELLM_PROXY_OPENAI_BASE",
+]

shotgun_sh-0.2.3.dev2/src/shotgun/shotgun_web/constants.py

@@ -0,0 +1,21 @@
+"""Constants for Shotgun Web API."""
+
+# Import from centralized API endpoints module
+from shotgun.api_endpoints import SHOTGUN_WEB_BASE_URL
+
+# API endpoints
+UNIFICATION_TOKEN_CREATE_PATH = "/api/unification/token/create"  # noqa: S105
+UNIFICATION_TOKEN_STATUS_PATH = "/api/unification/token/{token}/status"  # noqa: S105
+
+# Polling configuration
+DEFAULT_POLL_INTERVAL_SECONDS = 3
+DEFAULT_TOKEN_TIMEOUT_SECONDS = 1800  # 30 minutes
+
+# Re-export for backward compatibility
+__all__ = [
+    "SHOTGUN_WEB_BASE_URL",
+    "UNIFICATION_TOKEN_CREATE_PATH",
+    "UNIFICATION_TOKEN_STATUS_PATH",
+    "DEFAULT_POLL_INTERVAL_SECONDS",
+    "DEFAULT_TOKEN_TIMEOUT_SECONDS",
+]

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/src/shotgun/tui/app.py

@@ -8,7 +8,6 @@ from textual.screen import Screen
 from shotgun.agents.config import ConfigManager, get_config_manager
 from shotgun.logging_config import get_logger
 from shotgun.tui.screens.splash import SplashScreen
-from shotgun.utils.env_utils import is_shotgun_account_enabled
 from shotgun.utils.file_system_utils import get_shotgun_base_path
 from shotgun.utils.update_checker import perform_auto_update_async
 
@@ -61,28 +60,21 @@ class ShotgunApp(App[None]):
 
     def refresh_startup_screen(self) -> None:
         """Push the appropriate screen based on configured providers."""
-        if not self.config_manager.has_any_provider_key():
-            # If Shotgun Account is enabled, show welcome screen with choice
-            # Otherwise, go directly to provider config (BYOK only)
-            if is_shotgun_account_enabled():
-                if isinstance(self.screen, WelcomeScreen):
-                    return
-
-                self.push_screen(
-                    WelcomeScreen(),
-                    callback=lambda _arg: self.refresh_startup_screen(),
-                )
-                return
-            else:
-                if isinstance(self.screen, ProviderConfigScreen):
-                    return
-
-                self.push_screen(
-                    ProviderConfigScreen(),
-                    callback=lambda _arg: self.refresh_startup_screen(),
-                )
+        # Show welcome screen if no providers are configured OR if user hasn't seen it yet
+        config = self.config_manager.load()
+        if (
+            not self.config_manager.has_any_provider_key()
+            or not config.shown_welcome_screen
+        ):
+            if isinstance(self.screen, WelcomeScreen):
                 return
 
+            self.push_screen(
+                WelcomeScreen(),
+                callback=lambda _arg: self.refresh_startup_screen(),
+            )
+            return
+
         if not self.check_local_shotgun_directory_exists():
             if isinstance(self.screen, DirectorySetupScreen):
                 return

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/src/shotgun/tui/screens/provider_config.py

@@ -12,23 +12,19 @@ from textual.screen import Screen
 from textual.widgets import Button, Input, Label, ListItem, ListView, Markdown, Static
 
 from shotgun.agents.config import ConfigManager, ProviderType
-from shotgun.utils.env_utils import is_shotgun_account_enabled
 
 if TYPE_CHECKING:
     from ..app import ShotgunApp
 
 
 def get_configurable_providers() -> list[str]:
-    """Get list of configurable providers based on feature flags.
+    """Get list of configurable providers.
 
     Returns:
         List of provider identifiers that can be configured.
-        Includes shotgun only if SHOTGUN_ACCOUNT_ENABLED is set.
+        Includes all providers: openai, anthropic, google, and shotgun.
     """
-    providers = ["openai", "anthropic", "google"]
-    if is_shotgun_account_enabled():
-        providers.append("shotgun")
-    return providers
+    return ["openai", "anthropic", "google", "shotgun"]
 
 
 class ProviderConfigScreen(Screen[None]):

{shotgun_sh-0.2.3.dev1 → shotgun_sh-0.2.3.dev2}/src/shotgun/utils/env_utils.py

@@ -1,16 +1,17 @@
 """Utilities for working with environment variables."""
 
-import os
-
 
 def is_shotgun_account_enabled() -> bool:
     """Check if Shotgun Account feature is enabled via environment variable.
 
     Returns:
-        True if SHOTGUN_ACCOUNT_ENABLED is set to a truthy value,
-        False otherwise
+        True always (Shotgun Account is now live for all users)
+
+    Note:
+        This function is deprecated and always returns True.
+        Shotgun Account is now available to all users by default.
     """
-    return is_truthy(os.environ.get("SHOTGUN_ACCOUNT_ENABLED"))
+    return True
 
 
 def is_truthy(value: str | None) -> bool:

shotgun_sh-0.2.3.dev1/src/shotgun/llm_proxy/constants.py

@@ -1,8 +0,0 @@
-"""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_sh-0.2.3.dev1/src/shotgun/shotgun_web/constants.py

@@ -1,17 +0,0 @@
-"""Constants for Shotgun Web API."""
-
-import os
-
-# Shotgun Web API base URL
-# Default to production URL, can be overridden with environment variable
-SHOTGUN_WEB_BASE_URL = os.environ.get(
-    "SHOTGUN_WEB_BASE_URL", "https://api-701197220809.us-east1.run.app"
-)
-
-# API endpoints
-UNIFICATION_TOKEN_CREATE_PATH = "/api/unification/token/create"  # noqa: S105
-UNIFICATION_TOKEN_STATUS_PATH = "/api/unification/token/{token}/status"  # noqa: S105
-
-# Polling configuration
-DEFAULT_POLL_INTERVAL_SECONDS = 3
-DEFAULT_TOKEN_TIMEOUT_SECONDS = 1800  # 30 minutes