gac 1.13.0__py3-none-any.whl → 3.8.1__py3-none-any.whl

gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "1.13.0"
+__version__ = "3.8.1"

gac/ai.py

@@ -9,27 +9,7 @@ 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_chutes_api,
-    call_custom_anthropic_api,
-    call_custom_openai_api,
-    call_deepseek_api,
-    call_fireworks_api,
-    call_gemini_api,
-    call_groq_api,
-    call_lmstudio_api,
-    call_minimax_api,
-    call_ollama_api,
-    call_openai_api,
-    call_openrouter_api,
-    call_streamlake_api,
-    call_synthetic_api,
-    call_together_api,
-    call_zai_api,
-    call_zai_coding_api,
-)
+from gac.providers import PROVIDER_REGISTRY
 
 logger = logging.getLogger(__name__)
 
@@ -41,11 +21,14 @@ def generate_commit_message(
     max_tokens: int = EnvDefaults.MAX_OUTPUT_TOKENS,
     max_retries: int = EnvDefaults.MAX_RETRIES,
     quiet: bool = False,
+    is_group: bool = False,
+    skip_success_message: bool = False,
+    task_description: str = "commit message",
 ) -> 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')
+        model: The model to use in provider:model_name format (e.g., 'anthropic:claude-haiku-4-5')
         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
