gac 1.3.1__py3-none-any.whl → 1.4.1__py3-none-any.whl

gac/__version__.py

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

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/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/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/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/providers/zai.py

@@ -7,21 +7,15 @@ 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."""
+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")
 
-    # 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:
@@ -35,15 +29,27 @@ def call_zai_api(model: str, messages: list[dict], temperature: float, max_token
             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")
+                    raise AIError.model_error(f"{api_name} API returned null content")
                 if content == "":
-                    raise AIError.model_error("Z.AI API returned empty content")
+                    raise AIError.model_error(f"{api_name} API returned empty content")
                 return content
             else:
-                raise AIError.model_error(f"Z.AI API response missing content: {response_data}")
+                raise AIError.model_error(f"{api_name} API response missing content: {response_data}")
         else:
-            raise AIError.model_error(f"Z.AI API unexpected response structure: {response_data}")
+            raise AIError.model_error(f"{api_name} 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
+        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 Z.AI API: {str(e)}") from 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.dist-info → gac-1.4.1.dist-info}/METADATA

@@ -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.dist-info → gac-1.4.1.dist-info}/RECORD

@@ -1,7 +1,7 @@
 gac/__init__.py,sha256=HFWgSVNbTAFhgetCRWI1WrtyE7zC7IHvoBOrfDGUurM,989
-gac/__version__.py,sha256=HMucRcR7kcQZhE3vpMtxU0oneMqSyfDgbqk6dbmh7KA,66
-gac/ai.py,sha256=DRQ59U3-nf94qNCSqmOabRHEFaeV8gUU-4u_6iUyApo,3137
-gac/ai_utils.py,sha256=4h5KHZxUNGhKAi0OZoRd8JiCoA9oyFobWarsQrbJstw,7086
+gac/__version__.py,sha256=ECklih1md5aHpXO55UJLzW7uO_jRivVyKU-saBV1Dis,66
+gac/ai.py,sha256=RwA_4SuhUdl_ct1eZ-iiAY9UFWlncQ_OLGn3KC_CJbY,3205
+gac/ai_utils.py,sha256=JXfAuDiIL9VBgAAoKFC_QGvD-mtLSybOlWDHMdKTGPo,7100
 gac/cli.py,sha256=nvz6l-wctfo3SMpC-zqtXyHMg8rtdzxw9cllbVMXJ0w,4872
 gac/config.py,sha256=N62phuLUyVj54eLDiDL6VN8-2_Zt6yB5zsnimFavU3I,1630
 gac/config_cli.py,sha256=v9nFHZO1RvK9fzHyuUS6SG-BCLHMsdOMDwWamBhVVh4,1608
@@ -9,22 +9,22 @@ gac/constants.py,sha256=hGzmLGhVDB2KPIqwtl6tHMNuSwHj-2P1RK0cGm4pyNA,4962
 gac/diff_cli.py,sha256=wnVQ9OFGnM0d2Pj9WVjWbo0jxqIuRHVAwmb8wU9Pa3E,5676
 gac/errors.py,sha256=ysDIVRCd0YQVTOW3Q6YzdolxCdtkoQCAFf3_jrqbjUY,7916
 gac/git.py,sha256=MS2m4fv8h4mau1djFG1aje9NXTmkGsjPO9w18LqNGX0,6031
-gac/init_cli.py,sha256=geuiAmfy8Pblyugt_nmb8lVJKtvGRTaoAfyMlcGz10E,2335
+gac/init_cli.py,sha256=HAeoy7efjk3_imk7yIE2e1LunmnO-f8LvLEtv6rYuuI,2109
 gac/main.py,sha256=igiUnkdDG5akjcPHa2iCfqstziYifGmyGegP2k6g_c4,15273
 gac/preprocess.py,sha256=krrLPHsccYMdn_YAtUrppBJIoRgevxGWusDwhE40LEo,15366
 gac/prompt.py,sha256=_fv24XU3DZE_S72vcdUYnNkmy-_KXnr1Vlc-9okop7E,17263
 gac/security.py,sha256=M1MZm6BLOeKl6rH_-UdXsSKol39FnA5fIP3YP394yZE,9898
 gac/utils.py,sha256=W3ladtmsH01MNLdckQYTzYrYbTGEdzCKI36he9C-y_E,3945
-gac/providers/__init__.py,sha256=FUtpU9oSxwv8-GQ7WBFHzV_cQMh3HjZ1vQfOPsZcRPs,506
+gac/providers/__init__.py,sha256=pUKmPm8WMBbCRmOkhNbhIbS8fPL4ONvWmoKV35CflTc,554
 gac/providers/anthropic.py,sha256=esf6pq6nRdqD0mpKz_IQNXmXe5WnkoSA2b1isrrRB4o,1514
 gac/providers/cerebras.py,sha256=eE9lAjEzrATIo941vv97I2DSmpnXYBCJ9HkVIb-6Whg,1130
 gac/providers/groq.py,sha256=ILe1Qo8tK0mZ_b-fCPq25j76HfI9KcPnUi2Dginw0Ys,2529
 gac/providers/ollama.py,sha256=Bp94DvortQssDhekuNdJ7fKLeWpWASYXSssJNCuGszg,1383
 gac/providers/openai.py,sha256=RohHaQqttx0BTVzoJrmEA4eajxnFLN7zyfcFBE0aRyQ,1120
 gac/providers/openrouter.py,sha256=3PosNyAWgjsrSHiIOZ5PUp3KZbiK7NrGhw5SfPlQK6M,1828
-gac/providers/zai.py,sha256=iUDwO24Ydg_50KC9wgs1Y_Func8PEjDPpRhbOofAwNk,2092
-gac-1.3.1.dist-info/METADATA,sha256=0d2gi23LCCXkMTLa6RH0M5oitCpt6fWap9srMZhGWiU,9523
-gac-1.3.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-gac-1.3.1.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
-gac-1.3.1.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
-gac-1.3.1.dist-info/RECORD,,
+gac/providers/zai.py,sha256=J9SogoU-K-Gl3jgyWWJtVqqoUDXMUNodolf7Qrx3CBY,2450
+gac-1.4.1.dist-info/METADATA,sha256=arS9XXGgS-yb9IjICH4biN4iLy2t3AuOnzCXNITgRqw,9523
+gac-1.4.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+gac-1.4.1.dist-info/entry_points.txt,sha256=tdjN-XMmcWfL92swuRAjT62bFLOAwk9bTMRLGP5Z4aI,36
+gac-1.4.1.dist-info/licenses/LICENSE,sha256=vOab37NouL1PNs5BswnPayrMCqaN2sqLfMQfqPDrpZg,1103
+gac-1.4.1.dist-info/RECORD,,