[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
import os
|
2025-05-13 18:39:21 +07:00
|
|
|
import sys
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
from dotenv import load_dotenv
|
2025-05-13 18:59:06 +07:00
|
|
|
from interpreter import OpenInterpreter
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
load_dotenv() # Load environment variables from .env
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
|
2025-05-13 18:39:21 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
def get_git_credentials():
|
|
|
|
|
"""Retrieve Git credentials and project path from command-line arguments."""
|
2025-05-13 18:59:06 +07:00
|
|
|
if len(sys.argv) != 5:
|
2025-05-14 09:44:19 +07:00
|
|
|
print(
|
|
|
|
|
"Usage: python gen_commit.py <GIT_USER> <GIT_PASS> <GIT_REPO> <PROJECT_PATH>"
|
|
|
|
|
)
|
|
|
|
|
sys.exit(1)
|
2025-05-13 18:50:45 +07:00
|
|
|
return sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4]
|
2025-05-13 18:39:21 +07:00
|
|
|
|
|
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
def gen_commit(project_path):
|
|
|
|
|
"""Use OpenInterpreter to generate a commit message based on git diff."""
|
2025-05-14 09:38:53 +07:00
|
|
|
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
agent = OpenInterpreter()
|
2025-05-14 09:38:53 +07:00
|
|
|
agent.llm.model = "gpt-4o"
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
agent.auto_run = True
|
2025-05-14 09:03:13 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
# Read both convention and git commit files
|
|
|
|
|
convention_path = os.path.join(
|
|
|
|
|
os.path.dirname(__file__), "resources/commit_convention.md"
|
|
|
|
|
)
|
|
|
|
|
git_commit_path = os.path.join(os.path.dirname(__file__), "resources/git_commit.md")
|
|
|
|
|
|
|
|
|
|
with open(convention_path, "r") as f:
|
|
|
|
|
convention_content = f.read()
|
|
|
|
|
with open(git_commit_path, "r") as f:
|
|
|
|
|
git_commit_content = f.read()
|
2025-05-14 09:03:13 +07:00
|
|
|
|
|
|
|
|
agent.system_message = f"""
|
2025-05-13 19:02:13 +07:00
|
|
|
Your name is Bifrost.
|
|
|
|
|
You are a helpful assistant that generates commit messages based on uncommitted code.
|
|
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
Follow these rules:
|
2025-05-13 19:02:13 +07:00
|
|
|
1. Use English.
|
2025-05-14 09:44:19 +07:00
|
|
|
2. Be concise and follow this format:
|
|
|
|
|
{convention_content}
|
|
|
|
|
|
|
|
|
|
3. Use these git commands to analyze changes as you see fit:
|
|
|
|
|
{git_commit_content}
|
|
|
|
|
|
|
|
|
|
4. Only return the commit message. Do not add explanation or extra output.
|
2025-05-14 09:03:13 +07:00
|
|
|
"""
|
|
|
|
|
|
|
|
|
|
prompt = f"""
|
2025-05-14 09:44:19 +07:00
|
|
|
Generate a commit message based on the following changes in the project directory:
|
|
|
|
|
|
|
|
|
|
First, change directory:
|
2025-05-13 19:02:13 +07:00
|
|
|
cd {project_path}
|
2025-05-14 09:44:19 +07:00
|
|
|
|
|
|
|
|
Then check the uncommitted changes.
|
|
|
|
|
|
|
|
|
|
Then generate a commit message according to the changes.
|
2025-05-14 09:03:13 +07:00
|
|
|
"""
|
2025-05-13 19:02:13 +07:00
|
|
|
|
2025-05-14 09:03:13 +07:00
|
|
|
response = agent.chat(prompt)
|
2025-05-13 19:02:13 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
# Extract just the content from the response
|
|
|
|
|
if isinstance(response, list) and len(response) > 0:
|
|
|
|
|
if isinstance(response[-1], dict) and "content" in response[-1]:
|
|
|
|
|
return response[-1]["content"].strip()
|
2025-05-13 19:02:13 +07:00
|
|
|
|
2025-05-14 09:03:13 +07:00
|
|
|
return str(response).strip()
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
|
|
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
def push_code():
|
|
|
|
|
"""Pull, commit, and push code with AI-generated message."""
|
|
|
|
|
git_user, git_pass, git_repo, project_path = get_git_credentials()
|
2025-05-13 18:59:06 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
# Change to project path
|
2025-05-13 18:59:06 +07:00
|
|
|
os.chdir(project_path)
|
2025-05-14 09:48:17 +07:00
|
|
|
print(f"Changed to project path: {project_path}")
|
2025-05-14 15:35:25 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
# Generate commit message
|
|
|
|
|
commit_msg = gen_commit(project_path)
|
|
|
|
|
print(f"Generated commit message:\n{commit_msg}\n")
|
2025-05-13 18:59:06 +07:00
|
|
|
|
2025-05-14 09:44:19 +07:00
|
|
|
# Pull, add, commit, and push
|
2025-05-13 18:59:06 +07:00
|
|
|
remote_url = f"https://{git_user}:{git_pass}@{git_repo}"
|
|
|
|
|
|
2025-05-14 15:35:25 +07:00
|
|
|
# Execute git commands in sequence
|
|
|
|
|
os.system(f"git pull {remote_url} || true")
|
|
|
|
|
os.system("git add .")
|
|
|
|
|
os.system(f'git commit -m "{commit_msg}" || true')
|
|
|
|
|
os.system(f"git push {remote_url} || true")
|
[{'role': 'assistant', 'type': 'code', 'format': 'shell', 'content': 'cd /root/dev/Bifrost && git diff --name-status'}, {'role': 'computer', 'type': 'console', 'format': 'output', 'content': '\nM\tMakefile\nM\tbackend/app/service/app.go\nM\tregistry\n'}, {'role': 'assistant', 'type': 'message', 'content': 'The files that have been modified are:\n\n- \n- \n- \n\nBased on these changes, here is a generated commit message:\n\n\n\nThis message indicates updates have been made to the specified files. If you have specific details about the changes, feel free to share them for a more tailored message.'}]
2025-05-13 18:29:25 +07:00
|
|
|
|
|
|
|
|
|
|
|
|
|
if __name__ == "__main__":
|
2025-05-14 09:44:19 +07:00
|
|
|
push_code()
|