gmsg 0.1.1__py3-none-any.whl → 0.1.4__py3-none-any.whl

gmsg/api_key.py

@@ -8,6 +8,9 @@ def get_or_set_api_key():
     try:
         rc = os.path.join(Path.home(), ".gmsgrc")
         if not os.path.isfile(rc):
+            print(
+                "Get your key from https://ai.google.dev/gemini-api/docs/api-key"
+            )
             key_inp = input("Enter your Gemini API KEY: ").strip()
             with open(rc, 'w') as f:
                 f.write(key_inp)

gmsg/gmsg.py

@@ -1,4 +1,6 @@
+import os
 import sys
+import tempfile
 import subprocess
 from google import genai
 from pathlib import Path
@@ -32,46 +34,49 @@ def git_diff() -> str | None:
         sys.exit(1)
 
 
-def make_query(diff) -> str:
+def make_query(diff: str) -> str:
     prompt = f"Generate a one liner git commit message for these changes, Below are the changes:\n {diff}"
     return prompt
 
 
-def generate_commit_message(diff: str) -> str:
+def trigger_query(query: str, api_key: str) -> str:
     try:
-        query = make_query(diff)
-        while True:
-            client = genai.Client(api_key=USER_API_KEY)
-            msg = client.models.generate_content(model="gemini-2.0-flash",
-                                                 contents=query)
-
-            print(f"{GREEN}{msg.text}{RESET}")
-            # generated_msg = "feat: Add poetry.lock and pyproject.toml files."
-            # print(generated_msg)
-            if continue_with_this_prompt(msg.text):
-                break
+        client = genai.Client(api_key=api_key)
+        msg = client.models.generate_content(model="gemini-2.0-flash",
+                                             contents=query)
+        return msg.text
     except genai.errors.ClientError as error:
         if error.code == 400:
-            print(
-                dict(
-                    error=f"{RED}Gemini API key not valid, check ~/.gmsg{RESET}"
-                ))
+            printt(dict(error="Gemini API key not valid, check ~/.gmsg"),
+                   is_success=False)
         else:
-            print(error)
+            printt(error, is_success=False)
             sys.exit(1)
 
 
-def continue_with_this_prompt(commit_msg: str) -> bool:
-    action = input("Do you want to continue with this message [Y/n]: ")
-    if action in ("", "y", "Y"):
-        print(f"Running: `git commit -m {commit_msg}`")
-        print(
-            f"{GREEN}Message commited to git, to confirm you can run git commit --amend.{RESET}"
-        )
-        commit_message_to_git(commit_msg)
-        return True
-    elif action in ("n", "N"):
-        return False
+def cycle_through_messages(diff: str, api_key: str) -> bool:
+    query = make_query(diff)
+    msg = trigger_query(query, api_key)
+
+    while True:
+        printt(msg)
+        action = input(
+            "Do you want to continue with this message? [Y = yes / e = edit / n = no]: "
+        ).strip().lower()
+        if action in ("", "y", "Y"):
+            print(
+                f"Running: `git commit -m {msg}`\nMessage committed to git. You can run `git commit --amend` to modify it."
+            )
+
+            commit_message_to_git(msg)
+            break
+        elif action in ("n", "N"):
+            msg = trigger_query(query, api_key)
+        elif action in ("e", "E"):
+            msg = edit_message_in_editor(msg)
+
+        else:
+            print("Invalid input. Please enter 'Y', 'e', or 'n'.")
 
 
 def commit_message_to_git(generated_msg: str) -> str | None:
@@ -87,21 +92,43 @@ def commit_message_to_git(generated_msg: str) -> str | None:
         return None
 
 
-def main():
-    global USER_API_KEY
+def edit_message_in_editor(initial_msg: str) -> str:
+    editor = os.environ.get("EDITOR", "vim")
+    with tempfile.NamedTemporaryFile(suffix=".tmp", mode='w+',
+                                     delete=False) as tf:
+        tf.write(initial_msg)
+        tf.flush()
+        temp_path = tf.name
+
+    subprocess.run([editor, temp_path])
 
