commitmessagegenerator 1.5.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

commitmessagegenerator/cli.py

@@ -1,17 +1,148 @@
 import argparse
 import subprocess
 from .generator import gerar_mensagem_commit
-from .configure import api_key
+from .configure import api_key, get_configured_model, get_auto_add_setting, update_setting, get_api_key_status
 import sys
 import getpass
 
+MODEL_MAP = {
+    "1": "gemini-2.0-flash",
+    "2": "gemini-1.5-flash", 
+    "3": "gemini-1.5-pro",
+    "4": "gemini-2.0-flash-exp",
+    "5": "gemini-2.5-flash",
+    "6": "gemini-2.5-pro"
+}
+
+def configure_menu():
+    """Interactive configuration menu"""
+    while True:
+        # Get current settings
+        api_set = get_api_key_status()
+        current_model = get_configured_model()
+        auto_add = get_auto_add_setting()
+        
+        print("\n" + "="*40)
+        print("       CONFIGURATION MENU")
+        print("="*40)
+        print(f"\n1. API Key        [{('✓ Set' if api_set else '✗ Not set')}]")
+        print(f"2. Model          [{current_model}]")
+        print(f"3. File staging   [{('Auto-add all' if auto_add else 'Staged only')}]")
+        print("\n0. Exit")
+        print("="*40)
+        
+        choice = input("\nSelect option (0-3): ").strip()
+        
+        if choice == "0" or choice == "":
+            print("\nExiting configuration.\n")
+            break
+        elif choice == "1":
+            configure_api_key()
+        elif choice == "2":
+            configure_model()
+        elif choice == "3":
+            configure_staging()
+        else:
+            print("\nInvalid option. Please try again.")
+
+def configure_api_key():
+    """Configure the API key"""
+    print("\n" + "-"*40)
+    print("API KEY CONFIGURATION")
+    print("-"*40)
+    print("Enter your Gemini API key below.")
+    print("Press Enter without typing to cancel.\n")
+    
+    key = getpass.getpass("API Key: ")
+    
+    if not key.strip():
+        print("\nNo changes made.")
+        return
+    
+    update_setting("GEMINI_API_KEY", key)
+    print("\n✓ API Key saved successfully!")
+
+def configure_model():
+    """Configure the AI model"""
+    current_model = get_configured_model()
+    
+    print("\n" + "-"*40)
+    print("MODEL CONFIGURATION")
+    print("-"*40)
+    print(f"Current model: {current_model}\n")
+    print("Available models:")
+    print("1. gemini-2.0-flash (fast and efficient)")
+    print("2. gemini-1.5-flash (good balance)")
+    print("3. gemini-1.5-pro (highest quality, slower)")
+    print("4. gemini-2.0-flash-exp (experimental)")
+    print("5. gemini-2.5-flash (latest, fast)")
+    print("6. gemini-2.5-pro (latest, highest quality)")
+    print("\n0. Cancel")
+    
+    choice = input("\nSelect model (0-6): ").strip()
+    
+    if choice == "0" or choice == "":
+        print("\nNo changes made.")
+        return
+    
+    if choice in MODEL_MAP:
+        selected_model = MODEL_MAP[choice]
+        update_setting("AI_MODEL", selected_model)
+        print(f"\n✓ Model changed to: {selected_model}")
+    else:
+        print("\nInvalid option. No changes made.")
+
+def configure_staging():
+    """Configure file staging behavior"""
+    auto_add = get_auto_add_setting()
+    
+    print("\n" + "-"*40)
+    print("FILE STAGING CONFIGURATION")
+    print("-"*40)
+    print(f"Current setting: {'Auto-add all files' if auto_add else 'Staged only'}\n")
+    print("1. Auto-add all files - Automatically stages all changes")
+    print("2. Staged only - Only use already staged files")
+    print("\n0. Cancel")
+    
+    choice = input("\nSelect behavior (0-2): ").strip()
+    
+    if choice == "0" or choice == "":
+        print("\nNo changes made.")
+        return
+    
+    if choice == "1":
+        update_setting("AUTO_ADD_ALL", "true")
+        print("\n✓ Set to: Auto-add all files")
+    elif choice == "2":
+        update_setting("AUTO_ADD_ALL", "false")
+        print("\n✓ Set to: Staged only")
+    else:
+        print("\nInvalid option. No changes made.")
+
 def main():
     parser = argparse.ArgumentParser(description="Gerador de mensagens de commit com IA")
     parser.add_argument("-c", "--commit", action="store_true", help="Commits with the generated message")
     parser.add_argument("-cp", "--commitpush",  action="store_true", help="Commits and pushes with the generated message")
     parser.add_argument("-cf", "--configure", action="store_true", help="Configures the GEMINI_API_KEY environment variable")
