Merge pull request #145 from devchat-ai/update_test_api3

refactor: Remove redundant task query in test API upload command

community/github/code_task_summary/command.yml

@@ -0,0 +1,5 @@
+description: 'Generate code task summary.'
+input: optional
+help: README.md
+steps:
+  - run: $devchat_python $command_path/command.py "$input"

community/github/command.yml

@@ -0,0 +1 @@
+description: Root of github commands.

community/github/commit/commit.py

@@ -6,13 +6,20 @@ import sys
 
 from devchat.llm import chat_completion_stream
 
-from lib.chatmark import Checkbox, Form, TextEditor
+from lib.chatmark import Button, Checkbox, Form, TextEditor
 from lib.ide_service import IDEService
 
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
 
 from common_util import assert_exit  # noqa: E402
-from git_api import get_issue_info, subprocess_check_output, subprocess_run
+from git_api import (
+    get_github_repo,
+    get_github_repo_issues,
+    get_github_username,
+    get_issue_info,
+    subprocess_check_output,
+    subprocess_run,
+)
 
 diff_too_large_message_en = (
     "Commit failed. The modified content is too long "
@@ -286,7 +293,7 @@ def generate_commit_message_base_diff(user_input, diff, issue):
     if (
         not response["content"]
         and response.get("error", None)
-        and f'{response["error"]}'.find("This model's maximum context length is") > 0
+        and f"{response['error']}".find("This model's maximum context length is") > 0
     ):
         print(model_token_limit_error)
         sys.exit(0)
@@ -355,23 +362,112 @@ def check_git_installed():
     return False
 
 
+def ask_for_push():
+    """
+    询问用户是否要推送(push)更改到远程仓库
+
+    Returns:
+        bool: 用户是否选择推送
+    """
+
+    print(
+        "Step 3/3: Would you like to push your commit to the remote repository?",
+        end="\n\n",
+        flush=True,
+    )
+
+    button = Button(["Yes, push now", "No, I'll push later"])
+    button.render()
+
+    return button.clicked == 0  # 如果用户点击第一个按钮(Yes)，则返回True
+
+
+def push_changes():
+    """
+    推送更改到远程仓库
+
+    Returns:
+        bool: 推送是否成功
+    """
+    try:
+        current_branch = get_current_branch()
+        if not current_branch:
+            print(
+                "Could not determine current branch. Push failed.",
+                end="\n\n",
+                file=sys.stderr,
+                flush=True,
+            )
+            return False
+
+        print(f"Pushing changes to origin/{current_branch}...", end="\n\n", flush=True)
+        result = subprocess_run(
+            ["git", "push", "origin", current_branch],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+
+        if result.returncode != 0:
+            print(f"Push failed: {result.stderr}", end="\n\n", flush=True)
+            return False
+        print("Push completed successfully.", end="\n\n", flush=True)
+        return True
+    except subprocess.CalledProcessError as e:
+        print(f"Push failed: {str(e)}", end="\n\n", file=sys.stderr, flush=True)
+        return False
+    except Exception as e:
+        print(
+            f"An unexpected error occurred: {str(e)}",
+            end="\n\n",
+            file=sys.stderr,
+            flush=True,
+        )
+        return False
+
+
+def get_selected_issue_ids():
+    """
+    获取用户选中的issue id
+
+    Returns:
+        list: 用户选中的issue id列表
+    """
+    name = get_github_username()
+    issue_repo = get_github_repo(True)
+    issues = get_github_repo_issues(issue_repo, assignee=name, state="open")
+    if issues:
+        checkbox = Checkbox(
+            [f"#{issue['number']}: {issue['title']}" for issue in issues],
+            title="Select the issues you want to close",
+        )
+        checkbox.render()
+        return [issues[idx]["number"] for idx in checkbox.selections]
+
+
 def main():
     global language
     try:
         print("Let's follow the steps below.\n\n")
         # Ensure enough command line arguments are provided
-        if len(sys.argv) < 3:
-            print("Usage: python script.py <user_input> <language>", file=sys.stderr, flush=True)
+        if len(sys.argv) < 2:
+            print(
+                "Usage: python script.py <user_input> <language>",
+                file=sys.stderr,
+                flush=True,
+            )
             sys.exit(-1)
 
         user_input = sys.argv[1]
+        language = "english"
+        if len(sys.argv) > 2:
             language = sys.argv[2]
 
         if not check_git_installed():
             sys.exit(-1)
 
         print(
-            "Step 1/2: Select the files you've changed that you wish to include in this commit, "
+            "Step 1/3: Select the files you've changed that you wish to include in this commit, "
             "then click 'Submit'.",
             end="\n\n",
             flush=True,
@@ -389,7 +485,7 @@ def main():
         rebuild_stage_list(selected_files)
 
         print(
-            "Step 2/2: Review the commit message I've drafted for you. "
+            "Step 2/3: Review the commit message I've drafted for you. "
             "Edit it below if needed. Then click 'Commit' to proceed with "
             "the commit using this message.",
             end="\n\n",
@@ -411,11 +507,27 @@ def main():
             .replace("No specific issue to close", "")
             .replace("No specific issue mentioned.", "")
         )
-
+        # add closes #IssueNumber in commit message from issues from user selected
+        issue_ids = get_selected_issue_ids()
+        if issue_ids:
+            issue_repo = get_github_repo(True)
+            owner_repo = get_github_repo()
+            closes_issue_contents = []
+            for issue_id in issue_ids:
+                closes_issue_contents.append(
+                    f"#{issue_id}" if owner_repo == issue_repo else f"{issue_repo}#{issue_id}"
+                )
+            commit_message["content"] += f"\n\nCloses {', '.join(closes_issue_contents)}"
         commit_result = display_commit_message_and_commit(commit_message["content"])
         if not commit_result:
             print("Commit aborted.", flush=True)
         else:
+            # 添加推送步骤
+            if ask_for_push():
+                if not push_changes():
+                    print("Push failed.", flush=True)
+                    sys.exit(-1)
+
             print("Commit completed.", flush=True)
         sys.exit(0)
     except Exception as err:

community/github/commit/diffCommitMessagePrompt.txt

@@ -6,23 +6,21 @@ Objective:** Generate a commit message that succinctly describes the codebase ch
 3. **Closing Reference (Conditional):** Include the line `Closes #IssueNumber` only if a specific, relevant issue number has been mentioned in the user input.
 
 **Response Format:**
-```
+Response should be in the following markdown codeblock format:
+```commit
 type: Title
 
 - Detail message line 1
 - Detail message line 2
 - Detail message line 3
-
-Closes #IssueNumber
 ```
-Only append the \"Closes #IssueNumber\" if the user input explicitly references an issue to close.
+Only output the commit message codeblock, don't include any other text.
 
 **Constraints:**
 - Exclude markdown code block indicators (```) and the placeholder \"commit_message\" from your response.
 - Follow commit message best practices:
   - Limit the title length to 50 characters.
   - Limit each summary line to 72 characters.
-- If the precise issue number is not known or not stated by the user, do not include the closing reference.
 
 **User Input:** `{__USER_INPUT__}`
 
@@ -37,3 +35,11 @@ Related issue:
 {__ISSUE__}
 Utilize the provided format to craft a commit message that adheres to the stipulated criteria.
 
+example output:
+```commit
+feature: add update user info API
+
+- add post method api /user/update
+- implement update user info logic
+```
+

community/github/git_api.py

@@ -203,7 +203,10 @@ def check_git_installed():
     """
     try:
         subprocess_run(
-            ["git", "--version"], check=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+            ["git", "--version"],
+            check=True,
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
         )
         return True
     except subprocess.CalledProcessError:
@@ -304,7 +307,8 @@ def get_parent_branch():
     try:
         # 使用git命令获取当前分支的父分支引用
         result = subprocess_check_output(
-            ["git", "rev-parse", "--abbrev-ref", f"{current_branch}@{1}"], stderr=subprocess.STDOUT
+            ["git", "rev-parse", "--abbrev-ref", f"{current_branch}@{1}"],
+            stderr=subprocess.STDOUT,
         ).strip()
         # 将结果从bytes转换为str
         parent_branch_ref = result.decode("utf-8")
@@ -394,7 +398,10 @@ def get_commit_messages(base_branch):
 def create_pull_request(title, body, head, base, repo_name):
     url = f"{GITHUB_API_URL}/repos/{repo_name}/pulls"
     print("url:", url, end="\n\n")
-    headers = {"Authorization": f"token {GITHUB_ACCESS_TOKEN}", "Content-Type": "application/json"}
+    headers = {
+        "Authorization": f"token {GITHUB_ACCESS_TOKEN}",
+        "Content-Type": "application/json",
+    }
     payload = {"title": title, "body": body, "head": head, "base": base}
     response = requests.post(url, headers=headers, data=json.dumps(payload))
     if response.status_code == 201:
@@ -479,7 +486,10 @@ def get_recently_pr(repo):
 
 def update_pr(pr_number, title, body, repo_name):
     url = f"{GITHUB_API_URL}/repos/{repo_name}/pulls/{pr_number}"
-    headers = {"Authorization": f"token {GITHUB_ACCESS_TOKEN}", "Content-Type": "application/json"}
+    headers = {
+        "Authorization": f"token {GITHUB_ACCESS_TOKEN}",
+        "Content-Type": "application/json",
+    }
     payload = {"title": title, "body": body}
     response = requests.patch(url, headers=headers, data=json.dumps(payload))
 
@@ -526,3 +536,52 @@ def save_last_base_branch(base_branch=None):
         base_branch = get_current_branch()
     project_config_path = os.path.join(os.getcwd(), ".chat", ".workflow_config.json")
     save_config_item(project_config_path, "last_base_branch", base_branch)
+
+
+def get_github_username():
+    url = f"{GITHUB_API_URL}/user"
+    headers = {
+        "Authorization": f"token {GITHUB_ACCESS_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    response = requests.get(url, headers=headers)
+    return response.json()["login"]
+
+
+def get_github_repo_issues(
+    owner_repo,
+    milestone=None,
+    state=None,
+    assignee=None,
+    creator=None,
+    mentioned=None,
+    labels=None,
+    sort=None,
+    direction=None,
+    since=None,
+    per_page=None,
+    page=None,
+):
+    url = f"{GITHUB_API_URL}/repos/{owner_repo}/issues"
+    headers = {
+        "Authorization": f"token {GITHUB_ACCESS_TOKEN}",
+        "Accept": "application/vnd.github.v3+json",
+    }
+    params = {
+        "milestone": milestone,
+        "state": state,
+        "assignee": assignee,
+        "creator": creator,
+        "mentioned": mentioned,
+        "labels": labels,
+        "sort": sort,
+        "direction": direction,
+        "since": since,
+        "per_page": per_page,
+        "page": page,
+    }
+    response = requests.get(url, headers=headers, params=params)
+    if response.status_code == 200:
+        return response.json()
+    else:
+        return None

community/github/list_issue_tasks/command.yml

@@ -1,4 +1,4 @@
-description: 'Create new issue.'
+description: 'List issue tasks.'
 input: required
 help: README.md
 steps:

community/github/update_issue_tasks/command.yml

@@ -1,4 +1,4 @@
-description: 'Create new issue.'
+description: 'Update issue tasks.'
 input: required
 help: README.md
 steps:

community/github/update_pr/command.yml

@@ -1,4 +1,4 @@
-description: 'Create new PR.'
+description: 'Update PR.'
 input: required
 help: README.md
 steps:

community/gitlab/code_task_summary/command.yml

@@ -0,0 +1,5 @@
+description: 'Generate code task summary.'
+input: optional
+help: README.md
+steps:
+  - run: $devchat_python $command_path/command.py "$input"

community/gitlab/command.yml

@@ -0,0 +1 @@
+description: Root of gitlab commands.

community/gitlab/commit/commit.py

@@ -6,7 +6,7 @@ import sys
 
 from devchat.llm import chat_completion_stream
 
-from lib.chatmark import Checkbox, Form, TextEditor
+from lib.chatmark import Button, Checkbox, Form, TextEditor
 from lib.ide_service import IDEService
 
 sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), ".."))
@@ -286,7 +286,7 @@ def generate_commit_message_base_diff(user_input, diff, issue):
     if (
         not response["content"]
         and response.get("error", None)
-        and f'{response["error"]}'.find("This model's maximum context length is") > 0
+        and f"{response['error']}".find("This model's maximum context length is") > 0
     ):
         print(model_token_limit_error)
         sys.exit(0)
@@ -355,23 +355,84 @@ def check_git_installed():
     return False
 
 
+def ask_for_push():
+    """
+    询问用户是否要推送(push)更改到远程仓库
+
+    Returns:
+        bool: 用户是否选择推送
+    """
+
+    print(
+        "Step 3/3: Would you like to push your commit to the remote repository?",
+        end="\n\n",
+        flush=True,
+    )
+
+    button = Button(["Yes, push now", "No, I'll push later"])
+    button.render()
+
+    return button.clicked == 0  # 如果用户点击第一个按钮(Yes)，则返回True
+
+
+def push_changes():
+    """
+    推送更改到远程仓库
+
+    Returns:
+        bool: 推送是否成功
+    """
+    try:
+        current_branch = get_current_branch()
+        if not current_branch:
+            print(
+                "Could not determine current branch. Push failed.",
+                end="\n\n",
+                file=sys.stderr,
+                flush=True,
+            )
+            return False
+
+        print(f"Pushing changes to origin/{current_branch}...", end="\n\n", flush=True)
+        result = subprocess_run(
+            ["git", "push", "origin", current_branch],
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+        )
+
+        if result.returncode != 0:
+            print(f"Push failed: {result.stderr}", end="\n\n", flush=True)
+            return False
+        print("Push completed successfully.", end="\n\n", flush=True)
+        return True
+    except subprocess.CalledProcessError as e:
+        print(f"Push failed: {str(e)}", end="\n\n", file=sys.stderr, flush=True)
+        return False
+    except Exception as e:
+        print(f"An unexpected error occurred: {str(e)}", end="\n\n", file=sys.stderr, flush=True)
+        return False
+
+
 def main():
     global language
     try:
         print("Let's follow the steps below.\n\n")
         # Ensure enough command line arguments are provided
-        if len(sys.argv) < 3:
+        if len(sys.argv) < 2:
             print("Usage: python script.py <user_input> <language>", file=sys.stderr, flush=True)
             sys.exit(-1)
 
         user_input = sys.argv[1]
+        language = "english"
+        if len(sys.argv) > 2:
             language = sys.argv[2]
 
         if not check_git_installed():
             sys.exit(-1)
 
         print(
-            "Step 1/2: Select the files you've changed that you wish to include in this commit, "
+            "Step 1/3: Select the files you've changed that you wish to include in this commit, "
             "then click 'Submit'.",
             end="\n\n",
             flush=True,
@@ -389,7 +450,7 @@ def main():
         rebuild_stage_list(selected_files)
 
         print(
-            "Step 2/2: Review the commit message I've drafted for you. "
+            "Step 2/3: Review the commit message I've drafted for you. "
             "Edit it below if needed. Then click 'Commit' to proceed with "
             "the commit using this message.",
             end="\n\n",
@@ -416,6 +477,12 @@ def main():
         if not commit_result:
             print("Commit aborted.", flush=True)
         else:
+            # 添加推送步骤
+            if ask_for_push():
+                if not push_changes():
+                    print("Push failed.", flush=True)
+                    sys.exit(-1)
+
             print("Commit completed.", flush=True)
         sys.exit(0)
     except Exception as err:

community/gitlab/commit/diffCommitMessagePrompt.txt

@@ -6,16 +6,18 @@ Objective:** Generate a commit message that succinctly describes the codebase ch
 3. **Closing Reference (Conditional):** Include the line `Closes #IssueNumber` only if a specific, relevant issue number has been mentioned in the user input.
 
 **Response Format:**
-```
+Response should be in the following markdown codeblock format:
+```commit
 type: Title
 
 - Detail message line 1
 - Detail message line 2
 - Detail message line 3
 
-Closes #IssueNumber
+Closes <#IssueNumber>
 ```
 Only append the \"Closes #IssueNumber\" if the user input explicitly references an issue to close.
+Only output the commit message codeblock, don't include any other text.
 
 **Constraints:**
 - Exclude markdown code block indicators (```) and the placeholder \"commit_message\" from your response.
@@ -37,3 +39,11 @@ Related issue:
 {__ISSUE__}
 Utilize the provided format to craft a commit message that adheres to the stipulated criteria.
 
+example output:
+```commit
+feature: add update user info API
+
+- add post method api /user/update
+- implement update user info logic
+```
+

community/gitlab/list_issue_tasks/command.yml

@@ -1,4 +1,4 @@
-description: 'Create new issue.'
+description: 'List issue tasks.'
 input: required
 help: README.md
 steps:

community/gitlab/update_issue_tasks/command.yml

@@ -0,0 +1,5 @@
+description: 'Update issue tasks.'
+input: required
+help: README.md
+steps:
+  - run: $devchat_python $command_path/command.py "$input"

community/gitlab/update_pr/command.yml

@@ -1,4 +1,4 @@
-description: 'Create new PR.'
+description: 'Update PR.'
 input: required
 help: README.md
 steps:

community/pr/custom_suggestions/README.md

@@ -1,6 +1,6 @@
 
-# pr.improve
-**/pr.improve命令用于生成PR的代码建议。**
+# pr.custom_suggestions
+**/pr.custom_suggestions命令用于生成PR的代码建议。**
 
 使用方式为：/pr.improve <PR_URL>, 例如：
 /pr.improve https://github.com/devchat-ai/devchat/pull/301

community/pr/custom_suggestions/command.yml

@@ -1,4 +1,4 @@
-description: "review pr"
+description: "Generate custom suggestions for PR."
 input: required
 help: README.md
 steps: