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

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

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: git-commit-message
-Version: 0.5.1
-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,7 +44,9 @@ 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
 
 # git-commit-message
 
@@ -82,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
@@ -109,18 +117,49 @@ 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
 git-commit-message --one-line --max-length 50 "optional context"
 ```
 
+- Chunk long diffs by token budget (0 = single chunk + summary, -1 = disable chunking):
+
+```sh
+# force a single summary pass over the whole diff (default)
+git-commit-message --chunk-tokens 0 "optional context"
+
+# chunk the diff into ~4000-token pieces before summarising
+git-commit-message --chunk-tokens 4000 "optional context"
+
+# disable summarisation and use the legacy one-shot prompt
+git-commit-message --chunk-tokens -1 "optional context"
+```
+
 - Commit immediately with editor:
 
 ```sh
 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
@@ -141,9 +180,17 @@ 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
 

{git_commit_message-0.5.1 → 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,18 +67,49 @@ 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
 git-commit-message --one-line --max-length 50 "optional context"
 ```
 
+- Chunk long diffs by token budget (0 = single chunk + summary, -1 = disable chunking):
+
+```sh
+# force a single summary pass over the whole diff (default)
+git-commit-message --chunk-tokens 0 "optional context"
+
+# chunk the diff into ~4000-token pieces before summarising
+git-commit-message --chunk-tokens 4000 "optional context"
+
+# disable summarisation and use the legacy one-shot prompt
+git-commit-message --chunk-tokens -1 "optional context"
+```
+
 - Commit immediately with editor:
 
 ```sh
 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
@@ -93,9 +130,17 @@ 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
 

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

@@ -1,12 +1,14 @@
 [project]
 name = "git-commit-message"
-version = "0.5.1"
-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",
 ]
 maintainers = [{ name = "Mina Her", email = "minacle@live.com" }]
 license = { file = "UNLICENSE" }

{git_commit_message-0.5.1 → git_commit_message-0.7.0}/src/git_commit_message/__init__.py

@@ -5,6 +5,4 @@ This module exposes only public symbols in accordance with the codestyle guide.
 
 from ._cli import main
 
-__all__ = (
-    "main",
-)
+__all__ = ("main",)

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

@@ -1,24 +1,44 @@
-from __future__ import annotations
-
 """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.
 """
 
+from __future__ import annotations
+
 from argparse import ArgumentParser, Namespace
+from os import environ
 from pathlib import Path
-import sys
+from sys import exit as sys_exit
+from sys import stderr
 from typing import Final
 