+    parser.add_argument("-s", "--status", action="store_true", help="Shows current configuration status")
     args = parser.parse_args()
 
+    if args.status:
+        from .configure import get_configured_model, get_auto_add_setting
+        import os
+        from dotenv import load_dotenv
+        
+        load_dotenv()
+        key = os.getenv("GEMINI_API_KEY")
+        model = get_configured_model()
+        auto_add = get_auto_add_setting()
+        
+        print("\nCurrent Configuration:")
+        print(f"API Key: {'✓ Set' if key else '✗ Not set'}")
+        print(f"Model: {model}")
+        print(f"Auto-add all files: {'✓ Yes' if auto_add else '✗ No (staged only)'}")
+        return
+
     if not args.configure:
         mensagem = gerar_mensagem_commit()
 
@@ -30,10 +161,7 @@ def main():
         subprocess.run(["git", "push"])
     
     if args.configure:
-        print("\nPlease input your API KEY\nThis is directly set in the .env file")
-        key = getpass.getpass()
-        api_key(key)
-        print("\nAPI KEY saved in .env file\n")
+        configure_menu()
     
     if len(sys.argv) == 1:
         print("\nRemoving staged changes (git reset)...")

commitmessagegenerator/configure.py

@@ -1,22 +1,103 @@
 import os
-def api_key(key):
+
+def update_setting(setting_name, value):
+    """Update a single setting in the .env file"""
     if os.path.exists(".env"):
-        with open(".env", "r+") as outfile:
-            lines = outfile.readlines()
-            gemini_api_key = next((line for line in lines if line.startswith("GEMINI_API_KEY=")), None)
-            if gemini_api_key:
-                outfile.seek(0)
-                outfile.truncate()
-                outfile.writelines([line if not line.startswith("GEMINI_API_KEY=") else f"GEMINI_API_KEY={key}\n" for line in lines])
+        with open(".env", "r") as f:
+            lines = f.readlines()
+        
+        found = False
+        new_lines = []
+        for line in lines:
+            key_name = line.split("=")[0] if "=" in line else None
+            if key_name == setting_name:
+                new_lines.append(f"{setting_name}={value}\n")
+                found = True
             else:
-                outfile.write(f"GEMINI_API_KEY={key}\n")
+                new_lines.append(line)
+        
+        if not found:
+            new_lines.append(f"{setting_name}={value}\n")
+        
+        with open(".env", "w") as f:
+            f.writelines(new_lines)
     else:
-        with open(".env", "w") as outfile:
-            outfile.write(f"GEMINI_API_KEY={key}\n")
+        with open(".env", "w") as f:
+            f.write(f"{setting_name}={value}\n")
+    
+    _ensure_gitignore()
 
+def _ensure_gitignore():
+    """Ensure .env is in .gitignore"""
     if os.path.exists(".gitignore"):
         with open(".gitignore", "r+") as outfile:
             lines = outfile.readlines()
             env_in_gitignore = next((line for line in lines if line.strip() == ".env"), None)
             if not env_in_gitignore:
                 outfile.write("\n.env")
