gac 1.3.1__tar.gz → 1.4.1__tar.gz

{gac-1.3.1 → gac-1.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gac
-Version: 1.3.1
+Version: 1.4.1
 Summary: AI-powered Git commit message generator with multi-provider support
 Project-URL: Homepage, https://github.com/cellwebb/gac
 Project-URL: Documentation, https://github.com/cellwebb/gac#readme

{gac-1.3.1 → gac-1.4.1}/src/gac/__version__.py

@@ -1,3 +1,3 @@
 """Version information for gac package."""
 
-__version__ = "1.3.1"
+__version__ = "1.4.1"

{gac-1.3.1 → gac-1.4.1}/src/gac/ai.py

@@ -17,6 +17,7 @@ from gac.providers import (
     call_openai_api,
     call_openrouter_api,
     call_zai_api,
+    call_zai_coding_api,
 )
 
 logger = logging.getLogger(__name__)
@@ -69,6 +70,7 @@ def generate_commit_message(
         "ollama": call_ollama_api,
         "openrouter": call_openrouter_api,
         "zai": call_zai_api,
+        "zai-coding": call_zai_coding_api,
     }
 
     # Generate the commit message using centralized retry logic

{gac-1.3.1 → gac-1.4.1}/src/gac/ai_utils.py

@@ -93,7 +93,7 @@ def generate_with_retries(
     provider, model_name = model.split(":", 1)
 
     # Validate provider
-    supported_providers = ["anthropic", "openai", "groq", "cerebras", "ollama", "openrouter", "zai"]
+    supported_providers = ["anthropic", "openai", "groq", "cerebras", "ollama", "openrouter", "zai", "zai-coding"]
     if provider not in supported_providers:
         raise AIError.model_error(f"Unsupported provider: {provider}. Supported providers: {supported_providers}")
 

{gac-1.3.1 → gac-1.4.1}/src/gac/init_cli.py

@@ -26,14 +26,15 @@ def init() -> None:
         ("Ollama", "gemma3"),
         ("OpenAI", "gpt-4.1-mini"),
         ("OpenRouter", "openrouter/auto"),
-        ("Z.AI", "glm-4.6"),
+        ("Z.AI", "glm-4.5-air"),
+        ("Z.AI Coding", "glm-4.6"),
     ]
     provider_names = [p[0] for p in providers]
     provider = questionary.select("Select your provider:", choices=provider_names).ask()
     if not provider:
         click.echo("Provider selection cancelled. Exiting.")
         return
-    provider_key = provider.lower().replace(".", "")
+    provider_key = provider.lower().replace(".", "").replace(" ", "-")
     model_suggestion = dict(providers)[provider]
     model = questionary.text(f"Enter the model (default: {model_suggestion}):", default=model_suggestion).ask()
     model_to_save = model.strip() if model.strip() else model_suggestion
@@ -42,17 +43,9 @@ def init() -> None:
 
     api_key = questionary.password("Enter your API key (input hidden, can be set later):").ask()
     if api_key:
-        set_key(str(GAC_ENV_PATH), f"{provider_key.upper()}_API_KEY", api_key)
-        click.echo(f"Set {provider_key.upper()}_API_KEY (hidden)")
-
-    # Ask about ZAI coding plan if Z.AI provider was selected
-    if provider_key == "zai":
-        use_coding_api = questionary.confirm(
-            "Are you using a Z.AI coding plan? (uses different API endpoint)",
-            default=False,
-        ).ask()
-        if use_coding_api:
-            set_key(str(GAC_ENV_PATH), "GAC_ZAI_USE_CODING_PLAN", "true")
-            click.echo("Set GAC_ZAI_USE_CODING_PLAN=true")
+        # Z.AI and Z.AI Coding both use the same API key
+        api_key_name = "ZAI_API_KEY" if provider_key in ["zai", "zai-coding"] else f"{provider_key.upper()}_API_KEY"
+        set_key(str(GAC_ENV_PATH), api_key_name, api_key)
+        click.echo(f"Set {api_key_name} (hidden)")
 
     click.echo(f"\ngac environment setup complete. You can edit {GAC_ENV_PATH} to update values later.")

{gac-1.3.1 → gac-1.4.1}/src/gac/providers/__init__.py

@@ -6,7 +6,7 @@ from .groq import call_groq_api
 from .ollama import call_ollama_api
 from .openai import call_openai_api
 from .openrouter import call_openrouter_api
-from .zai import call_zai_api
+from .zai import call_zai_api, call_zai_coding_api
 
 __all__ = [
     "call_anthropic_api",
@@ -16,4 +16,5 @@ __all__ = [
     "call_openai_api",
     "call_openrouter_api",
     "call_zai_api",
+    "call_zai_coding_api",
 ]

gac-1.4.1/src/gac/providers/zai.py

@@ -0,0 +1,55 @@
+"""Z.AI API provider for gac."""
+
+import os
+
+import httpx
+
+from gac.errors import AIError
+
+
+def _call_zai_api_impl(
+    url: str, api_name: str, model: str, messages: list[dict], temperature: float, max_tokens: int
+) -> str:
+    """Internal implementation for Z.AI API calls."""
+    api_key = os.getenv("ZAI_API_KEY")
+    if not api_key:
+        raise AIError.model_error("ZAI_API_KEY not found in environment variables")
+
+    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()
+
+        # Handle different possible response structures
+        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"]
+                if content is None:
+                    raise AIError.model_error(f"{api_name} API returned null content")
+                if content == "":
+                    raise AIError.model_error(f"{api_name} API returned empty content")
+                return content
+            else:
+                raise AIError.model_error(f"{api_name} API response missing content: {response_data}")
+        else:
+            raise AIError.model_error(f"{api_name} API unexpected response structure: {response_data}")
+    except httpx.HTTPStatusError as e:
+        raise AIError.model_error(f"{api_name} API error: {e.response.status_code} - {e.response.text}") from e
+    except Exception as e:
+        raise AIError.model_error(f"Error calling {api_name} API: {str(e)}") from e
+
+
+def call_zai_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Z.AI regular API directly."""
+    url = "https://api.z.ai/api/paas/v4/chat/completions"
+    return _call_zai_api_impl(url, "Z.AI", model, messages, temperature, max_tokens)
+
+
+def call_zai_coding_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
+    """Call Z.AI coding API directly."""
+    url = "https://api.z.ai/api/coding/paas/v4/chat/completions"
+    return _call_zai_api_impl(url, "Z.AI coding", model, messages, temperature, max_tokens)

gac-1.3.1/src/gac/providers/zai.py

@@ -1,49 +0,0 @@
-"""Z.AI API provider for gac."""
-
-import os
-
-import httpx
-
-from gac.errors import AIError
-
-
-def call_zai_api(model: str, messages: list[dict], temperature: float, max_tokens: int) -> str:
-    """Call Z.AI API directly."""
-    api_key = os.getenv("ZAI_API_KEY")
-    if not api_key:
-        raise AIError.model_error("ZAI_API_KEY not found in environment variables")
-
-    # Support both regular and coding API endpoints
-    use_coding_api = os.getenv("GAC_ZAI_USE_CODING_PLAN", "false").lower() in ("true", "1", "yes", "on")
-    if use_coding_api:
-        url = "https://api.z.ai/api/coding/paas/v4/chat/completions"
-    else:
-        url = "https://api.z.ai/api/paas/v4/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()
-
-        # Handle different possible response structures
-        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"]
-                if content is None:
-                    raise AIError.model_error("Z.AI API returned null content")
-                if content == "":
-                    raise AIError.model_error("Z.AI API returned empty content")
-                return content
-            else:
-                raise AIError.model_error(f"Z.AI API response missing content: {response_data}")
-        else:
-            raise AIError.model_error(f"Z.AI API unexpected response structure: {response_data}")
-    except httpx.HTTPStatusError as e:
-        raise AIError.model_error(f"Z.AI API error: {e.response.status_code} - {e.response.text}") from e
-    except Exception as e:
-        raise AIError.model_error(f"Error calling Z.AI API: {str(e)}") from e