Update setup.py

2025-07-13 01:00:39 +08:00 · 2024-11-03 14:07:43 +02:00
133 changed files with 549 additions and 918 deletions
--- a/.github/workflows/build-and-test.yaml
+++ b/.github/workflows/build-and-test.yaml
@ -37,3 +37,5 @@ jobs:
        name: Test dev docker
        run: |
          docker run --rm codiumai/pr-agent:test pytest -v tests/unittest
--- a/.github/workflows/pr-agent-review.yaml
+++ b/.github/workflows/pr-agent-review.yaml
@ -30,3 +30,6 @@ jobs:
          GITHUB_ACTION_CONFIG.AUTO_DESCRIBE: true
          GITHUB_ACTION_CONFIG.AUTO_REVIEW: true
          GITHUB_ACTION_CONFIG.AUTO_IMPROVE: true
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@ -1,17 +0,0 @@
 # disabled. We might run it manually if needed.
 name: pre-commit
 on:
  workflow_dispatch:
 #  pull_request:
 #  push:
 #    branches: [main]
 jobs:
  pre-commit:
    runs-on: ubuntu-latest
    steps:
      - uses: actions/checkout@v3
      - uses: actions/setup-python@v5
      # SEE https://github.com/pre-commit/action
      - uses: pre-commit/action@v3.0.1
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@ -1,46 +0,0 @@
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 default_language_version:
  python: python3
 repos:
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v5.0.0
    hooks:
      - id: check-added-large-files
      - id: check-toml
      - id: check-yaml
      - id: end-of-file-fixer
      - id: trailing-whitespace
  # - repo: https://github.com/rhysd/actionlint
  #   rev: v1.7.3
  #   hooks:
  #     - id: actionlint
  - repo: https://github.com/pycqa/isort
    # rev must match what's in dev-requirements.txt
    rev: 5.13.2
    hooks:
      - id: isort
  # - repo: https://github.com/PyCQA/bandit
  #   rev: 1.7.10
  #   hooks:
  #     - id: bandit
  #       args: [
  #         "-c", "pyproject.toml",
  #       ]
  # - repo: https://github.com/astral-sh/ruff-pre-commit
  #   rev: v0.7.1
  #   hooks:
  #     - id: ruff
  #       args:
  #         - --fix
  #     - id: ruff-format
  # -   repo: https://github.com/PyCQA/autoflake
  #     rev: v2.3.1
  #     hooks:
  #     -   id: autoflake
  #         args:
  #           - --in-place
  #           - --remove-all-unused-imports
  #           - --remove-unused-variables