+
+def api_key(key, model="gemini-2.0-flash", auto_add_all=True):
+    """Set all configuration at once (legacy function)"""
+    config = {
+        "GEMINI_API_KEY": key,
+        "AI_MODEL": model,
+        "AUTO_ADD_ALL": str(auto_add_all).lower()
+    }
+    
+    if os.path.exists(".env"):
+        with open(".env", "r") as f:
+            lines = f.readlines()
+        
+        existing_keys = set()
+        new_lines = []
+        for line in lines:
+            key_name = line.split("=")[0] if "=" in line else None
+            if key_name in config:
+                new_lines.append(f"{key_name}={config[key_name]}\n")
+                existing_keys.add(key_name)
+            else:
+                new_lines.append(line)
+        
+        for key_name, value in config.items():
+            if key_name not in existing_keys:
+                new_lines.append(f"{key_name}={value}\n")
+        
+        with open(".env", "w") as f:
+            f.writelines(new_lines)
+    else:
+        with open(".env", "w") as f:
+            for key_name, value in config.items():
+                f.write(f"{key_name}={value}\n")
+
+    _ensure_gitignore()
+
+def get_api_key_status():
+    """Check if API key is set"""
+    if os.path.exists(".env"):
+        with open(".env", "r") as f:
+            lines = f.readlines()
+            api_line = next((line for line in lines if line.startswith("GEMINI_API_KEY=")), None)
+            if api_line:
+                value = api_line.split("=", 1)[1].strip()
+                return bool(value)
+    return False
+
+def get_configured_model():
+    """Get the currently configured AI model from .env file"""
+    if os.path.exists(".env"):
+        with open(".env", "r") as outfile:
+            lines = outfile.readlines()
+            model_line = next((line for line in lines if line.startswith("AI_MODEL=")), None)
+            if model_line:
+                return model_line.split("=", 1)[1].strip()
+    return "gemini-2.0-flash"  # Default fallback
+
+def get_auto_add_setting():
+    """Get the auto-add all files setting from .env file"""
+    if os.path.exists(".env"):
+        with open(".env", "r") as outfile:
+            lines = outfile.readlines()
+            auto_add_line = next((line for line in lines if line.startswith("AUTO_ADD_ALL=")), None)
+            if auto_add_line:
+                return auto_add_line.split("=", 1)[1].strip().lower() == "true"
+    return True  # Default: auto-add all files (current behavior)

commitmessagegenerator/generator.py

@@ -2,6 +2,7 @@ import os
 from dotenv import load_dotenv
 from google import genai
 from git import Repo
+from .configure import get_configured_model, get_auto_add_setting
 
 def gerar_mensagem_commit():
     load_dotenv()
@@ -9,16 +10,20 @@ def gerar_mensagem_commit():
     if not key:
         raise RuntimeError("The GEMINI_API_KEY environment variable is not set.")
 
-    #genai.configure(api_key=key)
-    #model = genai.GenerativeModel("gemini-2.0-flash")
+    # Get the configured model
+    model = get_configured_model()
 
     client = genai.Client(api_key=key)
     
 
     repo = Repo(os.getcwd())
 
-    # Inclui arquivos staged (adicionados ou modificados)
-    repo.git.add(all=True)
+    # Check if auto-add is enabled
+    auto_add = get_auto_add_setting()
+    if auto_add:
+        # Automatically stage all changes
+        repo.git.add(all=True)
+    
     diff = repo.git.diff("--cached")
 
     if not diff.strip():
@@ -39,7 +44,7 @@ def gerar_mensagem_commit():
     )
 
     response = client.models.generate_content(
-        model="gemini-2.0-flash",
+        model=model,
         contents=prompt
     )
-    return response.text.strip()
+    return response.text.strip() if response.text else "Failed to generate commit message"

