git-commit-msg-ai 1.7.0__py3-none-any.whl → 1.8.0__py3-none-any.whl

git_commit_msg_ai/ai_client.py

@@ -1,6 +1,6 @@
 import logging
 import textwrap
-from typing import Final, cast
+from typing import Final
 
 import anthropic
 
@@ -24,7 +24,7 @@ def generate_commit_message(diff: str) -> str:
     try:
         anthropic_client = anthropic.Anthropic()
 
-        logger.debug("Calling Anthropic API: model=%s max_tokens=%d", MODEL, MAX_TOKENS)
+        logger.debug(f"Calling Anthropic API: model={MODEL} max_tokens={MAX_TOKENS}")
         anthropic_api_response = anthropic_client.messages.create(
             model=MODEL,
             max_tokens=MAX_TOKENS,
@@ -32,21 +32,19 @@ def generate_commit_message(diff: str) -> str:
             messages=[{"role": "user", "content": diff}],
         )
     except anthropic.AuthenticationError:
-        logger.error("Anthropic authentication error")
         raise AIError("Anthropic API key is missing or invalid. Set the ANTHROPIC_API_KEY environment variable.")
     except anthropic.RateLimitError:
-        logger.error("Anthropic rate limit error")
         raise AIError("Anthropic API rate limit reached. Wait a moment and try again.")
     except anthropic.APIConnectionError:
-        logger.error("Anthropic API connection error")
         raise AIError("Could not reach the Anthropic API. Check your network connection.")
-    except anthropic.APIStatusError as error:
-        logger.error("Anthropic API status error: %s", error.status_code)
-        raise AIError(f"Anthropic API returned an error: {error.status_code}.")
+    except anthropic.APIStatusError as api_status_error:
+        raise AIError(f"Anthropic API returned an error: {api_status_error.status_code}.")
 
     anthropic_api_response_message = anthropic_api_response.content[0]
-    commit_message = cast(anthropic.types.TextBlock, anthropic_api_response_message).text.strip()
+    if not isinstance(anthropic_api_response_message, anthropic.types.TextBlock):
+        raise AIError("Unexpected response format from Anthropic API.")
+    commit_message = anthropic_api_response_message.text.strip()
 
-    logger.info("Commit message generated: %d chars", len(commit_message))
+    logger.info(f"Commit message generated: {len(commit_message)} chars")
 
     return commit_message

git_commit_msg_ai/cli.py

@@ -6,20 +6,28 @@ from typing import Final
 from git_commit_msg_ai import ai_client, editor, git_ops
 from git_commit_msg_ai.exceptions import GitCommitAIError
 
-LOG_LEVEL_ENV_VAR: Final[str] = "GIT_COMMIT_AI_LOG_LEVEL"
+LOG_LEVEL_ENVIRONMENT_VARIABLE: Final[str] = "GIT_COMMIT_AI_LOG_LEVEL"
+DEFAULT_LOG_LEVEL: Final[str] = "WARNING"
+LOG_FORMAT: Final[str] = "%(levelname)s:%(name)s:%(message)s"
+SELECTION_PROMPT: Final[str] = "[a]ccept / [e]dit / [r]eject: "
+SELECTION_ACCEPT: Final[str] = "a"
+SELECTION_EDIT: Final[str] = "e"
+SELECTION_REJECT: Final[str] = "r"
+REJECTED_MESSAGE: Final[str] = "User rejected the generated commit message. No commit made."
+INVALID_SELECTION_MESSAGE: Final[str] = "Invalid selection."
+ABORTED_MESSAGE: Final[str] = "Aborted."
 
 
 def main() -> None:
-    log_level_name = os.environ.get(LOG_LEVEL_ENV_VAR, "WARNING").upper()
+    log_level_name = os.environ.get(LOG_LEVEL_ENVIRONMENT_VARIABLE, DEFAULT_LOG_LEVEL).upper()
     numeric_log_level = getattr(logging, log_level_name, None)
+    valid_log_level = isinstance(numeric_log_level, int)
+    effective_log_level = numeric_log_level if valid_log_level else logging.WARNING
 
