git-commit-message 0.6.0__tar.gz → 0.7.0__tar.gz

{git_commit_message-0.6.0 → git_commit_message-0.7.0}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: git-commit-message
-Version: 0.6.0
-Summary: Generate Git commit messages from staged changes using OpenAI GPT
+Version: 0.7.0
+Summary: Generate Git commit messages from staged changes using LLM
 Maintainer-email: Mina Her <minacle@live.com>
 License: This is free and unencumbered software released into the public domain.
         
@@ -44,6 +44,7 @@ Classifier: Topic :: Software Development :: Version Control :: Git
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 Requires-Dist: babel>=2.17.0
+Requires-Dist: google-genai>=1.56.0
 Requires-Dist: openai>=2.6.1
 Requires-Dist: tiktoken>=0.12.0
 
@@ -83,6 +84,12 @@ Set your API key (POSIX sh):
 export OPENAI_API_KEY="sk-..."
 ```
 
+Or for the Google provider:
+
+```sh
+export GOOGLE_API_KEY="..."
+```
+
 Note (fish): In fish, set it as follows.
 
 ```fish
@@ -110,6 +117,18 @@ git-commit-message "optional extra context about the change"
 git-commit-message --one-line "optional context"
 ```
 
+- Select provider (default: openai):
+
+```sh
+git-commit-message --provider openai "optional context"
+```
+
+- Select provider (Google Gemini via google-genai):
+
+```sh
+git-commit-message --provider google "optional context"
+```
+
 - Limit subject length (default 72):
 
 ```sh
@@ -135,6 +154,12 @@ git-commit-message --chunk-tokens -1 "optional context"
 git-commit-message --commit --edit "refactor parser for speed"
 ```
 
+- Print debug info (prompt/response + token usage):
+
+```sh
+git-commit-message --debug "optional context"
+```
+
 - Select output language/locale (default: en-GB):
 
 ```sh
@@ -155,11 +180,18 @@ Notes:
 
 Environment:
 
-- `OPENAI_API_KEY`: required
-- `GIT_COMMIT_MESSAGE_MODEL` or `OPENAI_MODEL`: optional (default: `gpt-5-mini`)
+- `OPENAI_API_KEY`: required when provider is `openai`
+- `GOOGLE_API_KEY`: required when provider is `google`
+- `GIT_COMMIT_MESSAGE_PROVIDER`: optional (default: `openai`). `--provider` overrides this value.
+- `GIT_COMMIT_MESSAGE_MODEL`: optional model override (defaults: `openai` -> `gpt-5-mini`, `google` -> `gemini-2.5-flash`)
+- `OPENAI_MODEL`: optional OpenAI-only model override
 - `GIT_COMMIT_MESSAGE_LANGUAGE`: optional (default: `en-GB`)
 - `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: optional token budget per diff chunk (default: 0 = single chunk + summary; -1 disables summarisation)
 
+Notes:
+
+- If token counting fails for your provider while chunking, try `--chunk-tokens 0` (default) or `--chunk-tokens -1`.
+
 ## AI‑generated code notice
 
 Parts of this project were created with assistance from AI tools (e.g. large language models).

{git_commit_message-0.6.0 → git_commit_message-0.7.0}/README.md

@@ -34,6 +34,12 @@ Set your API key (POSIX sh):
 export OPENAI_API_KEY="sk-..."
 ```
 
+Or for the Google provider:
+
+```sh
+export GOOGLE_API_KEY="..."
+```
+
 Note (fish): In fish, set it as follows.
 
 ```fish
@@ -61,6 +67,18 @@ git-commit-message "optional extra context about the change"
 git-commit-message --one-line "optional context"
 ```
 
+- Select provider (default: openai):
+
+```sh
+git-commit-message --provider openai "optional context"
+```
+
+- Select provider (Google Gemini via google-genai):
+
+```sh
+git-commit-message --provider google "optional context"
+```
+
 - Limit subject length (default 72):
 
 ```sh
@@ -86,6 +104,12 @@ git-commit-message --chunk-tokens -1 "optional context"
 git-commit-message --commit --edit "refactor parser for speed"
 ```
 
