gac 1.2.0__py3-none-any.whl → 1.2.2__py3-none-any.whl

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "1.2.0"
+__version__ = "1.2.2"

gac/ai.py

@@ -81,6 +81,9 @@ def generate_commit_message(
             max_retries=max_retries,
             quiet=quiet,
         )
+    except AIError:
+        # Re-raise AIError exceptions as-is to preserve error classification
+        raise
     except Exception as e:
         logger.error(f"Failed to generate commit message: {e}")
         raise AIError.model_error(f"Failed to generate commit message: {e}") from e

gac/ai_utils.py

@@ -4,12 +4,10 @@ This module provides utility functions that support the AI provider implementati
 """
 
 import logging
-import os
 import time
 from functools import lru_cache
 from typing import Any
 
-import httpx
 import tiktoken
 from halo import Halo
 
@@ -25,12 +23,6 @@ def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: st
     if not text:
         return 0
 
-    if model.startswith("anthropic"):
-        anthropic_tokens = anthropic_count_tokens(text, model)
-        if anthropic_tokens is not None:
-            return anthropic_tokens
-        return len(text) // 4
-
     try:
         encoding = get_encoding(model)
         return len(encoding.encode(text))
@@ -39,60 +31,6 @@ def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: st
         return len(text) // 4
 
 
-def anthropic_count_tokens(text: str, model: str) -> int | None:
-    """Call Anthropic's token count endpoint and return the token usage.
-
-    Returns the token count when successful, otherwise ``None`` so callers can
-    fall back to a heuristic estimate.
-    """
-    api_key = os.getenv("ANTHROPIC_API_KEY")
-    if not api_key:
-        logger.debug("ANTHROPIC_API_KEY not set; using heuristic token estimation for Anthropic model")
-        return None
-
-    model_name = model.split(":", 1)[1] if ":" in model else "claude-3-5-haiku-latest"
-    headers = {
-        "Content-Type": "application/json",
-        "x-api-key": api_key,
-        "anthropic-version": "2023-06-01",
-    }
-    payload = {
-        "model": model_name,
-        "messages": [
-            {
-                "role": "user",
-                "content": [
-                    {
-                        "type": "text",
-                        "text": text,
-                    }
-                ],
-            }
-        ],
-    }
-
-    try:
-        response = httpx.post(
-            "https://api.anthropic.com/v1/messages/count_tokens",
-            headers=headers,
-            json=payload,
-            timeout=30.0,
-        )
-        response.raise_for_status()
-        data = response.json()
-
-        if "input_tokens" in data:
-            return data["input_tokens"]
-        if "usage" in data and "input_tokens" in data["usage"]:
-            return data["usage"]["input_tokens"]
-
-        logger.warning("Unexpected response format from Anthropic token count API: %s", data)
-    except Exception as exc:
-        logger.warning("Failed to retrieve Anthropic token count via HTTP: %s", exc)
-
-    return None
-
-
 def extract_text_content(content: str | list[dict[str, str]] | dict[str, Any]) -> str:
     """Extract text content from various input formats."""
     if isinstance(content, str):
@@ -172,6 +110,7 @@ def generate_with_retries(
         spinner.start()
 
     last_exception = None
+    last_error_type = "unknown"
 
     for attempt in range(max_retries):
         try:
@@ -190,20 +129,27 @@ def generate_with_retries(
             if spinner:
                 spinner.succeed(f"Generated commit message with {provider} {model_name}")
 
-            if content:
+            if content is not None and content.strip():
                 return content.strip()
             else:
+                logger.warning(f"Empty or None content received from {provider} {model_name}: {repr(content)}")
                 raise AIError.model_error("Empty response from AI model")
 
         except Exception as e:
             last_exception = e
             error_type = _classify_error(str(e))
+            last_error_type = error_type
 
+            # For authentication and model errors, don't retry
             if error_type in ["authentication", "model"]:
-                # Don't retry these errors
                 if spinner:
                     spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
-                raise AIError.authentication_error(f"AI generation failed: {str(e)}") from e
+
+                # Create the appropriate error type based on classification
+                if error_type == "authentication":
+                    raise AIError.authentication_error(f"AI generation failed: {str(e)}") from e
+                elif error_type == "model":
+                    raise AIError.model_error(f"AI generation failed: {str(e)}") from e
 
             if attempt < max_retries - 1:
                 # Exponential backoff
@@ -223,7 +169,17 @@ def generate_with_retries(
     if spinner:
         spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
 
-    # If we get here, all retries failed
-    raise AIError.model_error(
-        f"AI generation failed after {max_retries} attempts: {str(last_exception)}"
-    ) from last_exception
+    # If we get here, all retries failed - use the last classified error type
+    error_message = f"Failed to generate commit message after {max_retries} attempts"
+    if last_error_type == "authentication":
+        raise AIError.authentication_error(error_message) from last_exception
+    elif last_error_type == "rate_limit":
+        raise AIError.rate_limit_error(error_message) from last_exception
+    elif last_error_type == "timeout":
+        raise AIError.timeout_error(error_message) from last_exception
+    elif last_error_type == "connection":
+        raise AIError.connection_error(error_message) from last_exception
+    elif last_error_type == "model":
+        raise AIError.model_error(error_message) from last_exception
+    else:
+        raise AIError.unknown_error(error_message) from last_exception

gac/errors.py

@@ -95,6 +95,11 @@ class AIError(GacError):
         """Create a model error."""
         return cls(message, error_type="model")
 
+    @classmethod
+    def unknown_error(cls, message: str) -> "AIError":
+        """Create an unknown error."""
+        return cls(message, error_type="unknown")
+
 
 class FormattingError(GacError):
     """Error related to code formatting."""

gac/providers/groq.py

@@ -34,16 +34,23 @@ def call_groq_api(model: str, messages: list[dict], temperature: float, max_toke
             choice = response_data["choices"][0]
             if "message" in choice and "content" in choice["message"]:
                 content = choice["message"]["content"]
-                logger.debug(f"Found content in message.content: {content}")
+                logger.debug(f"Found content in message.content: {repr(content)}")
+                if content is None:
+                    logger.warning("Groq API returned None content in message.content")
+                    return ""
                 return content
             elif "text" in choice:
                 content = choice["text"]
-                logger.debug(f"Found content in choice.text: {content}")
+                logger.debug(f"Found content in choice.text: {repr(content)}")
+                if content is None:
+                    logger.warning("Groq API returned None content in choice.text")
+                    return ""
                 return content
             else:
-                logger.debug(f"Choice structure: {choice}")
+                logger.warning(f"Unexpected choice structure: {choice}")
 
         # If we can't find content in the expected places, raise an error
+        logger.error(f"Unexpected response format from Groq API: {response_data}")
         raise AIError.model_error(f"Unexpected response format from Groq API: {response_data}")
     except httpx.HTTPStatusError as e:
         raise AIError.model_error(f"Groq API error: {e.response.status_code} - {e.response.text}") from e

gac/providers/openrouter.py

@@ -19,15 +19,6 @@ def call_openrouter_api(model: str, messages: list[dict], temperature: float, ma
         "Authorization": f"Bearer {api_key}",
     }
 
-    # Add optional headers if environment variables are set
-    site_url = os.getenv("OPENROUTER_SITE_URL")
-    if site_url:
-        headers["HTTP-Referer"] = site_url
-
-    site_name = os.getenv("OPENROUTER_SITE_NAME")
-    if site_name:
-        headers["X-Title"] = site_name
-
     data = {
         "model": model,
         "messages": messages,

{gac-1.2.0.dist-info → gac-1.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 1.2.0
+Version: 1.2.2
 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
@@ -139,8 +139,6 @@ ANTHROPIC_API_KEY=your_anthropic_key_here
 # Optional: configure OpenRouter
 # GAC_MODEL=openrouter:openrouter/auto
 # OPENROUTER_API_KEY=your_openrouter_key_here
-# OPENROUTER_SITE_URL=https://example.com
-# OPENROUTER_SITE_NAME=Example App
 ```
 
 Alternatively, you can configure `gac` using environment variables or by manually creating/editing the configuration file.

{gac-1.2.0.dist-info → gac-1.2.2.dist-info}/RECORD

@@ -1,13 +1,13 @@
 gac/__init__.py,sha256=HFWgSVNbTAFhgetCRWI1WrtyE7zC7IHvoBOrfDGUurM,989
-gac/__version__.py,sha256=_cfu33DyI3jZln3bUKxhnDn1AeCj66_yLEqy9IJASqs,66
-gac/ai.py,sha256=RcZKXiyx9Wll2e-dRx0jNzQPzojVYE7OaSEDclE2MKc,2979
-gac/ai_utils.py,sha256=p63lxYp4AqzBgbYkYyNUKLecIszTVvBp4Wkm2hKlMlc,7854
+gac/__version__.py,sha256=iNS1DVqJb74bO6_PxrsUIrOdhcYnsH1F80ZnErn3N7A,66
+gac/ai.py,sha256=iW7DqVoWGaHJeUWhkcYgFxJZHEkvNMcKgnEFQiBT_Dg,3090
+gac/ai_utils.py,sha256=4qr1Jpm89ND5avqWQoQIjyc-zS-CPLoODjlhI44l8M8,7079
 gac/cli.py,sha256=eQS8S7v6p0CfN9wtr239ujYGTi9rKl-KV7STX2U-C3w,4581
 gac/config.py,sha256=wSgEDjtis7Vk1pv5VPvYmJyD9-tymDS6GiUHjnCMbIM,1486
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
 gac/constants.py,sha256=MAxdASGncfZY1TdKGdhJZ0wvTBEU3gTN6KEdw8n3Bd8,4844
 gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
-gac/errors.py,sha256=3vIRMQ2QF3sP9_rPfXAFuu5ZSjIVX4FxM-FAuiR8N-8,7416
+gac/errors.py,sha256=kwKxBhBpdgESRftUdN8RBiGDKE7E_H7nFN5-JVNyZE4,7578
 gac/git.py,sha256=MS2m4fv8h4mau1djFG1aje9NXTmkGsjPO9w18LqNGX0,6031
 gac/init_cli.py,sha256=e4z9-4NhoUn2DUyApIru8JR-W7HuNq2VeeXkR9aXHLo,1868
 gac/main.py,sha256=POay7l6ihm3oF9ajGWx9cA40Pu-NVz5x_OzQOYPDoX8,12011
@@ -17,12 +17,12 @@ gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
 gac/providers/__init__.py,sha256=iGwZmV-cFqL3AeFE0vc6KpHwm-RLWcVSU17c7IvJg2s,456
 gac/providers/anthropic.py,sha256=esf6pq6nRdqD0mpKz_IQNXmXe5WnkoSA2b1isrrRB4o,1514
 gac/providers/cerebras.py,sha256=eE9lAjEzrATIo941vv97I2DSmpnXYBCJ9HkVIb-6Whg,1130
-gac/providers/groq.py,sha256=EPivjTg3TUqynBofnatlIxKzFTpLPP4psVb562Dsx5o,2040
+gac/providers/groq.py,sha256=Z-j-RKrRGV7evSWxTyKKnPff1Mn5YmYZxitqWVlwadE,2452
 gac/providers/ollama.py,sha256=Bp94DvortQssDhekuNdJ7fKLeWpWASYXSssJNCuGszg,1383
 gac/providers/openai.py,sha256=1l-Wu7ETXXaJ7cNB3OD5ivf4_72iIEP9bPFMQst8JWI,1109
-gac/providers/openrouter.py,sha256=Vs0MXfv9KCldfEUD2roTwcXqs89tgE3ndNqRKoqdJQs,1473
-gac-1.2.0.dist-info/METADATA,sha256=fbK0j24cpsMWVJXnybrXyQ6MzMS791bpdIKu2vvG7-c,8558
-gac-1.2.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-1.2.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-1.2.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
-gac-1.2.0.dist-info/RECORD,,
+gac/providers/openrouter.py,sha256=x9jGhvHHbApCT859bSAUZrkpgQKfQTHUIFSlWYPvlfE,1196
+gac-1.2.2.dist-info/METADATA,sha256=4vc5SEzjFTwQsR0NZjMzEHaoVGNWhShTkttWnrqsgTc,8481
+gac-1.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-1.2.2.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-1.2.2.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
+gac-1.2.2.dist-info/RECORD,,