-    if not isinstance(numeric_log_level, int):
-        numeric_log_level = logging.WARNING
+    if not valid_log_level:
+        logging.warning(f"Invalid {LOG_LEVEL_ENVIRONMENT_VARIABLE} value {log_level_name!r}, defaulting to {DEFAULT_LOG_LEVEL}")
 
-    logging.basicConfig(level=numeric_log_level, format="%(levelname)s:%(name)s:%(message)s", stream=sys.stderr)
-
-    if not isinstance(getattr(logging, log_level_name, None), int):
-        logging.warning("Invalid %s value %r, defaulting to WARNING", LOG_LEVEL_ENV_VAR, log_level_name)
+    logging.basicConfig(level=effective_log_level, format=LOG_FORMAT, stream=sys.stderr)
 
     try:
         diff = git_ops.get_staged_diff()
@@ -27,23 +35,23 @@ def main() -> None:
         print(commit_message)
 
         print()
-        user_selection = input("[a]ccept / [e]dit / [r]eject: ").strip().lower()
+        user_selection = input(SELECTION_PROMPT).strip().lower()
 
-        if user_selection == "a":
+        if user_selection == SELECTION_ACCEPT:
             git_ops.commit(commit_message)
-        elif user_selection == "e":
+        elif user_selection == SELECTION_EDIT:
             updated_commit_message = editor.open_in_editor(commit_message)
             git_ops.commit(updated_commit_message)
-        elif user_selection == "r":
-            print("User rejected the generated commit message. No commit made.")
+        elif user_selection == SELECTION_REJECT:
+            print(REJECTED_MESSAGE)
         else:
-            print("Invalid selection.")
+            print(INVALID_SELECTION_MESSAGE)
             sys.exit(1)
     except GitCommitAIError as error:
-        print(str(error))
+        logging.error(str(error))
         sys.exit(1)
     except (KeyboardInterrupt, EOFError):
-        print("Aborted.")
+        print(ABORTED_MESSAGE)
         sys.exit(1)
 
 

git_commit_msg_ai/editor.py

@@ -3,44 +3,49 @@ import os
 import platform
 import subprocess
 import tempfile
+from typing import Final
 
 from git_commit_msg_ai.exceptions import EditorError
 
 logger = logging.getLogger(__name__)
 
+_WINDOWS_PLATFORM: Final[str] = "Windows"
+WINDOWS_EDITOR: Final[str] = "notepad"
+FALLBACK_EDITOR: Final[str] = "vi"
+_EDITOR_ENVIRONMENT_VARIABLE: Final[str] = "EDITOR"
+_TEMP_FILE_SUFFIX: Final[str] = ".txt"
+_TEMP_FILE_MODE: Final[str] = "w"
+
 
 def get_default_editor() -> str:
     current_platform = platform.system()
-    is_windows = current_platform == "Windows"
+    is_windows = current_platform == _WINDOWS_PLATFORM
 
-    return "notepad" if is_windows else "vi"
+    return WINDOWS_EDITOR if is_windows else FALLBACK_EDITOR
 
 
 def open_in_editor(initial_text: str) -> str:
     try:
-        with tempfile.NamedTemporaryFile(suffix=".txt", mode="w", delete=False) as temp_file:
+        with tempfile.NamedTemporaryFile(suffix=_TEMP_FILE_SUFFIX, mode=_TEMP_FILE_MODE, delete=False) as temp_file:
             temp_file.write(initial_text)
             temp_file_path = temp_file.name
     except OSError:
-        logger.error("Could not create temporary file")
         raise EditorError("Could not create a temporary file.")
 
-    logger.debug("Temporary file created: %s", temp_file_path)
+    logger.debug(f"Temporary file created: {temp_file_path}")
 
     platform_default_editor = get_default_editor()
-    editor_command = os.environ.get("EDITOR", platform_default_editor)
+    editor_command = os.environ.get(_EDITOR_ENVIRONMENT_VARIABLE, platform_default_editor)
 
-    logger.debug("Selected editor: %s", editor_command)
+    logger.debug(f"Selected editor: {editor_command}")
 
     try:
         try:
