-
Notifications
You must be signed in to change notification settings - Fork 0
/
autocommit.py
118 lines (99 loc) · 4.51 KB
/
autocommit.py
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
#!/bin/sh
''':'
for interpreter in python3 python; do
if command -v $interpreter > /dev/null 2>&1; then
exec "$interpreter" "$0" "$@"
exit
fi
done
echo "No python interpreter found."
exit 1
' '''
import os
import sys
import subprocess
from dotenv import load_dotenv
import openai
# Load environment variables from the .env file
load_dotenv()
# Initialize the OpenAI API
openai.api_key = os.getenv('OPENAI_API_KEY')
def get_staged_diff():
"""Get the git diff of the staged changes in the current repository."""
return os.popen('git diff --cached').read()
def stage_all_changes():
"""Stage all changes in the current repository."""
os.system('git add .')
def generate_commit_message(diff):
"""Generate a commit title and message using the OpenAI API."""
system_message = {
"role": "system",
"content": (
"You are an expert commit message generator. You should generate a single commit message from a git diff in the following format:"
"\n\n<type>: <description>\n\n[bulleted body]\n\n"
"Acceptable types for your commit message are:"
"\n- build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)"
"\n- ci: Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs)"
"\n- docs: Documentation only changes"
"\n- feat: A new feature"
"\n- fix: A bug fix"
"\n- perf: A code change that improves performance"
"\n- refactor: A code change that neither fixes a bug nor adds a feature"
"\n- style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)"
"\n- test: Adding missing tests or correcting existing tests"
)
}
user_message = {
"role": "user",
"content": diff
}
response = openai.ChatCompletion.create(
model="gpt-3.5-turbo-16k-0613",
messages=[system_message, user_message]
)
return response.choices[0].message['content'].strip()
def is_valid_git_repo():
"""Check if the current directory is a valid Git repository."""
exit_status = os.system('git rev-parse --is-inside-work-tree > /dev/null 2>&1')
return exit_status == 0
def main():
if "--stage-all" in sys.argv:
stage_all_changes()
if not is_valid_git_repo():
print("Error: This is not a valid Git repository.")
return
original_diff = get_staged_diff()
if not original_diff:
print("No staged changes detected. Ensure you've staged your changes using 'git add <filename>' or use the '--stage-all' flag to stage all changes.")
return
diff_with_context = original_diff
context = input("Provide context or any specific details you'd like to include for generating the commit message: ")
if context:
diff_with_context = original_diff + "\n\nFurther user context to incorporate in commit message: " + context
commit_msg = None
while True:
if not commit_msg:
commit_msg = generate_commit_message(diff_with_context)
print(f"Suggested Commit Message:\n\n{commit_msg}")
choice = input("\nDo you want to [a]ccept, [g]enerate a new one, provide [f]eedback, or [e]xit? ").lower()
if choice == 'a':
subprocess.run(['git', 'stash', 'push', '-k']) # Stash unstaged changes, keeping the index intact
subprocess.run(['git', 'commit', '-m', commit_msg])
subprocess.run(['git', 'stash', 'pop']) # Apply the stashed changes back
print("Changes committed!")
break
elif choice == 'g':
commit_msg = None # Reset the commit_msg to trigger generation in the next loop iteration
print("Generating a new commit message...\n")
elif choice == 'f':
feedback = input("Provide feedback to guide the message generation: ")
diff_with_feedback = diff_with_context + "\n\nFeedback: " + feedback # Combine original diff with latest feedback
commit_msg = generate_commit_message(diff_with_feedback) # Use the combined diff for generating message
print(f"New Suggested Commit Message based on feedback:\n\n{commit_msg}")
elif choice == 'e':
print("Exiting the script.")
break
else:
print("Invalid choice. Please choose [a]ccept, [g]enerate, provide [f]eedback, or [e]xit.")
if __name__ == '__main__':
main()