gac 0.17.3__py3-none-any.whl → 0.17.4__py3-none-any.whl

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "0.17.3"
+__version__ = "0.17.4"

gac/ai.py

@@ -61,7 +61,7 @@ def get_encoding(model: str) -> tiktoken.Encoding:
 
 def generate_commit_message(
     model: str,
-    prompt: str,
+    prompt: str | tuple[str, str],
     temperature: float = EnvDefaults.TEMPERATURE,
     max_tokens: int = EnvDefaults.MAX_OUTPUT_TOKENS,
     max_retries: int = EnvDefaults.MAX_RETRIES,
@@ -71,7 +71,7 @@ def generate_commit_message(
 
     Args:
         model: The model to use in provider:model_name format (e.g., 'anthropic:claude-3-5-haiku-latest')
-        prompt: The formatted prompt containing diff and context
+        prompt: Either a string prompt (for backward compatibility) or tuple of (system_prompt, user_prompt)
         temperature: Controls randomness (0.0-1.0), lower values are more deterministic
         max_tokens: Maximum tokens in the response
         max_retries: Number of retry attempts if generation fails
@@ -85,8 +85,8 @@ def generate_commit_message(
 
     Example:
         >>> model = "anthropic:claude-3-5-haiku-latest"
-        >>> prompt = build_prompt("On branch main", "diff --git a/README.md b/README.md")
-        >>> generate_commit_message(model, prompt)
+        >>> system_prompt, user_prompt = build_prompt("On branch main", "diff --git a/README.md b/README.md")
+        >>> generate_commit_message(model, (system_prompt, user_prompt))
         'docs: Update README with installation instructions'
     """
     try:
@@ -98,6 +98,14 @@ def generate_commit_message(
 
     client = ai.Client()
 
+    # Handle both old (string) and new (tuple) prompt formats
+    if isinstance(prompt, tuple):
+        system_prompt, user_prompt = prompt
+        messages = [{"role": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}]
+    else:
+        # Backward compatibility: treat string as user prompt
+        messages = [{"role": "user", "content": prompt}]
+
     if quiet:
         spinner = None
     else:
@@ -112,7 +120,7 @@ def generate_commit_message(
             logger.debug(f"Trying with model {model} (attempt {retry_count + 1}/{max_retries})")
             response = client.chat.completions.create(
                 model=model,
-                messages=[{"role": "user", "content": prompt}],
+                messages=messages,
                 temperature=temperature,
                 max_tokens=max_tokens,
             )

gac/main.py

@@ -95,7 +95,7 @@ def main(
     processed_diff = preprocess_diff(diff, token_limit=Utility.DEFAULT_DIFF_TOKEN_LIMIT, model=model_id)
     logger.debug(f"Processed diff ({len(processed_diff)} characters)")
 
-    prompt = build_prompt(
+    system_prompt, user_prompt = build_prompt(
         status=status,
         processed_diff=processed_diff,
         diff_stat=diff_stat,
@@ -106,16 +106,19 @@ def main(
 
     if show_prompt:
         console = Console()
+        # Show both system and user prompts
+        full_prompt = f"SYSTEM PROMPT:\n{system_prompt}\n\nUSER PROMPT:\n{user_prompt}"
         console.print(
             Panel(
-                prompt,
+                full_prompt,
                 title="Prompt for LLM",
                 border_style="bright_blue",
             )
         )
 
     try:
-        prompt_tokens = count_tokens(prompt, model)
+        # Count tokens for both prompts
+        prompt_tokens = count_tokens(system_prompt, model) + count_tokens(user_prompt, model)
 
         warning_limit = config.get("warning_limit_tokens", EnvDefaults.WARNING_LIMIT_TOKENS)
         if warning_limit and prompt_tokens > warning_limit:
@@ -132,7 +135,7 @@ def main(
 
         commit_message = generate_commit_message(
             model=model,
-            prompt=prompt,
+            prompt=(system_prompt, user_prompt),
             temperature=temperature,
             max_tokens=max_output_tokens,
             max_retries=max_retries,
@@ -193,7 +196,7 @@ def main(
                                 combined_hint = conversational_hint
 
                             # Regenerate prompt with conversational feedback
-                            reroll_prompt = build_prompt(
+                            reroll_system_prompt, reroll_user_prompt = build_prompt(
                                 status=status,
                                 processed_diff=processed_diff,
                                 diff_stat=diff_stat,
@@ -202,15 +205,15 @@ def main(
                                 scope=scope,
                             )
                         else:
-                            # No hint given, just reroll with same prompt
-                            reroll_prompt = prompt
+                            # No hint given, just reroll with same prompts
+                            reroll_system_prompt, reroll_user_prompt = system_prompt, user_prompt
 
                         console.print()  # Add blank line for readability
 
                         # Generate new message
                         commit_message = generate_commit_message(
                             model=model,
-                            prompt=reroll_prompt,
+                            prompt=(reroll_system_prompt, reroll_user_prompt),
                             temperature=temperature,
                             max_tokens=max_output_tokens,
                             max_retries=max_retries,

gac/prompt.py

@@ -237,8 +237,8 @@ def build_prompt(
     one_liner: bool = False,
     hint: str = "",
     scope: str | None = None,
-) -> str:
-    """Build a prompt for the AI model using the provided template and git information.
+) -> tuple[str, str]:
+    """Build system and user prompts for the AI model using the provided template and git information.
 
     Args:
         status: Git status output
@@ -249,7 +249,7 @@ def build_prompt(
         scope: Optional scope parameter. None = no scope, "infer" = infer scope, any other string = use as scope
 
     Returns:
-        Formatted prompt string ready to be sent to an AI model
+        Tuple of (system_prompt, user_prompt) ready to be sent to an AI model
     """
     template = load_prompt_template()
 
@@ -331,7 +331,49 @@ def build_prompt(
     # Clean up extra whitespace, collapsing blank lines that may contain spaces
     template = re.sub(r"\n(?:[ \t]*\n){2,}", "\n\n", template)
 
-    return template.strip()
+    # Split the template into system and user prompts
+    # System prompt contains all instructions, role, conventions, examples
+    # User prompt contains the actual git data
+
+    # Extract the git data sections for the user prompt
+    user_sections = []
+
+    # Extract git status
+    status_match = re.search(r"<git_status>.*?</git_status>", template, re.DOTALL)
+    if status_match:
+        user_sections.append(status_match.group(0))
+        # Remove from system prompt
+        template = template.replace(status_match.group(0), "")
+
+    # Extract git diff stat
+    diff_stat_match = re.search(r"<git_diff_stat>.*?</git_diff_stat>", template, re.DOTALL)
+    if diff_stat_match:
+        user_sections.append(diff_stat_match.group(0))
+        # Remove from system prompt
+        template = template.replace(diff_stat_match.group(0), "")
+
+    # Extract git diff
+    diff_match = re.search(r"<git_diff>.*?</git_diff>", template, re.DOTALL)
+    if diff_match:
+        user_sections.append(diff_match.group(0))
+        # Remove from system prompt
+        template = template.replace(diff_match.group(0), "")
+
+    # Extract hint if present
+    hint_match = re.search(r"<hint>.*?</hint>", template, re.DOTALL)
+    if hint_match and hint:  # Only include if hint was provided
+        user_sections.append(hint_match.group(0))
+        # Remove from system prompt
+        template = template.replace(hint_match.group(0), "")
+
+    # System prompt is everything else (role, conventions, examples, instructions)
+    system_prompt = template.strip()
+    system_prompt = re.sub(r"\n(?:[ \t]*\n){2,}", "\n\n", system_prompt)
+
+    # User prompt is the git data sections
+    user_prompt = "\n\n".join(user_sections).strip()
+
+    return system_prompt, user_prompt
 
 
 def clean_commit_message(message: str) -> str:

{gac-0.17.3.dist-info → gac-0.17.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 0.17.3
+Version: 0.17.4
 Summary: AI-powered Git commit message generator with multi-provider support
 Project-URL: Homepage, https://github.com/cellwebb/gac
 Project-URL: Documentation, https://github.com/cellwebb/gac#readme
@@ -71,7 +71,13 @@ Description-Content-Type: text/markdown
 
 ## How It Works
 
-gac analyzes your staged changes to generate high-quality commit messages with the help of large language models.
+gac analyzes your staged changes to generate high-quality commit messages with the help of large language models. The tool uses a sophisticated prompt architecture that separates system instructions from user data, enabling better AI understanding and more consistent results.
+
+### Technical Architecture
+
+- **Dual-Prompt System**: GAC uses a separated prompt architecture where system instructions (role definition, conventions, examples) are sent as system messages, while git data (diffs, status) are sent as user messages. This follows AI best practices for improved model performance.
+- **Smart Context Analysis**: The tool examines your repository structure, recent commit history, and README files to understand the broader context of your changes.
+- **Intelligent Diff Processing**: Large diffs are automatically preprocessed to focus on the most important changes while staying within token limits.
 
 ## How to Use
 

{gac-0.17.3.dist-info → gac-0.17.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 gac/__init__.py,sha256=z9yGInqtycFIT3g1ca24r-A3699hKVaRqGUI79wsmMc,415
-gac/__version__.py,sha256=PGRWYPpH_xUx9e7M1pSnGpMBmU_eozE_fKc0otJ6JfU,67
-gac/ai.py,sha256=kxZ0UMU_2i9Vb2fXKAUcuFCeZJAZ9G8OSjgTVF06h-Y,5452
+gac/__version__.py,sha256=qYY65gp8JDrTDyn1fMc6HTzqsRF0DSfklgRuLYJXGPQ,67
+gac/ai.py,sha256=hkOhBmN1XBJ2ZswsnBvckuov9D7FDOL9vm_A4atuoGs,5905
 gac/cli.py,sha256=KsagQerqcf2uqGS4HjV_U1AUBtY3DPmYLsTj08riZmE,4545
 gac/config.py,sha256=wSgEDjtis7Vk1pv5VPvYmJyD9-tymDS6GiUHjnCMbIM,1486
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
@@ -9,12 +9,12 @@ gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
 gac/errors.py,sha256=3vIRMQ2QF3sP9_rPfXAFuu5ZSjIVX4FxM-FAuiR8N-8,7416
 gac/git.py,sha256=MS2m4fv8h4mau1djFG1aje9NXTmkGsjPO9w18LqNGX0,6031
 gac/init_cli.py,sha256=aNllguofrcLn0ML9tzLVWFkPbwlAvCM9m7undHhMLEo,1825
-gac/main.py,sha256=yO17nqu78K4pHj4u9-enVDB2qetR1YWgqK4WBa4pXoM,11597
+gac/main.py,sha256=IlT6iOsdwb0uSJJ1A69FaBrq-gFGpnhCcAjJLdHp20w,11962
 gac/preprocess.py,sha256=4igtZ9OTHgTpqwlJmbcGaqzmdD0HHCZJwsZ9eG118Gk,15360
-gac/prompt.py,sha256=i6XPWXCC_v1k2wVkv5FlL540RKG5uS-U6HJU9wC-cGw,18291
+gac/prompt.py,sha256=Wd-CguIQnVNj_49dXz0Da2Osxx8sfTzRypx_rq2rFWk,20052
 gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
-gac-0.17.3.dist-info/METADATA,sha256=1Wc1DRE1Y-ZDs7h3l1XOT7BnFv9NH_eY2ayGdEyv7VM,7654
-gac-0.17.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-0.17.3.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-0.17.3.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
-gac-0.17.3.dist-info/RECORD,,
+gac-0.17.4.dist-info/METADATA,sha256=xDyjDHpjwyRyQy_v8xdQfb3WMxeIDqIa_YTmimsKvHM,8448
+gac-0.17.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-0.17.4.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-0.17.4.dist-info/licenses/LICENSE,sha256=s11puNmYfzwoSwG96nhOJe268Y1QFckr8-Hmzo3_eJE,1087
+gac-0.17.4.dist-info/RECORD,,