git-commit-message 0.6.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

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,13 +19,46 @@ 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,
 )
 
 
+class CliArgs(Namespace):
+    __slots__ = (
+        "description",
+        "commit",
+        "edit",
+        "provider",
+        "model",
+        "language",
+        "debug",
+        "one_line",
+        "max_length",
+        "chunk_tokens",
+        "host",
+    )
+
+    def __init__(
+        self,
+        /,
+    ) -> None:
+        self.description: str | None = None
+        self.commit: bool = False
+        self.edit: bool = False
+        self.provider: str | None = None
+        self.model: str | None = None
+        self.language: str | None = None
+        self.debug: bool = False
+        self.one_line: bool = False
+        self.max_length: int | None = None
+        self.chunk_tokens: int | None = None
+        self.host: str | None = None
+
+
 def _env_chunk_tokens_default() -> int | None:
     """Return chunk token default from env if valid, else None."""
 
@@ -50,7 +83,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 +105,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; ollama: gpt-oss:20b)."
         ),
     )
 
@@ -123,11 +166,21 @@ def _build_parser() -> ArgumentParser:
         ),
     )
 
+    parser.add_argument(
+        "--host",
+        dest="host",
+        default=None,
+        help=(
+            "Host URL for API providers like Ollama (default: http://localhost:11434). "
+            "You may also set OLLAMA_HOST for Ollama."
+        ),
+    )
+
     return parser
 
 
 def _run(
-    args: Namespace,
+    args: CliArgs,
     /,
 ) -> int:
     """Main execution logic.
@@ -166,10 +219,12 @@ def _run(
                 diff_text,
                 hint,
                 args.model,
-                getattr(args, "one_line", False),
-                getattr(args, "max_length", None),
-                getattr(args, "language", None),
+                args.one_line,
+                args.max_length,
+                args.language,
                 chunk_tokens,
+                args.provider,
+                args.host,
             )
             message = result.message
         else:
@@ -177,17 +232,22 @@ def _run(
                 diff_text,
                 hint,
                 args.model,
-                getattr(args, "one_line", False),
-                getattr(args, "max_length", None),
-                getattr(args, "language", None),
+                args.one_line,
+                args.max_length,
+                args.language,
                 chunk_tokens,
+                args.provider,
+                args.host,
             )
+    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
 
     # Option: force single-line message
-    if getattr(args, "one_line", False):
+    if args.one_line:
         # Use the first non-empty line only
         for line in (ln.strip() for ln in message.splitlines()):
             if line:
@@ -199,9 +259,10 @@ 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)')}")
+            print(f"response_id: {result.response_id or '(n/a)'}")
             if result.total_tokens is not None:
                 print(
                     f"tokens: prompt={result.prompt_tokens} completion={result.completion_tokens} total={result.total_tokens}"
@@ -220,9 +281,10 @@ 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)')}")
+        print(f"response_id: {result.response_id or '(n/a)'}")
         if result.total_tokens is not None:
             print(
                 f"tokens: prompt={result.prompt_tokens} completion={result.completion_tokens} total={result.total_tokens}"
@@ -251,7 +313,8 @@ def main() -> None:
     """
 
     parser: Final[ArgumentParser] = _build_parser()
-    args: Namespace = parser.parse_args()
+    args = CliArgs()
+    parser.parse_args(namespace=args)
 
     if args.edit and not args.commit:
         print("'--edit' must be used together with '--commit'.", file=stderr)

git_commit_message/_gemini.py

@@ -0,0 +1,127 @@
+"""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 typing import ClassVar
+
+from google import genai
+from google.genai import types
+
+from ._llm import LLMTextResult, LLMUsage
+
+
+class GoogleGenAIProvider:
+    __slots__ = (
+        "_client",
+    )
+
+    name: ClassVar[str] = "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),
+        )