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

gac/providers/groq.py

@@ -0,0 +1,134 @@
+"""Groq 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 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 _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/providers/ollama.py

@@ -0,0 +1,135 @@
+"""Ollama 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 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 _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/providers/openai.py

@@ -0,0 +1,134 @@
+"""OpenAI 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 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
+    )

gac/providers/openrouter.py

@@ -0,0 +1,125 @@
+"""OpenRouter 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 OpenRouter API with retry logic."""
+    api_key = os.getenv("OPENROUTER_API_KEY")
+    if not api_key:
+        raise AIError.model_error("OPENROUTER_API_KEY environment variable not set")
+
+    if isinstance(prompt, tuple):
+        system_prompt, user_prompt = prompt
+        messages = [{"role": "system", "content": system_prompt}, {"role": "user", "content": user_prompt}]
+    else:
+        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}",
+    }
+
+    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
+
+    return _make_request_with_retry(
+        url="https://openrouter.ai/api/v1/chat/completions",
+        headers=headers,
+        payload=payload,
+        provider_name=f"OpenRouter {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
+    )

{gac-1.0.1.dist-info → gac-1.1.0.dist-info}/METADATA

@@ -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.1.0.dist-info/RECORD

@@ -0,0 +1,28 @@
+gac/__init__.py,sha256=-knZC1oRylbJUv5uGk3fP_dHaaLHG76duAEWxLUi1eg,940
+gac/__version__.py,sha256=JSz2jRyqqtKTmDkhJ8NI5pr2e0rhFqSSkokXslLdc2M,66
+gac/ai.py,sha256=-Wd9cr5yK-UvR14AHvBeHrpa28KXu0bYZjJS02U-q90,3419
+gac/ai_utils.py,sha256=DFiM0Wzp-kremo33_i5SEYpms7tE13ipKLCCr_-AZPU,4327
+gac/cli.py,sha256=eQS8S7v6p0CfN9wtr239ujYGTi9rKl-KV7STX2U-C3w,4581
+gac/config.py,sha256=wSgEDjtis7Vk1pv5VPvYmJyD9-tymDS6GiUHjnCMbIM,1486
+gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
+gac/constants.py,sha256=MAxdASGncfZY1TdKGdhJZ0wvTBEU3gTN6KEdw8n3Bd8,4844
+gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
+gac/errors.py,sha256=3vIRMQ2QF3sP9_rPfXAFuu5ZSjIVX4FxM-FAuiR8N-8,7416
+gac/git.py,sha256=MS2m4fv8h4mau1djFG1aje9NXTmkGsjPO9w18LqNGX0,6031
+gac/init_cli.py,sha256=e4z9-4NhoUn2DUyApIru8JR-W7HuNq2VeeXkR9aXHLo,1868
+gac/main.py,sha256=POay7l6ihm3oF9ajGWx9cA40Pu-NVz5x_OzQOYPDoX8,12011
+gac/preprocess.py,sha256=krrLPHsccYMdn_YAtUrppBJIoRgevxGWusDwhE40LEo,15366
+gac/prompt.py,sha256=_fv24XU3DZE_S72vcdUYnNkmy-_KXnr1Vlc-9okop7E,17263
+gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
+gac/providers/__init__.py,sha256=_JawPCV_ZCtI18bBqVCbQkkbLetSQqOBcj2b19KRuX0,38
+gac/providers/anthropic.py,sha256=v0JApD6dNfIbxBoFbpf4GBWc4PsVPgcEcw1GDEWhoeM,4382
+gac/providers/cerebras.py,sha256=rWtndVj9q1w-EIfLyP4NJ10GFPnlfiu43ZminTdWP1s,4166
+gac/providers/groq.py,sha256=K7hrHaYfGn25hnDedR6FBEOqb0r0Y65zQRYso5w3xGE,4156
+gac/providers/ollama.py,sha256=qzX4qMsQeZUh8oPOWFIszhsvgioSnoLi82wO8G13pOI,4139
+gac/providers/openai.py,sha256=VKH7SQE6O4UB1c15KXIBL5UP1Fj3Ed4XQDrqENEPmBo,4150
+gac/providers/openrouter.py,sha256=vU4zIwtnyz9hjWokJwORwX3bZjYtF2MWqz8xxE-srsA,3753
+gac-1.1.0.dist-info/METADATA,sha256=VImMQAbgQT23S1czOiINsmy4tnloF8MRcb9_TSvasrI,8558
+gac-1.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-1.1.0.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-1.1.0.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
+gac-1.1.0.dist-info/RECORD,,