-            logger.debug("Opening editor: %s %s", editor_command, temp_file_path)
+            logger.debug(f"Opening editor: {editor_command} {temp_file_path}")
             subprocess.run([editor_command, temp_file_path], check=True)
         except FileNotFoundError:
-            logger.error("Editor not found: %s", editor_command)
             raise EditorError(f'Editor "{editor_command}" was not found. Set the EDITOR environment variable to a valid editor.')
         except subprocess.CalledProcessError:
-            logger.error("Editor exited with error: %s", editor_command)
             raise EditorError(f'Editor "{editor_command}" exited with an error.')
 
         logger.debug("Editor closed, reading edited content")
@@ -49,11 +54,10 @@ def open_in_editor(initial_text: str) -> str:
             with open(temp_file_path) as temp_file:
                 edited_text = temp_file.read().strip()
         except OSError:
-            logger.error("Could not read temporary file: %s", temp_file_path)
             raise EditorError("Could not read the edited commit message from the temporary file.")
     finally:
         os.unlink(temp_file_path)
 
-    logger.debug("Edited text read: %d chars", len(edited_text))
+    logger.debug(f"Edited text read: {len(edited_text)} chars")
 
     return edited_text

git_commit_msg_ai/git_ops.py

@@ -5,34 +5,25 @@ from typing import Final
 from git_commit_msg_ai.exceptions import GitError
 
 GIT_COMMAND: Final[str] = "git"
-DIFF_SUBCOMMAND: Final[str] = "diff"
-CACHED_FLAG: Final[str] = "--cached"
-COMMIT_SUBCOMMAND: Final[str] = "commit"
-MESSAGE_FLAG: Final[str] = "-m"
-UTF8_ENCODING: Final[str] = "utf-8"
 
 logger = logging.getLogger(__name__)
 
 
 def get_staged_diff() -> str:
     try:
-        logger.debug("Running: %s %s %s", GIT_COMMAND, DIFF_SUBCOMMAND, CACHED_FLAG)
-        raw_diff_bytes = subprocess.check_output([GIT_COMMAND, DIFF_SUBCOMMAND, CACHED_FLAG])
-        staged_diff = raw_diff_bytes.decode(UTF8_ENCODING)
+        logger.debug(f"Running: {GIT_COMMAND} diff --cached")
+        raw_diff_bytes = subprocess.check_output([GIT_COMMAND, "diff", "--cached"])
+        staged_diff = raw_diff_bytes.decode("utf-8")
     except FileNotFoundError:
-        logger.error("git not found on PATH")
         raise GitError("git is not installed or not on PATH.")
     except subprocess.CalledProcessError:
-        logger.error("git diff --cached exited non-zero")
         raise GitError("Failed to get staged diff. Are you inside a git repository?")
     except UnicodeDecodeError:
-        logger.error("Staged diff could not be decoded as UTF-8")
         raise GitError("Staged diff contains bytes that could not be decoded as UTF-8.")
 
-    logger.debug("Staged diff received: %d chars", len(staged_diff))
+    logger.debug(f"Staged diff received: {len(staged_diff)} chars")
 
     if not staged_diff:
-        logger.warning("No staged changes found")
         raise GitError("No staged changes found. Stage files with git add before running.")
 
     return staged_diff
@@ -40,13 +31,11 @@ def get_staged_diff() -> str:
 
 def commit(message: str) -> None:
     try:
-        logger.debug("Running: %s %s %s <message>", GIT_COMMAND, COMMIT_SUBCOMMAND, MESSAGE_FLAG)
-        subprocess.run([GIT_COMMAND, COMMIT_SUBCOMMAND, MESSAGE_FLAG, message], check=True)
+        logger.debug(f"Running: {GIT_COMMAND} commit -m <message>")
+        subprocess.run([GIT_COMMAND, "commit", "-m", message], check=True)
     except FileNotFoundError:
-        logger.error("git not found on PATH")
         raise GitError("git is not installed or not on PATH.")
     except subprocess.CalledProcessError:
-        logger.error("git commit exited non-zero")
         raise GitError("git commit failed.")
 
     logger.info("Commit created successfully")

{git_commit_msg_ai-1.7.0.dist-info → git_commit_msg_ai-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: git-commit-msg-ai
-Version: 1.7.0
+Version: 1.8.0
 Summary: AI-powered git commit message generator following Conventional Commits
 License-Expression: MIT
 Requires-Python: >=3.10
@@ -156,6 +156,6 @@ git-commit-msg-ai
 | Level | What you see |
 |---|---|
 | `DEBUG` | git commands run, API model/token params, temp file paths, char counts |
-| `INFO` | commit message generated, commit created |
+| `INFO` | commit message generated (with char count), commit created |
 | `WARNING` | no staged changes found |
 | `ERROR` | git not found, API failures, editor errors |

git_commit_msg_ai-1.8.0.dist-info/RECORD

@@ -0,0 +1,11 @@
+git_commit_msg_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+git_commit_msg_ai/ai_client.py,sha256=DktS01lI62kaIRW4SccdelpwFn3VSJ_YRjlO5_IQE6I,2238
+git_commit_msg_ai/cli.py,sha256=Z8uIRW1rTK4YDYdj8pIxgLC1Q0agfX5VFTIqI2geHoo,2189
+git_commit_msg_ai/editor.py,sha256=wW7TJ4zVvvN7ThLtrJthAf9FjdmIDTbBS7V5pIW490s,2143
+git_commit_msg_ai/exceptions.py,sha256=7Hwluf3zHMjs4lpGktWS-Lwgo8y_4Xbb1WqzPQHkkUA,352
+git_commit_msg_ai/git_ops.py,sha256=qZae4w3IEf3Lmf2T5oWItkgM0PrEYHCWr3TgBJLeecY,1387
+git_commit_msg_ai-1.8.0.dist-info/METADATA,sha256=UuCgjMWD8xVBSCk4F6FQ6nmIkmjwYN5BQ2jELeHM_kI,4226
+git_commit_msg_ai-1.8.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+git_commit_msg_ai-1.8.0.dist-info/entry_points.txt,sha256=KTu6wUhl0p3nf27k8L4vpSH_hpeRQpwzMPSmKv7K5Cs,65
+git_commit_msg_ai-1.8.0.dist-info/top_level.txt,sha256=XYQC2BXvrcREGKEG7sm9nbwO7ifqcUSVgU7SW8BTURs,18
+git_commit_msg_ai-1.8.0.dist-info/RECORD,,

git_commit_msg_ai-1.7.0.dist-info/RECORD

@@ -1,11 +0,0 @@
-git_commit_msg_ai/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-git_commit_msg_ai/ai_client.py,sha256=ET7wWfgiIPzXsuGi1bV8bV8UWOThPXn5JzRgcnh3yNI,2340
-git_commit_msg_ai/cli.py,sha256=IBU_BhBbd5azbTI6Rso92LtabLHlVUsO3ZUYA2Zr9wE,1686
-git_commit_msg_ai/editor.py,sha256=PycIvOuvHIAx8fSl6_L8AkzAWOS5PRNGTHb6yE11KN0,2087
-git_commit_msg_ai/exceptions.py,sha256=7Hwluf3zHMjs4lpGktWS-Lwgo8y_4Xbb1WqzPQHkkUA,352
-git_commit_msg_ai/git_ops.py,sha256=jJJ_8E_tOIl-SQ5Nf51XawO767P-5VMVXQ7gNNMLDyM,1974
-git_commit_msg_ai-1.7.0.dist-info/METADATA,sha256=4TloB0yvccJL4nQtoPUOCMrGY7026LcTpyF7RJ4Cnpo,4208
-git_commit_msg_ai-1.7.0.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-git_commit_msg_ai-1.7.0.dist-info/entry_points.txt,sha256=KTu6wUhl0p3nf27k8L4vpSH_hpeRQpwzMPSmKv7K5Cs,65
-git_commit_msg_ai-1.7.0.dist-info/top_level.txt,sha256=XYQC2BXvrcREGKEG7sm9nbwO7ifqcUSVgU7SW8BTURs,18
-git_commit_msg_ai-1.7.0.dist-info/RECORD,,