gac 1.0.1__tar.gz → 1.1.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 1.0.1
+Version: 1.1.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.1.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.1.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 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
 
 __all__ = [
     "__version__",
@@ -24,4 +23,5 @@ __all__ = [
     "groq_generate",
     "ollama_generate",
     "openai_generate",
+    "openrouter_generate",
 ]

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

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

gac-1.1.0/src/gac/ai.py

@@ -0,0 +1,80 @@
+"""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.0.1/src/gac/ai.py → gac-1.1.0/src/gac/ai_utils.py

@@ -1,7 +1,6 @@
-"""AI provider integration for gac.
+"""Utilities for 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.
+This module provides utility functions that support the AI provider implementations.
 """
 
 import logging
@@ -12,15 +11,7 @@ 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
+from gac.constants import Utility
 
 logger = logging.getLogger(__name__)
 
@@ -120,61 +111,24 @@ def get_encoding(model: str) -> tiktoken.Encoding:
         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)
+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:
-        raise AIError.model_error(f"Unsupported provider: {provider}")
+        return "unknown"

{gac-1.0.1 → gac-1.1.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.1.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.1.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.1.0/src/gac/providers/__init__.py

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

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

@@ -0,0 +1,141 @@
+"""Anthropic API provider for gac."""
+
+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
+    """
+    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
+    )

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

@@ -0,0 +1,134 @@
+"""Cerebras API provider for gac."""
+
+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 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 _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
+    )