Update setup.py

docs/docs/chrome-extension/index.md

@@ -1,11 +1,11 @@
-[Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl){:target="_blank"} is a collection of tools that integrates seamlessly with your GitHub environment, aiming to enhance your Git usage experience, and providing AI-powered capabilities to your PRs.
+[Qodo Merge Chrome extension](https://chromewebstore.google.com/detail/pr-agent-chrome-extension/ephlnjeghhogofkifjloamocljapahnl) is a collection of tools that integrates seamlessly with your GitHub environment, aiming to enhance your Git usage experience, and providing AI-powered capabilities to your PRs.
 
 With a single-click installation you will gain access to a context-aware chat on your pull requests code, a toolbar extension with multiple AI feedbacks, Qodo Merge filters, and additional abilities.
 
 The extension is powered by top code models like Claude 3.5 Sonnet and GPT4. All the extension's features are free to use on public repositories.
 
-For private repositories, you will need to install [Qodo Merge Pro](https://github.com/apps/qodo-merge-pro){:target="_blank"} in addition to the extension  (Quick GitHub app setup with a 14-day free trial. No credit card needed).
+For private repositories, you will need to install [Qodo Merge Pro](https://github.com/apps/qodo-merge-pro) in addition to the extension  (Quick GitHub app setup with a 14-day free trial. No credit card needed).
-For a demonstration of how to install Qodo Merge Pro and use it with the Chrome extension, please refer to the tutorial video at the provided [link](https://codium.ai/images/pr_agent/private_repos.mp4){:target="_blank"}.
+For a demonstration of how to install Qodo Merge Pro and use it with the Chrome extension, please refer to the tutorial video at the provided [link](https://codium.ai/images/pr_agent/private_repos.mp4).
 
 <img src="https://codium.ai/images/pr_agent/PR-AgentChat.gif" width="768">
 

docs/docs/core-abilities/fetching_ticket_context.md

@@ -1,5 +1,5 @@
 # Fetching Ticket Context for PRs
-`Supported Git Platforms: GitHub, GitLab, Bitbucket`
+`Supported Git Platforms : GitHub, GitLab, Bitbucket`
 
 ## Overview
 Qodo Merge PR Agent streamlines code review workflows by seamlessly connecting with multiple ticket management systems.

docs/docs/core-abilities/metadata.md

@@ -32,14 +32,14 @@ For example, when generating code suggestions for different files, Qodo Merge ca
 
 @@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
+11  unchanged code line0 in the PR
-12  unchanged code line1
+12  unchanged code line1 in the PR
-13 +new code line2 added
+13 +new code line2 added in the PR
-14  unchanged code line3
+14  unchanged code line3 in the PR
 __old hunk__
  unchanged code line0
  unchanged code line1
--old code line2 removed
+-old code line2 removed in the PR
  unchanged code line3
 
 @@ ... @@ def func2():

docs/docs/installation/index.md

@@ -3,8 +3,8 @@
 ## Self-hosted Qodo Merge
 If you choose to host your own Qodo Merge, you first need to acquire two tokens:
 
-1. An OpenAI key from [here](https://platform.openai.com/api-keys){:target="_blank"}, with access to GPT-4 (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
+1. An OpenAI key from [here](https://platform.openai.com/api-keys), with access to GPT-4 (or a key for other [language models](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/), if you prefer).
-2. A GitHub\GitLab\BitBucket personal access token (classic), with the repo scope. [GitHub from [here](https://github.com/settings/tokens){:target="_blank"}]
+2. A GitHub\GitLab\BitBucket personal access token (classic), with the repo scope. [GitHub from [here](https://github.com/settings/tokens)]
 
 There are several ways to use self-hosted Qodo Merge:
 

docs/docs/overview/pr_agent_pro.md

@@ -1,6 +1,6 @@
 ### Overview
 
-[Qodo Merge Pro](https://www.codium.ai/pricing/){:target="_blank"} is a hosted version of open-source [Qodo Merge (PR-Agent)](https://github.com/Codium-ai/pr-agent){:target="_blank"}. A complimentary two-week trial is offered, followed by a monthly subscription fee.
+[Qodo Merge Pro](https://www.codium.ai/pricing/) is a hosted version of open-source [Qodo Merge (PR-Agent)](https://github.com/Codium-ai/pr-agent). A complimentary two-week trial is offered, followed by a monthly subscription fee.
 Qodo Merge Pro is designed for companies and teams that require additional features and capabilities. It provides the following benefits:
 
 1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the Qodo Merge app to your GitHub\GitLab\BitBucket repo.

docs/docs/tools/improve.md

@@ -122,7 +122,7 @@ Use triple quotes to write multi-line instructions. Use bullet points or numbers
 
 >`Platforms supported: GitHub, GitLab, Bitbucket`
 
-Another option to give additional guidance to the AI model is by creating a `best_practices.md` file, either in your repository's root directory or as a [**wiki page**](https://github.com/Codium-ai/pr-agent/wiki) (we recommend the wiki page, as editing and maintaining it over time is easier).
+Another option to give additional guidance to the AI model is by creating a dedicated [**wiki page**](https://github.com/Codium-ai/pr-agent/wiki) called `best_practices.md`.
 This page can contain a list of best practices, coding standards, and guidelines that are specific to your repo/organization.
 
 The AI model will use this wiki page as a reference, and in case the PR code violates any of the guidelines, it will create additional suggestions, with a dedicated label: `Organization

docs/docs/usage-guide/additional_configurations.md

@@ -1,5 +1,5 @@
 ## Show possible configurations
-The possible configurations of Qodo Merge are stored in [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml){:target="_blank"}.
+The possible configurations of Qodo Merge are stored in [here](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml).
 In the [tools](https://qodo-merge-docs.qodo.ai/tools/) page you can find explanations on how to use these configurations for each tool.
 
 To print all the available configurations as a comment on your PR, you can use the following command:

docs/docs/usage-guide/enabling_a_wiki.md

@@ -1,24 +0,0 @@
-`Supported Git Platforms: GitHub, GitLab, Bitbucket`
-
-
-For optimal functionality of Qodo Merge, we recommend enabling a wiki for each repository where Qodo Merge is installed. The wiki serves several important purposes:
-
-**Key Wiki Features:**
-
-- Storing a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/#wiki-configuration-file)
-- Defining a [`best_practices.md`](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) file
-- Track [accepted suggestions](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking)
-- Facilitates learning over time by creating an [auto_best_practices.md]() file
-
-
-**Setup Instructions (GitHub):**
-
-To enable a wiki for your repository:
-
-1. Navigate to your repository's main page on GitHub
-2. Select "Settings" from the top navigation bar
-3. Locate the "Features" section
-4. Enable the "Wikis" option by checking the corresponding box
-5. Return to your repository's main page
-6. Look for the newly added "Wiki" tab in the top navigation
-7. Initialize your wiki by clicking "Create the first page" (this step is important - without creating an initial page, the wiki will not be fully functional)

docs/docs/usage-guide/index.md

@@ -5,7 +5,6 @@ It includes information on how to adjust Qodo Merge configurations, define which
 
 
 - [Introduction](./introduction.md)
-- [Enabling a Wiki](./enabling_a_wiki)
 - [Configuration File](./configuration_options.md)
 - [Usage and Automation](./automations_and_usage.md)
     - [Local Repo (CLI)](./automations_and_usage.md#local-repo-cli)

docs/docs/usage-guide/introduction.md

@@ -2,7 +2,7 @@
 After [installation](https://qodo-merge-docs.qodo.ai/installation/), there are three basic ways to invoke Qodo Merge:
 
 1. Locally running a CLI command
-2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901){:target="_blank"} on a PR
+2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR
 3. Enabling Qodo Merge tools to run automatically when a new PR is opened
 
 

docs/mkdocs.yml

@@ -18,7 +18,6 @@ nav:
   - Usage Guide:
     - 'usage-guide/index.md'
     - Introduction: 'usage-guide/introduction.md'
-    - Enabling a Wiki: 'usage-guide/enabling_a_wiki.md'
     - Configuration File: 'usage-guide/configuration_options.md'
     - Usage and Automation: 'usage-guide/automations_and_usage.md'
     - Managing Mail Notifications: 'usage-guide/mail_notifications.md'

pr_agent/algo/__init__.py

@@ -42,7 +42,6 @@ MAX_TOKENS = {
     'vertex_ai/claude-3-5-sonnet-v2@20241022': 100000,
     'vertex_ai/gemini-1.5-pro': 1048576,
     'vertex_ai/gemini-1.5-flash': 1048576,
-    'vertex_ai/gemini-2.0-flash-exp': 1048576,
     'vertex_ai/gemma2': 8200,
     'gemini/gemini-1.5-pro': 1048576,
     'gemini/gemini-1.5-flash': 1048576,

pr_agent/cli.py

@@ -77,8 +77,6 @@ def run(inargs=None, args=None):
     async def inner():
         if args.issue_url:
             result = await asyncio.create_task(PRAgent().handle_request(args.issue_url, [command] + args.rest))
-        elif args.repo_url:
-            result = await asyncio.create_task(PRAgent().handle_request(args.repo_url, [command] + args.rest))
         else:
             result = await asyncio.create_task(PRAgent().handle_request(args.pr_url, [command] + args.rest))
 

pr_agent/settings/pr_code_suggestions_prompts.toml

@@ -17,36 +17,30 @@ The PR code diff will be in the following structured format:
 
 @@ ... @@ def func1():
 __new hunk__
- unchanged code line0
+ unchanged code line0 in the PR
- unchanged code line1
+ unchanged code line1 in the PR
-+new code line2 added
++new code line2 added in the PR
- unchanged code line3
+ unchanged code line3 in the PR
 __old hunk__
  unchanged code line0
  unchanged code line1
--old code line2 removed
+-old code line2 removed in the PR
  unchanged code line3
 
 @@ ... @@ def func2():
 __new hunk__
  unchanged code line4
-+new code line5 removed
++new code line5 removed in the PR
  unchanged code line6
 
 ## File: 'src/file2.py'
 ...
 ======
 
-Important notes about the structured diff format above:
+- In the format above, the diff is organized into separate '__new hunk__' and '__old hunk__' sections for each code chunk. '__new hunk__' contains the updated code, while '__old hunk__' shows the removed code. If no code was removed in a specific chunk, the __old hunk__ section will be omitted.
-1. Each PR code chunk is decoupled into separate '__new hunk__' and '__old hunk__' sections:
+- Code lines are prefixed with symbols: '+' for new code added in the PR, '-' for code removed, and ' ' for unchanged code.
-  - The '__new hunk__' section shows the code chunk AFTER the PR changes.
-  - The '__old hunk__' section shows the code chunk BEFORE the PR changes. If no code was removed from the chunk, the '__old hunk__' section will be omitted.
-2. The diff uses line prefixes to show changes:
-  '+' → new line code added (will appear only in '__new hunk__')
-  '-' → line code removed (will appear only in '__old hunk__')
-  ' ' → unchanged context lines (will appear in both sections)
 {%- if is_ai_metadata %}
-3. When available, an AI-generated summary will precede each file's diff, with a high-level overview of the changes. Note that this summary may not be fully accurate or complete.
+- When available, an AI-generated summary will precede each file's diff, with a high-level overview of the changes. Note that this summary may not be fully accurate or complete.
 {%- endif %}
 
 
@@ -56,17 +50,16 @@ Specific guidelines for generating code suggestions:
 {%- else %}
 - Provide up to {{ num_code_suggestions }} distinct and insightful code suggestions. Return less suggestions if no pertinent ones are applicable.
 {%- endif %}
-- DO NOT suggest implementing changes that are already present in the '+' lines compared to the '-' lines.
+- Focus solely on enhancing new code introduced in the PR, identified by '+' prefixes in '__new hunk__' sections.
-- Focus your suggestions ONLY on new code introduced in the PR ('+' lines in '__new hunk__' sections).
 {%- if not focus_only_on_problems %}
 - Prioritize suggestions that address potential issues, critical problems, and bugs in the PR code. Avoid repeating changes already implemented in the PR. If no pertinent suggestions are applicable, return an empty list.
 - Don't suggest to add docstring, type hints, or comments, to remove unused imports, or to use more specific exception types.
 {%- else %}
 - Only give suggestions that address critical problems and bugs in the PR code. If no relevant suggestions are applicable, return an empty list.
-- Do not suggest to change packages version, add missing import statement, or declare undefined variable.
+- Do not suggest to change packages versions.
 {%- endif %}
 - When mentioning code elements (variables, names, or files) in your response, surround them with backticks (`). For example: "verify that `user_id` is..."
-- Note that you only see changed code segments (diff hunks in a PR), not the entire codebase. Avoid suggestions that might duplicate existing functionality or questioning code elements (like variables declerations or import statements) that may be defined elsewhere in the codebase.
+- Remember that Pull Request reviews show only changed code segments (diff hunks), not the entire codebase. Without full context, be cautious about suggesting modifications that could duplicate existing functionality (such as error handling) or questioning variable declarations that may exist elsewhere. Keep your review focused on the visible changes, acknowledging they're part of a larger codebase.
 
 {%- if extra_instructions %}
 
@@ -86,7 +79,7 @@ class CodeSuggestion(BaseModel):
     suggestion_content: str = Field(description="An actionable suggestion to enhance, improve or fix the new code introduced in the PR. Don't present here actual code snippets, just the suggestion. Be short and concise")
     existing_code: str = Field(description="A short code snippet from a '__new hunk__' section that the suggestion aims to enhance or fix. Include only complete code lines. Use ellipsis (...) for brevity if needed. This snippet should represent the specific PR code targeted for improvement.")
     improved_code: str = Field(description="A refined code snippet that replaces the 'existing_code' snippet after implementing the suggestion.")
-    one_sentence_summary: str = Field(description="A concise, single-sentence overview (up to 6 words) of the suggested improvement. Focus on the 'what'. Be general, and avoid method or variable names.")
+    one_sentence_summary: str = Field(description="A concise, single-sentence overview of the suggested improvement. Focus on the 'what'. Be general, and avoid method or variable names.")
 {%- if not focus_only_on_problems %}
     label: str = Field(description="A single, descriptive label that best characterizes the suggestion type. Possible labels include 'security', 'possible bug', 'possible issue', 'performance', 'enhancement', 'best practice', 'maintainability', 'typo'. Other relevant labels are also acceptable.")
 {%- else %}

pr_agent/settings/pr_code_suggestions_reflect_prompts.toml

@@ -49,14 +49,14 @@ The PR code diff will be presented in the following structured format:
 
 @@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
+11  unchanged code line0 in the PR
-12  unchanged code line1
+12  unchanged code line1 in the PR
-13 +new code line2 added
+13 +new code line2 added in the PR
-14  unchanged code line3
+14  unchanged code line3 in the PR
 __old hunk__
  unchanged code line0
  unchanged code line1
--old code line2 removed
+-old code line2 removed in the PR
  unchanged code line3
 
 @@ ... @@ def func2():

pr_agent/settings/pr_reviewer_prompts.toml

@@ -16,20 +16,20 @@ The format we will use to present the PR code diff:
 
 @@ ... @@ def func1():
 __new hunk__
-11  unchanged code line0
+11  unchanged code line0 in the PR
-12  unchanged code line1
+12  unchanged code line1 in the PR
-13 +new code line2 added
+13 +new code line2 added in the PR
-14  unchanged code line3
+14  unchanged code line3 in the PR
 __old hunk__
  unchanged code line0
  unchanged code line1
--old code line2 removed
+-old code line2 removed in the PR
  unchanged code line3
 
 @@ ... @@ def func2():
 __new hunk__
  unchanged code line4
-+new code line5 removed
++new code line5 removed in the PR
  unchanged code line6
 
 ## File: 'src/file2.py'
@@ -43,7 +43,7 @@ __new hunk__
 {%- if is_ai_metadata %}
 - If available, an AI-generated summary will appear and provide a high-level overview of the file changes. Note that this summary may not be fully accurate or complete.
 {%- endif %}
-- When quoting variables, names or file paths from the code, use backticks (`) instead of single quote (').
+- When quoting variables or names from the code, use backticks (`) instead of single quote (').
 
 
 {%- if extra_instructions %}

setup.py

@@ -3,3 +3,4 @@
 from setuptools import setup
 
 setup()
+print("aaa")