+- Print debug info (prompt/response + token usage):
+
+```sh
+git-commit-message --debug "optional context"
+```
+
 - Select output language/locale (default: en-GB):
 
 ```sh
@@ -106,11 +130,18 @@ Notes:
 
 Environment:
 
-- `OPENAI_API_KEY`: required
-- `GIT_COMMIT_MESSAGE_MODEL` or `OPENAI_MODEL`: optional (default: `gpt-5-mini`)
+- `OPENAI_API_KEY`: required when provider is `openai`
+- `GOOGLE_API_KEY`: required when provider is `google`
+- `GIT_COMMIT_MESSAGE_PROVIDER`: optional (default: `openai`). `--provider` overrides this value.
+- `GIT_COMMIT_MESSAGE_MODEL`: optional model override (defaults: `openai` -> `gpt-5-mini`, `google` -> `gemini-2.5-flash`)
+- `OPENAI_MODEL`: optional OpenAI-only model override
 - `GIT_COMMIT_MESSAGE_LANGUAGE`: optional (default: `en-GB`)
 - `GIT_COMMIT_MESSAGE_CHUNK_TOKENS`: optional token budget per diff chunk (default: 0 = single chunk + summary; -1 disables summarisation)
 
+Notes:
+
+- If token counting fails for your provider while chunking, try `--chunk-tokens 0` (default) or `--chunk-tokens -1`.
+
 ## AI‑generated code notice
 
 Parts of this project were created with assistance from AI tools (e.g. large language models).

{git_commit_message-0.6.0 → git_commit_message-0.7.0}/pyproject.toml

@@ -1,11 +1,12 @@
 [project]
 name = "git-commit-message"
-version = "0.6.0"
-description = "Generate Git commit messages from staged changes using OpenAI GPT"
+version = "0.7.0"
+description = "Generate Git commit messages from staged changes using LLM"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
 	"babel>=2.17.0",
+	"google-genai>=1.56.0",
 	"openai>=2.6.1",
 	"tiktoken>=0.12.0",
 ]

{git_commit_message-0.6.0 → git_commit_message-0.7.0}/src/git_commit_message/_cli.py

@@ -1,6 +1,6 @@
 """Command-line interface entry point.
 
-Collect staged changes from the repository and call an OpenAI GPT model
+Collect staged changes from the repository and call an LLM provider
 to generate a commit message, or create a commit straight away.
 """
 
@@ -19,10 +19,11 @@ from ._git import (
     get_staged_diff,
     has_staged_changes,
 )
-from ._gpt import (
+from ._llm import (
+    CommitMessageResult,
+    UnsupportedProviderError,
     generate_commit_message,
     generate_commit_message_with_info,
-    CommitMessageResult,
 )
 
 
@@ -50,7 +51,7 @@ def _build_parser() -> ArgumentParser:
     parser: ArgumentParser = ArgumentParser(
         prog="git-commit-message",
         description=(
-            "Generate a commit message with OpenAI GPT based on the staged changes."
+            "Generate a commit message based on the staged changes."
         ),
     )
 
@@ -72,11 +73,21 @@ def _build_parser() -> ArgumentParser:
         help="Open an editor to amend the message before committing. Use with '--commit'.",
     )
 
+    parser.add_argument(
+        "--provider",
+        default=None,
+        help=(
+            "LLM provider to use (default: openai). "
+            "You may also set GIT_COMMIT_MESSAGE_PROVIDER. "
+            "The CLI flag overrides the environment variable."
+        ),
+    )
+
     parser.add_argument(
         "--model",
         default=None,
         help=(
-            "OpenAI model name to use. If unspecified, uses the environment variables (GIT_COMMIT_MESSAGE_MODEL, OPENAI_MODEL) or 'gpt-5-mini'."
+            "Model name to use. If unspecified, uses GIT_COMMIT_MESSAGE_MODEL or a provider-specific default (openai: gpt-5-mini; google: gemini-2.5-flash)."
         ),
     )
 
@@ -170,6 +181,7 @@ def _run(
                 getattr(args, "max_length", None),
                 getattr(args, "language", None),
                 chunk_tokens,
+                getattr(args, "provider", None),
             )
             message = result.message
         else:
@@ -181,7 +193,11 @@ def _run(
                 getattr(args, "max_length", None),
                 getattr(args, "language", None),
                 chunk_tokens,
+                getattr(args, "provider", None),
             )
+    except UnsupportedProviderError as exc:
+        print(str(exc), file=stderr)
+        return 3
     except Exception as exc:  # noqa: BLE001 - to preserve standard output messaging
         print(f"Failed to generate commit message: {exc}", file=stderr)
         return 3
@@ -199,7 +215,8 @@ def _run(
     if not args.commit:
         if args.debug and result is not None:
             # Print debug information
-            print("==== OpenAI Usage ====")
+            print(f"==== {result.provider} Usage ====")
+            print(f"provider: {result.provider}")
             print(f"model: {result.model}")
             print(f"response_id: {getattr(result, 'response_id', '(n/a)')}")
             if result.total_tokens is not None:
@@ -220,7 +237,8 @@ def _run(
 
     if args.debug and result is not None:
         # Also print debug info before commit
-        print("==== OpenAI Usage ====")
+        print(f"==== {result.provider} Usage ====")
+        print(f"provider: {result.provider}")
         print(f"model: {result.model}")
         print(f"response_id: {getattr(result, 'response_id', '(n/a)')}")
         if result.total_tokens is not None:

git_commit_message-0.7.0/src/git_commit_message/_gemini.py

@@ -0,0 +1,122 @@
+"""Google (Gemini) provider implementation.
+
+This module contains only Google GenAI-specific API calls and token counting.
+Provider-agnostic orchestration/prompt logic lives in `_llm.py`.
+"""
+
+from __future__ import annotations
+
+from os import environ
+
+from google import genai
+from google.genai import types
+
+from ._llm import LLMTextResult, LLMUsage
+
+
+class GoogleGenAIProvider:
+    name = "google"
+
+    def __init__(
+        self,
+        /,
+        *,
+        api_key: str | None = None,
+    ) -> None:
+        key = api_key or environ.get("GOOGLE_API_KEY")
+        if not key:
+            raise RuntimeError("The GOOGLE_API_KEY environment variable is required.")
+        self._client = genai.Client(api_key=key)
+
+    def count_tokens(
+        self,
+        /,
+        *,
+        model: str,
+        text: str,
+    ) -> int:
+        try:
+            resp = self._client.models.count_tokens(
+                model=model,
+                contents=text,
+            )
+        except Exception as exc:
+            raise RuntimeError(
+                "Token counting failed for the Google provider. "
+                "Try `--chunk-tokens 0` (default) or `--chunk-tokens -1` to disable summarisation."
+            ) from exc
+
+        total = getattr(resp, "total_tokens", None)
+        if not isinstance(total, int):
+            raise RuntimeError(
+                "Token counting returned an unexpected response from the Google provider. "
+                "Try `--chunk-tokens 0` (default) or `--chunk-tokens -1` to disable summarisation."
+            )
+
+        return total
+
+    def generate_text(
+        self,
+        /,
+        *,
+        model: str,
+        instructions: str,
+        user_text: str,
+    ) -> LLMTextResult:
+        config = types.GenerateContentConfig(
+            system_instruction=instructions,
+        )
+
+        resp = self._client.models.generate_content(
+            model=model,
+            contents=user_text,
+            config=config,
+        )
+
+        text = self._extract_text(resp)
+        if not text:
+            raise RuntimeError("An empty response text was generated by the provider.")
+
+        usage = self._extract_usage(resp)
+
+        return LLMTextResult(
+            text=text,
+            response_id=getattr(resp, "response_id", None),
+            usage=usage,
+        )
+
+    @staticmethod
+    def _extract_text(
+        resp: types.GenerateContentResponse,
+        /,
+    ) -> str:
+        candidates = getattr(resp, "candidates", None)
+        if not candidates:
+            return ""
+
+        parts = getattr(candidates[0].content, "parts", None) if candidates[0].content else None
+        if not parts:
+            return ""
+
+        texts: list[str] = []
+        for part in parts:
+            t = getattr(part, "text", None)
+            if isinstance(t, str) and t.strip():
+                texts.append(t)
+
+        return "\n".join(texts).strip()
+
+    @staticmethod
+    def _extract_usage(
+        resp: types.GenerateContentResponse,
+        /,
+    ) -> LLMUsage | None:
+        metadata = getattr(resp, "usage_metadata", None)
+        if metadata is None:
+            return None
+
+        return LLMUsage(
+            prompt_tokens=getattr(metadata, "prompt_token_count", None),
+            completion_tokens=getattr(metadata, "candidates_token_count", None),
+            total_tokens=getattr(metadata, "total_token_count", None),
+        )

git_commit_message-0.7.0/src/git_commit_message/_gpt.py

@@ -0,0 +1,90 @@
+"""OpenAI provider implementation.
+
+This module contains only OpenAI-specific API calls and token counting.
+Provider-agnostic orchestration/prompt logic lives in `_llm.py`.
+"""
+
+from __future__ import annotations
+
+from openai import OpenAI
+from openai.types.responses import Response
+from os import environ
+from tiktoken import Encoding, encoding_for_model, get_encoding
+from ._llm import LLMTextResult, LLMUsage
+
+
+def _encoding_for_model(
+    model: str,
+    /,
+) -> Encoding:
+    try:
+        return encoding_for_model(model)
+    except Exception:
+        return get_encoding("cl100k_base")
+
+
+class OpenAIResponsesProvider:
+    name = "openai"
+
+    def __init__(
+        self,
+        /,
+        *,
+        api_key: str | None = None,
+    ) -> None:
+        key = api_key or environ.get("OPENAI_API_KEY")
+        if not key:
+            raise RuntimeError("The OPENAI_API_KEY environment variable is required.")
+        self._client = OpenAI(api_key=key)
+
+    def count_tokens(
+        self,
+        /,
+        *,
+        model: str,
+        text: str,
+    ) -> int:
+        encoding = _encoding_for_model(model)
+        return len(encoding.encode(text))
+
+    def generate_text(
+        self,
+        /,
+        *,
+        model: str,
+        instructions: str,
+        user_text: str,
+    ) -> LLMTextResult:
+        resp: Response = self._client.responses.create(
+            model=model,
+            instructions=instructions,
+            input=[
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "input_text",
+                            "text": user_text,
+                        }
+                    ],
+                }
+            ],
+        )
+
+        text: str = (resp.output_text or "").strip()
+        if not text:
+            raise RuntimeError("An empty response text was generated by the provider.")
+
+        usage: LLMUsage | None = None
+        if resp.usage is not None:
+            usage = LLMUsage(
+                prompt_tokens=resp.usage.input_tokens,
+                completion_tokens=resp.usage.output_tokens,
+                total_tokens=resp.usage.total_tokens,
+            )
+
+        return LLMTextResult(
+            text=text,
+            response_id=resp.id,
+            usage=usage,
+        )