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

moving the 'improve' command to turbo mode, with auto_extended=true #636

Merged
merged 1 commit into from
Feb 1, 2024

Conversation

mrT23
Copy link
Collaborator

@mrT23 mrT23 commented Feb 1, 2024

Type

Enhancement


Description

  • This PR introduces enhancements to handle a new type of model, 'TURBO', in addition to the regular models.
  • A new Enum 'ModelType' is introduced to differentiate between 'REGULAR' and 'TURBO' models.
  • The 'retry_with_fallback_models' and '_get_all_models' functions in 'pr_processing.py' are updated to handle the new 'model_type' parameter.
  • The 'run' function in 'pr_code_suggestions.py' is updated to use the 'TURBO' model type for predictions.
  • The 'configuration.toml' file is updated with new configurations for the turbo model and code suggestions.

Changes walkthrough

Relevant files
Configuration changes
__init__.py
Addition of new model 'gpt-4-0125-preview'                                             

pr_agent/algo/init.py

  • Added a new model 'gpt-4-0125-preview' to the list of models.

+1/-0     
configuration.toml
Configuration updates for turbo model and code suggestions             

pr_agent/settings/configuration.toml

  • Added a new configuration 'model_turbo' for specifying the turbo
    model.
    - Updated several configurations under 'pr_code_suggestions' section.

+7/-5     
Enhancement
pr_processing.py
Enhancements to model handling functions                                                 

pr_agent/algo/pr_processing.py

  • Modified the 'retry_with_fallback_models' function to accept a new
    parameter 'model_type'.
    - Updated the '_get_all_models' function to handle different types of
    models based on the 'model_type' parameter.

+8/-5     
utils.py
Introduction of new Enum 'ModelType'                                                         

pr_agent/algo/utils.py

  • Introduced a new Enum 'ModelType' with two types: 'REGULAR' and
    'TURBO'.

+4/-0     
pr_code_suggestions.py
Enhancements to the 'run' function                                                             

pr_agent/tools/pr_code_suggestions.py

  • Updated the 'run' function to use the 'TURBO' model type for
    predictions.
    - Added a condition to limit context specifically for the 'improve'
    command.

+11/-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 1, 2024
Copy link
Contributor

PR Description updated to latest commit (d04d8b6)

Copy link
Contributor

PR Analysis

  • 🎯 Main theme: Enhancement of the 'improve' command with turbo mode and auto_extended=true
  • 📝 PR summary: This PR introduces enhancements to handle a new type of model, 'TURBO', in addition to the regular models. It updates the 'retry_with_fallback_models' and '_get_all_models' functions in 'pr_processing.py' to handle the new 'model_type' parameter. The 'run' function in 'pr_code_suggestions.py' is updated to use the 'TURBO' model type for predictions. The 'configuration.toml' file is also updated with new configurations for the turbo model and code suggestions.
  • 📌 Type of PR: Enhancement
  • 🧪 Relevant tests added: No
  • ⏱️ Estimated effort to review [1-5]: 3, because the PR involves changes in multiple files and introduces a new model type which requires understanding of the existing model handling logic.
  • 🔒 Security concerns: No

PR Feedback

💡 General suggestions: The PR seems to be well-structured and the changes are logically grouped. However, it would be beneficial to add comments explaining the logic behind the new 'TURBO' model type and how it differs from the 'REGULAR' model type. This would help other developers understand the changes better. Also, it would be good to add error handling for the case when an unsupported model type is provided.


✨ 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 'general suggestions' 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.

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.

Copy link
Contributor

PR Code Suggestions

Suggestions                                                                                                                                                         
best practice
Remove the default argument from the _get_all_models function to ensure explicit model type specification.

The function _get_all_models has a default argument ModelType.REGULAR. If the function <br> is <br> called <br> without <br> any <br> arguments, <br> it <br> will <br> always <br> return <br> the <br> regular <br> model. <br> Consider <br> removing <br> the <br> default <br> argument <br> to <br> ensure <br> that <br> the <br> function <br> caller <br> explicitly <br> specifies <br> the <br> model <br> type.

pr_agent/algo/pr_processing.py [246-250]

-def _get_all_models(model_type: ModelType = ModelType.REGULAR) -> List[str]:
+def _get_all_models(model_type: ModelType) -> List[str]:
     if model_type == ModelType.TURBO:
         model = get_settings().config.model_turbo
     else:
         model = get_settings().config.model
 
maintainability
Break down the run method into smaller methods to improve readability and maintainability.

The run method has a lot of responsibilities. Consider breaking it down into smaller
methods to improve readability and maintainability.

pr_agent/tools/pr_code_suggestions.py [64-78]

 async def run(self):
     ...
+    data = self._prepare_data()
+    ...
+
+def _prepare_data(self):
     if not self.is_extended:
         await retry_with_fallback_models(self._prepare_prediction, ModelType.TURBO)
-        data = self._prepare_pr_code_suggestions()
+        return self._prepare_pr_code_suggestions()
     else:
-        data = await retry_with_fallback_models(self._prepare_prediction_extended, ModelType.TURBO)
-    ...
+        return await retry_with_fallback_models(self._prepare_prediction_extended, ModelType.TURBO)
 
Remove the repetition of comments or add more specific information for each model.

The comment # 128K, but may be limited by config.max_model_tokens is repeated for
different models. Consider removing the repetition or adding more specific information for
each model.

pr_agent/algo/init.py [11-12]

-'gpt-4-1106-preview': 128000, # 128K, but may be limited by config.max_model_tokens
-'gpt-4-0125-preview': 128000,  # 128K, but may be limited by config.max_model_tokens
+'gpt-4-1106-preview': 128000, # 128K, may be limited by config.max_model_tokens
+'gpt-4-0125-preview': 128000,  # 128K, may also be limited by config.max_model_tokens
 
performance
Consider reducing the max_context_tokens setting or making it configurable to avoid potential performance issues.

The max_context_tokens setting is set to 8000. If this value is too high, it might cause
performance issues. Consider reducing it or making it configurable.

pr_agent/settings/configuration.toml [72]

 [pr_code_suggestions] # /improve #
-max_context_tokens=8000
+max_context_tokens=4000
 

✨ 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.

@mrT23 mrT23 merged commit cb8ff2b into main Feb 1, 2024
3 checks passed
@mrT23 mrT23 deleted the tr/model_turbo branch February 1, 2024 14:57
yochail pushed a commit to yochail/pr-agent that referenced this pull request Feb 11, 2024
moving the 'improve' command to turbo mode, with auto_extended=true
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