--- a/README.md
+++ b/README.md
@ -43,38 +43,6 @@ Qode Merge PR-Agent aims to help efficiently review and handle pull requests, by
 ## News and Updates
 ### November 7, 2024
 Added new option: `--pr_code_suggestions.focus_only_on_problems=true`
 When enabled, this option reduces the number of code suggestions and categorizes them into just two groups: "Possible Issues" and "General". The suggestions will focus primarily on identifying and fixing code problems, rather than style considerations like best practices, maintainability, or readability.
 This mode is ideal for developers who want to concentrate specifically on finding and fixing potential bugs in their pull request code.
 **Example results:**
 Original mode
 <kbd><img src="https://qodo.ai/images/pr_agent/code_suggestions_original_mode.png" width="512"></kbd>
 Focused mode
 <kbd><img src="https://qodo.ai/images/pr_agent/code_suggestions_focused_mode.png" width="512"></kbd>
 ### November 4, 2024
 Qodo Merge PR Agent will now leverage context from Jira or GitHub tickets to enhance the PR Feedback. Read more about this feature 
 [here](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/)
 ### November 3, 2024
 Meaningful improvement to the quality of code suggestions by separating the code suggestion generation from [line number detection](https://github.com/Codium-ai/pr-agent/pull/1338)
 <kbd>![image](https://github.com/user-attachments/assets/093c185c-31ca-47a1-a4fe-be7d9335ea66)</kbd>
 ### October 27, 2024
 Qodo Merge PR Agent will now automatically document accepted code suggestions in a dedicated wiki page (`.pr_agent_accepted_suggestions`), enabling users to track historical changes, assess the tool's effectiveness, and learn from previously implemented recommendations in the repository.
--- a/docs/docs/chrome-extension/data_privacy.md
+++ b/docs/docs/chrome-extension/data_privacy.md
@ -2,3 +2,4 @@ We take your code's security and privacy seriously:
 - The Chrome extension will not send your code to any external servers.
 - For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge Pro integration.
--- a/docs/docs/core-abilities/fetching_ticket_context.md
+++ b/docs/docs/core-abilities/fetching_ticket_context.md
@ -1,115 +0,0 @@
 # Fetching Ticket Context for PRs
 ## Overview
 Qodo Merge PR Agent streamlines code review workflows by seamlessly connecting with multiple ticket management systems.
 This integration enriches the review process by automatically surfacing relevant ticket information and context alongside code changes.
 ## Affected Tools
 Ticket Recognition Requirements:
 1. The PR description should contain a link to the ticket.
 2. For Jira tickets, you should follow the instructions in [Jira Integration](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/#jira-integration) in order to authenticate with Jira.
 ### Describe tool
 Qodo Merge PR Agent will recognize the ticket and use the ticket content (title, description, labels) to provide additional context for the code changes.
 By understanding the reasoning and intent behind modifications, the LLM can offer more insightful and relevant code analysis.
 ### Review tool
 Similarly to the `describe` tool, the `review` tool will use the ticket content to provide additional context for the code changes.
 In addition, this feature will evaluate how well a Pull Request (PR) adheres to its original purpose/intent as defined by the associated ticket or issue mentioned in the PR description.
 Each ticket will be assigned a label (Compliance/Alignment level), Indicates the degree to which the PR fulfills its original purpose, Options: Fully compliant, Partially compliant or Not compliant.
 ![Ticket Compliance](https://www.qodo.ai/images/pr_agent/ticket_compliance_review.png){width=768}
 By default, the tool will automatically validate if the PR complies with the referenced ticket.
 If you want to disable this feedback, add the following line to your configuration file:
 ```toml
 [pr_reviewer]
 require_ticket_analysis_review=false
 ```
 ## Providers
 ### Github Issues Integration
 Qodo Merge PR Agent will automatically recognize Github issues mentioned in the PR description and fetch the issue content.
 Examples of valid GitHub issue references:
 - `https://github.com/<ORG_NAME>/<REPO_NAME>/issues/<ISSUE_NUMBER>`
 - `#<ISSUE_NUMBER>`
 - `<ORG_NAME>/<REPO_NAME>#<ISSUE_NUMBER>`
 Since Qodo Merge PR Agent is integrated with GitHub, it doesn't require any additional configuration to fetch GitHub issues.
 ### Jira Integration 💎
 We support both Jira Cloud and Jira Server/Data Center.
 To integrate with Jira, The PR Description should contain a link to the Jira ticket.
 For Jira integration, include a ticket reference in your PR description using either the complete URL format `https://<JIRA_ORG>.atlassian.net/browse/ISSUE-123` or the shortened ticket ID `ISSUE-123`.
 !!! note "Jira Base URL"
    If using the shortened format, ensure your configuration file contains the Jira base URL under the [jira] section like this:
    ```toml
    [jira]
    jira_base_url = "https://<JIRA_ORG>.atlassian.net"
    ```
 #### Jira Cloud 💎
 There are two ways to authenticate with Jira Cloud:
 **1) Jira App Authentication**
 The recommended way to authenticate with Jira Cloud is to install the Qodo Merge app in your Jira Cloud instance. This will allow Qodo Merge to access Jira data on your behalf.
 Installation steps:
 1. Click [here](https://auth.atlassian.com/authorize?audience=api.atlassian.com&client_id=8krKmA4gMD8mM8z24aRCgPCSepZNP1xf&scope=read%3Ajira-work%20offline_access&redirect_uri=https%3A%2F%2Fregister.jira.pr-agent.codium.ai&state=qodomerge&response_type=code&prompt=consent) to install the Qodo Merge app in your Jira Cloud instance, click the `accept` button.<br>
 ![Jira Cloud App Installation](https://www.qodo.ai/images/pr_agent/jira_app_installation1.png){width=384}
 2. After installing the app, you will be redirected to the Qodo Merge registration page. and you will see a success message.<br>
 ![Jira Cloud App success message](https://www.qodo.ai/images/pr_agent/jira_app_success.png){width=384}
 3. Now you can use the Jira integration in Qodo Merge PR Agent.
 **2) Email/Token Authentication**
 You can create an API token from your Atlassian account:
 1. Log in to https://id.atlassian.com/manage-profile/security/api-tokens.
 2. Click Create API token.
 3. From the dialog that appears, enter a name for your new token and click Create.
 4. Click Copy to clipboard.
 ![Jira Cloud API Token](https://images.ctfassets.net/zsv3d0ugroxu/1RYvh9lqgeZjjNe5S3Hbfb/155e846a1cb38f30bf17512b6dfd2229/screenshot_NewAPIToken){width=384}
 5. In your [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) add the following lines:
 ```toml
 [jira]
 jira_api_token = "YOUR_API_TOKEN"
 jira_api_email = "YOUR_EMAIL"
 ```
 #### Jira Server/Data Center 💎
 Currently, we only support the Personal Access Token (PAT) Authentication method.
 1. Create a [Personal Access Token (PAT)](https://confluence.atlassian.com/enterprise/using-personal-access-tokens-1026032365.html) in your Jira account
 2. In your Configuration file/Environment variables/Secrets file, add the following lines:
 ```toml
 [jira]
 jira_base_url = "YOUR_JIRA_BASE_URL" # e.g. https://jira.example.com
 jira_api_token = "YOUR_API_TOKEN"
 ```
--- a/docs/docs/core-abilities/index.md
+++ b/docs/docs/core-abilities/index.md
@ -1,7 +1,6 @@
 # Core Abilities
 Qodo Merge utilizes a variety of core abilities to provide a comprehensive and efficient code review experience. These abilities include:
 - [Fetching ticket context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/)
 - [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/)
 - [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/)
 - [Self-reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/)
--- a/docs/docs/core-abilities/self_reflection.md
+++ b/docs/docs/core-abilities/self_reflection.md
@ -46,5 +46,6 @@ This results in a more refined and valuable set of suggestions for the user, sav
 ## Appendix - Relevant Configuration Options
 ```
 [pr_code_suggestions]
 self_reflect_on_suggestions	= true # Enable self-reflection on code suggestions
 suggestions_score_threshold	= 0 # Filter out suggestions with a score below this threshold (0-10)
 ```
--- a/docs/docs/installation/gitlab.md
+++ b/docs/docs/installation/gitlab.md
@ -38,7 +38,6 @@ You can also modify the `script` section to run different Qodo Merge commands, o
 Note that if your base branches are not protected, don't set the variables as `protected`, since the pipeline will not have access to them.
 > **Note**: The `$CI_SERVER_FQDN` variable is available starting from GitLab version 16.10. If you're using an earlier version, this variable will not be available. However, you can combine `$CI_SERVER_HOST` and `$CI_SERVER_PORT` to achieve the same result. Please ensure you're using a compatible version or adjust your configuration.
 ## Run a GitLab webhook server
--- a/docs/docs/tools/improve.md
+++ b/docs/docs/tools/improve.md
@ -275,14 +275,14 @@ Using a combination of both can help the AI model to provide relevant and tailor
        <td><b>dual_publishing_score_threshold</b></td>
        <td>Minimum score threshold for suggestions to be presented as commitable PR comments in addition to the table. Default is -1 (disabled).</td>
      </tr>
      <tr>
        <td><b>focus_only_on_problems</b></td>
        <td>If set to true, suggestions will focus primarily on identifying and fixing code problems, and less on style considerations like best practices, maintainability, or readability. Default is false.</td> 
      </tr>
      <tr>
        <td><b>persistent_comment</b></td>
        <td>If set to true, the improve comment will be persistent, meaning that every new improve request will edit the previous one. Default is false.</td>
      </tr>
      <tr>
        <td><b>self_reflect_on_suggestions</b></td>
        <td>If set to true, the improve tool will calculate an importance score for each suggestion [1-10], and sort the suggestion labels group based on this score. Default is true.</td>
      </tr>
      <tr>
        <td><b>suggestions_score_threshold</b></td>
        <td> Any suggestion with importance score less than this threshold will be removed. Default is 0. Highly recommend not to set this value above 7-8, since above it may clip relevant suggestions that can be useful. </td>
--- a/docs/docs/tools/review.md
+++ b/docs/docs/tools/review.md
@ -140,7 +140,7 @@ num_code_suggestions = ...
  </tr>
  <tr>
    <td><b>require_ticket_analysis_review</b></td>
-    <td>If set to true, and the PR contains a GitHub or Jira ticket link, the tool will add a section that checks if the PR in fact fulfilled the ticket requirements. Default is true.</td>
+    <td>If set to true, and the PR contains a GitHub ticket number, the tool will add a section that checks if the PR in fact fulfilled the ticket requirements. Default is true.</td>
  </tr>
 </table>
@ -258,3 +258,4 @@ If enabled, the `review` tool can approve a PR when a specific comment, `/review
 [//]: # (    Notice If you are interested **only** in the code suggestions, it is recommended to use the [`improve`]&#40;./improve.md&#41; feature instead, since it is a dedicated only to code suggestions, and usually gives better results.)
 [//]: # (    Use the `review` tool if you want to get more comprehensive feedback, which includes code suggestions as well.)
--- a/docs/docs/usage-guide/additional_configurations.md
+++ b/docs/docs/usage-guide/additional_configurations.md
@ -160,13 +160,3 @@ ignore_pr_target_branches = ["qa"]
 Where the `ignore_pr_source_branches` and `ignore_pr_target_branches` are lists of regex patterns to match the source and target branches you want to ignore.
 They are not mutually exclusive, you can use them together or separately.
 To allow only specific folders (often needed in large monorepos), set:
 ```
 [config]
 allow_only_specific_folders=['folder1','folder2']
 ```
 For the configuration above, automatic feedback will only be triggered when the PR changes include files from 'folder1' or 'folder2'
--- a/docs/docs/usage-guide/automations_and_usage.md
+++ b/docs/docs/usage-guide/automations_and_usage.md
@ -72,14 +72,13 @@ The configuration parameter `pr_commands` defines the list of tools that will be
 ```
 [github_app]
 pr_commands = [
-    "/describe",
+    "/describe --pr_description.final_update_message=false",
-    "/review",
+    "/review --pr_reviewer.num_code_suggestions=0",
-    "/improve --pr_code_suggestions.suggestions_score_threshold=5",
+    "/improve",
 ]
 ```
 This means that when a new PR is opened/reopened or marked as ready for review, Qodo Merge will run the `describe`, `review` and `improve` tools.  
-For the `improve` tool, for example, the `suggestions_score_threshold` parameter will be set to 5 (suggestions below a score of 5 won't be presented)
+For the `review` tool, for example, the `num_code_suggestions` parameter will be set to 0.
 You can override the default tool parameters by using one the three options for a [configuration file](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/): **wiki**, **local**, or **global**. 
 For example, if your local `.pr_agent.toml` file contains:
@ -106,7 +105,7 @@ The configuration parameter `push_commands` defines the list of tools that will
 handle_push_trigger = true
 push_commands = [
    "/describe",
-    "/review",
+    "/review  --pr_reviewer.num_code_suggestions=0 --pr_reviewer.final_update_message=false",
 ]
 ```
 This means that when new code is pushed to the PR, the Qodo Merge will run the `describe` and `review` tools, with the specified parameters.
@ -149,7 +148,7 @@ After setting up a GitLab webhook, to control which commands will run automatica
 [gitlab]
 pr_commands = [
    "/describe",
-    "/review",
+    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve",
 ]
 ```
@ -162,7 +161,7 @@ The configuration parameter `push_commands` defines the list of tools that will
 handle_push_trigger = true
 push_commands = [
    "/describe",
-    "/review",
+    "/review  --pr_reviewer.num_code_suggestions=0 --pr_reviewer.final_update_message=false",
 ]
 ```
@ -183,7 +182,7 @@ Each time you invoke a `/review` tool, it will use the extra instructions you se
 Note that among other limitations, BitBucket provides relatively low rate-limits for applications (up to 1000 requests per hour), and does not provide an API to track the actual rate-limit usage.
-If you experience a lack of responses from Qodo Merge, you might want to set: `bitbucket_app.avoid_full_files=true` in your configuration file.
+If you experience lack of responses from Qodo Merge, you might want to set: `bitbucket_app.avoid_full_files=true` in your configuration file.
 This will prevent Qodo Merge from acquiring the full file content, and will only use the diff content. This will reduce the number of requests made to BitBucket, at the cost of small decrease in accuracy, as dynamic context will not be applicable.
@ -195,23 +194,13 @@ Specifically, set the following values:
 ```
 [bitbucket_app]
 pr_commands = [
-    "/review",
+    "/review --pr_reviewer.num_code_suggestions=0",
    "/improve --pr_code_suggestions.commitable_code_suggestions=true --pr_code_suggestions.suggestions_score_threshold=7",
 ]
 ```
 Note that we set specifically for bitbucket, we recommend using: `--pr_code_suggestions.suggestions_score_threshold=7` and that is the default value we set for bitbucket.
 Since this platform only supports inline code suggestions, we want to limit the number of suggestions, and only present a limited number.
 To enable BitBucket app to respond to each **push** to the PR, set (for example):
 ```
 [bitbucket_app]
 handle_push_trigger = true
 push_commands = [
    "/describe",
    "/review",
 ]
 ```
 ## Azure DevOps provider
 To use Azure DevOps provider use the following settings in configuration.toml:
--- a/docs/docs/usage-guide/introduction.md
+++ b/docs/docs/usage-guide/introduction.md
@ -10,3 +10,4 @@ Specifically, CLI commands can be issued by invoking a pre-built [docker image](
 For online usage, you will need to setup either a [GitHub App](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-app) or a [GitHub Action](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) (GitHub), a [GitLab webhook](https://qodo-merge-docs.qodo.ai/installation/gitlab/#run-a-gitlab-webhook-server) (GitLab), or a [BitBucket App](https://qodo-merge-docs.qodo.ai/installation/bitbucket/#run-using-codiumai-hosted-bitbucket-app) (BitBucket).
 These platforms also enable to run Qodo Merge specific tools automatically when a new PR is opened, or on each push to a branch.
--- a/docs/mkdocs.yml
+++ b/docs/mkdocs.yml
@ -43,7 +43,6 @@ nav:
    - 💎 Similar Code: 'tools/similar_code.md'
  - Core Abilities:
      - 'core-abilities/index.md'
      - Fetching ticket context: 'core-abilities/fetching_ticket_context.md'
      - Local and global metadata: 'core-abilities/metadata.md'
      - Dynamic context: 'core-abilities/dynamic_context.md'
      - Self-reflection: 'core-abilities/self_reflection.md'
--- a/pr_agent/init.py
+++ b/pr_agent/init.py
@ -0,0 +1 @@
--- a/pr_agent/agent/pr_agent.py
+++ b/pr_agent/agent/pr_agent.py
@ -3,6 +3,7 @@ from functools import partial
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.utils import apply_repo_settings
--- a/pr_agent/algo/init.py
+++ b/pr_agent/algo/init.py
@ -31,7 +31,6 @@ MAX_TOKENS = {
    'vertex_ai/codechat-bison': 6144,
    'vertex_ai/codechat-bison-32k': 32000,
    'vertex_ai/claude-3-haiku@20240307': 100000,
    'vertex_ai/claude-3-5-haiku@20241022': 100000,
    'vertex_ai/claude-3-sonnet@20240229': 100000,
    'vertex_ai/claude-3-opus@20240229': 100000,
    'vertex_ai/claude-3-5-sonnet@20240620': 100000,
@ -49,13 +48,11 @@ MAX_TOKENS = {
    'anthropic/claude-3-opus-20240229': 100000,
    'anthropic/claude-3-5-sonnet-20240620': 100000,
    'anthropic/claude-3-5-sonnet-20241022': 100000,
    'anthropic/claude-3-5-haiku-20241022': 100000,
    'bedrock/anthropic.claude-instant-v1': 100000,
    'bedrock/anthropic.claude-v2': 100000,
    'bedrock/anthropic.claude-v2:1': 100000,
    'bedrock/anthropic.claude-3-sonnet-20240229-v1:0': 100000,
    'bedrock/anthropic.claude-3-haiku-20240307-v1:0': 100000,
    'bedrock/anthropic.claude-3-5-haiku-20241022-v1:0': 100000,
    'bedrock/anthropic.claude-3-5-sonnet-20240620-v1:0': 100000,
    'bedrock/anthropic.claude-3-5-sonnet-20241022-v2:0': 100000,
    'claude-3-5-sonnet': 100000,
--- a/pr_agent/algo/ai_handlers/langchain_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/langchain_ai_handler.py
@ -1,18 +1,17 @@
 try:
-    from langchain_core.messages import HumanMessage, SystemMessage
+    from langchain_openai import ChatOpenAI, AzureChatOpenAI
-    from langchain_openai import AzureChatOpenAI, ChatOpenAI
+    from langchain_core.messages import SystemMessage, HumanMessage
 except:  # we don't enforce langchain as a dependency, so if it's not installed, just move on
    pass
 import functools
 from openai import APIError, RateLimitError, Timeout
 from retry import retry
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.config_loader import get_settings
 from pr_agent.log import get_logger
 from openai import APIError, RateLimitError, Timeout
 from retry import retry
 import functools
 OPENAI_RETRIES = 5
@ -74,3 +73,4 @@ class LangChainOpenAIHandler(BaseAiHandler):
                raise ValueError(f"OpenAI {e.name} is required") from e
            else:
                raise e
--- a/pr_agent/algo/ai_handlers/litellm_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/litellm_ai_handler.py
@ -1,8 +1,7 @@
 import os
-
+import requests
 import litellm
 import openai
 import requests
 from litellm import acompletion
 from tenacity import retry, retry_if_exception_type, stop_after_attempt
--- a/pr_agent/algo/ai_handlers/openai_ai_handler.py
+++ b/pr_agent/algo/ai_handlers/openai_ai_handler.py
@ -4,7 +4,6 @@ import openai
 from openai import APIError, AsyncOpenAI, RateLimitError, Timeout
 from retry import retry
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.config_loader import get_settings
 from pr_agent.log import get_logger
@ -42,6 +41,7 @@ class OpenAIHandler(BaseAiHandler):
           tries=OPENAI_RETRIES, delay=2, backoff=2, jitter=(1, 3))
    async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2):
        try:
            deployment_id = self.deployment_id
            get_logger().info("System: ", system)
            get_logger().info("User: ", user)
            messages = [{"role": "system", "content": system}, {"role": "user", "content": user}]
--- a/pr_agent/algo/git_patch_processing.py
+++ b/pr_agent/algo/git_patch_processing.py
@ -3,8 +3,8 @@ from __future__ import annotations
 import re
 import traceback
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.config_loader import get_settings
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.log import get_logger
@ -31,7 +31,7 @@ def extend_patch(original_file_str, patch_str, patch_extra_lines_before=0,
 def decode_if_bytes(original_file_str):
-    if isinstance(original_file_str, (bytes, bytearray)):
+    if isinstance(original_file_str, bytes):
        try:
            return original_file_str.decode('utf-8')
        except UnicodeDecodeError:
@ -61,26 +61,23 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
    patch_lines = patch_str.splitlines()
    extended_patch_lines = []
    is_valid_hunk = True
    start1, size1, start2, size2 = -1, -1, -1, -1
    RE_HUNK_HEADER = re.compile(
        r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
    try:
-        for i,line in enumerate(patch_lines):
+        for line in patch_lines:
            if line.startswith('@@'):
                match = RE_HUNK_HEADER.match(line)
                # identify hunk header
                if match:
                    # finish processing previous hunk
-                    if is_valid_hunk and (start1 != -1 and patch_extra_lines_after > 0):
+                    if start1 != -1 and patch_extra_lines_after > 0:
                        delta_lines = [f' {line}' for line in original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]]
                        extended_patch_lines.extend(delta_lines)
                    section_header, size1, size2, start1, start2 = extract_hunk_headers(match)
-                    is_valid_hunk = check_if_hunk_lines_matches_to_file(i, original_lines, patch_lines, start1)
+                    if patch_extra_lines_before > 0 or patch_extra_lines_after > 0:
                    if is_valid_hunk and (patch_extra_lines_before > 0 or patch_extra_lines_after > 0):
                        def _calc_context_limits(patch_lines_before):
                            extended_start1 = max(1, start1 - patch_lines_before)
                            extended_size1 = size1 + (start1 - extended_start1) + patch_extra_lines_after
@ -141,7 +138,7 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
        return patch_str
    # finish processing last hunk
-    if start1 != -1 and patch_extra_lines_after > 0 and is_valid_hunk:
+    if start1 != -1 and patch_extra_lines_after > 0:
        delta_lines = original_lines[start1 + size1 - 1:start1 + size1 - 1 + patch_extra_lines_after]
        # add space at the beginning of each extra line
        delta_lines = [f' {line}' for line in delta_lines]
@ -151,23 +148,6 @@ def process_patch_lines(patch_str, original_file_str, patch_extra_lines_before,
    return extended_patch_str
 def check_if_hunk_lines_matches_to_file(i, original_lines, patch_lines, start1):
    """
    Check if the hunk lines match the original file content. We saw cases where the hunk header line doesn't match the original file content, and then
    extending the hunk with extra lines before the hunk header can cause the hunk to be invalid.
    """
    is_valid_hunk = True
    try:
        if i + 1 < len(patch_lines) and patch_lines[i + 1][0] == ' ': # an existing line in the file
            if patch_lines[i + 1].strip() != original_lines[start1 - 1].strip():
                is_valid_hunk = False
                get_logger().error(
                    f"Invalid hunk in PR, line {start1} in hunk header doesn't match the original file content")
    except:
        pass
    return is_valid_hunk
 def extract_hunk_headers(match):
    res = list(match.groups())
    for i in range(len(res)):
--- a/pr_agent/algo/language_handler.py
+++ b/pr_agent/algo/language_handler.py
@ -4,6 +4,8 @@ from typing import Dict
 from pr_agent.config_loader import get_settings
 def filter_bad_extensions(files):
    # Bad Extensions, source: https://github.com/EleutherAI/github-downloader/blob/345e7c4cbb9e0dc8a0615fd995a08bf9d73b3fe6/download_repo_text.py  # noqa: E501
    bad_extensions = get_settings().bad_extensions.default
--- a/pr_agent/algo/pr_processing.py
+++ b/pr_agent/algo/pr_processing.py
@ -5,15 +5,14 @@ from typing import Callable, List, Tuple
 from github import RateLimitExceededException
-from pr_agent.algo.file_filter import filter_ignored
+from pr_agent.algo.git_patch_processing import convert_to_hunks_with_lines_numbers, extend_patch, handle_patch_deletions
 from pr_agent.algo.git_patch_processing import (
    convert_to_hunks_with_lines_numbers, extend_patch, handle_patch_deletions)
 from pr_agent.algo.language_handler import sort_files_by_main_languages
 from pr_agent.algo.file_filter import filter_ignored
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
+from pr_agent.algo.utils import get_max_tokens, clip_tokens, ModelType
 from pr_agent.algo.utils import ModelType, clip_tokens, get_max_tokens
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.log import get_logger
 DELETED_FILES_ = "Deleted files:\n"
--- a/pr_agent/algo/token_handler.py
+++ b/pr_agent/algo/token_handler.py
@ -1,9 +1,8 @@
 from threading import Lock
 from jinja2 import Environment, StrictUndefined
 from tiktoken import encoding_for_model, get_encoding
 from pr_agent.config_loader import get_settings
 from threading import Lock
 from pr_agent.log import get_logger
--- a/pr_agent/algo/utils.py
+++ b/pr_agent/algo/utils.py
@ -14,6 +14,7 @@ from datetime import datetime
 from enum import Enum
 from typing import Any, List, Tuple
 import html2text
 import requests
 import yaml
@ -22,11 +23,10 @@ from starlette_context import context
 from pr_agent.algo import MAX_TOKENS
 from pr_agent.algo.token_handler import TokenEncoder
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.config_loader import get_settings, global_settings
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.log import get_logger
 class Range(BaseModel):
    line_start: int  # should be 0-indexed
    line_end: int
--- a/pr_agent/cli.py
+++ b/pr_agent/cli.py
@ -4,7 +4,7 @@ import os
 from pr_agent.agent.pr_agent import PRAgent, commands
 from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger, setup_logger
+from pr_agent.log import setup_logger, get_logger
 log_level = os.environ.get("LOG_LEVEL", "INFO")
 setup_logger(log_level)
@ -92,4 +92,3 @@ def run(inargs=None, args=None):
 if __name__ == '__main__':
    run()
    aa= "rr"
--- a/pr_agent/git_providers/init.py
+++ b/pr_agent/git_providers/init.py
@ -1,16 +1,14 @@
 from starlette_context import context
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.azuredevops_provider import AzureDevopsProvider
 from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
-from pr_agent.git_providers.bitbucket_server_provider import \
+from pr_agent.git_providers.bitbucket_server_provider import BitbucketServerProvider
    BitbucketServerProvider
 from pr_agent.git_providers.codecommit_provider import CodeCommitProvider
 from pr_agent.git_providers.gerrit_provider import GerritProvider
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.git_providers.github_provider import GithubProvider
 from pr_agent.git_providers.gitlab_provider import GitLabProvider
 from pr_agent.git_providers.local_git_provider import LocalGitProvider
 from pr_agent.git_providers.azuredevops_provider import AzureDevopsProvider
 from pr_agent.git_providers.gerrit_provider import GerritProvider
 from starlette_context import context
 _GIT_PROVIDERS = {
    'github': GithubProvider,
--- a/pr_agent/git_providers/azuredevops_provider.py
+++ b/pr_agent/git_providers/azuredevops_provider.py
@ -2,16 +2,13 @@ import os
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import (PRDescriptionHeader, clip_tokens,
                          find_line_number_of_relevant_line_in_file,
                          load_large_diff)
 from ..config_loader import get_settings
 from ..log import get_logger
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import clip_tokens, find_line_number_of_relevant_line_in_file, load_large_diff, PRDescriptionHeader
 from ..config_loader import get_settings
 from .git_provider import GitProvider
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 AZURE_DEVOPS_AVAILABLE = True
 ADO_APP_CLIENT_DEFAULT_ID = "499b84ac-1321-427f-aa17-267ca6975798/.default"
@ -19,16 +16,19 @@ MAX_PR_DESCRIPTION_AZURE_LENGTH = 4000-1
 try:
    # noinspection PyUnresolvedReferences
    from msrest.authentication import BasicAuthentication
    # noinspection PyUnresolvedReferences
    from azure.devops.connection import Connection
    # noinspection PyUnresolvedReferences
    from azure.devops.v7_1.git.models import (Comment, CommentThread,
                                              GitPullRequest,
                                              GitPullRequestIterationChanges,
                                              GitVersionDescriptor)
    # noinspection PyUnresolvedReferences
    from azure.identity import DefaultAzureCredential
-    from msrest.authentication import BasicAuthentication
+    # noinspection PyUnresolvedReferences
    from azure.devops.v7_1.git.models import (
        Comment,
        CommentThread,
        GitVersionDescriptor,
        GitPullRequest,
        GitPullRequestIterationChanges,
    )
 except ImportError:
    AZURE_DEVOPS_AVAILABLE = False
@ -620,3 +620,4 @@ class AzureDevopsProvider(GitProvider):
    def publish_file_comments(self, file_comments: list) -> bool:
        pass
--- a/pr_agent/git_providers/bitbucket_provider.py
+++ b/pr_agent/git_providers/bitbucket_provider.py
@ -6,14 +6,13 @@ import requests
 from atlassian.bitbucket import Cloud
 from starlette_context import context
-from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
+from pr_agent.algo.types import FilePatchInfo, EDIT_TYPE
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
 from ..algo.utils import find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
 from ..log import get_logger
-from .git_provider import MAX_FILES_ALLOWED_FULL, GitProvider
+from .git_provider import GitProvider, MAX_FILES_ALLOWED_FULL
 def _gef_filename(diff):
--- a/pr_agent/git_providers/bitbucket_server_provider.py
+++ b/pr_agent/git_providers/bitbucket_server_provider.py
@ -1,17 +1,16 @@
 from distutils.version import LooseVersion
 from requests.exceptions import HTTPError
 from typing import Optional, Tuple
 from urllib.parse import quote_plus, urlparse
 from atlassian.bitbucket import Bitbucket
 from requests.exceptions import HTTPError
-from ..algo.language_handler import is_valid_file
+from .git_provider import GitProvider
 from ..algo.types import EDIT_TYPE, FilePatchInfo
-from ..algo.utils import (find_line_number_of_relevant_line_in_file,
+from ..algo.language_handler import is_valid_file
-                          load_large_diff)
+from ..algo.utils import load_large_diff, find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
 from ..log import get_logger
 from .git_provider import GitProvider
 class BitbucketServerProvider(GitProvider):
--- a/pr_agent/git_providers/codecommit_provider.py
+++ b/pr_agent/git_providers/codecommit_provider.py
@ -4,15 +4,13 @@ from collections import Counter
 from typing import List, Optional, Tuple
 from urllib.parse import urlparse
 from pr_agent.algo.language_handler import is_valid_file
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.git_providers.codecommit_client import CodeCommitClient
-
+from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from ..algo.utils import load_large_diff
 from .git_provider import GitProvider
 from ..config_loader import get_settings
 from ..log import get_logger
-from .git_provider import GitProvider
+from pr_agent.algo.language_handler import is_valid_file
 class PullRequestCCMimic:
    """
--- a/pr_agent/git_providers/gerrit_provider.py
+++ b/pr_agent/git_providers/gerrit_provider.py
@ -12,9 +12,9 @@ import requests
 import urllib3.util
 from git import Repo
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.git_providers.local_git_provider import PullRequestMimic
 from pr_agent.log import get_logger
--- a/pr_agent/git_providers/git_provider.py
+++ b/pr_agent/git_providers/git_provider.py
@ -1,12 +1,12 @@
 from abc import ABC, abstractmethod
 # enum EDIT_TYPE (ADDED, DELETED, MODIFIED, RENAMED)
 from typing import Optional
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.algo.utils import Range, process_description
 from pr_agent.config_loader import get_settings
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.log import get_logger
 MAX_FILES_ALLOWED_FULL = 50
 class GitProvider(ABC):
@ -62,8 +62,8 @@ class GitProvider(ABC):
        pass
    def get_pr_description(self, full: bool = True, split_changes_walkthrough=False) -> str or tuple:
        from pr_agent.algo.utils import clip_tokens
        from pr_agent.config_loader import get_settings
        from pr_agent.algo.utils import clip_tokens
        max_tokens_description = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
        description = self.get_pr_description_full() if full else self.get_user_description()
        if split_changes_walkthrough:
--- a/pr_agent/git_providers/github_provider.py
+++ b/pr_agent/git_providers/github_provider.py
@ -1,11 +1,10 @@
 import hashlib
 import itertools
 import time
 import hashlib
 import traceback
 from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 from github import AppAuthentication, Auth, Github
 from retry import retry
 from starlette_context import context
@ -13,14 +12,11 @@ from starlette_context import context
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
 from ..algo.types import EDIT_TYPE
-from ..algo.utils import (PRReviewHeader, Range, clip_tokens,
+from ..algo.utils import PRReviewHeader, load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file, Range
                          find_line_number_of_relevant_line_in_file,
                          load_large_diff)
 from ..config_loader import get_settings
 from ..log import get_logger
 from ..servers.utils import RateLimitExceeded
-from .git_provider import (MAX_FILES_ALLOWED_FULL, FilePatchInfo, GitProvider,
+from .git_provider import FilePatchInfo, GitProvider, IncrementalPR, MAX_FILES_ALLOWED_FULL
                           IncrementalPR)
 class GithubProvider(GitProvider):
@ -199,24 +195,7 @@ class GithubProvider(GitProvider):
                    if avoid_load:
                        original_file_content_str = ""
                    else:
-                        # The base.sha will point to the current state of the base branch (including parallel merges), not the original base commit when the PR was created
+                        original_file_content_str = self._get_pr_file_content(file, self.pr.base.sha)
                        # We can fix this by finding the merge base commit between the PR head and base branches
                        # Note that The pr.head.sha is actually correct as is - it points to the latest commit in your PR branch.
                        # This SHA isn't affected by parallel merges to the base branch since it's specific to your PR's branch.
                        repo = self.repo_obj
                        pr = self.pr
                        try:
                            compare = repo.compare(pr.base.sha, pr.head.sha)
                            merge_base_commit = compare.merge_base_commit
                        except Exception as e:
                            get_logger().error(f"Failed to get merge base commit: {e}")
                            merge_base_commit = pr.base
                        if merge_base_commit.sha != pr.base.sha:
                            get_logger().info(
                                f"Using merge base commit {merge_base_commit.sha} instead of base commit "
                                f"{pr.base.sha} for {file.filename}")
                        original_file_content_str = self._get_pr_file_content(file, merge_base_commit.sha)
                    if not patch:
                        patch = load_large_diff(file.filename, new_file_content_str, original_file_content_str)
@ -300,7 +279,8 @@ class GithubProvider(GitProvider):
                                                                                relevant_line_in_file,
                                                                                absolute_position)
        if position == -1:
-            get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
+            if get_settings().config.verbosity_level >= 2:
                get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
            subject_type = "FILE"
        else:
            subject_type = "LINE"
@ -312,9 +292,11 @@ class GithubProvider(GitProvider):
            # publish all comments in a single message
            self.pr.create_review(commit=self.last_commit_id, comments=comments)
        except Exception as e:
-            get_logger().info(f"Initially failed to publish inline comments as committable")
+            if get_settings().config.verbosity_level >= 2:
                get_logger().error(f"Failed to publish inline comments")
-            if (getattr(e, "status", None) == 422 and not disable_fallback):
+            if (getattr(e, "status", None) == 422
                    and get_settings().github.publish_inline_comments_fallback_with_verification and not disable_fallback):
                pass  # continue to try _publish_inline_comments_fallback_with_verification
            else:
                raise e # will end up with publishing the comments one by one
@ -322,7 +304,8 @@ class GithubProvider(GitProvider):
            try:
                self._publish_inline_comments_fallback_with_verification(comments)
            except Exception as e:
-                get_logger().error(f"Failed to publish inline code comments fallback, error: {e}")
+                if get_settings().config.verbosity_level >= 2:
                    get_logger().error(f"Failed to publish inline code comments fallback, error: {e}")
                raise e
    def _publish_inline_comments_fallback_with_verification(self, comments: list[dict]):
@ -347,9 +330,11 @@ class GithubProvider(GitProvider):
            for comment in fixed_comments_as_one_liner:
                try:
                    self.publish_inline_comments([comment], disable_fallback=True)
-                    get_logger().info(f"Published invalid comment as a single line comment: {comment}")
+                    if get_settings().config.verbosity_level >= 2:
                        get_logger().info(f"Published invalid comment as a single line comment: {comment}")
                except:
-                    get_logger().error(f"Failed to publish invalid comment as a single line comment: {comment}")
+                    if get_settings().config.verbosity_level >= 2:
                        get_logger().error(f"Failed to publish invalid comment as a single line comment: {comment}")
    def _verify_code_comment(self, comment: dict):
        is_verified = False
@ -407,7 +392,8 @@ class GithubProvider(GitProvider):
                if fixed_comment != comment:
                    fixed_comments.append(fixed_comment)
            except Exception as e:
-                get_logger().error(f"Failed to fix inline comment, error: {e}")
+                if get_settings().config.verbosity_level >= 2:
                    get_logger().error(f"Failed to fix inline comment, error: {e}")
        return fixed_comments
    def publish_code_suggestions(self, code_suggestions: list) -> bool:
@ -422,14 +408,16 @@ class GithubProvider(GitProvider):
            relevant_lines_end = suggestion['relevant_lines_end']
            if not relevant_lines_start or relevant_lines_start == -1:
-                get_logger().exception(
+                if get_settings().config.verbosity_level >= 2:
-                    f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
+                    get_logger().exception(
                        f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
                continue
            if relevant_lines_end < relevant_lines_start:
-                get_logger().exception(f"Failed to publish code suggestion, "
+                if get_settings().config.verbosity_level >= 2:
-                                  f"relevant_lines_end is {relevant_lines_end} and "
+                    get_logger().exception(f"Failed to publish code suggestion, "
-                                  f"relevant_lines_start is {relevant_lines_start}")
+                                      f"relevant_lines_end is {relevant_lines_end} and "
                                      f"relevant_lines_start is {relevant_lines_start}")
                continue
            if relevant_lines_end > relevant_lines_start:
@ -453,7 +441,8 @@ class GithubProvider(GitProvider):
            self.publish_inline_comments(post_parameters_list)
            return True
        except Exception as e:
-            get_logger().error(f"Failed to publish code suggestion, error: {e}")
+            if get_settings().config.verbosity_level >= 2:
                get_logger().error(f"Failed to publish code suggestion, error: {e}")
            return False
    def edit_comment(self, comment, body: str):
@ -512,7 +501,6 @@ class GithubProvider(GitProvider):
                    elif self.deployment_type == 'user':
                        same_comment_creator = self.github_user_id == existing_comment['user']['login']
                    if existing_comment['subject_type'] == 'file' and comment['path'] == existing_comment['path'] and same_comment_creator:
                        headers, data_patch = self.pr._requester.requestJsonAndCheck(
                            "PATCH", f"{self.base_url}/repos/{self.repo}/pulls/comments/{existing_comment['id']}", input={"body":comment['body']}
                        )
@ -524,7 +512,8 @@ class GithubProvider(GitProvider):
                    )
            return True
        except Exception as e:
-            get_logger().error(f"Failed to publish diffview file summary, error: {e}")
+            if get_settings().config.verbosity_level >= 2:
                get_logger().error(f"Failed to publish diffview file summary, error: {e}")
            return False
    def remove_initial_comment(self):
@ -812,7 +801,8 @@ class GithubProvider(GitProvider):
                link = f"{self.base_url_html}/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}R{absolute_position}"
                return link
        except Exception as e:
-            get_logger().info(f"Failed adding line link, error: {e}")
+            if get_settings().config.verbosity_level >= 2:
                get_logger().info(f"Failed adding line link, error: {e}")
        return ""
--- a/pr_agent/git_providers/gitlab_provider.py
+++ b/pr_agent/git_providers/gitlab_provider.py
@ -7,16 +7,13 @@ import gitlab
 import requests
 from gitlab import GitlabGetError
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from ..algo.file_filter import filter_ignored
 from ..algo.language_handler import is_valid_file
-from ..algo.utils import (clip_tokens,
+from ..algo.utils import load_large_diff, clip_tokens, find_line_number_of_relevant_line_in_file
                          find_line_number_of_relevant_line_in_file,
                          load_large_diff)
 from ..config_loader import get_settings
 from .git_provider import GitProvider, MAX_FILES_ALLOWED_FULL
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from ..log import get_logger
 from .git_provider import MAX_FILES_ALLOWED_FULL, GitProvider
 class DiffNotFoundError(Exception):
--- a/pr_agent/git_providers/local_git_provider.py
+++ b/pr_agent/git_providers/local_git_provider.py
@ -4,9 +4,9 @@ from typing import List
 from git import Repo
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.config_loader import _find_repository_root, get_settings
 from pr_agent.git_providers.git_provider import GitProvider
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.log import get_logger
--- a/pr_agent/git_providers/utils.py
+++ b/pr_agent/git_providers/utils.py
@ -3,12 +3,11 @@ import os
 import tempfile
 from dynaconf import Dynaconf
 from starlette_context import context
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (get_git_provider,
+from pr_agent.git_providers import get_git_provider, get_git_provider_with_context
                                    get_git_provider_with_context)
 from pr_agent.log import get_logger
 from starlette_context import context
 def apply_repo_settings(pr_url):
--- a/pr_agent/identity_providers/init.py
+++ b/pr_agent/identity_providers/init.py
@ -1,6 +1,5 @@
 from pr_agent.config_loader import get_settings
-from pr_agent.identity_providers.default_identity_provider import \
+from pr_agent.identity_providers.default_identity_provider import DefaultIdentityProvider
    DefaultIdentityProvider
 _IDENTITY_PROVIDERS = {
    'default': DefaultIdentityProvider
--- a/pr_agent/identity_providers/default_identity_provider.py
+++ b/pr_agent/identity_providers/default_identity_provider.py
@ -1,5 +1,4 @@
-from pr_agent.identity_providers.identity_provider import (Eligibility,
+from pr_agent.identity_providers.identity_provider import Eligibility, IdentityProvider
                                                           IdentityProvider)
 class DefaultIdentityProvider(IdentityProvider):
--- a/pr_agent/secret_providers/init.py
+++ b/pr_agent/secret_providers/init.py
@ -8,10 +8,12 @@ def get_secret_provider():
    provider_id = get_settings().config.secret_provider
    if provider_id == 'google_cloud_storage':
        try:
-            from pr_agent.secret_providers.google_cloud_storage_secret_provider import \
+            from pr_agent.secret_providers.google_cloud_storage_secret_provider import GoogleCloudStorageSecretProvider
                GoogleCloudStorageSecretProvider
            return GoogleCloudStorageSecretProvider()
        except Exception as e:
            raise ValueError(f"Failed to initialize google_cloud_storage secret provider {provider_id}") from e
    else:
        raise ValueError("Unknown SECRET_PROVIDER")
--- a/pr_agent/servers/azuredevops_server_webhook.py
+++ b/pr_agent/servers/azuredevops_server_webhook.py
@ -9,9 +9,9 @@ import secrets
 from urllib.parse import unquote
 import uvicorn
-from fastapi import APIRouter, Depends, FastAPI, HTTPException, Request
+from fastapi import APIRouter, Depends, FastAPI, HTTPException
 from fastapi.encoders import jsonable_encoder
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from fastapi.encoders import jsonable_encoder
 from starlette import status
 from starlette.background import BackgroundTasks
 from starlette.middleware import Middleware
@ -23,6 +23,9 @@ from pr_agent.agent.pr_agent import PRAgent, command2class
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import get_logger
 from fastapi import Request, Depends
 from fastapi.security import HTTPBasic, HTTPBasicCredentials
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
--- a/pr_agent/servers/bitbucket_app.py
+++ b/pr_agent/servers/bitbucket_app.py
@ -98,14 +98,11 @@ async def _perform_commands_bitbucket(commands_conf: str, agent: PRAgent, api_ur
 def is_bot_user(data) -> bool:
    try:
-        actor = data.get("data", {}).get("actor", {})
+        if data["data"]["actor"]["type"] != "user":
-        # allow actor type: user . if it's "AppUser" or "team" then it is a bot user
+            get_logger().info(f"BitBucket actor type is not 'user': {data['data']['actor']['type']}")
        allowed_actor_types = {"user"}
        if actor and actor["type"].lower() not in allowed_actor_types:
            get_logger().info(f"BitBucket actor type is not 'user', skipping: {actor}")
            return True
    except Exception as e:
-        get_logger().error(f"Failed 'is_bot_user' logic: {e}")
+        get_logger().error("Failed 'is_bot_user' logic: {e}")
    return False
@ -164,18 +161,16 @@ async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Req
                    return "OK"
            # Get the username of the sender
-            actor = data.get("data", {}).get("actor", {})
+            try:
-            if actor:
+                username = data["data"]["actor"]["username"]
            except KeyError:
                try:
-                    username = actor["username"]
+                    username = data["data"]["actor"]["display_name"]
                except KeyError:
-                    try:
+                    username = data["data"]["actor"]["nickname"]
-                        username = actor["display_name"]
+            log_context["sender"] = username
                    except KeyError:
                        username = actor["nickname"]
                log_context["sender"] = username
-            sender_id = data.get("data", {}).get("actor", {}).get("account_id", "")
+            sender_id = data["data"]["actor"]["account_id"]
            log_context["sender_id"] = sender_id
            jwt_parts = input_jwt.split(".")
            claim_part = jwt_parts[1]
--- a/pr_agent/servers/bitbucket_server_webhook.py
+++ b/pr_agent/servers/bitbucket_server_webhook.py
@ -6,20 +6,20 @@ from typing import List
 import uvicorn
 from fastapi import APIRouter, FastAPI
 from fastapi.encoders import jsonable_encoder
 from fastapi.responses import RedirectResponse
 from starlette import status
 from starlette.background import BackgroundTasks
 from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette_context.middleware import RawContextMiddleware
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.utils import verify_signature
 from fastapi.responses import RedirectResponse
 setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
 router = APIRouter()
--- a/pr_agent/servers/github_app.py
+++ b/pr_agent/servers/github_app.py
@ -15,8 +15,7 @@ from starlette_context.middleware import RawContextMiddleware
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.git_providers import (get_git_provider,
+from pr_agent.git_providers import get_git_provider, get_git_provider_with_context
                                    get_git_provider_with_context)
 from pr_agent.git_providers.git_provider import IncrementalPR
 from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.identity_providers import get_identity_provider
--- a/pr_agent/servers/github_polling.py
+++ b/pr_agent/servers/github_polling.py
@ -1,12 +1,11 @@
 import asyncio
 import multiprocessing
 import time
 import traceback
 from collections import deque
 import traceback
 from datetime import datetime, timezone
-
+import time
 import aiohttp
 import requests
 import aiohttp
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.config_loader import get_settings
--- a/pr_agent/servers/gitlab_webhook.py
+++ b/pr_agent/servers/gitlab_webhook.py
@ -1,6 +1,6 @@
 import copy
 import json
 import re
 import json
 from datetime import datetime
 import uvicorn
--- a/pr_agent/servers/serverless.py
+++ b/pr_agent/servers/serverless.py
@ -5,6 +5,7 @@ from starlette_context.middleware import RawContextMiddleware
 from pr_agent.servers.github_app import router
 middleware = [Middleware(RawContextMiddleware)]
 app = FastAPI(middleware=middleware)
 app.include_router(router)
--- a/pr_agent/servers/utils.py
+++ b/pr_agent/servers/utils.py
@ -2,7 +2,7 @@ import hashlib
 import hmac
 import time
 from collections import defaultdict
-from typing import Any, Callable
+from typing import Callable, Any
 from fastapi import HTTPException
--- a/pr_agent/settings/configuration.toml
+++ b/pr_agent/settings/configuration.toml
@ -7,7 +7,6 @@ fallback_models=["gpt-4o-2024-05-13"]
 git_provider="github"
 publish_output=true
 publish_output_progress=true
 publish_output_no_suggestions=true
 verbosity_level=0 # 0,1,2
 use_extra_bad_extensions=false
 # Configurations
@ -107,11 +106,10 @@ enable_help_text=false
 [pr_code_suggestions] # /improve #
-max_context_tokens=16000
+max_context_tokens=14000
 #
 commitable_code_suggestions = false
 dual_publishing_score_threshold=-1 # -1 to disable, [0-10] to set the threshold (>=) for publishing a code suggestion both in a table and as commitable
 focus_only_on_problems=false
 #
 extra_instructions = ""
 rank_suggestions = false
@ -123,6 +121,7 @@ max_history_len=4
 # enable to apply suggestion 💎
 apply_suggestions_checkbox=true
 # suggestions scoring
 self_reflect_on_suggestions=true
 suggestions_score_threshold=0 # [0-10]| recommend not to set this value above 8, since above it may clip highly relevant suggestions
 # params for '/improve --extended' mode
 auto_extended_mode=true
--- a/pr_agent/settings/pr_code_suggestions_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_prompts.toml
@ -1,10 +1,7 @@
 [pr_code_suggestions_prompt]
 system="""You are PR-Reviewer, an AI specializing in Pull Request (PR) code analysis and suggestions.
-{%- if not focus_only_on_problems %}
+Your task is to examine the provided code diff, focusing on new code (lines prefixed with '+'), and offer concise, actionable suggestions to fix possible bugs and problems, and enhance code quality, readability, and performance.
-Your task is to examine the provided code diff, focusing on new code (lines prefixed with '+'), and offer concise, actionable suggestions to fix possible bugs and problems, and enhance code quality and performance.
+
 {%- else %}
 Your task is to examine the provided code diff, focusing on new code (lines prefixed with '+'), and offer concise, actionable suggestions to fix critical bugs and problems.
 {%- endif %}
 The PR code diff will be in the following structured format:
 ======
@ -17,10 +14,10 @@ The PR code diff will be in the following structured format:
@@ ... @@ def func1():
 __new hunk__
- unchanged code line0 in the PR
+11  unchanged code line0 in the PR
- unchanged code line1 in the PR
+12  unchanged code line1 in the PR
-+new code line2 added in the PR
+13 +new code line2 added in the PR
- unchanged code line3 in the PR
+14  unchanged code line3 in the PR
 __old hunk__
 unchanged code line0
 unchanged code line1
@ -38,6 +35,7 @@ __new hunk__
 ======
 - 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.
 - Line numbers were added for the '__new hunk__' sections to help referencing specific lines in the code suggestions. These numbers are for reference only and are not part of the actual code.
 - Code lines are prefixed with symbols: '+' for new code added in the PR, '-' for code removed, and ' ' for unchanged code.
 {%- if is_ai_metadata %}
 - 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.
@ -45,17 +43,9 @@ __new hunk__
 Specific guidelines for generating code suggestions:
 {%- if not focus_only_on_problems %}
 - Provide up to {{ num_code_suggestions }} distinct and insightful code suggestions.
-{%- else %}
+- Focus solely on enhancing new code introduced in the PR, identified by '+' prefixes in '__new hunk__' sections (after the line numbers).
 - Provide up to {{ num_code_suggestions }} distinct and insightful code suggestions. Return less suggestions if no pertinent ones are applicable.
 {%- endif %}
 - Focus solely on enhancing new code introduced in the PR, identified by '+' prefixes 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.
 {%- else %}
 - Only give suggestions that address critical problems and bugs in the PR code. If no relevant suggestions are applicable, return an empty list.
 {%- endif %}
 - Don't suggest to add docstring, type hints, or comments, to remove unused imports, or to use more specific exception types.
 - When referencing variables or names from the code, enclose them in backticks (`). Example: "ensure that `variable_name` is..."
 - Be mindful you are viewing a partial PR code diff, not the full codebase. Avoid suggestions that might conflict with unseen code or alerting variables not declared in the visible scope, as the context is incomplete.
@ -77,14 +67,12 @@ class CodeSuggestion(BaseModel):
    relevant_file: str = Field(description="Full path of the relevant file")
    language: str = Field(description="Programming language used by the relevant file")
    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.")
+    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, without line numbers. 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 of the suggested improvement. Focus on the 'what'. Be general, and avoid method or variable names.")
-{%- if not focus_only_on_problems %}
+    relevant_lines_start: int = Field(description="The relevant line number, from a '__new hunk__' section, where the suggestion starts (inclusive). Should be derived from the hunk line numbers, and correspond to the beginning of the 'existing code' snippet above")
-    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.")
+    relevant_lines_end: int = Field(description="The relevant line number, from a '__new hunk__' section, where the suggestion ends (inclusive). Should be derived from the hunk line numbers, and correspond to the end of the 'existing code' snippet above")
-{%- else %}
+    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'. Other relevant labels are also acceptable.")
    label: str = Field(description="A single, descriptive label that best characterizes the suggestion type. Possible labels include 'security', 'critical bug', 'general'. The 'general' section should be used for suggestions that address a major issue, but are necessarily on a critical level.")
 {%- endif %}
 class PRCodeSuggestions(BaseModel):
@ -107,6 +95,8 @@ code_suggestions:
    ...
  one_sentence_summary: |
    ...
  relevant_lines_start: 12
  relevant_lines_end: 13
  label: |
    ...
 ```
@ -122,7 +112,7 @@ Title: '{{title}}'
 The PR Diff:
 ======
-{{ diff_no_line_numbers|trim }}
+{{ diff|trim }}
 ======
--- a/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
+++ b/pr_agent/settings/pr_code_suggestions_reflect_prompts.toml
@ -15,8 +15,8 @@ Be particularly vigilant for suggestions that:
    - Contradict or ignore parts of the PR's modifications
 In such cases, assign the suggestion a score of 0.
-Evaluate each valid suggestion by scoring its potential impact on the PR's correctness, quality and functionality.
+For valid suggestions, your role is to provide an impartial and precise score assessment that accurately reflects each suggestion's potential impact on the PR's correctness, quality and functionality.
-In addition, you should also detect the line numbers in the '__new hunk__' section that correspond to the 'existing_code' snippet.
+
 Key guidelines for evaluation:
 - Thoroughly examine both the suggestion content and the corresponding PR code diff. Be vigilant for potential errors in each suggestion, ensuring they are logically sound, accurate, and directly derived from the PR code diff.
@ -82,8 +82,6 @@ The output must be a YAML object equivalent to type $PRCodeSuggestionsFeedback,
 class CodeSuggestionFeedback(BaseModel):
    suggestion_summary: str = Field(description="Repeated from the input")
    relevant_file: str = Field(description="Repeated from the input")
    relevant_lines_start: int = Field(description="The relevant line number, from a '__new hunk__' section, where the suggestion starts (inclusive). Should be derived from the hunk line numbers, and correspond to the beginning of the relevant 'existing code' snippet")
    relevant_lines_end: int = Field(description="The relevant line number, from a '__new hunk__' section, where the suggestion ends (inclusive). Should be derived from the hunk line numbers, and correspond to the end of the relevant 'existing code' snippet")
    suggestion_score: int = Field(description="Evaluate the suggestion and assign a score from 0 to 10. Give 0 if the suggestion is wrong. For valid suggestions, score from 1 (lowest impact/importance) to 10 (highest impact/importance).")
    why: str = Field(description="Briefly explain the score given in 1-2 sentences, focusing on the suggestion's impact, relevance, and accuracy.")
@ -98,8 +96,6 @@ code_suggestions:
 - suggestion_summary: |
    Use a more descriptive variable name here
  relevant_file: "src/file1.py"
  relevant_lines_start: 13
  relevant_lines_end: 14
  suggestion_score: 6
  why: |
    The variable name 't' is not descriptive enough
--- a/pr_agent/tools/pr_code_suggestions.py
+++ b/pr_agent/tools/pr_code_suggestions.py
@ -1,30 +1,25 @@
 import asyncio
 import copy
 import difflib
 import re
 import textwrap
 import traceback
 from functools import partial
 from typing import Dict, List
 from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
-from pr_agent.algo.pr_processing import (add_ai_metadata_to_diff_files,
+from pr_agent.algo.pr_processing import get_pr_diff, get_pr_multi_diffs, retry_with_fallback_models, \
-                                         get_pr_diff, get_pr_multi_diffs,
+    add_ai_metadata_to_diff_files
                                         retry_with_fallback_models)
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import (ModelType, load_yaml, replace_code_tags,
+from pr_agent.algo.utils import load_yaml, replace_code_tags, ModelType, show_relevant_configurations
                                 show_relevant_configurations)
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (AzureDevopsProvider, GithubProvider,
+from pr_agent.git_providers import get_git_provider, get_git_provider_with_context, GithubProvider, GitLabProvider, \
-                                    GitLabProvider, get_git_provider,
+    AzureDevopsProvider
                                    get_git_provider_with_context)
 from pr_agent.git_providers.git_provider import get_main_pr_language
 from pr_agent.log import get_logger
 from pr_agent.servers.help import HelpMessage
 from pr_agent.tools.pr_description import insert_br_after_x_chars
 import difflib
 import re
 class PRCodeSuggestions:
@ -49,7 +44,7 @@ class PRCodeSuggestions:
            self.is_extended = self._get_is_extended(args or [])
        except:
            self.is_extended = False
-        num_code_suggestions = int(get_settings().pr_code_suggestions.num_code_suggestions_per_chunk)
+        num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions_per_chunk
        self.ai_handler = ai_handler()
@ -74,13 +69,11 @@ class PRCodeSuggestions:
            "description": self.pr_description,
            "language": self.main_language,
            "diff": "",  # empty diff for initial calculation
            "diff_no_line_numbers": "",  # empty diff for initial calculation
            "num_code_suggestions": num_code_suggestions,
            "extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
            "commit_messages_str": self.git_provider.get_commit_messages(),
            "relevant_best_practices": "",
            "is_ai_metadata": get_settings().get("config.enable_ai_metadata", False),
            "focus_only_on_problems": get_settings().get("pr_code_suggestions.focus_only_on_problems", False),
        }
        self.pr_code_suggestions_prompt_system = get_settings().pr_code_suggestions_prompt.system
@ -117,17 +110,15 @@ class PRCodeSuggestions:
            if not data:
                data = {"code_suggestions": []}
-            if (data is None or 'code_suggestions' not in data or not data['code_suggestions']):
+            if (data is None or 'code_suggestions' not in data or not data['code_suggestions']
-                pr_body = "## PR Code Suggestions ✨\n\nNo code suggestions found for the PR."
+                    and get_settings().config.publish_output):
                get_logger().warning('No code suggestions found for the PR.')
-                if get_settings().config.publish_output and get_settings().config.publish_output_no_suggestions:
+                pr_body = "## PR Code Suggestions ✨\n\nNo code suggestions found for the PR."
-                    get_logger().debug(f"PR output", artifact=pr_body)
+                get_logger().debug(f"PR output", artifact=pr_body)
-                    if self.progress_response:
+                if self.progress_response:
-                        self.git_provider.edit_comment(self.progress_response, body=pr_body)
+                    self.git_provider.edit_comment(self.progress_response, body=pr_body)
                    else:
                        self.git_provider.publish_comment(pr_body)
                else:
-                    get_settings().data = {"artifact": ""}
+                    self.git_provider.publish_comment(pr_body)
                return
            if (not self.is_extended and get_settings().pr_code_suggestions.rank_suggestions) or \
@ -204,11 +195,8 @@ class PRCodeSuggestions:
                        self.git_provider.remove_comment(self.progress_response)
            else:
                get_logger().info('Code suggestions generated for PR, but not published since publish_output is False.')
                get_settings().data = {"artifact": data}
                return
        except Exception as e:
-            get_logger().error(f"Failed to generate code suggestions for PR, error: {e}",
+            get_logger().error(f"Failed to generate code suggestions for PR, error: {e}")
                               artifact={"traceback": traceback.format_exc()})
            if get_settings().config.publish_output:
                if self.progress_response:
                    self.progress_response.delete()
@ -337,12 +325,10 @@ class PRCodeSuggestions:
                                        model,
                                        add_line_numbers_to_hunks=True,
                                        disable_extra_lines=False)
        self.patches_diff_list = [self.patches_diff]
        self.patches_diff_no_line_number = self.remove_line_numbers([self.patches_diff])[0]
        if self.patches_diff:
            get_logger().debug(f"PR diff", artifact=self.patches_diff)
-            self.prediction = await self._get_prediction(model, self.patches_diff, self.patches_diff_no_line_number)
+            self.prediction = await self._get_prediction(model, self.patches_diff)
        else:
            get_logger().warning(f"Empty PR diff")
            self.prediction = None
@ -350,76 +336,54 @@ class PRCodeSuggestions:
        data = self.prediction
        return data
-    async def _get_prediction(self, model: str, patches_diff: str, patches_diff_no_line_number: str) -> dict:
+    async def _get_prediction(self, model: str, patches_diff: str) -> dict:
        variables = copy.deepcopy(self.vars)
        variables["diff"] = patches_diff  # update diff
        variables["diff_no_line_numbers"] = patches_diff_no_line_number  # update diff
        environment = Environment(undefined=StrictUndefined)
        system_prompt = environment.from_string(self.pr_code_suggestions_prompt_system).render(variables)
        user_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.user).render(variables)
        response, finish_reason = await self.ai_handler.chat_completion(
            model=model, temperature=get_settings().config.temperature, system=system_prompt, user=user_prompt)
        if not get_settings().config.publish_output:
            get_settings().system_prompt = system_prompt
            get_settings().user_prompt = user_prompt
        # load suggestions from the AI response
        data = self._prepare_pr_code_suggestions(response)
-        # self-reflect on suggestions (mandatory, since line numbers are generated now here)
+        # self-reflect on suggestions
-        model_reflection = get_settings().config.model
+        if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
-        response_reflect = await self.self_reflect_on_suggestions(data["code_suggestions"],
+            model_turbo = get_settings().config.model_turbo  # use turbo model for self-reflection, since it is an easier task
-                                                                  patches_diff, model=model_reflection)
+            response_reflect = await self.self_reflect_on_suggestions(data["code_suggestions"],
-        if response_reflect:
+                                                                      patches_diff, model=model_turbo)
-            response_reflect_yaml = load_yaml(response_reflect)
+            if response_reflect:
-            code_suggestions_feedback = response_reflect_yaml["code_suggestions"]
+                response_reflect_yaml = load_yaml(response_reflect)
-            if len(code_suggestions_feedback) == len(data["code_suggestions"]):
+                code_suggestions_feedback = response_reflect_yaml["code_suggestions"]
-                for i, suggestion in enumerate(data["code_suggestions"]):
+                if len(code_suggestions_feedback) == len(data["code_suggestions"]):
-                    try:
+                    for i, suggestion in enumerate(data["code_suggestions"]):
                        suggestion["score"] = code_suggestions_feedback[i]["suggestion_score"]
                        suggestion["score_why"] = code_suggestions_feedback[i]["why"]
                        if 'relevant_lines_start' not in suggestion:
                            relevant_lines_start = code_suggestions_feedback[i].get('relevant_lines_start', -1)
                            relevant_lines_end = code_suggestions_feedback[i].get('relevant_lines_end', -1)
                            suggestion['relevant_lines_start'] = relevant_lines_start
                            suggestion['relevant_lines_end'] = relevant_lines_end
                            if relevant_lines_start < 0 or relevant_lines_end < 0:
                                suggestion["score"] = 0
                        try:
-                            if get_settings().config.publish_output:
+                            suggestion["score"] = code_suggestions_feedback[i]["suggestion_score"]
-                                suggestion_statistics_dict = {'score': int(suggestion["score"]),
+                            suggestion["score_why"] = code_suggestions_feedback[i]["why"]
-                                                              'label': suggestion["label"].lower().strip()}
+                        except Exception as e:  #
-                                get_logger().info(f"PR-Agent suggestions statistics",
+                            get_logger().error(f"Error processing suggestion score {i}",
-                                                  statistics=suggestion_statistics_dict, analytics=True)
+                                               artifact={"suggestion": suggestion,
                                                         "code_suggestions_feedback": code_suggestions_feedback[i]})
                            suggestion["score"] = 7
                            suggestion["score_why"] = ""
                        # if the before and after code is the same, clear one of them
                        try:
                            if suggestion['existing_code'] == suggestion['improved_code']:
                                get_logger().debug(
                                    f"edited improved suggestion {i + 1}, because equal to existing code: {suggestion['existing_code']}")
                                if get_settings().pr_code_suggestions.commitable_code_suggestions:
                                    suggestion['improved_code'] = ""  # we need 'existing_code' to locate the code in the PR
                                else:
                                    suggestion['existing_code'] = ""
                        except Exception as e:
-                            get_logger().error(f"Failed to log suggestion statistics, error: {e}")
+                            get_logger().error(f"Error processing suggestion {i + 1}, error: {e}")
-                            pass
+            else:
-
+                # get_logger().error(f"Could not self-reflect on suggestions. using default score 7")
-                    except Exception as e:  #
+                for i, suggestion in enumerate(data["code_suggestions"]):
-                        get_logger().error(f"Error processing suggestion score {i}",
+                    suggestion["score"] = 7
-                                           artifact={"suggestion": suggestion,
+                    suggestion["score_why"] = ""
                                                     "code_suggestions_feedback": code_suggestions_feedback[i]})
                        suggestion["score"] = 7
                        suggestion["score_why"] = ""
                    # if the before and after code is the same, clear one of them
                    try:
                        if suggestion['existing_code'] == suggestion['improved_code']:
                            get_logger().debug(
                                f"edited improved suggestion {i + 1}, because equal to existing code: {suggestion['existing_code']}")
                            if get_settings().pr_code_suggestions.commitable_code_suggestions:
                                suggestion['improved_code'] = ""  # we need 'existing_code' to locate the code in the PR
                            else:
                                suggestion['existing_code'] = ""
                    except Exception as e:
                        get_logger().error(f"Error processing suggestion {i + 1}, error: {e}")
        else:
            # get_logger().error(f"Could not self-reflect on suggestions. using default score 7")
            for i, suggestion in enumerate(data["code_suggestions"]):
                suggestion["score"] = 7
                suggestion["score_why"] = ""
        return data
@ -429,10 +393,10 @@ class PRCodeSuggestions:
        suggestion_truncation_message = get_settings().get("PR_CODE_SUGGESTIONS.SUGGESTION_TRUNCATION_MESSAGE", "")
        if max_code_suggestion_length > 0:
            if len(suggestion['improved_code']) > max_code_suggestion_length:
                get_logger().info(f"Truncated suggestion from {len(suggestion['improved_code'])} "
                                  f"characters to {max_code_suggestion_length} characters")
                suggestion['improved_code'] = suggestion['improved_code'][:max_code_suggestion_length]
                suggestion['improved_code'] += f"\n{suggestion_truncation_message}"
                get_logger().info(f"Truncated suggestion from {len(suggestion['improved_code'])} "
                                  f"characters to {max_code_suggestion_length} characters")
        return suggestion
    def _prepare_pr_code_suggestions(self, predictions: str) -> Dict:
@ -447,7 +411,8 @@ class PRCodeSuggestions:
        one_sentence_summary_list = []
        for i, suggestion in enumerate(data['code_suggestions']):
            try:
-                needed_keys = ['one_sentence_summary', 'label', 'relevant_file']
+                needed_keys = ['one_sentence_summary', 'label', 'relevant_file', 'relevant_lines_start',
                               'relevant_lines_end']
                is_valid_keys = True
                for key in needed_keys:
                    if key not in suggestion:
@ -458,11 +423,6 @@ class PRCodeSuggestions:
                if not is_valid_keys:
                    continue
                if get_settings().get("pr_code_suggestions.focus_only_on_problems", False):
                    CRITICAL_LABEL = 'critical'
                    if CRITICAL_LABEL in suggestion['label'].lower(): # we want the published labels to be less declarative
                        suggestion['label'] = 'possible issue'
                if suggestion['one_sentence_summary'] in one_sentence_summary_list:
                    get_logger().debug(f"Skipping suggestion {i + 1}, because it is a duplicate: {suggestion}")
                    continue
@ -576,33 +536,9 @@ class PRCodeSuggestions:
            return True
        return False
    def remove_line_numbers(self, patches_diff_list: List[str]) -> List[str]:
        # create a copy of the patches_diff_list, without line numbers for '__new hunk__' sections
        try:
            self.patches_diff_list_no_line_numbers = []
            for patches_diff in self.patches_diff_list:
                patches_diff_lines = patches_diff.splitlines()
                for i, line in enumerate(patches_diff_lines):
                    if line.strip():
                        if line[0].isdigit():
                            # find the first letter in the line that starts with a valid letter
                            for j, char in enumerate(line):
                                if not char.isdigit():
                                    patches_diff_lines[i] = line[j + 1:]
                                    break
                self.patches_diff_list_no_line_numbers.append('\n'.join(patches_diff_lines))
            return self.patches_diff_list_no_line_numbers
        except Exception as e:
            get_logger().error(f"Error removing line numbers from patches_diff_list, error: {e}")
            return patches_diff_list
    async def _prepare_prediction_extended(self, model: str) -> dict:
        self.patches_diff_list = get_pr_multi_diffs(self.git_provider, self.token_handler, model,
                                                    max_calls=get_settings().pr_code_suggestions.max_number_of_calls)
        # create a copy of the patches_diff_list, without line numbers for '__new hunk__' sections
        self.patches_diff_list_no_line_numbers = self.remove_line_numbers(self.patches_diff_list)
        if self.patches_diff_list:
            get_logger().info(f"Number of PR chunk calls: {len(self.patches_diff_list)}")
            get_logger().debug(f"PR diff:", artifact=self.patches_diff_list)
@ -610,14 +546,12 @@ class PRCodeSuggestions:
            # parallelize calls to AI:
            if get_settings().pr_code_suggestions.parallel_calls:
                prediction_list = await asyncio.gather(
-                    *[self._get_prediction(model, patches_diff, patches_diff_no_line_numbers) for
+                    *[self._get_prediction(model, patches_diff) for patches_diff in self.patches_diff_list])
                      patches_diff, patches_diff_no_line_numbers in
                      zip(self.patches_diff_list, self.patches_diff_list_no_line_numbers)])
                self.prediction_list = prediction_list
            else:
                prediction_list = []
-                for patches_diff, patches_diff_no_line_numbers in zip(self.patches_diff_list, self.patches_diff_list_no_line_numbers):
+                for i, patches_diff in enumerate(self.patches_diff_list):
-                    prediction = await self._get_prediction(model, patches_diff, patches_diff_no_line_numbers)
+                    prediction = await self._get_prediction(model, patches_diff)
                    prediction_list.append(prediction)
            data = {"code_suggestions": []}
@ -626,16 +560,18 @@ class PRCodeSuggestions:
                    score_threshold = max(1, int(get_settings().pr_code_suggestions.suggestions_score_threshold))
                    for i, prediction in enumerate(predictions["code_suggestions"]):
                        try:
-                            score = int(prediction.get("score", 1))
+                            if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
-                            if score >= score_threshold:
+                                score = int(prediction.get("score", 1))
-                                data["code_suggestions"].append(prediction)
+                                if score >= score_threshold:
                                    data["code_suggestions"].append(prediction)
                                else:
                                    get_logger().info(
                                        f"Removing suggestions {i} from call {j}, because score is {score}, and score_threshold is {score_threshold}",
                                        artifact=prediction)
                            else:
-                                get_logger().info(
+                                data["code_suggestions"].append(prediction)
                                    f"Removing suggestions {i} from call {j}, because score is {score}, and score_threshold is {score_threshold}",
                                    artifact=prediction)
                        except Exception as e:
-                            get_logger().error(f"Error getting PR diff for suggestion {i} in call {j}, error: {e}",
+                            get_logger().error(f"Error getting PR diff for suggestion {i} in call {j}, error: {e}")
                                               artifact={"prediction": prediction})
            self.data = data
        else:
            get_logger().warning(f"Empty PR diff list")
@ -686,7 +622,7 @@ class PRCodeSuggestions:
            if get_settings().pr_code_suggestions.final_clip_factor != 1:
                max_len = max(
                    len(data_sorted),
-                    int(get_settings().pr_code_suggestions.num_code_suggestions_per_chunk),
+                    get_settings().pr_code_suggestions.num_code_suggestions_per_chunk,
                )
                new_len = int(0.5 + max_len * get_settings().pr_code_suggestions.final_clip_factor)
                if new_len < len(data_sorted):
@ -719,7 +655,10 @@ class PRCodeSuggestions:
            header = f"Suggestion"
            delta = 66
            header += "&nbsp; " * delta
-            pr_body += f"""<thead><tr><td>Category</td><td align=left>{header}</td><td align=center>Score</td></tr>"""
+            if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
                pr_body += f"""<thead><tr><td>Category</td><td align=left>{header}</td><td align=center>Score</td></tr>"""
            else:
                pr_body += f"""<thead><tr><td>Category</td><td align=left>{header}</td></tr>"""
            pr_body += """<tbody>"""
            suggestions_labels = dict()
            # add all suggestions related to each label
@ -730,11 +669,12 @@ class PRCodeSuggestions:
                suggestions_labels[label].append(suggestion)
            # sort suggestions_labels by the suggestion with the highest score
-            suggestions_labels = dict(
+            if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
-                sorted(suggestions_labels.items(), key=lambda x: max([s['score'] for s in x[1]]), reverse=True))
+                suggestions_labels = dict(
-            # sort the suggestions inside each label group by score
+                    sorted(suggestions_labels.items(), key=lambda x: max([s['score'] for s in x[1]]), reverse=True))
-            for label, suggestions in suggestions_labels.items():
+                # sort the suggestions inside each label group by score
-                suggestions_labels[label] = sorted(suggestions, key=lambda x: x['score'], reverse=True)
+                for label, suggestions in suggestions_labels.items():
                    suggestions_labels[label] = sorted(suggestions, key=lambda x: x['score'], reverse=True)
            counter_suggestions = 0
            for label, suggestions in suggestions_labels.items():
@ -793,14 +733,16 @@ class PRCodeSuggestions:
 {example_code.rstrip()}                   
 """
-                    pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
+                    if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
-                    pr_body += f"Why: {suggestion['score_why']}\n\n"
+                        pr_body += f"<details><summary>Suggestion importance[1-10]: {suggestion['score']}</summary>\n\n"
-                    pr_body += f"</details>"
+                        pr_body += f"Why: {suggestion['score_why']}\n\n"
                        pr_body += f"</details>"
                    pr_body += f"</details>"
                    # # add another column for 'score'
-                    pr_body += f"</td><td align=center>{suggestion['score']}\n\n"
+                    if get_settings().pr_code_suggestions.self_reflect_on_suggestions:
                        pr_body += f"</td><td align=center>{suggestion['score']}\n\n"
                    pr_body += f"</td></tr>"
                    counter_suggestions += 1
@ -841,3 +783,4 @@ class PRCodeSuggestions:
            get_logger().info(f"Could not reflect on suggestions, error: {e}")
            return ""
        return response_reflect
--- a/pr_agent/tools/pr_description.py
+++ b/pr_agent/tools/pr_description.py
@ -9,24 +9,19 @@ from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
-from pr_agent.algo.pr_processing import (OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD,
+from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models, get_pr_diff_multiple_patchs, \
-                                         get_pr_diff,
+    OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD
                                         get_pr_diff_multiple_patchs,
                                         retry_with_fallback_models)
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import (ModelType, PRDescriptionHeader, clip_tokens,
+from pr_agent.algo.utils import set_custom_labels, PRDescriptionHeader
-                                 get_max_tokens, get_user_labels, load_yaml,
+from pr_agent.algo.utils import load_yaml, get_user_labels, ModelType, show_relevant_configurations, get_max_tokens, \
-                                 set_custom_labels,
+    clip_tokens
                                 show_relevant_configurations)
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (GithubProvider, get_git_provider,
+from pr_agent.git_providers import get_git_provider, GithubProvider, get_git_provider_with_context
                                    get_git_provider_with_context)
 from pr_agent.git_providers.git_provider import get_main_pr_language
 from pr_agent.log import get_logger
 from pr_agent.servers.help import HelpMessage
-from pr_agent.tools.ticket_pr_compliance_check import (
+from pr_agent.tools.ticket_pr_compliance_check import extract_ticket_links_from_pr_description, extract_tickets, \
-    extract_and_cache_pr_tickets, extract_ticket_links_from_pr_description,
+    extract_and_cache_pr_tickets
    extract_tickets)
 class PRDescription:
--- a/pr_agent/tools/pr_generate_labels.py
+++ b/pr_agent/tools/pr_generate_labels.py
@ -9,7 +9,7 @@ from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
 from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import get_user_labels, load_yaml, set_custom_labels
+from pr_agent.algo.utils import load_yaml, set_custom_labels, get_user_labels
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
--- a/pr_agent/tools/pr_help_message.py
+++ b/pr_agent/tools/pr_help_message.py
@ -9,10 +9,10 @@ from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
 from pr_agent.algo.pr_processing import retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import ModelType, clip_tokens, load_yaml
+from pr_agent.algo.utils import ModelType, load_yaml, clip_tokens
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (BitbucketServerProvider, GithubProvider,
+from pr_agent.git_providers import GithubProvider, BitbucketServerProvider, \
-                                    get_git_provider_with_context)
+    get_git_provider_with_context
 from pr_agent.log import get_logger
--- a/pr_agent/tools/pr_line_questions.py
+++ b/pr_agent/tools/pr_line_questions.py
@ -6,8 +6,8 @@ from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
-from pr_agent.algo.git_patch_processing import (
+from pr_agent.algo.git_patch_processing import convert_to_hunks_with_lines_numbers, \
-    convert_to_hunks_with_lines_numbers, extract_hunk_lines_from_patch)
+    extract_hunk_lines_from_patch
 from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.utils import ModelType
--- a/pr_agent/tools/pr_reviewer.py
+++ b/pr_agent/tools/pr_reviewer.py
@ -4,27 +4,19 @@ import traceback
 from collections import OrderedDict
 from functools import partial
 from typing import List, Tuple
 from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
-from pr_agent.algo.pr_processing import (add_ai_metadata_to_diff_files,
+from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models, add_ai_metadata_to_diff_files
                                         get_pr_diff,
                                         retry_with_fallback_models)
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import (ModelType, PRReviewHeader,
+from pr_agent.algo.utils import github_action_output, load_yaml, ModelType, \
-                                 convert_to_markdown_v2, github_action_output,
+    show_relevant_configurations, convert_to_markdown_v2, PRReviewHeader
                                 load_yaml, show_relevant_configurations)
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import (get_git_provider,
+from pr_agent.git_providers import get_git_provider, get_git_provider_with_context
-                                    get_git_provider_with_context)
+from pr_agent.git_providers.git_provider import IncrementalPR, get_main_pr_language
 from pr_agent.git_providers.git_provider import (IncrementalPR,
                                                 get_main_pr_language)
 from pr_agent.log import get_logger
 from pr_agent.servers.help import HelpMessage
-from pr_agent.tools.ticket_pr_compliance_check import (
+from pr_agent.tools.ticket_pr_compliance_check import extract_tickets, extract_and_cache_pr_tickets
    extract_and_cache_pr_tickets, extract_tickets)
 class PRReviewer:
--- a/pr_agent/tools/pr_similar_issue.py
+++ b/pr_agent/tools/pr_similar_issue.py
@ -34,9 +34,9 @@ class PRSimilarIssue:
        if get_settings().pr_similar_issue.vectordb == "pinecone":
            try:
                import pandas as pd
                import pinecone
                from pinecone_datasets import Dataset, DatasetMetadata
                import pandas as pd
            except:
                raise Exception("Please install 'pinecone' and 'pinecone_datasets' to use pinecone as vectordb")
            # assuming pinecone api key and environment are set in secrets file
@ -111,7 +111,7 @@ class PRSimilarIssue:
        elif get_settings().pr_similar_issue.vectordb == "lancedb":
            try:
-                import lancedb  # import lancedb only if needed
+                import lancedb # import lancedb only if needed
            except:
                raise Exception("Please install lancedb to use lancedb as vectordb")
            self.db = lancedb.connect(get_settings().lancedb.uri)
--- a/pr_agent/tools/pr_update_changelog.py
+++ b/pr_agent/tools/pr_update_changelog.py
@ -3,16 +3,14 @@ from datetime import date
 from functools import partial
 from time import sleep
 from typing import Tuple
 from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
 from pr_agent.algo.ai_handlers.litellm_ai_handler import LiteLLMAIHandler
 from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.utils import ModelType, show_relevant_configurations
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import GithubProvider, get_git_provider
+from pr_agent.git_providers import get_git_provider, GithubProvider
 from pr_agent.git_providers.git_provider import get_main_pr_language
 from pr_agent.log import get_logger
--- a/pr_agent/tools/ticket_pr_compliance_check.py
+++ b/pr_agent/tools/ticket_pr_compliance_check.py
@ -108,7 +108,7 @@ async def extract_tickets(git_provider):
 async def extract_and_cache_pr_tickets(git_provider, vars):
-    if not get_settings().get('pr_reviewer.require_ticket_analysis_review', False):
+    if get_settings().get('config.require_ticket_analysis_review', False):
        return
    related_tickets = get_settings().get('related_tickets', [])
    if not related_tickets:
--- a/pyproject.toml
+++ b/pyproject.toml
@ -6,19 +6,19 @@ build-backend = "setuptools.build_meta"
 name = "pr-agent"
 version = "0.2.4"
-authors = [{ name = "CodiumAI", email = "tal.r@codium.ai" }]
+authors = [{name= "CodiumAI", email = "tal.r@codium.ai"}]
 maintainers = [
-  { name = "Tal Ridnik", email = "tal.r@codium.ai" },
+  {name = "Tal Ridnik", email = "tal.r@codium.ai"},
-  { name = "Ori Kotek", email = "ori.k@codium.ai" },
+  {name = "Ori Kotek", email = "ori.k@codium.ai"},
-  { name = "Hussam Lawen", email = "hussam.l@codium.ai" },
+  {name = "Hussam Lawen", email = "hussam.l@codium.ai"},
 ]
 description = "CodiumAI PR-Agent aims to help efficiently review and handle pull requests, by providing AI feedbacks and suggestions."
 readme = "README.md"
 requires-python = ">=3.10"
 keywords = ["AI", "Agents", "Pull Request", "Automation", "Code Review"]
-license = { name = "Apache 2.0", file = "LICENSE" }
+license = {name = "Apache 2.0", file = "LICENSE"}
 classifiers = [
  "Intended Audience :: Developers",
@ -28,7 +28,7 @@ dynamic = ["dependencies"]
 [tool.setuptools.dynamic]
-dependencies = { file = ["requirements.txt"] }
+dependencies = {file = ["requirements.txt"]}
 [project.urls]
 "Homepage" = "https://github.com/Codium-ai/pr-agent"
@ -40,43 +40,41 @@ license-files = ["LICENSE"]
 [tool.setuptools.packages.find]
 where = ["."]
-include = [
+include = ["pr_agent*"] # include pr_agent and any sub-packages it finds under it.
  "pr_agent*",
 ] # include pr_agent and any sub-packages it finds under it.
 [project.scripts]
 pr-agent = "pr_agent.cli:run"
 [tool.ruff]
 line-length = 120
-lint.select = [
+select = [
-  "E",    # Pyflakes
+  "E",  # Pyflakes
-  "F",    # Pyflakes
+  "F",  # Pyflakes
-  "B",    # flake8-bugbear
+  "B",  # flake8-bugbear
-  "I001", # isort basic checks
+  "I001",  # isort basic checks
-  "I002", # isort missing-required-import
+  "I002",  # isort missing-required-import
-]
+  ]
 # First commit - only fixing isort
-lint.fixable = [
+fixable = [
-  "I001", # isort basic checks
+  "I001",  # isort basic checks
 ]
-lint.unfixable = [
+unfixable = [
-  "B", # Avoid trying to fix flake8-bugbear (`B`) violations.
+  "B",  # Avoid trying to fix flake8-bugbear (`B`) violations.
  ]
 exclude = [
  "api/code_completions",
 ]
-lint.exclude = ["api/code_completions"]
+ignore = [
  "E999", "B008"
 ]
-lint.ignore = ["E999", "B008"]
+[tool.ruff.per-file-ignores]
-
+"__init__.py" = ["E402"]  # Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`.
-[tool.ruff.lint.per-file-ignores]
+# TODO: should decide if maybe not to ignore these.
 "__init__.py" = [
  "E402",
 ] # Ignore `E402` (import violations) in all `__init__.py` files, and in `path/to/file.py`.
 [tool.bandit]
 exclude_dirs = ["tests"]
 skips = ["B101"]
 tests = []
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@ -1,4 +1,3 @@
 pytest==7.4.0
 poetry
 twine
 pre-commit>=4,<5
--- a/requirements.txt
+++ b/requirements.txt
@ -1,5 +1,5 @@
 aiohttp==3.9.5
-anthropic[vertex]==0.39.0
+anthropic[vertex]==0.37.1
 atlassian-python-api==3.41.4
 azure-devops==7.1.0b3
 azure-identity==1.15.0
@ -12,17 +12,17 @@ google-cloud-aiplatform==1.38.0
 google-generativeai==0.8.3
 google-cloud-storage==2.10.0
 Jinja2==3.1.2
-litellm==1.52.0
+litellm==1.50.2
 loguru==0.7.2
 msrest==0.7.1
-openai==1.54.1
+openai==1.52.1
 pytest==7.4.0
 PyGithub==1.59.*
 PyYAML==6.0.1
 python-gitlab==3.15.0
 retry==0.9.2
 starlette-context==0.3.6
-tiktoken==0.8.0
+tiktoken==0.7.0
 ujson==5.8.0
 uvicorn==0.22.0
 tenacity==8.2.3
--- a/setup.py
+++ b/setup.py
@ -3,3 +3,4 @@
 from setuptools import setup
 setup()
 print("aaa")
--- a/tests/e2e_tests/e2e_utils.py
+++ b/tests/e2e_tests/e2e_utils.py
@ -32,3 +32,4 @@ def main():
 if __name__ == '__main__':
    main()
 """
--- a/tests/e2e_tests/test_bitbucket_app.py
+++ b/tests/e2e_tests/test_bitbucket_app.py
@ -5,16 +5,16 @@ import time
 from datetime import datetime
 import jwt
 import requests
 from atlassian.bitbucket import Cloud
 import requests
 from requests.auth import HTTPBasicAuth
 from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger, setup_logger
+from pr_agent.log import setup_logger, get_logger
-from tests.e2e_tests.e2e_utils import (FILE_PATH,
+from tests.e2e_tests.e2e_utils import NEW_FILE_CONTENT, FILE_PATH, PR_HEADER_START_WITH, REVIEW_START_WITH, \
-                                       IMPROVE_START_WITH_REGEX_PATTERN,
+    IMPROVE_START_WITH_REGEX_PATTERN, NUM_MINUTES
-                                       NEW_FILE_CONTENT, NUM_MINUTES,
+
                                       PR_HEADER_START_WITH, REVIEW_START_WITH)
 log_level = os.environ.get("LOG_LEVEL", "INFO")
 setup_logger(log_level)
--- a/tests/e2e_tests/test_github_app.py
+++ b/tests/e2e_tests/test_github_app.py
@ -5,11 +5,9 @@ from datetime import datetime
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger, setup_logger
+from pr_agent.log import setup_logger, get_logger
-from tests.e2e_tests.e2e_utils import (FILE_PATH,
+from tests.e2e_tests.e2e_utils import NEW_FILE_CONTENT, FILE_PATH, PR_HEADER_START_WITH, REVIEW_START_WITH, \
-                                       IMPROVE_START_WITH_REGEX_PATTERN,
+    IMPROVE_START_WITH_REGEX_PATTERN, NUM_MINUTES
                                       NEW_FILE_CONTENT, NUM_MINUTES,
                                       PR_HEADER_START_WITH, REVIEW_START_WITH)
 log_level = os.environ.get("LOG_LEVEL", "INFO")
 setup_logger(log_level)
--- a/tests/e2e_tests/test_gitlab_webhook.py
+++ b/tests/e2e_tests/test_gitlab_webhook.py
@ -7,11 +7,9 @@ import gitlab
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger, setup_logger
+from pr_agent.log import setup_logger, get_logger
-from tests.e2e_tests.e2e_utils import (FILE_PATH,
+from tests.e2e_tests.e2e_utils import NEW_FILE_CONTENT, FILE_PATH, PR_HEADER_START_WITH, REVIEW_START_WITH, \
-                                       IMPROVE_START_WITH_REGEX_PATTERN,
+    IMPROVE_START_WITH_REGEX_PATTERN, NUM_MINUTES
                                       NEW_FILE_CONTENT, NUM_MINUTES,
                                       PR_HEADER_START_WITH, REVIEW_START_WITH)
 log_level = os.environ.get("LOG_LEVEL", "INFO")
 setup_logger(log_level)
--- a/tests/unittest/test_bitbucket_provider.py
+++ b/tests/unittest/test_bitbucket_provider.py
@ -1,10 +1,8 @@
 from unittest.mock import MagicMock
 from atlassian.bitbucket import Bitbucket
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.git_providers import BitbucketServerProvider
 from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
 from unittest.mock import MagicMock
 from atlassian.bitbucket import Bitbucket
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 class TestBitbucketProvider:
--- a/tests/unittest/test_codecommit_client.py
+++ b/tests/unittest/test_codecommit_client.py
@ -1,5 +1,4 @@
 from unittest.mock import MagicMock
 from pr_agent.git_providers.codecommit_client import CodeCommitClient
--- a/tests/unittest/test_codecommit_provider.py
+++ b/tests/unittest/test_codecommit_provider.py
@ -1,11 +1,9 @@
 from unittest.mock import patch
 import pytest
-
+from unittest.mock import patch
 from pr_agent.git_providers.codecommit_provider import CodeCommitFile
 from pr_agent.git_providers.codecommit_provider import CodeCommitProvider
 from pr_agent.git_providers.codecommit_provider import PullRequestCCMimic
 from pr_agent.algo.types import EDIT_TYPE, FilePatchInfo
 from pr_agent.git_providers.codecommit_provider import (CodeCommitFile,
                                                        CodeCommitProvider,
                                                        PullRequestCCMimic)
 class TestCodeCommitFile:
--- a/tests/unittest/test_extend_patch.py
+++ b/tests/unittest/test_extend_patch.py
@ -1,5 +1,4 @@
 import pytest
 from pr_agent.algo.git_patch_processing import extend_patch
 from pr_agent.algo.pr_processing import pr_generate_extended_diff
 from pr_agent.algo.token_handler import TokenHandler
--- a/tests/unittest/test_file_filter.py
+++ b/tests/unittest/test_file_filter.py
@ -1,9 +1,7 @@
 import pytest
 from pr_agent.algo.file_filter import filter_ignored
 from pr_agent.config_loader import global_settings
 class TestIgnoreFilter:
    def test_no_ignores(self):
        """
--- a/tests/unittest/test_find_line_number_of_relevant_line_in_file.py
+++ b/tests/unittest/test_find_line_number_of_relevant_line_in_file.py
@ -1,10 +1,9 @@
 # Generated by CodiumAI
 import pytest
 from pr_agent.algo.types import FilePatchInfo
 from pr_agent.algo.utils import find_line_number_of_relevant_line_in_file
 import pytest
 class TestFindLineNumberOfRelevantLineInFile:
    # Tests that the function returns the correct line number and absolute position when the relevant line is found in the patch
--- a/tests/unittest/test_github_action_output.py
+++ b/tests/unittest/test_github_action_output.py
@ -1,9 +1,7 @@
 import json
 import os
-
+import json
 from pr_agent.algo.utils import get_settings, github_action_output
 class TestGitHubOutput:
    def test_github_action_output_enabled(self, monkeypatch, tmp_path):
        get_settings().set('GITHUB_ACTION_CONFIG.ENABLE_OUTPUT', True)
--- a/tests/unittest/test_load_yaml.py
+++ b/tests/unittest/test_load_yaml.py
@ -47,3 +47,7 @@ PR Feedback:
        expected_output = [{'relevant file': 'src/app.py:\n', 'suggestion content': 'The print statement is outside inside the if __name__ ==:'}]
        assert load_yaml(yaml_str) == expected_output
--- a/tests/unittest/test_try_fix_yaml.py
+++ b/tests/unittest/test_try_fix_yaml.py
@ -1,10 +1,10 @@
 # Generated by CodiumAI
 import pytest
 from pr_agent.algo.utils import try_fix_yaml
 import pytest
 class TestTryFixYaml:
    # The function successfully parses a valid YAML string.
`@ -2,3 +2,4 @@ We take your code's security and privacy seriously:`

	`- The Chrome extension will not send your code to any external servers.`	`- The Chrome extension will not send your code to any external servers.`
	`- For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge Pro integration.`	`- For private repositories, we will first validate the user's identity and permissions. After authentication, we generate responses using the existing Qodo Merge Pro integration.`
`@ -10,3 +10,4 @@ Specifically, CLI commands can be issued by invoking a pre-built [docker image](`

	`For online usage, you will need to setup either a [GitHub App](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-app) or a [GitHub Action](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) (GitHub), a [GitLab webhook](https://qodo-merge-docs.qodo.ai/installation/gitlab/#run-a-gitlab-webhook-server) (GitLab), or a [BitBucket App](https://qodo-merge-docs.qodo.ai/installation/bitbucket/#run-using-codiumai-hosted-bitbucket-app) (BitBucket).`	`For online usage, you will need to setup either a [GitHub App](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-app) or a [GitHub Action](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) (GitHub), a [GitLab webhook](https://qodo-merge-docs.qodo.ai/installation/gitlab/#run-a-gitlab-webhook-server) (GitLab), or a [BitBucket App](https://qodo-merge-docs.qodo.ai/installation/bitbucket/#run-using-codiumai-hosted-bitbucket-app) (BitBucket).`
	`These platforms also enable to run Qodo Merge specific tools automatically when a new PR is opened, or on each push to a branch.`	`These platforms also enable to run Qodo Merge specific tools automatically when a new PR is opened, or on each push to a branch.`
`@ -1,5 +1,4 @@`
	`from unittest.mock import MagicMock`	`from unittest.mock import MagicMock`

	`from pr_agent.git_providers.codecommit_client import CodeCommitClient`	`from pr_agent.git_providers.codecommit_client import CodeCommitClient`
`@ -47,3 +47,7 @@ PR Feedback:`

	`expected_output = [{'relevant file': 'src/app.py:\n', 'suggestion content': 'The print statement is outside inside the if __name__ ==:'}]`	`expected_output = [{'relevant file': 'src/app.py:\n', 'suggestion content': 'The print statement is outside inside the if __name__ ==:'}]`
	`assert load_yaml(yaml_str) == expected_output`	`assert load_yaml(yaml_str) == expected_output`