shotgun-sh 0.2.4__tar.gz → 0.2.5.dev1__tar.gz

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.4
+Version: 0.2.5.dev1
 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.4 → shotgun_sh-0.2.5.dev1}/pyproject.toml

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

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/agents/common.py

@@ -24,6 +24,7 @@ from shotgun.logging_config import get_logger
 from shotgun.prompts import PromptLoader
 from shotgun.sdk.services import get_codebase_service
 from shotgun.utils import ensure_shotgun_directory_exists
+from shotgun.utils.datetime_utils import get_datetime_context
 from shotgun.utils.file_system_utils import get_shotgun_base_path
 
 from .history import token_limit_compactor
@@ -74,12 +75,18 @@ async def add_system_status_message(
     # Extract table of contents from the agent's markdown file
     markdown_toc = extract_markdown_toc(deps.agent_mode)
 
+    # Get current datetime with timezone information
+    dt_context = get_datetime_context()
+
     system_state = prompt_loader.render(
         "agents/state/system_state.j2",
         codebase_understanding_graphs=codebase_understanding_graphs,
         is_tui_context=deps.is_tui_context,
         existing_files=existing_files,
         markdown_toc=markdown_toc,
+        current_datetime=dt_context.datetime_formatted,
+        timezone_name=dt_context.timezone_name,
+        utc_offset=dt_context.utc_offset,
     )
 
     message_history.append(

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/agents/tools/web_search/anthropic.py

@@ -9,9 +9,14 @@ from shotgun.agents.config.constants import MEDIUM_TEXT_8K_TOKENS
 from shotgun.agents.config.models import ProviderType
 from shotgun.agents.llm import shotgun_model_request
 from shotgun.logging_config import get_logger
+from shotgun.prompts import PromptLoader
+from shotgun.utils.datetime_utils import get_datetime_context
 
 logger = get_logger(__name__)
 
+# Global prompt loader instance
+prompt_loader = PromptLoader()
+
 
 async def anthropic_web_search_tool(query: str) -> str:
     """Perform a web search using Anthropic's Claude API.
@@ -42,10 +47,20 @@ async def anthropic_web_search_tool(query: str) -> str:
         span.set_attribute("output.value", f"**Error:**\n {error_msg}\n")
         return error_msg
 
+    # Get datetime context for the search prompt
+    dt_context = get_datetime_context()
+
+    # Render search prompt from template
+    search_prompt = prompt_loader.render(
+        "tools/web_search.j2",
+        query=query,
+        current_datetime=dt_context.datetime_formatted,
+        timezone_name=dt_context.timezone_name,
+        utc_offset=dt_context.utc_offset,
+    )
+
     # Build the request messages
-    messages: list[ModelMessage] = [
-        ModelRequest.user_text_prompt(f"Search for: {query}")
-    ]
+    messages: list[ModelMessage] = [ModelRequest.user_text_prompt(search_prompt)]
 
     # Use the Messages API with web search tool
     try:

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/agents/tools/web_search/gemini.py

@@ -9,9 +9,14 @@ from shotgun.agents.config.constants import MEDIUM_TEXT_8K_TOKENS
 from shotgun.agents.config.models import ModelName
 from shotgun.agents.llm import shotgun_model_request
 from shotgun.logging_config import get_logger
+from shotgun.prompts import PromptLoader
+from shotgun.utils.datetime_utils import get_datetime_context
 
 logger = get_logger(__name__)
 
+# Global prompt loader instance
+prompt_loader = PromptLoader()
+
 
 async def gemini_web_search_tool(query: str) -> str:
     """Perform a web search using Google's Gemini API with grounding.
@@ -42,16 +47,17 @@ async def gemini_web_search_tool(query: str) -> str:
         span.set_attribute("output.value", f"**Error:**\n {error_msg}\n")
         return error_msg
 
-    # Create a search-optimized prompt
-    search_prompt = f"""Please provide current and accurate information about the following query:
-
-Query: {query}
-
-Instructions:
-- Provide comprehensive, factual information
-- Include relevant details and context
-- Focus on current and recent information
-- Be specific and accurate in your response"""
+    # Get datetime context for the search prompt
+    dt_context = get_datetime_context()
+
+    # Render search prompt from template
+    search_prompt = prompt_loader.render(
+        "tools/web_search.j2",
+        query=query,
+        current_datetime=dt_context.datetime_formatted,
+        timezone_name=dt_context.timezone_name,
+        utc_offset=dt_context.utc_offset,
+    )
 
     # Build the request messages
     messages: list[ModelMessage] = [ModelRequest.user_text_prompt(search_prompt)]

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/agents/tools/web_search/openai.py

@@ -6,9 +6,14 @@ from opentelemetry import trace
 from shotgun.agents.config import get_provider_model
 from shotgun.agents.config.models import ProviderType
 from shotgun.logging_config import get_logger
+from shotgun.prompts import PromptLoader
+from shotgun.utils.datetime_utils import get_datetime_context
 
 logger = get_logger(__name__)
 
+# Global prompt loader instance
+prompt_loader = PromptLoader()
+
 
 async def openai_web_search_tool(query: str) -> str:
     """Perform a web search and return results.
@@ -40,19 +45,17 @@ async def openai_web_search_tool(query: str) -> str:
             span.set_attribute("output.value", f"**Error:**\n {error_msg}\n")
             return error_msg
 
-        prompt = f"""Please provide current and accurate information about the following query:
-
-Query: {query}
+        # Get datetime context for the search prompt
+        dt_context = get_datetime_context()
 
-Instructions:
-- Provide comprehensive, factual information
-- Include relevant details and context
-- Focus on current and recent information
-- Be specific and accurate in your response
-- You can't ask the user for details, so assume the most relevant details for the query
-
-ALWAYS PROVIDE THE SOURCES (urls) TO BACK UP THE INFORMATION YOU PROVIDE.
-"""
+        # Render search prompt from template
+        prompt = prompt_loader.render(
+            "tools/web_search.j2",
+            query=query,
+            current_datetime=dt_context.datetime_formatted,
+            timezone_name=dt_context.timezone_name,
+            utc_offset=dt_context.utc_offset,
+        )
 
         client = AsyncOpenAI(api_key=api_key)
         response = await client.responses.create(  # type: ignore[call-overload]

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/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 = ''
-LOGFIRE_TOKEN = ''
+LOGFIRE_ENABLED = 'true'
+LOGFIRE_TOKEN = 'pylf_v1_us_KZ5NM1pP3NwgJkbBJt6Ftdzk8mMhmrXcGJHQQgDJ1LfK'
 
 # Build metadata
 BUILD_TIME_ENV = "production" if SENTRY_DSN else "development"

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/prompts/agents/state/system_state.j2

@@ -1,5 +1,7 @@
 ## System Status
 
+Your training data may be old. The current date and time is: {{ current_datetime }} in {{ timezone_name }} (UTC{{ utc_offset }})
+
 {% include 'agents/state/codebase/codebase_graphs_available.j2' %}
 
 ## Available Files
@@ -20,6 +22,8 @@ No files currently exist in your allowed directories. You can create:
 - `exports/` folder - For exported documents
 {% endif %}
 
+When updating a file try to add into the footer that this was created using Shotgun (https://shotgun.sh).
+
 {% if markdown_toc %}
 ## Document Table of Contents - READ THE ENTIRE FILE TO UNDERSTAND MORE
 

{shotgun_sh-0.2.4 → shotgun_sh-0.2.5.dev1}/src/shotgun/prompts/loader.py

@@ -5,7 +5,7 @@ from datetime import datetime
 from pathlib import Path
 from typing import Any
 
-from jinja2 import Environment, FileSystemLoader, Template, select_autoescape
+from jinja2 import Environment, FileSystemLoader, Template
 
 from shotgun.logging_config import setup_logger
 
@@ -32,7 +32,7 @@ class PromptLoader:
         self.templates_dir = templates_dir
         self.env = Environment(
             loader=FileSystemLoader(str(templates_dir)),
-            autoescape=select_autoescape(["j2"]),
+            autoescape=False,  # noqa: S701 - These are LLM prompts, not HTML
             trim_blocks=True,
             lstrip_blocks=True,
         )

shotgun_sh-0.2.5.dev1/src/shotgun/prompts/tools/web_search.j2

@@ -0,0 +1,14 @@
+Your training data may be old. The current date and time is: {{ current_datetime }} ({{ timezone_name }}, {{ utc_offset }})
+
+Please provide current and accurate information about the following query:
+
+Query: {{ query }}
+
+Instructions:
+- Provide comprehensive, factual information
+- Include relevant details and context
+- Focus on current and recent information
+- Be specific and accurate in your response
+- You can't ask the user for details, so assume the most relevant details for the query
+
+ALWAYS PROVIDE THE SOURCES (urls) TO BACK UP THE INFORMATION YOU PROVIDE.

shotgun_sh-0.2.5.dev1/src/shotgun/utils/datetime_utils.py

@@ -0,0 +1,77 @@
+"""Datetime utilities for consistent datetime formatting across the application."""
+
+from datetime import datetime
+
+from pydantic import BaseModel, Field
+
+
+class DateTimeContext(BaseModel):
+    """Structured datetime context with timezone information.
+
+    This model provides consistently formatted datetime information
+    for use in prompts, templates, and UI display.
+
+    Attributes:
+        datetime_formatted: Human-readable datetime string
+        timezone_name: Short timezone name (e.g., "PST", "UTC")
+        utc_offset: UTC offset formatted with colon (e.g., "UTC-08:00")
+
+    Example:
+        >>> dt_context = get_datetime_context()
+        >>> print(dt_context.datetime_formatted)
+        'Monday, January 13, 2025 at 3:45:30 PM'
+        >>> print(dt_context.timezone_name)
+        'PST'
+        >>> print(dt_context.utc_offset)
+        'UTC-08:00'
+    """
+
+    datetime_formatted: str = Field(
+        description="Human-readable datetime string in format: 'Day, Month DD, YYYY at HH:MM:SS AM/PM'"
+    )
+    timezone_name: str = Field(description="Short timezone name (e.g., PST, EST, UTC)")
+    utc_offset: str = Field(
+        description="UTC offset formatted with colon (e.g., UTC-08:00, UTC+05:30)"
+    )
+
+
+def get_datetime_context() -> DateTimeContext:
+    """Get formatted datetime context with timezone information.
+
+    Returns a Pydantic model containing consistently formatted datetime
+    information suitable for use in prompts and templates.
+
+    Returns:
+        DateTimeContext: Structured datetime context with formatted strings
+
+    Example:
+        >>> dt_context = get_datetime_context()
+        >>> dt_context.datetime_formatted
+        'Monday, January 13, 2025 at 3:45:30 PM'
+        >>> dt_context.timezone_name
+        'PST'
+        >>> dt_context.utc_offset
+        'UTC-08:00'
+    """
+    # Get current datetime with timezone information
+    now = datetime.now().astimezone()
+
+    # Format datetime in plain English
+    # Example: "Monday, January 13, 2025 at 3:45:30 PM"
+    datetime_formatted = now.strftime("%A, %B %d, %Y at %I:%M:%S %p")
+
+    # Get timezone name and UTC offset
+    # Example: "PST" and "UTC-08:00"
+    timezone_name = now.strftime("%Z")
+    utc_offset = now.strftime("%z")  # Format: +0800 or -0500
+
+    # Reformat UTC offset to include colon: +08:00 or -05:00
+    utc_offset_formatted = (
+        f"UTC{utc_offset[:3]}:{utc_offset[3:]}" if utc_offset else "UTC"
+    )
+
+    return DateTimeContext(
+        datetime_formatted=datetime_formatted,
+        timezone_name=timezone_name,
+        utc_offset=utc_offset_formatted,
+    )