shotgun-sh 0.2.4__py3-none-any.whl → 0.2.5__py3-none-any.whl

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/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/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/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/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/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/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/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,
+    )

{shotgun_sh-0.2.4.dist-info → shotgun_sh-0.2.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shotgun-sh
-Version: 0.2.4
+Version: 0.2.5
 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.dist-info → shotgun_sh-0.2.5.dist-info}/RECORD

@@ -9,7 +9,7 @@ shotgun/sentry_telemetry.py,sha256=VD8es-tREfgtRKhDsEVvqpo0_kM_ab6iVm2lkOEmTlI,2
 shotgun/telemetry.py,sha256=WfxdHALh5_51nw783ZZvD-LEyC6ypHxSUTMXUioZhTQ,3339
 shotgun/agents/__init__.py,sha256=8Jzv1YsDuLyNPFJyckSr_qI4ehTVeDyIMDW4omsfPGc,25
 shotgun/agents/agent_manager.py,sha256=xq8L0oAFgtFCpKVsyUoMtYJqUyz5XxjWLKNnxoe1zo4,26577
-shotgun/agents/common.py,sha256=Hr9HigsDopkI0Sr3FThGDv1f67NLemOjcYA6LV9v970,18963
+shotgun/agents/common.py,sha256=BINebrcS9BcHu7yDH2yxTjChCmQoUCUrmUMlRnz4_JY,19265
 shotgun/agents/conversation_history.py,sha256=5J8_1yxdZiiWTq22aDio88DkBDZ4_Lh_p5Iy5_ENszc,3898
 shotgun/agents/conversation_manager.py,sha256=fxAvXbEl3Cl2ugJ4N9aWXaqZtkrnfj3QzwjWC4LFXwI,3514
 shotgun/agents/export.py,sha256=Zke952DbJ_lOBUmN-TPHw7qmjbfqsFu1uycBRQI_pkg,2969
@@ -52,9 +52,9 @@ shotgun/agents/tools/codebase/models.py,sha256=8eR3_8DQiBNgB2twu0aC_evIJbugN9KW3
 shotgun/agents/tools/codebase/query_graph.py,sha256=vOeyN4-OZj-vpTSk3Z9W5TjraZAepJ-Qjk_zzvum3fU,2115
 shotgun/agents/tools/codebase/retrieve_code.py,sha256=2VjiqVKJMd9rPV-mGrL4C-N8fqGjYLW6ZInFGbcTxOM,2878
 shotgun/agents/tools/web_search/__init__.py,sha256=166SzGDspEqRoHvAoguoy02WAT5EQfozoc5Ha5VubdY,3699
-shotgun/agents/tools/web_search/anthropic.py,sha256=GelAhAmb-b4o87-3sgxNFfw-G2LXDEjfdZ7XfF0bQD0,4983
-shotgun/agents/tools/web_search/gemini.py,sha256=-fI_deaBT4-_61A7KlKtz8tmKXW50fVx_97WAJTUg4w,3468
-shotgun/agents/tools/web_search/openai.py,sha256=pnIcTV3vwXJQuxPs4I7gQNX18XzM7D7FqeNxnn1E7yw,3437
+shotgun/agents/tools/web_search/anthropic.py,sha256=_xtSUImIi8XNOVY4w2tJjHGEpAnEUkaCqWpjn7hwikY,5505
+shotgun/agents/tools/web_search/gemini.py,sha256=RESEVKAJHK_IkQf6npo6EObOJDQtBqhRVnQ4GsD3rSk,3670
+shotgun/agents/tools/web_search/openai.py,sha256=V_hs1bPoNNLK_SqR5ObM_wId9hc-NIOSSfGWAR16HIU,3550
 shotgun/agents/tools/web_search/utils.py,sha256=GLJ5QV9bT2ubFMuFN7caMN7tK9OTJ0R3GD57B-tCMF0,532
 shotgun/cli/__init__.py,sha256=_F1uW2g87y4bGFxz8Gp8u7mq2voHp8vQIUtCmm8Tojo,40
 shotgun/cli/config.py,sha256=lT_zXwui-Wv3hewjebQeu9eLwK3tYn1wla5vKit6eqs,7931
@@ -86,7 +86,7 @@ shotgun/llm_proxy/__init__.py,sha256=3ST3ygtf2sXXSOjIFHxVZ5xqRbT3TF7jpNHwuZAtIwA
 shotgun/llm_proxy/clients.py,sha256=Y19W8Gb2e-37w8rUKPmxJOqoTk6GlcPhZhoeAbbURU0,1341
 shotgun/llm_proxy/constants.py,sha256=_4piKdyvM7pAIRdAGrzYexwWoDlueUZiEMfwWrOa4T0,381
 shotgun/prompts/__init__.py,sha256=RswUm0HMdfm2m2YKUwUsEdRIwoczdbI7zlucoEvHYRo,132
-shotgun/prompts/loader.py,sha256=jy24-E02pCSmz2651aCT2NgHfRrHAGMYvKrD6gs0Er8,4424
+shotgun/prompts/loader.py,sha256=_7CdUYrAo6ZwvTBUlXugKyLU0IDBg5CVzUIAHFPw418,4433
 shotgun/prompts/agents/__init__.py,sha256=YRIJMbzpArojNX1BP5gfxxois334z_GQga8T-xyWMbY,39
 shotgun/prompts/agents/export.j2,sha256=GKpOfGbZA9PVa4TNtMORUYiBIAcN6JCo8URmTCWKlWw,15936
 shotgun/prompts/agents/plan.j2,sha256=MyZDyOS21V-zrHNzbIhIdzcESGh_3KVbA4qh9rZR2_E,6086