-    USER_API_KEY = get_or_set_api_key()
+    with open(temp_path, 'r') as tf:
+        edited_msg = tf.read().strip()
+
+    os.unlink(temp_path)
+    return edited_msg
+
+
+def printt(text: str, is_success: bool = True):
+    if not is_success:
+        print(RED + text + RESET, file=sys.stderr)
+        return None
+    print(GREEN + text + RESET)
+
+
+def main():
     try:
         if not is_git_repo():
-            print("Current directory does not have git initialized",
-                  file=sys.stdout)
+            printt("Not a git repository.", is_success=False)
             sys.exit(1)
+
         diff = git_diff()
         if not diff:
-            print("There's nothing in git diff.")
+            printt("No staged changes found.", is_success=False)
             sys.exit(1)
 
-        generate_commit_message(diff)
+        user_api_key = get_or_set_api_key()
+        cycle_through_messages(diff, user_api_key)
 
     except KeyboardInterrupt:
         sys.exit(0)

gmsg-0.1.4.dist-info/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2025 Shiyan Shirani
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

{gmsg-0.1.1.dist-info → gmsg-0.1.4.dist-info}/METADATA

@@ -1,12 +1,15 @@
 Metadata-Version: 2.3
 Name: gmsg
-Version: 0.1.1
+Version: 0.1.4
 Summary: Generates git commit messages for you using AI.
 License: MIT
 Author: shiyan99s@gmail.com
-Requires-Python: >=3.12
+Requires-Python: >=3.9
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Dist: google-genai (>=1.9.0,<2.0.0)

gmsg-0.1.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+gmsg/__init__.py,sha256=9B4ZkbOBiBYYqv3Kh-mdlNn-yDPvkpXOqrm52Ng8CTk,23
+gmsg/api_key.py,sha256=73RAEjrcN6f1tc3cqaJ5888COTm4gnjQ4G7VRB3-CnQ,569
+gmsg/gmsg.py,sha256=bPHA3Unsoe6XqpsY8rc5qnZ-rQGNcEBiJSrtgBJvXGk,3871
+gmsg-0.1.4.dist-info/LICENSE,sha256=4gnFnu1ft89RQUn-ohdbqKLhpQ6-wHtq2eAOs1p6X6M,1071
+gmsg-0.1.4.dist-info/METADATA,sha256=5hAkqmK7DnukSCFt5M7y7m8b9F49QL5gjHbG1s09WRw,609
+gmsg-0.1.4.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
+gmsg-0.1.4.dist-info/entry_points.txt,sha256=LqLzIXT9IVenl_xEptCn4LqWHm34ypTaVMhoW5tFBSg,39
+gmsg-0.1.4.dist-info/RECORD,,

gmsg-0.1.1.dist-info/RECORD

@@ -1,7 +0,0 @@
-gmsg/__init__.py,sha256=9B4ZkbOBiBYYqv3Kh-mdlNn-yDPvkpXOqrm52Ng8CTk,23
-gmsg/api_key.py,sha256=92X--Gmwki2QxBSpMwo5xTl6I1g6GMw8FbCwVx8ojME,454
-gmsg/gmsg.py,sha256=hflPSahpCDgaCsFE33udZSkZ4hgB43UkCZZ9tcigTd4,3172
-gmsg-0.1.1.dist-info/METADATA,sha256=PWwm7v5MgB32x9ZCOXXw2ko39yK7Xk2uhYQyI4PK65w,458
-gmsg-0.1.1.dist-info/WHEEL,sha256=RaoafKOydTQ7I_I3JTrPCg6kUmTgtm4BornzOqyEfJ8,88
-gmsg-0.1.1.dist-info/entry_points.txt,sha256=LqLzIXT9IVenl_xEptCn4LqWHm34ypTaVMhoW5tFBSg,39
-gmsg-0.1.1.dist-info/RECORD,,