2023-12-18 10:10:50 +08:00
|
|
|
|
|
|
|
|
|
import subprocess
|
|
|
|
|
import re
|
|
|
|
|
import shutil
|
|
|
|
|
import os
|
|
|
|
|
import json
|
|
|
|
|
import ui_parser
|
|
|
|
|
import yaml
|
|
|
|
|
import openai
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# 从GitHub链接中提取仓库URL和提交哈希
|
|
|
|
|
def extract_repo_info(github_link):
|
|
|
|
|
match = re.match(r'https://github\.com/(.+)/(.+)/commit/(.+)', github_link)
|
|
|
|
|
if not match:
|
|
|
|
|
raise ValueError("Invalid GitHub link format.")
|
|
|
|
|
user_repo = match.group(1) + '/' + match.group(2)
|
|
|
|
|
commit_hash = match.group(3)
|
|
|
|
|
repo_url = f'https://github.com/{user_repo}.git'
|
|
|
|
|
return repo_url, commit_hash, match.group(2)
|
|
|
|
|
|
|
|
|
|
# 克隆仓库到指定目录
|
|
|
|
|
def clone_repo(repo_url, target_dir):
|
|
|
|
|
subprocess.run(["git", "clone", repo_url, target_dir], check=True)
|
|
|
|
|
|
|
|
|
|
# 检出特定提交
|
|
|
|
|
def checkout_commit(target_dir, commit_hash):
|
|
|
|
|
subprocess.run(["git", "checkout", commit_hash], cwd=target_dir, check=True)
|
|
|
|
|
|
|
|
|
|
# 获取指定提交的差异
|
|
|
|
|
def diff_of_commit(target_dir, commit_hash):
|
|
|
|
|
# 初始化subprocess的Popen对象,执行git diff命令
|
|
|
|
|
proc = subprocess.Popen(['git', 'diff', commit_hash + '^!'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
|
|
|
|
|
|
|
|
|
|
# 获取命令输出和错误信息
|
|
|
|
|
stdout, stderr = proc.communicate()
|
|
|
|
|
|
|
|
|
|
# 检查是否有错误信息
|
|
|
|
|
if stderr:
|
|
|
|
|
print("Error:", stderr.decode())
|
|
|
|
|
return None
|
|
|
|
|
return stdout.decode()
|
|
|
|
|
|
|
|
|
|
# 重置提交(保留工作目录的更改)
|
|
|
|
|
def reset_commit(target_dir):
|
|
|
|
|
subprocess.run(["git", "reset", "HEAD~1"], cwd=target_dir, check=True)
|
|
|
|
|
|
|
|
|
|
# 主函数
|
|
|
|
|
def clone_and_reset(github_link, target_dir):
|
|
|
|
|
try:
|
|
|
|
|
# 从GitHub链接中提取仓库URL和提交哈希
|
|
|
|
|
repo_url, commit_hash, repo_name = extract_repo_info(github_link)
|
|
|
|
|
|
|
|
|
|
# 创建目标目录(如果不存在)
|
|
|
|
|
repo_path = os.path.join(target_dir, repo_name)
|
|
|
|
|
os.makedirs(repo_path, exist_ok=True)
|
|
|
|
|
|
|
|
|
|
# 克隆仓库到指定目录
|
|
|
|
|
clone_repo(repo_url, repo_path)
|
|
|
|
|
|
|
|
|
|
# 检出特定提交
|
|
|
|
|
checkout_commit(repo_path, commit_hash)
|
|
|
|
|
|
|
|
|
|
# 重置提交
|
|
|
|
|
reset_commit(repo_path)
|
|
|
|
|
return repo_path
|
|
|
|
|
except Exception as err:
|
|
|
|
|
print(f"Error: {err}")
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_last_commit_id():
|
|
|
|
|
# 使用git rev-parse命令获取当前HEAD的提交ID
|
|
|
|
|
command = ['git', 'rev-parse', 'HEAD']
|
|
|
|
|
try:
|
|
|
|
|
# 执行命令,并捕获标准输出
|
|
|
|
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True)
|
|
|
|
|
# 返回标准输出内容,即最后一个提交的ID
|
|
|
|
|
return result.stdout.strip()
|
|
|
|
|
except subprocess.CalledProcessError as e:
|
|
|
|
|
# 如果命令执行失败,打印错误信息
|
|
|
|
|
print(f"Error: {e.stderr}")
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
def reset_last_commit():
|
|
|
|
|
# 使用git reset命令重置最后一个提交
|
|
|
|
|
# --soft 选项将保留更改在工作目录中
|
|
|
|
|
command = ['git', 'reset', '--soft', 'HEAD~1']
|
|
|
|
|
try:
|
|
|
|
|
# 执行命令
|
|
|
|
|
subprocess.run(command, check=True)
|
|
|
|
|
print("Last commit has been reset successfully.")
|
|
|
|
|
except subprocess.CalledProcessError as e:
|
|
|
|
|
# 如果命令执行失败,打印错误信息
|
|
|
|
|
print(f"Error: {e}")
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def get_last_commit_message():
|
|
|
|
|
# 使用git log命令获取最新的提交消息,-1表示最后一个提交
|
|
|
|
|
command = ['git', 'log', '-1', '--pretty=%B']
|
|
|
|
|
try:
|
|
|
|
|
# 执行命令,并捕获标准输出
|
|
|
|
|
result = subprocess.run(command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True, check=True)
|
|
|
|
|
# 返回标准输出内容,即最后一个提交的消息
|
|
|
|
|
return result.stdout.strip()
|
|
|
|
|
except subprocess.CalledProcessError as e:
|
|
|
|
|
# 如果命令执行失败,打印错误信息
|
|
|
|
|
print(f"Error: {e.stderr}")
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def compare_result_parser(response):
|
|
|
|
|
start = response.find('```json')
|
|
|
|
|
end = response.find('```', start+7)
|
|
|
|
|
if start >= 0 and end > 0:
|
|
|
|
|
content = response[start+7:end].strip()
|
|
|
|
|
result = json.loads(content)
|
|
|
|
|
return result['choice']
|
|
|
|
|
return None
|
|
|
|
|
|
2023-12-14 10:28:08 +08:00
|
|
|
|
def commit_message_compare(commit_message_a, commit_message_b, diff):
|
2023-12-18 10:10:50 +08:00
|
|
|
|
# call openai to compare which commit message is better
|
|
|
|
|
json_str = '{ "choice": "first" , "reason": ""}'
|
|
|
|
|
prompt = f"""
|
|
|
|
|
You are a software developer, your task is to compare two commit messages and choose the better one.
|
|
|
|
|
|
|
|
|
|
The input for task has two commit messages and a diff of the code changes. You will choose the better commit message and response as JSON format, the format is:
|
|
|
|
|
```json
|
|
|
|
|
{json_str}
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
Current Input is:
|
|
|
|
|
left commit message:
|
|
|
|
|
{commit_message_a}
|
|
|
|
|
|
|
|
|
|
right commit message:
|
|
|
|
|
{commit_message_b}
|
|
|
|
|
|
|
|
|
|
code change diff:
|
|
|
|
|
{diff}
|
|
|
|
|
"""
|
|
|
|
|
if not diff:
|
|
|
|
|
print('Diff is empty, compare commit message failed!')
|
|
|
|
|
return None
|
|
|
|
|
if len(prompt) > 16000:
|
|
|
|
|
print('Change too much, compare commit message failed!')
|
|
|
|
|
return None
|
|
|
|
|
|
|
|
|
|
client = openai.OpenAI(
|
|
|
|
|
api_key=os.environ.get("OPENAI_API_KEY", None),
|
|
|
|
|
base_url=os.environ.get("OPENAI_API_BASE", None)
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
response = client.chat.completions.create(
|
|
|
|
|
messages=[{'role': 'user', 'content': prompt}],
|
|
|
|
|
model='gpt-4-1106-preview',
|
|
|
|
|
stream=True,
|
|
|
|
|
timeout=8
|
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
content = ''
|
|
|
|
|
for chunk in response:
|
|
|
|
|
content += chunk.choices[0].delta.content
|
|
|
|
|
print('AI says:', content)
|
|
|
|
|
return compare_result_parser(content)
|
|
|
|
|
|
|
|
|
|
|
2023-12-14 10:28:08 +08:00
|
|
|
|
def git_repo_case(git_url, expected_commit_message):
|
2023-12-18 10:10:50 +08:00
|
|
|
|
target_repo_dir = '/tmp/commit_test/cases'
|
|
|
|
|
|
|
|
|
|
ui_processed = 0
|
|
|
|
|
stdout_result = ''
|
|
|
|
|
current_directory = ''
|
|
|
|
|
code_diff = ''
|
|
|
|
|
|
2023-12-14 10:28:08 +08:00
|
|
|
|
def title():
|
|
|
|
|
return f'commit {git_url}'
|
|
|
|
|
|
2023-12-18 10:10:50 +08:00
|
|
|
|
def input_mock(output):
|
|
|
|
|
nonlocal stdout_result
|
|
|
|
|
nonlocal ui_processed
|
|
|
|
|
stdout_result += output + '\n'
|
|
|
|
|
|
|
|
|
|
ui_blocks = ui_parser.parse_ui_description(stdout_result)
|
|
|
|
|
input_dict = {}
|
|
|
|
|
while ui_processed < len(ui_blocks):
|
|
|
|
|
ui_processed += 1
|
|
|
|
|
for block in ui_blocks[ui_processed-1]:
|
|
|
|
|
if block['type'] == 'checkbox':
|
|
|
|
|
for item in block['items']:
|
|
|
|
|
input_dict[item['id']] = 'checked'
|
|
|
|
|
if block['type'] == 'radio':
|
|
|
|
|
input_dict[block['items'][0]['id']] = 'checked'
|
|
|
|
|
if block['type'] == 'editor':
|
|
|
|
|
input_dict[block['id']] = block['text']
|
|
|
|
|
|
|
|
|
|
return (
|
|
|
|
|
'```yaml\n'
|
|
|
|
|
f'{yaml.dump(input_dict)}\n'
|
|
|
|
|
'```\n') if input_dict.keys() else None
|
|
|
|
|
|
|
|
|
|
def assert_result():
|
|
|
|
|
nonlocal expected_commit_message
|
|
|
|
|
nonlocal git_url
|
|
|
|
|
_1, commit_hash, _1 = extract_repo_info(git_url)
|
|
|
|
|
# get last commit message by git log
|
|
|
|
|
commit_message = get_last_commit_message()
|
|
|
|
|
# does last commit message match expected commit message?
|
|
|
|
|
print('expect:', expected_commit_message)
|
|
|
|
|
print('actual:', commit_message)
|
2023-12-14 10:28:08 +08:00
|
|
|
|
better_one = commit_message_compare(expected_commit_message, commit_message, diff_of_commit(os.getcwd(), commit_hash))
|
2023-12-18 10:10:50 +08:00
|
|
|
|
return better_one == 'right' or better_one == 'second'
|
|
|
|
|
# print('AI says better one is:', better_one)
|
|
|
|
|
# return commit_message and commit_message == expected_commit_message
|
|
|
|
|
|
|
|
|
|
def setup():
|
|
|
|
|
nonlocal git_url
|
|
|
|
|
nonlocal target_repo_dir
|
|
|
|
|
nonlocal current_directory
|
|
|
|
|
if os.path.exists(target_repo_dir):
|
|
|
|
|
shutil.rmtree(target_repo_dir)
|
|
|
|
|
repo_path = clone_and_reset(git_url, target_repo_dir)
|
|
|
|
|
if not repo_path:
|
|
|
|
|
return False
|
|
|
|
|
# save current directory to current_directory
|
|
|
|
|
current_directory = os.getcwd()
|
|
|
|
|
# set current directory to repo_path
|
|
|
|
|
os.chdir(repo_path)
|
|
|
|
|
return True
|
|
|
|
|
|
|
|
|
|
def teardown():
|
|
|
|
|
nonlocal target_repo_dir
|
|
|
|
|
nonlocal current_directory
|
|
|
|
|
# remove target repo directory
|
|
|
|
|
shutil.rmtree(target_repo_dir)
|
|
|
|
|
# reset current directory
|
|
|
|
|
os.chdir(current_directory)
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
'input': '/commit',
|
|
|
|
|
'input_mock': input_mock,
|
|
|
|
|
'assert': assert_result,
|
|
|
|
|
'setup': setup,
|
|
|
|
|
'teardown': teardown
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
def case1():
|
|
|
|
|
input_pattern = [
|
|
|
|
|
(
|
|
|
|
|
'workflow_test.py',
|
|
|
|
|
('```yaml\n'
|
|
|
|
|
'workflow_test.py: checked\n'
|
|
|
|
|
'```\n')
|
|
|
|
|
), (
|
|
|
|
|
'editor01',
|
|
|
|
|
('```yaml\n'
|
|
|
|
|
'editor0: commit message\n'
|
|
|
|
|
'```\n')
|
|
|
|
|
)]
|
|
|
|
|
current_input_index = 0
|
|
|
|
|
last_commit_id = None
|
|
|
|
|
|
2023-12-14 10:28:08 +08:00
|
|
|
|
def title():
|
|
|
|
|
return 'commit local repo'
|
|
|
|
|
|
2023-12-18 10:10:50 +08:00
|
|
|
|
def input_mock(output):
|
|
|
|
|
nonlocal current_input_index
|
|
|
|
|
nonlocal input_pattern
|
|
|
|
|
if current_input_index < len(input_pattern):
|
|
|
|
|
if output.find(input_pattern[current_input_index][0]) > 0:
|
|
|
|
|
current_input_index += 1
|
|
|
|
|
return input_pattern[current_input_index - 1][1]
|
|
|
|
|
return None
|
|
|
|
|
def assert_result():
|
|
|
|
|
# get last commit message by git log
|
|
|
|
|
commit_message = get_last_commit_message()
|
|
|
|
|
return commit_message and commit_message == 'commit message'
|
|
|
|
|
|
|
|
|
|
def setup():
|
|
|
|
|
nonlocal last_commit_id
|
|
|
|
|
last_commit_id = get_last_commit_id()
|
|
|
|
|
|
|
|
|
|
def teardown():
|
|
|
|
|
nonlocal last_commit_id
|
|
|
|
|
current_commit_id = get_last_commit_id()
|
|
|
|
|
if current_commit_id != last_commit_id:
|
|
|
|
|
reset_last_commit()
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
'input': '/commit',
|
|
|
|
|
'input_mock': input_mock,
|
|
|
|
|
'assert': assert_result,
|
|
|
|
|
'setup': setup,
|
|
|
|
|
'teardown': teardown
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
def get_cases():
|
|
|
|
|
return [
|
|
|
|
|
git_repo_case(
|
|
|
|
|
git_url = 'https://github.com/ThatEidolon/Python/commit/d515ad1303d3043e8e9c8c611020b85252d958f6',
|
|
|
|
|
expected_commit_message = 'adding sending function and parsing actions'
|
|
|
|
|
)
|
|
|
|
|
]
|