Revert "Repo settings file - fix a bug and apply to GitHub app"

.github/workflows/pr-agent-review.yaml

@@ -5,9 +5,8 @@
 name: PR-Agent
 
 on:
-# pull_request:
+  pull_request:
-# issue_comment:
+  issue_comment:
-  workflow_dispatch:
 
 permissions:
   issues: write
@@ -27,7 +26,5 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PINECONE.API_KEY: ${{ secrets.PINECONE_API_KEY }}
           PINECONE.ENVIRONMENT: ${{ secrets.PINECONE_ENVIRONMENT }}
-          GITHUB_ACTION.AUTO_REVIEW: true
-          GITHUB_ACTION.AUTO_IMPROVE: true
 
 

.pr_agent.toml

@@ -1,6 +0,0 @@
-[pr_reviewer]
-enable_review_labels_effort = true
-
-
-[pr_code_suggestions]
-summarize=true

Dockerfile.bitbucket_pipeline

@@ -0,0 +1,18 @@
+FROM python:3.10 as base
+
+ENV OPENAI_API_KEY=${OPENAI_API_KEY} \
+    BITBUCKET_BEARER_TOKEN=${BITBUCKET_BEARER_TOKEN} \
+    BITBUCKET_PR_ID=${BITBUCKET_PR_ID} \
+    BITBUCKET_REPO_SLUG=${BITBUCKET_REPO_SLUG} \
+    BITBUCKET_WORKSPACE=${BITBUCKET_WORKSPACE}
+
+
+WORKDIR /app
+ADD pyproject.toml .
+ADD requirements.txt .
+RUN pip install . && rm pyproject.toml requirements.txt
+ENV PYTHONPATH=/app
+ADD pr_agent pr_agent
+ADD bitbucket_pipeline/entrypoint.sh /
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/entrypoint.sh"]

INSTALL.md

@@ -4,74 +4,66 @@
 To get started with PR-Agent quickly, you first need to acquire two tokens:
 
 1. An OpenAI key from [here](https://platform.openai.com/), with access to GPT-4.
-2. A GitHub\GitLab\BitBucket personal access token (classic) with the repo scope.
+2. A GitHub personal access token (classic) with the repo scope.
 
 There are several ways to use PR-Agent:
 
-**Locally**
+- [Method 1: Use Docker image (no installation required)](INSTALL.md#method-1-use-docker-image-no-installation-required)
-- [Using Docker image (no installation required)](INSTALL.md#use-docker-image-no-installation-required)
+- [Method 2: Run from source](INSTALL.md#method-2-run-from-source)
-- [Run from source](INSTALL.md#run-from-source)
+- [Method 3: Run as a GitHub Action](INSTALL.md#method-3-run-as-a-github-action)
-
+- [Method 4: Run as a polling server](INSTALL.md#method-4-run-as-a-polling-server)
-**GitHub specific methods**
+- [Method 5: Run as a GitHub App](INSTALL.md#method-5-run-as-a-github-app)
-- [Run as a GitHub Action](INSTALL.md#run-as-a-github-action)
+- [Method 6: Deploy as a Lambda Function](INSTALL.md#method-6---deploy-as-a-lambda-function)
-- [Run as a polling server](INSTALL.md#run-as-a-polling-server)
+- [Method 7: AWS CodeCommit](INSTALL.md#method-7---aws-codecommit-setup)
-- [Run as a GitHub App](INSTALL.md#run-as-a-github-app)
+- [Method 8: Run a GitLab webhook server](INSTALL.md#method-8---run-a-gitlab-webhook-server)
-- [Deploy as a Lambda Function](INSTALL.md#deploy-as-a-lambda-function)
+- [Method 9: Run as a Bitbucket Pipeline](INSTALL.md#method-9-run-as-a-bitbucket-pipeline)
-- [AWS CodeCommit](INSTALL.md#aws-codecommit-setup)
-
-**GitLab specific methods**
-- [Run a GitLab webhook server](INSTALL.md#run-a-gitlab-webhook-server)
-
-**BitBucket specific methods**
-- [Run as a Bitbucket Pipeline](INSTALL.md#run-as-a-bitbucket-pipeline)
-- [Run on a hosted app](INSTALL.md#run-on-a-hosted-bitbucket-app)
-- [Bitbucket server and data center](INSTALL.md#bitbucket-server-and-data-center)
 ---
 
-### Use Docker image (no installation required)
+### Method 1: Use Docker image (no installation required)
 
-A list of the relevant tools can be found in the [tools guide](./docs/TOOLS_GUIDE.md).
+To request a review for a PR, or ask a question about a PR, you can run directly from the Docker image. Here's how:
 
-To invoke a tool (for example `review`), you can run directly from the Docker image. Here's how:
+1. To request a review for a PR, run the following command:
 
-- For GitHub:
+For GitHub:
 ```
-docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
+docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent --pr_url <pr_url> review
 ```
-
+For GitLab:
-- For GitLab:
 ```
-docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> codiumai/pr-agent:latest --pr_url <pr_url> review
+docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> codiumai/pr-agent --pr_url <pr_url> review
 ```
-
-Note: If you have a dedicated GitLab instance, you need to specify the custom url as variable:
-```
-docker run --rm -it -e OPENAI.KEY=<your key> -e CONFIG.GIT_PROVIDER=gitlab -e GITLAB.PERSONAL_ACCESS_TOKEN=<your token> -e GITLAB.URL=<your gitlab instance url> codiumai/pr-agent:latest --pr_url <pr_url> review
-```
-
-- For BitBucket:
-```
-docker run --rm -it -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=<pr_url> review
-```
-
 For other git providers, update CONFIG.GIT_PROVIDER accordingly, and check the `pr_agent/settings/.secrets_template.toml` file for the environment variables expected names and values.
 
----
+2. To ask a question about a PR, run the following command:
 
+```
+docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent --pr_url <pr_url> ask "<your question>"
+```
+Note: If you want to ensure you're running a specific version of the Docker image, consider using the image's digest.
+The digest is a unique identifier for a specific version of an image. You can pull and run an image using its digest by referencing it like so: repository@sha256:digest. Always ensure you're using the correct and trusted digest for your operations.
 
-If you want to ensure you're running a specific version of the Docker image, consider using the image's digest:
+1. To request a review for a PR using a specific digest, run the following command:
 ```bash
 docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent@sha256:71b5ee15df59c745d352d84752d01561ba64b6d51327f97d46152f0c58a5f678 --pr_url <pr_url> review
 ```
 
-Or you can run a [specific released versions](./RELEASE_NOTES.md) of pr-agent, for example:
+2. To ask a question about a PR using the same digest, run the following command:
-```
+```bash
-codiumai/pr-agent@v0.9
+docker run --rm -it -e OPENAI.KEY=<your key> -e GITHUB.USER_TOKEN=<your token> codiumai/pr-agent@sha256:71b5ee15df59c745d352d84752d01561ba64b6d51327f97d46152f0c58a5f678 --pr_url <pr_url> ask "<your question>"
 ```
 
+Possible questions you can ask include:
+
+- What is the main theme of this PR?
+- Is the PR ready for merge?
+- What are the main changes in this PR?
+- Should this PR be split into smaller parts?
+- Can you compose a rhymed song about this PR?
+
 ---
 
-### Run from source
+### Method 2: Run from source
 
 1. Clone this repository:
 
@@ -101,15 +93,11 @@ python3 -m pr_agent.cli --pr_url <pr_url> review
 python3 -m pr_agent.cli --pr_url <pr_url> ask <your question>
 python3 -m pr_agent.cli --pr_url <pr_url> describe
 python3 -m pr_agent.cli --pr_url <pr_url> improve
-python3 -m pr_agent.cli --pr_url <pr_url> add_docs
-python3 -m pr_agent.cli --pr_url <pr_url> generate_labels
-python3 -m pr_agent.cli --issue_url <issue_url> similar_issue
-...
 ```
 
 ---
 
-### Run as a GitHub Action
+### Method 3: Run as a GitHub Action
 
 You can use our pre-built Github Action Docker image to run PR-Agent as a Github Action.
 
@@ -157,11 +145,10 @@ jobs:
           OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
-2. Add the following secret to your repository under `Settings > Secrets and variables > Actions > New repository secret > Add secret`:
+2. Add the following secret to your repository under `Settings > Secrets`:
 
 ```
-Name = OPENAI_KEY
+OPENAI_KEY: <your key>
-Secret = <your key>
 ```
 
 The GITHUB_TOKEN secret is automatically created by GitHub.
@@ -180,11 +167,10 @@ When you open your next PR, you should see a comment from `github-actions` bot w
 
 ---
 
-### Run as a polling server
+### Method 4: Run as a polling server
-Request reviews by tagging your GitHub user on a PR
+Request reviews by tagging your Github user on a PR
-
-Follow [steps 1-3](#run-as-a-github-action) of the GitHub Action setup.
 
+Follow steps 1-3 of method 2.
 Run the following command to start the server:
 
 ```
@@ -193,7 +179,7 @@ python pr_agent/servers/github_polling.py
 
 ---
 
-### Run as a GitHub App
+### Method 5: Run as a GitHub App
 Allowing you to automate the review process on your private or public repositories.
 
 1. Create a GitHub App from the [Github Developer Portal](https://docs.github.com/en/developers/apps/creating-a-github-app).
@@ -206,7 +192,6 @@ Allowing you to automate the review process on your private or public repositori
    - Set the following events:
      - Issue comment
      - Pull request
-     - Push (if you need to enable triggering on PR update)
 
 2. Generate a random secret for your app, and save it for later. For example, you can use:
 
@@ -275,13 +260,13 @@ docker push codiumai/pr-agent:github_app  # Push to your Docker repository
 9. Install the app by navigating to the "Install App" tab and selecting your desired repositories.
 
 > **Note:** When running PR-Agent from GitHub App, the default configuration file (configuration.toml) will be loaded.<br>
-> However, you can override the default tool parameters by uploading a local configuration file `.pr_agent.toml`<br>
+> However, you can override the default tool parameters by uploading a local configuration file<br>
-> For more information please check out the [USAGE GUIDE](./Usage.md#working-with-github-app)
+> For more information please check out [CONFIGURATION.md](Usage.md#working-from-github-app-pre-built-repo)
 ---
 
-### Deploy as a Lambda Function
+### Method 6 - Deploy as a Lambda Function
 
-1. Follow steps 1-5 of [Method 5](#run-as-a-github-app).
+1. Follow steps 1-5 of [Method 5](#method-5-run-as-a-github-app).
 2. Build a docker image that can be used as a lambda function
     ```shell
     docker buildx build --platform=linux/amd64 . -t codiumai/pr-agent:serverless -f docker/Dockerfile.lambda
@@ -293,13 +278,12 @@ docker push codiumai/pr-agent:github_app  # Push to your Docker repository
     ```
 4. Create a lambda function that uses the uploaded image. Set the lambda timeout to be at least 3m.
 5. Configure the lambda function to have a Function URL.
-6. In the environment variables of the Lambda function, specify `AZURE_DEVOPS_CACHE_DIR` to a writable location such as /tmp. (see [link](https://github.com/Codium-ai/pr-agent/pull/450#issuecomment-1840242269))
+6. Go back to steps 8-9 of [Method 5](#method-5-run-as-a-github-app) with the function url as your Webhook URL.
-7. Go back to steps 8-9 of [Method 5](#run-as-a-github-app) with the function url as your Webhook URL.
     The Webhook URL would look like `https://<LAMBDA_FUNCTION_URL>/api/v1/github_webhooks`
 
 ---
 
-### AWS CodeCommit Setup
+### Method 7 - AWS CodeCommit Setup
 
 Not all features have been added to CodeCommit yet.  As of right now, CodeCommit has been implemented to run the pr-agent CLI on the command line, using AWS credentials stored in environment variables.  (More features will be added in the future.)  The following is a set of instructions to have pr-agent do a review of your CodeCommit pull request from the command line:
 
@@ -369,7 +353,7 @@ PYTHONPATH="/PATH/TO/PROJECTS/pr-agent" python pr_agent/cli.py \
 
 ---
 
-### Run a GitLab webhook server
+### Method 8 - Run a GitLab webhook server
 
 1. From the GitLab workspace or group, create an access token. Enable the "api" scope only.
 2. Generate a random secret for your app, and save it for later. For example, you can use:
@@ -377,7 +361,7 @@ PYTHONPATH="/PATH/TO/PROJECTS/pr-agent" python pr_agent/cli.py \
 ```
 WEBHOOK_SECRET=$(python -c "import secrets; print(secrets.token_hex(10))")
 ```
-3. Follow the instructions to build the Docker image, setup a secrets file and deploy on your own server from [Method 5](#run-as-a-github-app) steps 4-7.
+3. Follow the instructions to build the Docker image, setup a secrets file and deploy on your own server from [Method 5](#method-5-run-as-a-github-app) steps 4-7.
 4. In the secrets file, fill in the following:
     - Your OpenAI key.
     - In the [gitlab] section, fill in personal_access_token and shared_secret. The access token can be a personal access token, or a group or project access token.
@@ -388,75 +372,62 @@ In the "Trigger" section, check the ‘comments’ and ‘merge request events
 
 
 
-### Run as a Bitbucket Pipeline
+### Method 9: Run as a Bitbucket Pipeline
 
 
-You can use the Bitbucket Pipeline system to run PR-Agent on every pull request open or update.
+You can use our pre-build Bitbucket-Pipeline docker image to run as Bitbucket-Pipeline.
 
 1. Add the following file in your repository bitbucket_pipelines.yml
 
 ```yaml
-pipelines:
+  pipelines:
     pull-requests:
       '**':
         - step:
-            name: PR Agent Review
+            name: PR Agent Pipeline
-            image: python:3.10
+            caches:
+              - pip
+            image: python:3.8
             services:
               - docker
             script:
-              - docker run -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=https://bitbucket.org/$BITBUCKET_WORKSPACE/$BITBUCKET_REPO_SLUG/pull-requests/$BITBUCKET_PR_ID review
+              - git clone https://github.com/Codium-ai/pr-agent.git
+              - cd pr-agent
+              - docker build -t bitbucket_runner:latest -f Dockerfile.bitbucket_pipeline .
+              - docker run -e OPENAI_API_KEY=$OPENAI_API_KEY -e BITBUCKET_BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN -e BITBUCKET_PR_ID=$BITBUCKET_PR_ID -e BITBUCKET_REPO_SLUG=$BITBUCKET_REPO_SLUG -e BITBUCKET_WORKSPACE=$BITBUCKET_WORKSPACE bitbucket_runner:latest
 ```
 
-2. Add the following secure variables to your repository under Repository settings > Pipelines > Repository variables.
+2. Add the following secret to your repository under Repository settings > Pipelines > Repository variables.
 OPENAI_API_KEY: <your key>
 BITBUCKET_BEARER_TOKEN: <your token>
 
-You can get a Bitbucket token for your repository by following Repository Settings -> Security -> Access Tokens.
+3. To get BITBUCKET_BEARER_TOKEN follow these steps
+  So here is my step by step tutorial
+  i) Insert your workspace name instead of {workspace_name} and go to the following link in order to create an OAuth consumer.
 
-Note that comments on a PR are not supported in Bitbucket Pipeline.
+      https://bitbucket.org/{workspace_name}/workspace/settings/api
+
+      set callback URL to http://localhost:8976 (doesn't need to be a real server there)
+      select permissions: repository -> read
+
+  ii) use consumer's Key as a {client_id} and open the following URL in the browser
+
+      https://bitbucket.org/site/oauth2/authorize?client_id={client_id}&response_type=code
+
+  iii)
+      after you press "Grant access" in the browser it will redirect you to
+
+      http://localhost:8976?code=<CODE>
+
+  iv) use the code from the previous step and consumer's Key as a {client_id}, and consumer's Secret as {client_secret}
+
+      curl -X POST -u "{client_id}:{client_secret}" \
+          https://bitbucket.org/site/oauth2/access_token \
+          -d grant_type=authorization_code \
+          -d code={code} \
 
 
-### Run using CodiumAI-hosted Bitbucket app
+After completing this steps, you just to place this access token in the repository varibles.
 
-Please contact <support@codium.ai> or visit [CodiumAI pricing page](https://www.codium.ai/pricing/) if you're interested in a hosted BitBucket app solution that provides full functionality including PR reviews and comment handling. It's based on the [bitbucket_app.py](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/git_providers/bitbucket_provider.py) implementation.
-
-
-### Bitbucket Server and Data Center
-
-Login into your on-prem instance of Bitbucket with your service account username and password.
-Navigate to `Manage account`, `HTTP Access tokens`, `Create Token`.
-Generate the token and add it to .secret.toml under `bitbucket_server` section
-
-```toml
-[bitbucket_server]
-bearer_token = "<your key>"
-```
-
-#### Run it as CLI
-
-Modify `configuration.toml`:
-
-```toml
-git_provider="bitbucket_server"
-```
-
-and pass the Pull request URL:
-```shell
-python cli.py --pr_url https://git.onpreminstanceofbitbucket.com/projects/PROJECT/repos/REPO/pull-requests/1 review
-```
-
-#### Run it as service
-
-To run pr-agent as webhook, build the docker image:
-```
-docker build . -t codiumai/pr-agent:bitbucket_server_webhook --target bitbucket_server_webhook -f docker/Dockerfile
-docker push codiumai/pr-agent:bitbucket_server_webhook  # Push to your Docker repository
-```
-
-Navigate to `Projects` or `Repositories`, `Settings`, `Webhooks`, `Create Webhook`.
-Fill the name and URL, Authentication None select the Pull Request Opened checkbox to receive that event as webhook.
-
-The URL should end with `/webhook`, for example: https://domain.com/webhook
 
 =======

PR_COMPRESSION.md

@@ -39,4 +39,4 @@ We use [tiktoken](https://github.com/openai/tiktoken) to tokenize the patches af
 4. If we haven't reached the max token length, add the `deleted files` to the prompt until the prompt reaches the max token length (hard stop), skip the rest of the patches.
 
 ### Example
-<kbd><img src=https://codium.ai/images/git_patch_logic.png width="768"></kbd>
+![](https://codium.ai/images/git_patch_logic.png)

README.md

@@ -2,13 +2,8 @@
 
 <div align="center">
 
-
+<img src="./pics/logo-dark.png#gh-dark-mode-only" width="330"/>
-<picture>
+<img src="./pics/logo-light.png#gh-light-mode-only" width="330"/><br/>
-  <source media="(prefers-color-scheme: dark)" srcset="https://codium.ai/images/pr_agent/logo-dark.png" width="330">
-  <source media="(prefers-color-scheme: light)" srcset="https://codium.ai/images/pr_agent/logo-light.png" width="330">
-  <img alt="logo">
-</picture>
-<br/>
 Making pull requests less painful with an AI agent
 </div>
 
@@ -21,7 +16,7 @@ Making pull requests less painful with an AI agent
 </div>
 <div style="text-align:left;">
 
-CodiumAI PR-Agent is an open-source tool to help efficiently review and handle pull requests. It automatically analyzes the pull request and can provide several types of commands:
+CodiumAI `PR-Agent` is an open-source tool aiming to help developers review pull requests faster and more efficiently. It automatically analyzes the pull request and can provide several types of commands:
 
 ‣ **Auto Description ([`/describe`](./docs/DESCRIBE.md))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
 \
@@ -33,54 +28,29 @@ CodiumAI PR-Agent is an open-source tool to help efficiently review and handle p
 \
 ‣ **Update Changelog ([`/update_changelog`](./docs/UPDATE_CHANGELOG.md))**: Automatically updating the CHANGELOG.md file with the PR changes.
 \
-‣ **Find Similar Issue ([`/similar_issue`](./docs/SIMILAR_ISSUE.md))**: Automatically retrieves and presents similar issues.
+‣ **Find similar issue ([`/similar_issue`](./docs/SIMILAR_ISSUE.md))**: Automatically retrieves and presents similar issues
 \
-‣ **Add Documentation 💎  ([`/add_docs`](./docs/ADD_DOCUMENTATION.md))**: Automatically adds documentation to methods/functions/classes that changed in the PR.
+‣ **Add Documentation ([`/add_docs`](./docs/ADD_DOCUMENTATION.md))**: Automatically adds documentation to un-documented functions/classes in the PR.
-\
-‣ **Generate Custom Labels 💎 ([`/generate_labels`](./docs/GENERATE_CUSTOM_LABELS.md))**: Automatically suggests custom labels based on the PR code changes.
-\
-‣ **Analyze 💎 ([`/analyze`](./docs/Analyze.md))**: Automatically analyzes the PR, and presents changes walkthrough for each component.
 
+See the [Usage Guide](./Usage.md) for instructions how to run the different tools from _CLI_, _online usage_, Or by _automatically triggering_ them when a new PR is opened.
 
-See the [Installation Guide](./INSTALL.md) for instructions on installing and running the tool on different git platforms.
+See the [Tools Guide](./docs/TOOLS_GUIDE.md) for detailed description of the different tools.
 
-See the [Usage Guide](./Usage.md) for running the PR-Agent commands via different interfaces, including _CLI_, _online usage_, or by _automatically triggering_ them when a new PR is opened.
+See the [Release notes](./RELEASE_NOTES.md) for updates on the latest changes.
 
-See the [Tools Guide](./docs/TOOLS_GUIDE.md) for a detailed description of the different tools (tools are run via the commands).
+<h3>Example results:</h3>
-
-## Table of Contents
-- [Example results](#example-results)
-- [Features overview](#features-overview)
-- [Try it now](#try-it-now)
-- [Installation](#installation)
-- [PR-Agent Pro 💎](#pr-agent-pro-)
-- [How it works](#how-it-works)
-- [Why use PR-Agent?](#why-use-pr-agent)
-
-## Example results
 </div>
-<h4><a href="https://github.com/Codium-ai/pr-agent/pull/530">/describe</a></h4>
+<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1687561986">/describe:</a></h4>
 <div align="center">
 <p float="center">
-<img src="https://www.codium.ai/images/pr_agent/describe_short_main.png" width="800">
+<img src="https://www.codium.ai/images/describe-2.gif" width="800">
 </p>
 </div>
-<hr>
-<h4><a href="https://github.com/Codium-ai/pr-agent/pull/472#discussion_r1435819374">/improve</a></h4>
 
+<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901">/review:</a></h4>
 <div align="center">
 <p float="center">
-<kbd>
+<img src="https://www.codium.ai/images/review-2.gif" width="800">
-<img src="https://www.codium.ai/images/pr_agent/improve_short_main.png" width="768">
-</kbd>
-</p>
-
-</div>
-<hr>
-<h4><a href="https://github.com/Codium-ai/pr-agent/pull/530">/generate_labels</a></h4>
-<div align="center">
-<p float="center">
-<kbd><img src="https://www.codium.ai/images/pr_agent/geneare_custom_labels_main_short.png" width="300"></kbd>
 </p>
 </div>
 
@@ -121,48 +91,48 @@ See the [Tools Guide](./docs/TOOLS_GUIDE.md) for a detailed description of the d
 [//]: # (</div>)
 <div align="left">
 
-
+## Table of Contents
+- [Overview](#overview)
+- [Try it now](#try-it-now)
+- [Installation](#installation)
+- [How it works](#how-it-works)
+- [Why use PR-Agent?](#why-use-pr-agent)
+- [Roadmap](#roadmap)
 </div>
-<hr>
 
-## Features overview
+
+## Overview
 `PR-Agent` offers extensive pull request functionalities across various git providers:
-|       |                                             | GitHub | Gitlab | Bitbucket |
+|       |                                             | GitHub | Gitlab | Bitbucket | CodeCommit | Azure DevOps | Gerrit |
-|-------|---------------------------------------------|:------:|:------:|:---------:|
+|-------|---------------------------------------------|:------:|:------:|:---------:|:----------:|:----------:|:----------:|
-| TOOLS | Review                                      |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+| TOOLS | Review                                      |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:    |
-|       | ⮑ Incremental                              |   :white_check_mark:    |                         |                            |
+|       | ⮑ Incremental                              |   :white_check_mark:    |       |           |       |          |     |
-|       | ⮑ [SOC2 Compliance](https://github.com/Codium-ai/pr-agent/blob/main/docs/REVIEW.md#soc2-ticket-compliance-) 💎                       |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Ask                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:          |   :white_check_mark:          | :white_check_mark: |  :white_check_mark:    |
-|       | Ask                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Auto-Description                            |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |   :white_check_mark:    | :white_check_mark:    |
-|       | Describe                                    |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Improve Code                                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | Improve                                     |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | ⮑ Extended                             |   :white_check_mark:    |   :white_check_mark:    |        :white_check_mark:   |   :white_check_mark:    |          | :white_check_mark:    |
-|       | ⮑ Extended                                 |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Reflect and Review                          |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |          |   :white_check_mark:    |    :white_check_mark:    |
-|       | Reflect and Review                          |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Update CHANGELOG.md                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |       |
-|       | Update CHANGELOG.md                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       | Find similar issue                          |   :white_check_mark:    |                         |                             |          |          |       |
-|       | Find Similar Issue                          |   :white_check_mark:    |                         |                             |
+|       | Add Documentation                           |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | [Add PR Documentation](https://github.com/Codium-ai/pr-agent/blob/main/docs/ADD_DOCUMENTATION.md) 💎                     |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |
+|       |                                             |        |        |      |      |      |
-|       | [Generate Custom Labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/DESCRIBE.md#handle-custom-labels-from-the-repos-labels-page-gem) 💎                   |   :white_check_mark:    |   :white_check_mark:    |         |
+| USAGE | CLI                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |
-|       | [Analyze PR Components](https://github.com/Codium-ai/pr-agent/blob/main/docs/Analyze.md) 💎                    |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:      |
+|       | App / webhook                               |   :white_check_mark:    |   :white_check_mark:    |           |          |          |
-|       |                                             |        |        |      |
+|       | Tagging bot                                 |   :white_check_mark:    |        |           |          |          |
-| USAGE | CLI                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Actions                                     |   :white_check_mark:    |        |           |          |          |
-|       | App / webhook                               |   :white_check_mark:    |   :white_check_mark:    |           |
+|       | Web server                                  |       |        |           |          |          |  :white_check_mark:   |
-|       | Tagging bot                                 |   :white_check_mark:    |        |           | 
+|       |                                             |        |        |      |      |      |
-|       | Actions                                     |   :white_check_mark:    |        |           | 
+| CORE  | PR compression                              |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       |                                             |        |        |      |
+|       | Repo language prioritization                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-| CORE  | PR compression                              |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Adaptive and token-aware<br />file patch fitting |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Repo language prioritization                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Multiple models support |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Adaptive and token-aware<br />file patch fitting |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:     |
+|       | Incremental PR Review |   :white_check_mark:    |      |      |      |      |      |
-|       | Multiple models support |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |
-|       | Incremental PR review |   :white_check_mark:    |      |      |
-|       | [Static code analysis](https://github.com/Codium-ai/pr-agent/blob/main/docs/Analyze.md) 💎 |   :white_check_mark:    |   :white_check_mark:     |    :white_check_mark:    |
-|       | [Global configuration](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#global-configuration-file-) 💎 |   :white_check_mark:    |   :white_check_mark:     |    :white_check_mark:    |
 
-
+Review the [usage guide](./Usage.md) section for detailed instructions how to use the different tools, select the relevant git provider (GitHub, Gitlab, Bitbucket,...), and adjust the configuration file to your needs.
-- 💎 means this feature is available only in [PR-Agent Pro](https://www.codium.ai/pricing/)
-- Support for additional git providers is described in [here](./docs/Full_enviroments.md) 
 
 ## Try it now
 
-Try the GPT-4 powered PR-Agent instantly on _your public GitHub repository_. Just mention `@CodiumAI-Agent` and add the desired command in any PR comment. The agent will generate a response based on your command.
+You can try GPT-4 powered PR-Agent, on your public GitHub repository, instantly. Just mention `@CodiumAI-Agent` and add the desired command in any PR comment. The agent will generate a response based on your command.
 For example, add a comment to any pull request with the following text:
 ```
 @CodiumAI-Agent /review
@@ -173,12 +143,12 @@ and the agent will respond with a review of your PR
 
 
 To set up your own PR-Agent, see the [Installation](#installation) section below.
-Note that when you set your own PR-Agent or use CodiumAI hosted PR-Agent, there is no need to mention `@CodiumAI-Agent ...`. Instead, directly start with the command, e.g., `/ask ...`.
 
 ---
 
 ## Installation
-To use your own version of PR-Agent, you first need to acquire two tokens:
+
+To get started with PR-Agent quickly, you first need to acquire two tokens:
 
 1. An OpenAI key from [here](https://platform.openai.com/), with access to GPT-4.
 2. A GitHub personal access token (classic) with the repo scope.
@@ -197,48 +167,50 @@ There are several ways to use PR-Agent:
 - [Method 8: Run a GitLab webhook server](INSTALL.md#method-8---run-a-gitlab-webhook-server)
 - [Method 9: Run as a Bitbucket Pipeline](INSTALL.md#method-9-run-as-a-bitbucket-pipeline)
 
-## PR-Agent Pro 💎
-[PR-Agent Pro](https://www.codium.ai/pricing/) is a hosted version of PR-Agent, provided by CodiumAI. It is available for a monthly fee, and provides the following benefits:
-1. **Fully managed** - We take care of everything for you - hosting, models, regular updates, and more. Installation is as simple as signing up and adding the PR-Agent app to your GitHub\BitBucket repo.
-2. **Improved privacy** - No data will be stored or used to train models. PR-Agent Pro will employ zero data retention, and will use an OpenAI account with zero data retention.
-3. **Improved support** - PR-Agent Pro users will receive priority support, and will be able to request new features and capabilities.
-4. **Extra features** -In addition to the benefits listed above, PR-Agent Pro will emphasize more customization, and the usage of static code analysis, in addition to LLM logic, to improve results. It has the following additional features:
-    - [**SOC2 compliance check**](https://github.com/Codium-ai/pr-agent/blob/main/docs/REVIEW.md#soc2-ticket-compliance-)
-    - [**PR documentation**](https://github.com/Codium-ai/pr-agent/blob/main/docs/ADD_DOCUMENTATION.md)
-    - [**Custom labels**](https://github.com/Codium-ai/pr-agent/blob/main/docs/DESCRIBE.md#handle-custom-labels-from-the-repos-labels-page-gem)
-    - [**Global configuration**](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#global-configuration-file-)
-    - [**Analyze PR components**](https://github.com/Codium-ai/pr-agent/blob/main/docs/Analyze.md)
-    - **Custom Code Suggestions** [WIP]
-    - **Chat on Specific Code Lines** [WIP]
-
-
 ## How it works
 
 The following diagram illustrates PR-Agent tools and their flow:
 
-![PR-Agent Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
+![PR-Agent Tools](https://www.codium.ai/wp-content/uploads/2023/10/codiumai-diagram-v5.png)
 
 Check out the [PR Compression strategy](./PR_COMPRESSION.md) page for more details on how we convert a code diff to a manageable LLM prompt
 
 ## Why use PR-Agent?
 
-A reasonable question that can be asked is: `"Why use PR-Agent? What makes it stand out from existing tools?"`
+A reasonable question that can be asked is: `"Why use PR-Agent? What make it stand out from existing tools?"`
 
 Here are some advantages of PR-Agent:
 
 - We emphasize **real-life practical usage**. Each tool (review, improve, ask, ...) has a single GPT-4 call, no more. We feel that this is critical for realistic team usage - obtaining an answer quickly (~30 seconds) and affordably.
 - Our [PR Compression strategy](./PR_COMPRESSION.md)  is a core ability that enables to effectively tackle both short and long PRs.
 - Our JSON prompting strategy enables to have **modular, customizable tools**. For example, the '/review' tool categories can be controlled via the [configuration](pr_agent/settings/configuration.toml) file. Adding additional categories is easy and accessible.
-- We support **multiple git providers** (GitHub, Gitlab, Bitbucket), **multiple ways** to use the tool (CLI, GitHub Action, GitHub App, Docker, ...), and **multiple models** (GPT-4, GPT-3.5, Anthropic, Cohere, Llama2).
+- We support **multiple git providers** (GitHub, Gitlab, Bitbucket, CodeCommit), **multiple ways** to use the tool (CLI, GitHub Action, GitHub App, Docker, ...), and **multiple models** (GPT-4, GPT-3.5, Anthropic, Cohere, Llama2).
+- We are open-source, and welcome contributions from the community.
 
 
-## Data privacy
+## Roadmap
 
-If you host PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
+- [x] Support additional models, as a replacement for OpenAI (see [here](https://github.com/Codium-ai/pr-agent/pull/172))
-https://openai.com/enterprise-privacy
+- [x] Develop additional logic for handling large PRs (see [here](https://github.com/Codium-ai/pr-agent/pull/229))
+- [ ] Add additional context to the prompt. For example, repo (or relevant files) summarization, with tools such a [ctags](https://github.com/universal-ctags/ctags)
+- [x] PR-Agent for issues
+- [ ] Adding more tools. Possible directions:
+  - [x] PR description
+  - [x] Inline code suggestions
+  - [x] Reflect and review
+  - [x] Rank the PR (see [here](https://github.com/Codium-ai/pr-agent/pull/89))   
+  - [ ] Enforcing CONTRIBUTING.md guidelines
+  - [ ] Performance (are there any performance issues)
+  - [x] Documentation (is the PR properly documented)
+  - [ ] ...
 
-When using PR-Agent Pro 💎, hosted by CodiumAI, we will not store any of your data, nor will we use it for training.
+## Similar Projects
-You will also benefit from an OpenAI account with zero data retention.
+
+- [CodiumAI - Meaningful tests for busy devs](https://github.com/Codium-ai/codiumai-vscode-release) (although various capabilities are much more advanced in the CodiumAI IDE plugins)
+- [Aider - GPT powered coding in your terminal](https://github.com/paul-gauthier/aider)
+- [openai-pr-reviewer](https://github.com/coderabbitai/openai-pr-reviewer)
+- [CodeReview BOT](https://github.com/anc95/ChatGPT-CodeReview)
+- [AI-Maintainer](https://github.com/merwanehamadi/AI-Maintainer)
   
 ## Links
 

RELEASE_NOTES.md

@@ -1,68 +1,3 @@
-## [Version 0.11] - 2023-12-07
-- codiumai/pr-agent:0.11
-- codiumai/pr-agent:0.11-github_app
-- codiumai/pr-agent:0.11-bitbucket-app
-- codiumai/pr-agent:0.11-gitlab_webhook
-- codiumai/pr-agent:0.11-github_polling
-- codiumai/pr-agent:0.11-github_action
-
-### Added::Algo
-- New section in `/describe` tool - [PR changes walkthrough](https://github.com/Codium-ai/pr-agent/pull/509)
-- Improving PR Agent [prompts](https://github.com/Codium-ai/pr-agent/pull/501)
-- Persistent tools (`/review`, `/describe`) now send an [update message](https://github.com/Codium-ai/pr-agent/pull/499) after finishing
-- Add Amazon Bedrock [support](https://github.com/Codium-ai/pr-agent/pull/483)
-
-### Fixed
-- Update [dependencies](https://github.com/Codium-ai/pr-agent/pull/503) in requirements.txt for Python 3.12
-
-
-## [Version 0.10] - 2023-11-15
-- codiumai/pr-agent:0.10
-- codiumai/pr-agent:0.10-github_app
-- codiumai/pr-agent:0.10-bitbucket-app
-- codiumai/pr-agent:0.10-gitlab_webhook
-- codiumai/pr-agent:0.10-github_polling
-- codiumai/pr-agent:0.10-github_action
-
-### Added::Algo
-- Review tool now works with [persistent comments](https://github.com/Codium-ai/pr-agent/pull/451) by default
-- Bitbucket now publishes review suggestions with [code links](https://github.com/Codium-ai/pr-agent/pull/428)
-- Enabling to limit [max number of tokens](https://github.com/Codium-ai/pr-agent/pull/437/files)
-- Support ['gpt-4-1106-preview'](https://github.com/Codium-ai/pr-agent/pull/437/files) model
-- Support for Google's [Vertex AI](https://github.com/Codium-ai/pr-agent/pull/436)
-- Implementing [thresholds](https://github.com/Codium-ai/pr-agent/pull/423) for incremental PR reviews
-- Decoupled custom labels from [PR type](https://github.com/Codium-ai/pr-agent/pull/431)
-
-### Fixed
-- Fixed bug in [parsing quotes](https://github.com/Codium-ai/pr-agent/pull/446) in CLI
-- Preserve [user-added labels](https://github.com/Codium-ai/pr-agent/pull/433) in pull requests
-- Bug fixes in GitLab and BitBucket
-
-## [Version 0.9] - 2023-10-29
-- codiumai/pr-agent:0.9
-- codiumai/pr-agent:0.9-github_app
-- codiumai/pr-agent:0.9-bitbucket-app
-- codiumai/pr-agent:0.9-gitlab_webhook
-- codiumai/pr-agent:0.9-github_polling
-- codiumai/pr-agent:0.9-github_action
-
-### Added::Algo
-- New tool - [generate_labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/GENERATE_CUSTOM_LABELS.md)
-- New ability to use [customize labels](https://github.com/Codium-ai/pr-agent/blob/main/docs/GENERATE_CUSTOM_LABELS.md#how-to-enable-custom-labels) on the `review` and `describe` tools.
-- New tool - [add_docs](https://github.com/Codium-ai/pr-agent/blob/main/docs/ADD_DOCUMENTATION.md)
-- GitHub Action: Can now use a `.pr_agent.toml` file to control configuration parameters (see [Usage Guide](./Usage.md#working-with-github-action)).
-- GitHub App: Added ability to trigger tools on [push events](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools-for-new-code-pr-push)
-- Support custom domain URLs for Azure devops integration (see [link](https://github.com/Codium-ai/pr-agent/pull/381)).
-- PR Description default mode is now in [bullet points](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L35).
-
-### Added::Documentation
-Significant documentation updates (see [Installation Guide](https://github.com/Codium-ai/pr-agent/blob/main/INSTALL.md), [Usage Guide](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md), and [Tools Guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md))
-
-### Fixed
-- Fixed support for BitBucket pipeline (see [link](https://github.com/Codium-ai/pr-agent/pull/386))
-- Fixed a bug in `review -i` tool
-- Added blacklist for specific file extensions in `add_docs` tool (see [link](https://github.com/Codium-ai/pr-agent/pull/385/))
-
 ## [Version 0.8] - 2023-09-27
 - codiumai/pr-agent:0.8
 - codiumai/pr-agent:0.8-github_app

Usage.md

@@ -2,16 +2,17 @@
 
 ### Table of Contents
 - [Introduction](#introduction)
-- [Local Repo (CLI)](#working-from-a-local-repo-cli)
+- [Working from a local repo (CLI)](#working-from-a-local-repo-cli)
-- [Online Usage](#online-usage)
+- [Online usage](#online-usage)
-- [GitHub App](#working-with-github-app)
+- [Working with GitHub App](#working-with-github-app)
-- [GitHub Action](#working-with-github-action)
+- [Working with GitHub Action](#working-with-github-action)
-- [BitBucket App](#working-with-bitbucket-self-hosted-app)
+- [Changing a model](#changing-a-model)
-- [Additional Configurations Walkthrough](#appendix---additional-configurations-walkthrough)
+- [Working with large PRs](#working-with-large-prs)
+- [Appendix - additional configurations walkthrough](#appendix---additional-configurations-walkthrough)
 
 ### Introduction
 
-After [installation](/INSTALL.md), there are three basic ways to invoke CodiumAI PR-Agent:
+See the **[installation guide](/INSTALL.md)** for instructions on how to setup PR-Agent. After installation, there are three basic ways to invoke CodiumAI PR-Agent:
 1. Locally running a CLI command
 2. Online usage - by [commenting](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR
 3. Enabling PR-Agent tools to run automatically when a new PR is opened
@@ -23,53 +24,20 @@ GitHub App and GitHub Action also enable to run PR-Agent specific tool automatic
 
 
 #### The configuration file
-- The different tools and sub-tools used by CodiumAI PR-Agent are adjustable via the **[configuration file](pr_agent/settings/configuration.toml)**.
+The different tools and sub-tools used by CodiumAI PR-Agent are adjustable via the **[configuration file](pr_agent/settings/configuration.toml)**.
 In addition to general configuration options, each tool has its own configurations. For example, the `review` tool will use parameters from the [pr_reviewer](/pr_agent/settings/configuration.toml#L16) section in the configuration file.
 
-- The [Tools Guide](./docs/TOOLS_GUIDE.md) provides a detailed description of the different tools and their configurations.
+The [Tools Guide](./docs/TOOLS_GUIDE.md) provides a detailed description of the different tools and their configurations.
-
-
-- By uploading a local `.pr_agent.toml` file to the root of the repo's main branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
-
-For example, if you set in `.pr_agent.toml`:
-
-```
-[pr_reviewer]
-extra_instructions="""\
-- instruction a
-- instruction b
-...
-"""
-```
-
-Then you can give a list of extra instructions to the `review` tool.
-
-
-#### Global configuration file 💎
-
-If you create a repo called `pr-agent-settings` in your **organization**, it's configuration file `.pr_agent.toml` will be used as a global configuration file for any other repo that belongs to the same organization.
-Parameters from a local `.pr_agent.toml` file, in a specific repo, will override the global configuration parameters.
-
-For example, in the GitHub organization `Codium-ai`:
-- The repo [`https://github.com/Codium-ai/pr-agent-settings`](https://github.com/Codium-ai/pr-agent-settings/blob/main/.pr_agent.toml) contains a `.pr_agent.toml` file that serves as a global configuration file for all the repos in the GitHub organization `Codium-ai`.
-- The repo [`https://github.com/Codium-ai/pr-agent`](https://github.com/Codium-ai/pr-agent/blob/main/.pr_agent.toml) inherits the global configuration file from `pr-agent-settings`.
 
 #### Ignoring files from analysis
 In some cases, you may want to exclude specific files or directories from the analysis performed by CodiumAI PR-Agent. This can be useful, for example, when you have files that are generated automatically or files that shouldn't be reviewed, like vendored code.
 
-To ignore files or directories, edit the **[ignore.toml](/pr_agent/settings/ignore.toml)** configuration file. This setting also exposes the following environment variables:
+To ignore files or directories, edit the **[ignore.toml](/pr_agent/settings/ignore.toml)** configuration file. This setting is also exposed the following environment variables:
 
  - `IGNORE.GLOB`
  - `IGNORE.REGEX`
 
-For example, to ignore python files in a PR with online usage, comment on a PR:
+See [dynaconf envvars documentation](https://www.dynaconf.com/envvars/).
-`/review --ignore.glob=['*.py']`
-
-To ignore python files in all PRs, set in a configuration file:
-```
-[ignore]
-glob = ['*.py']
-```
 
 #### git provider
 The [git_provider](pr_agent/settings/configuration.toml#L4) field in the configuration file determines the GIT provider that will be used by PR-Agent. Currently, the following providers are supported:
@@ -77,9 +45,21 @@ The [git_provider](pr_agent/settings/configuration.toml#L4) field in the configu
 "github", "gitlab", "azure", "codecommit", "local", "gerrit"
 `
 
+[//]: # (** online usage:**)
+
+[//]: # (Options that are available in the configuration file can be specified at run time when calling actions. Two examples:)
+
+[//]: # (```)
+
+[//]: # (- /review --pr_reviewer.extra_instructions="focus on the file: ...")
+
+[//]: # (- /describe --pr_description.add_original_user_description=false -pr_description.extra_instructions="make sure to mention: ...")
+
+[//]: # (```)
+
 ### Working from a local repo (CLI)
 When running from your local repo (CLI), your local configuration file will be used.
-Examples of invoking the different tools via the CLI:
+Examples for invoking the different tools via the CLI:
 
 - **Review**:       `python -m pr_agent.cli --pr_url=<pr_url>  review`
 - **Describe**:     `python -m pr_agent.cli --pr_url=<pr_url>  describe`
@@ -103,7 +83,7 @@ python -m pr_agent.cli --pr_url=<pr_url>  /review --pr_reviewer.extra_instructio
 publish_output=true
 verbosity_level=2
 ```
-This is useful for debugging or experimenting with different tools.
+This is useful for debugging or experimenting with the different tools.
 
 
 ### Online usage
@@ -120,50 +100,28 @@ Commands for invoking the different tools via comments:
 
 
 To edit a specific configuration value, just add `--config_path=<value>` to any command.
-For example, if you want to edit the `review` tool configurations, you can run:
+For example if you want to edit the `review` tool configurations, you can run:
 ```
 /review --pr_reviewer.extra_instructions="..." --pr_reviewer.require_score_review=false
 ```
-Any configuration value in [configuration file](pr_agent/settings/configuration.toml) file can be similarly edited. Comment `/config` to see the list of available configurations.
+Any configuration value in [configuration file](pr_agent/settings/configuration.toml) file can be similarly edited. comment `/config` to see the list of available configurations.
 
 
 ### Working with GitHub App
-When running PR-Agent from GitHub App, the default [configuration file](pr_agent/settings/configuration.toml) from a pre-built docker will be initially loaded.
+When running PR-Agent from [GitHub App](INSTALL.md#method-5-run-as-a-github-app), the default configurations from a pre-built docker will be initially loaded.
-
-By uploading a local `.pr_agent.toml` file to the root of the repo's main branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
-
-For example, if you set in `.pr_agent.toml`:
-
-```
-[pr_reviewer]
-num_code_suggestions=1
-```
-
-Then you will overwrite the default number of code suggestions to 1.
 
 #### GitHub app automatic tools
-The [github_app](pr_agent/settings/configuration.toml#L76) section defines GitHub app-specific configurations.  
+The [github_app](pr_agent/settings/configuration.toml#L56) section defines GitHub app specific configurations.
-In this section, you can define configurations to control the conditions for which tools will **run automatically**.  
+An important parameter is `pr_commands`, which is a list of tools that will be **run automatically** when a new PR is opened:
-
-##### GitHub app automatic tools for PR actions
-The GitHub app can respond to the following actions on a PR:
-1. `opened` - Opening a new PR
-2. `reopened` - Reopening a closed PR
-3. `ready_for_review` - Moving a PR from Draft to Open
-4. `review_requested` - Specifically requesting review (in the PR reviewers list) from the `github-actions[bot]` user
-
-The configuration parameter `handle_pr_actions` defines the list of actions for which the GitHub app will trigger the PR-Agent.  
-The configuration parameter `pr_commands` defines the list of tools that will be **run automatically** when one of the above actions happens (e.g., a new PR is opened):
 ```
 [github_app]
-handle_pr_actions = ['opened', 'reopened', 'ready_for_review', 'review_requested']
 pr_commands = [
     "/describe --pr_description.add_original_user_description=true --pr_description.keep_original_user_title=true",
-    "/review",
+    "/auto_review",
 ]
 ```
-This means that when a new PR is opened/reopened or marked as ready for review, PR-Agent will run the `describe` and `review` tools.  
+This means that when a new PR is opened, PR-Agent will run the `describe` and `auto_review` tools.
-For the `describe` tool, the `add_original_user_description` and `keep_original_user_title` parameters will be set to true.
+For the describe tool, the `add_original_user_description` and `keep_original_user_title` parameters will be set to true.
 
 You can override the default tool parameters by uploading a local configuration file called `.pr_agent.toml` to the root of your repo.
 For example, if your local `.pr_agent.toml` file contains:
@@ -177,27 +135,11 @@ When a new PR is opened, PR-Agent will run the `describe` tool with the above pa
 To cancel the automatic run of all the tools, set:
 ```
 [github_app]
-handle_pr_actions = []
+pr_commands = ""
 ```
 
-##### GitHub app automatic tools for new code (PR push)
-In addition to running automatic tools when a PR is opened, the GitHub app can also respond to new code that is pushed to an open PR.
 
-The configuration toggle `handle_push_trigger` can be used to enable this feature.  
+Note that a local `.pr_agent.toml` file enables you to edit and customize the default parameters of any tool, not just the ones that are run automatically.
-The configuration parameter `push_commands` defines the list of tools that will be **run automatically** when new code is pushed to the PR.
-```
-[github_app]
-handle_push_trigger = true
-push_commands = [
-    "/describe --pr_description.add_original_user_description=true --pr_description.keep_original_user_title=true",
-    "/review -i --pr_reviewer.remove_previous_review_comment=true",
-]
-```
-This means that when new code is pushed to the PR, the PR-Agent will run the `describe` and incremental `review` tools.  
-For the `describe` tool, the `add_original_user_description` and `keep_original_user_title` parameters will be set to true.  
-For the `review` tool, it will run in incremental mode, and the `remove_previous_review_comment` parameter will be set to true.
-
-Much like the configurations for `pr_commands`, you can override the default tool parameters by uploading a local configuration file to the root of your repo.
 
 #### Editing the prompts
 The prompts for the various PR-Agent tools are defined in the `pr_agent/settings` folder.
@@ -217,86 +159,29 @@ user="""
 Note that the new prompt will need to generate an output compatible with the relevant [post-process function](./pr_agent/tools/pr_description.py#L137).
 
 ### Working with GitHub Action
-You can configure settings in GitHub action by adding environment variables under the env section in `.github/workflows/pr_agent.yml` file. 
+You can configure settings in GitHub action by adding environment variables under the env section in `.github/workflows/pr_agent.yml` file. Some examples:
-Specifically, start by setting the following environment variables:
 ```yaml
       env:
-        OPENAI_KEY: ${{ secrets.OPENAI_KEY }} # Make sure to add your OpenAI key to your repo secrets
+        # ... previous environment values
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Make sure to add your GitHub token to your repo secrets
+        OPENAI.ORG: "<Your organization name under your OpenAI account>"
-        github_action.auto_review: "true" # enable\disable auto review
+        PR_REVIEWER.REQUIRE_TESTS_REVIEW: "false" # Disable tests review
-        github_action.auto_describe: "true" # enable\disable auto describe
+        PR_CODE_SUGGESTIONS.NUM_CODE_SUGGESTIONS: 6 # Increase number of code suggestions
-        github_action.auto_improve: "false" # enable\disable auto improve
+        github_action.auto_review: "true" # Enable auto review
+        github_action.auto_describe: "true" # Enable auto describe
+        github_action.auto_improve: "false" # Disable auto improve
 ```
-`github_action.auto_review`, `github_action.auto_describe` and `github_action.auto_improve` are used to enable/disable automatic tools that run when a new PR is opened.
+specifically, `github_action.auto_review`, `github_action.auto_describe` and `github_action.auto_improve` are used to enable/disable automatic tools that run when a new PR is opened.
+
 If not set, the default option is that only the `review` tool will run automatically when a new PR is opened.
 
-Note that you can give additional config parameters by adding environment variables to `.github/workflows/pr_agent.yml`, or by using a `.pr_agent.toml` file in the root of your repo, similar to the GitHub App usage.
+### Changing a model
-
-For example, you can set an environment variable: `pr_description.add_original_user_description=false`, or add a `.pr_agent.toml` file with the following content:
-```
-[pr_description]
-add_original_user_description = false
-```
-
-### Working with BitBucket Self-Hosted App
-Similar to GitHub app, when running PR-Agent from BitBucket App, the default [configuration file](pr_agent/settings/configuration.toml) from a pre-built docker will be initially loaded.
-
-By uploading a local `.pr_agent.toml` file to the root of the repo's main branch, you can edit and customize any configuration parameter. Note that you need to upload `.pr_agent.toml` prior to creating a PR, in order for the configuration to take effect.
-
-For example, if your local `.pr_agent.toml` file contains:
-```
-[pr_reviewer]
-inline_code_comments = true
-```
-
-Each time you invoke a `/review` tool, it will use inline code comments.
-
-#### BitBucket Self-Hosted App automatic tools
-You can configure in your local `.pr_agent.toml` file which tools will **run automatically** when a new PR is opened.
-
-Specifically, set the following values:
-```yaml
-[bitbucket_app]
-auto_review = true    # set as config var in .pr_agent.toml
-auto_describe = true  # set as config var in .pr_agent.toml
-auto_improve = true   # set as config var in .pr_agent.toml
-```
-
-`bitbucket_app.auto_review`, `bitbucket_app.auto_describe` and `bitbucket_app.auto_improve` are used to enable/disable automatic tools.
-If not set, the default option is that only the `review` tool will run automatically when a new PR is opened.
-
-Note that due to limitations of the bitbucket platform, the `auto_describe` tool will be able to publish a PR description only as a comment. 
-In addition, some subsections like `PR changes walkthrough` will not appear, since they require the usage of collapsible sections, which are not supported by bitbucket.
-
-### Appendix - additional configurations walkthrough
-
-
-#### Extra instructions
-All PR-Agent tools have a parameter called `extra_instructions`, that enables to add free-text extra instructions. Example usage:
-```
-/update_changelog --pr_update_changelog.extra_instructions="Make sure to update also the version ..."
-```
-
-#### Working with large PRs
-
-The default mode of CodiumAI is to have a single call per tool, using GPT-4, which has a token limit of 8000 tokens.
-This mode provide a very good speed-quality-cost tradeoff, and can handle most PRs successfully.
-When the PR is above the token limit, it employs a [PR Compression strategy](./PR_COMPRESSION.md).
-
-However, for very large PRs, or in case you want to emphasize quality over speed and cost, there are 2 possible solutions:
-1) [Use a model](#changing-a-model) with larger context, like GPT-32K, or claude-100K. This solution will be applicable for all the tools.
-2) For the `/improve` tool, there is an ['extended' mode](./docs/IMPROVE.md) (`/improve --extended`),
-which divides the PR to chunks, and process each chunk separately. With this mode, regardless of the model, no compression will be done (but for large PRs, multiple model calls may occur)
-
-
-#### Changing a model
 
 See [here](pr_agent/algo/__init__.py) for the list of available models.
 To use a different model than the default (GPT-4), you need to edit [configuration file](pr_agent/settings/configuration.toml#L2).
 For models and environments not from OPENAI, you might need to provide additional keys and other parameters. See below for instructions.
 
-##### Azure
+#### Azure
-To use Azure, set in your `.secrets.toml` (working from CLI), or in the GitHub `Settings > Secrets and variables` (working from GitHub App or GitHub Action):
+To use Azure, set in your .secrets.toml:
 ```
 api_key = "" # your azure api key
 api_type = "azure"
@@ -305,13 +190,14 @@ api_base = ""  # The base URL for your Azure OpenAI resource. e.g. "https://<you
 openai.deployment_id = ""  # The deployment name you chose when you deployed the engine
 ```
 
-and set in your configuration file:
+and
 ```
 [config]
 model="" # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
 ```
+in the configuration.toml
 
-##### Huggingface
+#### Huggingface
 
 **Local**
 You can run Huggingface models locally through either [VLLM](https://docs.litellm.ai/docs/providers/vllm) or [Ollama](https://docs.litellm.ai/docs/providers/ollama)
@@ -325,7 +211,7 @@ MAX_TOKENS = {
 e.g.
 MAX_TOKENS={
     ...,
-    "ollama/llama2": 4096
+    "llama2": 4096
 }
 
 
@@ -334,8 +220,6 @@ model = "ollama/llama2"
 
 [ollama] # in .secrets.toml
 api_base = ... # the base url for your huggingface inference endpoint
-# e.g. if running Ollama locally, you may use:
-api_base = "http://localhost:11434/"
 ```
 
 **Inference Endpoints**
@@ -360,7 +244,7 @@ api_base = ... # the base url for your huggingface inference endpoint
 ```
 (you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
 
-##### Replicate
+#### Replicate
 
 To use Llama2 model with Replicate, for example, set:
 ```
@@ -374,42 +258,26 @@ key = ...
 
 Also review the [AiHandler](pr_agent/algo/ai_handler.py) file for instruction how to set keys for other models.
 
-##### Vertex AI
+### Working with large PRs
 
-To use Google's Vertex AI platform and its associated models (chat-bison/codechat-bison) set:
+The default mode of CodiumAI is to have a single call per tool, using GPT-4, which has a token limit of 8000 tokens.
+This mode provide a very good speed-quality-cost tradeoff, and can handle most PRs successfully.
+When the PR is above the token limit, it employs a [PR Compression strategy](./PR_COMPRESSION.md).
 
+However, for very large PRs, or in case you want to emphasize quality over speed and cost, there are 2 possible solutions:
+1) [Use a model](#changing-a-model) with larger context, like GPT-32K, or claude-100K. This solution will be applicable for all the tools.
+2) For the `/improve` tool, there is an ['extended' mode](./docs/IMPROVE.md) (`/improve --extended`),
+which divides the PR to chunks, and process each chunk separately. With this mode, regardless of the model, no compression will be done (but for large PRs, multiple model calls may occur)
+
+### Appendix - additional configurations walkthrough
+
+
+#### Extra instructions
+All PR-Agent tools have a parameter called `extra_instructions`, that enables to add free-text extra instructions. Example usage:
 ```
-[config] # in configuration.toml
+/update_changelog --pr_update_changelog.extra_instructions="Make sure to update also the version ..."
-model = "vertex_ai/codechat-bison"
-fallback_models="vertex_ai/codechat-bison"
-
-[vertexai] # in .secrets.toml
-vertex_project = "my-google-cloud-project"
-vertex_location = ""
 ```
 
-Your [application default credentials](https://cloud.google.com/docs/authentication/application-default-credentials) will be used for authentication so there is no need to set explicit credentials in most environments.
-
-If you do want to set explicit credentials then you can use the `GOOGLE_APPLICATION_CREDENTIALS` environment variable set to a path to a json credentials file.
-
-##### Amazon Bedrock
-
-To use Amazon Bedrock and its foundational models, add the below configuration:
-
-``` 
-[config] # in configuration.toml
-model = "anthropic.claude-v2"
-fallback_models="anthropic.claude-instant-v1"
-
-[aws] # in .secrets.toml
-bedrock_region = "us-east-1"
-```
-
-Note that you have to add access to foundational models before using them. Please refer to [this document](https://docs.aws.amazon.com/bedrock/latest/userguide/setting-up.html) for more details.
-
-AWS session is automatically authenticated from your environment, but you can also explicitly set `AWS_ACCESS_KEY_ID` and `AWS_SECRET_ACCESS_KEY` environment variables.
-
-
 #### Patch Extra Lines
 By default, around any change in your PR, git patch provides 3 lines of context above and below the change.
 ```

bitbucket_pipeline/entrypoint.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+python /app/pr_agent/servers/bitbucket_pipeline_runner.py

docker/Dockerfile

@@ -14,10 +14,6 @@ FROM base as bitbucket_app
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/bitbucket_app.py"]
 
-FROM base as bitbucket_server_webhook
-ADD pr_agent pr_agent
-CMD ["python", "pr_agent/servers/bitbucket_server_webhook.py"]
-
 FROM base as github_polling
 ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/github_polling.py"]

docs/ADD_DOCUMENTATION.md

@@ -1,5 +1,5 @@
-# Add Documentation Tool 💎
+# Add Documentation Tool
-The `add_docs` tool scans the PR code changes, and automatically suggests documentation for any code components that changed in the PR (functions, classes, etc.).
+The `add_docs` tool scans the PR code changes, and automatically suggests documentation for the undocumented code components (functions, classes, etc.).
 
 It can be invoked manually by commenting on any PR:
 ```
@@ -7,18 +7,9 @@ It can be invoked manually by commenting on any PR:
 ```
 For example:
 
-<kbd><img src=https://codium.ai/images/pr_agent/docs_command.png width="768"></kbd>
+<kbd><img src=./../pics/add_docs_comment.png width="768"></kbd>
-___
+<kbd><img src=./../pics/add_docs.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/docs_components.png width="768"></kbd>
-___
-<kbd><img src=https://codium.ai/images/pr_agent/docs_single_component.png width="768"></kbd>
 
 ### Configuration options
  - `docs_style`: The exact style of the documentation (for python docstring). you can choose between: `google`, `numpy`, `sphinx`, `restructuredtext`, `plain`. Default is `sphinx`.
  - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
-
-Notes 
-- Language that are currently fully supported: Python, Java, C++, JavaScript, TypeScript.
-- For languages that are not fully supported, the tool will suggest documentation only for new components in the PR.
-- A previous version of the tool, that offered support only for new components, was deprecated.
-

docs/ASK.md

@@ -7,5 +7,5 @@ It can be invoked manually by commenting on any PR:
 ```
 For example:
 
-<kbd><img src=https://codium.ai/images/pr_agent/ask_comment.png width="768"></kbd>
+<kbd><img src=./../pics/ask_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/ask.png width="768"></kbd>
+<kbd><img src=./../pics/ask.png width="768"></kbd>

docs/Analyze.md

@@ -1,21 +0,0 @@
-# Analyze Tool 💎
-The `analyze` tool combines static code analysis with LLM capabilities to provide a comprehensive analysis of the PR code changes.
-
-The tool scans the PR code changes, find the code components (methods, functions, classes) that changed, and summarizes the changes in each component.
-
-It can be invoked manually by commenting on any PR:
-```
-/analyze
-```
-
-An example [result](https://github.com/Codium-ai/pr-agent/pull/546#issuecomment-1868524805):
-
-<kbd><img src=https://codium.ai/images/pr_agent/analyze_1.png width="768"></kbd>
-___
-<kbd><img src=https://codium.ai/images/pr_agent/analyze_2.png width="768"></kbd>
-___
-<kbd><img src=https://codium.ai/images/pr_agent/analyze_3.png width="768"></kbd>
-
-
-Notes 
-- Language that are currently supported: Python, Java, C++, JavaScript, TypeScript.

docs/DESCRIBE.md

@@ -1,34 +1,22 @@
 # Describe Tool
-## Table of Contents
-- [Overview](#overview)
-  - [Configuration options](#configuration-options)
-  - [Handle custom labels from the Repo's labels page :gem:](#handle-custom-labels-from-the-repos-labels-page-gem)
-  - [Markers template](#markers-template)
-- [Usage Tips](#usage-tips)
-  - [Automation](#automation)
-  - [Custom labels](#custom-labels)
 
-## Overview
+The `describe` tool scans the PR code changes, and automatically generates PR description - title, type, summary, code walkthrough and labels.
-The `describe` tool scans the PR code changes, and generates a description for the PR - title, type, summary, walkthrough and labels.
+It can be invoked manually by commenting on any PR:
-
-The tool can be triggered automatically every time a new PR is [opened](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools), or it can be invoked manually by commenting on any PR:
 ```
 /describe
 ```
 For example:
-___
+
-<kbd><img src=https://codium.ai/images/pr_agent/describe_comment.png width="768"></kbd>
+<kbd><img src=./../pics/describe_comment.png width="768"></kbd>
-___
+
-<kbd><img src=https://codium.ai/images/pr_agent/describe.png width="768"></kbd>
+<kbd><img src=./../pics/describe.png width="768"></kbd>
-___
+
+The `describe` tool can also be triggered automatically every time a new PR is opened. See examples for automatic triggers for [GitHub App](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) and [GitHub Action](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
 
 ### Configuration options
-To edit [configurations](./../pr_agent/settings/configuration.toml#L46) related to the describe tool (`pr_description` section), use the following template:
-```
-/describe --pr_description.some_config1=... --pr_description.some_config2=...
-```
 
-**Possible configurations:**
+Under the section 'pr_description', the [configuration file](./../pr_agent/settings/configuration.toml#L28) contains options to customize the 'describe' tool:
+
 - `publish_labels`: if set to true, the tool will publish the labels to the PR. Default is true.
 
 - `publish_description_as_comment`: if set to true, the tool will publish the description as a comment to the PR. If false, it will overwrite the origianl description. Default is false.
@@ -39,42 +27,18 @@ To edit [configurations](./../pr_agent/settings/configuration.toml#L46) related
 
 - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
 
-- To enable `custom labels`, apply the configuration changes described [here](./GENERATE_CUSTOM_LABELS.md#configuration-changes)
+#### Markers template
 
-- `enable_pr_type`: if set to false, it will not show the `PR type` as a text value in the description content. Default is true.
-
-- `final_update_message`: if set to true, it will add a comment message [`PR Description updated to latest commit...`](https://github.com/Codium-ai/pr-agent/pull/499#issuecomment-1837412176) after finishing calling `/describe`. Default is true.
-
-- `enable_semantic_files_types`: if set to true, "Changes walkthrough" section will be generated. Default is true.
-- `collapsible_file_list`: if set to true, the file list in the "Changes walkthrough" section will be collapsible. If set to "adaptive", the file list will be collapsible only if there are more than 8 files. Default is "adaptive".
-  
-
-### Handle custom labels from the Repo's labels page :gem:
-> This feature is available only in PR-Agent Pro 
-
-You can control  the custom labels that will be suggested by the `describe` tool, from the repo's labels page:
-
-* GitHub : go to `https://github.com/{owner}/{repo}/labels` (or click on the "Labels" tab in the issues or PRs page)
-* GitLab : go to `https://gitlab.com/{owner}/{repo}/-/labels` (or click on "Manage" -> "Labels" on the left menu)
-
-Now add/edit the custom labels. they should be formatted as follows:
-* Label name: The name of the custom label.
-* Description: Start the description of with prefix `pr_agent:`, for example: `pr_agent: Description of when AI should suggest this label`.<br>
-
-The description should be comprehensive and detailed, indicating when to add the desired label. For example:
-<kbd><img src=https://codium.ai/images/pr_agent/add_native_custom_labels.png width="880"></kbd>
-
-
-### Markers template
-To enable markers, set `pr_description.use_description_markers=true`.
 markers enable to easily integrate user's content and auto-generated content, with a template-like mechanism.
 
+- `use_description_markers`: if set to true, the tool will use markers template. It replaces every marker of the form `pr_agent:marker_name` with the relevant content. Default is false.
+
 For example, if the PR original description was:
 ```
 User content...
 
 ## PR Type:
-pr_agent:type
+pr_agent:pr_type
 
 ## PR Description:
 pr_agent:summary
@@ -82,60 +46,6 @@ pr_agent:summary
 ## PR Walkthrough:
 pr_agent:walkthrough
 ```
-The marker `pr_agent:type` will be replaced with the PR type, `pr_agent:summary` will be replaced with the PR summary, and `pr_agent:walkthrough` will be replaced with the PR walkthrough.
+The marker `pr_agent:pr_type` will be replaced with the PR type, `pr_agent:summary` will be replaced with the PR summary, and `pr_agent:walkthrough` will be replaced with the PR walkthrough.
 
-<kbd><img src=https://codium.ai/images/pr_agent/describe_markers_before.png width="768"></kbd>
-
-==>
-
-<kbd><img src=https://codium.ai/images/pr_agent/describe_markers_after.png width="768"></kbd>
-
-**Configuration params:**
-
-- `use_description_markers`: if set to true, the tool will use markers template. It replaces every marker of the form `pr_agent:marker_name` with the relevant content. Default is false.
 - `include_generated_by_header`: if set to true, the tool will add a dedicated header: 'Generated by PR Agent at ...' to any automatic content. Default is true.
-
-
-## Usage Tips
-1)  [Automation](#automation)
-2) [Custom labels](#custom-labels)
-### Automation
-- When you first install the app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the describe tool is:
-```
-pr_commands = ["/describe --pr_description.add_original_user_description=true" 
-                         "--pr_description.keep_original_user_title=true", ...]
-```
-meaning the `describe` tool will run automatically on every PR, will keep the original title, and will add the original user description above the generated description. 
-<br> This default settings aim to strike a good balance between automation and control:
-If you want more automation, just give the PR a title, and the tool will auto-write a full description; If you want more control, you can add a detailed description, and the tool will add the complementary description below it.
-- For maximal automation, you can change the default mode to:
-```
-pr_commands = ["/describe --pr_description.add_original_user_description=false" 
-                         "--pr_description.keep_original_user_title=true", ...]
-```
-so the title will be auto-generated as well.
-- Markers are an alternative way to control the generated description, to give maximal control to the user. If you set:
-```
-pr_commands = ["/describe --pr_description.use_description_markers=true", ...]
-```
-the tool will replace every marker of the form `pr_agent:marker_name` in the PR description with the relevant content, where `marker_name` is one of the following:
-  - `type`: the PR type.
-  - `summary`: the PR summary.
-  - `walkthrough`: the PR walkthrough.
-
-Note that when markers are enabled, if the original PR description does not contain any markers, the tool will not alter the description at all.
-
-### Custom labels
-The default labels of the describe tool are quite generic, since they are meant to be used in any repo: [`Bug fix`, `Tests`, `Enhancement`, `Documentation`, `Other`].
-
-If you specify [custom labels](#handle-custom-labels-from-the-repos-labels-page-gem) in the repo's labels page, you can get tailored labels for your use cases.
-Examples for custom labels:
-- `Main topic:performence` -  pr_agent:The main topic of this PR is performance
-- `New endpoint` -  pr_agent:A new endpoint was added in this PR
-- `SQL query` -  pr_agent:A new SQL query was added in this PR
-- `Dockerfile changes` - pr_agent:The PR contains changes in the Dockerfile
-- ...
-
-The list above is eclectic, and aims to give an idea of different possibilities. Define custom labels that are relevant for your repo and use cases.
-Note that Labels are not mutually exclusive, so you can add multiple label categories.
-<br>Make sure to provide proper title, and detailed and well-phrased description for each label, so the tool will know when to suggest it.

docs/Full_enviroments.md

@@ -1,27 +0,0 @@
-## Overview
-`PR-Agent` offers extensive pull request functionalities across various git providers:
-|       |                                             | GitHub | Gitlab | Bitbucket | CodeCommit | Azure DevOps | Gerrit |
-|-------|---------------------------------------------|:------:|:------:|:---------:|:----------:|:----------:|:----------:|
-| TOOLS | Review                                      |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:    |
-|       | ⮑ Incremental                              |   :white_check_mark:    |       |           |       |          |     |
-|       | Ask                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:          |   :white_check_mark:          | :white_check_mark: |  :white_check_mark:    |
-|       | Auto-Description                            |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |   :white_check_mark:    | :white_check_mark:    |
-|       | Improve Code                                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | ⮑ Extended                             |   :white_check_mark:    |   :white_check_mark:    |        :white_check_mark:   |   :white_check_mark:    |          | :white_check_mark:    |
-|       | Reflect and Review                          |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |          |   :white_check_mark:    |    :white_check_mark:    |
-|       | Update CHANGELOG.md                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |       |
-|       | Find similar issue                          |   :white_check_mark:    |                         |                             |          |          |       |
-|       | Add Documentation                           |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | Generate Custom Labels 💎                   |   :white_check_mark:    |   :white_check_mark:    |         |     |          |      |
-|       |                                             |        |        |      |      |      |
-| USAGE | CLI                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |
-|       | App / webhook                               |   :white_check_mark:    |   :white_check_mark:    |           |          |          |
-|       | Tagging bot                                 |   :white_check_mark:    |        |           |          |          |
-|       | Actions                                     |   :white_check_mark:    |        |           |          |          |
-|       | Web server                                  |       |        |           |          |          |  :white_check_mark:   |
-|       |                                             |        |        |      |      |      |
-| CORE  | PR compression                              |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Repo language prioritization                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Adaptive and token-aware<br />file patch fitting |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Multiple models support |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Incremental PR Review |   :white_check_mark:    |      |      |      |      |      |

docs/GENERATE_CUSTOM_LABELS.md

@@ -1,57 +0,0 @@
-# Generate Custom Labels 💎
-The `generate_labels` tool scans the PR code changes, and given a list of labels and their descriptions, it automatically suggests labels that match the PR code changes.
-
-It can be invoked manually by commenting on any PR:
-```
-/generate_labels
-```
-For example:
-
-If we wish to add detect changes to SQL queries in a given PR, we can add the following custom label along with its description:
-
-<kbd><img src=https://codium.ai/images/pr_agent/custom_labels_list.png width="768"></kbd>
-
-When running the `generate_labels` tool on a PR that includes changes in SQL queries, it will automatically suggest the custom label:
-<kbd><img src=https://codium.ai/images/pr_agent/custom_label_published.png width="768"></kbd>
-
-Note that in addition to the dedicated tool `generate_labels`, the custom labels will also be used by the `describe` tool.
-
-### How to enable custom labels
-There are 3 ways to enable custom labels:
-
-#### 1. CLI (local configuration file)
-When working from CLI, you need to apply the [configuration changes](#configuration-changes) to the [custom_labels file](./../pr_agent/settings/custom_labels.toml):
-
-#### 2. Repo configuration file
-To enable custom labels, you need to apply the [configuration changes](#configuration-changes) to the local `.pr_agent.toml` file in you repository.
-
-#### 3. Handle custom labels from the Repo's labels page 
-> This feature is available only in PR-Agent Pro 
-* GitHub : `https://github.com/{owner}/{repo}/labels`, or click on the "Labels" tab in the issues or PRs page.
-* GitLab : `https://gitlab.com/{owner}/{repo}/-/labels`, or click on "Manage" -> "Labels" on the left menu.
-
-b. Add/edit the custom labels. It should be formatted as follows:
-* Label name: The name of the custom label.
-* Description: Start the description of with prefix `pr_agent:`, for example: `pr_agent: Description of when AI should suggest this label`.<br>
-The description should be comprehensive and detailed, indicating when to add the desired label.
-<kbd><img src=https://codium.ai/images/pr_agent/add_native_custom_labels.png width="880"></kbd>
-
-c. Now the custom labels will be included in the `generate_labels` tool.
-
-*This feature is supported in GitHub and GitLab.
-
-#### Configuration changes
- - Change `enable_custom_labels` to True: This will turn off the default labels and enable the custom labels provided in the custom_labels.toml file.
- - Add the custom labels. It should be formatted as follows:
-
-```
-[config]
-enable_custom_labels=true
-
-[custom_labels."Custom Label Name"]
-description = "Description of when AI should suggest this label"
-
-[custom_labels."Custom Label 2"]
-description = "Description of when AI should suggest this label 2"
-```
-

docs/IMPROVE.md

@@ -1,100 +1,34 @@
 # Improve Tool
 
-## Table of Contents
+The `improve` tool scans the PR code changes, and automatically generate committable suggestions for improving the PR code.
-- [Overview](#overview)
+It can be invoked manually by commenting on any PR:
-  - [Configuration options](#configuration-options)
-  - [Summarize mode](#summarize-mode)
-- [Usage Tips](#usage-tips)
-    - [Extra instructions](#extra-instructions)
-    - [PR footprint - regular vs summarize mode](#pr-footprint---regular-vs-summarize-mode)
-    - [A note on code suggestions quality](#a-note-on-code-suggestions-quality)
-
-## Overview
-The `improve` tool scans the PR code changes, and automatically generates committable suggestions for improving the PR code.
-The tool can be triggered automatically every time a new PR is [opened](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools), or it can be invoked manually by commenting on any PR:
 ```
 /improve
 ```
-
 For example:
 
-<kbd><img src=https://codium.ai/images/pr_agent/improve_comment.png width="768"></kbd>
+<kbd><img src=./../pics/improve_comment.png width="768"></kbd>
+<kbd><img src=./../pics/improve.png width="768"></kbd>
 
----
+The `improve` tool can also be triggered automatically every time a new PR is opened. See examples for automatic triggers for [GitHub App](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) and [GitHub Action](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
-
-<kbd><img src=https://codium.ai/images/pr_agent/improve.png width="768"></kbd>
-
----
 
 An extended mode, which does not involve PR Compression and provides more comprehensive suggestions, can be invoked by commenting on any PR:
 ```
 /improve --extended
 ```
-Note that the extended mode divides the PR code changes into chunks, up to the token limits, where each chunk is handled separately (might use multiple calls to GPT-4 for large PRs).
+Note that the extended mode divides the PR code changes into chunks, up to the token limits, where each chunk is handled separately (multiple calls to GPT-4).
-Hence, the total number of suggestions is proportional to the number of chunks, i.e., the size of the PR.
+Hence, the total number of suggestions is proportional to the number of chunks, i.e. the size of the PR.
 
 ### Configuration options
 
-To edit [configurations](./../pr_agent/settings/configuration.toml#L66) related to the improve tool (`pr_code_suggestions` section), use the following template:
+Under the section 'pr_code_suggestions', the [configuration file](./../pr_agent/settings/configuration.toml#L40) contains options to customize the 'improve' tool:
-```
-/improve --pr_code_suggestions.some_config1=... --pr_code_suggestions.some_config2=...
-```
 
-#### General options
 - `num_code_suggestions`: number of code suggestions provided by the 'improve' tool. Default is 4.
 - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
 - `rank_suggestions`: if set to true, the tool will rank the suggestions, based on importance. Default is false.
-- `include_improved_code`: if set to true, the tool will include an improved code implementation in the suggestion. Default is true.
 
 #### params for '/improve --extended' mode
-- `auto_extended_mode`: enable extended mode automatically (no need for the `--extended` option). Default is false.
 - `num_code_suggestions_per_chunk`: number of code suggestions provided by the 'improve' tool, per chunk. Default is 8.
 - `rank_extended_suggestions`: if set to true, the tool will rank the suggestions, based on importance. Default is true.
 - `max_number_of_calls`: maximum number of chunks. Default is 5.
 - `final_clip_factor`: factor to remove suggestions with low confidence. Default is 0.9.
-
-#### Summarize mode
-In this mode, instead of presenting committable suggestions, the different suggestions will be combined into a single compact comment, with significantly smaller PR footprint.
-
-To invoke the summarize mode, use the following command:
-```
-/improve --pr_code_suggestions.summarize=true
-```
-
-For example:
-
-<kbd><img src=https://codium.ai/images/pr_agent/improved_summerize_open.png width="768"></kbd>
-
-___
-
-## Usage Tips
-
-### Extra instructions
-Extra instructions are very important for the `imrpove` tool, since they enable you to guide the model to suggestions that are more relevant to the specific needs of the project.
-
-Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify relevant aspects that you want the model to focus on.
-
-Examples for extra instructions:
-```
-[pr_code_suggestions] # /improve #
-extra_instructions="""
-Emphasize the following aspects:
-- Does the code logic covers relevant edge cases?
-- Is the code logic clear and easy to understand?
-- Is the code logic efficient?
-...
-"""
-```
-Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
-
-### PR footprint - regular vs summarize mode
-The default mode of the `improve` tool provides committable suggestions. This mode as a high PR footprint, since each suggestion is a separate comment you need to resolve.
-If you prefer something more compact, use the [`summarize`](#summarize-mode) mode, which combines all the suggestions into a single comment.
-
-### A note on code suggestions quality
-
-- While the current AI for code is getting better and better (GPT-4), it's not flawless. Not all the suggestions will be perfect, and a user should not accept all of them automatically.
-- Suggestions are not meant to be [simplistic](./../pr_agent/settings/pr_code_suggestions_prompts.toml#L34). Instead, they aim to give deep feedback and raise questions, ideas and thoughts to the user, who can then use his judgment, experience, and understanding of the code base.
-- Recommended to use the 'extra_instructions' field to guide the model to suggestions that are more relevant to the specific needs of the project.
-- Best quality will be obtained by using 'improve --extended' mode.
-

docs/REVIEW.md

@@ -1,148 +1,46 @@
 # Review Tool
 
-## Table of Contents
-- [Overview](#overview)
-  - [Configuration options](#configuration-options)
-  - [Incremental Mode](#incremental-mode)
-  - [PR Reflection](#pr-reflection)
-- [Usage Tips](#usage-tips)
-  - [General guidelines](#general-guidelines)
-  - [Code suggestions](#code-suggestions)
-  - [Automation](#automation)
-  - [Auto-labels](#auto-labels)
-  - [Extra instructions](#extra-instructions)
-
-## Overview
 The `review` tool scans the PR code changes, and automatically generates a PR review.
-The tool can be triggered automatically every time a new PR is [opened](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools), or can be invoked manually by commenting on any PR:
+It can be invoked manually by commenting on any PR:
 ```
 /review
 ```
 For example:
-___
+
-<kbd><img src=https://codium.ai/images/pr_agent/review_comment.png width="768"></kbd>
+<kbd><img src=./../pics/review_comment.png width="768"></kbd>
-___
+<kbd><img src=./../pics/describe.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/review.png width="768"></kbd>
+
-___
+The `review` tool can also be triggered automatically every time a new PR is opened. See examples for automatic triggers for [GitHub App](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) and [GitHub Action](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
 
 ### Configuration options
 
-To edit [configurations](./../pr_agent/settings/configuration.toml#L19)  related to the review tool (`pr_reviewer` section), use the following template:
+Under the section 'pr_reviewer', the [configuration file](./../pr_agent/settings/configuration.toml#L16) contains options to customize the 'review' tool:
-```
-/review --pr_reviewer.some_config1=... --pr_reviewer.some_config2=...
-```
 
-#### General options
-- `num_code_suggestions`: number of code suggestions provided by the 'review' tool. Default is 4.
-- `inline_code_comments`: if set to true, the tool will publish the code suggestions as comments on the code diff. Default is false.
-- `persistent_comment`: if set to true, the review comment will be persistent, meaning that every new review request will edit the previous one. Default is true.
-- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
-#### Enable\\disable features
 - `require_focused_review`: if set to true, the tool will add a section - 'is the PR a focused one'. Default is false.
 - `require_score_review`: if set to true, the tool will add a section that scores the PR. Default is false.
 - `require_tests_review`: if set to true, the tool will add a section that checks if the PR contains tests. Default is true.
 - `require_security_review`: if set to true, the tool will add a section that checks if the PR contains security issues. Default is true.
 - `require_estimate_effort_to_review`: if set to true, the tool will add a section that estimates thed effort needed to review the PR. Default is true.
-#### SOC2 ticket compliance 💎
+- `num_code_suggestions`: number of code suggestions provided by the 'review' tool. Default is 4.
-This sub-tool checks if the PR description properly contains a ticket to a project management system (e.g., Jira, Asana, Trello, etc.), as required by SOC2 compliance. If not, it will add a label to the PR: "Missing SOC2 ticket".
+- `inline_code_comments`: if set to true, the tool will publish the code suggestions as comments on the code diff. Default is false.
-- `require_soc2_review`: If set to true, the SOC2 ticket checker sub-tool will be enabled. Default is false.
+- `automatic_review`: if set to false, no automatic reviews will be done. Default is true.
-- `soc2_ticket_prompt`: The prompt for the SOC2 ticket review. Default is: `Does the PR description include a link to ticket in a project management system (e.g., Jira, Asana, Trello, etc.) ?`. Edit this field if your compliance requirements are different.
+- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
-#### Adding PR labels
+####  Incremental Mode
-- `enable_review_labels_security`: if set to true, the tool will publish a 'possible security issue' label if it detects a security issue. Default is true.
+For an incremental review, which only considers changes since the last PR-Agent review, this can be useful when working on the PR in an iterative manner, and you want to focus on the changes since the last review instead of reviewing the entire PR again, the following command can be used:
-- `enable_review_labels_effort`: if set to true, the tool will publish a 'Review effort [1-5]: x' label. Default is false.
-
-###  Incremental Mode
-Incremental review only considers changes since the last PR-Agent review. This can be useful when working on the PR in an iterative manner, and you want to focus on the changes since the last review instead of reviewing the entire PR again.
-For invoking the incremental mode, the following command can be used:
 ```
-/review -i
+/improve -i
 ```
 Note that the incremental mode is only available for GitHub.
 
-<kbd><img src=https://codium.ai/images/pr_agent/incremental_review.png width="768"></kbd>
+<kbd><img src=./../pics/incremental_review.png width="768"></kbd>
 
-Under the section 'pr_reviewer', the [configuration file](./../pr_agent/settings/configuration.toml#L19) contains options to customize the 'review -i' tool.  
+#### PR Reflection
-These configurations can be used to control the rate at which the incremental review tool will create new review comments when invoked automatically, to prevent making too much noise in the PR.
-- `minimal_commits_for_incremental_review`: Minimal number of commits since the last review that are required to create incremental review.
-If there are less than the specified number of commits since the last review, the tool will not perform any action.
-Default is 0 - the tool will always run, no matter how many commits since the last review.
-- `minimal_minutes_for_incremental_review`: Minimal number of minutes that need to pass since the last reviewed commit to create incremental review.
-If less that the specified number of minutes have passed between the last reviewed commit and running this command, the tool will not perform any action. 
-Default is 0 - the tool will always run, no matter how much time have passed since the last reviewed commit.
-- `require_all_thresholds_for_incremental_review`: If set to true, all the previous thresholds must be met for incremental review to run. If false, only one is enough to run the tool.
-For example, if `minimal_commits_for_incremental_review=2` and `minimal_minutes_for_incremental_review=2`, and we have 3 commits since the last review, but the last reviewed commit is from 1 minute ago:
-When `require_all_thresholds_for_incremental_review=true` the incremental review __will not__ run, because only 1 out of 2 conditions were met (we have enough commits but the last review is too recent),
-but when `require_all_thresholds_for_incremental_review=false` the incremental review __will__ run, because one condition is enough (we have 3 commits which is more than the configured 2).
-Default is false - the tool will run as long as at least once conditions is met.
-- `remove_previous_review_comment`: if set to true, the tool will remove the previous review comment before adding a new one. Default is false.
-
-### PR Reflection
 By invoking:
 ```
 /reflect_and_review
 ```
-The tool will first ask the author questions about the PR, and will guide the review based on their answers.
+The tool will first ask the author questions about the PR, and will guide the review based on his answers.
-
-<kbd><img src=https://codium.ai/images/pr_agent/reflection_questions.png width="768"></kbd>
-___
-<kbd><img src=https://codium.ai/images/pr_agent/reflection_answers.png width="768"></kbd>
-___
-<kbd><img src=https://codium.ai/images/pr_agent/reflection_insights.png width="768"></kbd>
-___
-
-
-## Usage Tips
-1) [General guidelines](#general-guidelines)
-2) [Code suggestions](#code-suggestions)
-3) [Automation](#automation)
-4) [Auto-labels](#auto-labels)
-5) [Extra instructions](#extra-instructions)
-
-### General guidelines
-The `review` tool provides a collection of possible feedbacks about a PR.
-It is recommended to review the [Configuration options](#configuration-options) section, and choose the relevant options for your use case.
-
-Some of the feature that are disabled by default are quite useful, and should be considered for enabling. For example: 
-`require_score_review`, `require_soc2_review`, `enable_review_labels_effort`, and more.
-
-On the other hand, if you find one of the enabled features to be irrelevant for your use case, disable it. No default configuration can fit all use cases.
-
-### Code suggestions
-The `review` tool provides several type of feedbacks, one of them is code suggestions.
-If you are interested **only** in the code suggestions, it is recommended to use the [`improve`](./IMPROVE.md) feature instead, since it dedicated only to code suggestions, and usually gives better results.
-Use the `review` tool if you want to get a more comprehensive feedback, which includes code suggestions as well.
-
-### Automation
-- When you first install the app, the [default mode](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) for the `review` tool is:
-```
-pr_commands = ["/review", ...]
-```
-meaning the `review` tool will run automatically on every PR, with the default configuration.
-Edit this field to enable/disable the tool, or to change the used configurations
-
-### Auto-labels
-The `review` tool can auto-generate two specific types of labels for a PR:
-- a `possible security issue` label if it detects a [security issue](https://github.com/Codium-ai/pr-agent/blob/tr/user_description/pr_agent/settings/pr_reviewer_prompts.toml#L136) (`enable_review_labels_security` flag)
-- a `Review effort [1-5]: x` label, where x is the estimated effort to review the PR (`enable_review_labels_effort` flag)
-
-Both modes are useful, and we recommended to enable them.
-
-### Extra instructions
-Extra instruction are important.
-The `review` tool can be configured with extra instructions, which can be used to guide the model to feedback tailored to the needs of your project.
-
-Be specific, clear, and concise in the instructions. With extra instructions, you are the prompter. Specify the relevant sub-tool, and the relevant aspects of the PR that you want to emphasize.
-
-Examples for extra instructions:
-```
-[pr_reviewer] # /review #
-extra_instructions="""
-In the code feedback section, emphasize the following:
-- Does the code logic covers relevant edge cases?
-- Is the code logic clear and easy to understand?
-- Is the code logic efficient?
-...
-"""
-```
-Use triple quotes to write multi-line instructions. Use bullet points to make the instructions more readable.
 
+<kbd><img src=./../pics/reflection_questions.png width="768"></kbd>
+<kbd><img src=./../pics/reflection_answers.png width="768"></kbd>
+<kbd><img src=./../pics/reflection_insights.png width="768"></kbd>

docs/SIMILAR_ISSUE.md

@@ -6,21 +6,13 @@ It can be invoked manually by commenting on any PR:
 ```
 For example:
 
-<kbd><img src=https://codium.ai/images/pr_agent/similar_issue_original_issue.png width="768"></kbd>
+<kbd><img src=./../pics/similar_issue_original_issue.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/similar_issue_comment.png width="768"></kbd>
+<kbd><img src=./../pics/similar_issue_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/similar_issue.png width="768"></kbd>
+<kbd><img src=./../pics/similar_issue.png width="768"></kbd>
 
 Note that to perform retrieval, the `similar_issue` tool indexes all the repo previous issues (once).
 
-
+To enable usage of the '**similar issue**' tool, you need to set the following keys in `.secrets.toml` (or in the relevant environment variables):
-**Select VectorDBs** by changing `pr_similar_issue` parameter in `configuration.toml` file 
-
-2 VectorDBs are available to switch in
-1. LanceDB
-2. Pinecone
-
-To enable usage of the '**similar issue**' tool for Pinecone, you need to set the following keys in `.secrets.toml` (or in the relevant environment variables):
-
 ```
 [pinecone]
 api_key = "..."

docs/TOOLS_GUIDE.md

@@ -6,7 +6,5 @@
 - [SIMILAR_ISSUE](./SIMILAR_ISSUE.md)
 - [UPDATE CHANGELOG](./UPDATE_CHANGELOG.md)
 - [ADD DOCUMENTATION](./ADD_DOCUMENTATION.md)
-- [GENERATE CUSTOM LABELS](./GENERATE_CUSTOM_LABELS.md)
-- [Analyze](./Analyze.md)
 
 See the **[installation guide](/INSTALL.md)** for instructions on how to setup PR-Agent.

docs/UPDATE_CHANGELOG.md

@@ -7,8 +7,8 @@ It can be invoked manually by commenting on any PR:
 ```
 For example:
 
-<kbd><img src=https://codium.ai/images/pr_agent/update_changelog_comment.png width="768"></kbd>
+<kbd><img src=./../pics/update_changelog_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/update_changelog.png width="768"></kbd>
+<kbd><img src=./../pics/update_changelog.png width="768"></kbd>
 
 
 ### Configuration options

pr_agent/agent/pr_agent.py

@@ -1,23 +1,20 @@
+import logging
+import os
 import shlex
-from functools import partial
+import tempfile
-
-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
+from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger
 from pr_agent.tools.pr_add_docs import PRAddDocs
 from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
-from pr_agent.tools.pr_config import PRConfig
 from pr_agent.tools.pr_description import PRDescription
-from pr_agent.tools.pr_generate_labels import PRGenerateLabels
 from pr_agent.tools.pr_information_from_user import PRInformationFromUser
+from pr_agent.tools.pr_similar_issue import PRSimilarIssue
 from pr_agent.tools.pr_questions import PRQuestions
 from pr_agent.tools.pr_reviewer import PRReviewer
-from pr_agent.tools.pr_similar_issue import PRSimilarIssue
 from pr_agent.tools.pr_update_changelog import PRUpdateChangelog
+from pr_agent.tools.pr_config import PRConfig
 
 command2class = {
     "auto_review": PRReviewer,
@@ -37,27 +34,38 @@ command2class = {
     "settings": PRConfig,
     "similar_issue": PRSimilarIssue,
     "add_docs": PRAddDocs,
-    "generate_labels": PRGenerateLabels,
 }
 
 commands = list(command2class.keys())
 
 class PRAgent:
-    def __init__(self, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
+    def __init__(self):
-        self.ai_handler = ai_handler # will be initialized in run_action
+        pass
 
     async def handle_request(self, pr_url, request, notify=None) -> bool:
         # First, apply repo specific settings if exists
-        apply_repo_settings(pr_url)
+        if get_settings().config.use_repo_settings_file:
+            repo_settings_file = None
+            try:
+                git_provider = get_git_provider()(pr_url)
+                repo_settings = git_provider.get_repo_settings()
+                if repo_settings:
+                    repo_settings_file = None
+                    fd, repo_settings_file = tempfile.mkstemp(suffix='.toml')
+                    os.write(fd, repo_settings)
+                    get_settings().load_file(repo_settings_file)
+            finally:
+                if repo_settings_file:
+                    try:
+                        os.remove(repo_settings_file)
+                    except Exception as e:
+                        logging.error(f"Failed to remove temporary settings file {repo_settings_file}", e)
 
         # Then, apply user specific settings if exists
-        if isinstance(request, str):
         request = request.replace("'", "\\'")
         lexer = shlex.shlex(request, posix=True)
         lexer.whitespace_split = True
         action, *args = list(lexer)
-        else:
-            action, *args = request
         args = update_settings_from_args(args)
 
         action = action.lstrip("/").lower()
@@ -66,15 +74,13 @@ class PRAgent:
         if action == "answer":
             if notify:
                 notify()
-            await PRReviewer(pr_url, is_answer=True, args=args, ai_handler=self.ai_handler).run()
+            await PRReviewer(pr_url, is_answer=True, args=args).run()
         elif action == "auto_review":
-            await PRReviewer(pr_url, is_auto=True, args=args, ai_handler=self.ai_handler).run()
+            await PRReviewer(pr_url, is_auto=True, args=args).run()
         elif action in command2class:
             if notify:
                 notify()
-                
+            await command2class[action](pr_url, args=args).run()
-            await command2class[action](pr_url, ai_handler=self.ai_handler, args=args).run()
         else:
             return False
         return True
-

pr_agent/algo/__init__.py

@@ -8,17 +8,9 @@ MAX_TOKENS = {
     'gpt-4': 8000,
     'gpt-4-0613': 8000,
     'gpt-4-32k': 32000,
-    'gpt-4-1106-preview': 128000, # 128K, but may be limited by config.max_model_tokens
     'claude-instant-1': 100000,
     'claude-2': 100000,
     'command-nightly': 4096,
     'replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1': 4096,
-    'meta-llama/Llama-2-7b-chat-hf': 4096,
+    'meta-llama/Llama-2-7b-chat-hf': 4096
-    'vertex_ai/codechat-bison': 6144,
-    'vertex_ai/codechat-bison-32k': 32000,
-    'codechat-bison': 6144,
-    'codechat-bison-32k': 32000,
-    'anthropic.claude-v2': 100000,
-    'anthropic.claude-instant-v1': 100000,
-    'anthropic.claude-v1': 100000,
 }

pr_agent/algo/ai_handler.py

@@ -0,0 +1,121 @@
+import logging
+import os
+
+import litellm
+import openai
+from litellm import acompletion
+from openai.error import APIError, RateLimitError, Timeout, TryAgain
+from retry import retry
+from pr_agent.config_loader import get_settings
+OPENAI_RETRIES = 5
+
+
+class AiHandler:
+    """
+    This class handles interactions with the OpenAI API for chat completions.
+    It initializes the API key and other settings from a configuration file,
+    and provides a method for performing chat completions using the OpenAI ChatCompletion API.
+    """
+
+    def __init__(self):
+        """
+        Initializes the OpenAI API key and other settings from a configuration file.
+        Raises a ValueError if the OpenAI key is missing.
+        """
+        try:
+            openai.api_key = get_settings().openai.key
+            litellm.openai_key = get_settings().openai.key
+            if get_settings().get("litellm.use_client"):
+                litellm_token = get_settings().get("litellm.LITELLM_TOKEN")
+                assert litellm_token, "LITELLM_TOKEN is required"
+                os.environ["LITELLM_TOKEN"] = litellm_token
+                litellm.use_client = True
+            self.azure = False
+            if get_settings().get("OPENAI.ORG", None):
+                litellm.organization = get_settings().openai.org
+            if get_settings().get("OPENAI.API_TYPE", None):
+                if get_settings().openai.api_type == "azure":
+                    self.azure = True
+                    litellm.azure_key = get_settings().openai.key
+            if get_settings().get("OPENAI.API_VERSION", None):
+                litellm.api_version = get_settings().openai.api_version
+            if get_settings().get("OPENAI.API_BASE", None):
+                litellm.api_base = get_settings().openai.api_base
+            if get_settings().get("ANTHROPIC.KEY", None):
+                litellm.anthropic_key = get_settings().anthropic.key
+            if get_settings().get("COHERE.KEY", None):
+                litellm.cohere_key = get_settings().cohere.key
+            if get_settings().get("REPLICATE.KEY", None):
+                litellm.replicate_key = get_settings().replicate.key
+            if get_settings().get("REPLICATE.KEY", None):
+                litellm.replicate_key = get_settings().replicate.key
+            if get_settings().get("HUGGINGFACE.KEY", None):
+                litellm.huggingface_key = get_settings().huggingface.key
+                if get_settings().get("HUGGINGFACE.API_BASE", None):
+                    litellm.api_base = get_settings().huggingface.api_base
+        except AttributeError as e:
+            raise ValueError("OpenAI key is required") from e
+
+    @property
+    def deployment_id(self):
+        """
+        Returns the deployment ID for the OpenAI API.
+        """
+        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
+
+    @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
+           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):
+        """
+        Performs a chat completion using the OpenAI ChatCompletion API.
+        Retries in case of API errors or timeouts.
+        
+        Args:
+            model (str): The model to use for chat completion.
+            temperature (float): The temperature parameter for chat completion.
+            system (str): The system message for chat completion.
+            user (str): The user message for chat completion.
+        
+        Returns:
+            tuple: A tuple containing the response and finish reason from the API.
+        
+        Raises:
+            TryAgain: If the API response is empty or there are no choices in the response.
+            APIError: If there is an error during OpenAI inference.
+            Timeout: If there is a timeout during OpenAI inference.
+            TryAgain: If there is an attribute error during OpenAI inference.
+        """
+        try:
+            deployment_id = self.deployment_id
+            if get_settings().config.verbosity_level >= 2:
+                logging.debug(
+                    f"Generating completion with {model}"
+                    f"{(' from deployment ' + deployment_id) if deployment_id else ''}"
+                )
+            if self.azure:
+                model = 'azure/' + model
+            response = await acompletion(
+                model=model,
+                deployment_id=deployment_id,
+                messages=[
+                    {"role": "system", "content": system},
+                    {"role": "user", "content": user}
+                ],
+                temperature=temperature,
+                force_timeout=get_settings().config.ai_timeout
+            )
+        except (APIError, Timeout, TryAgain) as e:
+            logging.error("Error during OpenAI inference: ", e)
+            raise
+        except (RateLimitError) as e:
+            logging.error("Rate limit error during OpenAI inference: ", e)
+            raise
+        except (Exception) as e:
+            logging.error("Unknown error during OpenAI inference: ", e)
+            raise TryAgain from e
+        if response is None or len(response["choices"]) == 0:
+            raise TryAgain
+        resp = response["choices"][0]['message']['content']
+        finish_reason = response["choices"][0]["finish_reason"]
+        print(resp, finish_reason)
+        return resp, finish_reason

pr_agent/algo/ai_handlers/base_ai_handler.py

@@ -1,28 +0,0 @@
-from abc import ABC, abstractmethod
-
-class BaseAiHandler(ABC):
-    """
-    This class defines the interface for an AI handler to be used by the PR Agents.  
-    """
-
-    @abstractmethod
-    def __init__(self):
-        pass
-
-    @property
-    @abstractmethod
-    def deployment_id(self):
-        pass
-
-    @abstractmethod   
-    async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2):
-        """
-        This method should be implemented to return a chat completion from the AI model.
-        Args:
-            model (str): the name of the model to use for the chat completion
-            system (str): the system message string to use for the chat completion
-            user (str): the user message string to use for the chat completion
-            temperature (float): the temperature to use for the chat completion    
-        """
-        pass
-

pr_agent/algo/ai_handlers/langchain_ai_handler.py

@@ -1,67 +0,0 @@
-try:
-    from langchain.chat_models import ChatOpenAI, AzureChatOpenAI
-    from langchain.schema import SystemMessage, HumanMessage
-except: # we don't enforce langchain as a dependency, so if it's not installed, just move on
-    pass
-
-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.error import APIError, RateLimitError, Timeout, TryAgain
-from retry import retry
-import functools
-
-OPENAI_RETRIES = 5
-
-class LangChainOpenAIHandler(BaseAiHandler):
-    def __init__(self):
-        # Initialize OpenAIHandler specific attributes here
-        super().__init__()
-        self.azure = get_settings().get("OPENAI.API_TYPE", "").lower() == "azure"
-        try:
-            if self.azure:
-                # using a partial function so we can set the deployment_id later to support fallback_deployments
-                # but still need to access the other settings now so we can raise a proper exception if they're missing
-                self._chat = functools.partial(
-                    lambda **kwargs: AzureChatOpenAI(**kwargs),
-                    openai_api_key=get_settings().openai.key,
-                    openai_api_base=get_settings().openai.api_base,
-                    openai_api_version=get_settings().openai.api_version,
-                )
-            else:
-                self._chat = ChatOpenAI(openai_api_key=get_settings().openai.key)
-        except AttributeError as e:
-            if getattr(e, "name"):
-                raise ValueError(f"OpenAI {e.name} is required") from e
-            else:
-                raise e
-    
-    @property
-    def chat(self):
-        if self.azure:
-            # we must set the deployment_id only here (instead of the __init__ method) to support fallback_deployments
-            return self._chat(deployment_name=self.deployment_id)
-        else:
-            return self._chat
-
-    @property
-    def deployment_id(self):
-        """
-        Returns the deployment ID for the OpenAI API.
-        """
-        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
-    @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
-           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:
-            messages=[SystemMessage(content=system), HumanMessage(content=user)]
-            
-            # get a chat completion from the formatted messages
-            resp = self.chat(messages, model=model, temperature=temperature)
-            finish_reason="completed"
-            return resp.content, finish_reason
-        
-        except (Exception) as e:
-            get_logger().error("Unknown error during OpenAI inference: ", e)
-            raise e

pr_agent/algo/ai_handlers/litellm_ai_handler.py

@@ -1,133 +0,0 @@
-import os
-
-import boto3
-import litellm
-import openai
-from litellm import acompletion
-from openai.error import APIError, RateLimitError, Timeout, TryAgain
-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
-
-OPENAI_RETRIES = 5
-
-
-class LiteLLMAIHandler(BaseAiHandler):
-    """
-    This class handles interactions with the OpenAI API for chat completions.
-    It initializes the API key and other settings from a configuration file,
-    and provides a method for performing chat completions using the OpenAI ChatCompletion API.
-    """
-
-    def __init__(self):
-        """
-        Initializes the OpenAI API key and other settings from a configuration file.
-        Raises a ValueError if the OpenAI key is missing.
-        """
-        self.azure = False
-        self.aws_bedrock_client = None
-
-        if get_settings().get("OPENAI.KEY", None):
-            openai.api_key = get_settings().openai.key
-            litellm.openai_key = get_settings().openai.key
-        if get_settings().get("litellm.use_client"):
-            litellm_token = get_settings().get("litellm.LITELLM_TOKEN")
-            assert litellm_token, "LITELLM_TOKEN is required"
-            os.environ["LITELLM_TOKEN"] = litellm_token
-            litellm.use_client = True
-        if get_settings().get("OPENAI.ORG", None):
-            litellm.organization = get_settings().openai.org
-        if get_settings().get("OPENAI.API_TYPE", None):
-            if get_settings().openai.api_type == "azure":
-                self.azure = True
-                litellm.azure_key = get_settings().openai.key
-        if get_settings().get("OPENAI.API_VERSION", None):
-            litellm.api_version = get_settings().openai.api_version
-        if get_settings().get("OPENAI.API_BASE", None):
-            litellm.api_base = get_settings().openai.api_base
-        if get_settings().get("ANTHROPIC.KEY", None):
-            litellm.anthropic_key = get_settings().anthropic.key
-        if get_settings().get("COHERE.KEY", None):
-            litellm.cohere_key = get_settings().cohere.key
-        if get_settings().get("REPLICATE.KEY", None):
-            litellm.replicate_key = get_settings().replicate.key
-        if get_settings().get("REPLICATE.KEY", None):
-            litellm.replicate_key = get_settings().replicate.key
-        if get_settings().get("HUGGINGFACE.KEY", None):
-            litellm.huggingface_key = get_settings().huggingface.key
-            if get_settings().get("HUGGINGFACE.API_BASE", None):
-                litellm.api_base = get_settings().huggingface.api_base
-        if get_settings().get("VERTEXAI.VERTEX_PROJECT", None):
-            litellm.vertex_project = get_settings().vertexai.vertex_project
-            litellm.vertex_location = get_settings().get(
-                "VERTEXAI.VERTEX_LOCATION", None
-            )
-        if get_settings().get("AWS.BEDROCK_REGION", None):
-            litellm.AmazonAnthropicConfig.max_tokens_to_sample = 2000
-            self.aws_bedrock_client = boto3.client(
-                service_name="bedrock-runtime",
-                region_name=get_settings().aws.bedrock_region,
-            )
-
-    @property
-    def deployment_id(self):
-        """
-        Returns the deployment ID for the OpenAI API.
-        """
-        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
-
-    @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
-           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):
-        """
-        Performs a chat completion using the OpenAI ChatCompletion API.
-        Retries in case of API errors or timeouts.
-        
-        Args:
-            model (str): The model to use for chat completion.
-            temperature (float): The temperature parameter for chat completion.
-            system (str): The system message for chat completion.
-            user (str): The user message for chat completion.
-        
-        Returns:
-            tuple: A tuple containing the response and finish reason from the API.
-        
-        Raises:
-            TryAgain: If the API response is empty or there are no choices in the response.
-            APIError: If there is an error during OpenAI inference.
-            Timeout: If there is a timeout during OpenAI inference.
-            TryAgain: If there is an attribute error during OpenAI inference.
-        """
-        try:
-            deployment_id = self.deployment_id
-            if self.azure:
-                model = 'azure/' + model
-            messages = [{"role": "system", "content": system}, {"role": "user", "content": user}]
-            kwargs = {
-                "model": model,
-                "deployment_id": deployment_id,
-                "messages": messages,
-                "temperature": temperature,
-                "force_timeout": get_settings().config.ai_timeout,
-            }
-            if self.aws_bedrock_client:
-                kwargs["aws_bedrock_client"] = self.aws_bedrock_client
-            response = await acompletion(**kwargs)
-        except (APIError, Timeout, TryAgain) as e:
-            get_logger().error("Error during OpenAI inference: ", e)
-            raise
-        except (RateLimitError) as e:
-            get_logger().error("Rate limit error during OpenAI inference: ", e)
-            raise
-        except (Exception) as e:
-            get_logger().error("Unknown error during OpenAI inference: ", e)
-            raise TryAgain from e
-        if response is None or len(response["choices"]) == 0:
-            raise TryAgain
-        resp = response["choices"][0]['message']['content']
-        finish_reason = response["choices"][0]["finish_reason"]
-        usage = response.get("usage")
-        get_logger().info("AI response", response=resp, messages=messages, finish_reason=finish_reason,
-                          model=model, usage=usage)
-        return resp, finish_reason

pr_agent/algo/ai_handlers/openai_ai_handler.py

@@ -1,67 +0,0 @@
-from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
-import openai
-from openai.error import APIError, RateLimitError, Timeout, TryAgain
-from retry import retry
-
-from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger
-
-OPENAI_RETRIES = 5
-
-
-class OpenAIHandler(BaseAiHandler):
-    def __init__(self):
-        # Initialize OpenAIHandler specific attributes here
-        try:
-            super().__init__()
-            openai.api_key = get_settings().openai.key
-            if get_settings().get("OPENAI.ORG", None):
-                openai.organization = get_settings().openai.org
-            if get_settings().get("OPENAI.API_TYPE", None):
-                if get_settings().openai.api_type == "azure":
-                    self.azure = True
-                    openai.azure_key = get_settings().openai.key
-            if get_settings().get("OPENAI.API_VERSION", None):
-                openai.api_version = get_settings().openai.api_version
-            if get_settings().get("OPENAI.API_BASE", None):
-                openai.api_base = get_settings().openai.api_base
-
-        except AttributeError as e:
-            raise ValueError("OpenAI key is required") from e
-    @property
-    def deployment_id(self):
-        """
-        Returns the deployment ID for the OpenAI API.
-        """
-        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
-    
-    @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
-           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}]
-
-            chat_completion = await openai.ChatCompletion.acreate(
-                model=model,
-                deployment_id=deployment_id,
-                messages=messages,
-                temperature=temperature,
-            )
-            resp = chat_completion["choices"][0]['message']['content']
-            finish_reason = chat_completion["choices"][0]["finish_reason"]
-            usage = chat_completion.get("usage")
-            get_logger().info("AI response", response=resp, messages=messages, finish_reason=finish_reason,
-                            model=model, usage=usage)
-            return resp, finish_reason       
-        except (APIError, Timeout, TryAgain) as e:
-            get_logger().error("Error during OpenAI inference: ", e)
-            raise
-        except (RateLimitError) as e:
-            get_logger().error("Rate limit error during OpenAI inference: ", e)
-            raise
-        except (Exception) as e:
-            get_logger().error("Unknown error during OpenAI inference: ", e)
-            raise TryAgain from e        

pr_agent/algo/file_filter.py

@@ -11,12 +11,7 @@ def filter_ignored(files):
     try:
         # load regex patterns, and translate glob patterns to regex
         patterns = get_settings().ignore.regex
-        if isinstance(patterns, str):
+        patterns += [fnmatch.translate(glob) for glob in get_settings().ignore.glob]
-            patterns = [patterns]
-        glob_setting = get_settings().ignore.glob
-        if isinstance(glob_setting, str): # --ignore.glob=[.*utils.py], --ignore.glob=.*utils.py
-            glob_setting = glob_setting.strip('[]').split(",")
-        patterns += [fnmatch.translate(glob) for glob in glob_setting]
 
         # compile all valid patterns
         compiled_patterns = []
@@ -28,7 +23,7 @@ def filter_ignored(files):
 
         # keep filenames that _don't_ match the ignore regex
         for r in compiled_patterns:
-            files = [f for f in files if (f.filename and not r.match(f.filename))]
+            files = [f for f in files if not r.match(f.filename)]
 
     except Exception as e:
         print(f"Could not filter file list: {e}")

pr_agent/algo/git_patch_processing.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
-
+import logging
 import re
 
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.git_provider import EDIT_TYPE
-from pr_agent.log import get_logger
 
 
 def extend_patch(original_file_str, patch_str, num_lines) -> str:
@@ -65,7 +63,7 @@ def extend_patch(original_file_str, patch_str, num_lines) -> str:
             extended_patch_lines.append(line)
     except Exception as e:
         if get_settings().config.verbosity_level >= 2:
-            get_logger().error(f"Failed to extend patch: {e}")
+            logging.error(f"Failed to extend patch: {e}")
         return patch_str
 
     # finish previous hunk
@@ -116,7 +114,7 @@ def omit_deletion_hunks(patch_lines) -> str:
 
 
 def handle_patch_deletions(patch: str, original_file_content_str: str,
-                           new_file_content_str: str, file_name: str, edit_type: EDIT_TYPE = EDIT_TYPE.UNKNOWN) -> str:
+                           new_file_content_str: str, file_name: str) -> str:
     """
     Handle entire file or deletion patches.
 
@@ -133,17 +131,17 @@ def handle_patch_deletions(patch: str, original_file_content_str: str,
         str: The modified patch with deletion hunks omitted.
 
     """
-    if not new_file_content_str and edit_type != EDIT_TYPE.ADDED:
+    if not new_file_content_str:
         # logic for handling deleted files - don't show patch, just show that the file was deleted
         if get_settings().config.verbosity_level > 0:
-            get_logger().info(f"Processing file: {file_name}, minimizing deletion file")
+            logging.info(f"Processing file: {file_name}, minimizing deletion file")
         patch = None # file was deleted
     else:
         patch_lines = patch.splitlines()
         patch_new = omit_deletion_hunks(patch_lines)
         if patch != patch_new:
             if get_settings().config.verbosity_level > 0:
-                get_logger().info(f"Processing file: {file_name}, hunks were deleted")
+                logging.info(f"Processing file: {file_name}, hunks were deleted")
             patch = patch_new
     return patch
 

pr_agent/algo/language_handler.py

@@ -3,7 +3,8 @@ from typing import Dict
 
 from pr_agent.config_loader import get_settings
 
-
+language_extension_map_org = get_settings().language_extension_map_org
+language_extension_map = {k.lower(): v for k, v in language_extension_map_org.items()}
 
 # Bad Extensions, source: https://github.com/EleutherAI/github-downloader/blob/345e7c4cbb9e0dc8a0615fd995a08bf9d73b3fe6/download_repo_text.py  # noqa: E501
 bad_extensions = get_settings().bad_extensions.default
@@ -28,8 +29,6 @@ def sort_files_by_main_languages(languages: Dict, files: list):
     # languages_sorted = sorted(languages, key=lambda x: x[1], reverse=True)
     # get all extensions for the languages
     main_extensions = []
-    language_extension_map_org = get_settings().language_extension_map_org
-    language_extension_map = {k.lower(): v for k, v in language_extension_map_org.items()}
     for language in languages_sorted_list:
         if language.lower() in language_extension_map:
             main_extensions.append(language_extension_map[language.lower()])

pr_agent/algo/pr_processing.py

@@ -1,26 +1,24 @@
 from __future__ import annotations
 
 import difflib
+import logging
 import re
 import traceback
 from typing import Any, Callable, List, Tuple
 
 from github import RateLimitExceededException
 
+from pr_agent.algo import MAX_TOKENS
 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.token_handler import TokenHandler, get_token_encoder
-from pr_agent.algo.utils import get_max_tokens
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.git_provider import FilePatchInfo, GitProvider, EDIT_TYPE
+from pr_agent.git_providers.git_provider import FilePatchInfo, GitProvider
-from pr_agent.log import get_logger
 
 DELETED_FILES_ = "Deleted files:\n"
 
-MORE_MODIFIED_FILES_ = "Additional modified files (insufficient token budget to process):\n"
+MORE_MODIFIED_FILES_ = "More modified files:\n"
-
-ADDED_FILES_ = "Additional added files (insufficient token budget to process):\n"
 
 OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD = 1000
 OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD = 600
@@ -53,7 +51,7 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: s
     try:
         diff_files = git_provider.get_diff_files()
     except RateLimitExceededException as e:
-        get_logger().error(f"Rate limit exceeded for git provider API. original message {e}")
+        logging.error(f"Rate limit exceeded for git provider API. original message {e}")
         raise
 
     diff_files = filter_ignored(diff_files)
@@ -66,17 +64,14 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: s
         pr_languages, token_handler, add_line_numbers_to_hunks, patch_extra_lines=PATCH_EXTRA_LINES)
 
     # if we are under the limit, return the full diff
-    if total_tokens + OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD < get_max_tokens(model):
+    if total_tokens + OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD < MAX_TOKENS[model]:
         return "\n".join(patches_extended)
 
     # if we are over the limit, start pruning
-    patches_compressed, modified_file_names, deleted_file_names, added_file_names = \
+    patches_compressed, modified_file_names, deleted_file_names = \
         pr_generate_compressed_diff(pr_languages, token_handler, model, add_line_numbers_to_hunks)
 
     final_diff = "\n".join(patches_compressed)
-    if added_file_names:
-        added_list_str = ADDED_FILES_ + "\n".join(added_file_names)
-        final_diff = final_diff + "\n\n" + added_list_str
     if modified_file_names:
         modified_list_str = MORE_MODIFIED_FILES_ + "\n".join(modified_file_names)
         final_diff = final_diff + "\n\n" + modified_list_str
@@ -127,7 +122,7 @@ def pr_generate_extended_diff(pr_languages: list,
 
 
 def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, model: str,
-                                convert_hunks_to_line_numbers: bool) -> Tuple[list, list, list, list]:
+                                convert_hunks_to_line_numbers: bool) -> Tuple[list, list, list]:
     """
     Generate a compressed diff string for a pull request, using diff minimization techniques to reduce the number of
     tokens used.
@@ -153,7 +148,6 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
     """
 
     patches = []
-    added_files_list = []
     modified_files_list = []
     deleted_files_list = []
     # sort each one of the languages in top_langs by the number of tokens in the diff
@@ -171,7 +165,7 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
 
         # removing delete-only hunks
         patch = handle_patch_deletions(patch, original_file_content_str,
-                                       new_file_content_str, file.filename, file.edit_type)
+                                       new_file_content_str, file.filename)
         if patch is None:
             if not deleted_files_list:
                 total_tokens += token_handler.count_tokens(DELETED_FILES_)
@@ -185,22 +179,17 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
         new_patch_tokens = token_handler.count_tokens(patch)
 
         # Hard Stop, no more tokens
-        if total_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD:
+        if total_tokens > MAX_TOKENS[model] - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD:
-            get_logger().warning(f"File was fully skipped, no more tokens: {file.filename}.")
+            logging.warning(f"File was fully skipped, no more tokens: {file.filename}.")
             continue
 
         # If the patch is too large, just show the file name
-        if total_tokens + new_patch_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
+        if total_tokens + new_patch_tokens > MAX_TOKENS[model] - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
             # Current logic is to skip the patch if it's too large
             # TODO: Option for alternative logic to remove hunks from the patch to reduce the number of tokens
             #  until we meet the requirements
             if get_settings().config.verbosity_level >= 2:
-                get_logger().warning(f"Patch too large, minimizing it, {file.filename}")
+                logging.warning(f"Patch too large, minimizing it, {file.filename}")
-            if file.edit_type == EDIT_TYPE.ADDED:
-                if not added_files_list:
-                    total_tokens += token_handler.count_tokens(ADDED_FILES_)
-                added_files_list.append(file.filename)
-            else:
             if not modified_files_list:
                 total_tokens += token_handler.count_tokens(MORE_MODIFIED_FILES_)
             modified_files_list.append(file.filename)
@@ -215,9 +204,9 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
             patches.append(patch_final)
             total_tokens += token_handler.count_tokens(patch_final)
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Tokens: {total_tokens}, last filename: {file.filename}")
+                logging.info(f"Tokens: {total_tokens}, last filename: {file.filename}")
 
-    return patches, modified_files_list, deleted_files_list, added_files_list
+    return patches, modified_files_list, deleted_files_list
 
 
 async def retry_with_fallback_models(f: Callable):
@@ -226,15 +215,10 @@ async def retry_with_fallback_models(f: Callable):
     # try each (model, deployment_id) pair until one is successful, otherwise raise exception
     for i, (model, deployment_id) in enumerate(zip(all_models, all_deployments)):
         try:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().debug(
-                    f"Generating prediction with {model}"
-                    f"{(' from deployment ' + deployment_id) if deployment_id else ''}"
-                )
             get_settings().set("openai.deployment_id", deployment_id)
             return await f(model)
         except Exception as e:
-            get_logger().warning(
+            logging.warning(
                 f"Failed to generate prediction with {model}"
                 f"{(' from deployment ' + deployment_id) if deployment_id else ''}: "
                 f"{traceback.format_exc()}"
@@ -269,44 +253,36 @@ def _get_all_deployments(all_models: List[str]) -> List[str]:
 
 def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
                                               relevant_file: str,
-                                              relevant_line_in_file: str,
+                                              relevant_line_in_file: str) -> Tuple[int, int]:
-                                              absolute_position: int = None) -> Tuple[int, int]:
+    """
+    Find the line number and absolute position of a relevant line in a file.
+
+    Args:
+        diff_files (List[FilePatchInfo]): A list of FilePatchInfo objects representing the patches of files.
+        relevant_file (str): The name of the file where the relevant line is located.
+        relevant_line_in_file (str): The content of the relevant line.
+
+    Returns:
+        Tuple[int, int]: A tuple containing the line number and absolute position of the relevant line in the file.
+    """
     position = -1
-    if absolute_position is None:
     absolute_position = -1
     re_hunk_header = re.compile(
         r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
 
     for file in diff_files:
-        if file.filename and (file.filename.strip() == relevant_file):
+        if file.filename.strip() == relevant_file:
             patch = file.patch
             patch_lines = patch.splitlines()
-            delta = 0
-            start1, size1, start2, size2 = 0, 0, 0, 0
-            if absolute_position != -1: # matching absolute to relative
-                for i, line in enumerate(patch_lines):
-                    # new hunk
-                    if line.startswith('@@'):
-                        delta = 0
-                        match = re_hunk_header.match(line)
-                        start1, size1, start2, size2 = map(int, match.groups()[:4])
-                    elif not line.startswith('-'):
-                        delta += 1
 
-                    #
-                    absolute_position_curr = start2 + delta - 1
-
-                    if absolute_position_curr == absolute_position:
-                        position = i
-                        break
-            else:
             # try to find the line in the patch using difflib, with some margin of error
             matches_difflib: list[str | Any] = difflib.get_close_matches(relevant_line_in_file,
                                                                          patch_lines, n=3, cutoff=0.93)
             if len(matches_difflib) == 1 and matches_difflib[0].startswith('+'):
                 relevant_line_in_file = matches_difflib[0]
 
-
+            delta = 0
+            start1, size1, start2, size2 = 0, 0, 0, 0
             for i, line in enumerate(patch_lines):
                 if line.startswith('@@'):
                     delta = 0
@@ -339,6 +315,35 @@ def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
     return position, absolute_position
 
 
+def clip_tokens(text: str, max_tokens: int) -> str:
+    """
+    Clip the number of tokens in a string to a maximum number of tokens.
+
+    Args:
+        text (str): The string to clip.
+        max_tokens (int): The maximum number of tokens allowed in the string.
+
+    Returns:
+        str: The clipped string.
+    """
+    if not text:
+        return text
+
+    try:
+        encoder = get_token_encoder()
+        num_input_tokens = len(encoder.encode(text))
+        if num_input_tokens <= max_tokens:
+            return text
+        num_chars = len(text)
+        chars_per_token = num_chars / num_input_tokens
+        num_output_chars = int(chars_per_token * max_tokens)
+        clipped_text = text[:num_output_chars]
+        return clipped_text
+    except Exception as e:
+        logging.warning(f"Failed to clip tokens: {e}")
+        return text
+
+
 def get_pr_multi_diffs(git_provider: GitProvider,
                        token_handler: TokenHandler,
                        model: str,
@@ -362,7 +367,7 @@ def get_pr_multi_diffs(git_provider: GitProvider,
     try:
         diff_files = git_provider.get_diff_files()
     except RateLimitExceededException as e:
-        get_logger().error(f"Rate limit exceeded for git provider API. original message {e}")
+        logging.error(f"Rate limit exceeded for git provider API. original message {e}")
         raise
 
     diff_files = filter_ignored(diff_files)
@@ -382,7 +387,7 @@ def get_pr_multi_diffs(git_provider: GitProvider,
     for file in sorted_files:
         if call_number > max_calls:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Reached max calls ({max_calls})")
+                logging.info(f"Reached max calls ({max_calls})")
             break
 
         original_file_content_str = file.base_file
@@ -392,26 +397,26 @@ def get_pr_multi_diffs(git_provider: GitProvider,
             continue
 
         # Remove delete-only hunks
-        patch = handle_patch_deletions(patch, original_file_content_str, new_file_content_str, file.filename, file.edit_type)
+        patch = handle_patch_deletions(patch, original_file_content_str, new_file_content_str, file.filename)
         if patch is None:
             continue
 
         patch = convert_to_hunks_with_lines_numbers(patch, file)
         new_patch_tokens = token_handler.count_tokens(patch)
-        if patch and (total_tokens + new_patch_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD):
+        if patch and (total_tokens + new_patch_tokens > MAX_TOKENS[model] - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD):
             final_diff = "\n".join(patches)
             final_diff_list.append(final_diff)
             patches = []
             total_tokens = token_handler.prompt_tokens
             call_number += 1
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Call number: {call_number}")
+                logging.info(f"Call number: {call_number}")
 
         if patch:
             patches.append(patch)
             total_tokens += new_patch_tokens
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Tokens: {total_tokens}, last filename: {file.filename}")
+                logging.info(f"Tokens: {total_tokens}, last filename: {file.filename}")
 
     # Add the last chunk
     if patches:

pr_agent/algo/utils.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import difflib
 import json
+import logging
 import re
 import textwrap
 from datetime import datetime
@@ -9,11 +10,7 @@ from typing import Any, List
 
 import yaml
 from starlette_context import context
-
-from pr_agent.algo import MAX_TOKENS
-from pr_agent.algo.token_handler import get_token_encoder
 from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.log import get_logger
 
 
 def get_setting(key: str) -> Any:
@@ -49,7 +46,7 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
     }
 
     for key, value in output_data.items():
-        if value is None or value == '' or value == {} or value == []:
+        if value is None or value == '' or value == {}:
             continue
         if isinstance(value, dict):
             markdown_text += f"## {key}\n\n"
@@ -58,15 +55,14 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
             emoji = emojis.get(key, "")
             if key.lower() == 'code feedback':
                 if gfm_supported:
-                    markdown_text += f"\n\n"
+                    markdown_text += f"\n\n- **<details><summary> { emoji } Code feedback:**</summary>\n\n"
-                    markdown_text += f"<details><summary> <strong>{ emoji } Code feedback:</strong></summary>"
                 else:
-                    markdown_text += f"\n\n**{emoji} Code feedback:**\n\n"
+                    markdown_text += f"\n\n- **{emoji} Code feedback:**\n\n"
             else:
                 markdown_text += f"- {emoji} **{key}:**\n\n"
-            for i, item in enumerate(value):
+            for item in value:
                 if isinstance(item, dict) and key.lower() == 'code feedback':
-                    markdown_text += parse_code_suggestion(item, i, gfm_supported)
+                    markdown_text += parse_code_suggestion(item, gfm_supported)
                 elif item:
                     markdown_text += f"  - {item}\n"
             if key.lower() == 'code feedback':
@@ -76,17 +72,11 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
                     markdown_text += "\n\n"
         elif value != 'n/a':
             emoji = emojis.get(key, "")
-            if key.lower() == 'general suggestions':
-                if gfm_supported:
-                    markdown_text += f"\n\n<strong>{emoji} General suggestions:</strong> {value}\n"
-                else:
-                    markdown_text += f"{emoji} **General suggestions:** {value}\n"
-            else:
             markdown_text += f"- {emoji} **{key}:** {value}\n"
     return markdown_text
 
 
-def parse_code_suggestion(code_suggestions: dict, i: int = 0, gfm_supported: bool = True) -> str:
+def parse_code_suggestion(code_suggestions: dict, gfm_supported: bool=True) -> str:
     """
     Convert a dictionary of data into markdown format.
 
@@ -97,35 +87,6 @@ def parse_code_suggestion(code_suggestions: dict, i: int = 0, gfm_supported: boo
         str: A string containing the markdown formatted text generated from the input dictionary.
     """
     markdown_text = ""
-    if gfm_supported and 'relevant line' in code_suggestions:
-        if i == 0:
-            markdown_text += "<hr>"
-        markdown_text += '<table>'
-        for sub_key, sub_value in code_suggestions.items():
-            try:
-                if sub_key.lower() == 'relevant file':
-                    relevant_file = sub_value.strip('`').strip('"').strip("'")
-                    markdown_text += f"<tr><td>{sub_key}</td><td>{relevant_file}</td></tr>"
-                    # continue
-                elif sub_key.lower() == 'suggestion':
-                    markdown_text += (f"<tr><td>{sub_key} &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</td>"
-                                      f"<td><br>\n\n**{sub_value.strip()}**\n<br></td></tr>")
-                elif sub_key.lower() == 'relevant line':
-                    markdown_text += f"<tr><td>relevant line</td>"
-                    sub_value_list = sub_value.split('](')
-                    relevant_line = sub_value_list[0].lstrip('`').lstrip('[')
-                    if len(sub_value_list) > 1:
-                        link = sub_value_list[1].rstrip(')').strip('`')
-                        markdown_text += f"<td><a href={link}>{relevant_line}</a></td>"
-                    else:
-                        markdown_text += f"<td>{relevant_line}</td>"
-                    markdown_text += "</tr>"
-            except Exception as e:
-                get_logger().exception(f"Failed to parse code suggestion: {e}")
-                pass
-        markdown_text += '</table>'
-        markdown_text += "<hr>"
-    else:
     for sub_key, sub_value in code_suggestions.items():
         if isinstance(sub_value, dict):  # "code example"
             markdown_text += f"  - **{sub_key}:**\n"
@@ -135,13 +96,12 @@ def parse_code_suggestion(code_suggestions: dict, i: int = 0, gfm_supported: boo
                 markdown_text += f"    - **{code_key}:**\n{code_str_indented}\n"
         else:
             if "relevant file" in sub_key.lower():
-                    markdown_text += f"\n  - **{sub_key}:** {sub_value}  \n"
+                markdown_text += f"\n  - **{sub_key}:** {sub_value}\n"
             else:
-                    markdown_text += f"   **{sub_key}:** {sub_value}  \n"
+                markdown_text += f"   **{sub_key}:** {sub_value}\n"
             if not gfm_supported:
                 if "relevant line" not in sub_key.lower(): # nicer presentation
-                        # markdown_text = markdown_text.rstrip('\n') + "\\\n" # works for gitlab
+                        markdown_text = markdown_text.rstrip('\n') + "\\\n"
-                        markdown_text = markdown_text.rstrip('\n') + "   \n"  # works for gitlab and bitbucker
 
     markdown_text += "\n"
     return markdown_text
@@ -199,7 +159,7 @@ def try_fix_json(review, max_iter=10, code_suggestions=False):
                 iter_count += 1
 
         if not valid_json:
-            get_logger().error("Unable to decode JSON response from AI")
+            logging.error("Unable to decode JSON response from AI")
             data = {}
 
     return data
@@ -270,7 +230,7 @@ def load_large_diff(filename, new_file_content_str: str, original_file_content_s
         diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
                                     new_file_content_str.splitlines(keepends=True))
         if get_settings().config.verbosity_level >= 2:
-            get_logger().warning(f"File was modified, but no patch was found. Manually creating patch: {filename}.")
+            logging.warning(f"File was modified, but no patch was found. Manually creating patch: {filename}.")
         patch = ''.join(diff)
     except Exception:
         pass
@@ -302,12 +262,12 @@ def update_settings_from_args(args: List[str]) -> List[str]:
                 vals = arg.split('=', 1)
                 if len(vals) != 2:
                     if len(vals) > 2: # --extended is a valid argument
-                        get_logger().error(f'Invalid argument format: {arg}')
+                        logging.error(f'Invalid argument format: {arg}')
                     other_args.append(arg)
                     continue
                 key, value = _fix_key_value(*vals)
                 get_settings().set(key, value)
-                get_logger().info(f'Updated setting {key} to: "{value}"')
+                logging.info(f'Updated setting {key} to: "{value}"')
             else:
                 other_args.append(arg)
     return other_args
@@ -319,159 +279,28 @@ def _fix_key_value(key: str, value: str):
     try:
         value = yaml.safe_load(value)
     except Exception as e:
-        get_logger().debug(f"Failed to parse YAML for config override {key}={value}", exc_info=e)
+        logging.error(f"Failed to parse YAML for config override {key}={value}", exc_info=e)
     return key, value
 
 
-def load_yaml(response_text: str, keys_fix_yaml: List[str] = []) -> dict:
+def load_yaml(review_text: str) -> dict:
-    response_text = response_text.removeprefix('```yaml').rstrip('`')
+    review_text = review_text.removeprefix('```yaml').rstrip('`')
     try:
-        data = yaml.safe_load(response_text)
+        data = yaml.safe_load(review_text)
     except Exception as e:
-        get_logger().error(f"Failed to parse AI prediction: {e}")
+        logging.error(f"Failed to parse AI prediction: {e}")
-        data = try_fix_yaml(response_text, keys_fix_yaml=keys_fix_yaml)
+        data = try_fix_yaml(review_text)
     return data
 
-
+def try_fix_yaml(review_text: str) -> dict:
-def try_fix_yaml(response_text: str, keys_fix_yaml: List[str] = []) -> dict:
+    review_text_lines = review_text.split('\n')
-    response_text_lines = response_text.split('\n')
-
-    keys = ['relevant line:', 'suggestion content:', 'relevant file:', 'existing code:', 'improved code:']
-    keys = keys + keys_fix_yaml
-    # first fallback - try to convert 'relevant line: ...' to relevant line: |-\n        ...'
-    response_text_lines_copy = response_text_lines.copy()
-    for i in range(0, len(response_text_lines_copy)):
-        for key in keys:
-            if key in response_text_lines_copy[i] and not '|-' in response_text_lines_copy[i]:
-                response_text_lines_copy[i] = response_text_lines_copy[i].replace(f'{key}',
-                                                                                  f'{key} |-\n        ')
-    try:
-        data = yaml.safe_load('\n'.join(response_text_lines_copy))
-        get_logger().info(f"Successfully parsed AI prediction after adding |-\n")
-        return data
-    except:
-        get_logger().info(f"Failed to parse AI prediction after adding |-\n")
-
-    # second fallback - try to extract only range from first ```yaml to ````
-    snippet_pattern = r'```(yaml)?[\s\S]*?```'
-    snippet = re.search(snippet_pattern, '\n'.join(response_text_lines_copy))
-    if snippet:
-        snippet_text = snippet.group()
-        try:
-            data = yaml.safe_load(snippet_text.removeprefix('```yaml').rstrip('`'))
-            get_logger().info(f"Successfully parsed AI prediction after extracting yaml snippet")
-            return data
-        except:
-            pass
-
-     # third fallback - try to remove leading and trailing curly brackets
-    response_text_copy = response_text.strip().rstrip().removeprefix('{').removesuffix('}')
-    try:
-        data = yaml.safe_load(response_text_copy,)
-        get_logger().info(f"Successfully parsed AI prediction after removing curly brackets")
-        return data
-    except:
-        pass
-
-    # fourth fallback - try to remove last lines
     data = {}
-    for i in range(1, len(response_text_lines)):
+    for i in range(1, len(review_text_lines)):
-        response_text_lines_tmp = '\n'.join(response_text_lines[:-i])
+        review_text_lines_tmp = '\n'.join(review_text_lines[:-i])
         try:
-            data = yaml.safe_load(response_text_lines_tmp,)
+            data = yaml.load(review_text_lines_tmp, Loader=yaml.SafeLoader)
-            get_logger().info(f"Successfully parsed AI prediction after removing {i} lines")
+            logging.info(f"Successfully parsed AI prediction after removing {i} lines")
-            return data
+            break
         except:
             pass
-
+    return data
-
-def set_custom_labels(variables, git_provider=None):
-    if not get_settings().config.enable_custom_labels:
-        return
-
-    labels = get_settings().custom_labels
-    if not labels:
-        # set default labels
-        labels = ['Bug fix', 'Tests', 'Bug fix with tests', 'Enhancement', 'Documentation', 'Other']
-        labels_list = "\n      - ".join(labels) if labels else ""
-        labels_list = f"      - {labels_list}" if labels_list else ""
-        variables["custom_labels"] = labels_list
-        return
-
-    # Set custom labels
-    variables["custom_labels_class"] = "class Label(str, Enum):"
-    counter = 0
-    labels_minimal_to_labels_dict = {}
-    for k, v in labels.items():
-        description = "'" + v['description'].strip('\n').replace('\n', '\\n') + "'"
-        # variables["custom_labels_class"] += f"\n    {k.lower().replace(' ', '_')} = '{k}' # {description}"
-        variables["custom_labels_class"] += f"\n    {k.lower().replace(' ', '_')} = {description}"
-        labels_minimal_to_labels_dict[k.lower().replace(' ', '_')] = k
-        counter += 1
-    variables["labels_minimal_to_labels_dict"] = labels_minimal_to_labels_dict
-
-def get_user_labels(current_labels: List[str] = None):
-    """
-    Only keep labels that has been added by the user
-    """
-    try:
-        if current_labels is None:
-            current_labels = []
-        user_labels = []
-        for label in current_labels:
-            if label.lower() in ['bug fix', 'tests', 'enhancement', 'documentation', 'other']:
-                continue
-            if get_settings().config.enable_custom_labels:
-                if label in get_settings().custom_labels:
-                    continue
-            user_labels.append(label)
-        if user_labels:
-            get_logger().info(f"Keeping user labels: {user_labels}")
-    except Exception as e:
-        get_logger().exception(f"Failed to get user labels: {e}")
-        return current_labels
-    return user_labels
-
-
-def get_max_tokens(model):
-    settings = get_settings()
-    if model in MAX_TOKENS:
-        max_tokens_model = MAX_TOKENS[model]
-    else:
-        raise Exception(f"MAX_TOKENS must be set for model {model} in ./pr_agent/algo/__init__.py")
-
-    if settings.config.max_model_tokens:
-        max_tokens_model = min(settings.config.max_model_tokens, max_tokens_model)
-        # get_logger().debug(f"limiting max tokens to {max_tokens_model}")
-    return max_tokens_model
-
-
-def clip_tokens(text: str, max_tokens: int, add_three_dots=True) -> str:
-    """
-    Clip the number of tokens in a string to a maximum number of tokens.
-
-    Args:
-        text (str): The string to clip.
-        max_tokens (int): The maximum number of tokens allowed in the string.
-        add_three_dots (bool, optional): A boolean indicating whether to add three dots at the end of the clipped
-    Returns:
-        str: The clipped string.
-    """
-    if not text:
-        return text
-
-    try:
-        encoder = get_token_encoder()
-        num_input_tokens = len(encoder.encode(text))
-        if num_input_tokens <= max_tokens:
-            return text
-        num_chars = len(text)
-        chars_per_token = num_chars / num_input_tokens
-        num_output_chars = int(chars_per_token * max_tokens)
-        clipped_text = text[:num_output_chars]
-        if add_three_dots:
-            clipped_text += "...(truncated)"
-        return clipped_text
-    except Exception as e:
-        get_logger().warning(f"Failed to clip tokens: {e}")
-        return text

pr_agent/cli.py

@@ -1,13 +1,10 @@
 import argparse
 import asyncio
+import logging
 import os
 
 from pr_agent.agent.pr_agent import PRAgent, commands
 from pr_agent.config_loader import get_settings
-from pr_agent.log import setup_logger
-
-setup_logger()
-
 
 
 def run(inargs=None):
@@ -23,22 +20,18 @@ For example:
 - cli.py --issue_url=... similar_issue
 
 Supported commands:
-- review / review_pr - Add a review that includes a summary of the PR and specific suggestions for improvement.
+-review / review_pr - Add a review that includes a summary of the PR and specific suggestions for improvement.
 
-- ask / ask_question [question] - Ask a question about the PR.
+-ask / ask_question [question] - Ask a question about the PR.
 
-- describe / describe_pr - Modify the PR title and description based on the PR's contents.
+-describe / describe_pr - Modify the PR title and description based on the PR's contents.
 
-- improve / improve_code - Suggest improvements to the code in the PR as pull request comments ready to commit.
+-improve / improve_code - Suggest improvements to the code in the PR as pull request comments ready to commit.
 Extended mode ('improve --extended') employs several calls, and provides a more thorough feedback
 
-- reflect - Ask the PR author questions about the PR.
+-reflect - Ask the PR author questions about the PR.
 
-- update_changelog - Update the changelog based on the PR's contents.
+-update_changelog - Update the changelog based on the PR's contents.
-
-- add_docs
-
-- generate_labels
 
 
 Configuration:
@@ -54,12 +47,13 @@ For example: 'python cli.py --pr_url=... review --pr_reviewer.extra_instructions
         parser.print_help()
         return
 
+    logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
     command = args.command.lower()
     get_settings().set("CONFIG.CLI_MODE", True)
     if args.issue_url:
-        result = asyncio.run(PRAgent().handle_request(args.issue_url, [command] + args.rest))
+        result = asyncio.run(PRAgent().handle_request(args.issue_url, command + " " + " ".join(args.rest)))
     else:
-        result = asyncio.run(PRAgent().handle_request(args.pr_url, [command] + args.rest))
+        result = asyncio.run(PRAgent().handle_request(args.pr_url, command + " " + " ".join(args.rest)))
     if not result:
         parser.print_help()
 

pr_agent/config_loader.py

@@ -23,10 +23,8 @@ global_settings = Dynaconf(
         "settings/pr_sort_code_suggestions_prompts.toml",
         "settings/pr_information_from_user_prompts.toml",
         "settings/pr_update_changelog_prompts.toml",
-        "settings/pr_custom_labels.toml",
         "settings/pr_add_docs.toml",
-        "settings_prod/.secrets.toml",
+        "settings_prod/.secrets.toml"
-        "settings/custom_labels.toml"
     ]]
 )
 

pr_agent/git_providers/__init__.py

@@ -1,6 +1,5 @@
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
-from pr_agent.git_providers.bitbucket_server_provider import BitbucketServerProvider
 from pr_agent.git_providers.codecommit_provider import CodeCommitProvider
 from pr_agent.git_providers.github_provider import GithubProvider
 from pr_agent.git_providers.gitlab_provider import GitLabProvider
@@ -13,7 +12,6 @@ _GIT_PROVIDERS = {
     'github': GithubProvider,
     'gitlab': GitLabProvider,
     'bitbucket': BitbucketProvider,
-    'bitbucket_server': BitbucketServerProvider,
     'azure': AzureDevopsProvider,
     'codecommit': CodeCommitProvider,
     'local' : LocalGitProvider,

pr_agent/git_providers/azuredevops_provider.py

@@ -1,147 +1,29 @@
-import os
+import json
+import logging
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 
-from ..log import get_logger
+import os
 
 AZURE_DEVOPS_AVAILABLE = True
 try:
     from msrest.authentication import BasicAuthentication
     from azure.devops.connection import Connection
-    from azure.devops.v7_1.git.models import (
+    from azure.devops.v7_1.git.models import Comment, CommentThread, GitVersionDescriptor, GitPullRequest
-        Comment,
+except ImportError:
-        CommentThread,
-        GitVersionDescriptor,
-        GitPullRequest,
-    )
-except ImportError as e:
     AZURE_DEVOPS_AVAILABLE = False
 
-from ..algo.language_handler import is_valid_file
+from ..algo.pr_processing import clip_tokens
-from ..algo.utils import clip_tokens, load_large_diff
 from ..config_loader import get_settings
-from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
+from ..algo.utils import load_large_diff
+from ..algo.language_handler import is_valid_file
+from .git_provider import EDIT_TYPE, FilePatchInfo
 
 
-class AzureDevopsProvider(GitProvider):
+class AzureDevopsProvider:
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
+    def __init__(self, pr_url: Optional[str] = None, incremental: Optional[bool] = False):
-        """
-        Publishes code suggestions as comments on the PR.
-        """
-        post_parameters_list = []
-        for suggestion in code_suggestions:
-            body = suggestion['body']
-            relevant_file = suggestion['relevant_file']
-            relevant_lines_start = suggestion['relevant_lines_start']
-            relevant_lines_end = suggestion['relevant_lines_end']
-
-            if not relevant_lines_start or relevant_lines_start == -1:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
-                        f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
-                continue
-
-            if relevant_lines_end < relevant_lines_start:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(f"Failed to publish code suggestion, "
-                                           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:
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_end,
-                    "start_line": relevant_lines_start,
-                    "start_side": "RIGHT",
-                }
-            else:  # API is different for single line comments
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_start,
-                    "side": "RIGHT",
-                }
-            post_parameters_list.append(post_parameters)
-
-        try:
-            for post_parameters in post_parameters_list:
-                comment = Comment(content=post_parameters["body"], comment_type=1)
-                thread = CommentThread(comments=[comment],
-                                       thread_context={
-                                           "filePath": post_parameters["path"],
-                                           "rightFileStart": {
-                                               "line": post_parameters["start_line"],
-                                               "offset": 1,
-                                           },
-                                           "rightFileEnd": {
-                                               "line": post_parameters["line"],
-                                               "offset": 1,
-                                           },
-                                       })
-                self.azure_devops_client.create_thread(
-                    comment_thread=thread,
-                    project=self.workspace_slug,
-                    repository_id=self.repo_slug,
-                    pull_request_id=self.pr_num
-                )
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(
-                        f"Published code suggestion on {self.pr_num} at {post_parameters['path']}"
-                    )
-            return True
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().error(f"Failed to publish code suggestion, error: {e}")
-            return False
-
-    def get_pr_description_full(self) -> str:
-        pass
-
-    def remove_comment(self, comment):
-        try:
-            self.azure_devops_client.delete_comment(
-                repository_id=self.repo_slug,
-                pull_request_id=self.pr_num,
-                thread_id=comment["thread_id"],
-                comment_id=comment["comment_id"],
-                project=self.workspace_slug,
-            )
-        except Exception as e:
-            get_logger().exception(f"Failed to remove comment, error: {e}")
-
-    def publish_labels(self, pr_types):
-        try:
-            for pr_type in pr_types:
-                self.azure_devops_client.create_pull_request_label(
-                    label={"name": pr_type},
-                    project=self.workspace_slug,
-                    repository_id=self.repo_slug,
-                    pull_request_id=self.pr_num,
-                )
-        except Exception as e:
-            get_logger().exception(f"Failed to publish labels, error: {e}")
-
-    def get_pr_labels(self):
-        try:
-            labels = self.azure_devops_client.get_pull_request_labels(
-                project=self.workspace_slug,
-                repository_id=self.repo_slug,
-                pull_request_id=self.pr_num,
-            )
-            return [label.name for label in labels]
-        except Exception as e:
-            get_logger().exception(f"Failed to get labels, error: {e}")
-            return []
-
-    def __init__(
-            self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
-    ):
         if not AZURE_DEVOPS_AVAILABLE:
-            raise ImportError(
+            raise ImportError("Azure DevOps provider is not available. Please install the required dependencies.")
-                "Azure DevOps provider is not available. Please install the required dependencies."
-            )
 
         self.azure_devops_client = self._get_azure_devops_client()
 
@@ -156,11 +38,8 @@ class AzureDevopsProvider(GitProvider):
             self.set_pr(pr_url)
 
     def is_supported(self, capability: str) -> bool:
-        if capability in [
+        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments', 'get_labels',
-            "get_issue_comments",
+                          'remove_initial_comment', 'gfm_markdown']:
-            "create_inline_comment",
-            "publish_inline_comments",
-        ]:
             return False
         return True
 
@@ -170,34 +49,26 @@ class AzureDevopsProvider(GitProvider):
 
     def get_repo_settings(self):
         try:
-            contents = self.azure_devops_client.get_item_content(
+            contents = self.azure_devops_client.get_item_content(repository_id=self.repo_slug,
-                repository_id=self.repo_slug,
+                                                                 project=self.workspace_slug, download=False,
-                project=self.workspace_slug,
+                                                                 include_content_metadata=False, include_content=True,
-                download=False,
+                                                                 path=".pr_agent.toml")
-                include_content_metadata=False,
-                include_content=True,
-                path=".pr_agent.toml",
-            )
             return contents
         except Exception as e:
-            get_logger().exception("get repo settings error")
+            logging.exception("get repo settings error")
             return ""
 
     def get_files(self):
         files = []
-        for i in self.azure_devops_client.get_pull_request_commits(
+        for i in self.azure_devops_client.get_pull_request_commits(project=self.workspace_slug,
-                project=self.workspace_slug,
                                                                    repository_id=self.repo_slug,
-                pull_request_id=self.pr_num,
+                                                                   pull_request_id=self.pr_num):
-        ):
+
-            changes_obj = self.azure_devops_client.get_changes(
+            changes_obj = self.azure_devops_client.get_changes(project=self.workspace_slug,
-                project=self.workspace_slug,
+                                                               repository_id=self.repo_slug, commit_id=i.commit_id)
-                repository_id=self.repo_slug,
-                commit_id=i.commit_id,
-            )
 
             for c in changes_obj.changes:
-                files.append(c["item"]["path"])
+                files.append(c['item']['path'])
         return list(set(files))
 
     def get_diff_files(self) -> list[FilePatchInfo]:
@@ -205,27 +76,22 @@ class AzureDevopsProvider(GitProvider):
             base_sha = self.pr.last_merge_target_commit
             head_sha = self.pr.last_merge_source_commit
 
-            commits = self.azure_devops_client.get_pull_request_commits(
+            commits = self.azure_devops_client.get_pull_request_commits(project=self.workspace_slug,
-                project=self.workspace_slug,
                                                                         repository_id=self.repo_slug,
-                pull_request_id=self.pr_num,
+                                                                        pull_request_id=self.pr_num)
-            )
 
             diff_files = []
             diffs = []
             diff_types = {}
 
             for c in commits:
-                changes_obj = self.azure_devops_client.get_changes(
+                changes_obj = self.azure_devops_client.get_changes(project=self.workspace_slug,
-                    project=self.workspace_slug,
+                                                                   repository_id=self.repo_slug, commit_id=c.commit_id)
-                    repository_id=self.repo_slug,
-                    commit_id=c.commit_id,
-                )
                 for i in changes_obj.changes:
-                    if i["item"]["gitObjectType"] == "tree":
+                    if(i['item']['gitObjectType'] == 'tree'):
                         continue
-                    diffs.append(i["item"]["path"])
+                    diffs.append(i['item']['path'])
-                    diff_types[i["item"]["path"]] = i["changeType"]
+                    diff_types[i['item']['path']] = i['changeType']
 
             diffs = list(set(diffs))
 
@@ -233,72 +99,47 @@ class AzureDevopsProvider(GitProvider):
                 if not is_valid_file(file):
                     continue
 
-                version = GitVersionDescriptor(
+                version = GitVersionDescriptor(version=head_sha.commit_id, version_type='commit')
-                    version=head_sha.commit_id, version_type="commit"
-                )
                 try:
-                    new_file_content_str = self.azure_devops_client.get_item(
+                    new_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
-                        repository_id=self.repo_slug,
                                                                             path=file,
                                                                             project=self.workspace_slug,
                                                                             version_descriptor=version,
                                                                             download=False,
-                        include_content=True,
+                                                                            include_content=True)
-                    )
 
                     new_file_content_str = new_file_content_str.content
                 except Exception as error:
-                    get_logger().error(
+                    logging.error("Failed to retrieve new file content of %s at version %s. Error: %s", file, version, str(error))
-                        "Failed to retrieve new file content of %s at version %s. Error: %s",
-                        file,
-                        version,
-                        str(error),
-                    )
                     new_file_content_str = ""
 
                 edit_type = EDIT_TYPE.MODIFIED
-                if diff_types[file] == "add":
+                if diff_types[file] == 'add':
                     edit_type = EDIT_TYPE.ADDED
-                elif diff_types[file] == "delete":
+                elif diff_types[file] == 'delete':
                     edit_type = EDIT_TYPE.DELETED
-                elif diff_types[file] == "rename":
+                elif diff_types[file] == 'rename':
                     edit_type = EDIT_TYPE.RENAMED
 
-                version = GitVersionDescriptor(
+                version = GitVersionDescriptor(version=base_sha.commit_id, version_type='commit')
-                    version=base_sha.commit_id, version_type="commit"
-                )
                 try:
-                    original_file_content_str = self.azure_devops_client.get_item(
+                    original_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
-                        repository_id=self.repo_slug,
                                                                               path=file,
                                                                               project=self.workspace_slug,
                                                                               version_descriptor=version,
                                                                               download=False,
-                        include_content=True,
+                                                                              include_content=True)
-                    )
                     original_file_content_str = original_file_content_str.content
                 except Exception as error:
-                    get_logger().error(
+                    logging.error("Failed to retrieve original file content of %s at version %s. Error: %s", file, version, str(error))
-                        "Failed to retrieve original file content of %s at version %s. Error: %s",
-                        file,
-                        version,
-                        str(error),
-                    )
                     original_file_content_str = ""
 
-                patch = load_large_diff(
+                patch = load_large_diff(file, new_file_content_str, original_file_content_str)
-                    file, new_file_content_str, original_file_content_str
-                )
 
-                diff_files.append(
+                diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str,
-                    FilePatchInfo(
-                        original_file_content_str,
-                        new_file_content_str,
                                                 patch=patch,
                                                 filename=file,
-                        edit_type=edit_type,
+                                                edit_type=edit_type))
-                    )
-                )
 
             self.diff_files = diff_files
             return diff_files
@@ -309,92 +150,67 @@ class AzureDevopsProvider(GitProvider):
     def publish_comment(self, pr_comment: str, is_temporary: bool = False):
         comment = Comment(content=pr_comment)
         thread = CommentThread(comments=[comment])
-        thread_response = self.azure_devops_client.create_thread(
+        thread_response = self.azure_devops_client.create_thread(comment_thread=thread, project=self.workspace_slug,
-            comment_thread=thread,
-            project=self.workspace_slug,
                                                                  repository_id=self.repo_slug,
-            pull_request_id=self.pr_num,
+                                                                 pull_request_id=self.pr_num)
-        )
         if is_temporary:
-            self.temp_comments.append(
+            self.temp_comments.append({'thread_id': thread_response.id, 'comment_id': comment.id})
-                {"thread_id": thread_response.id, "comment_id": thread_response.comments[0].id}
-            )
 
     def publish_description(self, pr_title: str, pr_body: str):
         try:
             updated_pr = GitPullRequest()
             updated_pr.title = pr_title
             updated_pr.description = pr_body
-            self.azure_devops_client.update_pull_request(
+            self.azure_devops_client.update_pull_request(project=self.workspace_slug,
-                project=self.workspace_slug,
                                                          repository_id=self.repo_slug,
                                                          pull_request_id=self.pr_num,
-                git_pull_request_to_update=updated_pr,
+                                                         git_pull_request_to_update=updated_pr)
-            )
         except Exception as e:
-            get_logger().exception(
+            logging.exception(f"Could not update pull request {self.pr_num} description: {e}")
-                f"Could not update pull request {self.pr_num} description: {e}"
-            )
 
     def remove_initial_comment(self):
-        try:
+        return ""  # not implemented yet
-            for comment in self.temp_comments:
-                self.remove_comment(comment)
-        except Exception as e:
-            get_logger().exception(f"Failed to remove temp comments, error: {e}")
 
-    def publish_inline_comment(
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-            self, body: str, relevant_file: str, relevant_line_in_file: str
+        raise NotImplementedError("Azure DevOps provider does not support publishing inline comment yet")
-    ):
+
-        raise NotImplementedError(
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-            "Azure DevOps provider does not support publishing inline comment yet"
+        raise NotImplementedError("Azure DevOps provider does not support creating inline comments yet")
-        )
 
     def publish_inline_comments(self, comments: list[dict]):
-        raise NotImplementedError(
+        raise NotImplementedError("Azure DevOps provider does not support publishing inline comments yet")
-            "Azure DevOps provider does not support publishing inline comments yet"
-        )
 
     def get_title(self):
         return self.pr.title
 
     def get_languages(self):
         languages = []
-        files = self.azure_devops_client.get_items(
+        files = self.azure_devops_client.get_items(project=self.workspace_slug, repository_id=self.repo_slug,
-            project=self.workspace_slug,
+                                                   recursion_level="Full", include_content_metadata=True,
-            repository_id=self.repo_slug,
+                                                   include_links=False, download=False)
-            recursion_level="Full",
-            include_content_metadata=True,
-            include_links=False,
-            download=False,
-        )
         for f in files:
-            if f.git_object_type == "blob":
+            if f.git_object_type == 'blob':
                 file_name, file_extension = os.path.splitext(f.path)
                 languages.append(file_extension[1:])
 
         extension_counts = {}
         for ext in languages:
-            if ext != "":
+            if ext != '':
                 extension_counts[ext] = extension_counts.get(ext, 0) + 1
 
         total_extensions = sum(extension_counts.values())
 
-        extension_percentages = {
+        extension_percentages = {ext: (count / total_extensions) * 100 for ext, count in extension_counts.items()}
-            ext: (count / total_extensions) * 100
-            for ext, count in extension_counts.items()
-        }
 
         return extension_percentages
 
     def get_pr_branch(self):
-        pr_info = self.azure_devops_client.get_pull_request_by_id(
+        pr_info = self.azure_devops_client.get_pull_request_by_id(project=self.workspace_slug,
-            project=self.workspace_slug, pull_request_id=self.pr_num
+                                                                  pull_request_id=self.pr_num)
-        )
+        source_branch = pr_info.source_ref_name.split('/')[-1]
-        source_branch = pr_info.source_ref_name.split("/")[-1]
         return source_branch
 
-    def get_pr_description(self, full=False):
+    def get_pr_description(self):
         max_tokens = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
         if max_tokens:
             return clip_tokens(self.pr.description, max_tokens)
@@ -404,9 +220,7 @@ class AzureDevopsProvider(GitProvider):
         return 0
 
     def get_issue_comments(self):
-        raise NotImplementedError(
+        raise NotImplementedError("Azure DevOps provider does not support issue comments yet")
-            "Azure DevOps provider does not support issue comments yet"
-        )
 
     def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
         return True
@@ -415,20 +229,19 @@ class AzureDevopsProvider(GitProvider):
         return True
 
     def get_issue_comments(self):
-        raise NotImplementedError(
+        raise NotImplementedError("Azure DevOps provider does not support issue comments yet")
-            "Azure DevOps provider does not support issue comments yet"
-        )
 
     @staticmethod
     def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
         parsed_url = urlparse(pr_url)
 
-        path_parts = parsed_url.path.strip("/").split("/")
+        if 'azure.com' not in parsed_url.netloc:
+            raise ValueError("The provided URL is not a valid Azure DevOps URL")
 
-        if len(path_parts) < 6 or path_parts[4] != "pullrequest":
+        path_parts = parsed_url.path.strip('/').split('/')
-            raise ValueError(
+
-                "The provided URL does not appear to be a Azure DevOps PR URL"
+        if len(path_parts) < 6 or path_parts[4] != 'pullrequest':
-            )
+            raise ValueError("The provided URL does not appear to be a Azure DevOps PR URL")
 
         workspace_slug = path_parts[1]
         repo_slug = path_parts[3]
@@ -444,9 +257,10 @@ class AzureDevopsProvider(GitProvider):
             pat = get_settings().azure_devops.pat
             org = get_settings().azure_devops.org
         except AttributeError as e:
-            raise ValueError("Azure DevOps PAT token is required ") from e
+            raise ValueError(
+                "Azure DevOps PAT token is required ") from e
 
-        credentials = BasicAuthentication("", pat)
+        credentials = BasicAuthentication('', pat)
         azure_devops_connection = Connection(base_url=org, creds=credentials)
         azure_devops_client = azure_devops_connection.clients.get_git_client()
 
@@ -454,23 +268,13 @@ class AzureDevopsProvider(GitProvider):
 
     def _get_repo(self):
         if self.repo is None:
-            self.repo = self.azure_devops_client.get_repository(
+            self.repo = self.azure_devops_client.get_repository(project=self.workspace_slug,
-                project=self.workspace_slug, repository_id=self.repo_slug
+                                                                repository_id=self.repo_slug)
-            )
         return self.repo
 
     def _get_pr(self):
-        self.pr = self.azure_devops_client.get_pull_request_by_id(
+        self.pr = self.azure_devops_client.get_pull_request_by_id(pull_request_id=self.pr_num, project=self.workspace_slug)
-            pull_request_id=self.pr_num, project=self.workspace_slug
-        )
         return self.pr
 
     def get_commit_messages(self):
         return ""  # not implemented yet
-
-    def get_pr_id(self):
-        try:
-            pr_id = f"{self.workspace_slug}/{self.repo_slug}/{self.pr_num}"
-            return pr_id
-        except Exception:
-            return ""

pr_agent/git_providers/bitbucket_provider.py

@@ -1,4 +1,5 @@
 import json
+import logging
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 
@@ -6,10 +7,9 @@ import requests
 from atlassian.bitbucket import Cloud
 from starlette_context import context
 
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
+from ..algo.pr_processing import clip_tokens, find_line_number_of_relevant_line_in_file
 from ..config_loader import get_settings
-from ..log import get_logger
+from .git_provider import FilePatchInfo, GitProvider
-from .git_provider import FilePatchInfo, GitProvider, EDIT_TYPE
 
 
 class BitbucketProvider(GitProvider):
@@ -32,10 +32,8 @@ class BitbucketProvider(GitProvider):
         self.repo = None
         self.pr_num = None
         self.pr = None
-        self.pr_url = pr_url
         self.temp_comments = []
         self.incremental = incremental
-        self.diff_files = None
         if pr_url:
             self.set_pr(pr_url)
         self.bitbucket_comment_api_url = self.pr._BitbucketBase__data["links"]["comments"]["href"]
@@ -43,12 +41,9 @@ class BitbucketProvider(GitProvider):
 
     def get_repo_settings(self):
         try:
-            url = (f"https://api.bitbucket.org/2.0/repositories/{self.workspace_slug}/{self.repo_slug}/src/"
+            contents = self.repo_obj.get_contents(
-                   f"{self.pr.destination_branch}/.pr_agent.toml")
+                ".pr_agent.toml", ref=self.pr.head.sha
-            response = requests.request("GET", url, headers=self.headers)
+            ).decoded_content
-            if response.status_code == 404:  # not found
-                return ""
-            contents = response.text.encode('utf-8')
             return contents
         except Exception:
             return ""
@@ -66,14 +61,14 @@ class BitbucketProvider(GitProvider):
 
             if not relevant_lines_start or relevant_lines_start == -1:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
+                    logging.exception(
                         f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}"
                     )
                 continue
 
             if relevant_lines_end < relevant_lines_start:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
+                    logging.exception(
                         f"Failed to publish code suggestion, "
                         f"relevant_lines_end is {relevant_lines_end} and "
                         f"relevant_lines_start is {relevant_lines_start}"
@@ -102,7 +97,7 @@ class BitbucketProvider(GitProvider):
             return True
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().error(f"Failed to publish code suggestion, error: {e}")
+                logging.error(f"Failed to publish code suggestion, error: {e}")
             return False
 
     def is_supported(self, capability: str) -> bool:
@@ -118,9 +113,6 @@ class BitbucketProvider(GitProvider):
         return [diff.new.path for diff in self.pr.diffstat()]
 
     def get_diff_files(self) -> list[FilePatchInfo]:
-        if self.diff_files:
-            return self.diff_files
-
         diffs = self.pr.diffstat()
         diff_split = [
             "diff --git%s" % x for x in self.pr.diff().split("diff --git") if x.strip()
@@ -132,56 +124,16 @@ class BitbucketProvider(GitProvider):
                 diff.old.get_data("links")
             )
             new_file_content_str = self._get_pr_file_content(diff.new.get_data("links"))
-            file_patch_canonic_structure = FilePatchInfo(
+            diff_files.append(
+                FilePatchInfo(
                     original_file_content_str,
                     new_file_content_str,
                     diff_split[index],
                     diff.new.path,
                 )
-
+            )
-            if diff.data['status'] == 'added':
-                file_patch_canonic_structure.edit_type = EDIT_TYPE.ADDED
-            elif diff.data['status'] == 'removed':
-                file_patch_canonic_structure.edit_type = EDIT_TYPE.DELETED
-            elif diff.data['status'] == 'modified':
-                file_patch_canonic_structure.edit_type = EDIT_TYPE.MODIFIED
-            elif diff.data['status'] == 'renamed':
-                file_patch_canonic_structure.edit_type = EDIT_TYPE.RENAMED
-            diff_files.append(file_patch_canonic_structure)
-
-
-        self.diff_files = diff_files
         return diff_files
 
-    def get_latest_commit_url(self):
-        return self.pr.data['source']['commit']['links']['html']['href']
-
-    def get_comment_url(self, comment):
-        return comment.data['links']['html']['href']
-
-    def publish_persistent_comment(self, pr_comment: str, initial_header: str, update_header: bool = True):
-        try:
-            for comment in self.pr.comments():
-                body = comment.raw
-                if initial_header in body:
-                    latest_commit_url = self.get_latest_commit_url()
-                    comment_url = self.get_comment_url(comment)
-                    if update_header:
-                        updated_header = f"{initial_header}\n\n### (review updated until commit {latest_commit_url})\n"
-                        pr_comment_updated = pr_comment.replace(initial_header, updated_header)
-                    else:
-                        pr_comment_updated = pr_comment
-                    get_logger().info(f"Persistent mode- updating comment {comment_url} to latest review message")
-                    d = {"content": {"raw": pr_comment_updated}}
-                    response = comment._update_data(comment.put(None, data=d))
-                    self.publish_comment(
-                        f"**[Persistent review]({comment_url})** updated to latest commit {latest_commit_url}")
-                    return
-        except Exception as e:
-            get_logger().exception(f"Failed to update persistent review, error: {e}")
-            pass
-        self.publish_comment(pr_comment)
-
     def publish_comment(self, pr_comment: str, is_temporary: bool = False):
         comment = self.pr.comment(pr_comment)
         if is_temporary:
@@ -190,24 +142,17 @@ class BitbucketProvider(GitProvider):
     def remove_initial_comment(self):
         try:
             for comment in self.temp_comments:
-                self.remove_comment(comment)
-        except Exception as e:
-            get_logger().exception(f"Failed to remove temp comments, error: {e}")
-
-    def remove_comment(self, comment):
-        try:
                 self.pr.delete(f"comments/{comment}")
         except Exception as e:
-            get_logger().exception(f"Failed to remove comment, error: {e}")
+            logging.exception(f"Failed to remove temp comments, error: {e}")
+
 
     # funtion to create_inline_comment
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, absolute_position: int = None):
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        position, absolute_position = find_line_number_of_relevant_line_in_file(self.get_diff_files(),
+        position, absolute_position = find_line_number_of_relevant_line_in_file(self.get_diff_files(), relevant_file.strip('`'), relevant_line_in_file)
-                                                                            relevant_file.strip('`'),
-                                                                            relevant_line_in_file, absolute_position)
         if position == -1:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
+                logging.info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
             subject_type = "FILE"
         else:
             subject_type = "LINE"
@@ -230,44 +175,9 @@ class BitbucketProvider(GitProvider):
         )
         return response
 
-    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
-        if relevant_line_start == -1:
-            link = f"{self.pr_url}/#L{relevant_file}"
-        else:
-            link = f"{self.pr_url}/#L{relevant_file}T{relevant_line_start}"
-        return link
-
-    def generate_link_to_relevant_line_number(self, suggestion) -> str:
-        try:
-            relevant_file = suggestion['relevant file'].strip('`').strip("'")
-            relevant_line_str = suggestion['relevant line']
-            if not relevant_line_str:
-                return ""
-
-            diff_files = self.get_diff_files()
-            position, absolute_position = find_line_number_of_relevant_line_in_file \
-                (diff_files, relevant_file, relevant_line_str)
-
-            if absolute_position != -1 and self.pr_url:
-                link = f"{self.pr_url}/#L{relevant_file}T{absolute_position}"
-                return link
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Failed adding line link, error: {e}")
-
-        return ""
-
     def publish_inline_comments(self, comments: list[dict]):
         for comment in comments:
-            if 'position' in comment:
-                self.publish_inline_comment(comment['body'], comment['position'], comment['path'])
-            elif 'start_line' in comment: # multi-line comment
-                # note that bitbucket does not seem to support range - only a comment on a single line - https://community.developer.atlassian.com/t/api-post-endpoint-for-inline-pull-request-comments/60452
             self.publish_inline_comment(comment['body'], comment['start_line'], comment['path'])
-            elif 'line' in comment: # single-line comment
-                self.publish_inline_comment(comment['body'], comment['line'], comment['path'])
-            else:
-                get_logger().error(f"Could not publish inline comment {comment}")
 
     def get_title(self):
         return self.pr.title
@@ -344,11 +254,6 @@ class BitbucketProvider(GitProvider):
             })
 
         response = requests.request("PUT", self.bitbucket_pull_request_api_url, headers=self.headers, data=payload)
-        try:
-            if response.status_code != 200:
-                get_logger().info(f"Failed to update description, error code: {response.status_code}")
-        except:
-            pass
         return response
 
     # bitbucket does not support labels
@@ -356,5 +261,5 @@ class BitbucketProvider(GitProvider):
         pass
     
     # bitbucket does not support labels
-    def get_pr_labels(self):
+    def get_labels(self):
         pass

pr_agent/git_providers/bitbucket_server_provider.py

@@ -1,354 +0,0 @@
-import json
-from typing import Optional, Tuple
-from urllib.parse import urlparse
-
-import requests
-from atlassian.bitbucket import Bitbucket
-from starlette_context import context
-
-from .git_provider import FilePatchInfo, GitProvider, EDIT_TYPE
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
-from ..algo.utils import load_large_diff
-from ..config_loader import get_settings
-from ..log import get_logger
-
-
-class BitbucketServerProvider(GitProvider):
-    def __init__(
-        self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
-    ):
-        s = requests.Session()
-        try:
-            bearer = context.get("bitbucket_bearer_token", None)
-            s.headers["Authorization"] = f"Bearer {bearer}"
-        except Exception:
-            s.headers[
-                "Authorization"
-            ] = f'Bearer {get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", None)}'
-
-        s.headers["Content-Type"] = "application/json"
-        self.headers = s.headers
-        self.bitbucket_server_url = None
-        self.workspace_slug = None
-        self.repo_slug = None
-        self.repo = None
-        self.pr_num = None
-        self.pr = None
-        self.pr_url = pr_url
-        self.temp_comments = []
-        self.incremental = incremental
-        self.diff_files = None
-        self.bitbucket_pull_request_api_url = pr_url
-
-        self.bitbucket_server_url = self._parse_bitbucket_server(url=pr_url)
-        self.bitbucket_client = Bitbucket(url=self.bitbucket_server_url,
-                                          token=get_settings().get("BITBUCKET_SERVER.BEARER_TOKEN", None))
-
-        if pr_url:
-            self.set_pr(pr_url)
-
-    def get_repo_settings(self):
-        try:
-            url = (f"{self.bitbucket_server_url}/projects/{self.workspace_slug}/repos/{self.repo_slug}/src/"
-                   f"{self.pr.destination_branch}/.pr_agent.toml")
-            response = requests.request("GET", url, headers=self.headers)
-            if response.status_code == 404:  # not found
-                return ""
-            contents = response.text.encode('utf-8')
-            return contents
-        except Exception:
-            return ""
-
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
-        """
-        Publishes code suggestions as comments on the PR.
-        """
-        post_parameters_list = []
-        for suggestion in code_suggestions:
-            body = suggestion["body"]
-            relevant_file = suggestion["relevant_file"]
-            relevant_lines_start = suggestion["relevant_lines_start"]
-            relevant_lines_end = suggestion["relevant_lines_end"]
-
-            if not relevant_lines_start or relevant_lines_start == -1:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
-                        f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}"
-                    )
-                continue
-
-            if relevant_lines_end < relevant_lines_start:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
-                        f"Failed to publish code suggestion, "
-                        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:
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_end,
-                    "start_line": relevant_lines_start,
-                    "start_side": "RIGHT",
-                }
-            else:  # API is different for single line comments
-                post_parameters = {
-                    "body": body,
-                    "path": relevant_file,
-                    "line": relevant_lines_start,
-                    "side": "RIGHT",
-                }
-            post_parameters_list.append(post_parameters)
-
-        try:
-            self.publish_inline_comments(post_parameters_list)
-            return True
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().error(f"Failed to publish code suggestion, error: {e}")
-            return False
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'get_labels', 'gfm_markdown']:
-            return False
-        return True
-
-    def set_pr(self, pr_url: str):
-        self.workspace_slug, self.repo_slug, self.pr_num = self._parse_pr_url(pr_url)
-        self.pr = self._get_pr()
-
-    def get_file(self, path: str, commit_id: str):
-        file_content = ""
-        try:
-            file_content = self.bitbucket_client.get_content_of_file(self.workspace_slug,
-                                                                     self.repo_slug,
-                                                                     path,
-                                                                     commit_id)
-        except requests.HTTPError as e:
-            get_logger().debug(f"File {path} not found at commit id: {commit_id}")
-        return file_content
-
-    def get_files(self):
-        changes = self.bitbucket_client.get_pull_requests_changes(self.workspace_slug, self.repo_slug, self.pr_num)
-        diffstat = [change["path"]['toString'] for change in changes]
-        return diffstat
-
-    def get_diff_files(self) -> list[FilePatchInfo]:
-        if self.diff_files:
-            return self.diff_files
-
-        commits_in_pr = self.bitbucket_client.get_pull_requests_commits(
-            self.workspace_slug,
-            self.repo_slug,
-            self.pr_num
-        )
-
-        commit_list = list(commits_in_pr)
-        base_sha, head_sha = commit_list[0]['parents'][0]['id'], commit_list[-1]['id']
-
-        diff_files = []
-        original_file_content_str = ""
-        new_file_content_str = ""
-
-        changes = self.bitbucket_client.get_pull_requests_changes(self.workspace_slug, self.repo_slug, self.pr_num)
-        for change in changes:
-            file_path = change['path']['toString']
-            match change['type']:
-                case 'ADD':
-                    edit_type = EDIT_TYPE.ADDED
-                    new_file_content_str = self.get_file(file_path, head_sha)
-                    if isinstance(new_file_content_str, (bytes, bytearray)):
-                        new_file_content_str = new_file_content_str.decode("utf-8")
-                    original_file_content_str = ""
-                case 'DELETE':
-                    edit_type = EDIT_TYPE.DELETED
-                    new_file_content_str = ""
-                    original_file_content_str = self.get_file(file_path, base_sha)
-                    if isinstance(original_file_content_str, (bytes, bytearray)):
-                        original_file_content_str = original_file_content_str.decode("utf-8")
-                case 'RENAME':
-                    edit_type = EDIT_TYPE.RENAMED
-                case _:
-                    edit_type = EDIT_TYPE.MODIFIED
-                    original_file_content_str = self.get_file(file_path, base_sha)
-                    if isinstance(original_file_content_str, (bytes, bytearray)):
-                        original_file_content_str = original_file_content_str.decode("utf-8")
-                    new_file_content_str = self.get_file(file_path, head_sha)
-                    if isinstance(new_file_content_str, (bytes, bytearray)):
-                        new_file_content_str = new_file_content_str.decode("utf-8")
-
-            patch = load_large_diff(file_path, new_file_content_str, original_file_content_str)
-
-            diff_files.append(
-                FilePatchInfo(
-                    original_file_content_str,
-                    new_file_content_str,
-                    patch,
-                    file_path,
-                    edit_type=edit_type,
-                )
-            )
-
-        self.diff_files = diff_files
-        return diff_files
-
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        if not is_temporary:
-            self.bitbucket_client.add_pull_request_comment(self.workspace_slug, self.repo_slug, self.pr_num, pr_comment)
-
-    def remove_initial_comment(self):
-        try:
-            for comment in self.temp_comments:
-                self.remove_comment(comment)
-        except ValueError as e:
-            get_logger().exception(f"Failed to remove temp comments, error: {e}")
-
-    def remove_comment(self, comment):
-        pass
-
-    # funtion to create_inline_comment
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
-                              absolute_position: int = None):
-
-        position, absolute_position = find_line_number_of_relevant_line_in_file(
-            self.get_diff_files(),
-            relevant_file.strip('`'),
-            relevant_line_in_file,
-            absolute_position
-        )
-        if position == -1:
-            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"
-        path = relevant_file.strip()
-        return dict(body=body, path=path, position=absolute_position) if subject_type == "LINE" else {}
-
-    def publish_inline_comment(self, comment: str, from_line: int, file: str):
-        payload = {
-            "text": comment,
-            "severity": "NORMAL",
-            "anchor": {
-                "diffType": "EFFECTIVE",
-                "path": file,
-                "lineType": "ADDED",
-                "line": from_line,
-                "fileType": "TO"
-            }
-        }
-
-        response = requests.post(url=self._get_pr_comments_url(), json=payload, headers=self.headers)
-        return response
-
-    def generate_link_to_relevant_line_number(self, suggestion) -> str:
-        try:
-            relevant_file = suggestion['relevant file'].strip('`').strip("'")
-            relevant_line_str = suggestion['relevant line']
-            if not relevant_line_str:
-                return ""
-
-            diff_files = self.get_diff_files()
-            position, absolute_position = find_line_number_of_relevant_line_in_file \
-                (diff_files, relevant_file, relevant_line_str)
-
-            if absolute_position != -1 and self.pr_url:
-                link = f"{self.pr_url}/#L{relevant_file}T{absolute_position}"
-                return link
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Failed adding line link, error: {e}")
-
-        return ""
-
-    def publish_inline_comments(self, comments: list[dict]):
-        for comment in comments:
-            self.publish_inline_comment(comment['body'], comment['position'], comment['path'])
-
-    def get_title(self):
-        return self.pr.title
-
-    def get_languages(self):
-        return {"yaml": 0}  # devops LOL
-
-    def get_pr_branch(self):
-        return self.pr.fromRef['displayId']
-
-    def get_pr_description_full(self):
-        return self.pr.description
-
-    def get_user_id(self):
-        return 0
-
-    def get_issue_comments(self):
-        raise NotImplementedError(
-            "Bitbucket provider does not support issue comments yet"
-        )
-
-    def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
-        return True
-
-    def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
-        return True
-
-    @staticmethod
-    def _parse_bitbucket_server(url: str) -> str:
-        parsed_url = urlparse(url)
-        return f"{parsed_url.scheme}://{parsed_url.netloc}"
-
-    @staticmethod
-    def _parse_pr_url(pr_url: str) -> Tuple[str, str, int]:
-        parsed_url = urlparse(pr_url)
-        path_parts = parsed_url.path.strip("/").split("/")
-        if len(path_parts) < 6 or path_parts[4] != "pull-requests":
-            raise ValueError(
-                "The provided URL does not appear to be a Bitbucket PR URL"
-            )
-
-        workspace_slug = path_parts[1]
-        repo_slug = path_parts[3]
-        try:
-            pr_number = int(path_parts[5])
-        except ValueError as e:
-            raise ValueError("Unable to convert PR number to integer") from e
-
-        return workspace_slug, repo_slug, pr_number
-
-    def _get_repo(self):
-        if self.repo is None:
-            self.repo = self.bitbucket_client.get_repo(self.workspace_slug, self.repo_slug)
-        return self.repo
-
-    def _get_pr(self):
-        pr = self.bitbucket_client.get_pull_request(self.workspace_slug, self.repo_slug, pull_request_id=self.pr_num)
-        return type('new_dict', (object,), pr)
-
-    def _get_pr_file_content(self, remote_link: str):
-        return ""
-
-    def get_commit_messages(self):
-        def get_commit_messages(self):
-            raise NotImplementedError("Get commit messages function not implemented yet.")
-    # bitbucket does not support labels
-    def publish_description(self, pr_title: str, description: str):
-        payload = json.dumps({
-            "description": description,
-            "title": pr_title
-        })
-
-        response = requests.put(url=self.bitbucket_pull_request_api_url, headers=self.headers, data=payload)
-        return response
-
-    # bitbucket does not support labels
-    def publish_labels(self, pr_types: list):
-        pass
-    
-    # bitbucket does not support labels
-    def get_pr_labels(self):
-        pass
-
-    def _get_pr_comments_url(self):
-        return f"{self.bitbucket_server_url}/rest/api/latest/projects/{self.workspace_slug}/repos/{self.repo_slug}/pull-requests/{self.pr_num}/comments"

pr_agent/git_providers/codecommit_provider.py

@@ -1,15 +1,16 @@
+import logging
 import os
 import re
 from collections import Counter
 from typing import List, Optional, Tuple
 from urllib.parse import urlparse
 
-from pr_agent.git_providers.codecommit_client import CodeCommitClient
+from ..algo.language_handler import is_valid_file, language_extension_map
-
+from ..algo.pr_processing import clip_tokens
 from ..algo.utils import load_large_diff
-from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
 from ..config_loader import get_settings
-from ..log import get_logger
+from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider, IncrementalPR
+from pr_agent.git_providers.codecommit_client import CodeCommitClient
 
 
 class PullRequestCCMimic:
@@ -61,7 +62,6 @@ class CodeCommitProvider(GitProvider):
         self.pr = None
         self.diff_files = None
         self.git_files = None
-        self.pr_url = pr_url
         if pr_url:
             self.set_pr(pr_url)
 
@@ -166,7 +166,7 @@ class CodeCommitProvider(GitProvider):
 
     def publish_comment(self, pr_comment: str, is_temporary: bool = False):
         if is_temporary:
-            get_logger().info(pr_comment)
+            logging.info(pr_comment)
             return
 
         pr_comment = CodeCommitProvider._remove_markdown_html(pr_comment)
@@ -188,12 +188,12 @@ class CodeCommitProvider(GitProvider):
         for suggestion in code_suggestions:
             # Verify that each suggestion has the required keys
             if not all(key in suggestion for key in ["body", "relevant_file", "relevant_lines_start"]):
-                get_logger().warning(f"Skipping code suggestion #{counter}: Each suggestion must have 'body', 'relevant_file', 'relevant_lines_start' keys")
+                logging.warning(f"Skipping code suggestion #{counter}: Each suggestion must have 'body', 'relevant_file', 'relevant_lines_start' keys")
                 continue
        
             # Publish the code suggestion to CodeCommit
             try:
-                get_logger().debug(f"Code Suggestion #{counter} in file: {suggestion['relevant_file']}: {suggestion['relevant_lines_start']}")
+                logging.debug(f"Code Suggestion #{counter} in file: {suggestion['relevant_file']}: {suggestion['relevant_lines_start']}")
                 self.codecommit_client.publish_comment(
                     repo_name=self.repo_name,
                     pr_number=self.pr_num,
@@ -216,19 +216,19 @@ class CodeCommitProvider(GitProvider):
     def publish_labels(self, labels):
         return [""]  # not implemented yet
 
-    def get_pr_labels(self):
+    def get_labels(self):
         return [""]  # not implemented yet
 
     def remove_initial_comment(self):
         return ""  # not implemented yet
 
-    def remove_comment(self, comment):
-        return ""  # not implemented yet
-
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
         # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/post_comment_for_compared_commit.html
         raise NotImplementedError("CodeCommit provider does not support publishing inline comments yet")
 
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        raise NotImplementedError("CodeCommit provider does not support creating inline comments yet")
+
     def publish_inline_comments(self, comments: list[dict]):
         raise NotImplementedError("CodeCommit provider does not support publishing inline comments yet")
 
@@ -267,8 +267,6 @@ class CodeCommitProvider(GitProvider):
         # where each dictionary item is a language name.
         # We build that language->extension dictionary here in main_extensions_flat.
         main_extensions_flat = {}
-        language_extension_map_org = get_settings().language_extension_map_org
-        language_extension_map = {k.lower(): v for k, v in language_extension_map_org.items()}
         for language, extensions in language_extension_map.items():
             for ext in extensions:
                 main_extensions_flat[ext] = language
@@ -298,11 +296,11 @@ class CodeCommitProvider(GitProvider):
         return self.codecommit_client.get_file(self.repo_name, settings_filename, self.pr.source_commit, optional=True)
 
     def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
-        get_logger().info("CodeCommit provider does not support eyes reaction yet")
+        logging.info("CodeCommit provider does not support eyes reaction yet")
         return True
 
     def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
-        get_logger().info("CodeCommit provider does not support removing reactions yet")
+        logging.info("CodeCommit provider does not support removing reactions yet")
         return True
 
     @staticmethod
@@ -368,7 +366,7 @@ class CodeCommitProvider(GitProvider):
         # TODO: implement support for multiple targets in one CodeCommit PR
         #       for now, we are only using the first target in the PR
         if len(response.targets) > 1:
-            get_logger().warning(
+            logging.warning(
                 "Multiple targets in one PR is not supported for CodeCommit yet. Continuing, using the first target only..."
             )
 

pr_agent/git_providers/gerrit_provider.py

@@ -1,4 +1,5 @@
 import json
+import logging
 import os
 import pathlib
 import shutil
@@ -6,16 +7,18 @@ import subprocess
 import uuid
 from collections import Counter, namedtuple
 from pathlib import Path
-from tempfile import NamedTemporaryFile, mkdtemp
+from tempfile import mkdtemp, NamedTemporaryFile
 
 import requests
 import urllib3.util
 from git import Repo
 
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
+from pr_agent.git_providers.git_provider import GitProvider, FilePatchInfo, \
+    EDIT_TYPE
 from pr_agent.git_providers.local_git_provider import PullRequestMimic
-from pr_agent.log import get_logger
+
+logger = logging.getLogger(__name__)
 
 
 def _call(*command, **kwargs) -> (int, str, str):
@@ -30,42 +33,42 @@ def _call(*command, **kwargs) -> (int, str, str):
 
 
 def clone(url, directory):
-    get_logger().info("Cloning %s to %s", url, directory)
+    logger.info("Cloning %s to %s", url, directory)
     stdout = _call('git', 'clone', "--depth", "1", url, directory)
-    get_logger().info(stdout)
+    logger.info(stdout)
 
 
 def fetch(url, refspec, cwd):
-    get_logger().info("Fetching %s %s", url, refspec)
+    logger.info("Fetching %s %s", url, refspec)
     stdout = _call(
         'git', 'fetch', '--depth', '2', url, refspec,
         cwd=cwd
     )
-    get_logger().info(stdout)
+    logger.info(stdout)
 
 
 def checkout(cwd):
-    get_logger().info("Checking out")
+    logger.info("Checking out")
     stdout = _call('git', 'checkout', "FETCH_HEAD", cwd=cwd)
-    get_logger().info(stdout)
+    logger.info(stdout)
 
 
 def show(*args, cwd=None):
-    get_logger().info("Show")
+    logger.info("Show")
     return _call('git', 'show', *args, cwd=cwd)
 
 
 def diff(*args, cwd=None):
-    get_logger().info("Diff")
+    logger.info("Diff")
     patch = _call('git', 'diff', *args, cwd=cwd)
     if not patch:
-        get_logger().warning("No changes found")
+        logger.warning("No changes found")
         return
     return patch
 
 
 def reset_local_changes(cwd):
-    get_logger().info("Reset local changes")
+    logger.info("Reset local changes")
     _call('git', 'checkout', "--force", cwd=cwd)
 
 
@@ -192,7 +195,7 @@ class GerritProvider(GitProvider):
         )
         self.repo = Repo(self.repo_path)
         assert self.repo
-        self.pr_url = base_url
+
         self.pr = PullRequestMimic(self.get_pr_title(), self.get_diff_files())
 
     def get_pr_title(self):
@@ -207,7 +210,7 @@ class GerritProvider(GitProvider):
         Comment = namedtuple('Comment', ['body'])
         return Comments([Comment(c['message']) for c in reversed(comments)])
 
-    def get_pr_labels(self):
+    def get_labels(self):
         raise NotImplementedError(
             'Getting labels is not implemented for the gerrit provider')
 
@@ -380,6 +383,11 @@ class GerritProvider(GitProvider):
             'Publishing inline comments is not implemented for the gerrit '
             'provider')
 
+    def create_inline_comment(self, body: str, relevant_file: str,
+                              relevant_line_in_file: str):
+        raise NotImplementedError(
+            'Creating inline comments is not implemented for the gerrit '
+            'provider')
 
     def publish_labels(self, labels):
         # Not applicable to the local git provider,
@@ -391,8 +399,5 @@ class GerritProvider(GitProvider):
         # shutil.rmtree(self.repo_path)
         pass
 
-    def remove_comment(self, comment):
-        pass
-
     def get_pr_branch(self):
         return self.repo.head

pr_agent/git_providers/git_provider.py

@@ -1,3 +1,4 @@
+import logging
 from abc import ABC, abstractmethod
 from dataclasses import dataclass
 
@@ -5,16 +6,12 @@ from dataclasses import dataclass
 from enum import Enum
 from typing import Optional
 
-from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger
-
 
 class EDIT_TYPE(Enum):
     ADDED = 1
     DELETED = 2
     MODIFIED = 3
     RENAMED = 4
-    UNKNOWN = 5
 
 
 @dataclass
@@ -24,10 +21,8 @@ class FilePatchInfo:
     patch: str
     filename: str
     tokens: int = -1
-    edit_type: EDIT_TYPE = EDIT_TYPE.UNKNOWN
+    edit_type: EDIT_TYPE = EDIT_TYPE.MODIFIED
     old_filename: str = None
-    num_plus_lines: int = -1
-    num_minus_lines: int = -1
 
 
 class GitProvider(ABC):
@@ -43,10 +38,38 @@ class GitProvider(ABC):
     def publish_description(self, pr_title: str, pr_body: str):
         pass
 
+    @abstractmethod
+    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
+        pass
+
+    @abstractmethod
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        pass
+
+    @abstractmethod
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        pass
+
+    @abstractmethod
+    def publish_inline_comments(self, comments: list[dict]):
+        pass
+
     @abstractmethod
     def publish_code_suggestions(self, code_suggestions: list) -> bool:
         pass
 
+    @abstractmethod
+    def publish_labels(self, labels):
+        pass
+
+    @abstractmethod
+    def get_labels(self):
+        pass
+
+    @abstractmethod
+    def remove_initial_comment(self):
+        pass
+
     @abstractmethod
     def get_languages(self):
         pass
@@ -65,112 +88,31 @@ class GitProvider(ABC):
 
     def get_pr_description(self, *, full: bool = True) -> str:
         from pr_agent.config_loader import get_settings
-        from pr_agent.algo.utils import clip_tokens
+        from pr_agent.algo.pr_processing import clip_tokens
-        max_tokens_description = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
+        max_tokens = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
         description = self.get_pr_description_full() if full else self.get_user_description()
-        if max_tokens_description:
+        if max_tokens:
-            return clip_tokens(description, max_tokens_description)
+            return clip_tokens(description, max_tokens)
         return description
 
     def get_user_description(self) -> str:
         description = (self.get_pr_description_full() or "").strip()
-        description_lowercase = description.lower()
-
         # if the existing description wasn't generated by the pr-agent, just return it as-is
-        if not self._is_generated_by_pr_agent(description_lowercase):
+        if not description.startswith("## PR Type"):
             return description
-
+        # if the existing description was generated by the pr-agent, but it doesn't contain the user description,
-        # if the existing description was generated by the pr-agent, but it doesn't contain a user description,
         # return nothing (empty string) because it means there is no user description
-        user_description_header = "## user description"
+        if "## User Description:" not in description:
-        if user_description_header not in description_lowercase:
             return ""
-
         # otherwise, extract the original user description from the existing pr-agent description and return it
-        # user_description_start_position = description_lowercase.find(user_description_header) + len(user_description_header)
+        return description.split("## User Description:", 1)[1].strip()
-        # return description[user_description_start_position:].split("\n", 1)[-1].strip()
-
-        # the 'user description' is in the beginning. extract and return it
-        possible_headers = self._possible_headers()
-        start_position = description_lowercase.find(user_description_header) + len(user_description_header)
-        end_position = len(description)
-        for header in possible_headers: # try to clip at the next header
-            if header != user_description_header and header in description_lowercase:
-                end_position = min(end_position, description_lowercase.find(header))
-        if end_position != len(description) and end_position > start_position:
-            original_user_description = description[start_position:end_position].strip()
-            if original_user_description.endswith("___"):
-                original_user_description = original_user_description[:-3].strip()
-        else:
-            original_user_description = description.split("___")[0].strip()
-            if original_user_description.lower().startswith(user_description_header):
-                original_user_description = original_user_description[len(user_description_header):].strip()
-
-        return original_user_description
-
-    def _possible_headers(self):
-        return ("## user description", "## pr type", "## pr description", "## pr labels", "## type", "## description",
-                "## labels", "### 🤖 generated by pr agent")
-
-    def _is_generated_by_pr_agent(self, description_lowercase: str) -> bool:
-        possible_headers = self._possible_headers()
-        return any(description_lowercase.startswith(header) for header in possible_headers)
-
-    @abstractmethod
-    def get_repo_settings(self):
-        pass
-
-    def get_pr_id(self):
-        return ""
-
-    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
-        return ""
-
-    #### comments operations ####
-    @abstractmethod
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        pass
-
-    def publish_persistent_comment(self, pr_comment: str, initial_header: str, update_header: bool):
-        self.publish_comment(pr_comment)
-
-    @abstractmethod
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        pass
-
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
-                              absolute_position: int = None):
-        raise NotImplementedError("This git provider does not support creating inline comments yet")
-
-    @abstractmethod
-    def publish_inline_comments(self, comments: list[dict]):
-        pass
-
-    @abstractmethod
-    def remove_initial_comment(self):
-        pass
-
-    @abstractmethod
-    def remove_comment(self, comment):
-        pass
 
     @abstractmethod
     def get_issue_comments(self):
         pass
 
-    def get_comment_url(self, comment) -> str:
-        return ""
-
-    #### labels operations ####
     @abstractmethod
-    def publish_labels(self, labels):
+    def get_repo_settings(self):
-        pass
-
-    @abstractmethod
-    def get_pr_labels(self):
-        pass
-
-    def get_repo_labels(self):
         pass
 
     @abstractmethod
@@ -181,12 +123,11 @@ class GitProvider(ABC):
     def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
         pass
 
-    #### commits operations ####
     @abstractmethod
     def get_commit_messages(self):
         pass
 
-    def get_latest_commit_url(self) -> str:
+    def get_pr_id(self):
         return ""
 
 def get_main_pr_language(languages, files) -> str:
@@ -195,10 +136,7 @@ def get_main_pr_language(languages, files) -> str:
     """
     main_language_str = ""
     if not languages:
-        get_logger().info("No languages detected")
+        logging.info("No languages detected")
-        return main_language_str
-    if not files:
-        get_logger().info("No files in diff")
         return main_language_str
 
     try:
@@ -207,52 +145,34 @@ def get_main_pr_language(languages, files) -> str:
         # validate that the specific commit uses the main language
         extension_list = []
         for file in files:
-            if not file:
-                continue
             if isinstance(file, str):
                 file = FilePatchInfo(base_file=None, head_file=None, patch=None, filename=file)
             extension_list.append(file.filename.rsplit('.')[-1])
 
         # get the most common extension
-        most_common_extension = '.' + max(set(extension_list), key=extension_list.count)
+        most_common_extension = max(set(extension_list), key=extension_list.count)
-        try:
-            language_extension_map_org = get_settings().language_extension_map_org
-            language_extension_map = {k.lower(): v for k, v in language_extension_map_org.items()}
 
-            if top_language in language_extension_map and most_common_extension in language_extension_map[top_language]:
+        # look for a match. TBD: add more languages, do this systematically
+        if most_common_extension == 'py' and top_language == 'python' or \
+                most_common_extension == 'js' and top_language == 'javascript' or \
+                most_common_extension == 'ts' and top_language == 'typescript' or \
+                most_common_extension == 'go' and top_language == 'go' or \
+                most_common_extension == 'java' and top_language == 'java' or \
+                most_common_extension == 'c' and top_language == 'c' or \
+                most_common_extension == 'cpp' and top_language == 'c++' or \
+                most_common_extension == 'cs' and top_language == 'c#' or \
+                most_common_extension == 'swift' and top_language == 'swift' or \
+                most_common_extension == 'php' and top_language == 'php' or \
+                most_common_extension == 'rb' and top_language == 'ruby' or \
+                most_common_extension == 'rs' and top_language == 'rust' or \
+                most_common_extension == 'scala' and top_language == 'scala' or \
+                most_common_extension == 'kt' and top_language == 'kotlin' or \
+                most_common_extension == 'pl' and top_language == 'perl' or \
+                most_common_extension == top_language:
             main_language_str = top_language
-            else:
-                for language, extensions in language_extension_map.items():
-                    if most_common_extension in extensions:
-                        main_language_str = language
-                        break
-        except Exception as e:
-            get_logger().exception(f"Failed to get main language: {e}")
-            pass
-
-        ## old approach:
-        # most_common_extension = max(set(extension_list), key=extension_list.count)
-        # if most_common_extension == 'py' and top_language == 'python' or \
-        #         most_common_extension == 'js' and top_language == 'javascript' or \
-        #         most_common_extension == 'ts' and top_language == 'typescript' or \
-        #         most_common_extension == 'tsx' and top_language == 'typescript' or \
-        #         most_common_extension == 'go' and top_language == 'go' or \
-        #         most_common_extension == 'java' and top_language == 'java' or \
-        #         most_common_extension == 'c' and top_language == 'c' or \
-        #         most_common_extension == 'cpp' and top_language == 'c++' or \
-        #         most_common_extension == 'cs' and top_language == 'c#' or \
-        #         most_common_extension == 'swift' and top_language == 'swift' or \
-        #         most_common_extension == 'php' and top_language == 'php' or \
-        #         most_common_extension == 'rb' and top_language == 'ruby' or \
-        #         most_common_extension == 'rs' and top_language == 'rust' or \
-        #         most_common_extension == 'scala' and top_language == 'scala' or \
-        #         most_common_extension == 'kt' and top_language == 'kotlin' or \
-        #         most_common_extension == 'pl' and top_language == 'perl' or \
-        #         most_common_extension == top_language:
-        #     main_language_str = top_language
 
     except Exception as e:
-        get_logger().exception(e)
+        logging.exception(e)
         pass
 
     return main_language_str
@@ -262,13 +182,6 @@ class IncrementalPR:
     def __init__(self, is_incremental: bool = False):
         self.is_incremental = is_incremental
         self.commits_range = None
-        self.first_new_commit = None
+        self.first_new_commit_sha = None
-        self.last_seen_commit = None
+        self.last_seen_commit_sha = None
 
-    @property
-    def first_new_commit_sha(self):
-        return None if self.first_new_commit is None else self.first_new_commit.sha
-
-    @property
-    def last_seen_commit_sha(self):
-        return None if self.last_seen_commit is None else self.last_seen_commit.sha

pr_agent/git_providers/github_provider.py

@@ -1,19 +1,20 @@
+import logging
 import hashlib
+
 from datetime import datetime
-from typing import Optional, Tuple
+from typing import Optional, Tuple, Any
 from urllib.parse import urlparse
 
-from github import AppAuthentication, Auth, Github, GithubException
+from github import AppAuthentication, Auth, Github, GithubException, Reaction
 from retry import retry
 from starlette_context import context
 
+from .git_provider import FilePatchInfo, GitProvider, IncrementalPR
 from ..algo.language_handler import is_valid_file
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
+from ..algo.utils import load_large_diff
-from ..algo.utils import load_large_diff, clip_tokens
+from ..algo.pr_processing import find_line_number_of_relevant_line_in_file, clip_tokens
 from ..config_loader import get_settings
-from ..log import get_logger
 from ..servers.utils import RateLimitExceeded
-from .git_provider import FilePatchInfo, GitProvider, IncrementalPR, EDIT_TYPE
 
 
 class GithubProvider(GitProvider):
@@ -34,7 +35,6 @@ class GithubProvider(GitProvider):
         if pr_url and 'pull' in pr_url:
             self.set_pr(pr_url)
             self.last_commit_id = list(self.pr.get_commits())[-1]
-            self.pr_url = self.get_pr_url() # pr_url for github actions can be as api.github.com, so we need to get the url from the pr object
 
     def is_supported(self, capability: str) -> bool:
         return True
@@ -51,44 +51,36 @@ class GithubProvider(GitProvider):
     def get_incremental_commits(self):
         self.commits = list(self.pr.get_commits())
 
-        self.previous_review = self.get_previous_review(full=True, incremental=True)
+        self.get_previous_review()
         if self.previous_review:
             self.incremental.commits_range = self.get_commit_range()
             # Get all files changed during the commit range
             self.file_set = dict()
             for commit in self.incremental.commits_range:
                 if commit.commit.message.startswith(f"Merge branch '{self._get_repo().default_branch}'"):
-                    get_logger().info(f"Skipping merge commit {commit.commit.message}")
+                    logging.info(f"Skipping merge commit {commit.commit.message}")
                     continue
                 self.file_set.update({file.filename: file for file in commit.files})
-        else:
-            raise ValueError("No previous review found")
 
     def get_commit_range(self):
         last_review_time = self.previous_review.created_at
-        first_new_commit_index = None
+        first_new_commit_index = 0
         for index in range(len(self.commits) - 1, -1, -1):
             if self.commits[index].commit.author.date > last_review_time:
-                self.incremental.first_new_commit = self.commits[index]
+                self.incremental.first_new_commit_sha = self.commits[index].sha
                 first_new_commit_index = index
             else:
-                self.incremental.last_seen_commit = self.commits[index]
+                self.incremental.last_seen_commit_sha = self.commits[index].sha
                 break
-        return self.commits[first_new_commit_index:] if first_new_commit_index is not None else []
+        return self.commits[first_new_commit_index:]
 
-    def get_previous_review(self, *, full: bool, incremental: bool):
+    def get_previous_review(self):
-        if not (full or incremental):
+        self.previous_review = None
-            raise ValueError("At least one of full or incremental must be True")
-        if not getattr(self, "comments", None):
         self.comments = list(self.pr.get_issue_comments())
-        prefixes = []
-        if full:
-            prefixes.append("## PR Analysis")
-        if incremental:
-            prefixes.append("## Incremental PR Review")
         for index in range(len(self.comments) - 1, -1, -1):
-            if any(self.comments[index].body.startswith(prefix) for prefix in prefixes):
+            if self.comments[index].body.startswith("## PR Analysis"):
-                return self.comments[index]
+                self.previous_review = self.comments[index]
+                break
 
     def get_files(self):
         if self.incremental.is_incremental and self.file_set:
@@ -132,68 +124,22 @@ class GithubProvider(GitProvider):
                     if not patch:
                         patch = load_large_diff(file.filename, new_file_content_str, original_file_content_str)
 
-                if file.status == 'added':
+                diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str, patch, file.filename))
-                    edit_type = EDIT_TYPE.ADDED
-                elif file.status == 'removed':
-                    edit_type = EDIT_TYPE.DELETED
-                elif file.status == 'renamed':
-                    edit_type = EDIT_TYPE.RENAMED
-                elif file.status == 'modified':
-                    edit_type = EDIT_TYPE.MODIFIED
-                else:
-                    get_logger().error(f"Unknown edit type: {file.status}")
-                    edit_type = EDIT_TYPE.UNKNOWN
-
-                # count number of lines added and removed
-                patch_lines = patch.splitlines(keepends=True)
-                num_plus_lines = len([line for line in patch_lines if line.startswith('+')])
-                num_minus_lines = len([line for line in patch_lines if line.startswith('-')])
-                file_patch_canonical_structure = FilePatchInfo(original_file_content_str, new_file_content_str, patch,
-                                                               file.filename, edit_type=edit_type,
-                                                               num_plus_lines=num_plus_lines,
-                                                               num_minus_lines=num_minus_lines,)
-                diff_files.append(file_patch_canonical_structure)
 
             self.diff_files = diff_files
             return diff_files
 
         except GithubException.RateLimitExceededException as e:
-            get_logger().error(f"Rate limit exceeded for GitHub API. Original message: {e}")
+            logging.error(f"Rate limit exceeded for GitHub API. Original message: {e}")
             raise RateLimitExceeded("Rate limit exceeded for GitHub API.") from e
 
     def publish_description(self, pr_title: str, pr_body: str):
         self.pr.edit(title=pr_title, body=pr_body)
 
-    def get_latest_commit_url(self) -> str:
-        return self.last_commit_id.html_url
-
-    def get_comment_url(self, comment) -> str:
-        return comment.html_url
-
-    def publish_persistent_comment(self, pr_comment: str, initial_header: str, update_header: bool = True):
-        prev_comments = list(self.pr.get_issue_comments())
-        for comment in prev_comments:
-            body = comment.body
-            if body.startswith(initial_header):
-                latest_commit_url = self.get_latest_commit_url()
-                comment_url = self.get_comment_url(comment)
-                if update_header:
-                    updated_header = f"{initial_header}\n\n### (review updated until commit {latest_commit_url})\n"
-                    pr_comment_updated = pr_comment.replace(initial_header, updated_header)
-                else:
-                    pr_comment_updated = pr_comment
-                get_logger().info(f"Persistent mode- updating comment {comment_url} to latest review message")
-                response = comment.edit(pr_comment_updated)
-                self.publish_comment(
-                    f"**[Persistent review]({comment_url})** updated to latest commit {latest_commit_url}")
-                return
-        self.publish_comment(pr_comment)
-
     def publish_comment(self, pr_comment: str, is_temporary: bool = False):
         if is_temporary and not get_settings().config.publish_output_progress:
-            get_logger().debug(f"Skipping publish_comment for temporary comment: {pr_comment}")
+            logging.debug(f"Skipping publish_comment for temporary comment: {pr_comment}")
             return
-
         response = self.pr.create_issue_comment(pr_comment)
         if hasattr(response, "user") and hasattr(response.user, "login"):
             self.github_user_id = response.user.login
@@ -206,15 +152,11 @@ class GithubProvider(GitProvider):
         self.publish_inline_comments([self.create_inline_comment(body, relevant_file, relevant_line_in_file)])
 
 
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str,
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-                              absolute_position: int = None):
+        position, absolute_position = find_line_number_of_relevant_line_in_file(self.diff_files, relevant_file.strip('`'), relevant_line_in_file)
-        position, absolute_position = find_line_number_of_relevant_line_in_file(self.diff_files,
-                                                                                relevant_file.strip('`'),
-                                                                                relevant_line_in_file,
-                                                                                absolute_position)
         if position == -1:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
+                logging.info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
             subject_type = "FILE"
         else:
             subject_type = "LINE"
@@ -237,13 +179,13 @@ class GithubProvider(GitProvider):
 
             if not relevant_lines_start or relevant_lines_start == -1:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(
+                    logging.exception(
                         f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
                 continue
 
             if relevant_lines_end < relevant_lines_start:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(f"Failed to publish code suggestion, "
+                    logging.exception(f"Failed to publish code suggestion, "
                                       f"relevant_lines_end is {relevant_lines_end} and "
                                       f"relevant_lines_start is {relevant_lines_start}")
                 continue
@@ -270,22 +212,16 @@ class GithubProvider(GitProvider):
             return True
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().error(f"Failed to publish code suggestion, error: {e}")
+                logging.error(f"Failed to publish code suggestion, error: {e}")
             return False
 
     def remove_initial_comment(self):
         try:
             for comment in getattr(self.pr, 'comments_list', []):
                 if comment.is_temporary:
-                    self.remove_comment(comment)
-        except Exception as e:
-            get_logger().exception(f"Failed to remove initial comment, error: {e}")
-
-    def remove_comment(self, comment):
-        try:
                     comment.delete()
         except Exception as e:
-            get_logger().exception(f"Failed to remove comment, error: {e}")
+            logging.exception(f"Failed to remove initial comment, error: {e}")
 
     def get_title(self):
         return self.pr.title
@@ -323,10 +259,7 @@ class GithubProvider(GitProvider):
 
     def get_repo_settings(self):
         try:
-            # contents = self.repo_obj.get_contents(".pr_agent.toml", ref=self.pr.head.sha).decoded_content
+            contents = self.repo_obj.get_contents(".pr_agent.toml", ref=self.pr.head.sha).decoded_content
-
-            # more logical to take 'pr_agent.toml' from the default branch
-            contents = self.repo_obj.get_contents(".pr_agent.toml").decoded_content
             return contents
         except Exception:
             return ""
@@ -336,7 +269,7 @@ class GithubProvider(GitProvider):
             reaction = self.pr.get_issue_comment(issue_comment_id).create_reaction("eyes")
             return reaction.id
         except Exception as e:
-            get_logger().exception(f"Failed to add eyes reaction, error: {e}")
+            logging.exception(f"Failed to add eyes reaction, error: {e}")
             return None
 
     def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
@@ -344,7 +277,7 @@ class GithubProvider(GitProvider):
             self.pr.get_issue_comment(issue_comment_id).delete_reaction(reaction_id)
             return True
         except Exception as e:
-            get_logger().exception(f"Failed to remove eyes reaction, error: {e}")
+            logging.exception(f"Failed to remove eyes reaction, error: {e}")
             return False
 
 
@@ -419,7 +352,7 @@ class GithubProvider(GitProvider):
                 raise ValueError("GitHub app installation ID is required when using GitHub app deployment")
             auth = AppAuthentication(app_id=app_id, private_key=private_key,
                                      installation_id=self.installation_id)
-            return Github(app_auth=auth, base_url=get_settings().github.base_url)
+            return Github(app_auth=auth)
 
         if deployment_type == 'user':
             try:
@@ -428,7 +361,7 @@ class GithubProvider(GitProvider):
                 raise ValueError(
                     "GitHub token is required when using user deployment. See: "
                     "https://github.com/Codium-ai/pr-agent#method-2-run-from-source") from e
-            return Github(auth=Auth.Token(token), base_url=get_settings().github.base_url)
+            return Github(auth=Auth.Token(token))
 
     def _get_repo(self):
         if hasattr(self, 'repo_obj') and \
@@ -453,7 +386,7 @@ class GithubProvider(GitProvider):
     def publish_labels(self, pr_types):
         try:
             label_color_map = {"Bug fix": "1d76db", "Tests": "e99695", "Bug fix with tests": "c5def5",
-                               "Enhancement": "bfd4f2", "Documentation": "d4c5f9",
+                               "Refactoring": "bfdadc", "Enhancement": "bfd4f2", "Documentation": "d4c5f9",
                                "Other": "d1bcf9"}
             post_parameters = []
             for p in pr_types:
@@ -463,19 +396,15 @@ class GithubProvider(GitProvider):
                 "PUT", f"{self.pr.issue_url}/labels", input=post_parameters
             )
         except Exception as e:
-            get_logger().exception(f"Failed to publish labels, error: {e}")
+            logging.exception(f"Failed to publish labels, error: {e}")
 
-    def get_pr_labels(self):
+    def get_labels(self):
         try:
             return [label.name for label in self.pr.labels]
         except Exception as e:
-            get_logger().exception(f"Failed to get labels, error: {e}")
+            logging.exception(f"Failed to get labels, error: {e}")
             return []
 
-    def get_repo_labels(self):
-        labels = self.repo_obj.get_labels()
-        return [label for label in labels]
-
     def get_commit_messages(self):
         """
         Retrieves the commit messages of a pull request.
@@ -515,21 +444,10 @@ class GithubProvider(GitProvider):
                 return link
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Failed adding line link, error: {e}")
+                logging.info(f"Failed adding line link, error: {e}")
 
         return ""
 
-    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
-        sha_file = hashlib.sha256(relevant_file.encode('utf-8')).hexdigest()
-        if relevant_line_start == -1:
-            link = f"https://github.com/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}"
-        elif relevant_line_end:
-            link = f"https://github.com/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}R{relevant_line_start}-R{relevant_line_end}"
-        else:
-            link = f"https://github.com/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}R{relevant_line_start}"
-        return link
-
-
     def get_pr_id(self):
         try:
             pr_id = f"{self.repo}/{self.pr_num}"

pr_agent/git_providers/gitlab_provider.py

@@ -1,4 +1,5 @@
 import hashlib
+import logging
 import re
 from typing import Optional, Tuple
 from urllib.parse import urlparse
@@ -7,12 +8,12 @@ import gitlab
 from gitlab import GitlabGetError
 
 from ..algo.language_handler import is_valid_file
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
+from ..algo.pr_processing import clip_tokens, find_line_number_of_relevant_line_in_file
-from ..algo.utils import load_large_diff, clip_tokens
+from ..algo.utils import load_large_diff
 from ..config_loader import get_settings
 from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from ..log import get_logger
 
+logger = logging.getLogger()
 
 class DiffNotFoundError(Exception):
     """Raised when the diff for a merge request cannot be found."""
@@ -37,14 +38,13 @@ class GitLabProvider(GitProvider):
         self.diff_files = None
         self.git_files = None
         self.temp_comments = []
-        self.pr_url = merge_request_url
         self._set_merge_request(merge_request_url)
         self.RE_HUNK_HEADER = re.compile(
             r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
         self.incremental = incremental
 
     def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments']: # gfm_markdown is supported in gitlab !
+        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments', 'gfm_markdown']:
             return False
         return True
 
@@ -59,7 +59,7 @@ class GitLabProvider(GitProvider):
         try:
             self.last_diff = self.mr.diffs.list(get_all=True)[-1]
         except IndexError as e:
-            get_logger().error(f"Could not get diff for merge request {self.id_mr}")
+            logger.error(f"Could not get diff for merge request {self.id_mr}")
             raise DiffNotFoundError(f"Could not get diff for merge request {self.id_mr}") from e
 
 
@@ -99,7 +99,7 @@ class GitLabProvider(GitProvider):
                     if isinstance(new_file_content_str, bytes):
                         new_file_content_str = bytes.decode(new_file_content_str, 'utf-8')
                 except UnicodeDecodeError:
-                    get_logger().warning(
+                    logging.warning(
                         f"Cannot decode file {diff['old_path']} or {diff['new_path']} in merge request {self.id_mr}")
 
                 edit_type = EDIT_TYPE.MODIFIED
@@ -115,20 +115,12 @@ class GitLabProvider(GitProvider):
                 if not patch:
                     patch = load_large_diff(filename, new_file_content_str, original_file_content_str)
 
-
-                # count number of lines added and removed
-                patch_lines = patch.splitlines(keepends=True)
-                num_plus_lines = len([line for line in patch_lines if line.startswith('+')])
-                num_minus_lines = len([line for line in patch_lines if line.startswith('-')])
                 diff_files.append(
                     FilePatchInfo(original_file_content_str, new_file_content_str,
                                   patch=patch,
                                   filename=filename,
                                   edit_type=edit_type,
-                                  old_filename=None if diff['old_path'] == diff['new_path'] else diff['old_path'],
+                                  old_filename=None if diff['old_path'] == diff['new_path'] else diff['old_path']))
-                                  num_plus_lines=num_plus_lines,
-                                  num_minus_lines=num_minus_lines, ))
-
         self.diff_files = diff_files
         return diff_files
 
@@ -143,34 +135,7 @@ class GitLabProvider(GitProvider):
             self.mr.description = pr_body
             self.mr.save()
         except Exception as e:
-            get_logger().exception(f"Could not update merge request {self.id_mr} description: {e}")
+            logging.exception(f"Could not update merge request {self.id_mr} description: {e}")
-
-    def get_latest_commit_url(self):
-        return self.mr.commits().next().web_url
-
-    def get_comment_url(self, comment):
-        return f"{self.mr.web_url}#note_{comment.id}"
-
-    def publish_persistent_comment(self, pr_comment: str, initial_header: str, update_header: bool = True):
-        try:
-            for comment in self.mr.notes.list(get_all=True)[::-1]:
-                if comment.body.startswith(initial_header):
-                    latest_commit_url = self.get_latest_commit_url()
-                    comment_url = self.get_comment_url(comment)
-                    if update_header:
-                        updated_header = f"{initial_header}\n\n### (review updated until commit {latest_commit_url})\n"
-                        pr_comment_updated = pr_comment.replace(initial_header, updated_header)
-                    else:
-                        pr_comment_updated = pr_comment
-                    get_logger().info(f"Persistent mode- updating comment {comment_url} to latest review message")
-                    response = self.mr.notes.update(comment.id, {'body': pr_comment_updated})
-                    self.publish_comment(
-                        f"**[Persistent review]({comment_url})** updated to latest commit {latest_commit_url}")
-                    return
-        except Exception as e:
-            get_logger().exception(f"Failed to update persistent review, error: {e}")
-            pass
-        self.publish_comment(pr_comment)
 
     def publish_comment(self, mr_comment: str, is_temporary: bool = False):
         comment = self.mr.notes.create({'body': mr_comment})
@@ -183,7 +148,7 @@ class GitLabProvider(GitProvider):
         self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
                                  target_file, target_line_no)
 
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str, absolute_position: int = None):
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
         raise NotImplementedError("Gitlab provider does not support creating inline comments yet")
 
     def create_inline_comments(self, comments: list[dict]):
@@ -192,12 +157,12 @@ class GitLabProvider(GitProvider):
     def send_inline_comment(self,body: str,edit_type: str,found: bool,relevant_file: str,relevant_line_in_file: int,
                             source_line_no: int, target_file: str,target_line_no: int) -> None:
         if not found:
-            get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
+            logging.info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
         else:
             # in order to have exact sha's we have to find correct diff for this change
             diff = self.get_relevant_diff(relevant_file, relevant_line_in_file)
             if diff is None:
-                get_logger().error(f"Could not get diff for merge request {self.id_mr}")
+                logger.error(f"Could not get diff for merge request {self.id_mr}")
                 raise DiffNotFoundError(f"Could not get diff for merge request {self.id_mr}")
             pos_obj = {'position_type': 'text',
                        'new_path': target_file.filename,
@@ -210,27 +175,23 @@ class GitLabProvider(GitProvider):
             else:
                 pos_obj['new_line'] = target_line_no - 1
                 pos_obj['old_line'] = source_line_no - 1
-            get_logger().debug(f"Creating comment in {self.id_mr} with body {body} and position {pos_obj}")
+            logging.debug(f"Creating comment in {self.id_mr} with body {body} and position {pos_obj}")
-            try:
             self.mr.discussions.create({'body': body, 'position': pos_obj})
-            except Exception as e:
-                get_logger().debug(
-                    f"Failed to create comment in {self.id_mr} with position {pos_obj} (probably not a '+' line)")
 
     def get_relevant_diff(self, relevant_file: str, relevant_line_in_file: int) -> Optional[dict]:
         changes = self.mr.changes()  # Retrieve the changes for the merge request once
         if not changes:
-            get_logger().error('No changes found for the merge request.')
+            logging.error('No changes found for the merge request.')
             return None
         all_diffs = self.mr.diffs.list(get_all=True)
         if not all_diffs:
-            get_logger().error('No diffs found for the merge request.')
+            logging.error('No diffs found for the merge request.')
             return None
         for diff in all_diffs:
             for change in changes['changes']:
                 if change['new_path'] == relevant_file and relevant_line_in_file in change['diff']:
                     return diff
-            get_logger().debug(
+            logging.debug(
                 f'No relevant diff found for {relevant_file} {relevant_line_in_file}. Falling back to last diff.')
         return self.last_diff  # fallback to last_diff if no relevant diff is found
 
@@ -265,7 +226,7 @@ class GitLabProvider(GitProvider):
                 self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
                                          target_file, target_line_no)
             except Exception as e:
-                get_logger().exception(f"Could not publish code suggestion:\nsuggestion: {suggestion}\nerror: {e}")
+                logging.exception(f"Could not publish code suggestion:\nsuggestion: {suggestion}\nerror: {e}")
 
         # note that we publish suggestions one-by-one. so, if one fails, the rest will still be published
         return True
@@ -327,15 +288,9 @@ class GitLabProvider(GitProvider):
     def remove_initial_comment(self):
         try:
             for comment in self.temp_comments:
-                self.remove_comment(comment)
-        except Exception as e:
-            get_logger().exception(f"Failed to remove temp comments, error: {e}")
-
-    def remove_comment(self, comment):
-        try:
                 comment.delete()
         except Exception as e:
-            get_logger().exception(f"Failed to remove comment, error: {e}")
+            logging.exception(f"Failed to remove temp comments, error: {e}")
 
     def get_title(self):
         return self.mr.title
@@ -355,7 +310,7 @@ class GitLabProvider(GitProvider):
 
     def get_repo_settings(self):
         try:
-            contents = self.gl.projects.get(self.id_project).files.get(file_path='.pr_agent.toml', ref=self.mr.target_branch).decode()
+            contents = self.gl.projects.get(self.id_project).files.get(file_path='.pr_agent.toml', ref=self.mr.source_branch)
             return contents
         except Exception:
             return ""
@@ -403,17 +358,14 @@ class GitLabProvider(GitProvider):
             self.mr.labels = list(set(pr_types))
             self.mr.save()
         except Exception as e:
-            get_logger().exception(f"Failed to publish labels, error: {e}")
+            logging.exception(f"Failed to publish labels, error: {e}")
 
     def publish_inline_comments(self, comments: list[dict]):
         pass
 
-    def get_pr_labels(self):
+    def get_labels(self):
         return self.mr.labels
 
-    def get_repo_labels(self):
-        return self.gl.projects.get(self.id_project).labels.list()
-
     def get_commit_messages(self):
         """
         Retrieves the commit messages of a pull request.
@@ -438,16 +390,6 @@ class GitLabProvider(GitProvider):
         except:
             return ""
 
-    def get_line_link(self, relevant_file: str, relevant_line_start: int, relevant_line_end: int = None) -> str:
-        if relevant_line_start == -1:
-            link = f"https://gitlab.com/codiumai/pr-agent/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads"
-        elif relevant_line_end:
-            link = f"https://gitlab.com/codiumai/pr-agent/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{relevant_line_start}-L{relevant_line_end}"
-        else:
-            link = f"https://gitlab.com/codiumai/pr-agent/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{relevant_line_start}"
-        return link
-
-
     def generate_link_to_relevant_line_number(self, suggestion) -> str:
         try:
             relevant_file = suggestion['relevant file'].strip('`').strip("'")
@@ -468,6 +410,6 @@ class GitLabProvider(GitProvider):
                 return link
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Failed adding line link, error: {e}")
+                logging.info(f"Failed adding line link, error: {e}")
 
         return ""

pr_agent/git_providers/local_git_provider.py

@@ -1,3 +1,4 @@
+import logging
 from collections import Counter
 from pathlib import Path
 from typing import List
@@ -6,7 +7,6 @@ from git import Repo
 
 from pr_agent.config_loader import _find_repository_root, get_settings
 from pr_agent.git_providers.git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from pr_agent.log import get_logger
 
 
 class PullRequestMimic:
@@ -49,7 +49,7 @@ class LocalGitProvider(GitProvider):
         """
         Prepare the repository for PR-mimic generation.
         """
-        get_logger().debug('Preparing repository for PR-mimic generation...')
+        logging.debug('Preparing repository for PR-mimic generation...')
         if self.repo.is_dirty():
             raise ValueError('The repository is not in a clean state. Please commit or stash pending changes.')
         if self.target_branch_name not in self.repo.heads:
@@ -121,6 +121,9 @@ class LocalGitProvider(GitProvider):
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
         raise NotImplementedError('Publishing inline comments is not implemented for the local git provider')
 
+    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        raise NotImplementedError('Creating inline comments is not implemented for the local git provider')
+
     def publish_inline_comments(self, comments: list[dict]):
         raise NotImplementedError('Publishing inline comments is not implemented for the local git provider')
 
@@ -137,9 +140,6 @@ class LocalGitProvider(GitProvider):
     def remove_initial_comment(self):
         pass  # Not applicable to the local git provider, but required by the interface
 
-    def remove_comment(self, comment):
-        pass  # Not applicable to the local git provider, but required by the interface
-
     def get_languages(self):
         """
         Calculate percentage of languages in repository. Used for hunk prioritisation.
@@ -175,5 +175,5 @@ class LocalGitProvider(GitProvider):
     def get_issue_comments(self):
         raise NotImplementedError('Getting issue comments is not implemented for the local git provider')
 
-    def get_pr_labels(self):
+    def get_labels(self):
         raise NotImplementedError('Getting labels is not implemented for the local git provider')

pr_agent/git_providers/utils.py

@@ -1,37 +0,0 @@
-import copy
-import os
-import tempfile
-
-from dynaconf import Dynaconf
-
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger
-
-
-def apply_repo_settings(pr_url):
-    if get_settings().config.use_repo_settings_file:
-        repo_settings_file = None
-        try:
-            git_provider = get_git_provider()(pr_url)
-            repo_settings = git_provider.get_repo_settings()
-            if repo_settings:
-                repo_settings_file = None
-                fd, repo_settings_file = tempfile.mkstemp(suffix='.toml')
-                os.write(fd, repo_settings)
-                new_settings = Dynaconf(settings_files=[repo_settings_file])
-                for section, contents in new_settings.as_dict().items():
-                    section_dict = copy.deepcopy(get_settings().as_dict().get(section, {}))
-                    for key, value in contents.items():
-                        section_dict[key] = value
-                    get_settings().unset(section)
-                    get_settings().set(section, section_dict, merge=False)
-                    get_logger().info(f"Applying repo settings for section {section}, contents: {contents}")
-        except Exception as e:
-            get_logger().exception("Failed to apply repo settings", e)
-        finally:
-            if repo_settings_file:
-                try:
-                    os.remove(repo_settings_file)
-                except Exception as e:
-                    get_logger().error(f"Failed to remove temporary settings file {repo_settings_file}", e)

pr_agent/log/__init__.py

@@ -1,40 +0,0 @@
-import json
-import logging
-import sys
-from enum import Enum
-
-from loguru import logger
-
-
-class LoggingFormat(str, Enum):
-    CONSOLE = "CONSOLE"
-    JSON = "JSON"
-
-
-def json_format(record: dict) -> str:
-    return record["message"]
-
-
-def setup_logger(level: str = "INFO", fmt: LoggingFormat = LoggingFormat.CONSOLE):
-    level: int = logging.getLevelName(level.upper())
-    if type(level) is not int:
-        level = logging.INFO
-
-    if fmt == LoggingFormat.JSON:
-        logger.remove(None)
-        logger.add(
-            sys.stdout,
-            level=level,
-            format="{message}",
-            colorize=False,
-            serialize=True,
-        )
-    elif fmt == LoggingFormat.CONSOLE:
-        logger.remove(None)
-        logger.add(sys.stdout, level=level, colorize=True)
-
-    return logger
-
-
-def get_logger(*args, **kwargs):
-    return logger

pr_agent/secret_providers/google_cloud_storage_secret_provider.py

@@ -1,8 +1,9 @@
 import ujson
+
 from google.cloud import storage
 
 from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger
+from pr_agent.git_providers.gitlab_provider import logger
 from pr_agent.secret_providers.secret_provider import SecretProvider
 
 
@@ -14,7 +15,7 @@ class GoogleCloudStorageSecretProvider(SecretProvider):
             self.bucket_name = get_settings().google_cloud_storage.bucket_name
             self.bucket = self.client.bucket(self.bucket_name)
         except Exception as e:
-            get_logger().error(f"Failed to initialize Google Cloud Storage Secret Provider: {e}")
+            logger.error(f"Failed to initialize Google Cloud Storage Secret Provider: {e}")
             raise e
 
     def get_secret(self, secret_name: str) -> str:
@@ -22,7 +23,7 @@ class GoogleCloudStorageSecretProvider(SecretProvider):
             blob = self.bucket.blob(secret_name)
             return blob.download_as_string()
         except Exception as e:
-            get_logger().error(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}")
+            logger.error(f"Failed to get secret {secret_name} from Google Cloud Storage: {e}")
             return ""
 
     def store_secret(self, secret_name: str, secret_value: str):
@@ -30,5 +31,5 @@ class GoogleCloudStorageSecretProvider(SecretProvider):
             blob = self.bucket.blob(secret_name)
             blob.upload_from_string(secret_value)
         except Exception as e:
-            get_logger().error(f"Failed to store secret {secret_name} in Google Cloud Storage: {e}")
+            logger.error(f"Failed to store secret {secret_name} in Google Cloud Storage: {e}")
             raise e

pr_agent/servers/bitbucket_app.py

@@ -1,7 +1,9 @@
 import copy
 import hashlib
 import json
+import logging
 import os
+import sys
 import time
 
 import jwt
@@ -16,15 +18,9 @@ from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.git_providers.utils import apply_repo_settings
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.secret_providers import get_secret_provider
-from pr_agent.servers.github_action_runner import get_setting_or_env, is_true
-from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
-from pr_agent.tools.pr_description import PRDescription
-from pr_agent.tools.pr_reviewer import PRReviewer
 
-setup_logger(fmt=LoggingFormat.JSON)
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 router = APIRouter()
 secret_provider = get_secret_provider()
 
@@ -53,7 +49,7 @@ async def get_bearer_token(shared_secret: str, client_key: str):
         bearer_token = response.json()["access_token"]
         return bearer_token
     except Exception as e:
-        get_logger().error(f"Failed to get bearer token: {e}")
+        logging.error(f"Failed to get bearer token: {e}")
         raise e
 
 @router.get("/")
@@ -64,23 +60,21 @@ async def handle_manifest(request: Request, response: Response):
         manifest = manifest.replace("app_key", get_settings().bitbucket.app_key)
         manifest = manifest.replace("base_url", get_settings().bitbucket.base_url)
     except:
-        get_logger().error("Failed to replace api_key in Bitbucket manifest, trying to continue")
+        logging.error("Failed to replace api_key in Bitbucket manifest, trying to continue")
     manifest_obj = json.loads(manifest)
     return JSONResponse(manifest_obj)
 
 @router.post("/webhook")
 async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "bitbucket_app"}
+    print(request.headers)
-    get_logger().debug(request.headers)
     jwt_header = request.headers.get("authorization", None)
     if jwt_header:
         input_jwt = jwt_header.split(" ")[1]
     data = await request.json()
-    get_logger().debug(data)
+    print(data)
     async def inner():
         try:
             owner = data["data"]["repository"]["owner"]["username"]
-            log_context["sender"] = owner
             secrets = json.loads(secret_provider.get_secret(owner))
             shared_secret = secrets["shared_secret"]
             client_key = secrets["client_key"]
@@ -92,31 +86,13 @@ async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Req
             agent = PRAgent()
             if event == "pullrequest:created":
                 pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
-                log_context["api_url"] = pr_url
+                await agent.handle_request(pr_url, "review")
-                log_context["event"] = "pull_request"
-                if pr_url:
-                    with get_logger().contextualize(**log_context):
-                        apply_repo_settings(pr_url)
-                        auto_review = get_setting_or_env("BITBUCKET_APP.AUTO_REVIEW", None)
-                        if auto_review is None or is_true(auto_review):  # by default, auto review is enabled
-                            await PRReviewer(pr_url).run()
-                        auto_improve = get_setting_or_env("BITBUCKET_APP.AUTO_IMPROVE", None)
-                        if is_true(auto_improve):  # by default, auto improve is disabled
-                            await PRCodeSuggestions(pr_url).run()
-                        auto_describe = get_setting_or_env("BITBUCKET_APP.AUTO_DESCRIBE", None)
-                        if is_true(auto_describe):  # by default, auto describe is disabled
-                            await PRDescription(pr_url).run()
-                # with get_logger().contextualize(**log_context):
-                #     await agent.handle_request(pr_url, "review")
             elif event == "pullrequest:comment_created":
                 pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
-                log_context["api_url"] = pr_url
-                log_context["event"] = "comment"
                 comment_body = data["data"]["comment"]["content"]["raw"]
-                with get_logger().contextualize(**log_context):
                 await agent.handle_request(pr_url, comment_body)
         except Exception as e:
-            get_logger().error(f"Failed to handle webhook: {e}")
+            logging.error(f"Failed to handle webhook: {e}")
     background_tasks.add_task(inner)
     return "OK"
 
@@ -127,10 +103,9 @@ async def handle_github_webhooks(request: Request, response: Response):
 @router.post("/installed")
 async def handle_installed_webhooks(request: Request, response: Response):
     try:
-        get_logger().info("handle_installed_webhooks")
+        print(request.headers)
-        get_logger().info(request.headers)
         data = await request.json()
-        get_logger().info(data)
+        print(data)
         shared_secret = data["sharedSecret"]
         client_key = data["clientKey"]
         username = data["principal"]["username"]
@@ -140,15 +115,13 @@ async def handle_installed_webhooks(request: Request, response: Response):
         }
         secret_provider.store_secret(username, json.dumps(secrets))
     except Exception as e:
-        get_logger().error(f"Failed to register user: {e}")
+        logging.error(f"Failed to register user: {e}")
         return JSONResponse({"error": "Unable to register user"}, status_code=500)
 
 @router.post("/uninstalled")
 async def handle_uninstalled_webhooks(request: Request, response: Response):
-    get_logger().info("handle_uninstalled_webhooks")
-
     data = await request.json()
-    get_logger().info(data)
+    print(data)
 
 
 def start():

pr_agent/servers/bitbucket_pipeline_runner.py

@@ -0,0 +1,34 @@
+import os
+from pr_agent.agent.pr_agent import PRAgent
+from pr_agent.config_loader import get_settings
+from pr_agent.tools.pr_reviewer import PRReviewer
+import asyncio
+
+async def run_action():
+    try:
+        pull_request_id = os.environ.get("BITBUCKET_PR_ID", '')
+        slug = os.environ.get("BITBUCKET_REPO_SLUG", '')
+        workspace = os.environ.get("BITBUCKET_WORKSPACE", '')
+        bearer_token = os.environ.get('BITBUCKET_BEARER_TOKEN', None)
+        OPENAI_KEY = os.environ.get('OPENAI_API_KEY') or os.environ.get('OPENAI.KEY')
+        OPENAI_ORG = os.environ.get('OPENAI_ORG') or os.environ.get('OPENAI.ORG')
+        # Check if required environment variables are set
+        if not bearer_token:
+            print("BITBUCKET_BEARER_TOKEN not set")
+            return
+        
+        if not OPENAI_KEY:
+            print("OPENAI_KEY not set")
+            return
+        # Set the environment variables in the settings
+        get_settings().set("BITBUCKET.BEARER_TOKEN", bearer_token)
+        get_settings().set("OPENAI.KEY", OPENAI_KEY)
+        if OPENAI_ORG:
+            get_settings().set("OPENAI.ORG", OPENAI_ORG)
+        if pull_request_id and slug and workspace:
+            pr_url = f"https://bitbucket.org/{workspace}/{slug}/pull-requests/{pull_request_id}"
+            await PRReviewer(pr_url).run()
+    except Exception as e:
+        print(f"An error occurred: {e}")
+if __name__ == "__main__":
+    asyncio.run(run_action())

pr_agent/servers/bitbucket_server_webhook.py

@@ -1,80 +0,0 @@
-import json
-import os
-
-import uvicorn
-from fastapi import APIRouter, FastAPI
-from fastapi.encoders import jsonable_encoder
-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.config_loader import get_settings
-from pr_agent.log import get_logger
-from pr_agent.servers.utils import verify_signature
-
-router = APIRouter()
-
-
-def handle_request(
-    background_tasks: BackgroundTasks, url: str, body: str, log_context: dict
-):
-    log_context["action"] = body
-    log_context["api_url"] = url
-    with get_logger().contextualize(**log_context):
-        background_tasks.add_task(PRAgent().handle_request, url, body)
-
-
-@router.post("/")
-async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "bitbucket_server"}
-    data = await request.json()
-    get_logger().info(json.dumps(data))
-
-    webhook_secret = get_settings().get("BITBUCKET_SERVER.WEBHOOK_SECRET", None)
-    if webhook_secret:
-        body_bytes = await request.body()
-        signature_header = request.headers.get("x-hub-signature", None)
-        verify_signature(body_bytes, webhook_secret, signature_header)
-
-    pr_id = data["pullRequest"]["id"]
-    repository_name = data["pullRequest"]["toRef"]["repository"]["slug"]
-    project_name = data["pullRequest"]["toRef"]["repository"]["project"]["key"]
-    bitbucket_server = get_settings().get("BITBUCKET_SERVER.URL")
-    pr_url = f"{bitbucket_server}/projects/{project_name}/repos/{repository_name}/pull-requests/{pr_id}"
-
-    log_context["api_url"] = pr_url
-    log_context["event"] = "pull_request"
-
-    if data["eventKey"] == "pr:opened":
-        body = "review"
-    elif data["eventKey"] == "pr:comment:added":
-        body = data["comment"]["text"]
-    else:
-        return JSONResponse(
-            status_code=status.HTTP_400_BAD_REQUEST,
-            content=json.dumps({"message": "Unsupported event"}),
-        )
-
-    handle_request(background_tasks, pr_url, body, log_context)
-    return JSONResponse(
-        status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"})
-    )
-
-
-@router.get("/")
-async def root():
-    return {"status": "ok"}
-
-
-def start():
-    app = FastAPI(middleware=[Middleware(RawContextMiddleware)])
-    app.include_router(router)
-    uvicorn.run(app, host="0.0.0.0", port=int(os.environ.get("PORT", "3000")))
-
-
-if __name__ == "__main__":
-    start()

pr_agent/servers/gerrit_server.py

@@ -1,4 +1,6 @@
 import copy
+import logging
+import sys
 from enum import Enum
 from json import JSONDecodeError
 
@@ -10,10 +12,9 @@ from starlette_context import context
 from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import get_settings, global_settings
+from pr_agent.config_loader import global_settings, get_settings
-from pr_agent.log import get_logger, setup_logger
 
-setup_logger()
+logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 router = APIRouter()
 
 
@@ -34,7 +35,7 @@ class Item(BaseModel):
 
 @router.post("/api/v1/gerrit/{action}")
 async def handle_gerrit_request(action: Action, item: Item):
-    get_logger().debug("Received a Gerrit request")
+    logging.debug("Received a Gerrit request")
     context["settings"] = copy.deepcopy(global_settings)
 
     if action == Action.ask:
@@ -53,7 +54,7 @@ async def get_body(request):
     try:
         body = await request.json()
     except JSONDecodeError as e:
-        get_logger().error("Error parsing request body", e)
+        logging.error("Error parsing request body", e)
         return {}
     return body
 

pr_agent/servers/github_action_runner.py

@@ -1,34 +1,15 @@
 import asyncio
 import json
 import os
-from typing import Union
 
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.git_providers.utils import apply_repo_settings
-from pr_agent.log import get_logger
 from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
 from pr_agent.tools.pr_description import PRDescription
 from pr_agent.tools.pr_reviewer import PRReviewer
 
 
-def is_true(value: Union[str, bool]) -> bool:
-    if isinstance(value, bool):
-        return value
-    if isinstance(value, str):
-        return value.lower() == 'true'
-    return False
-
-
-def get_setting_or_env(key: str, default: Union[str, bool] = None) -> Union[str, bool]:
-    try:
-        value = get_settings().get(key, default)
-    except AttributeError:  # TBD still need to debug why this happens on GitHub Actions
-        value = os.getenv(key, None) or os.getenv(key.upper(), None) or os.getenv(key.lower(), None) or default
-    return value
-
-
 async def run_action():
     # Get environment variables
     GITHUB_EVENT_NAME = os.environ.get('GITHUB_EVENT_NAME')
@@ -38,6 +19,7 @@ async def run_action():
     GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN')
     get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
 
+
     # Check if required environment variables are set
     if not GITHUB_EVENT_NAME:
         print("GITHUB_EVENT_NAME not set")
@@ -67,29 +49,20 @@ async def run_action():
         print(f"Failed to parse JSON: {e}")
         return
 
-    try:
-        get_logger().info("Applying repo settings")
-        pr_url = event_payload.get("pull_request", {}).get("html_url")
-        if pr_url:
-            apply_repo_settings(pr_url)
-            get_logger().info(f"enable_custom_labels: {get_settings().config.enable_custom_labels}")
-    except Exception as e:
-        get_logger().info(f"github action: failed to apply repo settings: {e}")
-
     # Handle pull request event
     if GITHUB_EVENT_NAME == "pull_request":
         action = event_payload.get("action")
         if action in ["opened", "reopened"]:
             pr_url = event_payload.get("pull_request", {}).get("url")
             if pr_url:
-                auto_review = get_setting_or_env("GITHUB_ACTION.AUTO_REVIEW", None)
+                auto_review = os.environ.get('github_action.auto_review', None)
-                if auto_review is None or is_true(auto_review):
+                if auto_review is None or (isinstance(auto_review, str) and auto_review.lower() == 'true'):
                     await PRReviewer(pr_url).run()
-                auto_describe = get_setting_or_env("GITHUB_ACTION.AUTO_DESCRIBE", None)
+                auto_describe = os.environ.get('github_action.auto_describe', None)
-                if is_true(auto_describe):
+                if isinstance(auto_describe, str) and auto_describe.lower() == 'true':
                     await PRDescription(pr_url).run()
-                auto_improve = get_setting_or_env("GITHUB_ACTION.AUTO_IMPROVE", None)
+                auto_improve = os.environ.get('github_action.auto_improve', None)
-                if is_true(auto_improve):
+                if isinstance(auto_improve, str) and auto_improve.lower() == 'true':
                     await PRCodeSuggestions(pr_url).run()
 
     # Handle issue comment event

pr_agent/servers/github_app.py

@@ -1,7 +1,9 @@
 import copy
+import logging
+import sys
 import os
-import asyncio.locks
+import time
-from typing import Any, Dict, List, Tuple
+from typing import Any, Dict
 
 import uvicorn
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
@@ -13,13 +15,9 @@ 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.utils import apply_repo_settings
+from pr_agent.servers.utils import verify_signature
-from pr_agent.git_providers.git_provider import IncrementalPR
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
-from pr_agent.servers.utils import verify_signature, DefaultDictWithTimeout
-
-setup_logger(fmt=LoggingFormat.JSON)
 
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 router = APIRouter()
 
 
@@ -30,11 +28,11 @@ async def handle_github_webhooks(request: Request, response: Response):
     Verifies the request signature, parses the request body, and passes it to the handle_request function for further
     processing.
     """
-    get_logger().debug("Received a GitHub webhook")
+    logging.debug("Received a GitHub webhook")
 
     body = await get_body(request)
 
-    get_logger().debug(f'Request body:\n{body}')
+    logging.debug(f'Request body:\n{body}')
     installation_id = body.get("installation", {}).get("id")
     context["installation_id"] = installation_id
     context["settings"] = copy.deepcopy(global_settings)
@@ -46,14 +44,13 @@ async def handle_github_webhooks(request: Request, response: Response):
 @router.post("/api/v1/marketplace_webhooks")
 async def handle_marketplace_webhooks(request: Request, response: Response):
     body = await get_body(request)
-    get_logger().info(f'Request body:\n{body}')
+    logging.info(f'Request body:\n{body}')
-
 
 async def get_body(request):
     try:
         body = await request.json()
     except Exception as e:
-        get_logger().error("Error parsing request body", e)
+        logging.error("Error parsing request body", e)
         raise HTTPException(status_code=400, detail="Error parsing request body") from e
     webhook_secret = getattr(get_settings().github, 'webhook_secret', None)
     if webhook_secret:
@@ -63,9 +60,7 @@ async def get_body(request):
     return body
 
 
-_duplicate_requests_cache = DefaultDictWithTimeout(ttl=get_settings().github_app.duplicate_requests_cache_ttl)
+_duplicate_requests_cache = {}
-_duplicate_push_triggers = DefaultDictWithTimeout(ttl=get_settings().github_app.push_trigger_pending_tasks_ttl)
-_pending_task_duplicate_push_conditions = DefaultDictWithTimeout(asyncio.locks.Condition, ttl=get_settings().github_app.push_trigger_pending_tasks_ttl)
 
 
 async def handle_request(body: Dict[str, Any], event: str):
@@ -81,8 +76,8 @@ async def handle_request(body: Dict[str, Any], event: str):
         return {}
     agent = PRAgent()
     bot_user = get_settings().github_app.bot_user
-    sender = body.get("sender", {}).get("login")
+    logging.info(f"action: '{action}'")
-    log_context = {"action": action, "event": event, "sender": sender, "server_type": "github_app"}
+    logging.info(f"event: '{event}'")
 
     if get_settings().github_app.duplicate_requests_cache and _is_duplicate_request(body):
         return {}
@@ -92,135 +87,56 @@ async def handle_request(body: Dict[str, Any], event: str):
         if "comment" not in body:
             return {}
         comment_body = body.get("comment", {}).get("body")
+        sender = body.get("sender", {}).get("login")
         if sender and bot_user in sender:
-            get_logger().info(f"Ignoring comment from {bot_user} user")
+            logging.info(f"Ignoring comment from {bot_user} user")
             return {}
-        get_logger().info(f"Processing comment from {sender} user")
+        logging.info(f"Processing comment from {sender} user")
         if "issue" in body and "pull_request" in body["issue"] and "url" in body["issue"]["pull_request"]:
             api_url = body["issue"]["pull_request"]["url"]
         elif "comment" in body and "pull_request_url" in body["comment"]:
             api_url = body["comment"]["pull_request_url"]
         else:
             return {}
-        log_context["api_url"] = api_url
+        logging.info(body)
-        get_logger().info(body)
+        logging.info(f"Handling comment because of event={event} and action={action}")
-        get_logger().info(f"Handling comment because of event={event} and action={action}")
         comment_id = body.get("comment", {}).get("id")
         provider = get_git_provider()(pr_url=api_url)
-        with get_logger().contextualize(**log_context):
         await agent.handle_request(api_url, comment_body, notify=lambda: provider.add_eyes_reaction(comment_id))
 
     # handle pull_request event:
     #   automatically review opened/reopened/ready_for_review PRs as long as they're not in draft,
     #   as well as direct review requests from the bot
-    elif event == 'pull_request' and action != 'synchronize':
+    elif event == 'pull_request':
-        pull_request, api_url = _check_pull_request_event(action, body, log_context, bot_user)
+        pull_request = body.get("pull_request")
-        if not (pull_request and api_url):
+        if not pull_request:
+            return {}
+        api_url = pull_request.get("url")
+        if not api_url:
+            return {}
+        if pull_request.get("draft", True) or pull_request.get("state") != "open" or pull_request.get("user", {}).get("login", "") == bot_user:
             return {}
         if action in get_settings().github_app.handle_pr_actions:
             if action == "review_requested":
                 if body.get("requested_reviewer", {}).get("login", "") != bot_user:
                     return {}
-            get_logger().info(f"Performing review for {api_url=} because of {event=} and {action=}")
+                if pull_request.get("created_at") == pull_request.get("updated_at"):
-            await _perform_commands("pr_commands", agent, body, api_url, log_context)
-
-    # handle pull_request event with synchronize action - "push trigger" for new commits
-    elif event == 'pull_request' and action == 'synchronize':
-        pull_request, api_url = _check_pull_request_event(action, body, log_context, bot_user)
-        if not (pull_request and api_url):
-            return {}
-
-        apply_repo_settings(api_url)
-        if not get_settings().github_app.handle_push_trigger:
-            return {}
-
-        # TODO: do we still want to get the list of commits to filter bot/merge commits?
-        before_sha = body.get("before")
-        after_sha = body.get("after")
-        merge_commit_sha = pull_request.get("merge_commit_sha")
-        if before_sha == after_sha:
-            return {}
-        if get_settings().github_app.push_trigger_ignore_merge_commits and after_sha == merge_commit_sha:
-            return {}
-        if get_settings().github_app.push_trigger_ignore_bot_commits and body.get("sender", {}).get("login", "") == bot_user:
-            return {}
-
-        # Prevent triggering multiple times for subsequent push triggers when one is enough:
-        # The first push will trigger the processing, and if there's a second push in the meanwhile it will wait.
-        # Any more events will be discarded, because they will all trigger the exact same processing on the PR.
-        # We let the second event wait instead of discarding it because while the first event was being processed,
-        # more commits may have been pushed that led to the subsequent events,
-        # so we keep just one waiting as a delegate to trigger the processing for the new commits when done waiting.
-        current_active_tasks = _duplicate_push_triggers.setdefault(api_url, 0)
-        max_active_tasks = 2 if get_settings().github_app.push_trigger_pending_tasks_backlog else 1
-        if current_active_tasks < max_active_tasks:
-            # first task can enter, and second tasks too if backlog is enabled
-            get_logger().info(
-                f"Continue processing push trigger for {api_url=} because there are {current_active_tasks} active tasks"
-            )
-            _duplicate_push_triggers[api_url] += 1
-        else:
-            get_logger().info(
-                f"Skipping push trigger for {api_url=} because another event already triggered the same processing"
-            )
-            return {}
-        async with _pending_task_duplicate_push_conditions[api_url]:
-            if current_active_tasks == 1:
-                # second task waits
-                get_logger().info(
-                    f"Waiting to process push trigger for {api_url=} because the first task is still in progress"
-                )
-                await _pending_task_duplicate_push_conditions[api_url].wait()
-                get_logger().info(f"Finished waiting to process push trigger for {api_url=} - continue with flow")
-
-        try:
-            if get_settings().github_app.push_trigger_wait_for_initial_review and not get_git_provider()(api_url, incremental=IncrementalPR(True)).previous_review:
-                get_logger().info(f"Skipping incremental review because there was no initial review for {api_url=} yet")
-                return {}
-            get_logger().info(f"Performing incremental review for {api_url=} because of {event=} and {action=}")
-            await _perform_commands("push_commands", agent, body, api_url, log_context)
-
-        finally:
-            # release the waiting task block
-            async with _pending_task_duplicate_push_conditions[api_url]:
-                _pending_task_duplicate_push_conditions[api_url].notify(1)
-                _duplicate_push_triggers[api_url] -= 1
-
-    get_logger().info("event or action does not require handling")
-    return {}
-
-
-def _check_pull_request_event(action: str, body: dict, log_context: dict, bot_user: str) -> Tuple[Dict[str, Any], str]:
-    invalid_result = {}, ""
-    pull_request = body.get("pull_request")
-    if not pull_request:
-        return invalid_result
-    api_url = pull_request.get("url")
-    if not api_url:
-        return invalid_result
-    log_context["api_url"] = api_url
-    if pull_request.get("draft", True) or pull_request.get("state") != "open" or pull_request.get("user", {}).get("login", "") == bot_user:
-        return invalid_result
-    if action in ("review_requested", "synchronize") and pull_request.get("created_at") == pull_request.get("updated_at"):
                     # avoid double reviews when opening a PR for the first time
-        return invalid_result
+                    return {}
-    return pull_request, api_url
+            logging.info(f"Performing review because of event={event} and action={action}")
-
+            for command in get_settings().github_app.pr_commands:
-
-async def _perform_commands(commands_conf: str, agent: PRAgent, body: dict, api_url: str, log_context: dict):
-    apply_repo_settings(api_url)
-    commands = get_settings().get(f"github_app.{commands_conf}")
-    for command in commands:
                 split_command = command.split(" ")
                 command = split_command[0]
                 args = split_command[1:]
                 other_args = update_settings_from_args(args)
                 new_command = ' '.join([command] + other_args)
-        get_logger().info(body)
+                logging.info(body)
-        get_logger().info(f"Performing command: {new_command}")
+                logging.info(f"Performing command: {new_command}")
-        with get_logger().contextualize(**log_context):
                 await agent.handle_request(api_url, new_command)
 
+    logging.info("event or action does not require handling")
+    return {}
+
 
 def _is_duplicate_request(body: Dict[str, Any]) -> bool:
     """
@@ -228,11 +144,16 @@ def _is_duplicate_request(body: Dict[str, Any]) -> bool:
     This function checks if the request is duplicate and if so - ignores it.
     """
     request_hash = hash(str(body))
-    get_logger().info(f"request_hash: {request_hash}")
+    logging.info(f"request_hash: {request_hash}")
-    is_duplicate = _duplicate_requests_cache.get(request_hash, False)
+    request_time = time.monotonic()
-    _duplicate_requests_cache[request_hash] = True
+    ttl = get_settings().github_app.duplicate_requests_cache_ttl  # in seconds
+    to_delete = [key for key, key_time in _duplicate_requests_cache.items() if request_time - key_time > ttl]
+    for key in to_delete:
+        del _duplicate_requests_cache[key]
+    is_duplicate = request_hash in _duplicate_requests_cache
+    _duplicate_requests_cache[request_hash] = request_time
     if is_duplicate:
-        get_logger().info(f"Ignoring duplicate request {request_hash}")
+        logging.info(f"Ignoring duplicate request {request_hash}")
     return is_duplicate
 
 

pr_agent/servers/github_polling.py

@@ -1,4 +1,6 @@
 import asyncio
+import logging
+import sys
 from datetime import datetime, timezone
 
 import aiohttp
@@ -6,10 +8,9 @@ import aiohttp
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.help import bot_help_text
 
-setup_logger(fmt=LoggingFormat.JSON)
+logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 NOTIFICATION_URL = "https://api.github.com/notifications"
 
 
@@ -93,7 +94,7 @@ async def polling_loop():
                                             comment_body = comment['body'] if 'body' in comment else ''
                                             commenter_github_user = comment['user']['login'] \
                                                 if 'user' in comment else ''
-                                            get_logger().info(f"Commenter: {commenter_github_user}\nComment: {comment_body}")
+                                            logging.info(f"Commenter: {commenter_github_user}\nComment: {comment_body}")
                                             user_tag = "@" + user_id
                                             if user_tag not in comment_body:
                                                 continue
@@ -111,7 +112,7 @@ async def polling_loop():
                         print(f"Failed to fetch notifications. Status code: {response.status}")
 
             except Exception as e:
-                get_logger().error(f"Exception during processing of a notification: {e}")
+                logging.error(f"Exception during processing of a notification: {e}")
 
 
 if __name__ == '__main__':

pr_agent/servers/gitlab_webhook.py

@@ -1,5 +1,7 @@
 import copy
 import json
+import logging
+import sys
 
 import uvicorn
 from fastapi import APIRouter, FastAPI, Request, status
@@ -12,37 +14,26 @@ from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.agent.pr_agent import PRAgent
 from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.secret_providers import get_secret_provider
 
-setup_logger(fmt=LoggingFormat.JSON)
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 router = APIRouter()
 
 secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
 
 
-def handle_request(background_tasks: BackgroundTasks, url: str, body: str, log_context: dict):
-    log_context["action"] = body
-    log_context["event"] = "pull_request" if body == "/review" else "comment"
-    log_context["api_url"] = url
-    with get_logger().contextualize(**log_context):
-        background_tasks.add_task(PRAgent().handle_request, url, body)
-
-
 @router.post("/webhook")
 async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "gitlab_app"}
     if request.headers.get("X-Gitlab-Token") and secret_provider:
         request_token = request.headers.get("X-Gitlab-Token")
         secret = secret_provider.get_secret(request_token)
         try:
             secret_dict = json.loads(secret)
             gitlab_token = secret_dict["gitlab_token"]
-            log_context["sender"] = secret_dict.get("token_name", secret_dict.get("id", "unknown"))
             context["settings"] = copy.deepcopy(global_settings)
             context["settings"].gitlab.personal_access_token = gitlab_token
         except Exception as e:
-            get_logger().error(f"Failed to validate secret {request_token}: {e}")
+            logging.error(f"Failed to validate secret {request_token}: {e}")
             return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
     elif get_settings().get("GITLAB.SHARED_SECRET"):
         secret = get_settings().get("GITLAB.SHARED_SECRET")
@@ -54,17 +45,17 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
     if not gitlab_token:
         return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
     data = await request.json()
-    get_logger().info(json.dumps(data))
+    logging.info(json.dumps(data))
     if data.get('object_kind') == 'merge_request' and data['object_attributes'].get('action') in ['open', 'reopen']:
-        get_logger().info(f"A merge request has been opened: {data['object_attributes'].get('title')}")
+        logging.info(f"A merge request has been opened: {data['object_attributes'].get('title')}")
         url = data['object_attributes'].get('url')
-        handle_request(background_tasks, url, "/review", log_context)
+        background_tasks.add_task(PRAgent().handle_request, url, "/review")
     elif data.get('object_kind') == 'note' and data['event_type'] == 'note':
         if 'merge_request' in data:
             mr = data['merge_request']
             url = mr.get('url')
             body = data.get('object_attributes', {}).get('note')
-            handle_request(background_tasks, url, body, log_context)
+            background_tasks.add_task(PRAgent().handle_request, url, body)
     return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
 
 

pr_agent/servers/help.py

@@ -1,20 +1,17 @@
-commands_text = "> - **/review**: Request a review of your Pull Request.   \n" \
+commands_text = "> **/review [-i]**: Request a review of your Pull Request. For an incremental review, which only " \
-                "> - **/describe**: Update the PR title and description based on the contents of the PR.   \n" \
+                "considers changes since the last review, include the '-i' option.\n" \
-                "> - **/improve [--extended]**: Suggest code improvements. Extended mode provides a higher quality feedback.   \n" \
+                "> **/describe**: Modify the PR title and description based on the contents of the PR.\n" \
-                "> - **/ask \\<QUESTION\\>**: Ask a question about the PR.   \n" \
+                "> **/improve [--extended]**: Suggest improvements to the code in the PR. Extended mode employs several calls, and provides a more thorough feedback. \n" \
-                "> - **/update_changelog**: Update the changelog based on the PR's contents.   \n" \
+                "> **/ask \\<QUESTION\\>**: Pose a question about the PR.\n" \
-                "> - **/add_docs** 💎: Generate docstring for new components introduced in the PR.   \n" \
+                "> **/update_changelog**: Update the changelog based on the PR's contents.\n\n" \
-                "> - **/generate_labels** 💎: Generate labels for the PR based on the PR's contents.   \n" \
+                ">To edit any configuration parameter from **configuration.toml**, add --config_path=new_value\n" \
-                "> - **/analyze** 💎: Automatically analyzes the PR, and presents changes walkthrough for each component.   \n\n" \
-                ">See the [tools guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md) for more details.\n" \
-                ">To edit any configuration parameter from the [configuration.toml](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml), add --config_path=new_value.  \n" \
                 ">For example: /review --pr_reviewer.extra_instructions=\"focus on the file: ...\" \n" \
-                ">To list the possible configuration parameters, add a **/config** comment.   \n" \
+                ">To list the possible configuration parameters, use the **/config** command.\n" \
 
 
 def bot_help_text(user: str):
-    return f"> Tag me in a comment '@{user}' and add one of the following commands:  \n" + commands_text
+    return f"> Tag me in a comment '@{user}' and add one of the following commands:\n" + commands_text
 
 
-actions_help_text = "> To invoke the PR-Agent, add a comment using one of the following commands:  \n" + \
+actions_help_text = "> To invoke the PR-Agent, add a comment using one of the following commands:\n" + \
                     commands_text

pr_agent/servers/serverless.py

@@ -1,13 +1,14 @@
+import logging
+
 from fastapi import FastAPI
 from mangum import Mangum
-from starlette.middleware import Middleware
-from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.servers.github_app import router
 
+logger = logging.getLogger()
+logger.setLevel(logging.DEBUG)
 
-middleware = [Middleware(RawContextMiddleware)]
+app = FastAPI()
-app = FastAPI(middleware=middleware)
 app.include_router(router)
 
 handler = Mangum(app, lifespan="off")

pr_agent/servers/utils.py

@@ -1,8 +1,5 @@
 import hashlib
 import hmac
-import time
-from collections import defaultdict
-from typing import Callable, Any
 
 from fastapi import HTTPException
 
@@ -28,59 +25,3 @@ def verify_signature(payload_body, secret_token, signature_header):
 class RateLimitExceeded(Exception):
     """Raised when the git provider API rate limit has been exceeded."""
     pass
-
-
-class DefaultDictWithTimeout(defaultdict):
-    """A defaultdict with a time-to-live (TTL)."""
-
-    def __init__(
-        self,
-        default_factory: Callable[[], Any] = None,
-        ttl: int = None,
-        refresh_interval: int = 60,
-        update_key_time_on_get: bool = True,
-        *args,
-        **kwargs,
-    ):
-        """
-        Args:
-            default_factory: The default factory to use for keys that are not in the dictionary.
-            ttl: The time-to-live (TTL) in seconds.
-            refresh_interval: How often to refresh the dict and delete items older than the TTL.
-            update_key_time_on_get: Whether to update the access time of a key also on get (or only when set).
-        """
-        super().__init__(default_factory, *args, **kwargs)
-        self.__key_times = dict()
-        self.__ttl = ttl
-        self.__refresh_interval = refresh_interval
-        self.__update_key_time_on_get = update_key_time_on_get
-        self.__last_refresh = self.__time() - self.__refresh_interval
-
-    @staticmethod
-    def __time():
-        return time.monotonic()
-
-    def __refresh(self):
-        if self.__ttl is None:
-            return
-        request_time = self.__time()
-        if request_time - self.__last_refresh > self.__refresh_interval:
-            return
-        to_delete = [key for key, key_time in self.__key_times.items() if request_time - key_time > self.__ttl]
-        for key in to_delete:
-            del self[key]
-        self.__last_refresh = request_time
-
-    def __getitem__(self, __key):
-        if self.__update_key_time_on_get:
-            self.__key_times[__key] = self.__time()
-        self.__refresh()
-        return super().__getitem__(__key)
-
-    def __setitem__(self, __key, __value):
-        self.__key_times[__key] = self.__time()
-        return super().__setitem__(__key, __value)
-
-    def __delitem__(self, __key):
-        del self.__key_times[__key]
-        return super().__delitem__(__key)

pr_agent/settings/.secrets_template.toml

@@ -34,14 +34,7 @@ key = "" # Optional, uncomment if you want to use Huggingface Inference API. Acq
 api_base = "" # the base url for your huggingface inference endpoint 
 
 [ollama]
-api_base = "" # the base url for your local Llama 2, Code Llama, and other models inference endpoint. Acquire through https://ollama.ai/
+api_base = "" # the base url for your huggingface inference endpoint 
-
-[vertexai]
-vertex_project = "" # the google cloud platform project name for your vertexai deployment
-vertex_location = "" # the google cloud platform location for your vertexai deployment
-
-[aws]
-bedrock_region = "" # the AWS region to call Bedrock APIs
 
 [github]
 # ---- Set the following only for deployment type == "user"
@@ -65,11 +58,6 @@ personal_access_token = ""
 # For Bitbucket personal/repository bearer token
 bearer_token = ""
 
-[bitbucket_server]
-# For Bitbucket Server bearer token
-auth_token = ""
-webhook_secret = ""
-
 # For Bitbucket app
 app_key = ""
 base_url = ""

pr_agent/settings/configuration.toml

@@ -1,5 +1,5 @@
 [config]
-model="gpt-4" # "gpt-4-1106-preview"
+model="gpt-4"
 fallback_models=["gpt-3.5-turbo-16k"]
 git_provider="github"
 publish_output=true
@@ -7,70 +7,42 @@ publish_output_progress=true
 verbosity_level=0 # 0,1,2
 use_extra_bad_extensions=false
 use_repo_settings_file=true
-use_global_settings_file=true
 ai_timeout=180
 max_description_tokens = 500
 max_commits_tokens = 500
-max_model_tokens = 32000 # Limits the maximum number of tokens that can be used by any model, regardless of the model's default capabilities.
 patch_extra_lines = 3
 secret_provider="google_cloud_storage"
 cli_mode=false
 
 [pr_reviewer] # /review #
-# enable/disable features
 require_focused_review=false
 require_score_review=false
 require_tests_review=true
 require_security_review=true
 require_estimate_effort_to_review=true
-# soc2
-require_soc2_ticket=false
-soc2_ticket_prompt="Does the PR description include a link to ticket in a project management system (e.g., Jira, Asana, Trello, etc.) ?"
-# general options
 num_code_suggestions=4
 inline_code_comments = false
 ask_and_reflect=false
-#automatic_review=true
+automatic_review=true
-remove_previous_review_comment=false
-persistent_comment=true
 extra_instructions = ""
-# review labels
-enable_review_labels_security=true
-enable_review_labels_effort=false
-# specific configurations for incremental review (/review -i)
-require_all_thresholds_for_incremental_review=false
-minimal_commits_for_incremental_review=0
-minimal_minutes_for_incremental_review=0
-enable_help_text=true # Determines whether to include help text in the PR review. Enabled by default.
 
 [pr_description] # /describe #
 publish_labels=true
 publish_description_as_comment=false
 add_original_user_description=false
 keep_original_user_title=false
-use_bullet_points=true
 extra_instructions = ""
-enable_pr_type=true
-final_update_message = true
-## changes walkthrough section
-enable_semantic_files_types=true
-collapsible_file_list='adaptive' # true, false, 'adaptive'
 # markers
 use_description_markers=false
 include_generated_by_header=true
 
-#custom_labels = ['Bug fix', 'Tests', 'Bug fix with tests', 'Enhancement', 'Documentation', 'Other']
-
 [pr_questions] # /ask #
 
 [pr_code_suggestions] # /improve #
 num_code_suggestions=4
-summarize = false
-include_improved_code = true
 extra_instructions = ""
 rank_suggestions = false
 # params for '/improve --extended' mode
-auto_extended_mode=false
 num_code_suggestions_per_chunk=8
 rank_extended_suggestions = true
 max_number_of_calls = 5
@@ -84,15 +56,12 @@ docs_style = "Sphinx Style" # "Google Style with Args, Returns, Attributes...etc
 push_changelog_changes=false
 extra_instructions = ""
 
-[pr_analyze] # /analyze #
-
 [pr_config] # /config #
 
 [github]
 # The type of deployment to create. Valid values are 'app' or 'user'.
 deployment_type = "user"
 ratelimit_retries = 5
-base_url = "https://api.github.com"
 
 [github_action]
 # auto_review = true    # set as env var in .github/workflows/pr-agent.yaml
@@ -111,31 +80,7 @@ duplicate_requests_cache_ttl = 60  # in seconds
 handle_pr_actions = ['opened', 'reopened', 'ready_for_review', 'review_requested']
 pr_commands = [
     "/describe --pr_description.add_original_user_description=true --pr_description.keep_original_user_title=true",
-    "/review",
+    "/auto_review",
-]
-# settings for "pull_request" event with "synchronize" action - used to detect and handle push triggers for new commits
-handle_push_trigger = false
-push_trigger_ignore_bot_commits = true
-push_trigger_ignore_merge_commits = true
-push_trigger_wait_for_initial_review = true
-push_trigger_pending_tasks_backlog = true
-push_trigger_pending_tasks_ttl = 300
-push_commands = [
-    "/describe --pr_description.add_original_user_description=true --pr_description.keep_original_user_title=true",
-    """/auto_review -i \
-       --pr_reviewer.require_focused_review=false \
-       --pr_reviewer.require_score_review=false \
-       --pr_reviewer.require_tests_review=false \
-       --pr_reviewer.require_security_review=false \
-       --pr_reviewer.require_estimate_effort_to_review=false \
-       --pr_reviewer.num_code_suggestions=0 \
-       --pr_reviewer.inline_code_comments=false \
-       --pr_reviewer.remove_previous_review_comment=true \
-       --pr_reviewer.require_all_thresholds_for_incremental_review=false \
-       --pr_reviewer.minimal_commits_for_incremental_review=5 \
-       --pr_reviewer.minimal_minutes_for_incremental_review=30 \
-       --pr_reviewer.extra_instructions='' \
-    """
 ]
 
 [gitlab]
@@ -151,12 +96,6 @@ magic_word = "AutoReview"
 # Polling interval
 polling_interval_seconds = 30
 
-[bitbucket_app]
-#auto_review = true    # set as config var in .pr_agent.toml
-#auto_describe = true  # set as config var in .pr_agent.toml
-#auto_improve = true   # set as config var in .pr_agent.toml
-
-
 [local]
 # LocalGitProvider settings - uncomment to use paths other than default
 # description_path= "path/to/description.md"
@@ -172,11 +111,6 @@ polling_interval_seconds = 30
 # token to authenticate in the patch server
 # patch_server_token = ""
 
-[bitbucket_server]
-# URL to the BitBucket Server instance
-# url = "https://git.bitbucket.com"
-url = ""
-
 [litellm]
 #use_client = false
 
@@ -184,12 +118,8 @@ url = ""
 skip_comments = false
 force_update_dataset = false
 max_issues_to_scan = 500
-vectordb = "pinecone"
 
 [pinecone]
 # fill and place in .secrets.toml
 #api_key = ...
 # environment = "gcp-starter"
-
-[lancedb]
-uri = "./lancedb"

pr_agent/settings/custom_labels.toml

@@ -1,16 +0,0 @@
-[config]
-enable_custom_labels=false
-
-## template for custom labels
-#[custom_labels."Bug fix"]
-#description = """Fixes a bug in the code"""
-#[custom_labels."Tests"]
-#description = """Adds or modifies tests"""
-#[custom_labels."Bug fix with tests"]
-#description = """Fixes a bug in the code and adds or modifies tests"""
-#[custom_labels."Enhancement"]
-#description = """Adds new features or modifies existing ones"""
-#[custom_labels."Documentation"]
-#description = """Adds or modifies documentation"""
-#[custom_labels."Other"]
-#description = """Other changes that do not fit in any of the above categories"""

pr_agent/settings/language_extensions.toml

@@ -433,6 +433,3 @@ reStructuredText = [".rst", ".rest", ".rest.txt", ".rst.txt", ]
 wisp = [".wisp", ]
 xBase = [".prg", ".prw", ]
 
-[docs_blacklist_extensions]
-# Disable docs for these extensions of text files and scripts that are not programming languages of function, classes and methods
-docs_blacklist = ['sql', 'txt', 'yaml', 'json', 'xml', 'md', 'rst', 'rest', 'rest.txt', 'rst.txt', 'mdpolicy', 'mdown', 'markdown', 'mdwn', 'mkd', 'mkdn', 'mkdown', 'sh']

pr_agent/settings/pr_add_docs.toml

@@ -1,22 +1,22 @@
 [pr_add_docs_prompt]
-system="""You are PR-Doc, a language model that specializes in generating documentation for code components in a Pull Request (PR).
+system="""You are a language model called PR-Code-Documentation Agent, that specializes in generating documentation for code.
-Your task is to generate {{ docs_for_language }} for code components in the PR Diff.
+Your task is to generate meaningfull {{ docs_for_language }} to a PR (the '+' lines).
 
-
+Example for a PR Diff input:
-Example for the PR Diff format:
+'
-======
 ## src/file1.py
 
-@@ -12,3 +12,4 @@ def func1():
+@@ -12,3 +12,5 @@ def func1():
 __new hunk__
-12  code line1 that remained unchanged in the PR
+12  code line that already existed in the file...
+13  code line that already existed in the file....
 14 +new code line1 added in the PR
 15 +new code line2 added in the PR
-16  code line2 that remained unchanged in the PR
+16  code line that already existed in the file...
 __old hunk__
- code line1 that remained unchanged in the PR
+ code line that already existed in the file...
 -code line that was removed in the PR
- code line2 that remained unchanged in the PR
+ code line that already existed in the file...
 
 
 @@ ... @@ def func2():
@@ -28,14 +28,13 @@ __old hunk__
 
 ## src/file2.py
 ...
-======
+'
-
 
 Specific instructions:
-- Try to identify edited/added code components (classes/functions/methods...) that are undocumented, and generate {{ docs_for_language }} for each one.
+- Try to identify edited/added code components (classes/functions/methods...) that are undocumented. and generate {{ docs_for_language }} for each one.
 - If there are documented (any type of {{ language }} documentation) code components in the PR, Don't generate {{ docs_for_language }} for them.
-- Ignore code components that don't appear fully in the '__new hunk__' section. For example, you must see the component header and body.
+- Ignore code components that don't appear fully in the '__new hunk__' section. For example. you must see the component header and body,
-- Make sure the {{ docs_for_language }} starts and ends with standard {{ language }} {{ docs_for_language }} signs.
+- Make sure the {{ docs_for_language }} starts and ends with standart {{ language }} {{ docs_for_language }} signs.
 - The {{ docs_for_language }} should be in standard format.
 - Provide the exact line number (inclusive) where the {{ docs_for_language }} should be added.
 
@@ -43,12 +42,11 @@ Specific instructions:
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-======
+'
 {{ extra_instructions }}
-======
+'
 {%- endif %}
 
-
 You must use the following YAML schema to format your answer:
 ```yaml
 Code Documentation:
@@ -69,7 +67,6 @@ Code Documentation:
         - after
       description: |-
         The {{ docs_for_language }} placement relative to the relevant line (code component).
-        For example, in Python the docs are placed after the function signature, but in Java they are placed before.
     documentation:
       type: string
       description: |-
@@ -102,25 +99,18 @@ Title: '{{ title }}'
 
 Branch: '{{ branch }}'
 
-{%- if description %}
+Description: '{{description}}'
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
 
 {%- if language %}
 
-Main PR language: '{{language}}'
+Main language: {{language}}
 {%- endif %}
 
 
 The PR Diff:
-======
+```
-{{ diff|trim }}
+{{- diff|trim }}
-======
+```
-
 
 Response (should be a valid YAML, and nothing else):
 ```yaml

pr_agent/settings/pr_code_suggestions_prompts.toml

@@ -1,21 +1,22 @@
 [pr_code_suggestions_prompt]
-system="""You are PR-Reviewer, a language model that specializes in suggesting code improvements for a Pull Request (PR).
+system="""You are a language model called PR-Code-Reviewer, that specializes in suggesting code improvements for Pull Request (PR).
-Your task is to provide meaningful and actionable code suggestions, to improve the new code presented in a PR diff (lines starting with '+').
+Your task is to provide meaningful and actionable code suggestions, to improve the new code presented in a PR (the '+' lines in the diff).
 
-Example for the PR Diff format:
+Example for a PR Diff input:
-======
+'
 ## src/file1.py
 
-@@ -12,3 +12,4 @@ def func1():
+@@ -12,3 +12,5 @@ def func1():
 __new hunk__
-12  code line1 that remained unchanged in the PR
+12  code line that already existed in the file...
+13  code line that already existed in the file....
 14 +new code line1 added in the PR
 15 +new code line2 added in the PR
-16  code line2 that remained unchanged in the PR
+16  code line that already existed in the file...
 __old hunk__
- code line1 that remained unchanged in the PR
+ code line that already existed in the file...
 -code line that was removed in the PR
- code line2 that remained unchanged in the PR
+ code line that already existed in the file...
 
 
 @@ ... @@ def func2():
@@ -27,63 +28,83 @@ __old hunk__
 
 ## src/file2.py
 ...
-======
+'
-
 
 Specific instructions:
 - Provide up to {{ num_code_suggestions }} code suggestions. Try to provide diverse and insightful suggestions.
-- Prioritize suggestions that address major problems, issues and bugs in the code. As a second priority, suggestions should focus on enhancement, best practice, performance, maintainability, and other aspects.
+- Prioritize suggestions that address major problems, issues and bugs in the code.
+  As a second priority, suggestions should focus on best practices, code readability, maintainability, enhancments, performance, and other aspects.
 - Don't suggest to add docstring, type hints, or comments.
 - Suggestions should refer only to code from the '__new hunk__' sections, and focus on new lines of code (lines starting with '+').
 - Avoid making suggestions that have already been implemented in the PR code. For example, if you want to add logs, or change a variable to const, or anything else, make sure it isn't already in the '__new hunk__' code.
-- Provide the exact line numbers range (inclusive) for each suggestion.
+- For each suggestion, make sure to take into consideration also the context, meaning the lines before and after the relevant code.
+- Provide the exact line numbers range (inclusive) for each issue.
 - Assume there is additional relevant code, that is not included in the diff.
-- When quoting variables or names from the code, use backticks (`) instead of single quote (').
 
 
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-======
+'
 {{ extra_instructions }}
-======
+'
 {%- endif %}
 
-The output must be a YAML object equivalent to type PRCodeSuggestions, according to the following Pydantic definitions:
+You must use the following YAML schema to format your answer:
-=====
+```yaml
-class CodeSuggestion(BaseModel):
+Code suggestions:
-    relevant_file: str = Field(description="the relevant file full path")
+  type: array
-    suggestion_content: str = Field(description="an actionable suggestion for meaningfully improving the new code introduced in the PR")
+  minItems: 1
-    existing_code: str = Field(description="a code snippet, showing the relevant code lines from a '__new hunk__' section. It must be contiguous, correctly formatted and indented, and without line numbers")
+  maxItems: {{ num_code_suggestions }}
-    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 'existing code' snippet above")
+  uniqueItems: true
-    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 'existing code' snippet above")
+  items:
-    improved_code: str = Field(description="a new code snippet, that can be used to replace the relevant lines in '__new hunk__' code. Replacement suggestions should be complete, correctly formatted and indented, and without line numbers")
+    relevant file:
-    label: str = Field(description="a single label for the suggestion, to help the user understand the suggestion type. For example: 'security', 'bug', 'performance', 'enhancement', 'possible issue', 'best practice', 'maintainability', etc. Other labels are also allowed")
+      type: string
-
+      description: the relevant file full path
-class PRCodeSuggestions(BaseModel):
+    suggestion content:
-    code_suggestions: List[CodeSuggestion]
+      type: string
-=====
+      description: |-
-
+        a concrete suggestion for meaningfully improving the new PR code.
+    existing code:
+      type: string
+      description: |-
+        a code snippet showing the relevant code lines from a '__new hunk__' section.
+        It must be contiguous, correctly formatted and indented, and without line numbers.
+    relevant lines start:
+      type: integer
+      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 'existing code' snippet above.
+    relevant lines end:
+      type: integer
+      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 'existing code' snippet above.
+    improved code:
+      type: string
+      description: |-
+        a new code snippet that can be used to replace the relevant lines in '__new hunk__' code.
+        Replacement suggestions should be complete, correctly formatted and indented, and without line numbers.
+```
 
 Example output:
 ```yaml
-code_suggestions:
+Code suggestions:
-- relevant_file: |-
+  - relevant file: |-
         src/file1.py
-  suggestion_content: |-
+    suggestion content: |-
         Add a docstring to func1()
-  existing_code: |-
+    existing code: |-
         def func1():
-  relevant_lines_start: 12
+    relevant lines start: 12
-  relevant_lines_end: 12
+    relevant lines end: 12
-  improved_code: |-
+    improved code: |-
-    ...
-  label: |-
         ...
 ```
 
 
 Each YAML output MUST be after a newline, indented, with block scalar indicator ('|-').
+Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
 """
 
 user="""PR Info:
@@ -92,25 +113,18 @@ Title: '{{title}}'
 
 Branch: '{{branch}}'
 
-{%- if description %}
+Description: '{{description}}'
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
 
 {%- if language %}
 
-Main PR language: '{{ language }}'
+Main language: {{language}}
 {%- endif %}
 
 
 The PR Diff:
-======
+```
-{{ diff|trim }}
+{{- diff|trim }}
-======
+```
-
 
 Response (should be a valid YAML, and nothing else):
 ```yaml

pr_agent/settings/pr_custom_labels.toml

@@ -1,86 +0,0 @@
-[pr_custom_labels_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
-Your task is to provide labels that describe the PR content.
-{%- if enable_custom_labels %}
-Thoroughly read the labels name and the provided description, and decide whether the label is relevant to the PR.
-{%- endif %}
-
-{%- if extra_instructions %}
-
-Extra instructions from the user:
-======
-{{ extra_instructions }}
-======
-{% endif %}
-
-
-The output must be a YAML object equivalent to type $Labels, according to the following Pydantic definitions:
-======
-{%- if enable_custom_labels %}
-
-{{ custom_labels_class }}
-
-{%- else %}
-class Label(str, Enum):
-    bug_fix = "Bug fix"
-    tests = "Tests"
-    enhancement = "Enhancement"
-    documentation = "Documentation"
-    other = "Other"
-{%- endif %}
-
-class Labels(BaseModel):
-    labels: List[Label] =  Field(min_items=0, description="choose the relevant custom labels that describe the PR content, and return their keys. Use the value field of the Label object to better understand the label meaning.")
-======
-
-
-Example output:
-
-```yaml
-labels:
-- ...
-- ...
-```
-
-Answer should be a valid YAML, and nothing else.
-"""
-
-user="""PR Info:
-
-Previous title: '{{title}}'
-
-Branch: '{{ branch }}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
-{%- if language %}
-
-Main PR language: '{{ language }}'
-{%- endif %}
-{%- if commit_messages_str %}
-
-
-Commit messages:
-======
-{{ commit_messages_str|trim }}
-======
-{%- endif %}
-
-
-The PR Git Diff:
-======
-{{ diff|trim }}
-======
-
-Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions, and ' ' (a space) for unchanged lines.
-
-
-Response (should be a valid YAML, and nothing else):
-```yaml
-"""

pr_agent/settings/pr_description_prompts.toml

@@ -1,127 +1,88 @@
 [pr_description_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
+system="""You are CodiumAI-PR-Reviewer, a language model designed to review git pull requests.
-{%- if enable_custom_labels %}
+Your task is to provide full description of the PR content.
-Your task is to provide a full description for the PR content - files walkthrough, title, type, description and labels.
+- Make sure not to focus the new PR code (the '+' lines).
-{%- else %}
+- Notice that the 'Previous title', 'Previous description' and 'Commit messages' sections may be partial, simplistic, non-informative or not up-to-date. Hence, compare them to the PR diff code, and use them only as a reference.
-Your task is to provide a full description for the PR content - files walkthrough, title, type, and description.
+-  If needed, each YAML output should be in block scalar format ('|-')
-{%- endif %}
-- Focus on the new PR code (lines starting with '+').
-- Keep in mind that the 'Previous title', 'Previous description' and 'Commit messages' sections may be partial, simplistic, non-informative or out of date. Hence, compare them to the PR diff code, and use them only as a reference.
-- The generated title and description should prioritize the most significant changes.
-- If needed, each YAML output should be in block scalar indicator ('|-')
-- When quoting variables or names from the code, use backticks (`) instead of single quote (').
-
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-=====
+'
 {{ extra_instructions }}
-=====
+'
 {% endif %}
 
-
+You must use the following YAML schema to format your answer:
-The output must be a YAML object equivalent to type $PRDescription, according to the following Pydantic definitions:
+```yaml
-=====
+PR Title:
-class PRType(str, Enum):
+  type: string
-    bug_fix = "Bug fix"
+  description: an informative title for the PR, describing its main theme
-    tests = "Tests"
+PR Type:
-    enhancement = "Enhancement"
+  type: array
-    documentation = "Documentation"
+  items:
-    other = "Other"
+    type: string
-
+    enum:
-{%- if enable_custom_labels %}
+      - Bug fix
-
+      - Tests
-{{ custom_labels_class }}
+      - Bug fix with tests
-
+      - Refactoring
-{%- endif %}
+      - Enhancement
-
+      - Documentation
-{%- if enable_semantic_files_types %}
+      - Other
-
+PR Description:
-Class FileDescription(BaseModel):
+  type: string
-    filename: str = Field(description="the relevant file full path")
+  description: an informative and concise description of the PR
-    changes_summary: str = Field(description="minimal and concise summary of the changes in the relevant file")
+PR Main Files Walkthrough:
-    label: str = Field(description="a single semantic label that represents a type of code changes that occurred in the File. Possible values (partial list): 'bug fix', 'tests', 'enhancement', 'documentation', 'error handling', 'configuration changes', 'dependencies', 'formatting', 'miscellaneous', ...")
+  type: array
-{%- endif %}
+  maxItems: 10
-
+  description: |-
-Class PRDescription(BaseModel):
+    a walkthrough of the PR changes. Review main files, and shortly describe the changes in each file (up to 10 most important files).
-    type: List[PRType] = Field(description="one or more types that describe the PR content. Return the label member value (e.g. 'Bug fix', not 'bug_fix')")
+  items:
-{%- if enable_semantic_files_types %}
+    filename:
-    pr_files[List[FileDescription]] = Field(max_items=15, description="a list of the files in the PR, and their changes summary.")
+      type: string
-{%- endif %}
+      description: the relevant file full path
-    description: str = Field(description="an informative and concise description of the PR. Use bullet points. Display first the most significant changes.")
+    changes in file:
-    title: str = Field(description="an informative title for the PR, describing its main theme")
+      type: string
-{%- if enable_custom_labels %}
+      description: minimal and concise description of the changes in the relevant file
-    labels: List[Label] =  Field(min_items=0, description="choose the relevant custom labels that describe the PR content, and return their keys. Use the value field of the Label object to better understand the label meaning.")
-{%- endif %}
-=====
 
 
 Example output:
-
 ```yaml
-type:
+PR Title: |-
-- ...
-- ...
-{%- if enable_semantic_files_types %}
-pr_files:
-- filename: |
   ...
-  changes_summary: |
+PR Type:
+  - Bug fix
+PR Description: |-
   ...
-  label: |
+PR Main Files Walkthrough:
-    ...
+  - ...
-...
+  - ...
-{%- endif %}
-description: |-
-  ...
-title: |-
-  ...
-{%- if enable_custom_labels %}
-labels:
-- |
-  ...
-- |
-  ...
-{%- endif %}
 ```
 
-Answer should be a valid YAML, and nothing else. Each YAML output MUST be after a newline, with proper indent, and block scalar indicator ('|-')
+Make sure to output a valid YAML. Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
 """
 
 user="""PR Info:
-
 Previous title: '{{title}}'
-
+Previous description: '{{description}}'
-{%- if description %}
-
-Previous description:
-=====
-{{ description|trim }}
-=====
-{%- endif %}
-
 Branch: '{{branch}}'
 {%- if language %}
 
-Main PR language: '{{ language }}'
+Main language: {{language}}
 {%- endif %}
 {%- if commit_messages_str %}
 
 Commit messages:
-=====
+{{commit_messages_str}}
-{{ commit_messages_str|trim }}
-=====
 {%- endif %}
 
 
-The PR Diff:
+The PR Git Diff:
-=====
+```
-{{ diff|trim }}
+{{diff}}
-=====
+```
-
 Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions, and ' ' (a space) for unchanged lines.
 
-
 Response (should be a valid YAML, and nothing else):
 ```yaml
 """

pr_agent/settings/pr_information_from_user_prompts.toml

@@ -1,5 +1,5 @@
 [pr_information_from_user_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
+system="""You are CodiumAI-PR-Reviewer, a language model designed to review git pull requests.
 Given the PR Info and the PR Git Diff, generate 3 short questions about the PR code for the PR author.
 The goal of the questions is to help the language model understand the PR better, so the questions should be insightful, informative, non-trivial, and relevant to the PR.
 You should prefer asking yes\\no questions, or multiple choice questions. Also add at least one open-ended question, but make sure they are not too difficult, and can be answered in a sentence or two.
@@ -16,36 +16,22 @@ Questions to better understand the PR:
 
 user="""PR Info:
 Title: '{{title}}'
-
 Branch: '{{branch}}'
-
+Description: '{{description}}'
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
 {%- if language %}
-
+Main language: {{language}}
-Main PR language: '{{ language }}'
 {%- endif %}
 {%- if commit_messages_str %}
 
-
 Commit messages:
-======
+{{commit_messages_str}}
-{{ commit_messages_str|trim }}
-======
 {%- endif %}
 
 
 The PR Git Diff:
-======
+```
-{{ diff|trim }}
+{{diff}}
-======
+```
-
 Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions, and ' ' (a space) for unchanged lines
 
 

pr_agent/settings/pr_questions_prompts.toml

@@ -1,42 +1,36 @@
 [pr_questions_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
+system="""You are CodiumAI-PR-Reviewer, a language model designed to review git pull requests.
-
+Your task is to answer questions about the new PR code (the '+' lines), and provide feedback.
-Your goal is to answer questions\\tasks about the new PR code (lines starting with '+'), and provide feedback.
 Be informative, constructive, and give examples. Try to be as specific as possible.
-Don't avoid answering the questions. You must answer the questions, as best as you can, without adding any unrelated content.
+Don't avoid answering the questions. You must answer the questions, as best as you can, without adding unrelated content.
+Make sure not to repeat modifications already implemented in the new PR code (the '+' lines).
 """
 
 user="""PR Info:
-
 Title: '{{title}}'
-
 Branch: '{{branch}}'
-
+Description: '{{description}}'
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
 {%- if language %}
+Main language: {{language}}
+{%- endif %}
+{%- if commit_messages_str %}
 
-Main PR language: '{{ language }}'
+Commit messages:
+{{commit_messages_str}}
 {%- endif %}
 
 
 The PR Git Diff:
-======
+```
-{{ diff|trim }}
+{{diff}}
-======
+```
 Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions, and ' ' (a space) for unchanged lines
 
 
 The PR Questions:
-======
+```
-{{ questions|trim }}
+{{ questions }}
-======
+```
 
-Response to the PR Questions:
+Response:
 """

pr_agent/settings/pr_reviewer_prompts.toml

@@ -1,19 +1,18 @@
 [pr_review_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
+system="""You are PR-Reviewer, a language model designed to review git pull requests.
 Your task is to provide constructive and concise feedback for the PR, and also provide meaningful code suggestions.
-The review should focus on new code added in the PR diff (lines starting with '+')
 
-Example PR Diff:
+Example PR Diff input:
-======
+'
 ## src/file1.py
 
 @@ -12,5 +12,5 @@ def func1():
-code line 1 that remained unchanged in the PR
+code line that already existed in the file...
-code line 2 that remained unchanged in the PR
+code line that already existed in the file....
 -code line that was removed in the PR
-+code line added in the PR
++new code line added in the PR
-code line 3 that remained unchanged in the PR
+ code line that already existed in the file...
-
+ code line that already existed in the file...
 
 @@ ... @@ def func2():
 ...
@@ -21,29 +20,26 @@ code line 3 that remained unchanged in the PR
 
 ## src/file2.py
 ...
-======
+'
+
+The review should focus on new code added in the PR (lines starting with '+'), and not on code that already existed in the file (lines starting with '-', or without prefix).
 
 {%- if num_code_suggestions > 0 %}
-
+- Provide up to {{ num_code_suggestions }} code suggestions.
-
-Code suggestions guidelines:
-- Provide up to {{ num_code_suggestions }} code suggestions. Try to provide diverse and insightful suggestions.
 - Focus on important suggestions like fixing code problems, issues and bugs. As a second priority, provide suggestions for meaningful code improvements, like performance, vulnerability, modularity, and best practices.
 - Avoid making suggestions that have already been implemented in the PR code. For example, if you want to add logs, or change a variable to const, or anything else, make sure it isn't already in the PR code.
 - Don't suggest to add docstring, type hints, or comments.
-- Suggestions should focus on the new code added in the PR diff (lines starting with '+')
+- Suggestions should focus on improving the new code added in the PR (lines starting with '+')
-- When quoting variables or names from the code, use backticks (`) instead of single quote (').
 {%- endif %}
 
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-======
+'
 {{ extra_instructions }}
-======
+'
 {% endif %}
 
-
 You must use the following YAML schema to format your answer:
 ```yaml
 PR Analysis:
@@ -58,6 +54,7 @@ PR Analysis:
     enum:
       - Bug fix
       - Tests
+      - Refactoring
       - Enhancement
       - Documentation
       - Other
@@ -96,16 +93,16 @@ PR Analysis:
     description: >-
       Estimate, on a scale of 1-5 (inclusive), the time and effort required to review this PR by an experienced and knowledgeable developer. 1 means short and easy review , 5 means long and hard review.
       Take into account the size, complexity, quality, and the needed changes of the PR code diff.
-      Explain your answer shortly (1-2 sentences). Use the format: '1, because ...'
+      Explain your answer shortly (1-2 sentences).
 {%- endif %}
 PR Feedback:
   General suggestions:
     type: string
     description: |-
-      General suggestions and feedback for the contributors and maintainers of this PR.
+      General suggestions and feedback for the contributors and maintainers of
-      May include important suggestions for the overall structure,
+      this PR. May include important suggestions for the overall structure,
-      primary purpose, best practices, critical bugs, and other aspects of the PR.
+      primary purpose, best practices, critical bugs, and other aspects of the
-      Don't address PR title and description, or lack of tests. Explain your suggestions.
+      PR. Don't address PR title and description, or lack of tests. Explain your suggestions.
 {%- if num_code_suggestions > 0 %}
   Code feedback:
     type: array
@@ -118,10 +115,11 @@ PR Feedback:
       suggestion:
         type: string
         description: |-
-          a concrete suggestion for meaningfully improving the new PR code.
+          a concrete suggestion for meaningfully improving the new PR code. Also
-          Also describe how, specifically, the suggestion can be applied to new PR code.
+          describe how, specifically, the suggestion can be applied to new PR
-          Add tags with importance measure that matches each suggestion ('important' or 'medium').
+          code. Add tags with importance measure that matches each suggestion
-          Do not make suggestions for updating or adding docstrings, renaming PR title and description, or linter like.
+          ('important' or 'medium'). Do not make suggestions for updating or
+          adding docstrings, renaming PR title and description, or linter like.
       relevant line:
         type: string
         description: |-
@@ -133,8 +131,7 @@ PR Feedback:
   Security concerns:
     type: string
     description: >-
-      does this PR code introduce possible vulnerabilities such as exposure of sensitive information (e.g., API keys, secrets, passwords), or security concerns like SQL injection, XSS, CSRF, and others ? Answer 'No' if there are no possible issues.
+      yes\\no question: does this PR code introduce possible vulnerabilities such as exposure of sensitive information (e.g., API keys, secrets, passwords), or security concerns like SQL injection, XSS, CSRF, and others ? If answered 'yes', explain your answer briefly.
-      Answer 'Yes, because ...' if there are security concerns or issues. Explain your answer shortly.
 {%- endif %}
 ```
 
@@ -146,7 +143,7 @@ PR Analysis:
   PR summary: |-
     xxx
   Type of PR: |-
-    ...
+    Bug fix
 {%- if require_score %}
   Score: 89
 {%- endif %}
@@ -156,8 +153,7 @@ PR Analysis:
   Focused PR: no, because ...
 {%- endif %}
 {%- if require_estimate_effort_to_review %}
-  Estimated effort to review [1-5]: |-
+  Estimated effort to review [1-5]: 3, because ...
-    3, because ...
 {%- endif %}
 PR Feedback:
   General PR suggestions: |-
@@ -182,50 +178,36 @@ Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'desc
 """
 
 user="""PR Info:
-
 Title: '{{title}}'
-
 Branch: '{{branch}}'
-
+Description: '{{description}}'
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
 {%- if language %}
-
+Main language: {{language}}
-Main PR language: '{{ language }}'
 {%- endif %}
 {%- if commit_messages_str %}
 
 Commit messages:
-======
 {{commit_messages_str}}
-======
 {%- endif %}
 
 {%- if question_str %}
-=====
+######
 Here are questions to better understand the PR. Use the answers to provide better feedback.
 
-{{ question_str|trim }}
+{{question_str|trim}}
 
 User answers:
 '
-{{ answer_str|trim }}
+{{answer_str|trim}}
 '
-=====
+######
 {%- endif %}
 
-
+The PR Git Diff:
-The PR Diff:
+```
-======
+{{diff}}
-{{ diff|trim }}
+```
-======
+Note that lines in the diff body are prefixed with a symbol that represents the type of change: '-' for deletions, '+' for additions. Focus on the '+' lines.
-
 
 Response (should be a valid YAML, and nothing else):
 ```yaml

pr_agent/settings/pr_sort_code_suggestions_prompts.toml

@@ -2,10 +2,10 @@
 system="""
 """
 
-user="""You are given a list of code suggestions to improve a Git Pull Request (PR):
+user="""You are given a list of code suggestions to improve a PR:
-======
+
 {{ suggestion_str|trim }}
-======
+
 
 Your task is to sort the code suggestions by their order of importance, and return a list with sorting order.
 The sorting order is a list of pairs, where each pair contains the index of the suggestion in the original list.

pr_agent/settings/pr_update_changelog_prompts.toml

@@ -1,5 +1,5 @@
 [pr_update_changelog_prompt]
-system="""You are a language model called PR-Changelog-Updater.
+system="""You are a language model called CodiumAI-PR-Changlog-summarizer.
 Your task is to update the CHANGELOG.md file of the project, to shortly summarize important changes introduced in this PR (the '+' lines).
 - The output should match the existing CHANGELOG.md format, style and conventions, so it will look like a natural part of the file. For example, if previous changes were summarized in a single line, you should do the same.
 - Don't repeat previous changes. Generate only new content, that is not already in the CHANGELOG.md file.
@@ -8,44 +8,30 @@ Your task is to update the CHANGELOG.md file of the project, to shortly summariz
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-======
+'
-{{ extra_instructions|trim }}
+{{ extra_instructions }}
-======
+'
 {%- endif %}
 """
 
 user="""PR Info:
-
 Title: '{{title}}'
-
 Branch: '{{branch}}'
-
+Description: '{{description}}'
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
 {%- if language %}
-
+Main language: {{language}}
-Main PR language: '{{ language }}'
 {%- endif %}
 {%- if commit_messages_str %}
 
-
 Commit messages:
-======
+{{commit_messages_str}}
-{{ commit_messages_str|trim }}
-======
 {%- endif %}
 
 
-The PR Git Diff:
+The PR Diff:
-======
+```
-{{ diff|trim }}
+{{diff}}
-======
+```
 
 Current date:
 ```
@@ -53,10 +39,9 @@ Current date:
 ```
 
 The current CHANGELOG.md:
-======
+```
 {{ changelog_file_str }}
-======
+```
-
 
 Response:
 """

pr_agent/tools/pr_add_docs.py

@@ -1,31 +1,27 @@
 import copy
+import logging
 import textwrap
-from functools import partial
+from typing import List, Dict
-from typing import Dict
-
 from jinja2 import Environment, StrictUndefined
 
-from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
+from pr_agent.algo.ai_handler import AiHandler
-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, get_pr_multi_diffs
-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 load_yaml
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider
+from pr_agent.git_providers import BitbucketProvider, get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
 
 
 class PRAddDocs:
-    def __init__(self, pr_url: str, cli_mode=False, args: list = None,
+    def __init__(self, pr_url: str, cli_mode=False, args: list = None):
-                 ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
 
         self.git_provider = get_git_provider()(pr_url)
         self.main_language = get_main_pr_language(
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
 
-        self.ai_handler = ai_handler()
+        self.ai_handler = AiHandler()
         self.patches_diff = None
         self.prediction = None
         self.cli_mode = cli_mode
@@ -47,39 +43,34 @@ class PRAddDocs:
 
     async def run(self):
         try:
-            get_logger().info('Generating code Docs for PR...')
+            logging.info('Generating code Docs for PR...')
             if get_settings().config.publish_output:
                 self.git_provider.publish_comment("Generating Documentation...", is_temporary=True)
 
-            get_logger().info('Preparing PR documentation...')
+            logging.info('Preparing PR documentation...')
             await retry_with_fallback_models(self._prepare_prediction)
             data = self._prepare_pr_code_docs()
             if (not data) or (not 'Code Documentation' in data):
-                get_logger().info('No code documentation found for PR.')
+                logging.info('No code documentation found for PR.')
                 return
 
             if get_settings().config.publish_output:
-                get_logger().info('Pushing PR documentation...')
+                logging.info('Pushing PR documentation...')
                 self.git_provider.remove_initial_comment()
-                get_logger().info('Pushing inline code documentation...')
+                logging.info('Pushing inline code documentation...')
                 self.push_inline_docs(data)
         except Exception as e:
-            get_logger().error(f"Failed to generate code documentation for PR, error: {e}")
+            logging.error(f"Failed to generate code documentation for PR, error: {e}")
 
     async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
-
-        # Disable adding docs to scripts and other non-relevant text files
-        from pr_agent.algo.language_handler import bad_extensions
-        bad_extensions += get_settings().docs_blacklist_extensions.docs_blacklist
-
         self.patches_diff = get_pr_diff(self.git_provider,
                                         self.token_handler,
                                         model,
                                         add_line_numbers_to_hunks=True,
                                         disable_extra_lines=False)
 
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
@@ -89,8 +80,8 @@ class PRAddDocs:
         system_prompt = environment.from_string(get_settings().pr_add_docs_prompt.system).render(variables)
         user_prompt = environment.from_string(get_settings().pr_add_docs_prompt.user).render(variables)
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
 
@@ -112,7 +103,7 @@ class PRAddDocs:
         for d in data['Code Documentation']:
             try:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"add_docs: {d}")
+                    logging.info(f"add_docs: {d}")
                 relevant_file = d['relevant file'].strip()
                 relevant_line = int(d['relevant line'])  # absolute position
                 documentation = d['documentation']
@@ -127,11 +118,11 @@ class PRAddDocs:
                                              'relevant_lines_end': relevant_line})
             except Exception:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"Could not parse code docs: {d}")
+                    logging.info(f"Could not parse code docs: {d}")
 
         is_successful = self.git_provider.publish_code_suggestions(docs)
         if not is_successful:
-            get_logger().info("Failed to publish code docs, trying to publish each docs separately")
+            logging.info("Failed to publish code docs, trying to publish each docs separately")
             for doc_suggestion in docs:
                 self.git_provider.publish_code_suggestions([doc_suggestion])
 
@@ -163,7 +154,7 @@ class PRAddDocs:
                         new_code_snippet = new_code_snippet.rstrip() + "\n" + original_initial_line
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
+                logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
 
         return new_code_snippet
 

pr_agent/tools/pr_code_suggestions.py

@@ -1,23 +1,20 @@
 import copy
+import logging
 import textwrap
-from functools import partial
+from typing import List, Dict
-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_handler import AiHandler
-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, get_pr_multi_diffs
-from pr_agent.algo.pr_processing import get_pr_diff, get_pr_multi_diffs, retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
 from pr_agent.algo.utils import load_yaml
 from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider
+from pr_agent.git_providers import BitbucketProvider, get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
 
 
 class PRCodeSuggestions:
-    def __init__(self, pr_url: str, cli_mode=False, args: list = None,
+    def __init__(self, pr_url: str, cli_mode=False, args: list = None):
-                 ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
 
         self.git_provider = get_git_provider()(pr_url)
         self.main_language = get_main_pr_language(
@@ -26,7 +23,7 @@ class PRCodeSuggestions:
 
         # extended mode
         try:
-            self.is_extended = self._get_is_extended(args or [])
+            self.is_extended = any(["extended" in arg for arg in args])
         except:
             self.is_extended = False
         if self.is_extended:
@@ -34,7 +31,7 @@ class PRCodeSuggestions:
         else:
             num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions
 
-        self.ai_handler = ai_handler()
+        self.ai_handler = AiHandler()
         self.patches_diff = None
         self.prediction = None
         self.cli_mode = cli_mode
@@ -55,46 +52,42 @@ class PRCodeSuggestions:
 
     async def run(self):
         try:
-            get_logger().info('Generating code suggestions for PR...')
+            logging.info('Generating code suggestions for PR...')
             if get_settings().config.publish_output:
-                self.git_provider.publish_comment("Preparing suggestions...", is_temporary=True)
+                self.git_provider.publish_comment("Preparing review...", is_temporary=True)
 
-            get_logger().info('Preparing PR code suggestions...')
+            logging.info('Preparing PR review...')
             if not self.is_extended:
                 await retry_with_fallback_models(self._prepare_prediction)
                 data = self._prepare_pr_code_suggestions()
             else:
                 data = await retry_with_fallback_models(self._prepare_prediction_extended)
-            if (not data) or (not 'code_suggestions' in data):
+            if (not data) or (not 'Code suggestions' in data):
-                get_logger().info('No code suggestions found for PR.')
+                logging.info('No code suggestions found for PR.')
                 return
 
             if (not self.is_extended and get_settings().pr_code_suggestions.rank_suggestions) or \
                     (self.is_extended and get_settings().pr_code_suggestions.rank_extended_suggestions):
-                get_logger().info('Ranking Suggestions...')
+                logging.info('Ranking Suggestions...')
-                data['code_suggestions'] = await self.rank_suggestions(data['code_suggestions'])
+                data['Code suggestions'] = await self.rank_suggestions(data['Code suggestions'])
 
             if get_settings().config.publish_output:
-                get_logger().info('Pushing PR code suggestions...')
+                logging.info('Pushing PR review...')
                 self.git_provider.remove_initial_comment()
-                if get_settings().pr_code_suggestions.summarize:
+                logging.info('Pushing inline code suggestions...')
-                    get_logger().info('Pushing summarize code suggestions...')
-                    self.publish_summarizes_suggestions(data)
-                else:
-                    get_logger().info('Pushing inline code suggestions...')
                 self.push_inline_code_suggestions(data)
         except Exception as e:
-            get_logger().error(f"Failed to generate code suggestions for PR, error: {e}")
+            logging.error(f"Failed to generate code suggestions for PR, error: {e}")
 
     async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider,
                                         self.token_handler,
                                         model,
                                         add_line_numbers_to_hunks=True,
                                         disable_extra_lines=True)
 
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
@@ -104,85 +97,52 @@ class PRCodeSuggestions:
         system_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.system).render(variables)
         user_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.user).render(variables)
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
 
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nAI response:\n{response}")
-
         return response
 
     def _prepare_pr_code_suggestions(self) -> Dict:
         review = self.prediction.strip()
-        data = load_yaml(review,
+        data = load_yaml(review)
-                         keys_fix_yaml=["relevant_file", "suggestion_content", "existing_code", "improved_code"])
         if isinstance(data, list):
-            data = {'code_suggestions': data}
+            data = {'Code suggestions': data}
-
-        # remove invalid suggestions
-        suggestion_list = []
-        for i, suggestion in enumerate(data['code_suggestions']):
-            if suggestion['existing_code'] != suggestion['improved_code']:
-                suggestion_list.append(suggestion)
-            else:
-                get_logger().debug(
-                    f"Skipping suggestion {i + 1}, because existing code is equal to improved code {suggestion['existing_code']}")
-        data['code_suggestions'] = suggestion_list
-
         return data
 
     def push_inline_code_suggestions(self, data):
         code_suggestions = []
 
-        if not data['code_suggestions']:
+        if not data['Code suggestions']:
-            get_logger().info('No suggestions found to improve this PR.')
             return self.git_provider.publish_comment('No suggestions found to improve this PR.')
 
-        for d in data['code_suggestions']:
+        for d in data['Code suggestions']:
             try:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"suggestion: {d}")
+                    logging.info(f"suggestion: {d}")
-                relevant_file = d['relevant_file'].strip()
+                relevant_file = d['relevant file'].strip()
-                relevant_lines_start = int(d['relevant_lines_start'])  # absolute position
+                relevant_lines_start = int(d['relevant lines start'])  # absolute position
-                relevant_lines_end = int(d['relevant_lines_end'])
+                relevant_lines_end = int(d['relevant lines end'])
-                content = d['suggestion_content'].rstrip()
+                content = d['suggestion content']
-                new_code_snippet = d['improved_code'].rstrip()
+                new_code_snippet = d['improved code']
-                label = d['label'].strip()
 
                 if new_code_snippet:
                     new_code_snippet = self.dedent_code(relevant_file, relevant_lines_start, new_code_snippet)
 
-                if get_settings().pr_code_suggestions.include_improved_code:
+                body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```"
-                    body = f"**Suggestion:** {content} [{label}]\n```suggestion\n" + new_code_snippet + "\n```"
                 code_suggestions.append({'body': body, 'relevant_file': relevant_file,
                                          'relevant_lines_start': relevant_lines_start,
                                          'relevant_lines_end': relevant_lines_end})
-                else:
-                    if self.git_provider.is_supported("create_inline_comment"):
-                        body = f"**Suggestion:** {content} [{label}]"
-                        comment = self.git_provider.create_inline_comment(body, relevant_file, "",
-                                                                          absolute_position=relevant_lines_end)
-                        if comment:
-                            code_suggestions.append(comment)
-                    else:
-                        get_logger().error("Inline comments are not supported by the git provider")
             except Exception:
                 if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"Could not parse suggestion: {d}")
+                    logging.info(f"Could not parse suggestion: {d}")
 
-        if get_settings().pr_code_suggestions.include_improved_code:
         is_successful = self.git_provider.publish_code_suggestions(code_suggestions)
-        else:
-            is_successful = self.git_provider.publish_inline_comments(code_suggestions)
         if not is_successful:
-            get_logger().info("Failed to publish code suggestions, trying to publish each suggestion separately")
+            logging.info("Failed to publish code suggestions, trying to publish each suggestion separately")
             for code_suggestion in code_suggestions:
-                if get_settings().pr_code_suggestions.include_improved_code:
                 self.git_provider.publish_code_suggestions([code_suggestion])
-                else:
-                    self.git_provider.publish_inline_comments([code_suggestion])
 
     def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet):
         try:  # dedent code snippet
@@ -202,29 +162,19 @@ class PRCodeSuggestions:
                     new_code_snippet = textwrap.indent(new_code_snippet, delta_spaces * " ").rstrip('\n')
         except Exception as e:
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
+                logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
 
         return new_code_snippet
 
-    def _get_is_extended(self, args: list[str]) -> bool:
-        """Check if extended mode should be enabled by the `--extended` flag or automatically according to the configuration"""
-        if any(["extended" in arg for arg in args]):
-            get_logger().info("Extended mode is enabled by the `--extended` flag")
-            return True
-        if get_settings().pr_code_suggestions.auto_extended_mode:
-            get_logger().info("Extended mode is enabled automatically based on the configuration toggle")
-            return True
-        return False
-
     async def _prepare_prediction_extended(self, model: str) -> dict:
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         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)
 
-        get_logger().info('Getting multi AI predictions...')
+        logging.info('Getting multi AI predictions...')
         prediction_list = []
         for i, patches_diff in enumerate(patches_diff_list):
-            get_logger().info(f"Processing chunk {i + 1} of {len(patches_diff_list)}")
+            logging.info(f"Processing chunk {i + 1} of {len(patches_diff_list)}")
             self.patches_diff = patches_diff
             prediction = await self._get_prediction(model)
             prediction_list.append(prediction)
@@ -234,8 +184,8 @@ class PRCodeSuggestions:
         for prediction in prediction_list:
             self.prediction = prediction
             data_per_chunk = self._prepare_pr_code_suggestions()
-            if "code_suggestions" in data:
+            if "Code suggestions" in data:
-                data["code_suggestions"].extend(data_per_chunk["code_suggestions"])
+                data["Code suggestions"].extend(data_per_chunk["Code suggestions"])
             else:
                 data.update(data_per_chunk)
         self.data = data
@@ -253,8 +203,11 @@ class PRCodeSuggestions:
         """
 
         suggestion_list = []
-        for suggestion in data:
+        # remove invalid suggestions
+        for i, suggestion in enumerate(data):
+            if suggestion['existing code'] != suggestion['improved code']:
                 suggestion_list.append(suggestion)
+
         data_sorted = [[]] * len(suggestion_list)
 
         try:
@@ -269,8 +222,8 @@ class PRCodeSuggestions:
                 variables)
             user_prompt = environment.from_string(get_settings().pr_sort_code_suggestions_prompt.user).render(variables)
             if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+                logging.info(f"\nSystem prompt:\n{system_prompt}")
-                get_logger().info(f"\nUser prompt:\n{user_prompt}")
+                logging.info(f"\nUser prompt:\n{user_prompt}")
             response, finish_reason = await self.ai_handler.chat_completion(model=model, system=system_prompt,
                                                                             user=user_prompt)
 
@@ -281,55 +234,13 @@ class PRCodeSuggestions:
                 data_sorted[importance_order - 1] = suggestion_list[suggestion_number - 1]
 
             if get_settings().pr_code_suggestions.final_clip_factor != 1:
-                max_len = max(
+                new_len = int(0.5 + len(data_sorted) * get_settings().pr_code_suggestions.final_clip_factor)
-                    len(data_sorted),
-                    get_settings().pr_code_suggestions.num_code_suggestions,
-                    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):
                 data_sorted = data_sorted[:new_len]
         except Exception as e:
             if get_settings().config.verbosity_level >= 1:
-                get_logger().info(f"Could not sort suggestions, error: {e}")
+                logging.info(f"Could not sort suggestions, error: {e}")
             data_sorted = suggestion_list
 
         return data_sorted
 
-    def publish_summarizes_suggestions(self, data: Dict):
-        try:
-            data_markdown = "## PR Code Suggestions\n\n"
 
-            language_extension_map_org = get_settings().language_extension_map_org
-            extension_to_language = {}
-            for language, extensions in language_extension_map_org.items():
-                for ext in extensions:
-                    extension_to_language[ext] = language
-
-            for s in data['code_suggestions']:
-                try:
-                    extension_s = s['relevant_file'].rsplit('.')[-1]
-                    code_snippet_link = self.git_provider.get_line_link(s['relevant_file'], s['relevant_lines_start'],
-                                                                        s['relevant_lines_end'])
-                    label = s['label'].strip()
-                    data_markdown += f"\n💡 [{label}]\n\n**{s['suggestion_content'].rstrip().rstrip()}**\n\n"
-                    if code_snippet_link:
-                        data_markdown += f" File: [{s['relevant_file']} ({s['relevant_lines_start']}-{s['relevant_lines_end']})]({code_snippet_link})\n\n"
-                    else:
-                        data_markdown += f"File: {s['relevant_file']} ({s['relevant_lines_start']}-{s['relevant_lines_end']})\n\n"
-                    if self.git_provider.is_supported("gfm_markdown"):
-                        data_markdown += "<details> <summary> Example code:</summary>\n\n"
-                        data_markdown += f"___\n\n"
-                    language_name = "python"
-                    if extension_s and (extension_s in extension_to_language):
-                        language_name = extension_to_language[extension_s]
-                    data_markdown += f"Existing code:\n```{language_name}\n{s['existing_code'].rstrip()}\n```\n"
-                    data_markdown += f"Improved code:\n```{language_name}\n{s['improved_code'].rstrip()}\n```\n"
-                    if self.git_provider.is_supported("gfm_markdown"):
-                        data_markdown += "</details>\n"
-                    data_markdown += "\n___\n\n"
-                except Exception as e:
-                    get_logger().error(f"Could not parse suggestion: {s}, error: {e}")
-            self.git_provider.publish_comment(data_markdown)
-        except Exception as e:
-            get_logger().info(f"Failed to publish summarized code suggestions, error: {e}")

pr_agent/tools/pr_config.py

@@ -1,13 +1,14 @@
+import logging
+
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger
 
 
 class PRConfig:
     """
     The PRConfig class is responsible for listing all configuration options available for the user.
     """
-    def __init__(self, pr_url: str, args=None, ai_handler=None):
+    def __init__(self, pr_url: str, args=None):
         """
         Initialize the PRConfig object with the necessary attributes and objects to comment on a pull request.
 
@@ -18,11 +19,11 @@ class PRConfig:
         self.git_provider = get_git_provider()(pr_url)
 
     async def run(self):
-        get_logger().info('Getting configuration settings...')
+        logging.info('Getting configuration settings...')
-        get_logger().info('Preparing configs...')
+        logging.info('Preparing configs...')
         pr_comment = self._prepare_pr_configs()
         if get_settings().config.publish_output:
-            get_logger().info('Pushing configs...')
+            logging.info('Pushing configs...')
             self.git_provider.publish_comment(pr_comment)
             self.git_provider.remove_initial_comment()
         return ""
@@ -43,5 +44,5 @@ class PRConfig:
                 comment_str += f"\n{header.lower()}.{key.lower()} = {repr(value) if isinstance(value, str) else value}"
                 comment_str += "  "
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"comment_str:\n{comment_str}")
+            logging.info(f"comment_str:\n{comment_str}")
         return comment_str

pr_agent/tools/pr_description.py

@@ -1,24 +1,22 @@
 import copy
+import json
 import re
-from functools import partial
+import logging
 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_handler import AiHandler
-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 load_yaml, set_custom_labels, get_user_labels
+from pr_agent.algo.utils import load_yaml
 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
-from pr_agent.log import get_logger
 
 
 class PRDescription:
-    def __init__(self, pr_url: str, args: list = None,
+    def __init__(self, pr_url: str, args: list = None):
-                 ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
         """
         Initialize the PRDescription object with the necessary attributes and objects for generating a PR description
         using an AI model.
@@ -33,13 +31,8 @@ class PRDescription:
         )
         self.pr_id = self.git_provider.get_pr_id()
 
-        if get_settings().pr_description.enable_semantic_files_types and not self.git_provider.is_supported(
-                "gfm_markdown"):
-            get_logger().debug(f"Disabling semantic files types for {self.pr_id}")
-            get_settings().pr_description.enable_semantic_files_types = False
-
         # Initialize the AI handler
-        self.ai_handler = ai_handler()
+        self.ai_handler = AiHandler()
     
         # Initialize the variables dictionary
         self.vars = {
@@ -49,10 +42,7 @@ class PRDescription:
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
             "extra_instructions": get_settings().pr_description.extra_instructions,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
+            "commit_messages_str": self.git_provider.get_commit_messages()
-            "enable_custom_labels": get_settings().config.enable_custom_labels,
-            "custom_labels_class": "",  # will be filled if necessary in 'set_custom_labels' function
-            "enable_semantic_files_types": get_settings().pr_description.enable_semantic_files_types,
         }
 
         self.user_description = self.git_provider.get_user_description()
@@ -75,21 +65,18 @@ class PRDescription:
         """
 
         try:
-            get_logger().info(f"Generating a PR description {self.pr_id}")
+            logging.info(f"Generating a PR description {self.pr_id}")
             if get_settings().config.publish_output:
                 self.git_provider.publish_comment("Preparing PR description...", is_temporary=True)
 
             await retry_with_fallback_models(self._prepare_prediction)
 
-            get_logger().info(f"Preparing answer {self.pr_id}")
+            logging.info(f"Preparing answer {self.pr_id}")
             if self.prediction:
                 self._prepare_data()
             else:
                 return None
 
-            if get_settings().pr_description.enable_semantic_files_types:
-                self._prepare_file_labels()
-
             pr_labels = []
             if get_settings().pr_description.publish_labels:
                 pr_labels = self._prepare_labels()
@@ -101,26 +88,19 @@ class PRDescription:
             full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}"
 
             if get_settings().config.publish_output:
-                get_logger().info(f"Pushing answer {self.pr_id}")
+                logging.info(f"Pushing answer {self.pr_id}")
                 if get_settings().pr_description.publish_description_as_comment:
-                    get_logger().info(f"Publishing answer as comment")
                     self.git_provider.publish_comment(full_markdown_description)
                 else:
                     self.git_provider.publish_description(pr_title, pr_body)
                     if get_settings().pr_description.publish_labels and self.git_provider.is_supported("get_labels"):
-                        current_labels = self.git_provider.get_pr_labels()
+                        current_labels = self.git_provider.get_labels()
-                        user_labels = get_user_labels(current_labels)
+                        if current_labels is None:
-                        self.git_provider.publish_labels(pr_labels + user_labels)
+                            current_labels = []
-
+                        self.git_provider.publish_labels(pr_labels + current_labels)
-                    if (get_settings().pr_description.final_update_message and
-                            hasattr(self.git_provider, 'pr_url') and self.git_provider.pr_url):
-                        latest_commit_url = self.git_provider.get_latest_commit_url()
-                        if latest_commit_url:
-                            self.git_provider.publish_comment(
-                                f"**[PR Description]({self.git_provider.pr_url})** updated to latest commit ({latest_commit_url})")
                 self.git_provider.remove_initial_comment()
         except Exception as e:
-            get_logger().error(f"Error generating PR description {self.pr_id}: {e}")
+            logging.error(f"Error generating PR description {self.pr_id}: {e}")
         
         return ""
 
@@ -141,9 +121,9 @@ class PRDescription:
         if get_settings().pr_description.use_description_markers and 'pr_agent:' not in self.user_description:
             return None
 
-        get_logger().info(f"Getting PR diff {self.pr_id}")
+        logging.info(f"Getting PR diff {self.pr_id}")
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info(f"Getting AI prediction {self.pr_id}")
+        logging.info(f"Getting AI prediction {self.pr_id}")
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str) -> str:
@@ -160,14 +140,12 @@ class PRDescription:
         variables["diff"] = self.patches_diff  # update diff
 
         environment = Environment(undefined=StrictUndefined)
-        set_custom_labels(variables, self.git_provider)
-        self.variables = variables
         system_prompt = environment.from_string(get_settings().pr_description_prompt.system).render(variables)
         user_prompt = environment.from_string(get_settings().pr_description_prompt.user).render(variables)
 
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
 
         response, finish_reason = await self.ai_handler.chat_completion(
             model=model,
@@ -176,11 +154,9 @@ class PRDescription:
             user=user_prompt
         )
 
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nAI response:\n{response}")
-
         return response
 
+
     def _prepare_data(self):
         # Load the AI prediction data into a dictionary
         self.data = load_yaml(self.prediction.strip())
@@ -188,51 +164,21 @@ class PRDescription:
         if get_settings().pr_description.add_original_user_description and self.user_description:
             self.data["User Description"] = self.user_description
 
-        # re-order keys
-        if 'User Description' in self.data:
-            self.data['User Description'] = self.data.pop('User Description')
-        if 'title' in self.data:
-            self.data['title'] = self.data.pop('title')
-        if 'type' in self.data:
-            self.data['type'] = self.data.pop('type')
-        if 'labels' in self.data:
-            self.data['labels'] = self.data.pop('labels')
-        if 'description' in self.data:
-            self.data['description'] = self.data.pop('description')
-        if 'pr_files' in self.data:
-            self.data['pr_files'] = self.data.pop('pr_files')
-
-
-
 
     def _prepare_labels(self) -> List[str]:
         pr_types = []
 
         # If the 'PR Type' key is present in the dictionary, split its value by comma and assign it to 'pr_types'
-        if 'labels' in self.data:
+        if 'PR Type' in self.data:
-            if type(self.data['labels']) == list:
+            if type(self.data['PR Type']) == list:
-                pr_types = self.data['labels']
+                pr_types = self.data['PR Type']
-            elif type(self.data['labels']) == str:
+            elif type(self.data['PR Type']) == str:
-                pr_types = self.data['labels'].split(',')
+                pr_types = self.data['PR Type'].split(',')
-        elif 'type' in self.data:
-            if type(self.data['type']) == list:
-                pr_types = self.data['type']
-            elif type(self.data['type']) == str:
-                pr_types = self.data['type'].split(',')
 
-        # convert lowercase labels to original case
-        try:
-            if "labels_minimal_to_labels_dict" in self.variables:
-                d: dict = self.variables["labels_minimal_to_labels_dict"]
-                for i, label_i in enumerate(pr_types):
-                    if label_i in d:
-                        pr_types[i] = d[label_i]
-        except Exception as e:
-            get_logger().error(f"Error converting labels to original case {self.pr_id}: {e}")
         return pr_types
 
     def _prepare_pr_answer_with_markers(self) -> Tuple[str, str]:
-        get_logger().info(f"Using description marker replacements {self.pr_id}")
+        logging.info(f"Using description marker replacements {self.pr_id}")
         title = self.vars["title"]
         body = self.user_description
         if get_settings().pr_description.include_generated_by_header:
@@ -240,25 +186,21 @@ class PRDescription:
         else:
             ai_header = ""
 
-        ai_type = self.data.get('type')
+        ai_summary = self.data.get('PR Description')
-        if ai_type and not re.search(r'<!--\s*pr_agent:type\s*-->', body):
-            pr_type = f"{ai_header}{ai_type}"
-            body = body.replace('pr_agent:type', pr_type)
-
-        ai_summary = self.data.get('description')
         if ai_summary and not re.search(r'<!--\s*pr_agent:summary\s*-->', body):
             summary = f"{ai_header}{ai_summary}"
             body = body.replace('pr_agent:summary', summary)
 
-        ai_walkthrough = self.data.get('pr_files')
+        if not re.search(r'<!--\s*pr_agent:walkthrough\s*-->', body):
-        if ai_walkthrough and not re.search(r'<!--\s*pr_agent:walkthrough\s*-->', body):
+            ai_walkthrough = self.data.get('PR Main Files Walkthrough')
-            try:
+            if ai_walkthrough:
-                walkthrough_gfm = ""
+                walkthrough = str(ai_header)
-                walkthrough_gfm = self.process_pr_files_prediction(walkthrough_gfm, self.file_label_dict)
+                for file in ai_walkthrough:
-                body = body.replace('pr_agent:walkthrough', walkthrough_gfm)
+                    filename = file['filename'].replace("'", "`")
-            except Exception as e:
+                    description = file['changes in file'].replace("'", "`")
-                get_logger().error(f"Failing to process walkthrough {self.pr_id}: {e}")
+                    walkthrough += f'- `{filename}`: {description}\n'
-                body = body.replace('pr_agent:walkthrough', "")
+
+                body = body.replace('pr_agent:walkthrough', walkthrough)
 
         return title, body
 
@@ -273,17 +215,12 @@ class PRDescription:
 
         # Iterate over the dictionary items and append the key and value to 'markdown_text' in a markdown format
         markdown_text = ""
-        # Don't display 'PR Labels'
-        if 'labels' in self.data and self.git_provider.is_supported("get_labels"):
-            self.data.pop('labels')
-        if not get_settings().pr_description.enable_pr_type:
-            self.data.pop('type')
         for key, value in self.data.items():
             markdown_text += f"## {key}\n\n"
             markdown_text += f"{value}\n\n"
 
         # Remove the 'PR Title' key from the dictionary
-        ai_title = self.data.pop('title', self.vars["title"])
+        ai_title = self.data.pop('PR Title', self.vars["title"])
         if get_settings().pr_description.keep_original_user_title:
             # Assign the original PR title to the 'title' variable
             title = self.vars["title"]
@@ -295,147 +232,26 @@ class PRDescription:
         # except for the items containing the word 'walkthrough'
         pr_body = ""
         for idx, (key, value) in enumerate(self.data.items()):
-            if key == 'pr_files':
+            pr_body += f"## {key}:\n"
-                value = self.file_label_dict
-                key_publish = "Changes walkthrough"
-            else:
-                key_publish = key.rstrip(':').replace("_", " ").capitalize()
-            pr_body += f"## {key_publish}\n"
             if 'walkthrough' in key.lower():
+                # for filename, description in value.items():
                 if self.git_provider.is_supported("gfm_markdown"):
                     pr_body += "<details> <summary>files:</summary>\n\n"
                 for file in value:
                     filename = file['filename'].replace("'", "`")
-                    description = file['changes_in_file']
+                    description = file['changes in file']
-                    pr_body += f'- `{filename}`: {description}\n'
+                    pr_body += f'`{filename}`: {description}\n'
                 if self.git_provider.is_supported("gfm_markdown"):
-                    pr_body += "</details>\n"
+                    pr_body +="</details>\n"
-            elif 'pr_files' in key.lower():
-                pr_body = self.process_pr_files_prediction(pr_body, value)
             else:
                 # if the value is a list, join its items by comma
-                if isinstance(value, list):
+                if type(value) == list:
                     value = ', '.join(v for v in value)
                 pr_body += f"{value}\n"
             if idx < len(self.data) - 1:
-                pr_body += "\n\n___\n\n"
+                pr_body += "\n___\n"
 
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"title:\n{title}\n{pr_body}")
+            logging.info(f"title:\n{title}\n{pr_body}")
 
         return title, pr_body
-
-    def _prepare_file_labels(self):
-        self.file_label_dict = {}
-        for file in self.data['pr_files']:
-            try:
-                filename = file['filename'].replace("'", "`").replace('"', '`')
-                changes_summary = file['changes_summary']
-                label = file.get('label')
-                if label not in self.file_label_dict:
-                    self.file_label_dict[label] = []
-                self.file_label_dict[label].append((filename, changes_summary))
-            except Exception as e:
-                get_logger().error(f"Error preparing file label dict {self.pr_id}: {e}")
-                pass
-
-    def process_pr_files_prediction(self, pr_body, value):
-        # logic for using collapsible file list
-        use_collapsible_file_list = get_settings().pr_description.collapsible_file_list
-        num_files = 0
-        if value:
-            for semantic_label in value.keys():
-                num_files += len(value[semantic_label])
-        if use_collapsible_file_list == "adaptive":
-            use_collapsible_file_list = num_files > 8
-
-        if not self.git_provider.is_supported("gfm_markdown"):
-            get_logger().info(f"Disabling semantic files types for {self.pr_id} since gfm_markdown is not supported")
-            return pr_body
-        try:
-            pr_body += "<table>"
-            header = f"Relevant files"
-            delta = 65
-            header += "&nbsp; " * delta
-            pr_body += f"""<thead><tr><th></th><th>{header}</th></tr></thead>"""
-            pr_body += """<tbody>"""
-            for semantic_label in value.keys():
-                s_label = semantic_label.strip("'").strip('"')
-                pr_body += f"""<tr><td><strong>{s_label.capitalize()}</strong></td>"""
-                list_tuples = value[semantic_label]
-
-                if use_collapsible_file_list:
-                    pr_body += f"""<td><details><summary>{len(list_tuples)} files</summary><table>"""
-                else:
-                    pr_body += f"""<td><table>"""
-                for filename, file_change_description in list_tuples:
-                    filename = filename.replace("'", "`")
-                    filename_publish = filename.split("/")[-1]
-                    filename_publish = f"{filename_publish}"
-                    if len(filename_publish) < (delta - 5):
-                        filename_publish += "&nbsp; " * ((delta - 5) - len(filename_publish))
-                    diff_plus_minus = ""
-                    diff_files = self.git_provider.diff_files
-                    for f in diff_files:
-                        if f.filename.lower() == filename.lower():
-                            num_plus_lines = f.num_plus_lines
-                            num_minus_lines = f.num_minus_lines
-                            diff_plus_minus += f"+{num_plus_lines}/-{num_minus_lines}"
-                            break
-
-                    # try to add line numbers link to code suggestions
-                    link = ""
-                    if hasattr(self.git_provider, 'get_line_link'):
-                        filename = filename.strip()
-                        link = self.git_provider.get_line_link(filename, relevant_line_start=-1)
-
-                    file_change_description = self._insert_br_after_x_chars(file_change_description, x=(delta - 5))
-                    pr_body += f"""
-<tr>
-  <td>
-    <details>
-      <summary><strong>{filename_publish}</strong></summary>
-      <ul>
-        {filename}<br><br>
-
-**{file_change_description}**
-</ul>
-    </details>
-  </td>
-  <td><a href="{link}"> {diff_plus_minus}</a></td>
-
-</tr>                    
-"""
-                if use_collapsible_file_list:
-                    pr_body += """</table></details></td></tr>"""
-                else:
-                    pr_body += """</table></td></tr>"""
-            pr_body += """</tr></tbody></table>"""
-
-        except Exception as e:
-            get_logger().error(f"Error processing pr files to markdown {self.pr_id}: {e}")
-            pass
-        return pr_body
-
-    def _insert_br_after_x_chars(self, text, x=70):
-        """
-        Insert <br> into a string after a word that increases its length above x characters.
-        """
-        if len(text) < x:
-            return text
-
-        words = text.split(' ')
-        new_text = ""
-        current_length = 0
-
-        for word in words:
-            # Check if adding this word exceeds x characters
-            if current_length + len(word) > x:
-                new_text += "<br>"  # Insert line break
-                current_length = 0  # Reset counter
-
-            # Add the word to the new text
-            new_text += word + " "
-            current_length += len(word) + 1  # Add 1 for the space
-
-        return new_text.strip()  # Remove trailing space

pr_agent/tools/pr_generate_labels.py

@@ -1,184 +0,0 @@
-import copy
-import re
-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 get_pr_diff, retry_with_fallback_models
-from pr_agent.algo.token_handler import TokenHandler
-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
-from pr_agent.log import get_logger
-
-
-class PRGenerateLabels:
-    def __init__(self, pr_url: str, args: list = None,
-                 ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
-        """
-        Initialize the PRGenerateLabels object with the necessary attributes and objects for generating labels
-        corresponding to the PR using an AI model.
-        Args:
-            pr_url (str): The URL of the pull request.
-            args (list, optional): List of arguments passed to the PRGenerateLabels class. Defaults to None.
-        """
-        # Initialize the git provider and main PR language
-        self.git_provider = get_git_provider()(pr_url)
-        self.main_pr_language = get_main_pr_language(
-            self.git_provider.get_languages(), self.git_provider.get_files()
-        )
-        self.pr_id = self.git_provider.get_pr_id()
-
-        # Initialize the AI handler
-        self.ai_handler = ai_handler()
-    
-        # Initialize the variables dictionary
-        self.vars = {
-            "title": self.git_provider.pr.title,
-            "branch": self.git_provider.get_pr_branch(),
-            "description": self.git_provider.get_pr_description(full=False),
-            "language": self.main_pr_language,
-            "diff": "",  # empty diff for initial calculation
-            "extra_instructions": get_settings().pr_description.extra_instructions,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
-            "enable_custom_labels": get_settings().config.enable_custom_labels,
-            "custom_labels_class": "",  # will be filled if necessary in 'set_custom_labels' function
-        }
-
-        # Initialize the token handler
-        self.token_handler = TokenHandler(
-            self.git_provider.pr,
-            self.vars,
-            get_settings().pr_custom_labels_prompt.system,
-            get_settings().pr_custom_labels_prompt.user,
-        )
-    
-        # Initialize patches_diff and prediction attributes
-        self.patches_diff = None
-        self.prediction = None
-
-    async def run(self):
-        """
-        Generates a PR labels using an AI model and publishes it to the PR.
-        """
-
-        try:
-            get_logger().info(f"Generating a PR labels {self.pr_id}")
-            if get_settings().config.publish_output:
-                self.git_provider.publish_comment("Preparing PR labels...", is_temporary=True)
-
-            await retry_with_fallback_models(self._prepare_prediction)
-
-            get_logger().info(f"Preparing answer {self.pr_id}")
-            if self.prediction:
-                self._prepare_data()
-            else:
-                return None
-
-            pr_labels = self._prepare_labels()
-
-            if get_settings().config.publish_output:
-                get_logger().info(f"Pushing labels {self.pr_id}")
-
-                current_labels = self.git_provider.get_pr_labels()
-                user_labels = get_user_labels(current_labels)
-                pr_labels = pr_labels + user_labels
-
-                if self.git_provider.is_supported("get_labels"):
-                    self.git_provider.publish_labels(pr_labels)
-                elif pr_labels:
-                    value = ', '.join(v for v in pr_labels)
-                    pr_labels_text = f"## PR Labels:\n{value}\n"
-                    self.git_provider.publish_comment(pr_labels_text, is_temporary=False)
-                self.git_provider.remove_initial_comment()
-        except Exception as e:
-            get_logger().error(f"Error generating PR labels {self.pr_id}: {e}")
-        
-        return ""
-
-    async def _prepare_prediction(self, model: str) -> None:
-        """
-        Prepare the AI prediction for the PR labels based on the provided model.
-
-        Args:
-            model (str): The name of the model to be used for generating the prediction.
-
-        Returns:
-            None
-
-        Raises:
-            Any exceptions raised by the 'get_pr_diff' and '_get_prediction' functions.
-
-        """
-
-        get_logger().info(f"Getting PR diff {self.pr_id}")
-        self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info(f"Getting AI prediction {self.pr_id}")
-        self.prediction = await self._get_prediction(model)
-
-    async def _get_prediction(self, model: str) -> str:
-        """
-        Generate an AI prediction for the PR labels based on the provided model.
-
-        Args:
-            model (str): The name of the model to be used for generating the prediction.
-
-        Returns:
-            str: The generated AI prediction.
-        """
-        variables = copy.deepcopy(self.vars)
-        variables["diff"] = self.patches_diff  # update diff
-
-        environment = Environment(undefined=StrictUndefined)
-        set_custom_labels(variables, self.git_provider)
-        self.variables = variables
-        system_prompt = environment.from_string(get_settings().pr_custom_labels_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_custom_labels_prompt.user).render(variables)
-
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
-
-        response, finish_reason = await self.ai_handler.chat_completion(
-            model=model,
-            temperature=0.2,
-            system=system_prompt,
-            user=user_prompt
-        )
-
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nAI response:\n{response}")
-
-        return response
-
-    def _prepare_data(self):
-        # Load the AI prediction data into a dictionary
-        self.data = load_yaml(self.prediction.strip())
-
-
-
-    def _prepare_labels(self) -> List[str]:
-        pr_types = []
-
-        # If the 'labels' key is present in the dictionary, split its value by comma and assign it to 'pr_types'
-        if 'labels' in self.data:
-            if type(self.data['labels']) == list:
-                pr_types = self.data['labels']
-            elif type(self.data['labels']) == str:
-                pr_types = self.data['labels'].split(',')
-
-        # convert lowercase labels to original case
-        try:
-            if "labels_minimal_to_labels_dict" in self.variables:
-                d: dict = self.variables["labels_minimal_to_labels_dict"]
-                for i, label_i in enumerate(pr_types):
-                    if label_i in d:
-                        pr_types[i] = d[label_i]
-        except Exception as e:
-            get_logger().error(f"Error converting labels to original case {self.pr_id}: {e}")
-
-        return pr_types

pr_agent/tools/pr_information_from_user.py

@@ -1,26 +1,23 @@
 import copy
-from functools import partial
+import logging
 
 from jinja2 import Environment, StrictUndefined
 
-from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
+from pr_agent.algo.ai_handler import AiHandler
-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.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
-from pr_agent.log import get_logger
 
 
 class PRInformationFromUser:
-    def __init__(self, pr_url: str, args: list = None,
+    def __init__(self, pr_url: str, args: list = None):
-                 ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
         self.git_provider = get_git_provider()(pr_url)
         self.main_pr_language = get_main_pr_language(
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
-        self.ai_handler = ai_handler()
+        self.ai_handler = AiHandler()
         self.vars = {
             "title": self.git_provider.pr.title,
             "branch": self.git_provider.get_pr_branch(),
@@ -37,22 +34,22 @@ class PRInformationFromUser:
         self.prediction = None
 
     async def run(self):
-        get_logger().info('Generating question to the user...')
+        logging.info('Generating question to the user...')
         if get_settings().config.publish_output:
             self.git_provider.publish_comment("Preparing questions...", is_temporary=True)
         await retry_with_fallback_models(self._prepare_prediction)
-        get_logger().info('Preparing questions...')
+        logging.info('Preparing questions...')
         pr_comment = self._prepare_pr_answer()
         if get_settings().config.publish_output:
-            get_logger().info('Pushing questions...')
+            logging.info('Pushing questions...')
             self.git_provider.publish_comment(pr_comment)
             self.git_provider.remove_initial_comment()
         return ""
 
     async def _prepare_prediction(self, model):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
@@ -62,8 +59,8 @@ class PRInformationFromUser:
         system_prompt = environment.from_string(get_settings().pr_information_from_user_prompt.system).render(variables)
         user_prompt = environment.from_string(get_settings().pr_information_from_user_prompt.user).render(variables)
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
         return response
@@ -71,7 +68,7 @@ class PRInformationFromUser:
     def _prepare_pr_answer(self) -> str:
         model_output = self.prediction.strip()
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"answer_str:\n{model_output}")
+            logging.info(f"answer_str:\n{model_output}")
         answer_str = f"{model_output}\n\n Please respond to the questions above in the following format:\n\n" +\
                      "\n>/answer\n>1) ...\n>2) ...\n>...\n"
         return answer_str

pr_agent/tools/pr_questions.py

@@ -1,26 +1,24 @@
 import copy
-from functools import partial
+import logging
 
 from jinja2 import Environment, StrictUndefined
 
-from pr_agent.algo.ai_handlers.base_ai_handler import BaseAiHandler
+from pr_agent.algo.ai_handler import AiHandler
-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.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
-from pr_agent.log import get_logger
 
 
 class PRQuestions:
-    def __init__(self, pr_url: str, args=None, ai_handler: partial[BaseAiHandler,] = LiteLLMAIHandler):
+    def __init__(self, pr_url: str, args=None):
         question_str = self.parse_args(args)
         self.git_provider = get_git_provider()(pr_url)
         self.main_pr_language = get_main_pr_language(
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
-        self.ai_handler = ai_handler()
+        self.ai_handler = AiHandler()
         self.question_str = question_str
         self.vars = {
             "title": self.git_provider.pr.title,
@@ -46,22 +44,22 @@ class PRQuestions:
         return question_str
 
     async def run(self):
-        get_logger().info('Answering a PR question...')
+        logging.info('Answering a PR question...')
         if get_settings().config.publish_output:
             self.git_provider.publish_comment("Preparing answer...", is_temporary=True)
         await retry_with_fallback_models(self._prepare_prediction)
-        get_logger().info('Preparing answer...')
+        logging.info('Preparing answer...')
         pr_comment = self._prepare_pr_answer()
         if get_settings().config.publish_output:
-            get_logger().info('Pushing answer...')
+            logging.info('Pushing answer...')
             self.git_provider.publish_comment(pr_comment)
             self.git_provider.remove_initial_comment()
         return ""
 
     async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
@@ -71,8 +69,8 @@ class PRQuestions:
         system_prompt = environment.from_string(get_settings().pr_questions_prompt.system).render(variables)
         user_prompt = environment.from_string(get_settings().pr_questions_prompt.user).render(variables)
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
         return response
@@ -81,5 +79,5 @@ class PRQuestions:
         answer_str = f"Question: {self.question_str}\n\n"
         answer_str += f"Answer:\n{self.prediction.strip()}\n\n"
         if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"answer_str:\n{answer_str}")
+            logging.info(f"answer_str:\n{answer_str}")
         return answer_str