@@ -59,7 +42,7 @@ def generate_commit_message(
         AIError: If generation fails after max_retries attempts
 
     Example:
-        >>> model = "anthropic:claude-3-5-haiku-latest"
+        >>> model = "anthropic:claude-haiku-4-5"
         >>> 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'
@@ -81,39 +64,19 @@ def generate_commit_message(
             {"role": "user", "content": user_prompt},
         ]
 
-    # Provider functions mapping
-    provider_funcs = {
-        "anthropic": call_anthropic_api,
-        "cerebras": call_cerebras_api,
-        "chutes": call_chutes_api,
-        "custom-anthropic": call_custom_anthropic_api,
-        "custom-openai": call_custom_openai_api,
-        "deepseek": call_deepseek_api,
-        "fireworks": call_fireworks_api,
-        "gemini": call_gemini_api,
-        "groq": call_groq_api,
-        "lm-studio": call_lmstudio_api,
-        "minimax": call_minimax_api,
-        "ollama": call_ollama_api,
-        "openai": call_openai_api,
-        "openrouter": call_openrouter_api,
-        "streamlake": call_streamlake_api,
-        "synthetic": call_synthetic_api,
-        "together": call_together_api,
-        "zai": call_zai_api,
-        "zai-coding": call_zai_coding_api,
-    }
-
     # Generate the commit message using centralized retry logic
     try:
         return generate_with_retries(
-            provider_funcs=provider_funcs,
+            provider_funcs=PROVIDER_REGISTRY,
             model=model,
             messages=messages,
             temperature=temperature,
             max_tokens=max_tokens,
             max_retries=max_retries,
             quiet=quiet,
+            is_group=is_group,
+            skip_success_message=skip_success_message,
+            task_description=task_description,
         )
     except AIError:
         # Re-raise AIError exceptions as-is to preserve error classification
@@ -121,3 +84,26 @@ def generate_commit_message(
     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
+
+
+def generate_grouped_commits(
+    model: str,
+    prompt: list[dict[str, str]],
+    temperature: float,
+    max_tokens: int,
+    max_retries: int,
+    quiet: bool = False,
+    skip_success_message: bool = False,
+) -> str:
+    """Generate grouped commits JSON response."""
+    return generate_commit_message(
+        model=model,
+        prompt=prompt,
+        temperature=temperature,
+        max_tokens=max_tokens,
+        max_retries=max_retries,
+        quiet=quiet,
+        is_group=True,
+        skip_success_message=skip_success_message,
+        task_description="commit message",
+    )

gac/ai_utils.py

@@ -4,17 +4,28 @@ 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 tiktoken
-from halo import Halo
+from rich.console import Console
+from rich.status import Status
 
-from gac.constants import Utility
+from gac.constants import EnvDefaults, Utility
 from gac.errors import AIError
+from gac.providers import SUPPORTED_PROVIDERS
 
 logger = logging.getLogger(__name__)
+console = Console()
+
+
+@lru_cache(maxsize=1)
+def _should_skip_tiktoken_counting() -> bool:
+    """Return True when token counting should avoid tiktoken calls entirely."""
+    value = os.getenv("GAC_NO_TIKTOKEN", str(EnvDefaults.NO_TIKTOKEN))
+    return value.lower() in ("true", "1", "yes", "on")
 
 
 def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: str) -> int:
@@ -23,11 +34,15 @@ def count_tokens(content: str | list[dict[str, str]] | dict[str, Any], model: st
     if not text:
         return 0
 
+    if _should_skip_tiktoken_counting():
+        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}")
+        # Fallback to rough estimation (4 chars per token on average)
         return len(text) // 4
 
 
@@ -45,10 +60,18 @@ def extract_text_content(content: str | list[dict[str, str]] | dict[str, Any]) -
 @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
+    provider, model_name = model.split(":", 1) if ":" in model else (None, model)
+
+    if provider != "openai":
+        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
+
     try:
         return tiktoken.encoding_for_model(model_name)
     except KeyError:
+        # Fall back to default encoding if model not found
+        return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
+    except Exception:
+        # If there are any network/SSL issues, fall back to default encoding
         return tiktoken.get_encoding(Utility.DEFAULT_ENCODING)
 
 
@@ -83,6 +106,9 @@ def generate_with_retries(
     max_tokens: int,
     max_retries: int,
     quiet: bool = False,
+    is_group: bool = False,
+    skip_success_message: bool = False,
+    task_description: str = "commit message",
 ) -> str:
     """Generate content with retry logic using direct API calls."""
     # Parse model string to determine provider and actual model
@@ -92,38 +118,69 @@ def generate_with_retries(
     provider, model_name = model.split(":", 1)
 
     # Validate provider
-    supported_providers = [
-        "anthropic",
-        "cerebras",
-        "chutes",
-        "deepseek",
-        "fireworks",
-        "gemini",
-        "groq",
-        "lm-studio",
-        "minimax",
-        "ollama",
-        "openai",
-        "openrouter",
-        "streamlake",
-        "synthetic",
-        "together",
-        "zai",
-        "zai-coding",
-        "custom-anthropic",
-        "custom-openai",
-    ]
-    if provider not in supported_providers:
-        raise AIError.model_error(f"Unsupported provider: {provider}. Supported providers: {supported_providers}")
+    if provider not in SUPPORTED_PROVIDERS:
+        raise AIError.model_error(f"Unsupported provider: {provider}. Supported providers: {SUPPORTED_PROVIDERS}")
 
     if not messages:
         raise AIError.model_error("No messages provided for AI generation")
 
+    # Load Claude Code token from TokenStore if needed
+    if provider == "claude-code":
+        from gac.oauth import refresh_token_if_expired
+        from gac.oauth.token_store import TokenStore
+
+        # Check token expiry and refresh if needed
+        if not refresh_token_if_expired(quiet=True):
+            raise AIError.authentication_error(
+                "Claude Code token not found or expired. Please authenticate with 'gac auth claude-code login'."
+            )
+
+        # Load the (possibly refreshed) token
+        token_store = TokenStore()
+        token_data = token_store.get_token("claude-code")
+        if token_data and "access_token" in token_data:
+            os.environ["CLAUDE_CODE_ACCESS_TOKEN"] = token_data["access_token"]
+        else:
+            raise AIError.authentication_error(
+                "Claude Code token not found. Please authenticate with 'gac auth claude-code login'."
+            )
+
+    # Check Qwen OAuth token expiry and refresh if needed
+    if provider == "qwen":
+        from gac.oauth import QwenOAuthProvider, TokenStore
+
+        oauth_provider = QwenOAuthProvider(TokenStore())
+        token = oauth_provider.get_token()
+        if not token:
+            if not quiet:
+                console.print("[yellow]⚠ Qwen authentication not found or expired[/yellow]")
+                console.print("[cyan]🔐 Starting automatic authentication...[/cyan]")
+            try:
+                oauth_provider.initiate_auth(open_browser=True)
+                token = oauth_provider.get_token()
+                if not token:
+                    raise AIError.authentication_error(
+                        "Qwen authentication failed. Run 'gac auth qwen login' to authenticate manually."
+                    )
+                if not quiet:
+                    console.print("[green]✓ Authentication successful![/green]\n")
+            except AIError:
+                raise
+            except Exception as e:
+                raise AIError.authentication_error(
+                    f"Qwen authentication failed: {e}. Run 'gac auth qwen login' to authenticate manually."
+                ) from e
+
     # Set up spinner
+    if is_group:
+        message_type = f"grouped {task_description}s"
+    else:
+        message_type = task_description
+
     if quiet:
         spinner = None
     else:
-        spinner = Halo(text=f"Generating commit message with {provider} {model_name}...", spinner="dots")
+        spinner = Status(f"Generating {message_type} with {provider} {model_name}...")
         spinner.start()
 
     last_exception = None
@@ -131,9 +188,9 @@ def generate_with_retries(
 
     for attempt in range(max_retries):
         try:
-            if not quiet and attempt > 0:
+            if not quiet and not skip_success_message and attempt > 0:
                 if spinner:
-                    spinner.text = f"Retry {attempt + 1}/{max_retries} with {provider} {model_name}..."
+                    spinner.update(f"Retry {attempt + 1}/{max_retries} with {provider} {model_name}...")
                 logger.info(f"Retry attempt {attempt + 1}/{max_retries}")
 
             # Call the appropriate provider function
@@ -144,7 +201,11 @@ def generate_with_retries(
             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 skip_success_message:
+                    spinner.stop()  # Stop spinner without showing success/failure
+                else:
+                    spinner.stop()
+                    console.print(f"✓ Generated {message_type} with {provider} {model_name}")
 
             if content is not None and content.strip():
                 return content.strip()  # type: ignore[no-any-return]
@@ -159,8 +220,9 @@ def generate_with_retries(
 
             # For authentication and model errors, don't retry
             if error_type in ["authentication", "model"]:
-                if spinner:
-                    spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+                if spinner and not skip_success_message:
+                    spinner.stop()
+                    console.print(f"✗ Failed to generate {message_type} with {provider} {model_name}")
 
                 # Create the appropriate error type based on classification
                 if error_type == "authentication":
@@ -171,23 +233,33 @@ def generate_with_retries(
             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:
+                if not quiet and not skip_success_message:
+                    if attempt == 0:
+                        logger.warning(f"AI generation failed, retrying in {wait_time}s: {str(e)}")
+                    else:
+                        logger.warning(
+                            f"AI generation failed (attempt {attempt + 1}), retrying in {wait_time}s: {str(e)}"
+                        )
+
+                if spinner and not skip_success_message:
                     for i in range(wait_time, 0, -1):
-                        spinner.text = f"Retry {attempt + 1}/{max_retries} in {i}s..."
+                        spinner.update(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)}")
+                num_retries = max_retries
+                retry_word = "retry" if num_retries == 1 else "retries"
+                logger.error(f"AI generation failed after {num_retries} {retry_word}: {str(e)}")
 
-    if spinner:
-        spinner.fail(f"Failed to generate commit message with {provider} {model_name}")
+    if spinner and not skip_success_message:
+        spinner.stop()
+        console.print(f"✗ Failed to generate {message_type} with {provider} {model_name}")
 
     # If we get here, all retries failed - use the last classified error type
-    error_message = f"Failed to generate commit message after {max_retries} attempts"
+    num_retries = max_retries
+    retry_word = "retry" if num_retries == 1 else "retries"
+    error_message = f"Failed to generate {message_type} after {num_retries} {retry_word}"
     if last_error_type == "authentication":
         raise AIError.authentication_error(error_message) from last_exception
     elif last_error_type == "rate_limit":

gac/auth_cli.py

@@ -0,0 +1,214 @@
+"""CLI for OAuth authentication with various providers.
+
+Provides commands to authenticate and manage OAuth tokens for supported providers.
+"""
+
+import logging
+
+import click
+
+from gac.oauth import (
+    QwenOAuthProvider,
+    TokenStore,
+    authenticate_and_save,
+    remove_token,
+)
+from gac.utils import setup_logging
+
+logger = logging.getLogger(__name__)
+
+
+@click.group(invoke_without_command=True)
+@click.pass_context
+def auth(ctx: click.Context) -> None:
+    """Manage OAuth authentication for AI providers.
+
+    Supports authentication for:
+    - claude-code: Claude Code subscription OAuth
+    - qwen: Qwen AI OAuth (device flow)
+
+    Examples:
+        gac auth                        # Show authentication status
+        gac auth claude-code login      # Login to Claude Code
+        gac auth claude-code logout     # Logout from Claude Code
+        gac auth claude-code status     # Check Claude Code auth status
+        gac auth qwen login             # Login to Qwen
+        gac auth qwen logout            # Logout from Qwen
+        gac auth qwen status            # Check Qwen auth status
+    """
+    if ctx.invoked_subcommand is None:
+        _show_auth_status()
+
+
+def _show_auth_status() -> None:
+    """Show authentication status for all providers."""
+    click.echo("OAuth Authentication Status")
+    click.echo("-" * 40)
+
+    token_store = TokenStore()
+
+    claude_token = token_store.get_token("claude-code")
+    if claude_token:
+        click.echo("Claude Code: ✓ Authenticated")
+    else:
+        click.echo("Claude Code: ✗ Not authenticated")
+        click.echo("             Run 'gac auth claude-code login' to login")
+
+    qwen_token = token_store.get_token("qwen")
+    if qwen_token:
+        click.echo("Qwen:        ✓ Authenticated")
+    else:
+        click.echo("Qwen:        ✗ Not authenticated")
+        click.echo("             Run 'gac auth qwen login' to login")
+
+
+# Claude Code commands
+@auth.group("claude-code")
+def claude_code() -> None:
+    """Manage Claude Code OAuth authentication.
+
+    Use browser-based authentication to log in to Claude Code.
+    """
+    pass
+
+
+@claude_code.command("login")
+@click.option("--quiet", "-q", is_flag=True, help="Suppress non-error output")
+def claude_code_login(quiet: bool = False) -> None:
+    """Login to Claude Code using OAuth.
+
+    Opens a browser to authenticate with Claude Code. The token is stored
+    securely in ~/.gac/oauth/claude-code.json.
+    """
+    if not quiet:
+        setup_logging("INFO")
+
+    token_store = TokenStore()
+    existing_token = token_store.get_token("claude-code")
+    if existing_token:
+        if not quiet:
+            click.echo("✓ Already authenticated with Claude Code.")
+            if not click.confirm("Re-authenticate?"):
+                return
+
+    if not quiet:
+        click.echo("🔐 Starting Claude Code OAuth authentication...")
+        click.echo("   Your browser will open automatically")
+        click.echo("   (Waiting up to 3 minutes for callback)")
+        click.echo()
+
+    success = authenticate_and_save(quiet=quiet)
+
+    if success:
+        if not quiet:
+            click.echo()
+            click.echo("✅ Claude Code authentication completed successfully!")
+    else:
+        click.echo("❌ Claude Code authentication failed.")
+        click.echo("   Please try again or check your network connection.")
+        raise click.ClickException("Claude Code authentication failed")
+
+
+@claude_code.command("logout")
+@click.option("--quiet", "-q", is_flag=True, help="Suppress non-error output")
+def claude_code_logout(quiet: bool = False) -> None:
+    """Logout from Claude Code and remove stored tokens."""
+    token_store = TokenStore()
+    existing_token = token_store.get_token("claude-code")
+
+    if not existing_token:
+        if not quiet:
+            click.echo("Not currently authenticated with Claude Code.")
+        return
+
+    try:
+        remove_token()
+        if not quiet:
+            click.echo("✅ Successfully logged out from Claude Code.")
+    except Exception as e:
+        click.echo("❌ Failed to remove Claude Code token.")
+        raise click.ClickException("Claude Code logout failed") from e
+
+
+@claude_code.command("status")
+def claude_code_status() -> None:
+    """Check Claude Code authentication status."""
+    token_store = TokenStore()
+    token = token_store.get_token("claude-code")
+
+    if token:
+        click.echo("Claude Code Authentication Status: ✓ Authenticated")
+    else:
+        click.echo("Claude Code Authentication Status: ✗ Not authenticated")
+        click.echo("Run 'gac auth claude-code login' to authenticate.")
+
+
+# Qwen commands
+@auth.group()
+def qwen() -> None:
+    """Manage Qwen OAuth authentication.
+
+    Use device flow authentication to log in to Qwen AI.
+    """
+    pass
+
+
+@qwen.command("login")
+@click.option("--no-browser", is_flag=True, help="Don't automatically open browser")
+@click.option("--quiet", "-q", is_flag=True, help="Suppress non-error output")
+def qwen_login(no_browser: bool = False, quiet: bool = False) -> None:
+    """Login to Qwen using OAuth device flow.
+
+    Opens a browser to authenticate with Qwen. The token is stored
+    securely in ~/.gac/oauth/qwen.json.
+    """
+    if not quiet:
+        setup_logging("INFO")
+
+    provider = QwenOAuthProvider()
+
+    if provider.is_authenticated():
+        if not quiet:
+            click.echo("✓ Already authenticated with Qwen.")
+            if not click.confirm("Re-authenticate?"):
+                return
+
+    try:
+        provider.initiate_auth(open_browser=not no_browser)
+        if not quiet:
+            click.echo()
+            click.echo("✅ Qwen authentication completed successfully!")
+    except Exception as e:
+        click.echo(f"❌ Qwen authentication failed: {e}")
+        raise click.ClickException("Qwen authentication failed") from None
+
+
+@qwen.command("logout")
+@click.option("--quiet", "-q", is_flag=True, help="Suppress non-error output")
+def qwen_logout(quiet: bool = False) -> None:
+    """Logout from Qwen and remove stored tokens."""
+    provider = QwenOAuthProvider()
+
+    if not provider.is_authenticated():
+        if not quiet:
+            click.echo("Not currently authenticated with Qwen.")
+        return
+
+    provider.logout()
+    if not quiet:
+        click.echo("✅ Successfully logged out from Qwen.")
+
+
+@qwen.command("status")
+def qwen_status() -> None:
+    """Check Qwen authentication status."""
+    provider = QwenOAuthProvider()
+    token = provider.get_token()
+
+    if token:
+        click.echo("Qwen Authentication Status: ✓ Authenticated")
+        if token.get("resource_url"):
+            click.echo(f"API Endpoint: {token['resource_url']}")
+    else:
+        click.echo("Qwen Authentication Status: ✗ Not authenticated")
+        click.echo("Run 'gac auth qwen login' to authenticate.")