-from ._git import commit_with_message, get_repo_root, get_staged_diff, has_staged_changes
-from ._gpt import (
+from ._git import (
+    commit_with_message,
+    get_repo_root,
+    get_staged_diff,
+    has_staged_changes,
+)
+from ._llm import (
+    CommitMessageResult,
+    UnsupportedProviderError,
     generate_commit_message,
     generate_commit_message_with_info,
-    CommitMessageResult,
 )
 
 
+def _env_chunk_tokens_default() -> int | None:
+    """Return chunk token default from env if valid, else None."""
+
+    raw: str | None = environ.get("GIT_COMMIT_MESSAGE_CHUNK_TOKENS")
+    if raw is None:
+        return None
+    try:
+        return int(raw)
+    except ValueError:
+        return None
+
+
 def _build_parser() -> ArgumentParser:
     """Create the CLI argument parser.
 
@@ -31,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."
         ),
     )
 
@@ -53,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)."
         ),
     )
 
@@ -92,12 +122,24 @@ def _build_parser() -> ArgumentParser:
         help="Maximum subject (first line) length (default: 72).",
     )
 
+    parser.add_argument(
+        "--chunk-tokens",
+        dest="chunk_tokens",
+        type=int,
+        default=None,
+        help=(
+            "Target token budget per diff chunk. "
+            "0 forces a single chunk with summarisation; -1 disables summarisation (legacy one-shot). "
+            "If omitted, uses GIT_COMMIT_MESSAGE_CHUNK_TOKENS when set (default: 0)."
+        ),
+    )
+
     return parser
 
 
 def _run(
-    *,
     args: Namespace,
+    /,
 ) -> int:
     """Main execution logic.
 
@@ -114,37 +156,50 @@ def _run(
 
     repo_root: Path = get_repo_root()
 
-    if not has_staged_changes(cwd=repo_root):
-        print("No staged changes. Run 'git add' and try again.", file=sys.stderr)
+    if not has_staged_changes(repo_root):
+        print("No staged changes. Run 'git add' and try again.", file=stderr)
         return 2
 
-    diff_text: str = get_staged_diff(cwd=repo_root)
+    diff_text: str = get_staged_diff(repo_root)
 
     hint: str | None = args.description if isinstance(args.description, str) else None
 
+    chunk_tokens: int | None = args.chunk_tokens
+    if chunk_tokens is None:
+        chunk_tokens = _env_chunk_tokens_default()
+    if chunk_tokens is None:
+        chunk_tokens = 0
+
     result: CommitMessageResult | None = None
     try:
         if args.debug:
             result = generate_commit_message_with_info(
-                diff=diff_text,
-                hint=hint,
-                model=args.model,
-                single_line=getattr(args, "one_line", False),
-                subject_max=getattr(args, "max_length", None),
-                language=getattr(args, "language", None),
+                diff_text,
+                hint,
+                args.model,
+                getattr(args, "one_line", False),
+                getattr(args, "max_length", None),
+                getattr(args, "language", None),
+                chunk_tokens,
+                getattr(args, "provider", None),
             )
             message = result.message
         else:
             message = generate_commit_message(
-                diff=diff_text,
-                hint=hint,
-                model=args.model,
-                single_line=getattr(args, "one_line", False),
-                subject_max=getattr(args, "max_length", None),
-                language=getattr(args, "language", None),
+                diff_text,
+                hint,
+                args.model,
+                getattr(args, "one_line", False),
+                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=sys.stderr)
+        print(f"Failed to generate commit message: {exc}", file=stderr)
         return 3
 
     # Option: force single-line message
@@ -160,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:
@@ -181,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:
@@ -198,9 +255,9 @@ def _run(
         print(message)
 
     if args.edit:
-        rc: int = commit_with_message(message=message, edit=True, cwd=repo_root)
+        rc: int = commit_with_message(message, True, repo_root)
     else:
-        rc = commit_with_message(message=message, edit=False, cwd=repo_root)
+        rc = commit_with_message(message, False, repo_root)
 
     return rc
 
@@ -215,8 +272,8 @@ def main() -> None:
     args: Namespace = parser.parse_args()
 
     if args.edit and not args.commit:
-        print("'--edit' must be used together with '--commit'.", file=sys.stderr)
-        sys.exit(2)
+        print("'--edit' must be used together with '--commit'.", file=stderr)
+        sys_exit(2)
 
-    code: int = _run(args=args)
-    sys.exit(code)
+    code: int = _run(args)
+    sys_exit(code)

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.5.1 → git_commit_message-0.7.0}/src/git_commit_message/_git.py

@@ -1,18 +1,18 @@
-from __future__ import annotations
-
 """Git-related helper functions.
 
 Provides repository root discovery, extraction of staged changes, and
 creating commits from a message.
 """
 
+from __future__ import annotations
+
 from pathlib import Path
-import subprocess
+from subprocess import CalledProcessError, check_call, check_output, run
 
 
 def get_repo_root(
-    *,
     cwd: Path | None = None,
+    /,
 ) -> Path:
     """Find the repository root from the current working directory.
 
@@ -29,7 +29,7 @@ def get_repo_root(
 
     start: Path = cwd or Path.cwd()
     try:
-        out: bytes = subprocess.check_output(
+        out: bytes = check_output(
             [
                 "git",
                 "rev-parse",
@@ -37,7 +37,7 @@ def get_repo_root(
             ],
             cwd=str(start),
         )
-    except subprocess.CalledProcessError as exc:  # noqa: TRY003
+    except CalledProcessError as exc:  # noqa: TRY003
         raise RuntimeError("Not a Git repository.") from exc
 
     root = Path(out.decode().strip())
@@ -45,28 +45,28 @@ def get_repo_root(
 
 
 def has_staged_changes(
-    *,
     cwd: Path,
+    /,
 ) -> bool:
     """Check whether there are staged changes."""
 
     try:
-        subprocess.check_call(
+        check_call(
             ["git", "diff", "--cached", "--quiet", "--exit-code"],
             cwd=str(cwd),
         )
         return False
-    except subprocess.CalledProcessError:
+    except CalledProcessError:
         return True
 
 
 def get_staged_diff(
-    *,
     cwd: Path,
+    /,
 ) -> str:
     """Return the staged changes as diff text."""
 
-    out: bytes = subprocess.check_output(
+    out: bytes = check_output(
         [
             "git",
             "diff",
@@ -81,10 +81,10 @@ def get_staged_diff(
 
 
 def commit_with_message(
-    *,
     message: str,
     edit: bool,
     cwd: Path,
+    /,
 ) -> int:
     """Create a commit with the given message.
 
@@ -108,7 +108,7 @@ def commit_with_message(
         cmd.append("--edit")
 
     try:
-        completed = subprocess.run(cmd, cwd=str(cwd), check=False)
+        completed = run(cmd, cwd=str(cwd), check=False)
         return int(completed.returncode)
     except OSError as exc:  # e.g., editor launch failure, etc.
         raise RuntimeError(f"Failed to run 'git commit': {exc}") from exc