gac 1.1.0__py3-none-any.whl → 1.2.1__py3-none-any.whl

gac/__init__.py

@@ -4,12 +4,12 @@ from gac.__version__ import __version__
 from gac.ai import generate_commit_message
 from gac.git import get_staged_files, push_changes
 from gac.prompt import build_prompt, clean_commit_message
-from gac.providers.anthropic import generate as anthropic_generate
-from gac.providers.cerebras import generate as cerebras_generate
-from gac.providers.groq import generate as groq_generate
-from gac.providers.ollama import generate as ollama_generate
-from gac.providers.openai import generate as openai_generate
-from gac.providers.openrouter import generate as openrouter_generate
+from gac.providers.anthropic import call_anthropic_api as anthropic_generate
+from gac.providers.cerebras import call_cerebras_api as cerebras_generate
+from gac.providers.groq import call_groq_api as groq_generate
+from gac.providers.ollama import call_ollama_api as ollama_generate
+from gac.providers.openai import call_openai_api as openai_generate
+from gac.providers.openrouter import call_openrouter_api as openrouter_generate
 
 __all__ = [
     "__version__",

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "1.1.0"
+__version__ = "1.2.1"

gac/ai.py

@@ -6,14 +6,17 @@ It consolidates all AI-related functionality including token counting and commit
 
 import logging
 
+from gac.ai_utils import generate_with_retries
 from gac.constants import EnvDefaults
 from gac.errors import AIError
-from gac.providers.anthropic import generate as anthropic_generate
-from gac.providers.cerebras import generate as cerebras_generate
-from gac.providers.groq import generate as groq_generate
-from gac.providers.ollama import generate as ollama_generate
-from gac.providers.openai import generate as openai_generate
-from gac.providers.openrouter import generate as openrouter_generate
+from gac.providers import (
+    call_anthropic_api,
+    call_cerebras_api,
+    call_groq_api,
+    call_ollama_api,
+    call_openai_api,
+    call_openrouter_api,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -48,33 +51,39 @@ def generate_commit_message(
         >>> generate_commit_message(model, (system_prompt, user_prompt))
         'docs: Update README with installation instructions'
     """
-    try:
-        _, _ = model.split(":", 1)
-    except ValueError as err:
-        raise AIError.model_error(
-            f"Invalid model format: {model}. Please use the format 'provider:model_name'."
-        ) from err
+    # Handle both old (string) and new (tuple) prompt formats
+    if isinstance(prompt, tuple):
+        system_prompt, user_prompt = prompt
+    else:
+        # Backward compatibility: treat string as user prompt with no system prompt
+        system_prompt = ""
+        user_prompt = prompt
 
-    # Parse the model string to extract provider and model name
-    try:
-        provider, model_name = model.split(":", 1)
-    except ValueError as err:
-        raise AIError.model_error(
-            f"Invalid model format: {model}. Please use the format 'provider:model_name'."
-        ) from err
+    # Provider functions mapping
+    provider_funcs = {
+        "anthropic": call_anthropic_api,
+        "openai": call_openai_api,
+        "groq": call_groq_api,
+        "cerebras": call_cerebras_api,
+        "ollama": call_ollama_api,
+        "openrouter": call_openrouter_api,
+    }
 
-    # Route to the appropriate provider function
-    if provider == "openai":
-        return openai_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    elif provider == "anthropic":
-        return anthropic_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    elif provider == "groq":
-        return groq_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    elif provider == "cerebras":
-        return cerebras_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    elif provider == "ollama":
-        return ollama_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    elif provider == "openrouter":
-        return openrouter_generate(model_name, prompt, temperature, max_tokens, max_retries, quiet)
-    else:
-        raise AIError.model_error(f"Unsupported provider: {provider}")
+    # Generate the commit message using centralized retry logic
+    try:
+        return generate_with_retries(
+            provider_funcs=provider_funcs,
+            model=model,
+            system_prompt=system_prompt,
+            user_prompt=user_prompt,
+            temperature=temperature,
+            max_tokens=max_tokens,
+            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,14 +4,15 @@ 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
 
 from gac.constants import Utility
+from gac.errors import AIError
 
 logger = logging.getLogger(__name__)
 
@@ -22,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))
@@ -36,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):
@@ -132,3 +73,113 @@ def _classify_error(error_str: str) -> str:
         return "model"
     else:
         return "unknown"
+
+
+def generate_with_retries(
+    provider_funcs: dict,
+    model: str,
+    system_prompt: str,
+    user_prompt: str,
+    temperature: float,
+    max_tokens: int,
+    max_retries: int,
+    quiet: bool = False,
+) -> str:
+    """Generate content with retry logic using direct API calls."""
+    # Parse model string to determine provider and actual model
+    if ":" not in model:
+        raise AIError.model_error(f"Invalid model format. Expected 'provider:model', got '{model}'")
+
+    provider, model_name = model.split(":", 1)
+
+    # Validate provider
+    supported_providers = ["anthropic", "openai", "groq", "cerebras", "ollama", "openrouter"]
+    if provider not in supported_providers:
+        raise AIError.model_error(f"Unsupported provider: {provider}. Supported providers: {supported_providers}")
+
+    messages = [
+        {"role": "system", "content": system_prompt},
+        {"role": "user", "content": user_prompt},
+    ]
+
+    # Set up spinner
+    if quiet:
+        spinner = None
+    else:
+        spinner = Halo(text=f"Generating commit message with {provider} {model_name}...", spinner="dots")
+        spinner.start()
+
+    last_exception = None
+    last_error_type = "unknown"
+
+    for attempt in range(max_retries):
+        try:
+            if not quiet and attempt > 0:
+                if spinner:
+                    spinner.text = f"Retry {attempt + 1}/{max_retries} with {provider} {model_name}..."
+                logger.info(f"Retry attempt {attempt + 1}/{max_retries}")
+
+            # Call the appropriate provider function
+            provider_func = provider_funcs.get(provider)
+            if not provider_func:
+                raise AIError.model_error(f"Provider function not found for: {provider}")
+
+            content = provider_func(model=model_name, messages=messages, temperature=temperature, max_tokens=max_tokens)
+
+            if spinner:
+                spinner.succeed(f"Generated commit message with {provider} {model_name}")
+
+            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"]:
+                if spinner:
+                    spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+
+                # 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
+                wait_time = 2**attempt
+                if not quiet:
+                    logger.warning(f"AI generation failed (attempt {attempt + 1}), retrying in {wait_time}s: {str(e)}")
+
+                if spinner:
+                    for i in range(wait_time, 0, -1):
+                        spinner.text = f"Retry {attempt + 1}/{max_retries} in {i}s..."
+                        time.sleep(1)
+                else:
+                    time.sleep(wait_time)
+            else:
+                logger.error(f"AI generation failed after {max_retries} attempts: {str(e)}")
+
+    if spinner:
+        spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+
+    # 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/__init__.py

@@ -1 +1,17 @@
-"""AI providers submodule for gac."""
+"""AI provider implementations for commit message generation."""
+
+from .anthropic import call_anthropic_api
+from .cerebras import call_cerebras_api
+from .groq import call_groq_api
+from .ollama import call_ollama_api
+from .openai import call_openai_api
+from .openrouter import call_openrouter_api
+
+__all__ = [
+    "call_anthropic_api",
+    "call_cerebras_api",
+    "call_groq_api",
+    "call_ollama_api",
+    "call_openai_api",
+    "call_openrouter_api",
+]

gac/providers/anthropic.py

@@ -1,141 +1,42 @@
-"""Anthropic API provider for gac."""
+"""Anthropic AI provider implementation."""
 
-import logging
 import os
-import time
 
 import httpx
-from halo import Halo
 
-from gac.ai_utils import _classify_error
-from gac.constants import EnvDefaults
 from gac.errors import AIError
 
-logger = logging.getLogger(__name__)
 
-
-def generate(
-    model: str,
-    prompt: str | tuple[str, str],
-    temperature: float = EnvDefaults.TEMPERATURE,
-    max_tokens: int = EnvDefaults.MAX_OUTPUT_TOKENS,
-    max_retries: int = EnvDefaults.MAX_RETRIES,
-    quiet: bool = False,
-) -> str:
-    """Generate commit message using Anthropic API with retry logic.
-
-    Args:
-        model: The model name (e.g., 'claude-3-5-haiku-latest', 'claude-3-opus-latest')
-        prompt: Either a string prompt or tuple of (system_prompt, user_prompt)
-        temperature: Controls randomness (0.0-1.0)
-        max_tokens: Maximum tokens in the response
-        max_retries: Number of retry attempts if generation fails
-        quiet: If True, suppress progress indicators
-
-    Returns:
-        A formatted commit message string
-
-    Raises:
-        AIError: If generation fails after max_retries attempts
-    """
+def call_anthropic_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Anthropic API directly."""
     api_key = os.getenv("ANTHROPIC_API_KEY")
     if not api_key:
-        raise AIError.model_error("ANTHROPIC_API_KEY environment variable not set")
-
-    # Handle both old (string) and new (tuple) prompt formats
-    if isinstance(prompt, tuple):
-        system_prompt, user_prompt = prompt
-        messages = [{"role": "user", "content": user_prompt}]
-        payload = {
-            "model": model,
-            "messages": messages,
-            "system": system_prompt,
-            "temperature": temperature,
-            "max_tokens": max_tokens,
-        }
-    else:
-        # Backward compatibility: treat string as user prompt
-        messages = [{"role": "user", "content": prompt}]
-        payload = {
-            "model": model,
-            "messages": messages,
-            "temperature": temperature,
-            "max_tokens": max_tokens,
-        }
-
-    headers = {
-        "Content-Type": "application/json",
-        "x-api-key": api_key,
-        "anthropic-version": "2023-06-01",
-    }
-
-    return _make_request_with_retry(
-        url="https://api.anthropic.com/v1/messages",
-        headers=headers,
-        payload=payload,
-        provider_name=f"Anthropic {model}",
-        max_retries=max_retries,
-        quiet=quiet,
-        response_parser=lambda r: r["content"][0]["text"],
-    )
-
-
-def _make_request_with_retry(
-    url: str,
-    headers: dict,
-    payload: dict,
-    provider_name: str,
-    max_retries: int,
-    quiet: bool,
-    response_parser: callable,
-) -> str:
-    """Make HTTP request with retry logic and common error handling."""
-    if quiet:
-        spinner = None
-    else:
-        spinner = Halo(text=f"Generating commit message with {provider_name}...", spinner="dots")
-        spinner.start()
-
-    last_error = None
-    retry_count = 0
-
-    while retry_count < max_retries:
-        try:
-            logger.debug(f"Trying with {provider_name} (attempt {retry_count + 1}/{max_retries})")
-
-            with httpx.Client(timeout=30.0) as client:
-                response = client.post(url, headers=headers, json=payload)
-                response.raise_for_status()
-
-                response_data = response.json()
-                message = response_parser(response_data)
-
-                if spinner:
-                    spinner.succeed(f"Generated commit message with {provider_name}")
-
-                return message
-
-        except Exception as e:
-            last_error = e
-            retry_count += 1
-
-            if retry_count == max_retries:
-                logger.warning(f"Error generating commit message: {e}. Giving up.")
-                break
-
-            wait_time = 2**retry_count
-            logger.warning(f"Error generating commit message: {e}. Retrying in {wait_time}s...")
-            if spinner:
-                for i in range(wait_time, 0, -1):
-                    spinner.text = f"Retry {retry_count}/{max_retries} in {i}s..."
-                    time.sleep(1)
-            else:
-                time.sleep(wait_time)
-
-    if spinner:
-        spinner.fail(f"Failed to generate commit message with {provider_name}")
-
-    error_type = _classify_error(str(last_error))
-    raise AIError(
-        f"Failed to generate commit message after {max_retries} attempts: {last_error}", error_type=error_type
-    )
+        raise AIError.model_error("ANTHROPIC_API_KEY not found in environment variables")
+
+    url = "https://api.anthropic.com/v1/messages"
+    headers = {"x-api-key": api_key, "anthropic-version": "2023-06-01", "content-type": "application/json"}
+
+    # Convert messages to Anthropic format
+    anthropic_messages = []
+    system_message = ""
+
+    for msg in messages:
+        if msg["role"] == "system":
+            system_message = msg["content"]
+        else:
+            anthropic_messages.append({"role": msg["role"], "content": msg["content"]})
+
+    data = {"model": model, "messages": anthropic_messages, "temperature": temperature, "max_tokens": max_tokens}
+
+    if system_message:
+        data["system"] = system_message
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+        return response_data["content"][0]["text"]
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"Anthropic API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling Anthropic API: {str(e)}") from e