gac 1.0.1__tar.gz → 1.2.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 1.0.1
+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
@@ -56,7 +56,7 @@ Description-Content-Type: text/markdown
 
 - **LLM-Powered Commit Messages:** Automatically generates clear, concise, and context-aware commit messages using large language models.
 - **Deep Contextual Analysis:** Understands your code by analyzing staged changes, repository structure, and recent commit history to provide highly relevant suggestions.
-- **Multi-Provider & Model Support:** Flexibly works with various leading AI providers (like Anthropic, Cerebras, Groq, OpenAI) and models, easily configured through an interactive setup or environment variables.
+- **Multi-Provider & Model Support:** Flexibly works with various leading AI providers (like Anthropic, Cerebras, Groq, OpenRouter, OpenAI) and models, easily configured through an interactive setup or environment variables.
 - **Seamless Git Workflow:** Integrates smoothly into your existing Git routine as a simple drop-in replacement for `git commit`.
 - **Extensive Customization:** Tailor commit messages to your needs with a rich set of flags, including one-liners (`-o`), AI hints (`-h`), scope inference (`-s`), and specific model selection (`-m`).
 - **Streamlined Workflow Commands:** Boost your productivity with convenient options to stage all changes (`-a`), auto-confirm commits (`-y`), and push to your remote repository (`-p`) in a single step.
@@ -136,6 +136,11 @@ Example `$HOME/.gac.env` output:
 ```env
 GAC_MODEL=anthropic:claude-3-5-haiku-latest
 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.0.1 → gac-1.2.0}/README.md

@@ -14,7 +14,7 @@
 
 - **LLM-Powered Commit Messages:** Automatically generates clear, concise, and context-aware commit messages using large language models.
 - **Deep Contextual Analysis:** Understands your code by analyzing staged changes, repository structure, and recent commit history to provide highly relevant suggestions.
-- **Multi-Provider & Model Support:** Flexibly works with various leading AI providers (like Anthropic, Cerebras, Groq, OpenAI) and models, easily configured through an interactive setup or environment variables.
+- **Multi-Provider & Model Support:** Flexibly works with various leading AI providers (like Anthropic, Cerebras, Groq, OpenRouter, OpenAI) and models, easily configured through an interactive setup or environment variables.
 - **Seamless Git Workflow:** Integrates smoothly into your existing Git routine as a simple drop-in replacement for `git commit`.
 - **Extensive Customization:** Tailor commit messages to your needs with a rich set of flags, including one-liners (`-o`), AI hints (`-h`), scope inference (`-s`), and specific model selection (`-m`).
 - **Streamlined Workflow Commands:** Boost your productivity with convenient options to stage all changes (`-a`), auto-confirm commits (`-y`), and push to your remote repository (`-p`) in a single step.
@@ -94,6 +94,11 @@ Example `$HOME/.gac.env` output:
 ```env
 GAC_MODEL=anthropic:claude-3-5-haiku-latest
 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.0.1 → gac-1.2.0}/src/gac/__init__.py

@@ -2,15 +2,14 @@
 
 from gac.__version__ import __version__
 from gac.ai import generate_commit_message
-from gac.ai_providers import (
-    anthropic_generate,
-    cerebras_generate,
-    groq_generate,
-    ollama_generate,
-    openai_generate,
-)
 from gac.git import get_staged_files, push_changes
 from gac.prompt import build_prompt, clean_commit_message
+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__",
@@ -24,4 +23,5 @@ __all__ = [
     "groq_generate",
     "ollama_generate",
     "openai_generate",
+    "openrouter_generate",
 ]

{gac-1.0.1 → gac-1.2.0}/src/gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "1.0.1"
+__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.2.0/src/gac/ai_utils.py