{commitmessagegenerator-1.5.0.dist-info → commitmessagegenerator-2.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: commitmessagegenerator
-Version: 1.5.0
+Version: 2.2.0
 Summary: Generate commit messages with AI (Google Gemini) automatically using `git diff`.
 Author-email: Gabriel Terceiro <gcarolinoterceiro@gmail.com>
 License: MIT
@@ -35,6 +35,14 @@ pip install commitmessagegenerator
 commitgen -cf
 ```
 
+This opens an interactive configuration menu where you can:
+
+1. Set or update your Gemini API key
+2. Change the AI model
+3. Configure file staging behavior
+
+Each option can be configured independently, and you can exit at any time without saving changes.
+
 ## Run this and type you API key to the terminal so the package creates the .env file and automatically adds it to the .gitignore
 
 Or do it manually:
@@ -45,6 +53,8 @@ Create a `.env` file in the directory where you will run commitgen (usually the
 
 ```
 GEMINI_API_KEY=your-gemini-api-key
+AI_MODEL=gemini-2.0-flash
+AUTO_ADD_ALL=true
 ```
 
 ## 🚀 Usage
@@ -58,9 +68,37 @@ commitgen (-c/-cp)
 The command will:
 
 - Read the git diff;
-- Send it to the Google Gemini API;
+- Send it to the Google Gemini API using your configured model;
 - Return a commit message suggestion directly in your terminal.
 
+### Available Commands
+
+- `commitgen` - Generate commit message only
+- `commitgen -c` - Generate and commit with the message
+- `commitgen -cp` - Generate, commit, and push
+- `commitgen -cf` - Configure API key, model, and file staging behavior
+- `commitgen -s` - Show current configuration status
+
+### Available Models
+
+When configuring with `-cf`, you can choose from:
+
+1. **gemini-2.0-flash** (default) - Fast and efficient
+2. **gemini-1.5-flash** - Good balance of speed and quality
+3. **gemini-1.5-pro** - Highest quality, slower
+4. **gemini-2.0-flash-exp** - Experimental version
+5. **gemini-2.5-flash** - Latest version, fast and efficient
+6. **gemini-2.5-pro** - Latest version, highest quality
+
+### File Staging Behavior
+
+When configuring with `-cf`, you can choose how files are staged:
+
+1. **Auto-add all files** (default) - Automatically runs `git add --all` before generating the commit message
+2. **Staged only** - Only reads the diff from files you've already staged with `git add`
+
+The "staged only" option gives you more control over which changes are included in the commit message.
+
 ## 🧩 Requisites
 
 - Python 3.8 or higher

commitmessagegenerator-2.2.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+commitmessagegenerator/__init__.py,sha256=Wsl1vaSI5fWuK3B9MfZnPp1PxnRfTmnvW_20vgswgT0,45
+commitmessagegenerator/cli.py,sha256=IoSYuH8-Zc5YNdS6pmSg0nwo-UNufNPZb78Z76llSTk,5775
+commitmessagegenerator/configure.py,sha256=5OtQ9Y2udsIGeSztnsiFqSrcKWcm4pGKS6uyZS9-YvU,3749
+commitmessagegenerator/generator.py,sha256=c0IUPxP8A10OMokWwKYoes5gDi_-BJ0COl0Vm2ZM6ew,1624
+commitmessagegenerator-2.2.0.dist-info/licenses/LICENSE,sha256=q7KJbcPCqUAvkBuI1QNc8Kg9XPfBfnNkLN9WKwudO8U,11
+commitmessagegenerator-2.2.0.dist-info/METADATA,sha256=MBfGnghBea_1vjbxqyRD2cPISPZb7pzJ2heW2AYJv9w,3376
+commitmessagegenerator-2.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+commitmessagegenerator-2.2.0.dist-info/entry_points.txt,sha256=VmVQY00e0SuHsTFZmOCcyN0VYCQlVnZrdZNJdUGLCVo,62
+commitmessagegenerator-2.2.0.dist-info/top_level.txt,sha256=G8wUZw8MTtvYs1WgehFVTPKqw5Td7gGedZZIQbZH1Co,23
+commitmessagegenerator-2.2.0.dist-info/RECORD,,

commitmessagegenerator-1.5.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-commitmessagegenerator/__init__.py,sha256=Wsl1vaSI5fWuK3B9MfZnPp1PxnRfTmnvW_20vgswgT0,45
-commitmessagegenerator/cli.py,sha256=lpYpRpjcKY6dQ2uhm6Rwpos_lEy9RELhuvE6aSI2jxI,1475
-commitmessagegenerator/configure.py,sha256=gzG9cp4B4qIXsoGVTSq-D80N6cmf_A77W73s0k-JkyQ,981
-commitmessagegenerator/generator.py,sha256=4BJHi7Perllkxnqf00KWPTQTPh1oZZABX3DXHrApF1Y,1453
-commitmessagegenerator-1.5.0.dist-info/licenses/LICENSE,sha256=q7KJbcPCqUAvkBuI1QNc8Kg9XPfBfnNkLN9WKwudO8U,11
-commitmessagegenerator-1.5.0.dist-info/METADATA,sha256=TTMjszdGCBBNgRtdGYH5zYT2MEje1PgkieiEAiX5yaE,1909
-commitmessagegenerator-1.5.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-commitmessagegenerator-1.5.0.dist-info/entry_points.txt,sha256=VmVQY00e0SuHsTFZmOCcyN0VYCQlVnZrdZNJdUGLCVo,62
-commitmessagegenerator-1.5.0.dist-info/top_level.txt,sha256=G8wUZw8MTtvYs1WgehFVTPKqw5Td7gGedZZIQbZH1Co,23
-commitmessagegenerator-1.5.0.dist-info/RECORD,,