Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add loading comment to /improve #653

Merged
merged 5 commits into from
Feb 11, 2024
Merged

add loading comment to /improve #653

merged 5 commits into from
Feb 11, 2024

Conversation

hussam789
Copy link
Collaborator

@hussam789 hussam789 commented Feb 11, 2024

Type

enhancement


Description

  • Introduced a visual loading feedback using a progress GIF for users when generating PR code suggestions.
  • Improved the user experience by dynamically updating or removing the progress comment based on the generation outcome.
  • This change makes the PR code suggestions feature more interactive and informative during the processing phase.

Changes walkthrough

Relevant files
Enhancement
pr_code_suggestions.py
Enhance Feedback Mechanism for PR Code Suggestions Generation   

pr_agent/tools/pr_code_suggestions.py

  • Introduced a loading comment with a progress GIF when generating PR
    code suggestions.
  • Enhanced the feedback mechanism by editing or deleting the progress
    comment based on the outcome.
  • Utilized edit_comment and delete methods on progress_response to
    update or clear the progress feedback.
  • +19/-3   

    ✨ Usage guide:

    Overview:
    The describe tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.

    When commenting, to edit configurations related to the describe tool (pr_description section), use the following template:

    /describe --pr_description.some_config1=... --pr_description.some_config2=...
    

    With a configuration file, use the following template:

    [pr_description]
    some_config1=...
    some_config2=...
    
    Enabling\disabling automation
    • When you first install the app, the default mode for the describe tool is:
    pr_commands = ["/describe --pr_description.add_original_user_description=true" 
                             "--pr_description.keep_original_user_title=true", ...]
    

    meaning the describe tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description.

    • Markers are an alternative way to control the generated description, to give maximal control to the user. If you set:
    pr_commands = ["/describe --pr_description.use_description_markers=true", ...]
    

    the tool will replace every marker of the form pr_agent:marker_name in the PR description with the relevant content, where marker_name is one of the following:

    • type: the PR type.
    • summary: the PR summary.
    • walkthrough: the PR walkthrough.

    Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.

    Custom labels

    The default labels of the describe tool are quite generic: [Bug fix, Tests, Enhancement, Documentation, Other].

    If you specify custom labels in the repo's labels page or via configuration file, you can get tailored labels for your use cases.
    Examples for custom labels:

    • Main topic:performance - pr_agent:The main topic of this PR is performance
    • New endpoint - pr_agent:A new endpoint was added in this PR
    • SQL query - pr_agent:A new SQL query was added in this PR
    • Dockerfile changes - pr_agent:The PR contains changes in the Dockerfile
    • ...

    The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases.
    Note that Labels are not mutually exclusive, so you can add multiple label categories.
    Make sure to provide proper title, and a detailed and well-phrased description for each label, so the tool will know when to suggest it.

    Inline File Walkthrough 💎

    For enhanced user experience, the describe tool can add file summaries directly to the "Files changed" tab in the PR page.
    This will enable you to quickly understand the changes in each file, while reviewing the code changes (diffs).

    To enable inline file summary, set pr_description.inline_file_summary in the configuration file, possible values are:

    • 'table': File changes walkthrough table will be displayed on the top of the "Files changed" tab, in addition to the "Conversation" tab.
    • true: A collapsable file comment with changes title and a changes summary for each file in the PR.
    • false (default): File changes walkthrough will be added only to the "Conversation" tab.
    Utilizing extra instructions

    The describe tool can be configured with extra instructions, to guide the model to a feedback tailored to the needs of your project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Notice that the general structure of the description is fixed, and cannot be changed. Extra instructions can change the content or style of each sub-section of the PR description.

    Examples for extra instructions:

    [pr_description] 
    extra_instructions="""
    - The PR title should be in the format: '<PR type>: <title>'
    - The title should be short and concise (up to 10 words)
    - ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the describe usage page for a comprehensive guide on using this tool.

    @codiumai-pr-agent-pro codiumai-pr-agent-pro bot added the enhancement New feature or request label Feb 11, 2024
    Copy link

    PR Description updated to latest commit (d93a24b)

    Copy link

    PR Review

         PR feedback                    
    ⏱️ Estimated effort to review [1-5]

    2, because the changes are focused on a single functionality enhancement within a specific file. The logic is straightforward, involving the addition of progress feedback during the generation of PR code suggestions. The changes are well-contained and do not seem to introduce complex new logic.

    🧪 Relevant tests

    No

    🔍 Possible issues
    • The addition of a progress GIF and the logic to update or delete the progress comment based on various outcomes is a nice touch. However, there's a potential issue if the edit_comment or delete methods fail. It's not clear from the diff if there are retries or error handling for these operations.
    • The use of an external image URL for the progress GIF (https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif) introduces a dependency on the availability of this URL. If the URL becomes inaccessible, it could degrade the user experience.
    🔒 Security concerns

    No


    ✨ Usage guide:

    Overview:
    The review tool scans the PR code changes, and generates a PR review. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on any PR.
    When commenting, to edit configurations related to the review tool (pr_reviewer section), use the following template:

    /review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=...
    

    With a configuration file, use the following template:

    [pr_reviewer]
    some_config1=...
    some_config2=...
    
    Utilizing extra instructions

    The review tool can be configured with extra instructions, which can be used to guide the model to a feedback tailored to the needs of your project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize.

    Examples for extra instructions:

    [pr_reviewer] # /review #
    extra_instructions="""
    In the 'possible issues' section, emphasize the following:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    How to enable\disable automation
    • When you first install PR-Agent app, the default mode for the review tool is:
    pr_commands = ["/review", ...]
    

    meaning the review tool will run automatically on every PR, with the default configuration.
    Edit this field to enable/disable the tool, or to change the used configurations

    Auto-labels

    The review tool can auto-generate two specific types of labels for a PR:

    • a possible security issue label, that detects possible security issues (enable_review_labels_security flag)
    • a Review effort [1-5]: x label, where x is the estimated effort to review the PR (enable_review_labels_effort flag)
    Extra sub-tools

    The review tool provides a collection of possible feedbacks about a PR.
    It is recommended to review the possible options, and choose the ones relevant for your use case.
    Some of the feature that are disabled by default are quite useful, and should be considered for enabling. For example:
    require_score_review, require_soc2_ticket, and more.

    Auto-approve PRs

    By invoking:

    /review auto_approve
    

    The tool will automatically approve the PR, and add a comment with the approval.

    To ensure safety, the auto-approval feature is disabled by default. To enable auto-approval, you need to actively set in a pre-defined configuration file the following:

    [pr_reviewer]
    enable_auto_approval = true
    

    (this specific flag cannot be set with a command line argument, only in the configuration file, committed to the repository)

    You can also enable auto-approval only if the PR meets certain requirements, such as that the estimated_review_effort is equal or below a certain threshold, by adjusting the flag:

    [pr_reviewer]
    maximal_review_effort = 5
    
    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the review usage page for a comprehensive guide on using this tool.

    @mrT23
    Copy link
    Collaborator

    mrT23 commented Feb 11, 2024

    please test this also on bitbucket and gitlab

    Copy link

    PR Code Suggestions

    Suggestions                                                                                                                                                     
    maintainability
    Use more descriptive variable names for clarity.                             

    Consider using a more descriptive variable name instead of progress_response. A name like
    loading_comment_id could better convey the purpose of the variable, which is to hold the
    identifier for the loading comment.

    pr_agent/tools/pr_code_suggestions.py [70]

    -self.progress_response = None
    +self.loading_comment_id = None
     
    possible issue
    Handle exceptions when interacting with external services.                   

    Ensure to handle potential exceptions when publishing or editing comments to avoid runtime
    errors. Wrap the calls to publish_comment and edit_comment with try-except blocks.

    pr_agent/tools/pr_code_suggestions.py [77]

    -self.progress_response = self.git_provider.publish_comment(self.progress)
    +try:
    +    self.progress_response = self.git_provider.publish_comment(self.progress)
    +except Exception as e:
    +    get_logger().error(f"Failed to publish progress comment: {e}")
     
    enhancement
    Improve string readability and maintainability.                              

    Instead of concatenating strings to build self.progress, use a multiline string for better
    readability and maintainability.

    pr_agent/tools/pr_code_suggestions.py [68-69]

    -self.progress = f"## Generating PR code suggestions\n\n"
    -self.progress += f"""\nWork in progress ...<br>\n<img src="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif" width=48>"""
    +self.progress = f"""## Generating PR code suggestions
     
    +Work in progress ...<br>
    +<img src="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif" width=48>"""
    +
    performance
    Use asynchronous operations within async functions.                          

    Use asynchronous versions of publish_comment and edit_comment if available, to avoid
    blocking the event loop, especially since the surrounding function is an async function.

    pr_agent/tools/pr_code_suggestions.py [77]

    -self.progress_response = self.git_provider.publish_comment(self.progress)
    +self.progress_response = await self.git_provider.async_publish_comment(self.progress)
     
    best practice
    Avoid dangling references by resetting variables after deletion.             

    After deleting the progress response, set self.progress_response to None to avoid
    potential issues with dangling references.

    pr_agent/tools/pr_code_suggestions.py [120]

     self.progress_response.delete()
    +self.progress_response = None
     

    ✨ Usage guide:

    Overview:
    The improve tool scans the PR code changes, and automatically generates suggestions for improving the PR code. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.
    When commenting, to edit configurations related to the improve tool (pr_code_suggestions section), use the following template:

    /improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...
    

    With a configuration file, use the following template:

    [pr_code_suggestions]
    some_config1=...
    some_config2=...
    
    Enabling\disabling automation

    When you first install the app, the default mode for the improve tool is:

    pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...]
    

    meaning the improve tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically.

    Utilizing extra instructions

    Extra instructions are very important for the improve tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.

    Examples for extra instructions:

    [pr_code_suggestions] # /improve #
    extra_instructions="""
    Emphasize the following aspects:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    A note on code suggestions quality
    • While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically.
    • Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base.
    • Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project, or use the custom suggestions 💎 tool
    • With large PRs, best quality will be obtained by using 'improve --extended' mode.
    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the improve usage page for a more comprehensive guide on using this tool.

    @hussam789
    Copy link
    Collaborator Author

    hussam789 commented Feb 11, 2024

    PR Code Suggestions

    Suggestions                                                                                                                                                     
    best practice
    Catch a more specific exception than Exception.                 

    Consider catching a more specific exception than the base Exception class to avoid masking
    other unexpected errors.

    pr_agent/git_providers/bitbucket_provider.py [195]

    -except Exception as e:
    +except SpecificException as e:
     
    Use specific exceptions for better error handling.                           

    Similar to other suggestions, catch a more specific exception than Exception to improve
    error handling.

    pr_agent/git_providers/gitlab_provider.py [185]

    -except Exception as e:
    +except SpecificException as e:
     
    enhancement
    Validate comment object before editing.                                      

    Ensure that the edit_comment method checks if the comment object is valid and can be
    edited before attempting to edit it.

    pr_agent/git_providers/github_provider.py [399]

    -comment.edit(body=body)
    +if comment and hasattr(comment, 'edit'):
    +    comment.edit(body=body)
     
    Use a template engine for HTML content.                                      

    Instead of directly manipulating strings for HTML content, consider using a template
    engine for better maintainability and security.

    pr_agent/tools/pr_code_suggestions.py [69]

    -self.progress += f"""\nWork in progress ...<br>\n<img src="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif" width=48>"""
    +self.progress += template_engine.render('progress_template', image_url="https://codium.ai/images/pr_agent/dual_ball_loading-crop.gif")
     
    Add error handling for comment editing and publishing.                       

    Implement error handling for the edit_comment and publish_comment methods to ensure the
    application can gracefully handle failures.

    pr_agent/tools/pr_code_suggestions.py [112]

    -self.git_provider.edit_comment(self.progress_response, body=pr_body)
    +try:
    +    self.git_provider.edit_comment(self.progress_response, body=pr_body)
    +except Exception as e:
    +    get_logger().exception("Failed to edit progress comment.")
     

    ✨ Usage guide:

    Overview:
    The improve tool scans the PR code changes, and automatically generates suggestions for improving the PR code. The tool can be triggered automatically every time a new PR is opened, or can be invoked manually by commenting on a PR.
    When commenting, to edit configurations related to the improve tool (pr_code_suggestions section), use the following template:

    /improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...
    

    With a configuration file, use the following template:

    [pr_code_suggestions]
    some_config1=...
    some_config2=...
    
    Enabling\disabling automation

    When you first install the app, the default mode for the improve tool is:

    pr_commands = ["/improve --pr_code_suggestions.summarize=true", ...]
    

    meaning the improve tool will run automatically on every PR, with summarization enabled. Delete this line to disable the tool from running automatically.

    Utilizing extra instructions

    Extra instructions are very important for the improve tool, since they enable to guide the model to suggestions that are more relevant to the specific needs of the project.

    Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.

    Examples for extra instructions:

    [pr_code_suggestions] # /improve #
    extra_instructions="""
    Emphasize the following aspects:
    - Does the code logic cover relevant edge cases?
    - Is the code logic clear and easy to understand?
    - Is the code logic efficient?
    ...
    """
    

    Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.

    A note on code suggestions quality
    • While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically.
    • Suggestions are not meant to be simplistic. Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base.
    • Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project, or use the custom suggestions 💎 tool
    • With large PRs, best quality will be obtained by using 'improve --extended' mode.
    More PR-Agent commands

    To invoke the PR-Agent, add a comment using one of the following commands:

    • /review: Request a review of your Pull Request.
    • /describe: Update the PR title and description based on the contents of the PR.
    • /improve [--extended]: Suggest code improvements. Extended mode provides a higher quality feedback.
    • /ask <QUESTION>: Ask a question about the PR.
    • /update_changelog: Update the changelog based on the PR's contents.
    • /add_docs 💎: Generate docstring for new components introduced in the PR.
    • /generate_labels 💎: Generate labels for the PR based on the PR's contents.
    • /analyze 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.

    See the tools guide for more details.
    To list the possible configuration parameters, add a /config comment.

    See the improve usage page for a more comprehensive guide on using this tool.

    @hussam789
    Copy link
    Collaborator Author

    This animation will be in Gitlab and Github, other git providers (with no gfm_markdown support) will work as before.

    Tested on:

    • Github
    • Gitlab
    • Bitbucket

    @hussam789 hussam789 requested a review from mrT23 February 11, 2024 12:13
    @mrT23 mrT23 merged commit 60d6fec into main Feb 11, 2024
    1 check passed
    @mrT23 mrT23 deleted the hl/loading_improve branch February 11, 2024 15:28
    yochail pushed a commit to yochail/pr-agent that referenced this pull request Feb 11, 2024
    Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
    Labels
    Projects
    None yet
    Development

    Successfully merging this pull request may close these issues.

    None yet

    2 participants