@@ -0,0 +1,229 @@
+"""Utilities for AI provider integration for gac.
+
+This module provides utility functions that support the AI provider implementations.
+"""
+
+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__)
+
+
+def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: str) -> int:
+    """Count tokens in content using the model's tokenizer."""
+    text = extract_text_content(content)
+    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))
+    except Exception as e:
+        logger.error(f"Error counting tokens: {e}")
+        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):
+        return content
+    elif isinstance(content, list):
+        return "\n".join(msg["content"] for msg in content if isinstance(msg, dict) and "content" in msg)
+    elif isinstance(content, dict) and "content" in content:
+        return content["content"]
+    return ""
+
+
+@lru_cache(maxsize=1)
+def get_encoding(model: str) -> tiktoken.Encoding:
+    """Get the appropriate encoding for a given model."""
+    model_name = model.split(":")[-1] if ":" in model else model
+    try:
+        return tiktoken.encoding_for_model(model_name)
+    except KeyError:
+        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
+
+
+def _classify_error(error_str: str) -> str:
+    """Classify error types based on error message content."""
+    error_str = error_str.lower()
+
+    if (
+        "api key" in error_str
+        or "unauthorized" in error_str
+        or "authentication" in error_str
+        or "invalid api key" in error_str
+    ):
+        return "authentication"
+    elif "timeout" in error_str or "timed out" in error_str or "request timeout" in error_str:
+        return "timeout"
+    elif "rate limit" in error_str or "too many requests" in error_str or "rate limit exceeded" in error_str:
+        return "rate_limit"
+    elif "connect" in error_str or "network" in error_str or "network connection failed" in error_str:
+        return "connection"
+    elif "model" in error_str or "not found" in error_str or "model not found" in error_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.0.1 → gac-1.2.0}/src/gac/init_cli.py

@@ -24,6 +24,7 @@ def init() -> None:
         ("Cerebras", "qwen-3-coder-480b"),
         ("Groq", "meta-llama/llama-4-maverick-17b-128e-instruct"),
         ("Ollama", "gemma3"),
+        ("OpenRouter", "openrouter/auto"),
         ("OpenAI", "gpt-4.1-mini"),
     ]
     provider_names = [p[0] for p in providers]

{gac-1.0.1 → gac-1.2.0}/src/gac/main.py

@@ -10,7 +10,8 @@ import click
 from rich.console import Console
 from rich.panel import Panel
 
-from gac.ai import count_tokens, generate_commit_message
+from gac.ai import generate_commit_message
+from gac.ai_utils import count_tokens
 from gac.config import load_config
 from gac.constants import EnvDefaults, Utility
 from gac.errors import AIError, GitError, handle_error

{gac-1.0.1 → gac-1.2.0}/src/gac/preprocess.py

@@ -10,7 +10,7 @@ import logging
 import os
 import re
 
-from gac.ai import count_tokens
+from gac.ai_utils import count_tokens
 from gac.constants import (
     CodePatternImportance,
     FilePatterns,

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.0.1/src/gac/ai.py

@@ -1,180 +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
-import os
-from functools import lru_cache
-from typing import Any
-
-import httpx
-import tiktoken
-
-from gac.ai_providers import (
-    anthropic_generate,
-    cerebras_generate,
-    groq_generate,
-    ollama_generate,
-    openai_generate,
-)
-from gac.constants import EnvDefaults, Utility
-from gac.errors import AIError
-
-logger = logging.getLogger(__name__)
-
-
-def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: str) -> int:
-    """Count tokens in content using the model's tokenizer."""
-    text = extract_text_content(content)
-    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))
-    except Exception as e:
-        logger.error(f"Error counting tokens: {e}")
-        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):
-        return content
-    elif isinstance(content, list):
-        return "\n".join(msg["content"] for msg in content if isinstance(msg, dict) and "content" in msg)
-    elif isinstance(content, dict) and "content" in content:
-        return content["content"]
-    return ""
-
-
-@lru_cache(maxsize=1)
-def get_encoding(model: str) -> tiktoken.Encoding:
-    """Get the appropriate encoding for a given model."""
-    model_name = model.split(":")[-1] if ":" in model else model
-    try:
-        return tiktoken.encoding_for_model(model_name)
-    except KeyError:
-        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
-
-
-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)
-    else:
-        raise AIError.model_error(f"Unsupported provider: {provider}")

gac-1.0.1/src/gac/ai_providers.py

@@ -1,404 +0,0 @@
-"""Direct HTTP API calls to AI providers using httpx.
-
-This module provides functions for making direct HTTP API calls to various AI providers.
-Each provider has its own function to generate commit messages using only httpx.
-"""
-
-import logging
-import os
-import time
-
-import httpx
-from halo import Halo
-
-from gac.constants import EnvDefaults
-from gac.errors import AIError
-
-logger = logging.getLogger(__name__)
-
-
-def _classify_error(error_str: str) -> str:
-    """Classify error types based on error message content."""
-    error_str = error_str.lower()
-
-    if (
-        "api key" in error_str
-        or "unauthorized" in error_str
-        or "authentication" in error_str
-        or "invalid api key" in error_str
-    ):
-        return "authentication"
-    elif "timeout" in error_str or "timed out" in error_str or "request timeout" in error_str:
-        return "timeout"
-    elif "rate limit" in error_str or "too many requests" in error_str or "rate limit exceeded" in error_str:
-        return "rate_limit"
-    elif "connect" in error_str or "network" in error_str or "network connection failed" in error_str:
-        return "connection"
-    elif "model" in error_str or "not found" in error_str or "model not found" in error_str:
-        return "model"
-    else:
-        return "unknown"
-
-
-def anthropic_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
-    """
-    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 cerebras_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 Cerebras API with retry logic.
-
-    Args:
-        model: The model name (e.g., 'llama3.1-8b', 'llama3.1-70b')
-        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
-    """
-    api_key = os.getenv("CEREBRAS_API_KEY")
-    if not api_key:
-        raise AIError.model_error("CEREBRAS_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": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}]
-    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",
-        "Authorization": f"Bearer {api_key}",
-    }
-
-    return _make_request_with_retry(
-        url="https://api.cerebras.ai/v1/chat/completions",
-        headers=headers,
-        payload=payload,
-        provider_name=f"Cerebras {model}",
-        max_retries=max_retries,
-        quiet=quiet,
-        response_parser=lambda r: r["choices"][0]["message"]["content"],
-    )
-
-
-def groq_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 Groq API with retry logic.
-
-    Args:
-        model: The model name (e.g., 'llama3-8b-8192', 'llama3-70b-8192')
-        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
-    """
-    api_key = os.getenv("GROQ_API_KEY")
-    if not api_key:
-        raise AIError.model_error("GROQ_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": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}]
-    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",
-        "Authorization": f"Bearer {api_key}",
-    }
-
-    return _make_request_with_retry(
-        url="https://api.groq.com/openai/v1/chat/completions",
-        headers=headers,
-        payload=payload,
-        provider_name=f"Groq {model}",
-        max_retries=max_retries,
-        quiet=quiet,
-        response_parser=lambda r: r["choices"][0]["message"]["content"],
-    )
-
-
-def ollama_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 Ollama API with retry logic.
-
-    Args:
-        model: The model name (e.g., 'llama3', 'mistral')
-        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 (note: Ollama uses 'num_predict')
-        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
-    """
-    # 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}]
-
-    payload = {
-        "model": model,
-        "messages": messages,
-        "stream": False,
-        "options": {
-            "temperature": temperature,
-            "num_predict": max_tokens,
-        },
-    }
-
-    headers = {
-        "Content-Type": "application/json",
-    }
-
-    # Ollama typically runs locally on port 11434
-    ollama_url = os.getenv("OLLAMA_URL", "http://localhost:11434")
-
-    return _make_request_with_retry(
-        url=f"{ollama_url}/api/chat",
-        headers=headers,
-        payload=payload,
-        provider_name=f"Ollama {model}",
-        max_retries=max_retries,
-        quiet=quiet,
-        response_parser=lambda r: r["message"]["content"],
-    )
-
-
-def openai_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 OpenAI API with retry logic.
-
-    Args:
-        model: The model name (e.g., 'gpt-4', 'gpt-3.5-turbo')
-        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
-    """
-    api_key = os.getenv("OPENAI_API_KEY")
-    if not api_key:
-        raise AIError.model_error("OPENAI_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": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}]
-    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",
-        "Authorization": f"Bearer {api_key}",
-    }
-
-    return _make_request_with_retry(
-        url="https://api.openai.com/v1/chat/completions",
-        headers=headers,
-        payload=payload,
-        provider_name=f"OpenAI {model}",
-        max_retries=max_retries,
-        quiet=quiet,
-        response_parser=lambda r: r["choices"][0]["message"]["content"],
-    )
-
-
-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
-    )