run_from_scratch

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

@@ -26,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

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**
-- [Using Docker image (no installation required)](INSTALL.md#use-docker-image-no-installation-required)
-- [Run from source](INSTALL.md#run-from-source)
-
-**GitHub specific methods**
-- [Run as a GitHub Action](INSTALL.md#run-as-a-github-action)
-- [Run as a polling server](INSTALL.md#run-as-a-polling-server)
-- [Run as a GitHub App](INSTALL.md#run-as-a-github-app)
-- [Deploy as a Lambda Function](INSTALL.md#deploy-as-a-lambda-function)
-- [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)
+- [Method 1: Use Docker image (no installation required)](INSTALL.md#method-1-use-docker-image-no-installation-required)
+- [Method 2: Run from source](INSTALL.md#method-2-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)
+- [Method 5: Run as a GitHub App](INSTALL.md#method-5-run-as-a-github-app)
+- [Method 6: Deploy as a Lambda Function](INSTALL.md#method-6---deploy-as-a-lambda-function)
+- [Method 7: AWS CodeCommit](INSTALL.md#method-7---aws-codecommit-setup)
+- [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)
 ---
 
-### 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> 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:
-```
-codiumai/pr-agent@v0.9
+2. To ask a question about a PR using the same 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> 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
-Secret = <your key>
+OPENAI_KEY: <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
-Request reviews by tagging your GitHub user on a PR
-
-Follow [steps 1-3](#run-as-a-github-action) of the GitHub Action setup.
+### Method 4: Run as a polling server
+Request reviews by tagging your Github user on a PR
 
+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>
-> For more information please check out the [USAGE GUIDE](./Usage.md#working-with-github-app)
+> However, you can override the default tool parameters by uploading a local configuration file<br>
+> 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))
-7. Go back to steps 8-9 of [Method 5](#run-as-a-github-app) with the function url as your Webhook URL.
+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.
     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,7 +372,7 @@ 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.
@@ -412,51 +396,7 @@ pipelines:
 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.
+You can get a Bitbucket token for your repository by following Repository Settings -> Security -> Access Tokens
 
-Note that comments on a PR are not supported in Bitbucket Pipeline.
-
-
-### Run using CodiumAI-hosted Bitbucket app
-
-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">
 
-
-<picture>
-  <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/>
+<img src="./pics/logo-dark.png#gh-dark-mode-only" width="330"/>
+<img src="./pics/logo-light.png#gh-light-mode-only" width="330"/><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 for efficient pull request reviewing and handling. 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,17 +28,15 @@ CodiumAI `PR-Agent` is an open-source tool for efficient pull request reviewing
 \
 ‣ **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 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.
 
-See the [Installation Guide](./INSTALL.md) for instructions on installing and running the tool on different git platforms.
+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 [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 [Tools Guide](./docs/TOOLS_GUIDE.md) for detailed description of the different tools.
 
-See the [Tools Guide](./docs/TOOLS_GUIDE.md) for detailed description of the different tools (tools are run via the commands).
+See the [Release notes](./RELEASE_NOTES.md) for updates on the latest changes.
 
 <h3>Example results:</h3>
 </div>
@@ -120,14 +113,13 @@ See the [Tools Guide](./docs/TOOLS_GUIDE.md) for detailed description of the dif
 |       | ⮑ 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:    |                         |                             |          |          |       |
+|       | Find similar issue                          |   :white_check_mark:    |                         |   :white_check_mark:                          |          |          |       |
 |       | Add Documentation                           |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | Generate 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:    |        |           |          |          |
+|       | Actions                                     |   :white_check_mark:    |        | :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:       |
@@ -140,7 +132,7 @@ Review the [usage guide](./Usage.md) section for detailed instructions how to us
 
 ## 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
@@ -151,7 +143,6 @@ 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 ...`.
 
 ---
 
@@ -180,7 +171,7 @@ There are several ways to use PR-Agent:
 
 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
 
@@ -213,9 +204,6 @@ Here are some advantages of PR-Agent:
   - [x] Documentation (is the PR properly documented)
   - [ ] ...
 
-See the [Release notes](./RELEASE_NOTES.md) for updates on the latest changes.
-
-
 ## Similar Projects
 
 - [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)
@@ -223,15 +211,7 @@ See the [Release notes](./RELEASE_NOTES.md) for updates on the latest changes.
 - [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)
-
-## Data Privacy
-
-If you use a self-hosted PR-Agent with your OpenAI API key, it is between you and OpenAI. You can read their API data privacy policy here:
-https://openai.com/enterprise-privacy
-
-When using a PR-Agent app hosted by CodiumAI, we will not store any of your data, nor will we used it for training.
-You will also benefit from an OpenAI account with zero data retention.
-
+  
 ## Links
 
 [![Join our Discord community](https://raw.githubusercontent.com/Codium-ai/codiumai-vscode-release/main/media/docs/Joincommunity.png)](https://discord.gg/kG35uSHDBc)

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

@@ -6,14 +6,13 @@
 - [Online usage](#online-usage)
 - [Working with GitHub App](#working-with-github-app)
 - [Working with GitHub Action](#working-with-github-action)
-- [Working with BitBucket App](#working-with-bitbucket-self-hosted-app)
 - [Changing a model](#changing-a-model)
 - [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
@@ -33,19 +32,12 @@ The [Tools Guide](./docs/TOOLS_GUIDE.md) provides a detailed description of the
 #### 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:
-`/review --ignore.glob=['*.py']`
-
-To ignore python files in all PRs, set in a configuration file:
-```
-[ignore]
-glob = ['*.py']
-```
+See [dynaconf envvars documentation](https://www.dynaconf.com/envvars/).
 
 #### 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:
@@ -67,7 +59,7 @@ The [git_provider](pr_agent/settings/configuration.toml#L4) field in the configu
 
 ### 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`
@@ -91,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
@@ -108,49 +100,27 @@ 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.
-
-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.
+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.
 
 #### GitHub app automatic tools
-The [github_app](pr_agent/settings/configuration.toml#L76) section defines GitHub app-specific configurations.  
-In this section you can define configurations to control the conditions for which tools will **run automatically**.  
-
-##### 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):
+The [github_app](pr_agent/settings/configuration.toml#L56) section defines GitHub app specific configurations.
+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]
-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",
     "/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 `auto_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.
 
 You can override the default tool parameters by uploading a local configuration file called `.pr_agent.toml` to the root of your repo.
@@ -165,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.  
-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",
-    "/auto_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 `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 `auto_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.
+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.
 
 #### Editing the prompts
 The prompts for the various PR-Agent tools are defined in the `pr_agent/settings` folder.
@@ -205,57 +159,21 @@ 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. 
-Specifically, start by setting the following environment variables:
+You can configure settings in GitHub action by adding environment variables under the env section in `.github/workflows/pr_agent.yml` file. Some examples:
 ```yaml
       env:
-        OPENAI_KEY: ${{ secrets.OPENAI_KEY }} # Make sure to add your OpenAI key to your repo secrets
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Make sure to add your GitHub token to your repo secrets
-        github_action.auto_review: "true" # enable\disable auto review
-        github_action.auto_describe: "true" # enable\disable auto describe
-        github_action.auto_improve: "false" # enable\disable auto improve
+        # ... previous environment values
+        OPENAI.ORG: "<Your organization name under your OpenAI account>"
+        PR_REVIEWER.REQUIRE_TESTS_REVIEW: "false" # Disable tests review
+        PR_CODE_SUGGESTIONS.NUM_CODE_SUGGESTIONS: 6 # Increase number of code suggestions
+        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.
-
-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.
-
 ### Changing a model
 
 See [here](pr_agent/algo/__init__.py) for the list of available models.
@@ -263,7 +181,7 @@ To use a different model than the default (GPT-4), you need to edit [configurati
 For models and environments not from OPENAI, you might need to provide additional keys and other parameters. See below for instructions.
 
 #### 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"
@@ -272,11 +190,12 @@ 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
 
@@ -292,7 +211,7 @@ MAX_TOKENS = {
 e.g.
 MAX_TOKENS={
     ...,
-    "ollama/llama2": 4096
+    "llama2": 4096
 }
 
 
@@ -301,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**
@@ -341,41 +258,6 @@ key = ...
 
 Also review the [AiHandler](pr_agent/algo/ai_handler.py) file for instruction how to set keys for other models.
 
-#### Vertex AI
-
-To use Google's Vertex AI platform and its associated models (chat-bison/codechat-bison) set:
-
-``` 
-[config] # in configuration.toml
-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.
-
 ### 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.

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

@@ -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/add_docs_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/add_docs.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>
 
 ### 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`.

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=https://codium.ai/images/pr_agent/ask.png width="768"></kbd>
+<kbd><img src=./../pics/ask_comment.png width="768"></kbd>
+<kbd><img src=./../pics/ask.png width="768"></kbd>

docs/DESCRIBE.md

@@ -1,15 +1,15 @@
 # Describe Tool
 
-The `describe` tool scans the PR code changes, and automatically generates PR description - title, type, summary, walkthrough and labels.
+The `describe` tool scans the PR code changes, and automatically generates PR description - title, type, summary, code walkthrough and labels.
 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)
 
@@ -27,22 +27,18 @@ Under the section 'pr_description', the [configuration file](./../pr_agent/setti
 
 - `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)
-
-- `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, "PR changes walkthrough" section will be generated. Default is true.
-  
-### Markers template
+#### Markers template
 
 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:pr_type
 
 ## PR Description:
 pr_agent:summary
@@ -50,21 +46,6 @@ pr_agent:summary
 ## PR Walkthrough:
 pr_agent:walkthrough
 ```
-The marker `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.
 
-##### Example:
-```
-        env:
-          pr_description.use_description_markers: 'true'
-```          
-
-<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.

docs/GENERATE_CUSTOM_LABELS.md

@@ -1,41 +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>
-
-### How to enable custom labels
-
-Note that in addition to the dedicated tool `generate_labels`, the custom labels will also be used by the `review` and `describe` tools.
-
-#### CLI
-To enable custom labels, you need to apply the [configuration changes](#configuration-changes) to the [custom_labels file](./../pr_agent/settings/custom_labels.toml):
-
-#### GitHub Action and GitHub App
-To enable custom labels, you need to apply the [configuration changes](#configuration-changes) to the local `.pr_agent.toml` file in you repository.
-
-#### 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,14 +1,14 @@
 # Improve Tool
 
-The `improve` tool scans the PR code changes, and automatically generates committable suggestions for improving the PR code.
+The `improve` tool scans the PR code changes, and automatically generate committable suggestions for improving the PR code.
 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=https://codium.ai/images/pr_agent/improve.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)
 
@@ -17,7 +17,7 @@ An extended mode, which does not involve PR Compression and provides more compre
 /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 (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
 
@@ -31,27 +31,4 @@ Under the section 'pr_code_suggestions', the [configuration file](./../pr_agent/
 - `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
-- `summarize`: if set to true, the tool will present the code suggestions in a compact way. Default is false.
-
-In this mode, instead of presenting committable suggestions, the different suggestions will be combined into a single compact comment, with significantly smaller PR footprint.
-
-For example:
-
-`/improve --pr_code_suggestions.summarize=true`
-
-<kbd><img src=https://codium.ai/images/pr_agent/improved_summerize_open.png width="768"></kbd>
-
-___
-
-### 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.
+- `final_clip_factor`: factor to remove suggestions with low confidence. Default is 0.9.

docs/REVIEW.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/review_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/review.png width="768"></kbd>
+<kbd><img src=./../pics/review_comment.png width="768"></kbd>
+<kbd><img src=./../pics/describe.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)
 
@@ -16,45 +16,23 @@ The `review` tool can also be triggered automatically every time a new PR is ope
 
 Under the section 'pr_reviewer', the [configuration file](./../pr_agent/settings/configuration.toml#L16) contains options to customize the 'review' tool:
 
-#### 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.
-#### 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.
 - `automatic_review`: if set to false, no automatic reviews will be done. Default is true.
-- `remove_previous_review_comment`: if set to true, the tool will remove the previous review comment before adding a new one. 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 ...".
-#### review labels
-- `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.
-- `enable_review_labels_effort`: if set to true, the tool will publish a 'Review effort [1-5]: x' label. Default is false.
-- To enable `custom labels`, apply the configuration changes described [here](./GENERATE_CUSTOM_LABELS.md#configuration-changes) 
 ####  Incremental Mode
 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:
 ```
-/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>
-
-Under the section 'pr_reviewer', the [configuration file](./../pr_agent/settings/configuration.toml#L16) contains options to customize the 'review -i' tool.  
-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.
+<kbd><img src=./../pics/incremental_review.png width="768"></kbd>
 
 #### PR Reflection
 By invoking:
@@ -63,17 +41,6 @@ By invoking:
 ```
 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>
-
-
-#### A note on code suggestions quality
-
-- With current level of AI for code (GPT-4), mistakes can happen. 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_reviewer_prompts.toml#L29). 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.
-
-- Unlike the 'review' feature, which does a lot of things, the ['improve --extended'](./IMPROVE.md) feature is dedicated only to suggestions, and usually gives better results.
+<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,9 +6,9 @@ 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=https://codium.ai/images/pr_agent/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_original_issue.png width="768"></kbd>
+<kbd><img src=./../pics/similar_issue_comment.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).
 

docs/TOOLS_GUIDE.md

@@ -6,6 +6,5 @@
 - [SIMILAR_ISSUE](./SIMILAR_ISSUE.md)
 - [UPDATE CHANGELOG](./UPDATE_CHANGELOG.md)
 - [ADD DOCUMENTATION](./ADD_DOCUMENTATION.md)
-- [GENERATE CUSTOM LABELS](./GENERATE_CUSTOM_LABELS.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=https://codium.ai/images/pr_agent/update_changelog.png width="768"></kbd>
+<kbd><img src=./../pics/update_changelog_comment.png width="768"></kbd>
+<kbd><img src=./../pics/update_changelog.png width="768"></kbd>
 
 
 ### Configuration options

pr_agent/agent/pr_agent.py

@@ -7,7 +7,6 @@ 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_questions import PRQuestions
 from pr_agent.tools.pr_reviewer import PRReviewer
@@ -32,7 +31,6 @@ command2class = {
     "settings": PRConfig,
     "similar_issue": PRSimilarIssue,
     "add_docs": PRAddDocs,
-    "generate_labels": PRGenerateLabels,
 }
 
 commands = list(command2class.keys())
@@ -46,13 +44,10 @@ class PRAgent:
         apply_repo_settings(pr_url)
 
         # 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
+        request = request.replace("'", "\\'")
+        lexer = shlex.shlex(request, posix=True)
+        lexer.whitespace_split = True
+        action, *args = list(lexer)
         args = update_settings_from_args(args)
 
         action = action.lstrip("/").lower()

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,
-    '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,
+    'meta-llama/Llama-2-7b-chat-hf': 4096
 }

pr_agent/algo/ai_handler.py

@@ -1,6 +1,5 @@
 import os
 
-import boto3
 import litellm
 import openai
 from litellm import acompletion
@@ -24,50 +23,39 @@ class AiHandler:
         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):
+        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
-        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,
-            )
+            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):
@@ -108,16 +96,13 @@ class AiHandler:
             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)
+            response = await acompletion(
+                model=model,
+                deployment_id=deployment_id,
+                messages=messages,
+                temperature=temperature,
+                force_timeout=get_settings().config.ai_timeout
+            )
         except (APIError, Timeout, TryAgain) as e:
             get_logger().error("Error during OpenAI inference: ", e)
             raise

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 = [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]
+        patterns += [fnmatch.translate(glob) for glob in get_settings().ignore.glob]
 
         # 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

@@ -3,7 +3,6 @@ from __future__ import annotations
 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
 
 
@@ -116,7 +115,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,7 +132,7 @@ 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")

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

@@ -7,20 +7,18 @@ 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.utils import get_max_tokens
+from pr_agent.algo.token_handler import TokenHandler, get_token_encoder
 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"
-
-ADDED_FILES_ = "Additional added files (insufficient token budget to process):\n"
+MORE_MODIFIED_FILES_ = "More modified files:\n"
 
 OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD = 1000
 OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD = 600
@@ -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,26 +179,21 @@ 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}.")
             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}")
-            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)
-                total_tokens += token_handler.count_tokens(file.filename) + 1
+            if not modified_files_list:
+                total_tokens += token_handler.count_tokens(MORE_MODIFIED_FILES_)
+            modified_files_list.append(file.filename)
+            total_tokens += token_handler.count_tokens(file.filename) + 1
             continue
 
         if patch:
@@ -217,7 +206,7 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
             if get_settings().config.verbosity_level >= 2:
                 get_logger().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):
@@ -282,7 +271,7 @@ def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
         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()
 
@@ -326,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:
+        get_logger().warning(f"Failed to clip tokens: {e}")
+        return text
+
+
 def get_pr_multi_diffs(git_provider: GitProvider,
                        token_handler: TokenHandler,
                        model: str,
@@ -379,13 +397,13 @@ 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 = []

pr_agent/algo/utils.py

@@ -9,9 +9,6 @@ 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
 
@@ -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"<details><summary> { emoji } Code feedback:</summary>"
+                    markdown_text += f"\n\n- **<details><summary> { emoji } Code feedback:**</summary>\n\n"
                 else:
                     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':
@@ -80,7 +76,7 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
     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.
 
@@ -91,52 +87,23 @@ 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><td><strong>{sub_value}</strong></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"
-                for code_key, code_value in sub_value.items():  # 'before' and 'after' code
-                    code_str = f"```\n{code_value}\n```"
-                    code_str_indented = textwrap.indent(code_str, '        ')
-                    markdown_text += f"    - **{code_key}:**\n{code_str_indented}\n"
+    for sub_key, sub_value in code_suggestions.items():
+        if isinstance(sub_value, dict):  # "code example"
+            markdown_text += f"  - **{sub_key}:**\n"
+            for code_key, code_value in sub_value.items():  # 'before' and 'after' code
+                code_str = f"```\n{code_value}\n```"
+                code_str_indented = textwrap.indent(code_str, '        ')
+                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"
             else:
-                if "relevant file" in sub_key.lower():
-                    markdown_text += f"\n  - **{sub_key}:** {sub_value}  \n"
-                else:
-                    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"  # works for gitlab and bitbucker
+                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"
 
-        markdown_text += "\n"
+    markdown_text += "\n"
     return markdown_text
 
 
@@ -312,139 +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)
+        get_logger().error(f"Failed to parse YAML for config override {key}={value}", exc_info=e)
     return key, value
 
 
-def load_yaml(response_text: str) -> dict:
-    response_text = response_text.removeprefix('```yaml').rstrip('`')
+def load_yaml(review_text: str) -> dict:
+    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}")
-        data = try_fix_yaml(response_text)
+        data = try_fix_yaml(review_text)
     return data
 
-def try_fix_yaml(response_text: str) -> dict:
-    response_text_lines = response_text.split('\n')
-
-    keys = ['relevant line:', 'suggestion content:', 'relevant file:']
-    # 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 remove last lines
+def try_fix_yaml(review_text: str) -> dict:
+    review_text_lines = review_text.split('\n')
     data = {}
-    for i in range(1, len(response_text_lines)):
-        response_text_lines_tmp = '\n'.join(response_text_lines[:-i])
+    for i in range(1, len(review_text_lines)):
+        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")
             break
         except:
             pass
-    
-    # thrid 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
-
-
-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):"
-    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}"
-
-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
+    return data

pr_agent/cli.py

@@ -8,8 +8,6 @@ from pr_agent.log import setup_logger
 
 setup_logger()
 
-
-
 def run(inargs=None):
     parser = argparse.ArgumentParser(description='AI based pull request analyzer', usage=
 """\
@@ -23,22 +21,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.
-
-- add_docs
-
-- generate_labels
+-update_changelog - Update the changelog based on the PR's contents.
 
 
 Configuration:
@@ -57,9 +51,9 @@ For example: 'python cli.py --pr_url=... review --pr_reviewer.extra_instructions
     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,11 +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_foo.toml",
-        "settings/custom_labels.toml"
+        "settings_prod/.secrets.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

@@ -14,8 +14,9 @@ try:
 except ImportError:
     AZURE_DEVOPS_AVAILABLE = False
 
+from ..algo.pr_processing import clip_tokens
 from ..config_loader import get_settings
-from ..algo.utils import load_large_diff, clip_tokens
+from ..algo.utils import load_large_diff
 from ..algo.language_handler import is_valid_file
 from .git_provider import EDIT_TYPE, FilePatchInfo
 

pr_agent/git_providers/bitbucket_provider.py

@@ -9,13 +9,13 @@ from starlette_context import context
 from ..algo.pr_processing import 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, EDIT_TYPE
+from .git_provider import FilePatchInfo, GitProvider
+import ast
 
 
 class BitbucketProvider(GitProvider):
     def __init__(
-        self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
-    ):
+        self, pr_url: Optional[str] = None, incremental: Optional[bool] = False):
         s = requests.Session()
         try:
             bearer = context.get("bitbucket_bearer_token", None)
@@ -32,23 +32,21 @@ class BitbucketProvider(GitProvider):
         self.repo = None
         self.pr_num = None
         self.pr = None
-        self.pr_url = pr_url
+        self.feature = None
+        self.issue_num = None
+        self.issue_name = None
         self.temp_comments = []
         self.incremental = incremental
-        self.diff_files = None
-        if pr_url:
+        if pr_url and 'pull' in pr_url:
             self.set_pr(pr_url)
-        self.bitbucket_comment_api_url = self.pr._BitbucketBase__data["links"]["comments"]["href"]
-        self.bitbucket_pull_request_api_url = self.pr._BitbucketBase__data["links"]['self']['href']
+            self.bitbucket_comment_api_url = self.pr._BitbucketBase__data["links"]["comments"]["href"]
+            self.bitbucket_pull_request_api_url = self.pr._BitbucketBase__data["links"]['self']['href']
 
     def get_repo_settings(self):
         try:
-            url = (f"https://api.bitbucket.org/2.0/repositories/{self.workspace_slug}/{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')
+            contents = self.repo_obj.get_contents(
+                ".pr_agent.toml", ref=self.pr.head.sha
+            ).decoded_content
             return contents
         except Exception:
             return ""
@@ -118,9 +116,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 +127,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(
-                original_file_content_str,
-                new_file_content_str,
-                diff_split[index],
-                diff.new.path,
+            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,15 +145,10 @@ class BitbucketProvider(GitProvider):
     def remove_initial_comment(self):
         try:
             for comment in self.temp_comments:
-                self.remove_comment(comment)
+                self.pr.delete(f"comments/{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}")
 
     # funtion to create_inline_comment
     def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
@@ -228,44 +178,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}")
+            self.publish_inline_comment(comment['body'], comment['start_line'], comment['path'])
 
     def get_title(self):
         return self.pr.title
@@ -316,6 +231,27 @@ class BitbucketProvider(GitProvider):
             raise ValueError("Unable to convert PR number to integer") from e
 
         return workspace_slug, repo_slug, pr_number
+    
+    @staticmethod
+    def _parse_issue_url(issue_url: str) -> Tuple[str, int]:
+        parsed_url = urlparse(issue_url)
+
+        if "bitbucket.org" not in parsed_url.netloc:
+            raise ValueError("The provided URL is not a valid Bitbucket URL")
+
+        path_parts = parsed_url.path.strip('/').split('/')
+        if len(path_parts) < 5 or path_parts[2] != "issues":
+            raise ValueError("The provided URL does not appear to be a Bitbucket issue URL")
+        
+        workspace_slug = path_parts[0]
+        repo_slug = path_parts[1]
+        try:
+            issue_number = int(path_parts[3])
+        except ValueError as e:
+            raise ValueError("Unable to convert issue number to integer") from e
+        
+        return workspace_slug, repo_slug, issue_number
+
 
     def _get_repo(self):
         if self.repo is None:
@@ -342,11 +278,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
@@ -354,5 +285,83 @@ class BitbucketProvider(GitProvider):
         pass
     
     # bitbucket does not support labels
-    def get_pr_labels(self):
+    def get_labels(self):
         pass
+
+    def get_issue(self, workspace_slug, repo_name, original_issue_number):
+        issue = self.bitbucket_client.repositories.get(workspace_slug, repo_name).issues.get(original_issue_number)
+        return issue
+    
+    def get_issue_url(self, issue):
+        return issue._BitbucketBase__data['links']['html']['href']
+    
+    def get_issue_body(self, issue):
+        return issue.content['raw']
+    
+    def get_issue_number(self, issue):
+        return issue.id
+    
+    def get_issue_comment_body(self, comment):
+        return comment['content']['raw']
+    
+    def get_issue_comment_user(self, comment):
+        return comment['user']['display_name']
+    
+    def get_issue_created_at(self, issue):
+        return str(issue.created_on)
+    
+    def get_username(self, issue, workspace_slug):
+        return workspace_slug
+
+    
+    def get_repo_issues(self, repo_obj):
+        return repo_obj._Repository__issues.each()
+
+   
+    def get_issues_comments(self, workspace_slug, repo_name, original_issue_number):
+        import requests
+
+        url = f"https://api.bitbucket.org/2.0/repositories/{workspace_slug}/{repo_name}/issues/{original_issue_number}/comments"
+
+        payload = {}
+        headers = {}
+
+        response = requests.request("GET", url, headers=headers, data=payload)
+        return response.json()['values']
+    
+    def create_issue_comment(self, similar_issues_str, workspace_slug, repo_name, original_issue_number):
+        url = f"https://api.bitbucket.org/2.0/repositories/{workspace_slug}/{repo_name}/issues/{original_issue_number}/comments"
+        payload = json.dumps({
+        "content": {
+            "raw": similar_issues_str
+        }
+        })
+        headers = {
+        'Authorization': f'Bearer {get_settings().get("BITBUCKET.BEARER_TOKEN", None)}',
+        'Content-Type': 'application/json'
+        }
+
+        response = requests.request("POST", url, headers=headers, data=payload)
+
+    def get_repo_obj(self, workspace_slug, repo_name):
+        return self.bitbucket_client.repositories.get(workspace_slug, repo_name)
+    
+    def get_repo_name_for_indexing(self, repo_obj):
+        return repo_obj._BitbucketBase__data['full_name'].lower().replace('/', '-').replace('_/', '-')
+    
+    def check_if_issue_pull_request(self, issue):
+        return False
+    
+    def get_issue_numbers(self, issue):
+        list_of_issue_numbers = []
+        for issue in issue:
+            list_of_issue_numbers.append(issue.id)
+        return str(list_of_issue_numbers)
+    
+    def get_issue_numbers_from_list(self, issues):
+        # convert str to list'
+        int_list = ast.literal_eval(issues)
+        int_list = [int(x) for x in int_list]
+        for issue_number in int_list:
+            return issue_number
+

pr_agent/git_providers/bitbucket_server_provider.py

@@ -1,351 +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):
-        position, absolute_position = find_line_number_of_relevant_line_in_file(
-            self.get_diff_files(),
-            relevant_file.strip('`'),
-            relevant_line_in_file
-        )
-        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

@@ -6,9 +6,9 @@ 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.utils import load_large_diff
 from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from ..config_loader import get_settings
 from ..log import get_logger
 
 
@@ -61,7 +61,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)
 
@@ -216,15 +215,12 @@ 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")
@@ -270,8 +266,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

pr_agent/git_providers/gerrit_provider.py

@@ -192,7 +192,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 +207,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')
 
@@ -396,8 +396,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

@@ -5,7 +5,6 @@ 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
 
 
@@ -14,7 +13,6 @@ class EDIT_TYPE(Enum):
     DELETED = 2
     MODIFIED = 3
     RENAMED = 4
-    UNKNOWN = 5
 
 
 @dataclass
@@ -24,10 +22,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 +39,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,17 +89,17 @@ 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
-        max_tokens_description = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
+        from pr_agent.algo.pr_processing import clip_tokens
+        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:
-            return clip_tokens(description, max_tokens_description)
+        if max_tokens:
+            return clip_tokens(description, max_tokens)
         return description
 
     def get_user_description(self) -> str:
         description = (self.get_pr_description_full() or "").strip()
         # if the existing description wasn't generated by the pr-agent, just return it as-is
-        if not any(description.startswith(header) for header in ("## PR Type", "## PR Description")):
+        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,
         # return nothing (empty string) because it means there is no user description
@@ -84,61 +108,12 @@ class GitProvider(ABC):
         # otherwise, extract the original user description from the existing pr-agent description and return it
         return description.split("## User Description:", 1)[1].strip()
 
-    @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
-
-    @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 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):
-        pass
-
-    @abstractmethod
-    def get_pr_labels(self):
-        pass
-
-    def get_repo_labels(self):
+    def get_repo_settings(self):
         pass
 
     @abstractmethod
@@ -149,12 +124,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:
@@ -165,9 +139,6 @@ def get_main_pr_language(languages, files) -> str:
     if not languages:
         get_logger().info("No languages detected")
         return main_language_str
-    if not files:
-        get_logger().info("No files in diff")
-        return main_language_str
 
     try:
         top_language = max(languages, key=languages.get).lower()
@@ -175,49 +146,31 @@ 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)
-        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()}
+        most_common_extension = max(set(extension_list), key=extension_list.count)
 
-            if top_language in language_extension_map and most_common_extension in language_extension_map[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
+        # 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
 
     except Exception as e:
         get_logger().exception(e)
@@ -230,13 +183,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.last_seen_commit = None
+        self.first_new_commit_sha = 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

@@ -8,12 +8,12 @@ from retry import retry
 from starlette_context import context
 
 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, clip_tokens
+from ..algo.pr_processing import clip_tokens, 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
 from ..servers.utils import RateLimitExceeded
-from .git_provider import FilePatchInfo, GitProvider, IncrementalPR, EDIT_TYPE
+from .git_provider import FilePatchInfo, GitProvider, IncrementalPR
 
 
 class GithubProvider(GitProvider):
@@ -34,7 +34,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,7 +50,7 @@ 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
@@ -61,34 +60,26 @@ class GithubProvider(GitProvider):
                     get_logger().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):
-        if not (full or incremental):
-            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")
+    def get_previous_review(self):
+        self.previous_review = None
+        self.comments = list(self.pr.get_issue_comments())
         for index in range(len(self.comments) - 1, -1, -1):
-            if any(self.comments[index].body.startswith(prefix) for prefix in prefixes):
-                return self.comments[index]
+            if self.comments[index].body.startswith("## PR Analysis") or self.comments[index].body.startswith("## Incremental PR Review"):
+                self.previous_review = self.comments[index]
+                break
 
     def get_files(self):
         if self.incremental.is_incremental and self.file_set:
@@ -132,27 +123,7 @@ class GithubProvider(GitProvider):
                     if not patch:
                         patch = load_large_diff(file.filename, new_file_content_str, original_file_content_str)
 
-                if file.status == 'added':
-                    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)
+                diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str, patch, file.filename))
 
             self.diff_files = diff_files
             return diff_files
@@ -164,36 +135,10 @@ class GithubProvider(GitProvider):
     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}")
             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
@@ -273,16 +218,10 @@ class GithubProvider(GitProvider):
         try:
             for comment in getattr(self.pr, 'comments_list', []):
                 if comment.is_temporary:
-                    self.remove_comment(comment)
+                    comment.delete()
         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}")
-
     def get_title(self):
         return self.pr.title
 
@@ -302,7 +241,7 @@ class GithubProvider(GitProvider):
                 self.github_user_id = self.github_client.get_user().raw_data['login']
             except Exception as e:
                 self.github_user_id = ""
-                # logging.exception(f"Failed to get user id, error: {e}")
+                # get_logger().exception(f"Failed to get user id, error: {e}")
         return self.github_user_id
 
     def get_notifications(self, since: datetime):
@@ -319,10 +258,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
-
-            # more logical to take 'pr_agent.toml' from the default branch
-            contents = self.repo_obj.get_contents(".pr_agent.toml").decoded_content
+            contents = self.repo_obj.get_contents(".pr_agent.toml", ref=self.pr.head.sha).decoded_content
             return contents
         except Exception:
             return ""
@@ -399,8 +335,9 @@ class GithubProvider(GitProvider):
             issue_number = int(path_parts[3])
         except ValueError as e:
             raise ValueError("Unable to convert issue number to integer") from e
+        workspace_slug = None
 
-        return repo_name, issue_number
+        return workspace_slug, repo_name, issue_number
 
     def _get_github_client(self):
         deployment_type = get_settings().get("GITHUB.DEPLOYMENT_TYPE", "user")
@@ -415,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:
@@ -424,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 \
@@ -449,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:
@@ -461,17 +398,13 @@ class GithubProvider(GitProvider):
         except Exception as e:
             get_logger().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}")
             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,20 +448,68 @@ class GithubProvider(GitProvider):
 
         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}"
             return pr_id
         except:
             return ""
+        
+    def get_repo_issues(self, repo_obj):
+        return list(repo_obj.get_issues(state='all'))
+    
+    def get_issues_comments(self, workspace_slug, repo_name, original_issue_number):
+        return self.repo_obj.get_issue(original_issue_number)
+    
+    def get_issue_url(self, issue):
+        return issue.html_url
+    
+    def create_issue_comment(self, similar_issues_str, workspace_slug, repo_name, original_issue_number):
+        try:
+            issue = self.repo_obj.get_issue(original_issue_number)
+            issue.create_comment(similar_issues_str)
+        except Exception as e:
+            get_logger().exception(f"Failed to create issue comment, error: {e}")
+
+    def get_issue_body(self, issue):
+        return issue.body
+        
+    def get_issue_number(self, issue):
+        return issue.number
+    
+    def get_issues_comments(self, workspace_slug, repo_name, original_issue_number):
+        issue = self.repo_obj.get_issue(original_issue_number)
+        return list(issue.get_comments())
+    
+    def get_issue_body(self, issue):
+        return issue.body
+    
+    def get_username(self, issue, workspace_slug):
+        return issue.user.login
+    
+    def get_issue_created_at(self, issue):
+        return str(issue.created_at)
+    
+    def get_issue_comment_body(self, comment):
+        return comment.body
+    
+    def get_issue(self, workspace_slug, repo_name, original_issue_number):
+        return self.repo_obj.get_issue(int(original_issue_number))
+    
+    def get_repo_obj(self, workspace_slug, repo_name):
+        return self.github_client.get_repo(repo_name)
+    
+    def get_repo_name_for_indexing(self, repo_obj):
+        return repo_obj.full_name.lower().replace('/', '-').replace('_/', '-')
+    
+    def check_if_issue_pull_request(self, issue):
+        if issue.pull_request:
+            return True
+        return False
+    
+    def get_issue_numbers(self, issues_list):
+        return str([issue.number for issue in issues_list])
+    
+    def get_issue_numbers_from_list(self, r):
+        return int(r.split('.')[0].split('_')[-1])
+

pr_agent/git_providers/gitlab_provider.py

@@ -7,8 +7,8 @@ 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.utils import load_large_diff, clip_tokens
+from ..algo.pr_processing import clip_tokens, find_line_number_of_relevant_line_in_file
+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
@@ -37,14 +37,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
 
@@ -115,20 +114,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'],
-                                  num_plus_lines=num_plus_lines,
-                                  num_minus_lines=num_minus_lines, ))
-
+                                  old_filename=None if diff['old_path'] == diff['new_path'] else diff['old_path']))
         self.diff_files = diff_files
         return diff_files
 
@@ -145,33 +136,6 @@ class GitLabProvider(GitProvider):
         except Exception as e:
             get_logger().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})
         if is_temporary:
@@ -211,11 +175,7 @@ class GitLabProvider(GitProvider):
                 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}")
-            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)")
+            self.mr.discussions.create({'body': body, 'position': pos_obj})
 
     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
@@ -327,16 +287,10 @@ class GitLabProvider(GitProvider):
     def remove_initial_comment(self):
         try:
             for comment in self.temp_comments:
-                self.remove_comment(comment)
+                comment.delete()
         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}")
-
     def get_title(self):
         return self.mr.title
 
@@ -355,7 +309,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 ""
@@ -408,7 +362,7 @@ class GitLabProvider(GitProvider):
     def publish_inline_comments(self, comments: list[dict]):
         pass
 
-    def get_pr_labels(self):
+    def get_labels(self):
         return self.mr.labels
 
     def get_commit_messages(self):
@@ -435,16 +389,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("'")

pr_agent/git_providers/local_git_provider.py

@@ -140,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.
@@ -178,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

@@ -26,9 +26,7 @@ def apply_repo_settings(pr_url):
                         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:

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

@@ -16,13 +16,8 @@ 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)
 router = APIRouter()
@@ -70,17 +65,15 @@ async def handle_manifest(request: Request, response: Response):
 
 @router.post("/webhook")
 async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "bitbucket_app"}
-    get_logger().debug(request.headers)
+    print(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,29 +85,11 @@ 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
-                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")
+                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)
+                await agent.handle_request(pr_url, comment_body)
         except Exception as e:
             get_logger().error(f"Failed to handle webhook: {e}")
     background_tasks.add_task(inner)
@@ -127,10 +102,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")
-        get_logger().info(request.headers)
+        print(request.headers)
         data = await request.json()
-        get_logger().info(data)
+        print(data)
         shared_secret = data["sharedSecret"]
         client_key = data["clientKey"]
         username = data["principal"]["username"]
@@ -145,10 +119,8 @@ async def handle_installed_webhooks(request: Request, response: Response):
 
 @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_server_webhook.py

@@ -1,64 +0,0 @@
-import json
-
-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
-
-router = APIRouter()
-
-
-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 handle_webhook(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "bitbucket_server"}
-    data = await request.json()
-    get_logger().info(json.dumps(data))
-
-    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"
-
-    handle_request(background_tasks, pr_url, "review", 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():
-    bitbucket_server_url = get_settings().get("BITBUCKET_SERVER.URL", None)
-    if not bitbucket_server_url:
-        raise ValueError("BITBUCKET_SERVER.URL is not set")
-    get_settings().config.git_provider = "bitbucket_server"
-    middleware = [Middleware(RawContextMiddleware)]
-    app = FastAPI(middleware=middleware)
-    app.include_router(router)
-    uvicorn.run(app, host="0.0.0.0", port=3000)
-
-
-if __name__ == '__main__':
-    start()

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)
-                if auto_review is None or is_true(auto_review):
+                auto_review = os.environ.get('github_action.auto_review', None)
+                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)
-                if is_true(auto_describe):
+                auto_describe = os.environ.get('github_action.auto_describe', None)
+                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)
-                if is_true(auto_improve):
+                auto_improve = os.environ.get('github_action.auto_improve', None)
+                if isinstance(auto_improve, str) and auto_improve.lower() == 'true':
                     await PRCodeSuggestions(pr_url).run()
 
     # Handle issue comment event
@@ -116,4 +89,4 @@ async def run_action():
 
 
 if __name__ == '__main__':
-    asyncio.run(run_action())
+    asyncio.run(run_action())

pr_agent/servers/github_app.py

@@ -1,7 +1,7 @@
 import copy
 import os
-import asyncio.locks
-from typing import Any, Dict, List, Tuple
+import time
+from typing import Any, Dict
 
 import uvicorn
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
@@ -14,9 +14,8 @@ 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.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
+from pr_agent.servers.utils import verify_signature
 
 setup_logger(fmt=LoggingFormat.JSON)
 
@@ -48,7 +47,6 @@ async def handle_marketplace_webhooks(request: Request, response: Response):
     body = await get_body(request)
     get_logger().info(f'Request body:\n{body}')
 
-
 async def get_body(request):
     try:
         body = await request.json()
@@ -63,9 +61,7 @@ async def get_body(request):
     return body
 
 
-_duplicate_requests_cache = DefaultDictWithTimeout(ttl=get_settings().github_app.duplicate_requests_cache_ttl)
-_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)
+_duplicate_requests_cache = {}
 
 
 async def handle_request(body: Dict[str, Any], event: str):
@@ -113,115 +109,40 @@ async def handle_request(body: Dict[str, Any], event: str):
     # 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':
-        pull_request, api_url = _check_pull_request_event(action, body, log_context, bot_user)
-        if not (pull_request and api_url):
+    elif event == 'pull_request':
+        pull_request = body.get("pull_request")
+        if not pull_request:
+            return {}
+        api_url = pull_request.get("url")
+        if not api_url:
+            return {}
+        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 {}
         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=}")
-            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
+                if pull_request.get("created_at") == pull_request.get("updated_at"):
+                    # avoid double reviews when opening a PR for the first time
+                    return {}
+            get_logger().info(f"Performing review because of event={event} and action={action}")
+            apply_repo_settings(api_url)
+            for command in get_settings().github_app.pr_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)
+                get_logger().info(f"Performing command: {new_command}")
+                with get_logger().contextualize(**log_context):
+                    await agent.handle_request(api_url, new_command)
 
     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 pull_request, api_url
-
-
-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)
-        get_logger().info(f"Performing command: {new_command}")
-        with get_logger().contextualize(**log_context):
-            await agent.handle_request(api_url, new_command)
-
-
 def _is_duplicate_request(body: Dict[str, Any]) -> bool:
     """
     In some deployments its possible to get duplicate requests if the handling is long,
@@ -229,8 +150,13 @@ def _is_duplicate_request(body: Dict[str, Any]) -> bool:
     """
     request_hash = hash(str(body))
     get_logger().info(f"request_hash: {request_hash}")
-    is_duplicate = _duplicate_requests_cache.get(request_hash, False)
-    _duplicate_requests_cache[request_hash] = True
+    request_time = time.monotonic()
+    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}")
     return is_duplicate

pr_agent/servers/gitlab_webhook.py

@@ -12,33 +12,23 @@ 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.log import get_logger, setup_logger
 from pr_agent.secret_providers import get_secret_provider
 
-setup_logger(fmt=LoggingFormat.JSON)
+setup_logger()
 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:
@@ -58,13 +48,13 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
     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')}")
         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,19 +1,17 @@
-commands_text = "> **/review**: Request a review of your Pull Request.   \n" \
-                "> **/describe**: Update the PR title and description based on the contents of the PR.   \n" \
-                "> **/improve [--extended]**: Suggest code improvements. Extended mode provides a higher quality feedback.   \n" \
-                "> **/ask \\<QUESTION\\>**: Ask a question about the PR.   \n" \
-                "> **/update_changelog**: Update the changelog based on the PR's contents.   \n" \
-                "> **/add_docs**: Generate docstring for new components introduced in the PR.   \n" \
-                "> **/generate_labels**: Generate labels for the PR based on the PR's contents.   \n" \
-                "> see the [tools guide](https://github.com/Codium-ai/pr-agent/blob/main/docs/TOOLS_GUIDE.md) for more details.\n\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" \
+commands_text = "> **/review [-i]**: Request a review of your Pull Request. For an incremental review, which only " \
+                "considers changes since the last review, include the '-i' option.\n" \
+                "> **/describe**: Modify the PR title and description based on the contents of 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" \
+                "> **/ask \\<QUESTION\\>**: Pose a question about the PR.\n" \
+                "> **/update_changelog**: Update the changelog based on the PR's contents.\n\n" \
+                ">To edit any configuration parameter from **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, 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,12 @@
 from fastapi import FastAPI
 from mangum import Mangum
-from starlette.middleware import Middleware
-from starlette_context.middleware import RawContextMiddleware
 
+from pr_agent.log import setup_logger
 from pr_agent.servers.github_app import router
 
+setup_logger()
 
-middleware = [Middleware(RawContextMiddleware)]
-app = FastAPI(middleware=middleware)
+app = FastAPI()
 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/
-
-[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
+api_base = "" # the base url for your huggingface inference endpoint 
 
 [github]
 # ---- Set the following only for deployment type == "user"

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
@@ -10,58 +10,36 @@ use_repo_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
-# general options
 num_code_suggestions=4
 inline_code_comments = false
 ask_and_reflect=false
 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
 
 [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
-enable_file_walkthrough=false
-enable_semantic_files_types=true
-final_update_message = true
-
-
 # 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
 extra_instructions = ""
 rank_suggestions = false
 # params for '/improve --extended' mode
@@ -84,7 +62,6 @@ extra_instructions = ""
 # 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
@@ -105,30 +82,6 @@ pr_commands = [
     "/describe --pr_description.add_original_user_description=true --pr_description.keep_original_user_title=true",
     "/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]
 # URL to the gitlab service
@@ -143,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"
@@ -175,5 +122,4 @@ max_issues_to_scan = 500
 [pinecone]
 # fill and place in .secrets.toml
 #api_key = ...
-# environment = "gcp-starter"
-
+# environment = "gcp-starter"

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).
-Your task is to generate {{ docs_for_language }} for code components in the PR Diff.
+system="""You are a language model called PR-Code-Documentation Agent, that specializes in generating documentation for code.
+Your task is to generate meaningfull {{ docs_for_language }} to a PR (the '+' lines).
 
-
-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():
@@ -28,13 +28,12 @@ __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 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:
@@ -101,25 +99,18 @@ Title: '{{ title }}'
 
 Branch: '{{ branch }}'
 
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
+Description: '{{description}}'
 
 {%- 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).
-Your task is to provide meaningful and actionable code suggestions, to improve the new code presented in a PR diff (lines starting with '+').
+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 (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,29 +28,28 @@ __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 best practices, code readability, maintainability, enhancments, performance, 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.
 - 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 suggestion.
+- Provide the exact line numbers range (inclusive) for each issue.
 - Assume there is additional relevant code, that is not included in the diff.
 
 
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-======
+'
 {{ extra_instructions }}
-======
+'
 {%- endif %}
 
-
 You must use the following YAML schema to format your answer:
 ```yaml
 Code suggestions:
@@ -90,19 +90,16 @@ Code suggestions:
 Example output:
 ```yaml
 Code suggestions:
-- relevant file: |-
-    src/file1.py
-  suggestion content: |-
-    Add a docstring to func1()
-  existing code: |-
-    def func1():
-  relevant lines start: |-
-    12
-  relevant lines end: |-
-    12
-  improved code: |-
-    ...
-...
+  - relevant file: |-
+        src/file1.py
+    suggestion content: |-
+        Add a docstring to func1()
+    existing code: |-
+        def func1():
+    relevant lines start: 12
+    relevant lines end: 12
+    improved code: |-
+        ...
 ```
 
 
@@ -116,25 +113,18 @@ Title: '{{title}}'
 
 Branch: '{{branch}}'
 
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
+Description: '{{description}}'
 
 {%- 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="custom labels that describe the PR. Return the label value, not the name.")
-======
-
-
-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,133 +1,88 @@
 [pr_description_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
-Your task is to provide a full description for the PR content - title, type, description, and main files walkthrough.
-- 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 ('|-')
-
+system="""You are CodiumAI-PR-Reviewer, a language model designed to review git pull requests.
+Your task is to provide full description of the PR content.
+- Make sure not to focus the new PR code (the '+' lines).
+- 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.
+-  If needed, each YAML output should be in block scalar format ('|-')
 {%- if extra_instructions %}
 
 Extra instructions from the user:
-=====
+'
 {{ extra_instructions }}
-=====
+'
 {% endif %}
 
-
-The output must be a YAML object equivalent to type $PRDescription, according to the following Pydantic definitions:
-=====
-class PRType(str, Enum):
-    bug_fix = "Bug fix"
-    tests = "Tests"
-    enhancement = "Enhancement"
-    documentation = "Documentation"
-    other = "Other"
-
-{%- if enable_custom_labels %}
-
-{{ custom_labels_class }}
-
-{%- endif %}
-
-{%- if enable_file_walkthrough %}
-class FileWalkthrough(BaseModel):
-    filename: str = Field(description="the relevant file full path")
-    changes_in_file: str = Field(description="minimal and concise summary of the changes in the relevant file")
-{%- endif %}
-
-{%- if enable_semantic_files_types %}
-Class FileDescription(BaseModel):
-    filename: str = Field(description="the relevant file full path")
-    changes_summary: str = Field(description="minimal and concise summary of the changes in the relevant file")
-    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', ...")
-{%- endif %}
-
-Class PRDescription(BaseModel):
-    title: str = Field(description="an informative title for the PR, describing its main theme")
-    type: List[PRType] = Field(description="one or more types that describe the PR type. Return the label value, not the name.")
-    description: str = Field(description="an informative and concise description of the PR. {%- if use_bullet_points %} Use bullet points.{% endif %}")
-{%- if enable_custom_labels %}
-    labels: List[Label] = Field(min_items=0, description="custom labels that describe the PR. Return the label value, not the name.")
-{%- endif %}
-{%- if enable_file_walkthrough %}
-    main_files_walkthrough: List[FileWalkthrough] = Field(max_items=10)
-{%- endif %}
-{%- if enable_semantic_files_types %}
-    pr_files[List[FileDescription]] = Field(max_items=15")
-{%- endif %}
-=====
+You must use the following YAML schema to format your answer:
+```yaml
+PR Title:
+  type: string
+  description: an informative title for the PR, describing its main theme
+PR Type:
+  type: array
+  items:
+    type: string
+    enum:
+      - Bug fix
+      - Tests
+      - Bug fix with tests
+      - Refactoring
+      - Enhancement
+      - Documentation
+      - Other
+PR Description:
+  type: string
+  description: an informative and concise description of the PR
+PR Main Files Walkthrough:
+  type: array
+  maxItems: 10
+  description: |-
+    a walkthrough of the PR changes. Review main files, and shortly describe the changes in each file (up to 10 most important files).
+  items:
+    filename:
+      type: string
+      description: the relevant file full path
+    changes in file:
+      type: string
+      description: minimal and concise description of the changes in the relevant file
 
 
 Example output:
-
 ```yaml
-title: |-
+PR Title: |-
   ...
-type:
-- ...
-- ...
-{%- if enable_custom_labels %}
-labels:
-- ...
-- ...
-{%- endif %}
-description: |-
+PR Type:
+  - Bug fix
+PR Description: |-
   ...
-{%- if enable_file_walkthrough %}
-main_files_walkthrough:
-- ...
-- ...
-{%- endif %}
-{%- if enable_semantic_files_types %}
-pr_files:
-- filename: |
-    ...
-  changes_summary: |
-    ...
-  label: |
-    ...
-...
-{%- endif %}
+PR Main Files Walkthrough:
+  - ...
+  - ...
 ```
 
-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}}'
-
-{%- if description %}
-
-Previous description:
-=====
-{{ description|trim }}
-=====
-{%- endif %}
-
+Previous description: '{{description}}'
 Branch: '{{branch}}'
 {%- if language %}
 
-Main PR language: '{{ language }}'
+Main language: {{language}}
 {%- endif %}
 {%- if commit_messages_str %}
 
 Commit messages:
-=====
-{{ commit_messages_str|trim }}
-=====
+{{commit_messages_str}}
 {%- endif %}
 
 
-The PR Diff:
-=====
-{{ diff|trim }}
-=====
-
+The PR Git Diff:
+```
+{{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}}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
+Description: '{{description}}'
 {%- if language %}
-
-Main PR language: '{{ language }}'
+Main language: {{language}}
 {%- endif %}
 {%- if commit_messages_str %}
 
-
 Commit messages:
-======
-{{ commit_messages_str|trim }}
-======
+{{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
 
 

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).
-
-Your goal is to answer questions\\tasks about the new PR code (lines starting with '+'), and provide feedback.
+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.
 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}}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
+Description: '{{description}}'
 {%- 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 2 that remained unchanged in the PR
+code line that already existed in the file...
+code line that already existed in the file....
 -code line that was removed in the PR
-+code line added in the PR
-code line 3 that remained unchanged in the PR
-
++new code line added in the PR
+ code line that already existed in the file...
+ code line that already existed in the file...
 
 @@ ... @@ def func2():
 ...
@@ -21,28 +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 %}
-
-
-Code suggestions guidelines:
-- Provide up to {{ num_code_suggestions }} code suggestions. Try to provide diverse and insightful suggestions.
+- Provide up to {{ num_code_suggestions }} code 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 '+')
 {%- 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:
@@ -57,6 +54,7 @@ PR Analysis:
     enum:
       - Bug fix
       - Tests
+      - Refactoring
       - Enhancement
       - Documentation
       - Other
@@ -95,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.
-      May include important suggestions for the overall structure,
-      primary purpose, best practices, critical bugs, and other aspects of the PR.
-      Don't address PR title and description, or lack of tests. Explain your suggestions.
+      General suggestions and feedback for the contributors and maintainers of
+      this PR. May include important suggestions for the overall structure,
+      primary purpose, best practices, critical bugs, and other aspects of the
+      PR. Don't address PR title and description, or lack of tests. Explain your suggestions.
 {%- if num_code_suggestions > 0 %}
   Code feedback:
     type: array
@@ -117,10 +115,11 @@ PR Feedback:
       suggestion:
         type: string
         description: |-
-          a concrete suggestion for meaningfully improving the new PR code.
-          Also describe how, specifically, the suggestion can be applied to new PR code.
-          Add tags with importance measure that matches each suggestion ('important' or 'medium').
-          Do not make suggestions for updating or adding docstrings, renaming PR title and description, or linter like.
+          a concrete suggestion for meaningfully improving the new PR code. Also
+          describe how, specifically, the suggestion can be applied to new PR
+          code. Add tags with importance measure that matches each suggestion
+          ('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: |-
@@ -132,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.
-      Answer 'Yes, because ...' if there are security concerns or issues. Explain your answer shortly.
+      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.
 {%- endif %}
 ```
 
@@ -145,7 +143,7 @@ PR Analysis:
   PR summary: |-
     xxx
   Type of PR: |-
-    ...
+    Bug fix
 {%- if require_score %}
   Score: 89
 {%- endif %}
@@ -155,8 +153,7 @@ PR Analysis:
   Focused PR: no, because ...
 {%- endif %}
 {%- if require_estimate_effort_to_review %}
-  Estimated effort to review [1-5]: |-
-    3, because ...
+  Estimated effort to review [1-5]: 3, because ...
 {%- endif %}
 PR Feedback:
   General PR suggestions: |-
@@ -181,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}}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
+Description: '{{description}}'
 {%- if language %}
-
-Main PR language: '{{ language }}'
+Main 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 Diff:
-======
-{{ diff|trim }}
-======
-
+The PR Git Diff:
+```
+{{diff}}
+```
+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}}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
+Description: '{{description}}'
 {%- if language %}
-
-Main PR language: '{{ language }}'
+Main language: {{language}}
 {%- endif %}
 {%- if commit_messages_str %}
 
-
 Commit messages:
-======
-{{ commit_messages_str|trim }}
-======
+{{commit_messages_str}}
 {%- endif %}
 
 
-The PR Git Diff:
-======
-{{ diff|trim }}
-======
+The PR Diff:
+```
+{{diff}}
+```
 
 Current date:
 ```
@@ -53,10 +39,9 @@ Current date:
 ```
 
 The current CHANGELOG.md:
-======
+```
 {{ changelog_file_str }}
-======
-
+```
 
 Response:
 """

pr_agent/tools/pr_add_docs.py

@@ -65,11 +65,6 @@ class PRAddDocs:
 
     async def _prepare_prediction(self, model: str):
         get_logger().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,

pr_agent/tools/pr_code_suggestions.py

@@ -1,6 +1,7 @@
 import copy
 import textwrap
 from typing import Dict, List
+
 from jinja2 import Environment, StrictUndefined
 
 from pr_agent.algo.ai_handler import AiHandler
@@ -54,9 +55,9 @@ class PRCodeSuggestions:
         try:
             get_logger().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...')
+            get_logger().info('Preparing PR review...')
             if not self.is_extended:
                 await retry_with_fallback_models(self._prepare_prediction)
                 data = self._prepare_pr_code_suggestions()
@@ -72,14 +73,10 @@ class PRCodeSuggestions:
                 data['Code suggestions'] = await self.rank_suggestions(data['Code suggestions'])
 
             if get_settings().config.publish_output:
-                get_logger().info('Pushing PR code suggestions...')
+                get_logger().info('Pushing PR review...')
                 self.git_provider.remove_initial_comment()
-                if get_settings().pr_code_suggestions.summarize:
-                    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)
+                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}")
 
@@ -119,7 +116,6 @@ class PRCodeSuggestions:
         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']:
@@ -248,41 +244,4 @@ class PRCodeSuggestions:
 
         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'])
-                    data_markdown += f"\n💡 Suggestion:\n\n**{s['suggestion content']}**\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']}\n```\n"
-                    data_markdown += f"Improved code:\n```{language_name}\n{s['improved code']}\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_description.py

@@ -7,7 +7,7 @@ from jinja2 import Environment, StrictUndefined
 from pr_agent.algo.ai_handler import AiHandler
 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
@@ -30,11 +30,6 @@ 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 = AiHandler()
     
@@ -45,13 +40,8 @@ class PRDescription:
             "description": self.git_provider.get_pr_description(full=False),
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
-            "use_bullet_points": get_settings().pr_description.use_bullet_points,
             "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
-            "enable_file_walkthrough": get_settings().pr_description.enable_file_walkthrough,
-            "enable_semantic_files_types": get_settings().pr_description.enable_semantic_files_types,
+            "commit_messages_str": self.git_provider.get_commit_messages()
         }
 
         self.user_description = self.git_provider.get_user_description()
@@ -86,9 +76,6 @@ class PRDescription:
             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()
@@ -102,21 +89,14 @@ class PRDescription:
             if get_settings().config.publish_output:
                 get_logger().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()
-                        user_labels = get_user_labels(current_labels)
-                        self.git_provider.publish_labels(pr_labels + user_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})")
+                        current_labels = self.git_provider.get_labels()
+                        if current_labels is None:
+                            current_labels = []
+                        self.git_provider.publish_labels(pr_labels + current_labels)
                 self.git_provider.remove_initial_comment()
         except Exception as e:
             get_logger().error(f"Error generating PR description {self.pr_id}: {e}")
@@ -159,7 +139,6 @@ class PRDescription:
         variables["diff"] = self.patches_diff  # update diff
 
         environment = Environment(undefined=StrictUndefined)
-        set_custom_labels(variables, self.git_provider)
         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)
 
@@ -174,11 +153,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())
@@ -191,16 +168,12 @@ class PRDescription:
         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 type(self.data['labels']) == list:
-                pr_types = self.data['labels']
-            elif type(self.data['labels']) == str:
-                pr_types = self.data['labels'].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(',')
+        if 'PR Type' in self.data:
+            if type(self.data['PR Type']) == list:
+                pr_types = self.data['PR Type']
+            elif type(self.data['PR Type']) == str:
+                pr_types = self.data['PR Type'].split(',')
+
         return pr_types
 
     def _prepare_pr_answer_with_markers(self) -> Tuple[str, str]:
@@ -212,12 +185,7 @@ class PRDescription:
         else:
             ai_header = ""
 
-        ai_type = self.data.get('type')
-        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')
+        ai_summary = self.data.get('PR 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)
@@ -246,17 +214,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"]
@@ -268,130 +231,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':
-                value = self.file_label_dict
-                key_publish = "PR changes walkthrough"
-            else:
-                key_publish = key.rstrip(':').replace("_", " ").capitalize()
-            pr_body += f"## {key_publish}\n"
+            pr_body += f"## {key}:\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']
-                    pr_body += f'- `{filename}`: {description}\n'
+                    description = file['changes in file']
+                    pr_body += f'`{filename}`: {description}\n'
                 if self.git_provider.is_supported("gfm_markdown"):
-                    pr_body += "</details>\n"
-            elif 'pr_files' in key.lower():
-                pr_body = self.process_pr_files_prediction(pr_body, value)
+                    pr_body +="</details>\n"
             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}")
 
-        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['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):
-        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]
-                pr_body += f"""<td><details><summary>{len(list_tuples)} files</summary><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>
-        <strong>{file_change_description}</strong>
-      </ul>
-    </details>
-  </td>
-  <td><a href="{link}"> {diff_plus_minus}</a></td>
-
-</tr>                    
-"""
-                pr_body += """</table></details></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
+        return title, pr_body

pr_agent/tools/pr_generate_labels.py

@@ -1,171 +0,0 @@
-import copy
-import re
-from typing import List, Tuple
-
-from jinja2 import Environment, StrictUndefined
-
-from pr_agent.algo.ai_handler import AiHandler
-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):
-        """
-        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 = AiHandler()
-    
-        # 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
-            "use_bullet_points": get_settings().pr_description.use_bullet_points,
-            "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)
-        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(',')
-
-        return pr_types

pr_agent/tools/pr_reviewer.py

@@ -1,5 +1,4 @@
 import copy
-import datetime
 from collections import OrderedDict
 from typing import List, Tuple
 
@@ -10,7 +9,7 @@ from yaml import SafeLoader
 from pr_agent.algo.ai_handler import AiHandler
 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 convert_to_markdown, load_yaml, try_fix_yaml, set_custom_labels, get_user_labels
+from pr_agent.algo.utils import convert_to_markdown, load_yaml, try_fix_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 IncrementalPR, get_main_pr_language
@@ -64,8 +63,6 @@ class PRReviewer:
             'answer_str': answer_str,
             "extra_instructions": get_settings().pr_reviewer.extra_instructions,
             "commit_messages_str": self.git_provider.get_commit_messages(),
-            "custom_labels": "",
-            "enable_custom_labels": get_settings().config.enable_custom_labels,
         }
 
         self.token_handler = TokenHandler(
@@ -101,8 +98,6 @@ class PRReviewer:
             if self.is_auto and not get_settings().pr_reviewer.automatic_review:
                 get_logger().info(f'Automatic review is disabled {self.pr_url}')
                 return None
-            if self.incremental.is_incremental and not self._can_run_incremental_review():
-                return None
 
             get_logger().info(f'Reviewing PR: {self.pr_url} ...')
 
@@ -116,19 +111,9 @@ class PRReviewer:
 
             if get_settings().config.publish_output:
                 get_logger().info('Pushing PR review...')
-                previous_review_comment = self._get_previous_review_comment()
-
-                # publish the review
-                if get_settings().pr_reviewer.persistent_comment and not self.incremental.is_incremental:
-                    self.git_provider.publish_persistent_comment(pr_comment,
-                                                                 initial_header="## PR Analysis",
-                                                                 update_header=True)
-                else:
-                    self.git_provider.publish_comment(pr_comment)
-
+                self.git_provider.publish_comment(pr_comment)
                 self.git_provider.remove_initial_comment()
-                if previous_review_comment:
-                    self._remove_previous_review_comment(previous_review_comment)
+
                 if get_settings().pr_reviewer.inline_code_comments:
                     get_logger().info('Pushing inline code comments...')
                     self._publish_inline_code_comments()
@@ -178,9 +163,6 @@ class PRReviewer:
             user=user_prompt
         )
 
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nAI response:\n{response}")
-
         return response
 
     def _prepare_pr_review(self) -> str:
@@ -227,20 +209,28 @@ class PRReviewer:
                             suggestion['relevant line'] = f"[{suggestion['relevant line']}]({link})"
                     else:
                         pass
+                        # try:
+                        #     relevant_file = suggestion['relevant file'].strip('`').strip("'")
+                        #     relevant_line_str = suggestion['relevant line']
+                        #     if not relevant_line_str:
+                        #         return ""
+                        #
+                        #     position, absolute_position = find_line_number_of_relevant_line_in_file(
+                        #         self.git_provider.diff_files, relevant_file, relevant_line_str)
+                        #     if absolute_position != -1:
+                        #         suggestion[
+                        #             'relevant line'] = f"{suggestion['relevant line']} (line {absolute_position})"
+                        # except:
+                        #     pass
 
 
         # Add incremental review section
         if self.incremental.is_incremental:
             last_commit_url = f"{self.git_provider.get_pr_url()}/commits/" \
                               f"{self.git_provider.incremental.first_new_commit_sha}"
-            last_commit_msg = self.incremental.commits_range[0].commit.message if self.incremental.commits_range else ""
-            incremental_review_markdown_text = f"Starting from commit {last_commit_url}"
-            if last_commit_msg:
-                replacement = last_commit_msg.splitlines(keepends=False)[0].replace('_', r'\_')
-                incremental_review_markdown_text += f"  \n_({replacement})_"
             data = OrderedDict(data)
             data.update({'Incremental PR Review': {
-                "⏮️ Review for commits since previous PR-Agent review": incremental_review_markdown_text}})
+                "⏮️ Review for commits since previous PR-Agent review": f"Starting from commit {last_commit_url}"}})
             data.move_to_end('Incremental PR Review', last=False)
 
         markdown_text = convert_to_markdown(data, self.git_provider.is_supported("gfm_markdown"))
@@ -249,18 +239,11 @@ class PRReviewer:
         # Add help text if not in CLI mode
         if not get_settings().get("CONFIG.CLI_MODE", False):
             markdown_text += "\n### How to use\n"
-            if self.git_provider.is_supported("gfm_markdown"):
-                markdown_text += "\n <details> <summary> Instructions</summary>\n\n"
             bot_user = "[bot]" if get_settings().github_app.override_deployment_type else get_settings().github_app.bot_user
             if user and bot_user not in user:
                 markdown_text += bot_help_text(user)
             else:
                 markdown_text += actions_help_text
-            if self.git_provider.is_supported("gfm_markdown"):
-                markdown_text += "\n</details>\n"
-
-        # Add custom labels from the review prediction (effort, security)
-        self.set_review_labels(data)
 
         # Log markdown response if verbosity level is high
         if get_settings().config.verbosity_level >= 2:
@@ -278,7 +261,14 @@ class PRReviewer:
         if get_settings().pr_reviewer.num_code_suggestions == 0:
             return
 
-        data = load_yaml(self.prediction.strip())
+        review_text = self.prediction.strip()
+        review_text = review_text.removeprefix('```yaml').rstrip('`')
+        try:
+            data = yaml.load(review_text, Loader=SafeLoader)
+        except Exception as e:
+            get_logger().error(f"Failed to parse AI prediction: {e}")
+            data = try_fix_yaml(review_text)
+
         comments: List[str] = []
         for suggestion in data.get('PR Feedback', {}).get('Code feedback', []):
             relevant_file = suggestion.get('relevant file', '').strip()
@@ -321,83 +311,3 @@ class PRReviewer:
                     break
 
         return question_str, answer_str
-
-    def _get_previous_review_comment(self):
-        """
-        Get the previous review comment if it exists.
-        """
-        try:
-            if get_settings().pr_reviewer.remove_previous_review_comment and hasattr(self.git_provider, "get_previous_review"):
-                return self.git_provider.get_previous_review(
-                    full=not self.incremental.is_incremental,
-                    incremental=self.incremental.is_incremental,
-                )
-        except Exception as e:
-            get_logger().exception(f"Failed to get previous review comment, error: {e}")
-
-    def _remove_previous_review_comment(self, comment):
-        """
-        Remove the previous review comment if it exists.
-        """
-        try:
-            if get_settings().pr_reviewer.remove_previous_review_comment and comment:
-                self.git_provider.remove_comment(comment)
-        except Exception as e:
-            get_logger().exception(f"Failed to remove previous review comment, error: {e}")
-
-    def _can_run_incremental_review(self) -> bool:
-        """Checks if we can run incremental review according the various configurations and previous review"""
-        # checking if running is auto mode but there are no new commits
-        if self.is_auto and not self.incremental.first_new_commit_sha:
-            get_logger().info(f"Incremental review is enabled for {self.pr_url} but there are no new commits")
-            return False
-        # checking if there are enough commits to start the review
-        num_new_commits = len(self.incremental.commits_range)
-        num_commits_threshold = get_settings().pr_reviewer.minimal_commits_for_incremental_review
-        not_enough_commits = num_new_commits < num_commits_threshold
-        # checking if the commits are not too recent to start the review
-        recent_commits_threshold = datetime.datetime.now() - datetime.timedelta(
-            minutes=get_settings().pr_reviewer.minimal_minutes_for_incremental_review
-        )
-        last_seen_commit_date = (
-            self.incremental.last_seen_commit.commit.author.date if self.incremental.last_seen_commit else None
-        )
-        all_commits_too_recent = (
-            last_seen_commit_date > recent_commits_threshold if self.incremental.last_seen_commit else False
-        )
-        # check all the thresholds or just one to start the review
-        condition = any if get_settings().pr_reviewer.require_all_thresholds_for_incremental_review else all
-        if condition((not_enough_commits, all_commits_too_recent)):
-            get_logger().info(
-                f"Incremental review is enabled for {self.pr_url} but didn't pass the threshold check to run:"
-                f"\n* Number of new commits = {num_new_commits} (threshold is {num_commits_threshold})"
-                f"\n* Last seen commit date = {last_seen_commit_date} (threshold is {recent_commits_threshold})"
-            )
-            return False
-        return True
-
-    def set_review_labels(self, data):
-        if (get_settings().pr_reviewer.enable_review_labels_security or
-                get_settings().pr_reviewer.enable_review_labels_effort):
-            try:
-                review_labels = []
-                if get_settings().pr_reviewer.enable_review_labels_effort:
-                    estimated_effort = data['PR Analysis']['Estimated effort to review [1-5]']
-                    estimated_effort_number = int(estimated_effort.split(',')[0])
-                    if 1 <= estimated_effort_number <= 5: # 1, because ...
-                        review_labels.append(f'Review effort [1-5]: {estimated_effort_number}')
-                if get_settings().pr_reviewer.enable_review_labels_security:
-                    security_concerns = data['PR Analysis']['Security concerns'] # yes, because ...
-                    security_concerns_bool = 'yes' in security_concerns.lower() or 'true' in security_concerns.lower()
-                    if security_concerns_bool:
-                        review_labels.append('Possible security concern')
-
-                current_labels = self.git_provider.get_pr_labels()
-                current_labels_filtered = [label for label in current_labels if
-                                           not label.lower().startswith('review effort [1-5]:') and not label.lower().startswith(
-                                               'possible security concern')]
-                if current_labels or review_labels:
-                    get_logger().info(f"Setting review labels: {review_labels + current_labels_filtered}")
-                    self.git_provider.publish_labels(review_labels + current_labels_filtered)
-            except Exception as e:
-                get_logger().error(f"Failed to set review labels, error: {e}")

pr_agent/tools/pr_similar_issue.py

@@ -10,7 +10,6 @@ from pydantic import BaseModel, Field
 
 from pr_agent.algo import MAX_TOKENS
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import get_max_tokens
 from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.log import get_logger
@@ -20,19 +19,17 @@ MODEL = "text-embedding-ada-002"
 
 class PRSimilarIssue:
     def __init__(self, issue_url: str, args: list = None):
-        if get_settings().config.git_provider != "github":
-            raise Exception("Only github is supported for similar issue tool")
 
         self.cli_mode = get_settings().CONFIG.CLI_MODE
         self.max_issues_to_scan = get_settings().pr_similar_issue.max_issues_to_scan
         self.issue_url = issue_url
         self.git_provider = get_git_provider()()
-        repo_name, issue_number = self.git_provider._parse_issue_url(issue_url.split('=')[-1])
-        self.git_provider.repo = repo_name
-        self.git_provider.repo_obj = self.git_provider.github_client.get_repo(repo_name)
+        self.workspace_slug, self.repo_name, self.issue_number = self.git_provider._parse_issue_url(issue_url.split('=')[-1])
+        self.git_provider.repo = self.repo_name
+        self.git_provider.repo_obj = self.git_provider.get_repo_obj(self.workspace_slug, self.repo_name)
         self.token_handler = TokenHandler()
         repo_obj = self.git_provider.repo_obj
-        repo_name_for_index = self.repo_name_for_index = repo_obj.full_name.lower().replace('/', '-').replace('_/', '-')
+        repo_name_for_index = self.repo_name_for_index = self.git_provider.get_repo_name_for_indexing(repo_obj)
         index_name = self.index_name = "codium-ai-pr-agent-issues"
 
         # assuming pinecone api key and environment are set in secrets file
@@ -41,8 +38,8 @@ class PRSimilarIssue:
             environment = get_settings().pinecone.environment
         except Exception:
             if not self.cli_mode:
-                repo_name, original_issue_number = self.git_provider._parse_issue_url(self.issue_url.split('=')[-1])
-                issue_main = self.git_provider.repo_obj.get_issue(original_issue_number)
+                workspace_slug, repo_name, original_issue_number = self.git_provider._parse_issue_url(self.issue_url.split('=')[-1])
+                issue_main = self.git_provider.get_issue(workspace_slug, repo_name, original_issue_number)
                 issue_main.create_comment("Please set pinecone api key and environment in secrets file")
             raise Exception("Please set pinecone api key and environment in secrets file")
 
@@ -73,19 +70,20 @@ class PRSimilarIssue:
             get_logger().info('Indexing the entire repo...')
 
             get_logger().info('Getting issues...')
-            issues = list(repo_obj.get_issues(state='all'))
+            issues = self.git_provider.get_repo_issues(repo_obj)
             get_logger().info('Done')
             self._update_index_with_issues(issues, repo_name_for_index, upsert=upsert)
         else:  # update index if needed
             pinecone_index = pinecone.Index(index_name=index_name)
             issues_to_update = []
-            issues_paginated_list = repo_obj.get_issues(state='all')
+            issues_paginated_list = self.git_provider.get_repo_issues(repo_obj)
             counter = 1
             for issue in issues_paginated_list:
-                if issue.pull_request:
+                issue_pull_request = self.git_provider.check_if_issue_pull_request(issue)
+                if issue_pull_request:
                     continue
                 issue_str, comments, number = self._process_issue(issue)
-                issue_key = f"issue_{number}"
+                issue_key = f"issue_{number}"   
                 id = issue_key + "." + "issue"
                 res = pinecone_index.fetch([id]).to_dict()
                 is_new_issue = True
@@ -107,8 +105,8 @@ class PRSimilarIssue:
 
     async def run(self):
         get_logger().info('Getting issue...')
-        repo_name, original_issue_number = self.git_provider._parse_issue_url(self.issue_url.split('=')[-1])
-        issue_main = self.git_provider.repo_obj.get_issue(original_issue_number)
+        workspace_slug, repo_name, original_issue_number = self.git_provider._parse_issue_url(self.issue_url.split('=')[-1])
+        issue_main = self.git_provider.get_issue(workspace_slug, repo_name, original_issue_number)
         issue_str, comments, number = self._process_issue(issue_main)
         openai.api_key = get_settings().openai.key
         get_logger().info('Done')
@@ -130,11 +128,11 @@ class PRSimilarIssue:
                 continue
 
             try:
-                issue_number = int(r["id"].split('.')[0].split('_')[-1])
+                issue_id= r['id']
+                issue_number = self.git_provider.get_issue_numbers_from_list(issue_id)
             except:
                 get_logger().debug(f"Failed to parse issue number from {r['id']}")
                 continue
-
             if original_issue_number == issue_number:
                 continue
             if issue_number not in relevant_issues_number_list:
@@ -149,33 +147,32 @@ class PRSimilarIssue:
         get_logger().info('Publishing response...')
         similar_issues_str = "### Similar Issues\n___\n\n"
         for i, issue_number_similar in enumerate(relevant_issues_number_list):
-            issue = self.git_provider.repo_obj.get_issue(issue_number_similar)
+            issue = self.git_provider.get_issue(workspace_slug, repo_name, issue_number_similar)
             title = issue.title
-            url = issue.html_url
-            if relevant_comment_number_list[i] != -1:
-                url = list(issue.get_comments())[relevant_comment_number_list[i]].html_url
+            url = self.git_provider.get_issue_url(issue)
             similar_issues_str += f"{i + 1}. **[{title}]({url})** (score={score_list[i]})\n\n"
         if get_settings().config.publish_output:
-            response = issue_main.create_comment(similar_issues_str)
+            response = self.git_provider.create_issue_comment(similar_issues_str, workspace_slug, repo_name, original_issue_number)
         get_logger().info(similar_issues_str)
         get_logger().info('Done')
 
     def _process_issue(self, issue):
         header = issue.title
-        body = issue.body
-        number = issue.number
+        body = self.git_provider.get_issue_body(issue)
+        number = self.git_provider.get_issue_number(issue)
         if get_settings().pr_similar_issue.skip_comments:
             comments = []
         else:
-            comments = list(issue.get_comments())
+            comments = self.git_provider.get_issues_comments(self.workspace_slug, self.repo_name, self.issue_number)
         issue_str = f"Issue Header: \"{header}\"\n\nIssue Body:\n{body}"
         return issue_str, comments, number
 
     def _update_index_with_issues(self, issues_list, repo_name_for_index, upsert=False):
         get_logger().info('Processing issues...')
         corpus = Corpus()
+        issues = self.git_provider.get_issue_numbers(issues_list)
         example_issue_record = Record(
-            id=f"example_issue_{repo_name_for_index}",
+            id=str(issues),
             text="example_issue",
             metadata=Metadata(repo=repo_name_for_index)
         )
@@ -183,7 +180,9 @@ class PRSimilarIssue:
 
         counter = 0
         for issue in issues_list:
-            if issue.pull_request:
+
+            issue_pull_request = self.git_provider.check_if_issue_pull_request(issue)
+            if issue_pull_request:
                 continue
 
             counter += 1
@@ -195,10 +194,10 @@ class PRSimilarIssue:
 
             issue_str, comments, number = self._process_issue(issue)
             issue_key = f"issue_{number}"
-            username = issue.user.login
-            created_at = str(issue.created_at)
+            username = self.git_provider.get_username(issue, self.workspace_slug)
+            created_at = self.git_provider.get_issue_created_at(issue)
             if len(issue_str) < 8000 or \
-                    self.token_handler.count_tokens(issue_str) < get_max_tokens(MODEL):  # fast reject first
+                    self.token_handler.count_tokens(issue_str) < MAX_TOKENS[MODEL]:  # fast reject first
                 issue_record = Record(
                     id=issue_key + "." + "issue",
                     text=issue_str,
@@ -210,7 +209,7 @@ class PRSimilarIssue:
                 corpus.append(issue_record)
                 if comments:
                     for j, comment in enumerate(comments):
-                        comment_body = comment.body
+                        comment_body = self.git_provider.get_issue_comment_body(comment)
                         num_words_comment = len(comment_body.split())
                         if num_words_comment < 10 or not isinstance(comment_body, str):
                             continue

requirements.txt

@@ -1,25 +1,24 @@
-aiohttp==3.9.1
-atlassian-python-api==3.39.0
-azure-devops==7.1.0b3
-boto3==1.33.6
-dynaconf==3.2.4
+dynaconf==3.1.12
 fastapi==0.99.0
-GitPython==3.1.32
-google-cloud-aiplatform==1.35.0
-google-cloud-storage==2.10.0
-Jinja2==3.1.2
-litellm==0.12.5
-loguru==0.7.2
-msrest==0.7.1
+PyGithub==1.59.*
+retry==0.9.2
 openai==0.27.8
+Jinja2==3.1.2
+tiktoken==0.4.0
+uvicorn==0.22.0
+python-gitlab==3.15.0
+pytest==7.4.0
+aiohttp==3.8.4
+atlassian-python-api==3.39.0
+GitPython==3.1.32
+PyYAML==6.0
+starlette-context==0.3.6
+litellm~=0.1.574
+boto3==1.28.25
+google-cloud-storage==2.10.0
+ujson==5.8.0
+azure-devops==7.1.0b3
+msrest==0.7.1
 pinecone-client
 pinecone-datasets @ git+https://github.com/mrT23/pinecone-datasets.git@main
-pytest==7.4.0
-PyGithub==1.59.*
-PyYAML==6.0.1
-python-gitlab==3.15.0
-retry==0.9.2
-starlette-context==0.3.6
-tiktoken==0.5.2
-ujson==5.8.0
-uvicorn==0.22.0
+loguru==0.7.2

tests/unittest/test_bitbucket_provider.py

@@ -1,4 +1,3 @@
-from pr_agent.git_providers import BitbucketServerProvider
 from pr_agent.git_providers.bitbucket_provider import BitbucketProvider
 
 
@@ -9,10 +8,3 @@ class TestBitbucketProvider:
         assert workspace_slug == "WORKSPACE_XYZ"
         assert repo_slug == "MY_TEST_REPO"
         assert pr_number == 321
-
-    def test_bitbucket_server_pr_url(self):
-        url = "https://git.onpreminstance.com/projects/AAA/repos/my-repo/pull-requests/1"
-        workspace_slug, repo_slug, pr_number = BitbucketServerProvider._parse_pr_url(url)
-        assert workspace_slug == "AAA"
-        assert repo_slug == "my-repo"
-        assert pr_number == 1

tests/unittest/test_clip_tokens.py

@@ -1,19 +0,0 @@
-
-# Generated by CodiumAI
-
-import pytest
-
-from pr_agent.algo.utils import clip_tokens
-
-
-class TestClipTokens:
-    def test_clip(self):
-        text = "line1\nline2\nline3\nline4\nline5\nline6"
-        max_tokens = 25
-        result = clip_tokens(text, max_tokens)
-        assert result == text
-
-        max_tokens = 10
-        result = clip_tokens(text, max_tokens)
-        expected_results = 'line1\nline2\nline3\nli...(truncated)'
-        assert result == expected_results

tests/unittest/test_convert_to_markdown.py

@@ -71,7 +71,7 @@ class TestConvertToMarkdown:
 - 📌 **Type of PR:** Test type\n\
 - 🧪 **Relevant tests added:** no\n\
 - ✨ **Focused PR:** Yes\n\
--  **General PR suggestions:** general suggestion...\n\n\n- <details><summary> 🤖 Code feedback:</summary>  - **Code example:**\n    - **Before:**\n        ```\n        Code before\n        ```\n    - **After:**\n        ```\n        Code after\n        ```\n\n  - **Code example:**\n    - **Before:**\n        ```\n        Code before 2\n        ```\n    - **After:**\n        ```\n        Code after 2\n        ```\n\n</details>\
+-  **General PR suggestions:** general suggestion...\n\n\n- **<details><summary> 🤖 Code feedback:**</summary>\n\n  - **Code example:**\n    - **Before:**\n        ```\n        Code before\n        ```\n    - **After:**\n        ```\n        Code after\n        ```\n\n  - **Code example:**\n    - **Before:**\n        ```\n        Code before 2\n        ```\n    - **After:**\n        ```\n        Code after 2\n        ```\n\n</details>\
 """
         assert convert_to_markdown(input_data).strip() == expected_output.strip()
 

tests/unittest/test_load_yaml.py

@@ -2,9 +2,6 @@
 # Generated by CodiumAI
 
 import pytest
-import yaml
-from yaml.scanner import ScannerError
-
 from pr_agent.algo.utils import load_yaml
 
 
@@ -15,7 +12,7 @@ class TestLoadYaml:
         expected_output = {'name': 'John Smith', 'age': 35}
         assert load_yaml(yaml_str) == expected_output
 
-    def test_load_invalid_yaml1(self):
+    def test_load_complicated_yaml(self):
         yaml_str = \
 '''\
 PR Analysis:
@@ -29,23 +26,7 @@ PR Feedback:
   Code feedback:
     - relevant file: pr_agent/settings/pr_description_prompts.toml
       suggestion: Consider using a more descriptive variable name than 'user' for the command prompt. A more descriptive name would make the code more readable and maintainable. [medium]
-      relevant line: user="""PR Info: aaa
+      relevant line: 'user="""PR Info:'
   Security concerns: No'''
-        with pytest.raises(ScannerError):
-            yaml.safe_load(yaml_str)
-
-        expected_output = {'PR Analysis': {'Main theme': 'Enhancing the `/describe` command prompt by adding title and description', 'Type of PR': 'Enhancement', 'Relevant tests added': False, 'Focused PR': 'Yes, the PR is focused on enhancing the `/describe` command prompt.'}, 'PR Feedback': {'General suggestions': 'The PR seems to be well-structured and focused on a specific enhancement. However, it would be beneficial to add tests to ensure the new feature works as expected.', 'Code feedback': [{'relevant file': 'pr_agent/settings/pr_description_prompts.toml', 'suggestion': "Consider using a more descriptive variable name than 'user' for the command prompt. A more descriptive name would make the code more readable and maintainable. [medium]", 'relevant line': 'user="""PR Info: aaa'}], 'Security concerns': False}}
+        expected_output = {'PR Analysis': {'Main theme': 'Enhancing the `/describe` command prompt by adding title and description', 'Type of PR': 'Enhancement', 'Relevant tests added': False, 'Focused PR': 'Yes, the PR is focused on enhancing the `/describe` command prompt.'}, 'PR Feedback': {'General suggestions': 'The PR seems to be well-structured and focused on a specific enhancement. However, it would be beneficial to add tests to ensure the new feature works as expected.', 'Code feedback': [{'relevant file': 'pr_agent/settings/pr_description_prompts.toml', 'suggestion': "Consider using a more descriptive variable name than 'user' for the command prompt. A more descriptive name would make the code more readable and maintainable. [medium]", 'relevant line': 'user="""PR Info:'}], 'Security concerns': False}}
         assert load_yaml(yaml_str) == expected_output
-
-    def test_load_invalid_yaml2(self):
-        yaml_str = '''\
-- relevant file: src/app.py:
-  suggestion content: The print statement is outside inside the if __name__ ==: \
-  '''
-        with pytest.raises(ScannerError):
-            yaml.safe_load(yaml_str)
-
-        expected_output =[{'relevant file': 'src/app.py:',
-  'suggestion content': 'The print statement is outside inside the if __name__ ==:   '}]
-        assert load_yaml(yaml_str) == expected_output
-

tests/unittest/test_parse_code_suggestion.py

@@ -61,7 +61,7 @@ class TestParseCodeSuggestion:
             'before': 'Before 1',
             'after': 'After 1'
         }
-        expected_output = '   **suggestion:** Suggestion 1  \n   **description:** Description 1  \n   **before:** Before 1  \n   **after:** After 1  \n\n'  # noqa: E501
+        expected_output = "   **suggestion:** Suggestion 1\n   **description:** Description 1\n   **before:** Before 1\n   **after:** After 1\n\n"  # noqa: E501
         assert parse_code_suggestion(code_suggestions) == expected_output
 
     # Tests that function returns correct output when input dictionary has 'code example' key
@@ -74,5 +74,5 @@ class TestParseCodeSuggestion:
                 'after': 'After 2'
             }
         }
-        expected_output = '   **suggestion:** Suggestion 2  \n   **description:** Description 2  \n  - **code example:**\n    - **before:**\n        ```\n        Before 2\n        ```\n    - **after:**\n        ```\n        After 2\n        ```\n\n'  # noqa: E501
+        expected_output = "   **suggestion:** Suggestion 2\n   **description:** Description 2\n  - **code example:**\n    - **before:**\n        ```\n        Before 2\n        ```\n    - **after:**\n        ```\n        After 2\n        ```\n\n"  # noqa: E501
         assert parse_code_suggestion(code_suggestions) == expected_output

tests/unittest/try_fix_yaml.py

@@ -1,31 +0,0 @@
-
-# Generated by CodiumAI
-from pr_agent.algo.utils import try_fix_yaml
-
-
-import pytest
-
-class TestTryFixYaml:
-
-    # The function successfully parses a valid YAML string.
-    def test_valid_yaml(self):
-        review_text = "key: value\n"
-        expected_output = {"key": "value"}
-        assert try_fix_yaml(review_text) == expected_output
-
-    # The function adds '|-' to 'relevant line:' if it is not already present and successfully parses the YAML string.
-    def test_add_relevant_line(self):
-        review_text = "relevant line: value: 3\n"
-        expected_output = {"relevant line": "value: 3"}
-        assert try_fix_yaml(review_text) == expected_output
-
-    # The function removes the last line(s) of the YAML string and successfully parses the YAML string.
-    def test_remove_last_line(self):
-        review_text = "key: value\nextra invalid line\n"
-        expected_output = {"key": "value"}
-        assert try_fix_yaml(review_text) == expected_output
-
-    # The YAML string is empty.
-    def test_empty_yaml_fixed(self):
-        review_text = ""
-        assert try_fix_yaml(review_text) is None