@@ -97,7 +97,7 @@ shotgun/prompts/agents/partials/codebase_understanding.j2,sha256=7WH-PVd-TRBFQUd
 shotgun/prompts/agents/partials/common_agent_system_prompt.j2,sha256=eFuc3z1pSJzQtPJfjMIDNHv5XX9lP6YVrmKcbbskJj8,1877
 shotgun/prompts/agents/partials/content_formatting.j2,sha256=MG0JB7SSp8YV5akDWpbs2f9DcdREIYqLp38NnoWLeQ0,1854
 shotgun/prompts/agents/partials/interactive_mode.j2,sha256=9sYPbyc46HXg3k1FT_LugIQvOyNDnMQwsMIgOgN-_aY,1100
-shotgun/prompts/agents/state/system_state.j2,sha256=TQPnCLtmiNwQCbMxnCE7nLhXMJpKlBCnlNBKt7FTjuo,1033
+shotgun/prompts/agents/state/system_state.j2,sha256=RPweqBYmgWMiDuOjdEDl6NLgYU7HMaUGW1jBSnD5UzQ,1270
 shotgun/prompts/agents/state/codebase/codebase_graphs_available.j2,sha256=U-hy-H9bPwV0sYIHTZ5TESxc5EOCtntI8GUZOmJipJw,601
 shotgun/prompts/codebase/__init__.py,sha256=NYuPMtmYM2ptuwf3YxVuotNlJOUq0hnjmwlzKcJkGK4,42
 shotgun/prompts/codebase/cypher_query_patterns.j2,sha256=ufTx_xT3VoS76KcVUbIgGQx-bJoJHx3bBE3dagAXv18,8913
@@ -109,6 +109,7 @@ shotgun/prompts/codebase/partials/temporal_context.j2,sha256=yYHQHBQ4EeSs6TtKPm9
 shotgun/prompts/history/__init__.py,sha256=wbMLQ8yWmYz1sfXXigEAUlNkFcM50KdQv0kp4VU_P58,43
 shotgun/prompts/history/incremental_summarization.j2,sha256=GmnNh0pWTjaEaI1sPwKNsGCys5fK8xrzWqalAs_LhJw,2447
 shotgun/prompts/history/summarization.j2,sha256=OYNVHg65zbuWB6_pXzTOs2T2k5qFD2gyfbmr6NP01rs,2268
+shotgun/prompts/tools/web_search.j2,sha256=_F1m5UYiZENPQCqTUiO2du9Lkzs1SWujjAiauDD_5-Y,568
 shotgun/sdk/__init__.py,sha256=ESV0WM9MigjXG30g9qVjcCMI40GQv-P-MSMGVuOisK4,380
 shotgun/sdk/codebase.py,sha256=7doUvwwl27RDJZIbP56LQsAx26GANtAKEBptTUhLT6w,8842
 shotgun/sdk/exceptions.py,sha256=qBcQv0v7ZTwP7CMcxZST4GqCsfOWtOUjSzGBo0-heqo,412
@@ -143,12 +144,13 @@ shotgun/tui/screens/chat_screen/history.py,sha256=Go859iEjw0s5aELKpF42MjLXy7UFQ5
 shotgun/tui/utils/__init__.py,sha256=cFjDfoXTRBq29wgP7TGRWUu1eFfiIG-LLOzjIGfadgI,150
 shotgun/tui/utils/mode_progress.py,sha256=lseRRo7kMWLkBzI3cU5vqJmS2ZcCjyRYf9Zwtvc-v58,10931
 shotgun/utils/__init__.py,sha256=WinIEp9oL2iMrWaDkXz2QX4nYVPAm8C9aBSKTeEwLtE,198
+shotgun/utils/datetime_utils.py,sha256=x_uYmG1n9rkhSO2oR2uV9ttiuPL0nKa9os8YYaPfdWY,2592
 shotgun/utils/env_utils.py,sha256=ulM3BRi9ZhS7uC-zorGeDQm4SHvsyFuuU9BtVPqdrHY,1418
 shotgun/utils/file_system_utils.py,sha256=l-0p1bEHF34OU19MahnRFdClHufThfGAjQ431teAIp0,1004
 shotgun/utils/source_detection.py,sha256=Co6Q03R3fT771TF3RzB-70stfjNP2S4F_ArZKibwzm8,454
 shotgun/utils/update_checker.py,sha256=IgzPHRhS1ETH7PnJR_dIx6lxgr1qHpCkMTgzUxvGjhI,7586
-shotgun_sh-0.2.4.dist-info/METADATA,sha256=8iOzc8p7VixOSpkVjmOQeZVt5c5lp0KkpcwtNc0P0ew,11221
-shotgun_sh-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shotgun_sh-0.2.4.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
-shotgun_sh-0.2.4.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
-shotgun_sh-0.2.4.dist-info/RECORD,,
+shotgun_sh-0.2.5.dist-info/METADATA,sha256=EFOMTry3j-nndQQf5YRJ5RCXxZkAoisYUSNCn1rCEZw,11221
+shotgun_sh-0.2.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shotgun_sh-0.2.5.dist-info/entry_points.txt,sha256=asZxLU4QILneq0MWW10saVCZc4VWhZfb0wFZvERnzfA,45
+shotgun_sh-0.2.5.dist-info/licenses/LICENSE,sha256=YebsZl590zCHrF_acCU5pmNt0pnAfD2DmAnevJPB1tY,1065
+shotgun_sh-0.2.5.dist-info/RECORD,,