gac 1.1.0__tar.gz → 1.2.0__tar.gz

{gac-1.1.0 → gac-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 1.1.0
+Version: 1.2.0
 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

{gac-1.1.0 → gac-1.2.0}/src/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-1.1.0 → gac-1.2.0}/src/gac/__version__.py

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

gac-1.2.0/src/gac/ai.py

@@ -0,0 +1,86 @@
+"""AI provider integration for gac.
+
+This module provides core functionality for AI provider interaction.
+It consolidates all AI-related functionality including token counting and commit message generation.
+"""
+
+import logging
+
+from gac.ai_utils import generate_with_retries
+from gac.constants import EnvDefaults
+from gac.errors import AIError
+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__)
+
+
+def generate_commit_message(
+    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 a commit message using direct API calls to AI providers.
+
+    Args:
+        model: The model to use in provider:model_name format (e.g., 'anthropic:claude-3-5-haiku-latest')
+        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
+        quiet: If True, suppress progress indicators
+
+    Returns:
+        A formatted commit message string
+
+    Raises:
+        AIError: If generation fails after max_retries attempts
+
+    Example:
+        >>> model = "anthropic:claude-3-5-haiku-latest"
+        >>> 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'
+    """
+    # 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
+
+    # 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,
+    }
+
+    # 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 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-1.1.0 → gac-1.2.0}/src/gac/ai_utils.py

@@ -5,13 +5,16 @@ 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__)
 
@@ -132,3 +135,95 @@ 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
+
+    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:
+                return content.strip()
+            else:
+                raise AIError.model_error("Empty response from AI model")
+
+        except Exception as e:
+            last_exception = e
+            error_type = _classify_error(str(e))
+
+            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
+
+            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
+    raise AIError.model_error(
+        f"AI generation failed after {max_retries} attempts: {str(last_exception)}"
+    ) from last_exception

gac-1.2.0/src/gac/providers/__init__.py

@@ -0,0 +1,17 @@
+"""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-1.2.0/src/gac/providers/anthropic.py

@@ -0,0 +1,42 @@
+"""Anthropic AI provider implementation."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+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 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

gac-1.2.0/src/gac/providers/cerebras.py

@@ -0,0 +1,29 @@
+"""Cerebras AI provider implementation."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def call_cerebras_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Cerebras API directly."""
+    api_key = os.getenv("CEREBRAS_API_KEY")
+    if not api_key:
+        raise AIError.model_error("CEREBRAS_API_KEY not found in environment variables")
+
+    url = "https://api.cerebras.ai/v1/chat/completions"
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+
+    data = {"model": model, "messages": messages, "temperature": temperature, "max_tokens": max_tokens}
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+        return response_data["choices"][0]["message"]["content"]
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"Cerebras API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling Cerebras API: {str(e)}") from e

gac-1.2.0/src/gac/providers/groq.py

@@ -0,0 +1,51 @@
+"""Groq API provider for gac."""
+
+import logging
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+logger = logging.getLogger(__name__)
+
+
+def call_groq_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Groq API directly."""
+    api_key = os.getenv("GROQ_API_KEY")
+    if not api_key:
+        raise AIError.model_error("GROQ_API_KEY not found in environment variables")
+
+    url = "https://api.groq.com/openai/v1/chat/completions"
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+
+    data = {"model": model, "messages": messages, "temperature": temperature, "max_tokens": max_tokens}
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+
+        # Debug logging to understand response structure
+        logger.debug(f"Groq API response: {response_data}")
+
+        # Handle different response formats
+        if "choices" in response_data and len(response_data["choices"]) > 0:
+            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}")
+                return content
+            elif "text" in choice:
+                content = choice["text"]
+                logger.debug(f"Found content in choice.text: {content}")
+                return content
+            else:
+                logger.debug(f"Choice structure: {choice}")
+
+        # If we can't find content in the expected places, raise an error
+        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
+    except Exception as e:
+        raise AIError.model_error(f"Error calling Groq API: {str(e)}") from e

gac-1.2.0/src/gac/providers/ollama.py

@@ -0,0 +1,35 @@
+"""Ollama AI provider implementation."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def call_ollama_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Ollama API directly."""
+    api_url = os.getenv("OLLAMA_API_URL", "http://localhost:11434")
+
+    url = f"{api_url.rstrip('/')}/api/chat"
+    data = {"model": model, "messages": messages, "temperature": temperature, "stream": False}
+
+    try:
+        response = httpx.post(url, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+
+        # Handle different response formats from Ollama
+        if "message" in response_data and "content" in response_data["message"]:
+            return response_data["message"]["content"]
+        elif "response" in response_data:
+            return response_data["response"]
+        else:
+            # Fallback: return the full response as string
+            return str(response_data)
+    except httpx.ConnectError as e:
+        raise AIError.connection_error(f"Ollama connection failed. Make sure Ollama is running: {str(e)}") from e
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"Ollama API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling Ollama API: {str(e)}") from e

gac-1.2.0/src/gac/providers/openai.py

@@ -0,0 +1,29 @@
+"""OpenAI API provider for gac."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def call_openai_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call OpenAI API directly."""
+    api_key = os.getenv("OPENAI_API_KEY")
+    if not api_key:
+        raise AIError.model_error("OPENAI_API_KEY not found in environment variables")
+
+    url = "https://api.openai.com/v1/chat/completions"
+    headers = {"Authorization": f"Bearer {api_key}", "Content-Type": "application/json"}
+
+    data = {"model": model, "messages": messages, "temperature": temperature, "max_tokens": max_tokens}
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+        return response_data["choices"][0]["message"]["content"]
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"OpenAI API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling OpenAI API: {str(e)}") from e

gac-1.2.0/src/gac/providers/openrouter.py

@@ -0,0 +1,46 @@
+"""OpenRouter API provider for gac."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def call_openrouter_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call OpenRouter API directly."""
+    api_key = os.getenv("OPENROUTER_API_KEY")
+    if not api_key:
+        raise AIError.model_error("OPENROUTER_API_KEY environment variable not set")
+
+    url = "https://openrouter.ai/api/v1/chat/completions"
+    headers = {
+        "Content-Type": "application/json",
+        "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,
+        "temperature": temperature,
+        "max_tokens": max_tokens,
+    }
+
+    try:
+        response = httpx.post(url, headers=headers, json=data, timeout=120)
+        response.raise_for_status()
+        response_data = response.json()
+        return response_data["choices"][0]["message"]["content"]
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"OpenRouter API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling OpenRouter API: {str(e)}") from e

gac-1.1.0/src/gac/ai.py

@@ -1,80 +0,0 @@
-"""AI provider integration for gac.
-
-This module provides core functionality for AI provider interaction.
-It consolidates all AI-related functionality including token counting and commit message generation.
-"""
-
-import logging
-
-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
-
-logger = logging.getLogger(__name__)
-
-
-def generate_commit_message(
-    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 a commit message using direct API calls to AI providers.
-
-    Args:
-        model: The model to use in provider:model_name format (e.g., 'anthropic:claude-3-5-haiku-latest')
-        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
-        quiet: If True, suppress progress indicators
-
-    Returns:
-        A formatted commit message string
-
-    Raises:
-        AIError: If generation fails after max_retries attempts
-
-    Example:
-        >>> model = "anthropic:claude-3-5-haiku-latest"
-        >>> 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:
-        _, _ = 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
-
-    # 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
-
-    # 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}")

gac-1.1.0/src/gac/providers/__init__.py

@@ -1 +0,0 @@
-"""AI providers submodule for gac."""