gitlab debug

Ok/gitlab webhook

See merge request codiumai/pr-agent!1

.dockerignore

@@ -1,5 +1,3 @@
 venv/
 pr_agent/settings/.secrets.toml
-pics/
-pr_agent.egg-info/
-build/
+pics/

.github/workflows/build-and-test.yaml

@@ -1,38 +0,0 @@
-name: Build-and-test
-
-on:
-  push:
-  pull_request:
-    types: [ opened, reopened ]
-
-jobs:
-  build-and-test:
-    runs-on: ubuntu-latest
-
-    steps:
-      - id: checkout
-        uses: actions/checkout@v2
-
-      - id: dockerx
-        name: Setup Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - id: build
-        name: Build dev docker
-        uses: docker/build-push-action@v2
-        with:
-          context: .
-          file: ./docker/Dockerfile
-          push: false
-          load: true
-          tags: codiumai/pr-agent:test
-          cache-from: type=gha,scope=dev
-          cache-to: type=gha,mode=max,scope=dev
-          target: test
-
-      - id: test
-        name: Test dev docker
-        run: |
-          docker run --rm codiumai/pr-agent:test pytest -v
-        
-          

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

@@ -1,32 +0,0 @@
-# This workflow enables developers to call PR-Agents `/[actions]` in PR's comments and upon PR creation. 
-# Learn more at https://www.codium.ai/pr-agent/
-# This is v0.2 of this workflow file
-
-name: PR-Agent
-
-on:
-  pull_request:
-  issue_comment:
-
-permissions:
-  issues: write
-  pull-requests: write
-
-jobs:
-  pr_agent_job:
-    runs-on: ubuntu-latest
-    name: Run pr agent on every pull request
-    steps:
-      - name: PR Agent action step
-        id: pragent
-        uses: Codium-ai/pr-agent@main
-        env:
-          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
-          OPENAI_ORG: ${{ secrets.OPENAI_ORG }} # optional
-          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
-
-

.github/workflows/review.yaml

@@ -0,0 +1,16 @@
+on:
+  pull_request:
+  issue_comment:
+jobs:
+  pr_agent_job:
+    runs-on: ubuntu-latest
+    name: Run pr agent on every pull request
+    steps:
+      - name: PR Agent action step
+        id: pragent
+        uses: Codium-ai/pr-agent@main
+        env:
+          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
+          OPENAI_ORG: ${{ secrets.OPENAI_ORG }} # optional
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+

.gitignore

@@ -1,8 +1,4 @@
 .idea/
 venv/
 pr_agent/settings/.secrets.toml
-__pycache__
-dist/
-*.egg-info/
-build/
-review.md
+__pycache__

.gitlab-ci.yml

@@ -0,0 +1,11 @@
+bot-review:
+  stage: test
+  variables:
+    MR_URL: ${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}
+  image: docker:latest
+  services:
+    - docker:19-dind
+  script:
+    - docker run --rm -e OPENAI.KEY=${OPEN_API_KEY} -e OPENAI.ORG=${OPEN_API_ORG} -e GITLAB.PERSONAL_ACCESS_TOKEN=${GITLAB_PAT} -e CONFIG.GIT_PROVIDER=gitlab codiumai/pr-agent --pr_url ${MR_URL} describe
+  rules:
+    - if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH

.pr_agent.toml

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

CHANGELOG.md

@@ -1,45 +0,0 @@
-## 2023-08-03
-
-### Optimized
-- Optimized PR diff processing by introducing caching for diff files, reducing the number of API calls.
-- Refactored `load_large_diff` function to generate a patch only when necessary.
-- Fixed a bug in the GitLab provider where the new file was not retrieved correctly.
-
-## 2023-08-02
-
-### Enhanced
-- Updated several tools in the `pr_agent` package to use commit messages in their functionality.
-- Commit messages are now retrieved and stored in the `vars` dictionary for each tool.
-- Added a section to display the commit messages in the prompts of various tools.
-
-## 2023-08-01
-
-### Enhanced
-- Introduced the ability to retrieve commit messages from pull requests across different git providers.
-- Implemented commit messages retrieval for GitHub and GitLab providers.
-- Updated the PR description template to include a section for commit messages if they exist.
-- Added support for repository-specific configuration files (.pr_agent.yaml) for the PR Agent.
-- Implemented this feature for both GitHub and GitLab providers.
-- Added a new configuration option 'use_repo_settings_file' to enable or disable the use of a repo-specific settings file.
-
-
-## 2023-07-30
-
-### Enhanced
-- Added the ability to modify any configuration parameter from 'configuration.toml' on-the-fly.
-- Updated the command line interface and bot commands to accept configuration changes as arguments.
-- Improved the PR agent to handle additional arguments for each action.
-
-## 2023-07-28
-
-### Improved
-- Enhanced error handling and logging in the GitLab provider.
-- Improved handling of inline comments and code suggestions in GitLab.
-- Fixed a bug where an additional unneeded line was added to code suggestions in GitLab.
-
-## 2023-07-26
-
-### Added
-- New feature for updating the CHANGELOG.md based on the contents of a PR.
-- Added support for this feature for the Github provider.
-- New configuration settings and prompts for the changelog update feature.

CONFIGURATION.md

@@ -0,0 +1,19 @@
+## Configuration
+
+The different tools and sub-tools used by CodiumAI pr-agent are easily configurable via the configuration file: `/pr-agent/settings/configuration.toml`.
+##### Git Provider:
+You can select your git_provider with the flag `git_provider` in the `config` section
+
+##### PR Reviewer:
+
+You can enable/disable the different PR Reviewer abilities with the following flags (`pr_reviewer` section):
+```
+require_focused_review=true
+require_score_review=true
+require_tests_review=true
+require_security_review=true
+```
+You can contol the number of suggestions returned by the PR Reviewer with the following flag:
+```inline_code_comments=3```
+And enable/disable the inline code suggestions with the following flag:
+```inline_code_comments=true```

Dockerfile.github_action

@@ -1,9 +1,8 @@
 FROM python:3.10 as base
 
 WORKDIR /app
-ADD pyproject.toml .
 ADD requirements.txt .
-RUN pip install . && rm pyproject.toml requirements.txt
+RUN pip install -r requirements.txt && rm requirements.txt
 ENV PYTHONPATH=/app
 ADD pr_agent pr_agent
 ADD github_action/entrypoint.sh /

INSTALL.md

@@ -1,77 +1,80 @@
 
 ## Installation
 
-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.
-
-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)
 ---
 
-### 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:
 ```
-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:
+2. To ask a question about a PR, run the following command:
+
 ```
-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 GITHUB.USER_TOKEN=<your token> codiumai/pr-agent --pr_url <pr_url> ask "<your question>"
 ```
 
-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
-```
+Possible questions you can ask include:
 
-- 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.
+- 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?
 
 ---
 
+#### Method 2: Run as a GitHub Action
 
-If you want to ensure you're running a specific version of the Docker image, consider using the image's digest:
-```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
+You can use our pre-built Github Action Docker image to run PR-Agent as a Github Action. 
+
+1. Add the following file to your repository under `.github/workflows/pr_agent.yml`:
+
+```yaml
+on:
+  pull_request:
+  issue_comment:
+jobs:
+  pr_agent_job:
+    runs-on: ubuntu-latest
+    name: Run pr agent on every pull request, respond to user comments
+    steps:
+      - name: PR Agent action step
+        id: pragent
+        uses: Codium-ai/pr-agent@main
+        env:
+          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 ```
 
-Or you can run a [specific released versions](./RELEASE_NOTES.md) of pr-agent, for example:
+2. Add the following secret to your repository under `Settings > Secrets`:
+
 ```
-codiumai/pr-agent@v0.9
+OPENAI_KEY: <your key>
+```
+
+The GITHUB_TOKEN secret is automatically created by GitHub.
+
+3. Merge this change to your main branch. 
+When you open your next PR, you should see a comment from `github-actions` bot with a review of your PR, and instructions on how to use the rest of the tools.
+
+4. You may configure PR-Agent by adding environment variables under the env section corresponding to any configurable property in the [configuration](./CONFIGURATION.md) file. Some examples:
+```yaml
+      env:
+        # ... 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
 ```
 
 ---
 
-### Run from source
+#### Method 3: Run from source
 
 1. Clone this repository:
 
@@ -89,7 +92,6 @@ pip install -r requirements.txt
 
 ```
 cp pr_agent/settings/.secrets_template.toml pr_agent/settings/.secrets.toml
-chmod 600 pr_agent/settings/.secrets.toml
 # Edit .secrets.toml file
 ```
 
@@ -97,94 +99,18 @@ chmod 600 pr_agent/settings/.secrets.toml
 
 ```
 export PYTHONPATH=[$PYTHONPATH:]<PATH to pr_agent folder>
-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
-...
+python pr_agent/cli.py --pr_url <pr_url> review
+python pr_agent/cli.py --pr_url <pr_url> ask <your question>
+python pr_agent/cli.py --pr_url <pr_url> describe
+python pr_agent/cli.py --pr_url <pr_url> improve
 ```
 
 ---
 
-### Run as a GitHub Action
-
-You can use our pre-built Github Action Docker image to run PR-Agent as a Github Action.
-
-1. Add the following file to your repository under `.github/workflows/pr_agent.yml`:
-
-```yaml
-on:
-  pull_request:
-  issue_comment:
-jobs:
-  pr_agent_job:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-      contents: write
-    name: Run pr agent on every pull request, respond to user comments
-    steps:
-      - name: PR Agent action step
-        id: pragent
-        uses: Codium-ai/pr-agent@main
-        env:
-          OPENAI_KEY: ${{ secrets.OPENAI_KEY }}
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-```
-** if you want to pin your action to a specific release (v0.7 for example) for stability reasons, use:
-```yaml
-on:
-  pull_request:
-  issue_comment:
-
-jobs:
-  pr_agent_job:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-      pull-requests: write
-      contents: write
-    name: Run pr agent on every pull request, respond to user comments
-    steps:
-      - name: PR Agent action step
-        id: pragent
-        uses: Codium-ai/pr-agent@v0.7
-        env:
-          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`:
-
-```
-Name = OPENAI_KEY
-Secret = <your key>
-```
-
-The GITHUB_TOKEN secret is automatically created by GitHub.
-
-3. Merge this change to your main branch.
-When you open your next PR, you should see a comment from `github-actions` bot with a review of your PR, and instructions on how to use the rest of the tools.
-
-4. You may configure PR-Agent by adding environment variables under the env section corresponding to any configurable property in the [configuration](pr_agent/settings/configuration.toml) file. Some examples:
-```yaml
-      env:
-        # ... 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
-```
-
----
-
-### 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 +119,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).
@@ -202,11 +128,9 @@ Allowing you to automate the review process on your private or public repositori
      - Pull requests: Read & write
      - Issue comment: Read & write
      - Metadata: Read-only
-     - Contents: Read-only
    - 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:
 
@@ -236,12 +160,12 @@ git clone https://github.com/Codium-ai/pr-agent.git
    - Copy your app's webhook secret to the webhook_secret field.
    - Set deployment_type to 'app' in [configuration.toml](./pr_agent/settings/configuration.toml)
 
-> The .secrets.toml file is not copied to the Docker image by default, and is only used for local development.
+> The .secrets.toml file is not copied to the Docker image by default, and is only used for local development. 
 > If you want to use the .secrets.toml file in your Docker image, you can add remove it from the .dockerignore file.
-> In most production environments, you would inject the secrets file as environment variables or as mounted volumes.
+> In most production environments, you would inject the secrets file as environment variables or as mounted volumes. 
 > For example, in order to inject a secrets file as a volume in a Kubernetes environment you can update your pod spec to include the following,
 > assuming you have a secret named `pr-agent-settings` with a key named `.secrets.toml`:
-```
+``` 
        volumes:
         - name: settings-volume
           secret:
@@ -274,14 +198,11 @@ 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)
 ---
 
-### Deploy as a Lambda Function
+####  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,170 +214,5 @@ 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
-
-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:
-
-1. Create an IAM user that you will use to read CodeCommit pull requests and post comments
-    * Note: That user should have CLI access only, not Console access
-2. Add IAM permissions to that user, to allow access to CodeCommit (see IAM Role example below)
-3. Generate an Access Key for your IAM user
-4. Set the Access Key and Secret using environment variables (see Access Key example below)
-5. Set the `git_provider` value to `codecommit` in the `pr_agent/settings/configuration.toml` settings file
-6. Set the `PYTHONPATH` to include your `pr-agent` project directory
-    * Option A: Add `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent` to your `.env` file
-    * Option B: Set `PYTHONPATH` and run the CLI in one command, for example:
-        * `PYTHONPATH="/PATH/TO/PROJECTS/pr-agent python pr_agent/cli.py [--ARGS]`
-
-##### AWS CodeCommit IAM Role Example
-
-Example IAM permissions to that user to allow access to CodeCommit:
-
-* Note: The following is a working example of IAM permissions that has read access to the repositories and write access to allow posting comments
-* Note: If you only want pr-agent to review your pull requests, you can tighten the IAM permissions further, however this IAM example will work, and allow the pr-agent to post comments to the PR
-* Note: You may want to replace the `"Resource": "*"` with your list of repos, to limit access to only those repos
-
-```
-{
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Effect": "Allow",
-            "Action": [
-                "codecommit:BatchDescribe*",
-                "codecommit:BatchGet*",
-                "codecommit:Describe*",
-                "codecommit:EvaluatePullRequestApprovalRules",
-                "codecommit:Get*",
-                "codecommit:List*",
-                "codecommit:PostComment*",
-                "codecommit:PutCommentReaction",
-                "codecommit:UpdatePullRequestDescription",
-                "codecommit:UpdatePullRequestTitle"
-            ],
-            "Resource": "*"
-        }
-    ]
-}
-```
-
-##### AWS CodeCommit Access Key and Secret
-
-Example setting the Access Key and Secret using environment variables
-
-```sh
-export AWS_ACCESS_KEY_ID="XXXXXXXXXXXXXXXX"
-export AWS_SECRET_ACCESS_KEY="XXXXXXXXXXXXXXXX"
-export AWS_DEFAULT_REGION="us-east-1"
-```
-
-##### AWS CodeCommit CLI Example
-
-After you set up AWS CodeCommit using the instructions above, here is an example CLI run that tells pr-agent to **review** a given pull request.
-(Replace your specific PYTHONPATH and PR URL in the example)
-
-```sh
-PYTHONPATH="/PATH/TO/PROJECTS/pr-agent" python pr_agent/cli.py \
-  --pr_url https://us-east-1.console.aws.amazon.com/codesuite/codecommit/repositories/MY_REPO_NAME/pull-requests/321 \
-  review
-```
-
----
-
-### 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:
-
-```
-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.
-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.
-    - Set deployment_type to 'gitlab' in [configuration.toml](./pr_agent/settings/configuration.toml)
-5. Create a webhook in GitLab. Set the URL to the URL of your app's server. Set the secret token to the generated secret from step 2.
-In the "Trigger" section, check the ‘comments’ and ‘merge request events’ boxes.
-6. Test your installation by opening a merge request or commenting or a merge request using one of CodiumAI's commands.
-
-
-
-### Run as a Bitbucket Pipeline
-
-
-You can use the Bitbucket Pipeline system to run PR-Agent on every pull request open or update.
-
-1. Add the following file in your repository bitbucket_pipelines.yml
-
-```yaml
-pipelines:
-    pull-requests:
-      '**':
-        - step:
-            name: PR Agent Review
-            image: python:3.10
-            services:
-              - docker
-            script:
-              - docker run -e CONFIG.GIT_PROVIDER=bitbucket -e OPENAI.KEY=$OPENAI_API_KEY -e BITBUCKET.BEARER_TOKEN=$BITBUCKET_BEARER_TOKEN codiumai/pr-agent:latest --pr_url=https://bitbucket.org/$BITBUCKET_WORKSPACE/$BITBUCKET_REPO_SLUG/pull-requests/$BITBUCKET_PR_ID review
-```
-
-2. Add the following secure variables to your repository under Repository settings > Pipelines > Repository variables.
-OPENAI_API_KEY: <your key>
-BITBUCKET_BEARER_TOKEN: <your token>
-
-You can get a Bitbucket token for your repository by following Repository Settings -> Security -> Access Tokens.
-
-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

@@ -1,4 +1,4 @@
-# PR Compression Strategy
+# Git Patch Logic
 There are two scenarios:
 1. The PR is small enough to fit in a single prompt (including system and user prompt)
 2. The PR is too large to fit in a single prompt (including system and user prompt)
@@ -16,7 +16,7 @@ We prioritize the languages of the repo based on the following criteria:
 ## Small PR
 In this case, we can fit the entire PR in a single prompt:
 1. Exclude binary files and non code files (e.g. images, pdfs, etc)
-2. We Expand the surrounding context of each patch to 3 lines above and below the patch
+2. We Expand the surrounding context of each patch to 6 lines above and below the patch
 ## Large PR
 
 ### Motivation
@@ -25,13 +25,13 @@ We want to be able to pack as much information as possible in a single LMM promp
 
 
 
-#### Compression strategy
+#### PR compression strategy
 We prioritize additions over deletions:
  - Combine all deleted files into a single list (`deleted files`)
  - File patches are a list of hunks, remove all hunks of type deletion-only from the hunks in the file patch
 ####  Adaptive and token-aware file patch fitting
 We use [tiktoken](https://github.com/openai/tiktoken) to tokenize the patches after the modifications described above, and we use the following strategy to fit the patches into the prompt:
-1. Within each language we sort the files by the number of tokens in the file (in descending order):
+1. Withing each language we sort the files by the number of tokens in the file (in descending order):
    * ```[[file2.py, file.py],[file4.jsx, file3.js],[readme.md]]```
 2. Iterate through the patches in the order described above
 2. Add the patches to the prompt until the prompt reaches a certain buffer from the max token length
@@ -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,156 +2,113 @@
 
 <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>
 
 [![GitHub license](https://img.shields.io/badge/License-Apache_2.0-blue.svg)](https://github.com/Codium-ai/pr-agent/blob/main/LICENSE)
 [![Discord](https://badgen.net/badge/icon/discord?icon=discord&label&color=purple)](https://discord.com/channels/1057273017547378788/1126104260430528613)
-[![Twitter](https://img.shields.io/twitter/follow/codiumai)](https://twitter.com/codiumai)
     <a href="https://github.com/Codium-ai/pr-agent/commits/main">
     <img alt="GitHub" src="https://img.shields.io/github/last-commit/Codium-ai/pr-agent/main?style=for-the-badge" height="20">
     </a>
 </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 feedback:
 
-‣ **Auto Description ([`/describe`](./docs/DESCRIBE.md))**: Automatically generating PR description - title, type, summary, code walkthrough and labels.
+**Auto-Description**: Automatically generating PR description - title, type, summary, code walkthrough and PR labels.
 \
-‣ **Auto Review ([`/review`](./docs/REVIEW.md))**: Adjustable feedback about the PR main theme, type, relevant tests, security issues, score, and various suggestions for the PR content.
+**PR Review**: Adjustable feedback about the PR main theme, type, relevant tests, security issues, focus, score, and various suggestions for the PR content.
 \
-‣ **Question Answering ([`/ask ...`](./docs/ASK.md))**: Answering free-text questions about the PR.
+**Question Answering**: Answering free-text questions about the PR.
 \
-‣ **Code Suggestions ([`/improve`](./docs/IMPROVE.md))**: Committable code suggestions for improving the PR.
-\
-‣ **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.
-\
-‣ **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.
+**Code Suggestion**: Committable code suggestions for improving the PR.
 
-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 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 (tools are run via the commands).
-
-<h3>Example results:</h3>
+<h3>Example results:</h2>
 </div>
-<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1687561986">/describe:</a></h4>
+<h4>/describe:</h4>
 <div align="center">
 <p float="center">
 <img src="https://www.codium.ai/images/describe-2.gif" width="800">
 </p>
 </div>
-
-<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901">/review:</a></h4>
+<h4>/review:</h4>
 <div align="center">
 <p float="center">
 <img src="https://www.codium.ai/images/review-2.gif" width="800">
 </p>
 </div>
-
-[//]: # (<h4><a href="https://github.com/Codium-ai/pr-agent/pull/78#issuecomment-1639739496">/reflect_and_review:</a></h4>)
-
-[//]: # (<div align="center">)
-
-[//]: # (<p float="center">)
-
-[//]: # (<img src="https://www.codium.ai/images/reflect_and_review.gif" width="800">)
-
-[//]: # (</p>)
-
-[//]: # (</div>)
-
-[//]: # (<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695020538">/ask:</a></h4>)
-
-[//]: # (<div align="center">)
-
-[//]: # (<p float="center">)
-
-[//]: # (<img src="https://www.codium.ai/images/ask-2.gif" width="800">)
-
-[//]: # (</p>)
-
-[//]: # (</div>)
-
-[//]: # (<h4><a href="https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695024952">/improve:</a></h4>)
-
-[//]: # (<div align="center">)
-
-[//]: # (<p float="center">)
-
-[//]: # (<img src="https://www.codium.ai/images/improve-2.gif" width="800">)
-
-[//]: # (</p>)
-
-[//]: # (</div>)
+<h4>/reflect_and_review:</h4>
+<div align="center">
+<p float="center">
+<img src="https://www.codium.ai/images/reflect_and_review.gif" width="800">
+</p>
+</div>
+<h4>/ask:</h4>
+<div align="center">
+<p float="center">
+<img src="https://www.codium.ai/images/ask-2.gif" width="800">
+</p>
+</div>
+<h4>/improve:</h4>
+<div align="center">
+<p float="center">
+<img src="https://www.codium.ai/images/improve-2.gif" width="800">
+</p>
+</div>
 <div align="left">
 
-## Table of Contents
+
 - [Overview](#overview)
 - [Try it now](#try-it-now)
 - [Installation](#installation)
+- [Usage and tools](#usage-and-tools)
+- [Configuration](./CONFIGURATION.md)
 - [How it works](#how-it-works)
-- [Why use PR-Agent?](#why-use-pr-agent)
 - [Roadmap](#roadmap)
+- [Similar projects](#similar-projects)
 </div>
 
 
 ## Overview
 `PR-Agent` offers extensive pull request functionalities across various git providers:
-|       |                                             | GitHub | Gitlab | Bitbucket | CodeCommit | Azure DevOps | Gerrit |
-|-------|---------------------------------------------|:------:|:------:|:---------:|:----------:|:----------:|:----------:|
-| TOOLS | Review                                      |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:    |
-|       | ⮑ Incremental                              |   :white_check_mark:    |       |           |       |          |     |
-|       | Ask                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:          |   :white_check_mark:          | :white_check_mark: |  :white_check_mark:    |
-|       | Auto-Description                            |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |   :white_check_mark:    | :white_check_mark:    |
-|       | Improve Code                                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | ⮑ Extended                             |   :white_check_mark:    |   :white_check_mark:    |        :white_check_mark:   |   :white_check_mark:    |          | :white_check_mark:    |
-|       | Reflect and Review                          |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |          |   :white_check_mark:    |    :white_check_mark:    |
-|       | Update CHANGELOG.md                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |       |
-|       | Find similar issue                          |   :white_check_mark:    |                         |                             |          |          |       |
-|       | Add Documentation                           |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:        |   :white_check_mark:    |          |    :white_check_mark:    |
-|       | Generate Labels                           |   :white_check_mark:    |   :white_check_mark:    |         |     |          |      |
-|       |                                             |        |        |      |      |      |
-| USAGE | CLI                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |   :white_check_mark:    |   :white_check_mark:    |
-|       | App / webhook                               |   :white_check_mark:    |   :white_check_mark:    |           |          |          |
-|       | Tagging bot                                 |   :white_check_mark:    |        |           |          |          |
-|       | Actions                                     |   :white_check_mark:    |        |           |          |          |
-|       | Web server                                  |       |        |           |          |          |  :white_check_mark:   |
-|       |                                             |        |        |      |      |      |
-| CORE  | PR compression                              |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Repo language prioritization                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Adaptive and token-aware<br />file patch fitting |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Multiple models support |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       | :white_check_mark: |   :white_check_mark:       | :white_check_mark:       |
-|       | Incremental PR Review |   :white_check_mark:    |      |      |      |      |      |
+|       |                                             | GitHub | Gitlab | Bitbucket |
+|-------|---------------------------------------------|:------:|:------:|:---------:|
+| TOOLS | Review                                      |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | ⮑ Inline review                             |   :white_check_mark:    |   :white_check_mark:    |           |
+|       | Ask                                         |   :white_check_mark:    |   :white_check_mark:    |           |
+|       | Auto-Description                            |   :white_check_mark:    |  :white_check_mark:      |           |
+|       | Improve Code                                |   :white_check_mark:    |   :white_check_mark:    |           |
+|       | Reflect and Review                          |   :white_check_mark:    |                         |           |
+|       |                                             |        |        |           |
+| USAGE | CLI                                         |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Tagging bot                                 |   :white_check_mark:    |        |           |
+|       | Actions                                     |   :white_check_mark:    |        |           |
+|       |                                             |        |        |           |
+| CORE  | PR compression                              |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Repo language prioritization                |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Adaptive and token-aware<br />file patch fitting |   :white_check_mark:    |   :white_check_mark:    |   :white_check_mark:       |
+|       | Incremental PR Review |   :white_check_mark:    |      |         |
 
-Review the [usage guide](./Usage.md) section for detailed instructions how to use the different tools, select the relevant git provider (GitHub, Gitlab, Bitbucket,...), and adjust the configuration file to your needs.
+Examples for invoking the different tools via the CLI:
+- **Review**:       python cli.py --pr-url=<pr_url>  review
+- **Describe**:     python cli.py --pr-url=<pr_url>  describe
+- **Improve**:      python cli.py --pr-url=<pr_url>  improve
+- **Ask**:          python cli.py --pr-url=<pr_url>  ask "Write me a poem about this PR"
+- **Reflect**:      python cli.py --pr-url=<pr_url>  reflect
+
+"<pr_url>" is the url of the relevant PR (for example: https://github.com/Codium-ai/pr-agent/pull/50).
+
+In the [configuration](./CONFIGURATION.md) file you can select your git provider (GitHub, Gitlab, Bitbucket), and further configure the different tools.
 
 ## 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.
-For example, add a comment to any pull request with the following text:
-```
-@CodiumAI-Agent /review
-```
-and the agent will respond with a review of your PR
+Try GPT-4 powered PR-Agent on your public GitHub repository for free. Just mention `@CodiumAI-Agent` and add the desired command in any PR comment! The agent will generate a response based on your command.
 
 ![Review generation process](https://www.codium.ai/images/demo-2.gif)
 
-
-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 ...`.
+To set up your own PR-Agent, see the [Installation](#installation) section
 
 ---
 
@@ -165,79 +122,49 @@ To get started with PR-Agent quickly, you first need to acquire two tokens:
 There are several ways to use PR-Agent:
 
 - [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 2: Run as a GitHub Action](INSTALL.md#method-2-run-as-a-github-action)
+- [Method 3: Run from source](INSTALL.md#method-3-run-from-source)
 - [Method 4: Run as a polling server](INSTALL.md#method-4-run-as-a-polling-server)
   - Request reviews by tagging your GitHub user on a PR
 - [Method 5: Run as a GitHub App](INSTALL.md#method-5-run-as-a-github-app)
   - Allowing you to automate the review process on your private or public repositories
-- [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)
+
+## Usage and Tools
+
+**PR-Agent** provides five types of interactions ("tools"): `"PR Reviewer"`, `"PR Q&A"`, `"PR Description"`, `"PR Code Sueggestions"` and `"PR Reflect and Review"`.
+
+- The "PR Reviewer" tool automatically analyzes PRs, and provides various types of feedback.
+- The "PR Q&A" tool answers free-text questions about the PR.
+- The "PR Description" tool automatically sets the PR Title and body.
+- The "PR Code Suggestion" tool provide inline code suggestions for the PR that can be applied and committed.
+- The "PR Reflect and Review" tool initiates a dialog with the user, asks them to reflect on the PR, and then provides a more focused review.
 
 ## How it works
 
-The following diagram illustrates PR-Agent tools and their flow:
-
-![PR-Agent Tools](https://codium.ai/images/pr_agent/diagram-v0.9.png)
+![PR-Agent Tools](https://www.codium.ai/wp-content/uploads/2023/07/codiumai-diagram-v4.jpg)
 
 Check out the [PR Compression strategy](./PR_COMPRESSION.md) page for more details on how we convert a code diff to a manageable LLM prompt
 
-## Why use PR-Agent?
-
-A reasonable question that can be asked is: `"Why use PR-Agent? What make it stand out from existing tools?"`
-
-Here are some advantages of PR-Agent:
-
-- We emphasize **real-life practical usage**. Each tool (review, improve, ask, ...) has a single GPT-4 call, no more. We feel that this is critical for realistic team usage - obtaining an answer quickly (~30 seconds) and affordably.
-- Our [PR Compression strategy](./PR_COMPRESSION.md)  is a core ability that enables to effectively tackle both short and long PRs.
-- Our JSON prompting strategy enables to have **modular, customizable tools**. For example, the '/review' tool categories can be controlled via the [configuration](pr_agent/settings/configuration.toml) file. Adding additional categories is easy and accessible.
-- We support **multiple git providers** (GitHub, Gitlab, Bitbucket, CodeCommit), **multiple ways** to use the tool (CLI, GitHub Action, GitHub App, Docker, ...), and **multiple models** (GPT-4, GPT-3.5, Anthropic, Cohere, Llama2).
-- We are open-source, and welcome contributions from the community.
-
-
 ## Roadmap
 
-- [x] Support additional models, as a replacement for OpenAI (see [here](https://github.com/Codium-ai/pr-agent/pull/172))
-- [x] Develop additional logic for handling large PRs (see [here](https://github.com/Codium-ai/pr-agent/pull/229))
+- [ ] Support open-source models, as a replacement for OpenAI models. (Note - a minimal requirement for each open-source model is to have 8k+ context, and good support for generating JSON as an output)
+- [x] Support other Git providers, such as Gitlab and Bitbucket.
+- [ ] Develop additional logic for handling large PRs, and compressing git patches
 - [ ] Add additional context to the prompt. For example, repo (or relevant files) summarization, with tools such a [ctags](https://github.com/universal-ctags/ctags)
-- [x] PR-Agent for issues
 - [ ] Adding more tools. Possible directions:
   - [x] PR description
   - [x] Inline code suggestions
   - [x] Reflect and review
-  - [x] Rank the PR (see [here](https://github.com/Codium-ai/pr-agent/pull/89))   
   - [ ] Enforcing CONTRIBUTING.md guidelines
   - [ ] Performance (are there any performance issues)
-  - [x] Documentation (is the PR properly documented)
+  - [ ] Documentation (is the PR properly documented)
+  - [ ] Rank the PR importance
   - [ ] ...
 
-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)
+- [CodiumAI - Meaningful tests for busy devs](https://github.com/Codium-ai/codiumai-vscode-release)
 - [Aider - GPT powered coding in your terminal](https://github.com/paul-gauthier/aider)
 - [openai-pr-reviewer](https://github.com/coderabbitai/openai-pr-reviewer)
 - [CodeReview BOT](https://github.com/anc95/ChatGPT-CodeReview)
 - [AI-Maintainer](https://github.com/merwanehamadi/AI-Maintainer)
-
-## 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)
-
-- Discord community: https://discord.gg/kG35uSHDBc
-- CodiumAI site: https://codium.ai
-- Blog: https://www.codium.ai/blog/
-- Troubleshooting: https://www.codium.ai/blog/technical-faq-and-troubleshooting/
-- Support: support@codium.ai

RELEASE_NOTES.md

@@ -1,103 +0,0 @@
-## [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
-- codiumai/pr-agent:0.8-bitbucket-app
-- codiumai/pr-agent:0.8-gitlab_webhook
-- codiumai/pr-agent:0.8-github_polling
-- codiumai/pr-agent:0.8-github_action
-
-### Added::Algo
-- GitHub Action: Can control which tools will run automatically when a new PR is created. (see usage guide: https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
-- Code suggestion tool: Will try to avoid an 'add comments' suggestion  (see https://github.com/Codium-ai/pr-agent/pull/327)
-
-### Fixed
-- Gitlab: Fixed a bug of improper usage of pr_id
-
-
-## [Version 0.7] - 2023-09-20
-
-### Docker Tags
-- codiumai/pr-agent:0.7
-- codiumai/pr-agent:0.7-github_app
-- codiumai/pr-agent:0.7-bitbucket-app
-- codiumai/pr-agent:0.7-gitlab_webhook
-- codiumai/pr-agent:0.7-github_polling
-- codiumai/pr-agent:0.7-github_action
- 
-### Added::Algo
-- New tool /similar_issue - Currently on GitHub app and CLI: indexes the issues in the repo, find the most similar issues to the target issue.
-- Describe markers: Empower the /describe tool with a templating capability (see more details in https://github.com/Codium-ai/pr-agent/pull/273).
-- New feature in the /review tool - added an estimated effort estimation to the review (https://github.com/Codium-ai/pr-agent/pull/306).
-
-### Added::Infrastructure
-- Implementation of a GitLab webhook.
-- Implementation of a BitBucket app.
-
-### Fixed
-- Protection against no code suggestions generated.
-- Resilience to repositories where the languages cannot be automatically detected.

Usage.md

@@ -1,436 +0,0 @@
-## Usage Guide
-
-### Table of Contents
-- [Introduction](#introduction)
-- [Working from a local repo (CLI)](#working-from-a-local-repo-cli)
-- [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:
-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
-
-
-Specifically, CLI commands can be issued by invoking a pre-built [docker image](/INSTALL.md#running-from-source), or by invoking a [locally cloned repo](INSTALL.md#method-2-run-from-source).
-For online usage, you will need to setup either a [GitHub App](INSTALL.md#method-5-run-as-a-github-app), or a [GitHub Action](INSTALL.md#method-3-run-as-a-github-action).
-GitHub App and GitHub Action also enable to run PR-Agent specific tool automatically when a new PR is opened.
-
-
-#### The configuration file
-The different tools and sub-tools used by CodiumAI PR-Agent are adjustable via the **[configuration file](pr_agent/settings/configuration.toml)**.
-In addition to general configuration options, each tool has its own configurations. For example, the `review` tool will use parameters from the [pr_reviewer](/pr_agent/settings/configuration.toml#L16) section in the configuration file.
-
-The [Tools Guide](./docs/TOOLS_GUIDE.md) provides a detailed description of the different tools and their configurations.
-
-#### 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:
-
- - `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']
-```
-
-#### 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:
-`
-"github", "gitlab", "azure", "codecommit", "local", "gerrit"
-`
-
-[//]: # (** online usage:**)
-
-[//]: # (Options that are available in the configuration file can be specified at run time when calling actions. Two examples:)
-
-[//]: # (```)
-
-[//]: # (- /review --pr_reviewer.extra_instructions="focus on the file: ...")
-
-[//]: # (- /describe --pr_description.add_original_user_description=false -pr_description.extra_instructions="make sure to mention: ...")
-
-[//]: # (```)
-
-### Working from a local repo (CLI)
-When running from your local repo (CLI), your local configuration file will be used.
-Examples of invoking the different tools via the CLI:
-
-- **Review**:       `python -m pr_agent.cli --pr_url=<pr_url>  review`
-- **Describe**:     `python -m pr_agent.cli --pr_url=<pr_url>  describe`
-- **Improve**:      `python -m pr_agent.cli --pr_url=<pr_url>  improve`
-- **Ask**:          `python -m pr_agent.cli --pr_url=<pr_url>  ask "Write me a poem about this PR"`
-- **Reflect**:      `python -m pr_agent.cli --pr_url=<pr_url>  reflect`
-- **Update Changelog**:      `python -m pr_agent.cli --pr_url=<pr_url>  update_changelog`
-
-`<pr_url>` is the url of the relevant PR (for example: https://github.com/Codium-ai/pr-agent/pull/50).
-
-**Notes:**
-
-(1) in addition to editing your local configuration file, you can also change any configuration value by adding it to the command line:
-```
-python -m pr_agent.cli --pr_url=<pr_url>  /review --pr_reviewer.extra_instructions="focus on the file: ..."
-```
-
-(2) You can print results locally, without publishing them, by setting in `configuration.toml`:
-```
-[config]
-publish_output=true
-verbosity_level=2
-```
-This is useful for debugging or experimenting with different tools.
-
-
-### Online usage
-
-Online usage means invoking PR-Agent tools by [comments](https://github.com/Codium-ai/pr-agent/pull/229#issuecomment-1695021901) on a PR.
-Commands for invoking the different tools via comments:
-
-- **Review**:       `/review`
-- **Describe**:     `/describe`
-- **Improve**:      `/improve`
-- **Ask**:          `/ask "..."`
-- **Reflect**:      `/reflect`
-- **Update Changelog**:      `/update_changelog`
-
-
-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:
-```
-/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.
-
-
-### 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.
-
-#### 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):
-```
-[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.  
-For the describe tool, the `add_original_user_description` and `keep_original_user_title` parameters will be set to true.
-
-You can override the default tool parameters by uploading a local configuration file called `.pr_agent.toml` to the root of your repo.
-For example, if your local `.pr_agent.toml` file contains:
-```
-[pr_description]
-add_original_user_description = false
-keep_original_user_title = false
-```
-When a new PR is opened, PR-Agent will run the `describe` tool with the above parameters.
-
-To cancel the automatic run of all the tools, set:
-```
-[github_app]
-handle_pr_actions = []
-```
-
-##### 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.
-
-#### Editing the prompts
-The prompts for the various PR-Agent tools are defined in the `pr_agent/settings` folder.
-In practice, the prompts are loaded and stored as a standard setting object.
-Hence, editing them is similar to editing any other configuration value - just place the relevant key in `.pr_agent.toml`file, and override the default value.
-
-For example, if you want to edit the prompts of the [describe](./pr_agent/settings/pr_description_prompts.toml) tool, you can add the following to your `.pr_agent.toml` file:
-```
-[pr_description_prompt]
-system="""
-...
-"""
-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:
-```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
-```
-`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.
-To use a different model than the default (GPT-4), you need to edit [configuration file](pr_agent/settings/configuration.toml#L2).
-For models and environments not from OPENAI, you might need to provide additional keys and other parameters. See below for instructions.
-
-#### Azure
-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):
-```
-api_key = "" # your azure api key
-api_type = "azure"
-api_version = '2023-05-15'  # Check Azure documentation for the current API version
-api_base = ""  # The base URL for your Azure OpenAI resource. e.g. "https://<your resource name>.openai.azure.com"
-openai.deployment_id = ""  # The deployment name you chose when you deployed the engine
-```
-
-and set in your configuration file:
-```
-[config]
-model="" # the OpenAI model you've deployed on Azure (e.g. gpt-3.5-turbo)
-```
-
-#### Huggingface
-
-**Local**
-You can run Huggingface models locally through either [VLLM](https://docs.litellm.ai/docs/providers/vllm) or [Ollama](https://docs.litellm.ai/docs/providers/ollama)
-
-E.g. to use a new Huggingface model locally via Ollama, set:
-```
-[__init__.py]
-MAX_TOKENS = {
-    "model-name-on-ollama": <max_tokens>
-}
-e.g.
-MAX_TOKENS={
-    ...,
-    "ollama/llama2": 4096
-}
-
-
-[config] # in configuration.toml
-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**
-
-To use a new model with Huggingface Inference Endpoints, for example, set:
-```
-[__init__.py]
-MAX_TOKENS = {
-    "model-name-on-huggingface": <max_tokens>
-}
-e.g.
-MAX_TOKENS={
-    ...,
-    "meta-llama/Llama-2-7b-chat-hf": 4096
-}
-[config] # in configuration.toml
-model = "huggingface/meta-llama/Llama-2-7b-chat-hf"
-
-[huggingface] # in .secrets.toml
-key = ... # your huggingface api key
-api_base = ... # the base url for your huggingface inference endpoint
-```
-(you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
-
-#### Replicate
-
-To use Llama2 model with Replicate, for example, set:
-```
-[config] # in configuration.toml
-model = "replicate/llama-2-70b-chat:2c1608e18606fad2812020dc541930f2d0495ce32eee50074220b87300bc16e1"
-[replicate] # in .secrets.toml
-key = ...
-```
-(you can obtain a Llama2 key from [here](https://replicate.com/replicate/llama-2-70b-chat/api))
-
-
-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.
-This mode provide a very good speed-quality-cost tradeoff, and can handle most PRs successfully.
-When the PR is above the token limit, it employs a [PR Compression strategy](./PR_COMPRESSION.md).
-
-However, for very large PRs, or in case you want to emphasize quality over speed and cost, there are 2 possible solutions:
-1) [Use a model](#changing-a-model) with larger context, like GPT-32K, or claude-100K. This solution will be applicable for all the tools.
-2) For the `/improve` tool, there is an ['extended' mode](./docs/IMPROVE.md) (`/improve --extended`),
-which divides the PR to chunks, and process each chunk separately. With this mode, regardless of the model, no compression will be done (but for large PRs, multiple model calls may occur)
-
-### Appendix - additional configurations walkthrough
-
-
-#### Extra instructions
-All PR-Agent tools have a parameter called `extra_instructions`, that enables to add free-text extra instructions. Example usage:
-```
-/update_changelog --pr_update_changelog.extra_instructions="Make sure to update also the version ..."
-```
-
-#### Patch Extra Lines
-By default, around any change in your PR, git patch provides 3 lines of context above and below the change.
-```
-@@ -12,5 +12,5 @@ def func1():
- code line that already existed in the file...
- code line that already existed in the file...
- code line that already existed in the file....
--code line that was removed 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...
- code line that already existed in the file...
-```
-
-For the `review`, `describe`, `ask` and `add_docs` tools, if the token budget allows, PR-Agent tries to increase the number of lines of context, via the parameter:
-```
-[config]
-patch_extra_lines=3
-```
-
-Increasing this number provides more context to the model, but will also increase the token budget.
-If the PR is too large (see [PR Compression strategy](./PR_COMPRESSION.md)), PR-Agent automatically sets this number to 0, using the original git patch.
-
-
-#### Azure DevOps provider
-To use Azure DevOps provider use the following settings in configuration.toml:
-```
-[config]
-git_provider="azure"
-use_repo_settings_file=false
-```
-
-And use the following settings (you have to replace the values) in .secrets.toml:
-```
-[azure_devops]
-org = "https://dev.azure.com/YOUR_ORGANIZATION/"
-pat = "YOUR_PAT_TOKEN"
-```

docker/Dockerfile

@@ -1,37 +1,20 @@
 FROM python:3.10 as base
 
 WORKDIR /app
-ADD pyproject.toml .
 ADD requirements.txt .
-RUN pip install . && rm pyproject.toml requirements.txt
+RUN pip install -r requirements.txt && rm requirements.txt
 ENV PYTHONPATH=/app
+ADD pr_agent pr_agent
 
 FROM base as github_app
-ADD pr_agent pr_agent
 CMD ["python", "pr_agent/servers/github_app.py"]
 
-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"]
 
-FROM base as gitlab_webhook
-ADD pr_agent pr_agent
-CMD ["python", "pr_agent/servers/gitlab_webhook.py"]
-
 FROM base as test
 ADD requirements-dev.txt .
 RUN pip install -r requirements-dev.txt && rm requirements-dev.txt
-ADD pr_agent pr_agent
-ADD tests tests
 
 FROM base as cli
-ADD pr_agent pr_agent
 ENTRYPOINT ["python", "pr_agent/cli.py"]

docker/Dockerfile.lambda

@@ -4,9 +4,9 @@ RUN yum update -y && \
     yum install -y gcc python3-devel && \
     yum clean all
 
-ADD pyproject.toml .
-RUN pip install . && rm pyproject.toml
-RUN pip install mangum==0.17.0
+ADD requirements.txt .
+RUN pip install -r requirements.txt && rm requirements.txt
+RUN pip install mangum==16.0.0
 COPY pr_agent/ ${LAMBDA_TASK_ROOT}/pr_agent/
 
 CMD ["pr_agent.servers.serverless.serverless"]

docs/ADD_DOCUMENTATION.md

@@ -1,15 +0,0 @@
-# Add Documentation Tool
-The `add_docs` tool scans the PR code changes, and automatically suggests documentation for the undocumented code components (functions, classes, etc.).
-
-It can be invoked manually by commenting on any PR:
-```
-/add_docs
-```
-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>
-
-### Configuration options
- - `docs_style`: The exact style of the documentation (for python docstring). you can choose between: `google`, `numpy`, `sphinx`, `restructuredtext`, `plain`. Default is `sphinx`.
- - `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".

docs/ASK.md

@@ -1,11 +0,0 @@
-# ASK Tool
-
-The `ask` tool answers questions about the PR, based on the PR code changes.
-It can be invoked manually by commenting on any PR:
-```
-/ask "..."
-```
-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>

docs/DESCRIBE.md

@@ -1,70 +0,0 @@
-# Describe Tool
-
-The `describe` tool scans the PR code changes, and automatically generates PR description - title, type, summary, 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=https://codium.ai/images/pr_agent/describe.png width="768"></kbd>
-
-The `describe` tool can also be triggered automatically every time a new PR is opened. See examples for automatic triggers for [GitHub App](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) and [GitHub Action](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
-
-### Configuration options
-
-Under the section 'pr_description', the [configuration file](./../pr_agent/settings/configuration.toml#L28) contains options to customize the 'describe' tool:
-
-- `publish_labels`: if set to true, the tool will publish the labels to the PR. Default is true.
-
-- `publish_description_as_comment`: if set to true, the tool will publish the description as a comment to the PR. If false, it will overwrite the origianl description. Default is false.
-
-- `add_original_user_description`: if set to true, the tool will add the original user description to the generated description. Default is false.
-
-- `keep_original_user_title`: if set to true, the tool will keep the original PR title, and won't change it. Default is false.
-
-- `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 enable to easily integrate user's content and auto-generated content, with a template-like mechanism.
-
-For example, if the PR original description was:
-```
-User content...
-
-
-## PR Description:
-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.
-
-##### 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,57 +0,0 @@
-# Improve Tool
-
-The `improve` tool scans the PR code changes, and automatically generates 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>
-
-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)
-
-An extended mode, which does not involve PR Compression and provides more comprehensive suggestions, can be invoked by commenting on any PR:
-```
-/improve --extended
-```
-Note that the extended mode divides the PR code changes into chunks, up to the token limits, where each chunk is handled separately (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.
-
-### Configuration options
-
-Under the section 'pr_code_suggestions', the [configuration file](./../pr_agent/settings/configuration.toml#L40) contains options to customize the 'improve' tool:
-
-- `num_code_suggestions`: number of code suggestions provided by the 'improve' tool. Default is 4.
-- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...".
-- `rank_suggestions`: if set to true, the tool will rank the suggestions, based on importance. Default is false.
-
-#### params for '/improve --extended' mode
-- `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.

docs/REVIEW.md

@@ -1,79 +0,0 @@
-# Review Tool
-
-The `review` tool scans the PR code changes, and automatically generates a PR review.
-It can be invoked manually by commenting on any PR:
-```
-/review
-```
-For example:
-
-<kbd><img src=https://codium.ai/images/pr_agent/review_comment.png width="768"></kbd>
-<kbd><img src=https://codium.ai/images/pr_agent/review.png width="768"></kbd>
-
-The `review` tool can also be triggered automatically every time a new PR is opened. See examples for automatic triggers for [GitHub App](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#github-app-automatic-tools) and [GitHub Action](https://github.com/Codium-ai/pr-agent/blob/main/Usage.md#working-with-github-action)
-
-### Configuration options
-
-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
-```
-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.
-
-#### PR Reflection
-By invoking:
-```
-/reflect_and_review
-```
-The tool will first ask the author questions about the PR, and will guide the review based on 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.

docs/SIMILAR_ISSUE.md

@@ -1,31 +0,0 @@
-# Similar Issue Tool
-The similar issue tool retrieves the most similar issues to the current issue.
-It can be invoked manually by commenting on any PR:
-```
-/similar_issue
-```
-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>
-
-Note that to perform retrieval, the `similar_issue` tool indexes all the repo previous issues (once).
-
-To enable usage of the '**similar issue**' tool, you need to set the following keys in `.secrets.toml` (or in the relevant environment variables):
-```
-[pinecone]
-api_key = "..."
-environment = "..."
-```
-These parameters can be obtained by registering to [Pinecone](https://app.pinecone.io/?sessionType=signup/).
-
-
-### How to use:
-- To invoke the 'similar issue' tool from **CLI**, run:
-`python3 cli.py --issue_url=... similar_issue`
-
-- To invoke the 'similar' issue tool via online usage, [comment](https://github.com/Codium-ai/pr-agent/issues/178#issuecomment-1716934893) on a PR:
-`/similar_issue`
-
-- You can also enable the 'similar issue' tool to run automatically when a new issue is opened, by adding it to the [pr_commands list in the github_app section](https://github.com/Codium-ai/pr-agent/blob/main/pr_agent/settings/configuration.toml#L66)

docs/TOOLS_GUIDE.md

@@ -1,11 +0,0 @@
-## Tools Guide
-- [DESCRIBE](./DESCRIBE.md)
-- [REVIEW](./REVIEW.md)
-- [IMPROVE](./IMPROVE.md)
-- [ASK](./ASK.md)
-- [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

@@ -1,19 +0,0 @@
-# Update Changelog Tool
-
-The `update_changelog` tool automatically updates the CHANGELOG.md file with the PR changes.
-It can be invoked manually by commenting on any PR:
-```
-/update_changelog
-```
-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>
-
-
-### Configuration options
-
-Under the section 'pr_update_changelog', the [configuration file](./../pr_agent/settings/configuration.toml#L50) contains options to customize the 'update changelog' tool:
-
-- `push_changelog_changes`: whether to push the changes to CHANGELOG.md, or just print them. Default is false (print only).
-- `extra_instructions`: Optional extra instructions to the tool. For example: "focus on the changes in the file X. Ignore change in ...

pr_agent/agent/pr_agent.py

@@ -1,74 +1,33 @@
-import shlex
+import re
 
-from pr_agent.algo.utils import update_settings_from_args
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.utils import apply_repo_settings
-from pr_agent.tools.pr_add_docs import PRAddDocs
+from pr_agent.config_loader import settings
 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
-from pr_agent.tools.pr_similar_issue import PRSimilarIssue
-from pr_agent.tools.pr_update_changelog import PRUpdateChangelog
 
-command2class = {
-    "auto_review": PRReviewer,
-    "answer": PRReviewer,
-    "review": PRReviewer,
-    "review_pr": PRReviewer,
-    "reflect": PRInformationFromUser,
-    "reflect_and_review": PRInformationFromUser,
-    "describe": PRDescription,
-    "describe_pr": PRDescription,
-    "improve": PRCodeSuggestions,
-    "improve_code": PRCodeSuggestions,
-    "ask": PRQuestions,
-    "ask_question": PRQuestions,
-    "update_changelog": PRUpdateChangelog,
-    "config": PRConfig,
-    "settings": PRConfig,
-    "similar_issue": PRSimilarIssue,
-    "add_docs": PRAddDocs,
-    "generate_labels": PRGenerateLabels,
-}
-
-commands = list(command2class.keys())
 
 class PRAgent:
     def __init__(self):
         pass
 
-    async def handle_request(self, pr_url, request, notify=None) -> bool:
-        # First, apply repo specific settings if exists
-        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
-        args = update_settings_from_args(args)
-
-        action = action.lstrip("/").lower()
-        if action == "reflect_and_review":
-            get_settings().pr_reviewer.ask_and_reflect = True
-        if action == "answer":
-            if notify:
-                notify()
-            await PRReviewer(pr_url, is_answer=True, args=args).run()
-        elif action == "auto_review":
-            await PRReviewer(pr_url, is_auto=True, args=args).run()
-        elif action in command2class:
-            if notify:
-                notify()
-            await command2class[action](pr_url, args=args).run()
+    async def handle_request(self, pr_url, request) -> bool:
+        action, *args = request.strip().split()
+        if any(cmd == action for cmd in ["/answer"]):
+            await PRReviewer(pr_url, is_answer=True).review()
+        elif any(cmd == action for cmd in ["/review", "/review_pr", "/reflect_and_review"]):
+            if settings.pr_reviewer.ask_and_reflect or "/reflect_and_review" in request:
+                await PRInformationFromUser(pr_url).generate_questions()
+            else:
+                await PRReviewer(pr_url, args=args).review()
+        elif any(cmd == action for cmd in ["/describe", "/describe_pr"]):
+            await PRDescription(pr_url).describe()
+        elif any(cmd == action for cmd in ["/improve", "/improve_code"]):
+            await PRCodeSuggestions(pr_url).suggest()
+        elif any(cmd == action for cmd in ["/ask", "/ask_question"]):
+            await PRQuestions(pr_url, args).answer()
         else:
             return False
-        return True
 
+        return True

pr_agent/algo/__init__.py

@@ -1,5 +1,4 @@
 MAX_TOKENS = {
-    'text-embedding-ada-002': 8000,
     'gpt-3.5-turbo': 4000,
     'gpt-3.5-turbo-0613': 4000,
     'gpt-3.5-turbo-0301': 4000,
@@ -8,17 +7,4 @@ 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,
 }

pr_agent/algo/ai_handler.py

@@ -1,16 +1,12 @@
-import os
+import logging
 
-import boto3
-import litellm
 import openai
-from litellm import acompletion
-from openai.error import APIError, RateLimitError, Timeout, TryAgain
+from openai.error import APIError, Timeout, TryAgain, RateLimitError
 from retry import retry
-from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger
 
-OPENAI_RETRIES = 5
+from pr_agent.config_loader import settings
 
+OPENAI_RETRIES=5
 
 class AiHandler:
     """
@@ -24,61 +20,23 @@ 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):
-            openai.api_key = get_settings().openai.key
-            litellm.openai_key = get_settings().openai.key
-        if get_settings().get("litellm.use_client"):
-            litellm_token = get_settings().get("litellm.LITELLM_TOKEN")
-            assert litellm_token, "LITELLM_TOKEN is required"
-            os.environ["LITELLM_TOKEN"] = litellm_token
-            litellm.use_client = True
-        if get_settings().get("OPENAI.ORG", None):
-            litellm.organization = get_settings().openai.org
-        if get_settings().get("OPENAI.API_TYPE", None):
-            if get_settings().openai.api_type == "azure":
-                self.azure = True
-                litellm.azure_key = get_settings().openai.key
-        if get_settings().get("OPENAI.API_VERSION", None):
-            litellm.api_version = get_settings().openai.api_version
-        if get_settings().get("OPENAI.API_BASE", None):
-            litellm.api_base = get_settings().openai.api_base
-        if get_settings().get("ANTHROPIC.KEY", None):
-            litellm.anthropic_key = get_settings().anthropic.key
-        if get_settings().get("COHERE.KEY", None):
-            litellm.cohere_key = get_settings().cohere.key
-        if get_settings().get("REPLICATE.KEY", None):
-            litellm.replicate_key = get_settings().replicate.key
-        if get_settings().get("REPLICATE.KEY", None):
-            litellm.replicate_key = get_settings().replicate.key
-        if get_settings().get("HUGGINGFACE.KEY", None):
-            litellm.huggingface_key = get_settings().huggingface.key
-            if get_settings().get("HUGGINGFACE.API_BASE", None):
-                litellm.api_base = get_settings().huggingface.api_base
-        if get_settings().get("VERTEXAI.VERTEX_PROJECT", None):
-            litellm.vertex_project = get_settings().vertexai.vertex_project
-            litellm.vertex_location = get_settings().get(
-                "VERTEXAI.VERTEX_LOCATION", None
-            )
-        if get_settings().get("AWS.BEDROCK_REGION", None):
-            litellm.AmazonAnthropicConfig.max_tokens_to_sample = 2000
-            self.aws_bedrock_client = boto3.client(
-                service_name="bedrock-runtime",
-                region_name=get_settings().aws.bedrock_region,
-            )
-
-    @property
-    def deployment_id(self):
-        """
-        Returns the deployment ID for the OpenAI API.
-        """
-        return get_settings().get("OPENAI.DEPLOYMENT_ID", None)
+        try:
+            openai.api_key = settings.openai.key
+            if settings.get("OPENAI.ORG", None):
+                openai.organization = settings.openai.org
+            self.deployment_id = settings.get("OPENAI.DEPLOYMENT_ID", None)
+            if settings.get("OPENAI.API_TYPE", None):
+                openai.api_type = settings.openai.api_type
+            if settings.get("OPENAI.API_VERSION", None):
+                openai.api_version = settings.openai.api_version
+            if settings.get("OPENAI.API_BASE", None):
+                openai.api_base = settings.openai.api_base
+        except AttributeError as e:
+            raise ValueError("OpenAI key is required") from e
 
     @retry(exceptions=(APIError, Timeout, TryAgain, AttributeError, RateLimitError),
            tries=OPENAI_RETRIES, delay=2, backoff=2, jitter=(1, 3))
-    async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2):
+    async def chat_completion(self, model: str, temperature: float, system: str, user: str):
         """
         Performs a chat completion using the OpenAI ChatCompletion API.
         Retries in case of API errors or timeouts.
@@ -99,39 +57,26 @@ class AiHandler:
             TryAgain: If there is an attribute error during OpenAI inference.
         """
         try:
-            deployment_id = self.deployment_id
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().debug(
-                    f"Generating completion with {model}"
-                    f"{(' from deployment ' + deployment_id) if deployment_id else ''}"
-                )
-            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 openai.ChatCompletion.acreate(
+                            model=model,
+                            deployment_id=self.deployment_id,
+                            messages=[
+                                {"role": "system", "content": system},
+                                {"role": "user", "content": user}
+                            ],
+                            temperature=temperature,
+                        )
         except (APIError, Timeout, TryAgain) as e:
-            get_logger().error("Error during OpenAI inference: ", e)
+            logging.error("Error during OpenAI inference: ", e)
             raise
         except (RateLimitError) as e:
-            get_logger().error("Rate limit error during OpenAI inference: ", e)
+            logging.error("Rate limit error during OpenAI inference: ", e)
             raise
         except (Exception) as e:
-            get_logger().error("Unknown error during OpenAI inference: ", e)
+            logging.error("Unknown error during OpenAI inference: ", e)
             raise TryAgain from e
-        if response is None or len(response["choices"]) == 0:
+        if response is None or len(response.choices) == 0:
             raise TryAgain
-        resp = response["choices"][0]['message']['content']
-        finish_reason = response["choices"][0]["finish_reason"]
-        usage = response.get("usage")
-        get_logger().info("AI response", response=resp, messages=messages, finish_reason=finish_reason,
-                          model=model, usage=usage)
-        return resp, finish_reason
+        resp = response.choices[0]['message']['content']
+        finish_reason = response.choices[0].finish_reason
+        return resp, finish_reason

pr_agent/algo/file_filter.py

@@ -1,36 +0,0 @@
-import fnmatch
-import re
-
-from pr_agent.config_loader import get_settings
-
-def filter_ignored(files):
-    """
-    Filter out files that match the ignore patterns.
-    """
-
-    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]
-
-        # compile all valid patterns
-        compiled_patterns = []
-        for r in patterns:
-            try:
-                compiled_patterns.append(re.compile(r))
-            except re.error:
-                pass
-
-        # 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))]
-
-    except Exception as e:
-        print(f"Could not filter file list: {e}")
-
-    return files

pr_agent/algo/git_patch_processing.py

@@ -1,10 +1,9 @@
 from __future__ import annotations
 
+import logging
 import re
 
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.git_provider import EDIT_TYPE
-from pr_agent.log import get_logger
+from pr_agent.config_loader import settings
 
 
 def extend_patch(original_file_str, patch_str, num_lines) -> str:
@@ -42,16 +41,8 @@ def extend_patch(original_file_str, patch_str, num_lines) -> str:
                         extended_patch_lines.extend(
                             original_lines[start1 + size1 - 1:start1 + size1 - 1 + num_lines])
 
-                    res = list(match.groups())
-                    for i in range(len(res)):
-                        if res[i] is None:
-                            res[i] = 0
-                    try:
-                        start1, size1, start2, size2 = map(int, res[:4])
-                    except:  # '@@ -0,0 +1 @@' case
-                        start1, size1, size2 = map(int, res[:3])
-                        start2 = 0
-                    section_header = res[4]
+                    start1, size1, start2, size2 = map(int, match.groups()[:4])
+                    section_header = match.groups()[4]
                     extended_start1 = max(1, start1 - num_lines)
                     extended_size1 = size1 + (start1 - extended_start1) + num_lines
                     extended_start2 = max(1, start2 - num_lines)
@@ -64,8 +55,8 @@ def extend_patch(original_file_str, patch_str, num_lines) -> str:
                     continue
             extended_patch_lines.append(line)
     except Exception as e:
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().error(f"Failed to extend patch: {e}")
+        if settings.config.verbosity_level >= 2:
+            logging.error(f"Failed to extend patch: {e}")
         return patch_str
 
     # finish previous hunk
@@ -116,7 +107,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,25 +124,24 @@ 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")
+        if settings.config.verbosity_level > 0:
+            logging.info(f"Processing file: {file_name}, minimizing deletion file")
         patch = None # file was deleted
     else:
         patch_lines = patch.splitlines()
         patch_new = omit_deletion_hunks(patch_lines)
         if patch != patch_new:
-            if get_settings().config.verbosity_level > 0:
-                get_logger().info(f"Processing file: {file_name}, hunks were deleted")
+            if settings.config.verbosity_level > 0:
+                logging.info(f"Processing file: {file_name}, hunks were deleted")
             patch = patch_new
     return patch
 
 
 def convert_to_hunks_with_lines_numbers(patch: str, file) -> str:
     """
-    Convert a given patch string into a string with line numbers for each hunk, indicating the new and old content of
-    the file.
+    Convert a given patch string into a string with line numbers for each hunk, indicating the new and old content of the file.
 
     Args:
         patch (str): The patch string to be converted.
@@ -162,7 +152,7 @@ def convert_to_hunks_with_lines_numbers(patch: str, file) -> str:
 
     example output:
 ## src/file.ts
-__new hunk__
+--new hunk--
 881        line1
 882        line2
 883        line3
@@ -171,7 +161,7 @@ __new hunk__
 889        line6
 890        line7
 ...
-__old hunk__
+--old hunk--
         line1
         line2
 -       line3
@@ -181,7 +171,8 @@ __old hunk__
            ...
     """
     
-    patch_with_lines_str = f"\n\n## {file.filename}\n"
+    patch_with_lines_str = f"## {file.filename}\n"
+    import re
     patch_lines = patch.splitlines()
     RE_HUNK_HEADER = re.compile(
         r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
@@ -189,41 +180,24 @@ __old hunk__
     old_content_lines = []
     match = None
     start1, size1, start2, size2 = -1, -1, -1, -1
-    prev_header_line = []
-    header_line =[]
     for line in patch_lines:
         if 'no newline at end of file' in line.lower():
             continue
 
         if line.startswith('@@'):
-            header_line = line
             match = RE_HUNK_HEADER.match(line)
             if match and new_content_lines:  # found a new hunk, split the previous lines
                 if new_content_lines:
-                    if prev_header_line:
-                        patch_with_lines_str += f'\n{prev_header_line}\n'
-                    patch_with_lines_str += '__new hunk__\n'
+                    patch_with_lines_str += '\n--new hunk--\n'
                     for i, line_new in enumerate(new_content_lines):
                         patch_with_lines_str += f"{start2 + i} {line_new}\n"
                 if old_content_lines:
-                    patch_with_lines_str += '__old hunk__\n'
+                    patch_with_lines_str += '--old hunk--\n'
                     for line_old in old_content_lines:
                         patch_with_lines_str += f"{line_old}\n"
                 new_content_lines = []
                 old_content_lines = []
-            if match:
-                prev_header_line = header_line
-
-            res = list(match.groups())
-            for i in range(len(res)):
-                if res[i] is None:
-                    res[i] = 0
-            try:
-                start1, size1, start2, size2 = map(int, res[:4])
-            except: # '@@ -0,0 +1 @@' case
-                start1, size1, size2 = map(int, res[:3])
-                start2 = 0
-
+            start1, size1, start2, size2 = map(int, match.groups()[:4])
         elif line.startswith('+'):
             new_content_lines.append(line)
         elif line.startswith('-'):
@@ -235,13 +209,12 @@ __old hunk__
     # finishing last hunk
     if match and new_content_lines:
         if new_content_lines:
-            patch_with_lines_str += f'\n{header_line}\n'
-            patch_with_lines_str += '\n__new hunk__\n'
+            patch_with_lines_str += '\n--new hunk--\n'
             for i, line_new in enumerate(new_content_lines):
                 patch_with_lines_str += f"{start2 + i} {line_new}\n"
         if old_content_lines:
-            patch_with_lines_str += '\n__old hunk__\n'
+            patch_with_lines_str += '\n--old hunk--\n'
             for line_old in old_content_lines:
                 patch_with_lines_str += f"{line_old}\n"
 
-    return patch_with_lines_str.rstrip()
+    return patch_with_lines_str.strip()

pr_agent/algo/language_handler.py

@@ -1,18 +1,19 @@
 # Language Selection, source: https://github.com/bigcode-project/bigcode-dataset/blob/main/language_selection/programming-languages-to-file-extensions.json  # noqa E501
 from typing import Dict
 
-from pr_agent.config_loader import get_settings
-
+from pr_agent.config_loader import settings
 
+language_extension_map_org = 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
-if get_settings().config.use_extra_bad_extensions:
-    bad_extensions += get_settings().bad_extensions.extra
+bad_extensions = settings.bad_extensions.default
+if settings.config.use_extra_bad_extensions:
+    bad_extensions += settings.bad_extensions.extra
 
 
 def filter_bad_extensions(files):
-    return [f for f in files if f.filename is not None and is_valid_file(f.filename)]
+    return [f for f in files if is_valid_file(f.filename)]
 
 
 def is_valid_file(filename):
@@ -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()])
@@ -43,11 +42,6 @@ def sort_files_by_main_languages(languages: Dict, files: list):
     files_sorted = []
     rest_files = {}
 
-    # if no languages detected, put all files in the "Other" category
-    if not languages:
-        files_sorted = [({"language": "Other", "files": list(files_filtered)})]
-        return files_sorted
-
     main_extensions_flat = []
     for ext in main_extensions:
         main_extensions_flat.extend(ext)

pr_agent/algo/pr_processing.py

@@ -1,29 +1,24 @@
 from __future__ import annotations
 
-import difflib
-import re
-import traceback
-from typing import Any, Callable, List, Tuple
-
-from github import RateLimitExceededException
+import logging
+from typing import Tuple, Union, Callable, List
 
+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.config_loader import get_settings
-from pr_agent.git_providers.git_provider import FilePatchInfo, GitProvider, EDIT_TYPE
-from pr_agent.log import get_logger
+from pr_agent.algo.utils import load_large_diff
+from pr_agent.config_loader import settings
+from pr_agent.git_providers.git_provider import GitProvider
 
 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
+PATCH_EXTRA_LINES = 3
+
 
 def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: str,
                 add_line_numbers_to_hunks: bool = False, disable_extra_lines: bool = False) -> str:
@@ -31,52 +26,38 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: s
     Returns a string with the diff of the pull request, applying diff minimization techniques if needed.
 
     Args:
-        git_provider (GitProvider): An object of the GitProvider class representing the Git provider used for the pull
-        request.
-        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the
-        pull request.
+        git_provider (GitProvider): An object of the GitProvider class representing the Git provider used for the pull request.
+        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the pull request.
         model (str): The name of the model used for tokenization.
-        add_line_numbers_to_hunks (bool, optional): A boolean indicating whether to add line numbers to the hunks in the
-        diff. Defaults to False.
-        disable_extra_lines (bool, optional): A boolean indicating whether to disable the extension of each patch with
-        extra lines of context. Defaults to False.
+        add_line_numbers_to_hunks (bool, optional): A boolean indicating whether to add line numbers to the hunks in the diff. Defaults to False.
+        disable_extra_lines (bool, optional): A boolean indicating whether to disable the extension of each patch with extra lines of context. Defaults to False.
 
     Returns:
         str: A string with the diff of the pull request, applying diff minimization techniques if needed.
     """
 
     if disable_extra_lines:
+        global PATCH_EXTRA_LINES
         PATCH_EXTRA_LINES = 0
-    else:
-        PATCH_EXTRA_LINES = get_settings().config.patch_extra_lines
 
-    try:
-        diff_files = git_provider.get_diff_files()
-    except RateLimitExceededException as e:
-        get_logger().error(f"Rate limit exceeded for git provider API. original message {e}")
-        raise
-
-    diff_files = filter_ignored(diff_files)
+    diff_files = list(git_provider.get_diff_files())
 
     # get pr languages
     pr_languages = sort_files_by_main_languages(git_provider.get_languages(), diff_files)
 
     # generate a standard diff string, with patch extension
-    patches_extended, total_tokens, patches_extended_tokens = pr_generate_extended_diff(
-        pr_languages, token_handler, add_line_numbers_to_hunks, patch_extra_lines=PATCH_EXTRA_LINES)
+    patches_extended, total_tokens = pr_generate_extended_diff(pr_languages, token_handler,
+                                                               add_line_numbers_to_hunks)
 
     # 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 = \
-        pr_generate_compressed_diff(pr_languages, token_handler, model, add_line_numbers_to_hunks)
+    patches_compressed, modified_file_names, deleted_file_names = \
+        pr_generate_compressed_diff(pr_languages, token_handler, 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
@@ -86,33 +67,38 @@ def get_pr_diff(git_provider: GitProvider, token_handler: TokenHandler, model: s
     return final_diff
 
 
-def pr_generate_extended_diff(pr_languages: list,
-                              token_handler: TokenHandler,
-                              add_line_numbers_to_hunks: bool,
-                              patch_extra_lines: int = 0) -> Tuple[list, int, list]:
+def pr_generate_extended_diff(pr_languages: list, token_handler: TokenHandler,
+                              add_line_numbers_to_hunks: bool) -> \
+        Tuple[list, int]:
     """
-    Generate a standard diff string with patch extension, while counting the number of tokens used and applying diff
-    minimization techniques if needed.
+    Generate a standard diff string with patch extension, while counting the number of tokens used and applying diff minimization techniques if needed.
 
     Args:
-    - pr_languages: A list of dictionaries representing the languages used in the pull request and their corresponding
-      files.
+    - pr_languages: A list of dictionaries representing the languages used in the pull request and their corresponding files.
     - token_handler: An object of the TokenHandler class used for handling tokens in the context of the pull request.
     - add_line_numbers_to_hunks: A boolean indicating whether to add line numbers to the hunks in the diff.
+
+    Returns:
+    - patches_extended: A list of extended patches for each file in the pull request.
+    - total_tokens: The total number of tokens used in the extended patches.
     """
     total_tokens = token_handler.prompt_tokens  # initial tokens
     patches_extended = []
-    patches_extended_tokens = []
     for lang in pr_languages:
         for file in lang['files']:
             original_file_content_str = file.base_file
+            new_file_content_str = file.head_file
             patch = file.patch
+
+            # handle the case of large patch, that initially was not loaded
+            patch = load_large_diff(file, new_file_content_str, original_file_content_str, patch)
+
             if not patch:
                 continue
 
             # extend each patch with extra lines of context
-            extended_patch = extend_patch(original_file_content_str, patch, num_lines=patch_extra_lines)
-            full_extended_patch = f"\n\n## {file.filename}\n\n{extended_patch}\n"
+            extended_patch = extend_patch(original_file_content_str, patch, num_lines=PATCH_EXTRA_LINES)
+            full_extended_patch = f"## {file.filename}\n\n{extended_patch}\n"
 
             if add_line_numbers_to_hunks:
                 full_extended_patch = convert_to_hunks_with_lines_numbers(extended_patch, file)
@@ -120,22 +106,18 @@ def pr_generate_extended_diff(pr_languages: list,
             patch_tokens = token_handler.count_tokens(full_extended_patch)
             file.tokens = patch_tokens
             total_tokens += patch_tokens
-            patches_extended_tokens.append(patch_tokens)
             patches_extended.append(full_extended_patch)
 
-    return patches_extended, total_tokens, patches_extended_tokens
+    return patches_extended, total_tokens
 
 
 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.
+    Generate a compressed diff string for a pull request, using diff minimization techniques to reduce the number of tokens used.
     Args:
-        top_langs (list): A list of dictionaries representing the languages used in the pull request and their
-        corresponding files.
-        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the
-        pull request.
+        top_langs (list): A list of dictionaries representing the languages used in the pull request and their corresponding files.
+        token_handler (TokenHandler): An object of the TokenHandler class used for handling tokens in the context of the pull request.
         model (str): The model used for tokenization.
         convert_hunks_to_line_numbers (bool): A boolean indicating whether to convert hunks to line numbers in the diff.
     Returns:
@@ -153,7 +135,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
@@ -166,12 +147,13 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
         original_file_content_str = file.base_file
         new_file_content_str = file.head_file
         patch = file.patch
+        patch = load_large_diff(file, new_file_content_str, original_file_content_str, patch)
         if not patch:
             continue
 
         # 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 +167,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:
-            get_logger().warning(f"File was fully skipped, no more tokens: {file.filename}.")
+        if total_tokens > MAX_TOKENS[model] - OUTPUT_BUFFER_TOKENS_HARD_THRESHOLD:
+            logging.warning(f"File was fully skipped, no more tokens: {file.filename}.")
             continue
 
         # If the patch is too large, just show the file name
-        if total_tokens + new_patch_tokens > get_max_tokens(model) - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
+        if total_tokens + new_patch_tokens > MAX_TOKENS[model] - OUTPUT_BUFFER_TOKENS_SOFT_THRESHOLD:
             # Current logic is to skip the patch if it's too large
             # TODO: Option for alternative logic to remove hunks from the patch to reduce the number of tokens
             #  until we meet the requirements
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().warning(f"Patch too large, minimizing it, {file.filename}")
-            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 settings.config.verbosity_level >= 2:
+                logging.warning(f"Patch too large, minimizing it, {file.filename}")
+            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:
@@ -214,195 +191,22 @@ def pr_generate_compressed_diff(top_langs: list, token_handler: TokenHandler, mo
                 patch_final = patch
             patches.append(patch_final)
             total_tokens += token_handler.count_tokens(patch_final)
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Tokens: {total_tokens}, last filename: {file.filename}")
+            if settings.config.verbosity_level >= 2:
+                logging.info(f"Tokens: {total_tokens}, last filename: {file.filename}")
 
-    return patches, modified_files_list, deleted_files_list, added_files_list
+    return patches, modified_files_list, deleted_files_list
 
 
 async def retry_with_fallback_models(f: Callable):
-    all_models = _get_all_models()
-    all_deployments = _get_all_deployments(all_models)
-    # try each (model, deployment_id) pair until one is successful, otherwise raise exception
-    for i, (model, deployment_id) in enumerate(zip(all_models, all_deployments)):
+    model = settings.config.model
+    fallback_models = settings.config.fallback_models
+    if not isinstance(fallback_models, list):
+        fallback_models = [fallback_models]
+    all_models = [model] + fallback_models
+    for i, model in enumerate(all_models):
         try:
-            get_settings().set("openai.deployment_id", deployment_id)
             return await f(model)
         except Exception as e:
-            get_logger().warning(
-                f"Failed to generate prediction with {model}"
-                f"{(' from deployment ' + deployment_id) if deployment_id else ''}: "
-                f"{traceback.format_exc()}"
-            )
+            logging.warning(f"Failed to generate prediction with {model}: {e}")
             if i == len(all_models) - 1:  # If it's the last iteration
                 raise  # Re-raise the last exception
-
-
-def _get_all_models() -> List[str]:
-    model = get_settings().config.model
-    fallback_models = get_settings().config.fallback_models
-    if not isinstance(fallback_models, list):
-        fallback_models = [m.strip() for m in fallback_models.split(",")]
-    all_models = [model] + fallback_models
-    return all_models
-
-
-def _get_all_deployments(all_models: List[str]) -> List[str]:
-    deployment_id = get_settings().get("openai.deployment_id", None)
-    fallback_deployments = get_settings().get("openai.fallback_deployments", [])
-    if not isinstance(fallback_deployments, list) and fallback_deployments:
-        fallback_deployments = [d.strip() for d in fallback_deployments.split(",")]
-    if fallback_deployments:
-        all_deployments = [deployment_id] + fallback_deployments
-        if len(all_deployments) < len(all_models):
-            raise ValueError(f"The number of deployments ({len(all_deployments)}) "
-                             f"is less than the number of models ({len(all_models)})")
-    else:
-        all_deployments = [deployment_id] * len(all_models)
-    return all_deployments
-
-
-def find_line_number_of_relevant_line_in_file(diff_files: List[FilePatchInfo],
-                                              relevant_file: str,
-                                              relevant_line_in_file: str) -> Tuple[int, int]:
-    """
-    Find the line number and absolute position of a relevant line in a file.
-
-    Args:
-        diff_files (List[FilePatchInfo]): A list of FilePatchInfo objects representing the patches of files.
-        relevant_file (str): The name of the file where the relevant line is located.
-        relevant_line_in_file (str): The content of the relevant line.
-
-    Returns:
-        Tuple[int, int]: A tuple containing the line number and absolute position of the relevant line in the file.
-    """
-    position = -1
-    absolute_position = -1
-    re_hunk_header = re.compile(
-        r"^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@[ ]?(.*)")
-
-    for file in diff_files:
-        if file.filename and (file.filename.strip() == relevant_file):
-            patch = file.patch
-            patch_lines = patch.splitlines()
-
-            # try to find the line in the patch using difflib, with some margin of error
-            matches_difflib: list[str | Any] = difflib.get_close_matches(relevant_line_in_file,
-                                                                         patch_lines, n=3, cutoff=0.93)
-            if len(matches_difflib) == 1 and matches_difflib[0].startswith('+'):
-                relevant_line_in_file = matches_difflib[0]
-
-            delta = 0
-            start1, size1, start2, size2 = 0, 0, 0, 0
-            for i, line in enumerate(patch_lines):
-                if line.startswith('@@'):
-                    delta = 0
-                    match = re_hunk_header.match(line)
-                    start1, size1, start2, size2 = map(int, match.groups()[:4])
-                elif not line.startswith('-'):
-                    delta += 1
-
-                if relevant_line_in_file in line and line[0] != '-':
-                    position = i
-                    absolute_position = start2 + delta - 1
-                    break
-
-            if position == -1 and relevant_line_in_file[0] == '+':
-                no_plus_line = relevant_line_in_file[1:].lstrip()
-                for i, line in enumerate(patch_lines):
-                    if line.startswith('@@'):
-                        delta = 0
-                        match = re_hunk_header.match(line)
-                        start1, size1, start2, size2 = map(int, match.groups()[:4])
-                    elif not line.startswith('-'):
-                        delta += 1
-
-                    if no_plus_line in line and line[0] != '-':
-                        # The model might add a '+' to the beginning of the relevant_line_in_file even if originally
-                        # it's a context line
-                        position = i
-                        absolute_position = start2 + delta - 1
-                        break
-    return position, absolute_position
-
-
-def get_pr_multi_diffs(git_provider: GitProvider,
-                       token_handler: TokenHandler,
-                       model: str,
-                       max_calls: int = 5) -> List[str]:
-    """
-    Retrieves the diff files from a Git provider, sorts them by main language, and generates patches for each file.
-    The patches are split into multiple groups based on the maximum number of tokens allowed for the given model.
-
-    Args:
-        git_provider (GitProvider): An object that provides access to Git provider APIs.
-        token_handler (TokenHandler): An object that handles tokens in the context of a pull request.
-        model (str): The name of the model.
-        max_calls (int, optional): The maximum number of calls to retrieve diff files. Defaults to 5.
-
-    Returns:
-        List[str]: A list of final diff strings, split into multiple groups based on the maximum number of tokens allowed for the given model.
-
-    Raises:
-        RateLimitExceededException: If the rate limit for the Git provider API is exceeded.
-    """
-    try:
-        diff_files = git_provider.get_diff_files()
-    except RateLimitExceededException as e:
-        get_logger().error(f"Rate limit exceeded for git provider API. original message {e}")
-        raise
-
-    diff_files = filter_ignored(diff_files)
-
-    # Sort files by main language
-    pr_languages = sort_files_by_main_languages(git_provider.get_languages(), diff_files)
-
-    # Sort files within each language group by tokens in descending order
-    sorted_files = []
-    for lang in pr_languages:
-        sorted_files.extend(sorted(lang['files'], key=lambda x: x.tokens, reverse=True))
-
-    patches = []
-    final_diff_list = []
-    total_tokens = token_handler.prompt_tokens
-    call_number = 1
-    for file in sorted_files:
-        if call_number > max_calls:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Reached max calls ({max_calls})")
-            break
-
-        original_file_content_str = file.base_file
-        new_file_content_str = file.head_file
-        patch = file.patch
-        if not patch:
-            continue
-
-        # Remove delete-only hunks
-        patch = handle_patch_deletions(patch, original_file_content_str, new_file_content_str, file.filename, file.edit_type)
-        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):
-            final_diff = "\n".join(patches)
-            final_diff_list.append(final_diff)
-            patches = []
-            total_tokens = token_handler.prompt_tokens
-            call_number += 1
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Call number: {call_number}")
-
-        if patch:
-            patches.append(patch)
-            total_tokens += new_patch_tokens
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Tokens: {total_tokens}, last filename: {file.filename}")
-
-    # Add the last chunk
-    if patches:
-        final_diff = "\n".join(patches)
-        final_diff_list.append(final_diff)
-
-    return final_diff_list

pr_agent/algo/token_handler.py

@@ -1,27 +1,21 @@
 from jinja2 import Environment, StrictUndefined
-from tiktoken import encoding_for_model, get_encoding
+from tiktoken import encoding_for_model
 
-from pr_agent.config_loader import get_settings
+from pr_agent.algo import MAX_TOKENS
+from pr_agent.config_loader import settings
 
 
-def get_token_encoder():
-    return encoding_for_model(get_settings().config.model) if "gpt" in get_settings().config.model else get_encoding(
-        "cl100k_base")
-
 class TokenHandler:
     """
     A class for handling tokens in the context of a pull request.
 
     Attributes:
-    - encoder: An object of the encoding_for_model class from the tiktoken module. Used to encode strings and count the
-      number of tokens in them.
-    - limit: The maximum number of tokens allowed for the given model, as defined in the MAX_TOKENS dictionary in the
-      pr_agent.algo module.
-    - prompt_tokens: The number of tokens in the system and user strings, as calculated by the _get_system_user_tokens
-      method.
+    - encoder: An object of the encoding_for_model class from the tiktoken module. Used to encode strings and count the number of tokens in them.
+    - limit: The maximum number of tokens allowed for the given model, as defined in the MAX_TOKENS dictionary in the pr_agent.algo module.
+    - prompt_tokens: The number of tokens in the system and user strings, as calculated by the _get_system_user_tokens method.
     """
 
-    def __init__(self, pr=None, vars: dict = {}, system="", user=""):
+    def __init__(self, pr, vars: dict, system, user):
         """
         Initializes the TokenHandler object.
 
@@ -31,9 +25,8 @@ class TokenHandler:
         - system: The system string.
         - user: The user string.
         """
-        self.encoder = get_token_encoder()
-        if pr is not None:
-            self.prompt_tokens = self._get_system_user_tokens(pr, self.encoder, vars, system, user)
+        self.encoder = encoding_for_model(settings.config.model)
+        self.prompt_tokens = self._get_system_user_tokens(pr, self.encoder, vars, system, user)
 
     def _get_system_user_tokens(self, pr, encoder, vars: dict, system, user):
         """
@@ -52,6 +45,7 @@ class TokenHandler:
         environment = Environment(undefined=StrictUndefined)
         system_prompt = environment.from_string(system).render(vars)
         user_prompt = environment.from_string(user).render(vars)
+
         system_prompt_tokens = len(encoder.encode(system_prompt))
         user_prompt_tokens = len(encoder.encode(user_prompt))
         return system_prompt_tokens + user_prompt_tokens

pr_agent/algo/utils.py

@@ -1,29 +1,16 @@
 from __future__ import annotations
 
 import difflib
+from datetime import datetime
 import json
+import logging
 import re
 import textwrap
-from datetime import datetime
-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
+from pr_agent.config_loader import settings
 
 
-def get_setting(key: str) -> Any:
-    try:
-        key = key.upper()
-        return context.get("settings", global_settings).get(key, global_settings.get(key, None))
-    except Exception:
-        return global_settings.get(key, None)
-
-def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
+def convert_to_markdown(output_data: dict) -> str:
     """
     Convert a dictionary of data into markdown format.
     Args:
@@ -35,52 +22,40 @@ def convert_to_markdown(output_data: dict, gfm_supported: bool=True) -> str:
 
     emojis = {
         "Main theme": "🎯",
-        "PR summary": "📝",
         "Type of PR": "📌",
         "Score": "🏅",
         "Relevant tests added": "🧪",
         "Unrelated changes": "⚠️",
         "Focused PR": "✨",
         "Security concerns": "🔒",
-        "General suggestions": "💡",
+        "General PR suggestions": "💡",
         "Insights from user's answers": "📝",
-        "Code feedback": "🤖",
-        "Estimated effort to review [1-5]": "⏱️",
+        "Code suggestions": "🤖",
     }
 
     for key, value in output_data.items():
-        if value is None or value == '' or value == {}:
+        if not value:
             continue
         if isinstance(value, dict):
             markdown_text += f"## {key}\n\n"
-            markdown_text += convert_to_markdown(value, gfm_supported)
+            markdown_text += convert_to_markdown(value)
         elif isinstance(value, list):
+            if key.lower() == 'code suggestions':
+                markdown_text += "\n"  # just looks nicer with additional line breaks
             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>"
-                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):
-                if isinstance(item, dict) and key.lower() == 'code feedback':
-                    markdown_text += parse_code_suggestion(item, i, gfm_supported)
+            markdown_text += f"- {emoji} **{key}:**\n\n"
+            for item in value:
+                if isinstance(item, dict) and key.lower() == 'code suggestions':
+                    markdown_text += parse_code_suggestion(item)
                 elif item:
                     markdown_text += f"  - {item}\n"
-            if key.lower() == 'code feedback':
-                if gfm_supported:
-                    markdown_text += "</details>\n\n"
-                else:
-                    markdown_text += "\n\n"
         elif value != 'n/a':
             emoji = emojis.get(key, "")
             markdown_text += f"- {emoji} **{key}:** {value}\n"
     return markdown_text
 
 
-def parse_code_suggestion(code_suggestions: dict, i: int = 0, gfm_supported: bool = True) -> str:
+def parse_code_suggestion(code_suggestions: dict) -> str:
     """
     Convert a dictionary of data into markdown format.
 
@@ -91,52 +66,20 @@ 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"
 
-        markdown_text += "\n"
+    markdown_text += "\n"
     return markdown_text
 
 
@@ -147,22 +90,18 @@ def try_fix_json(review, max_iter=10, code_suggestions=False):
     Args:
     - review: A string containing the JSON message to be fixed.
     - max_iter: An integer representing the maximum number of iterations to try and fix the JSON message.
-    - code_suggestions: A boolean indicating whether to try and fix JSON messages with code feedback.
+    - code_suggestions: A boolean indicating whether to try and fix JSON messages with code suggestions.
 
     Returns:
     - data: A dictionary containing the parsed JSON data.
 
     The function attempts to fix broken or incomplete JSON messages by parsing until the last valid code suggestion.
-    If the JSON message ends with a closing bracket, the function calls the fix_json_escape_char function to fix the
-    message.
-    If code_suggestions is True and the JSON message contains code feedback, the function tries to fix the JSON
-    message by parsing until the last valid code suggestion.
-    The function uses regular expressions to find the last occurrence of "}," with any number of whitespaces or
-    newlines.
+    If the JSON message ends with a closing bracket, the function calls the fix_json_escape_char function to fix the message.
+    If code_suggestions is True and the JSON message contains code suggestions, the function tries to fix the JSON message by parsing until the last valid code suggestion.
+    The function uses regular expressions to find the last occurrence of "}," with any number of whitespaces or newlines.
     It tries to parse the JSON message with the closing bracket and checks if it is valid.
     If the JSON message is valid, the parsed JSON data is returned.
-    If the JSON message is not valid, the last code suggestion is removed and the process is repeated until a valid JSON
-    message is obtained or the maximum number of iterations is reached.
+    If the JSON message is not valid, the last code suggestion is removed and the process is repeated until a valid JSON message is obtained or the maximum number of iterations is reached.
     If a valid JSON message is not obtained, an error is logged and an empty dictionary is returned.
     """
 
@@ -175,8 +114,7 @@ def try_fix_json(review, max_iter=10, code_suggestions=False):
     else:
         closing_bracket = "]}}"
 
-    if (review.rfind("'Code feedback': [") > 0 or review.rfind('"Code feedback": [') > 0) or \
-            (review.rfind("'Code suggestions': [") > 0 or review.rfind('"Code suggestions": [') > 0) :
+    if review.rfind("'Code suggestions': [") > 0 or review.rfind('"Code suggestions": [') > 0:
         last_code_suggestion_ind = [m.end() for m in re.finditer(r"\}\s*,", review)][-1] - 1
         valid_json = False
         iter_count = 0
@@ -192,7 +130,7 @@ def try_fix_json(review, max_iter=10, code_suggestions=False):
                 iter_count += 1
 
         if not valid_json:
-            get_logger().error("Unable to decode JSON response from AI")
+            logging.error("Unable to decode JSON response from AI")
             data = {}
 
     return data
@@ -211,7 +149,7 @@ def fix_json_escape_char(json_message=None):
     Raises:
         None
 
-    """
+    """    
     try:
         result = json.loads(json_message)
     except Exception as e:
@@ -238,213 +176,38 @@ def convert_str_to_datetime(date_str):
     Example:
         >>> convert_str_to_datetime('Mon, 01 Jan 2022 12:00:00 UTC')
         datetime.datetime(2022, 1, 1, 12, 0, 0)
-    """
+    """    
     datetime_format = '%a, %d %b %Y %H:%M:%S %Z'
     return datetime.strptime(date_str, datetime_format)
 
 
-def load_large_diff(filename, new_file_content_str: str, original_file_content_str: str) -> str:
+def load_large_diff(file, new_file_content_str: str, original_file_content_str: str, patch: str) -> str:
     """
-    Generate a patch for a modified file by comparing the original content of the file with the new content provided as
-    input.
+    Generate a patch for a modified file by comparing the original content of the file with the new content provided as input.
 
     Args:
+        file: The file object for which the patch needs to be generated.
         new_file_content_str: The new content of the file as a string.
         original_file_content_str: The original content of the file as a string.
+        patch: An optional patch string that can be provided as input.
 
     Returns:
         The generated or provided patch string.
 
     Raises:
         None.
+
+    Additional Information:
+        - If 'patch' is not provided as input, the function generates a patch using the 'difflib' library and returns it as output.
+        - If the 'settings.config.verbosity_level' is greater than or equal to 2, a warning message is logged indicating that the file was modified but no patch was found, and a patch is manually created.
     """
-    patch = ""
-    try:
-        diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
-                                    new_file_content_str.splitlines(keepends=True))
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().warning(f"File was modified, but no patch was found. Manually creating patch: {filename}.")
-        patch = ''.join(diff)
-    except Exception:
-        pass
-    return patch
-
-
-def update_settings_from_args(args: List[str]) -> List[str]:
-    """
-    Update the settings of the Dynaconf object based on the arguments passed to the function.
-
-    Args:
-        args: A list of arguments passed to the function.
-        Example args: ['--pr_code_suggestions.extra_instructions="be funny',
-                  '--pr_code_suggestions.num_code_suggestions=3']
-
-    Returns:
-        None
-
-    Raises:
-        ValueError: If the argument is not in the correct format.
-
-    """
-    other_args = []
-    if args:
-        for arg in args:
-            arg = arg.strip()
-            if arg.startswith('--'):
-                arg = arg.strip('-').strip()
-                vals = arg.split('=', 1)
-                if len(vals) != 2:
-                    if len(vals) > 2: # --extended is a valid argument
-                        get_logger().error(f'Invalid argument format: {arg}')
-                    other_args.append(arg)
-                    continue
-                key, value = _fix_key_value(*vals)
-                get_settings().set(key, value)
-                get_logger().info(f'Updated setting {key} to: "{value}"')
-            else:
-                other_args.append(arg)
-    return other_args
-
-
-def _fix_key_value(key: str, value: str):
-    key = key.strip().upper()
-    value = value.strip()
-    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)
-    return key, value
-
-
-def load_yaml(response_text: str) -> dict:
-    response_text = response_text.removeprefix('```yaml').rstrip('`')
-    try:
-        data = yaml.safe_load(response_text)
-    except Exception as e:
-        get_logger().error(f"Failed to parse AI prediction: {e}")
-        data = try_fix_yaml(response_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
-    data = {}
-    for i in range(1, len(response_text_lines)):
-        response_text_lines_tmp = '\n'.join(response_text_lines[:-i])
+    if not patch:  # to Do - also add condition for file extension
         try:
-            data = yaml.safe_load(response_text_lines_tmp,)
-            get_logger().info(f"Successfully parsed AI prediction after removing {i} lines")
-            break
-        except:
+            diff = difflib.unified_diff(original_file_content_str.splitlines(keepends=True),
+                                        new_file_content_str.splitlines(keepends=True))
+            if settings.config.verbosity_level >= 2:
+                logging.warning(f"File was modified, but no patch was found. Manually creating patch: {file.filename}.")
+            patch = ''.join(diff)
+        except Exception:
             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 patch

pr_agent/cli.py

@@ -1,68 +1,101 @@
 import argparse
 import asyncio
+import logging
 import os
 
-from pr_agent.agent.pr_agent import PRAgent, commands
-from pr_agent.config_loader import get_settings
-from pr_agent.log import setup_logger
-
-setup_logger()
+from pr_agent.tools.pr_code_suggestions import PRCodeSuggestions
+from pr_agent.tools.pr_description import PRDescription
+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
 
 
-
-def run(inargs=None):
+def run(args=None):
     parser = argparse.ArgumentParser(description='AI based pull request analyzer', usage=
 """\
-Usage: cli.py --pr-url=<URL on supported git hosting service> <command> [<args>].
+Usage: cli.py --pr-url <URL on supported git hosting service> <command> [<args>].
 For example:
-- cli.py --pr_url=... review
-- cli.py --pr_url=... describe
-- cli.py --pr_url=... improve
-- cli.py --pr_url=... ask "write me a poem about this PR"
-- cli.py --pr_url=... reflect
-- cli.py --issue_url=... similar_issue
+- cli.py --pr-url=... review
+- cli.py --pr-url=... describe
+- cli.py --pr-url=... improve
+- cli.py --pr-url=... ask "write me a poem about this PR"
+- cli.py --pr-url=... reflect
 
 Supported commands:
-- 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.
-
-- 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.
-Extended mode ('improve --extended') employs several calls, and provides a more thorough feedback
-
-- reflect - Ask the PR author questions about the PR.
-
-- update_changelog - Update the changelog based on the PR's contents.
-
-- add_docs
-
-- generate_labels
-
-
-Configuration:
-To edit any configuration parameter from 'configuration.toml', just add -config_path=<value>.
-For example: 'python cli.py --pr_url=... review --pr_reviewer.extra_instructions="focus on the file: ..."'
+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.
+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.
+reflect - Ask the PR author questions about the PR.
 """)
-    parser.add_argument('--pr_url', type=str, help='The URL of the PR to review', default=None)
-    parser.add_argument('--issue_url', type=str, help='The URL of the Issue to review', default=None)
-    parser.add_argument('command', type=str, help='The', choices=commands, default='review')
+    parser.add_argument('--pr_url', type=str, help='The URL of the PR to review', required=True)
+    parser.add_argument('command', type=str, help='The', choices=['review', 'review_pr',
+                                                                  'ask', 'ask_question',
+                                                                  'describe', 'describe_pr',
+                                                                  'improve', 'improve_code',
+                                                                  'reflect', 'review_after_reflect'],
+                                                                   default='review')
     parser.add_argument('rest', nargs=argparse.REMAINDER, default=[])
-    args = parser.parse_args(inargs)
-    if not args.pr_url and not args.issue_url:
-        parser.print_help()
-        return
-
+    args = parser.parse_args(args)
+    logging.basicConfig(level=os.environ.get("LOGLEVEL", "INFO"))
     command = args.command.lower()
-    get_settings().set("CONFIG.CLI_MODE", True)
-    if args.issue_url:
-        result = asyncio.run(PRAgent().handle_request(args.issue_url, [command] + args.rest))
+    commands = {
+        'ask': _handle_ask_command,
+        'ask_question': _handle_ask_command,
+        'describe': _handle_describe_command,
+        'describe_pr': _handle_describe_command,
+        'improve': _handle_improve_command,
+        'improve_code': _handle_improve_command,
+        'review': _handle_review_command,
+        'review_pr': _handle_review_command,
+        'reflect': _handle_reflect_command,
+        'review_after_reflect': _handle_review_after_reflect_command
+    }
+    if command in commands:
+        commands[command](args.pr_url, args.rest)
     else:
-        result = asyncio.run(PRAgent().handle_request(args.pr_url, [command] + args.rest))
-    if not result:
+        print(f"Unknown command: {command}")
         parser.print_help()
 
 
+def _handle_ask_command(pr_url: str, rest: list):
+    if len(rest) == 0:
+        print("Please specify a question")
+        return
+    print(f"Question: {' '.join(rest)} about PR {pr_url}")
+    reviewer = PRQuestions(pr_url, rest)
+    asyncio.run(reviewer.answer())
+
+
+def _handle_describe_command(pr_url: str, rest: list):
+    print(f"PR description: {pr_url}")
+    reviewer = PRDescription(pr_url)
+    asyncio.run(reviewer.describe())
+
+
+def _handle_improve_command(pr_url: str, rest: list):
+    print(f"PR code suggestions: {pr_url}")
+    reviewer = PRCodeSuggestions(pr_url)
+    asyncio.run(reviewer.suggest())
+
+
+def _handle_review_command(pr_url: str, rest: list):
+    print(f"Reviewing PR: {pr_url}")
+    reviewer = PRReviewer(pr_url, cli_mode=True, args=rest)
+    asyncio.run(reviewer.review())
+
+
+def _handle_reflect_command(pr_url: str, rest: list):
+    print(f"Asking the PR author questions: {pr_url}")
+    reviewer = PRInformationFromUser(pr_url)
+    asyncio.run(reviewer.generate_questions())
+
+
+def _handle_review_after_reflect_command(pr_url: str, rest: list):
+    print(f"Processing author's answers and sending review: {pr_url}")
+    reviewer = PRReviewer(pr_url, cli_mode=True, is_answer=True)
+    asyncio.run(reviewer.review())
+
+
 if __name__ == '__main__':
     run()

pr_agent/config_loader.py

@@ -1,70 +1,20 @@
 from os.path import abspath, dirname, join
-from pathlib import Path
-from typing import Optional
 
 from dynaconf import Dynaconf
-from starlette_context import context
-
-PR_AGENT_TOML_KEY = 'pr-agent'
 
 current_dir = dirname(abspath(__file__))
-global_settings = Dynaconf(
+settings = Dynaconf(
     envvar_prefix=False,
     merge_enabled=True,
     settings_files=[join(current_dir, f) for f in [
-        "settings/.secrets.toml",
-        "settings/configuration.toml",
-        "settings/ignore.toml",
-        "settings/language_extensions.toml",
-        "settings/pr_reviewer_prompts.toml",
-        "settings/pr_questions_prompts.toml",
-        "settings/pr_description_prompts.toml",
-        "settings/pr_code_suggestions_prompts.toml",
-        "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/.secrets.toml",
+         "settings/configuration.toml",
+         "settings/language_extensions.toml",
+         "settings/pr_reviewer_prompts.toml",
+         "settings/pr_questions_prompts.toml",
+         "settings/pr_description_prompts.toml",
+         "settings/pr_code_suggestions_prompts.toml",
+         "settings/pr_information_from_user_prompts.toml",
+         "settings_prod/.secrets.toml"
+        ]]
 )
-
-
-def get_settings():
-    try:
-        return context["settings"]
-    except Exception:
-        return global_settings
-
-
-# Add local configuration from pyproject.toml of the project being reviewed
-def _find_repository_root() -> Path:
-    """
-    Identify project root directory by recursively searching for the .git directory in the parent directories.
-    """
-    cwd = Path.cwd().resolve()
-    no_way_up = False
-    while not no_way_up:
-        no_way_up = cwd == cwd.parent
-        if (cwd / ".git").is_dir():
-            return cwd
-        cwd = cwd.parent
-    return None
-
-
-def _find_pyproject() -> Optional[Path]:
-    """
-    Search for file pyproject.toml in the repository root.
-    """
-    repo_root = _find_repository_root()
-    if repo_root:
-        pyproject = _find_repository_root() / "pyproject.toml"
-        return pyproject if pyproject.is_file() else None
-    return None
-
-
-pyproject_path = _find_pyproject()
-if pyproject_path is not None:
-    get_settings().load_file(pyproject_path, env=f'tool.{PR_AGENT_TOML_KEY}')

pr_agent/git_providers/__init__.py

@@ -1,28 +1,17 @@
-from pr_agent.config_loader import get_settings
+from pr_agent.config_loader import 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
-from pr_agent.git_providers.local_git_provider import LocalGitProvider
-from pr_agent.git_providers.azuredevops_provider import AzureDevopsProvider
-from pr_agent.git_providers.gerrit_provider import GerritProvider
-
 
 _GIT_PROVIDERS = {
     'github': GithubProvider,
     'gitlab': GitLabProvider,
     'bitbucket': BitbucketProvider,
-    'bitbucket_server': BitbucketServerProvider,
-    'azure': AzureDevopsProvider,
-    'codecommit': CodeCommitProvider,
-    'local' : LocalGitProvider,
-    'gerrit': GerritProvider,
 }
 
 def get_git_provider():
     try:
-        provider_id = get_settings().config.git_provider
+        provider_id = settings.config.git_provider
     except AttributeError as e:
         raise ValueError("git_provider is a required attribute in the configuration file") from e
     if provider_id not in _GIT_PROVIDERS:

pr_agent/git_providers/azuredevops_provider.py

@@ -1,277 +0,0 @@
-import json
-from typing import Optional, Tuple
-from urllib.parse import urlparse
-
-import os
-
-from ..log import get_logger
-
-AZURE_DEVOPS_AVAILABLE = True
-try:
-    from msrest.authentication import BasicAuthentication
-    from azure.devops.connection import Connection
-    from azure.devops.v7_1.git.models import Comment, CommentThread, GitVersionDescriptor, GitPullRequest
-except ImportError:
-    AZURE_DEVOPS_AVAILABLE = False
-
-from ..config_loader import get_settings
-from ..algo.utils import load_large_diff, clip_tokens
-from ..algo.language_handler import is_valid_file
-from .git_provider import EDIT_TYPE, FilePatchInfo
-
-
-class AzureDevopsProvider:
-    def __init__(self, pr_url: Optional[str] = None, incremental: Optional[bool] = False):
-        if not AZURE_DEVOPS_AVAILABLE:
-            raise ImportError("Azure DevOps provider is not available. Please install the required dependencies.")
-
-        self.azure_devops_client = self._get_azure_devops_client()
-
-        self.workspace_slug = None
-        self.repo_slug = None
-        self.repo = None
-        self.pr_num = None
-        self.pr = None
-        self.temp_comments = []
-        self.incremental = incremental
-        if pr_url:
-            self.set_pr(pr_url)
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments', 'get_labels',
-                          'remove_initial_comment', '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_repo_settings(self):
-        try:
-            contents = self.azure_devops_client.get_item_content(repository_id=self.repo_slug,
-                                                                 project=self.workspace_slug, download=False,
-                                                                 include_content_metadata=False, include_content=True,
-                                                                 path=".pr_agent.toml")
-            return contents
-        except Exception as e:
-            get_logger().exception("get repo settings error")
-            return ""
-
-    def get_files(self):
-        files = []
-        for i in self.azure_devops_client.get_pull_request_commits(project=self.workspace_slug,
-                                                                   repository_id=self.repo_slug,
-                                                                   pull_request_id=self.pr_num):
-
-            changes_obj = self.azure_devops_client.get_changes(project=self.workspace_slug,
-                                                               repository_id=self.repo_slug, commit_id=i.commit_id)
-
-            for c in changes_obj.changes:
-                files.append(c['item']['path'])
-        return list(set(files))
-
-    def get_diff_files(self) -> list[FilePatchInfo]:
-        try:
-            base_sha = self.pr.last_merge_target_commit
-            head_sha = self.pr.last_merge_source_commit
-
-            commits = self.azure_devops_client.get_pull_request_commits(project=self.workspace_slug,
-                                                                        repository_id=self.repo_slug,
-                                                                        pull_request_id=self.pr_num)
-
-            diff_files = []
-            diffs = []
-            diff_types = {}
-
-            for c in commits:
-                changes_obj = self.azure_devops_client.get_changes(project=self.workspace_slug,
-                                                                   repository_id=self.repo_slug, commit_id=c.commit_id)
-                for i in changes_obj.changes:
-                    if(i['item']['gitObjectType'] == 'tree'):
-                        continue
-                    diffs.append(i['item']['path'])
-                    diff_types[i['item']['path']] = i['changeType']
-
-            diffs = list(set(diffs))
-
-            for file in diffs:
-                if not is_valid_file(file):
-                    continue
-
-                version = GitVersionDescriptor(version=head_sha.commit_id, version_type='commit')
-                try:
-                    new_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
-                                                                            path=file,
-                                                                            project=self.workspace_slug,
-                                                                            version_descriptor=version,
-                                                                            download=False,
-                                                                            include_content=True)
-
-                    new_file_content_str = new_file_content_str.content
-                except Exception as error:
-                    get_logger().error("Failed to retrieve new file content of %s at version %s. Error: %s", file, version, str(error))
-                    new_file_content_str = ""
-
-                edit_type = EDIT_TYPE.MODIFIED
-                if diff_types[file] == 'add':
-                    edit_type = EDIT_TYPE.ADDED
-                elif diff_types[file] == 'delete':
-                    edit_type = EDIT_TYPE.DELETED
-                elif diff_types[file] == 'rename':
-                    edit_type = EDIT_TYPE.RENAMED
-
-                version = GitVersionDescriptor(version=base_sha.commit_id, version_type='commit')
-                try:
-                    original_file_content_str = self.azure_devops_client.get_item(repository_id=self.repo_slug,
-                                                                              path=file,
-                                                                              project=self.workspace_slug,
-                                                                              version_descriptor=version,
-                                                                              download=False,
-                                                                              include_content=True)
-                    original_file_content_str = original_file_content_str.content
-                except Exception as error:
-                    get_logger().error("Failed to retrieve original file content of %s at version %s. Error: %s", file, version, str(error))
-                    original_file_content_str = ""
-
-                patch = load_large_diff(file, new_file_content_str, original_file_content_str)
-
-                diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str,
-                                                patch=patch,
-                                                filename=file,
-                                                edit_type=edit_type))
-
-            self.diff_files = diff_files
-            return diff_files
-        except Exception as e:
-            print(f"Error: {str(e)}")
-            return []
-
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        comment = Comment(content=pr_comment)
-        thread = CommentThread(comments=[comment])
-        thread_response = self.azure_devops_client.create_thread(comment_thread=thread, project=self.workspace_slug,
-                                                                 repository_id=self.repo_slug,
-                                                                 pull_request_id=self.pr_num)
-        if is_temporary:
-            self.temp_comments.append({'thread_id': thread_response.id, 'comment_id': comment.id})
-
-    def publish_description(self, pr_title: str, pr_body: str):
-        try:
-            updated_pr = GitPullRequest()
-            updated_pr.title = pr_title
-            updated_pr.description = pr_body
-            self.azure_devops_client.update_pull_request(project=self.workspace_slug,
-                                                         repository_id=self.repo_slug,
-                                                         pull_request_id=self.pr_num,
-                                                         git_pull_request_to_update=updated_pr)
-        except Exception as e:
-            get_logger().exception(f"Could not update pull request {self.pr_num} description: {e}")
-
-    def remove_initial_comment(self):
-        return ""  # not implemented yet
-
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        raise NotImplementedError("Azure DevOps provider does not support publishing inline comment yet")
-
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        raise NotImplementedError("Azure DevOps provider does not support creating inline comments yet")
-
-    def publish_inline_comments(self, comments: list[dict]):
-        raise NotImplementedError("Azure DevOps provider does not support publishing inline comments yet")
-
-    def get_title(self):
-        return self.pr.title
-
-    def get_languages(self):
-        languages = []
-        files = self.azure_devops_client.get_items(project=self.workspace_slug, repository_id=self.repo_slug,
-                                                   recursion_level="Full", include_content_metadata=True,
-                                                   include_links=False, download=False)
-        for f in files:
-            if f.git_object_type == 'blob':
-                file_name, file_extension = os.path.splitext(f.path)
-                languages.append(file_extension[1:])
-
-        extension_counts = {}
-        for ext in languages:
-            if ext != '':
-                extension_counts[ext] = extension_counts.get(ext, 0) + 1
-
-        total_extensions = sum(extension_counts.values())
-
-        extension_percentages = {ext: (count / total_extensions) * 100 for ext, count in extension_counts.items()}
-
-        return extension_percentages
-
-    def get_pr_branch(self):
-        pr_info = self.azure_devops_client.get_pull_request_by_id(project=self.workspace_slug,
-                                                                  pull_request_id=self.pr_num)
-        source_branch = pr_info.source_ref_name.split('/')[-1]
-        return source_branch
-
-    def get_pr_description(self):
-        max_tokens = get_settings().get("CONFIG.MAX_DESCRIPTION_TOKENS", None)
-        if max_tokens:
-            return clip_tokens(self.pr.description, max_tokens)
-        return self.pr.description
-
-    def get_user_id(self):
-        return 0
-
-    def get_issue_comments(self):
-        raise NotImplementedError("Azure DevOps 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
-
-    def get_issue_comments(self):
-        raise NotImplementedError("Azure DevOps provider does not support issue comments yet")
-
-    @staticmethod
-    def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
-        parsed_url = urlparse(pr_url)
-
-        path_parts = parsed_url.path.strip('/').split('/')
-
-        if len(path_parts) < 6 or path_parts[4] != 'pullrequest':
-            raise ValueError("The provided URL does not appear to be a Azure DevOps PR URL")
-
-        workspace_slug = path_parts[1]
-        repo_slug = path_parts[3]
-        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_azure_devops_client(self):
-        try:
-            pat = get_settings().azure_devops.pat
-            org = get_settings().azure_devops.org
-        except AttributeError as e:
-            raise ValueError(
-                "Azure DevOps PAT token is required ") from e
-
-        credentials = BasicAuthentication('', pat)
-        azure_devops_connection = Connection(base_url=org, creds=credentials)
-        azure_devops_client = azure_devops_connection.clients.get_git_client()
-
-        return azure_devops_client
-
-    def _get_repo(self):
-        if self.repo is None:
-            self.repo = self.azure_devops_client.get_repository(project=self.workspace_slug,
-                                                                repository_id=self.repo_slug)
-        return self.repo
-
-    def _get_pr(self):
-        self.pr = self.azure_devops_client.get_pull_request_by_id(pull_request_id=self.pr_num, project=self.workspace_slug)
-        return self.pr
-
-    def get_commit_messages(self):
-        return ""  # not implemented yet

pr_agent/git_providers/bitbucket_provider.py

@@ -1,112 +1,33 @@
-import json
+import logging
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 
 import requests
 from atlassian.bitbucket import Cloud
-from starlette_context import context
 
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
-from ..config_loader import get_settings
-from ..log import get_logger
-from .git_provider import FilePatchInfo, GitProvider, EDIT_TYPE
+from pr_agent.config_loader import settings
+
+from .git_provider import FilePatchInfo
 
 
-class BitbucketProvider(GitProvider):
-    def __init__(
-        self, pr_url: Optional[str] = None, incremental: Optional[bool] = False
-    ):
+class BitbucketProvider:
+    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.BEARER_TOKEN", None)}'
-        s.headers["Content-Type"] = "application/json"
-        self.headers = s.headers
+        s.headers['Authorization'] = f'Bearer {settings.get("BITBUCKET.BEARER_TOKEN", None)}'
         self.bitbucket_client = Cloud(session=s)
+
         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
         if 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']
-
-    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')
-            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', 'publish_inline_comments', 'get_labels', 'gfm_markdown']:
+        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments']:
             return False
         return True
 
@@ -118,195 +39,68 @@ 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()
-        ]
-
+        diff_split = ['diff --git%s' % x for x in self.pr.diff().split('diff --git') if x.strip()]
+        
         diff_files = []
         for index, diff in enumerate(diffs):
-            original_file_content_str = self._get_pr_file_content(
-                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,
-            )
-
-            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
+            original_file_content_str = self._get_pr_file_content(diff.old.get_data('links'))
+            new_file_content_str = self._get_pr_file_content(diff.new.get_data('links'))
+            diff_files.append(FilePatchInfo(original_file_content_str, new_file_content_str,
+                                            diff_split[index], diff.new.path))
         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:
-            self.temp_comments.append(comment["id"])
+            self.temp_comments.append(comment['id'])
 
     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}")
+            logging.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}")
+    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        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 = json.dumps( {
-            "content": {
-                "raw": comment,
-            },
-            "inline": {
-                "to": from_line,
-                "path": file
-            },
-        })
-        response = requests.request(
-            "POST", self.bitbucket_comment_api_url, data=payload, headers=self.headers
-        )
-        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 ""
+        raise NotImplementedError("Bitbucket provider does not support creating inline comments yet")
 
     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}")
+        raise NotImplementedError("Bitbucket provider does not support publishing inline comments yet")
 
     def get_title(self):
         return self.pr.title
 
     def get_languages(self):
-        languages = {self._get_repo().get_data("language"): 0}
+        languages = {self._get_repo().get_data('language'): 0}
         return languages
 
     def get_pr_branch(self):
         return self.pr.source_branch
 
-    def get_pr_description_full(self):
+    def get_pr_description(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
+        raise NotImplementedError("Bitbucket provider does not support issue comments yet")
 
     @staticmethod
     def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
         parsed_url = urlparse(pr_url)
+        
+        if 'bitbucket.org' not in parsed_url.netloc:
+            raise ValueError("The provided URL is not a valid GitHub 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) < 4 or path_parts[2] != "pull-requests":
-            raise ValueError(
-                "The provided URL does not appear to be a Bitbucket PR URL"
-            )
+        path_parts = parsed_url.path.strip('/').split('/')
+        
+        if len(path_parts) < 4 or path_parts[2] != 'pull-requests':
+            raise ValueError("The provided URL does not appear to be a Bitbucket PR URL")
 
         workspace_slug = path_parts[0]
         repo_slug = path_parts[1]
@@ -319,9 +113,7 @@ class BitbucketProvider(GitProvider):
 
     def _get_repo(self):
         if self.repo is None:
-            self.repo = self.bitbucket_client.workspaces.get(
-                self.workspace_slug
-            ).repositories.get(self.repo_slug)
+            self.repo = self.bitbucket_client.workspaces.get(self.workspace_slug).repositories.get(self.repo_slug)
         return self.repo
 
     def _get_pr(self):
@@ -329,30 +121,3 @@ class BitbucketProvider(GitProvider):
 
     def _get_pr_file_content(self, remote_link: str):
         return ""
-
-    def get_commit_messages(self):
-        return ""  # 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.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
-    def publish_labels(self, pr_types: list):
-        pass
-    
-    # bitbucket does not support labels
-    def get_pr_labels(self):
-        pass

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_client.py

@@ -1,277 +0,0 @@
-import boto3
-import botocore
-
-
-class CodeCommitDifferencesResponse:
-    """
-    CodeCommitDifferencesResponse is the response object returned from our get_differences() function.
-    It maps the JSON response to member variables of this class.
-    """
-
-    def __init__(self, json: dict):
-        before_blob = json.get("beforeBlob", {})
-        after_blob = json.get("afterBlob", {})
-
-        self.before_blob_id = before_blob.get("blobId", "")
-        self.before_blob_path = before_blob.get("path", "")
-        self.after_blob_id = after_blob.get("blobId", "")
-        self.after_blob_path = after_blob.get("path", "")
-        self.change_type = json.get("changeType", "")
-
-
-class CodeCommitPullRequestResponse:
-    """
-    CodeCommitPullRequestResponse is the response object returned from our get_pr() function.
-    It maps the JSON response to member variables of this class.
-    """
-
-    def __init__(self, json: dict):
-        self.title = json.get("title", "")
-        self.description = json.get("description", "")
-
-        self.targets = []
-        for target in json.get("pullRequestTargets", []):
-            self.targets.append(CodeCommitPullRequestResponse.CodeCommitPullRequestTarget(target))
-
-    class CodeCommitPullRequestTarget:
-        """
-        CodeCommitPullRequestTarget is a subclass of CodeCommitPullRequestResponse that
-        holds details about an individual target commit.
-        """
-
-        def __init__(self, json: dict):
-            self.source_commit = json.get("sourceCommit", "")
-            self.source_branch = json.get("sourceReference", "")
-            self.destination_commit = json.get("destinationCommit", "")
-            self.destination_branch = json.get("destinationReference", "")
-
-
-class CodeCommitClient:
-    """
-    CodeCommitClient is a wrapper around the AWS boto3 SDK for the CodeCommit client
-    """
-
-    def __init__(self):
-        self.boto_client = None
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in ["gfm_markdown"]:
-            return False
-        return True
-
-    def _connect_boto_client(self):
-        try:
-            self.boto_client = boto3.client("codecommit")
-        except Exception as e:
-            raise ValueError(f"Failed to connect to AWS CodeCommit: {e}") from e
-
-    def get_differences(self, repo_name: int, destination_commit: str, source_commit: str):
-        """
-        Get the differences between two commits in CodeCommit.
-
-        Args:
-        - repo_name: Name of the repository
-        - destination_commit: Commit hash you want to merge into (the "before" hash) (usually on the main or master branch)
-        - source_commit: Commit hash of the code you are adding (the "after" branch)
-
-        Returns:
-        - List of CodeCommitDifferencesResponse objects
-
-        Boto3 Documentation:
-        - aws codecommit get-differences
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/get_differences.html
-        """
-        if self.boto_client is None:
-            self._connect_boto_client()
-
-        # The differences response from AWS is paginated, so we need to iterate through the pages to get all the differences.
-        differences = []
-        try:
-            paginator = self.boto_client.get_paginator("get_differences")
-            for page in paginator.paginate(
-                repositoryName=repo_name,
-                beforeCommitSpecifier=destination_commit,
-                afterCommitSpecifier=source_commit,
-            ):
-                differences.extend(page.get("differences", []))
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] == 'RepositoryDoesNotExistException':
-                raise ValueError(f"CodeCommit cannot retrieve differences: Repository does not exist: {repo_name}") from e
-            raise ValueError(f"CodeCommit cannot retrieve differences for {source_commit}..{destination_commit}") from e
-        except Exception as e:
-            raise ValueError(f"CodeCommit cannot retrieve differences for {source_commit}..{destination_commit}") from e
-
-        output = []
-        for json in differences:
-            output.append(CodeCommitDifferencesResponse(json))
-        return output
-
-    def get_file(self, repo_name: str, file_path: str, sha_hash: str, optional: bool = False):
-        """
-        Retrieve a file from CodeCommit.
-
-        Args:
-        - repo_name: Name of the repository
-        - file_path: Path to the file you are retrieving
-        - sha_hash: Commit hash of the file you are retrieving
-
-        Returns:
-        - File contents
-
-        Boto3 Documentation:
-        - aws codecommit get_file
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/get_file.html
-        """
-        if not file_path:
-            return ""
-
-        if self.boto_client is None:
-            self._connect_boto_client()
-
-        try:
-            response = self.boto_client.get_file(repositoryName=repo_name, commitSpecifier=sha_hash, filePath=file_path)
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] == 'RepositoryDoesNotExistException':
-                raise ValueError(f"CodeCommit cannot retrieve PR: Repository does not exist: {repo_name}") from e
-            # if the file does not exist, but is flagged as optional, then return an empty string
-            if optional and e.response["Error"]["Code"] == 'FileDoesNotExistException':
-                return ""
-            raise ValueError(f"CodeCommit cannot retrieve file '{file_path}' from repository '{repo_name}'") from e
-        except Exception as e:
-            raise ValueError(f"CodeCommit cannot retrieve file '{file_path}' from repository '{repo_name}'") from e
-        if "fileContent" not in response:
-            raise ValueError(f"File content is empty for file: {file_path}")
-
-        return response.get("fileContent", "")
-
-    def get_pr(self, repo_name: str, pr_number: int):
-        """
-        Get a information about a CodeCommit PR.
-
-        Args:
-        - repo_name: Name of the repository
-        - pr_number: The PR number you are requesting
-
-        Returns:
-        - CodeCommitPullRequestResponse object
-
-        Boto3 Documentation:
-        - aws codecommit get_pull_request
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/get_pull_request.html
-        """
-        if self.boto_client is None:
-            self._connect_boto_client()
-
-        try:
-            response = self.boto_client.get_pull_request(pullRequestId=str(pr_number))
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] == 'PullRequestDoesNotExistException':
-                raise ValueError(f"CodeCommit cannot retrieve PR: PR number does not exist: {pr_number}") from e
-            if e.response["Error"]["Code"] == 'RepositoryDoesNotExistException':
-                raise ValueError(f"CodeCommit cannot retrieve PR: Repository does not exist: {repo_name}") from e
-            raise ValueError(f"CodeCommit cannot retrieve PR: {pr_number}: boto client error") from e
-        except Exception as e:
-            raise ValueError(f"CodeCommit cannot retrieve PR: {pr_number}") from e
-
-        if "pullRequest" not in response:
-            raise ValueError("CodeCommit PR number not found: {pr_number}")
-
-        return CodeCommitPullRequestResponse(response.get("pullRequest", {}))
-
-    def publish_description(self, pr_number: int, pr_title: str, pr_body: str):
-        """
-        Set the title and description on a pull request
-
-        Args:
-        - pr_number: the AWS CodeCommit pull request number
-        - pr_title: title of the pull request
-        - pr_body: body of the pull request
-
-        Returns:
-        - None
-
-        Boto3 Documentation:
-        - aws codecommit update_pull_request_title
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/update_pull_request_title.html
-        - aws codecommit update_pull_request_description
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/update_pull_request_description.html
-        """
-        if self.boto_client is None:
-            self._connect_boto_client()
-
-        try:
-            self.boto_client.update_pull_request_title(pullRequestId=str(pr_number), title=pr_title)
-            self.boto_client.update_pull_request_description(pullRequestId=str(pr_number), description=pr_body)
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] == 'PullRequestDoesNotExistException':
-                raise ValueError(f"PR number does not exist: {pr_number}") from e
-            if e.response["Error"]["Code"] == 'InvalidTitleException':
-                raise ValueError(f"Invalid title for PR number: {pr_number}") from e
-            if e.response["Error"]["Code"] == 'InvalidDescriptionException':
-                raise ValueError(f"Invalid description for PR number: {pr_number}") from e
-            if e.response["Error"]["Code"] == 'PullRequestAlreadyClosedException':
-                raise ValueError(f"PR is already closed: PR number: {pr_number}") from e
-            raise ValueError(f"Boto3 client error calling publish_description") from e
-        except Exception as e:
-            raise ValueError(f"Error calling publish_description") from e
-
-    def publish_comment(self, repo_name: str, pr_number: int, destination_commit: str, source_commit: str, comment: str, annotation_file: str = None, annotation_line: int = None):
-        """
-        Publish a comment to a pull request
-
-        Args:
-        - repo_name: name of the repository
-        - pr_number: number of the pull request
-        - destination_commit: The commit hash you want to merge into (the "before" hash) (usually on the main or master branch)
-        - source_commit: The commit hash of the code you are adding (the "after" branch)
-        - comment: The comment you want to publish
-        - annotation_file: The file you want to annotate (optional)
-        - annotation_line: The line number you want to annotate (optional)
-
-        Comment annotations for CodeCommit are different than GitHub.
-        CodeCommit only designates the starting line number for the comment.
-        It does not support the ending line number to highlight a range of lines.
-
-        Returns:
-        - None
-
-        Boto3 Documentation:
-        - aws codecommit post_comment_for_pull_request
-        - https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/post_comment_for_pull_request.html
-        """
-        if self.boto_client is None:
-            self._connect_boto_client()
-
-        try:
-            # If the comment has code annotations,
-            # then set the file path and line number in the location dictionary
-            if annotation_file and annotation_line:
-                self.boto_client.post_comment_for_pull_request(
-                    pullRequestId=str(pr_number),
-                    repositoryName=repo_name,
-                    beforeCommitId=destination_commit,
-                    afterCommitId=source_commit,
-                    content=comment,
-                    location={
-                        "filePath": annotation_file,
-                        "filePosition": annotation_line,
-                        "relativeFileVersion": "AFTER",
-                    },
-                )
-            else:
-                # The comment does not have code annotations
-                self.boto_client.post_comment_for_pull_request(
-                    pullRequestId=str(pr_number),
-                    repositoryName=repo_name,
-                    beforeCommitId=destination_commit,
-                    afterCommitId=source_commit,
-                    content=comment,
-                )
-        except botocore.exceptions.ClientError as e:
-            if e.response["Error"]["Code"] == 'RepositoryDoesNotExistException':
-                raise ValueError(f"Repository does not exist: {repo_name}") from e
-            if e.response["Error"]["Code"] == 'PullRequestDoesNotExistException':
-                raise ValueError(f"PR number does not exist: {pr_number}") from e
-            raise ValueError(f"Boto3 client error calling post_comment_for_pull_request") from e
-        except Exception as e:
-            raise ValueError(f"Error calling post_comment_for_pull_request") from e

pr_agent/git_providers/codecommit_provider.py

@@ -1,498 +0,0 @@
-import os
-import re
-from collections import Counter
-from typing import List, Optional, Tuple
-from urllib.parse import urlparse
-
-from pr_agent.git_providers.codecommit_client import CodeCommitClient
-
-from ..algo.utils import load_large_diff
-from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from ..config_loader import get_settings
-from ..log import get_logger
-
-
-class PullRequestCCMimic:
-    """
-    This class mimics the PullRequest class from the PyGithub library for the CodeCommitProvider.
-    """
-
-    def __init__(self, title: str, diff_files: List[FilePatchInfo]):
-        self.title = title
-        self.diff_files = diff_files
-        self.description = None
-        self.source_commit = None
-        self.source_branch = None  # the branch containing your new code changes
-        self.destination_commit = None
-        self.destination_branch = None  # the branch you are going to merge into
-
-
-class CodeCommitFile:
-    """
-    This class represents a file in a pull request in CodeCommit.
-    """
-
-    def __init__(
-        self,
-        a_path: str,
-        a_blob_id: str,
-        b_path: str,
-        b_blob_id: str,
-        edit_type: EDIT_TYPE,
-    ):
-        self.a_path = a_path
-        self.a_blob_id = a_blob_id
-        self.b_path = b_path
-        self.b_blob_id = b_blob_id
-        self.edit_type: EDIT_TYPE = edit_type
-        self.filename = b_path if b_path else a_path
-
-
-class CodeCommitProvider(GitProvider):
-    """
-    This class implements the GitProvider interface for AWS CodeCommit repositories.
-    """
-
-    def __init__(self, pr_url: Optional[str] = None, incremental: Optional[bool] = False):
-        self.codecommit_client = CodeCommitClient()
-        self.aws_client = None
-        self.repo_name = None
-        self.pr_num = None
-        self.pr = None
-        self.diff_files = None
-        self.git_files = None
-        self.pr_url = pr_url
-        if pr_url:
-            self.set_pr(pr_url)
-
-    def provider_name(self):
-        return "CodeCommit"
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in [
-            "get_issue_comments",
-            "create_inline_comment",
-            "publish_inline_comments",
-            "get_labels",
-            "gfm_markdown"
-        ]:
-            return False
-        return True
-
-    def set_pr(self, pr_url: str):
-        self.repo_name, self.pr_num = self._parse_pr_url(pr_url)
-        self.pr = self._get_pr()
-
-    def get_files(self) -> list[CodeCommitFile]:
-        # bring files from CodeCommit only once
-        if self.git_files:
-            return self.git_files
-
-        self.git_files = []
-        differences = self.codecommit_client.get_differences(self.repo_name, self.pr.destination_commit, self.pr.source_commit)
-        for item in differences:
-            self.git_files.append(CodeCommitFile(item.before_blob_path,
-                                                 item.before_blob_id,
-                                                 item.after_blob_path,
-                                                 item.after_blob_id,
-                                                 CodeCommitProvider._get_edit_type(item.change_type)))
-        return self.git_files
-
-    def get_diff_files(self) -> list[FilePatchInfo]:
-        """
-        Retrieves the list of files that have been modified, added, deleted, or renamed in a pull request in CodeCommit,
-        along with their content and patch information.
-
-        Returns:
-            diff_files (List[FilePatchInfo]): List of FilePatchInfo objects representing the modified, added, deleted,
-            or renamed files in the merge request.
-        """
-        # bring files from CodeCommit only once
-        if self.diff_files:
-            return self.diff_files
-
-        self.diff_files = []
-
-        files = self.get_files()
-        for diff_item in files:
-            patch_filename = ""
-            if diff_item.a_blob_id is not None:
-                patch_filename = diff_item.a_path
-                original_file_content_str = self.codecommit_client.get_file(
-                    self.repo_name, diff_item.a_path, self.pr.destination_commit)
-                if isinstance(original_file_content_str, (bytes, bytearray)):
-                    original_file_content_str = original_file_content_str.decode("utf-8")
-            else:
-                original_file_content_str = ""
-
-            if diff_item.b_blob_id is not None:
-                patch_filename = diff_item.b_path
-                new_file_content_str = self.codecommit_client.get_file(self.repo_name, diff_item.b_path, self.pr.source_commit)
-                if isinstance(new_file_content_str, (bytes, bytearray)):
-                    new_file_content_str = new_file_content_str.decode("utf-8")
-            else:
-                new_file_content_str = ""
-
-            patch = load_large_diff(patch_filename, new_file_content_str, original_file_content_str)
-
-            # Store the diffs as a list of FilePatchInfo objects
-            info = FilePatchInfo(
-                original_file_content_str,
-                new_file_content_str,
-                patch,
-                diff_item.b_path,
-                edit_type=diff_item.edit_type,
-                old_filename=None
-                if diff_item.a_path == diff_item.b_path
-                else diff_item.a_path,
-            )
-            # Only add valid files to the diff list
-            # "bad extensions" are set in the language_extensions.toml file
-            # a "valid file" is one that is not in the "bad extensions" list
-            if is_valid_file(info.filename):
-                self.diff_files.append(info)
-
-        return self.diff_files
-
-    def publish_description(self, pr_title: str, pr_body: str):
-        try:
-            self.codecommit_client.publish_description(
-                pr_number=self.pr_num,
-                pr_title=pr_title,
-                pr_body=CodeCommitProvider._add_additional_newlines(pr_body),
-            )
-        except Exception as e:
-            raise ValueError(f"CodeCommit Cannot publish description for PR: {self.pr_num}") from e    
-
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        if is_temporary:
-            get_logger().info(pr_comment)
-            return
-
-        pr_comment = CodeCommitProvider._remove_markdown_html(pr_comment)
-        pr_comment = CodeCommitProvider._add_additional_newlines(pr_comment)
-
-        try:
-            self.codecommit_client.publish_comment(
-                repo_name=self.repo_name,
-                pr_number=self.pr_num,
-                destination_commit=self.pr.destination_commit,
-                source_commit=self.pr.source_commit,
-                comment=pr_comment,
-            )
-        except Exception as e:
-            raise ValueError(f"CodeCommit Cannot publish comment for PR: {self.pr_num}") from e
-
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
-        counter = 1
-        for suggestion in code_suggestions:
-            # Verify that each suggestion has the required keys
-            if not all(key in suggestion for key in ["body", "relevant_file", "relevant_lines_start"]):
-                get_logger().warning(f"Skipping code suggestion #{counter}: Each suggestion must have 'body', 'relevant_file', 'relevant_lines_start' keys")
-                continue
-       
-            # Publish the code suggestion to CodeCommit
-            try:
-                get_logger().debug(f"Code Suggestion #{counter} in file: {suggestion['relevant_file']}: {suggestion['relevant_lines_start']}")
-                self.codecommit_client.publish_comment(
-                    repo_name=self.repo_name,
-                    pr_number=self.pr_num,
-                    destination_commit=self.pr.destination_commit,
-                    source_commit=self.pr.source_commit,
-                    comment=suggestion["body"],
-                    annotation_file=suggestion["relevant_file"],
-                    annotation_line=suggestion["relevant_lines_start"],
-                )
-            except Exception as e:
-                raise ValueError(f"CodeCommit Cannot publish code suggestions for PR: {self.pr_num}") from e
-            
-            counter += 1
-
-        # The calling function passes in a list of code suggestions, and this function publishes each suggestion one at a time.
-        # If we were to return False here, the calling function will attempt to publish the same list of code suggestions again, one at a time.
-        # Since this function publishes the suggestions one at a time anyway, we always return True here to avoid the retry.        
-        return True
-
-    def publish_labels(self, labels):
-        return [""]  # not implemented yet
-
-    def get_pr_labels(self):
-        return [""]  # not implemented yet
-
-    def remove_initial_comment(self):
-        return ""  # not implemented yet
-
-    def remove_comment(self, comment):
-        return ""  # not implemented yet
-
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        # https://boto3.amazonaws.com/v1/documentation/api/latest/reference/services/codecommit/client/post_comment_for_compared_commit.html
-        raise NotImplementedError("CodeCommit provider does not support publishing inline comments yet")
-
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        raise NotImplementedError("CodeCommit provider does not support creating inline comments yet")
-
-    def publish_inline_comments(self, comments: list[dict]):
-        raise NotImplementedError("CodeCommit provider does not support publishing inline comments yet")
-
-    def get_title(self):
-        return self.pr.title
-
-    def get_pr_id(self):
-        """
-        Returns the PR ID in the format: "repo_name/pr_number".
-        Note: This is an internal identifier for PR-Agent, 
-        and is not the same as the CodeCommit PR identifier.
-        """
-        try:
-            pr_id = f"{self.repo_name}/{self.pr_num}"
-            return pr_id
-        except:
-            return ""
-        
-    def get_languages(self):
-        """
-        Returns a dictionary of languages, containing the percentage of each language used in the PR.
-
-        Returns:
-        - dict: A dictionary where each key is a language name and the corresponding value is the percentage of that language in the PR.
-        """
-        commit_files = self.get_files()
-        filenames = [ item.filename for item in commit_files ]
-        extensions = CodeCommitProvider._get_file_extensions(filenames)
-
-        # Calculate the percentage of each file extension in the PR
-        percentages = CodeCommitProvider._get_language_percentages(extensions)
-
-        # The global language_extension_map is a dictionary of languages,
-        # where each dictionary item is a BoxList of extensions.
-        # We want a dictionary of extensions,
-        # 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
-
-        # Map the file extension/languages to percentages
-        languages = {}
-        for ext, pct in percentages.items():
-            languages[main_extensions_flat.get(ext, "")] = pct
-
-        return languages
-
-    def get_pr_branch(self):
-        return self.pr.source_branch
-
-    def get_pr_description_full(self) -> str:
-        return self.pr.description
-
-    def get_user_id(self):
-        return -1  # not implemented yet
-
-    def get_issue_comments(self):
-        raise NotImplementedError("CodeCommit provider does not support issue comments yet")
-
-    def get_repo_settings(self):
-        # a local ".pr_agent.toml" settings file is optional
-        settings_filename = ".pr_agent.toml"
-        return self.codecommit_client.get_file(self.repo_name, settings_filename, self.pr.source_commit, optional=True)
-
-    def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
-        get_logger().info("CodeCommit provider does not support eyes reaction yet")
-        return True
-
-    def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
-        get_logger().info("CodeCommit provider does not support removing reactions yet")
-        return True
-
-    @staticmethod
-    def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
-        """
-        Parse the CodeCommit PR URL and return the repository name and PR number.
-
-        Args:
-        - pr_url: the full AWS CodeCommit pull request URL
-
-        Returns:
-        - Tuple[str, int]: A tuple containing the repository name and PR number.
-        """
-        # Example PR URL:
-        # https://us-east-1.console.aws.amazon.com/codesuite/codecommit/repositories/__MY_REPO__/pull-requests/123456"
-        parsed_url = urlparse(pr_url)
-
-        if not CodeCommitProvider._is_valid_codecommit_hostname(parsed_url.netloc):
-            raise ValueError(f"The provided URL is not a valid CodeCommit URL: {pr_url}")
-
-        path_parts = parsed_url.path.strip("/").split("/")
-
-        if (
-            len(path_parts) < 6
-            or path_parts[0] != "codesuite"
-            or path_parts[1] != "codecommit"
-            or path_parts[2] != "repositories"
-            or path_parts[4] != "pull-requests"
-        ):
-            raise ValueError(f"The provided URL does not appear to be a CodeCommit PR URL: {pr_url}")
-
-        repo_name = path_parts[3]
-
-        try:
-            pr_number = int(path_parts[5])
-        except ValueError as e:
-            raise ValueError(f"Unable to convert PR number to integer: '{path_parts[5]}'") from e
-
-        return repo_name, pr_number
-
-    @staticmethod
-    def _is_valid_codecommit_hostname(hostname: str) -> bool:
-        """
-        Check if the provided hostname is a valid AWS CodeCommit hostname.
-
-        This is not an exhaustive check of AWS region names, 
-        but instead uses a regex to check for matching AWS region patterns.
-
-        Args:
-        - hostname: the hostname to check
-
-        Returns:
-        - bool: True if the hostname is valid, False otherwise.
-        """
-        return re.match(r"^[a-z]{2}-(gov-)?[a-z]+-\d\.console\.aws\.amazon\.com$", hostname) is not None
-
-    def _get_pr(self):
-        response = self.codecommit_client.get_pr(self.repo_name, self.pr_num)
-
-        if len(response.targets) == 0:
-            raise ValueError(f"No files found in CodeCommit PR: {self.pr_num}")
-
-        # TODO: implement support for multiple targets in one CodeCommit PR
-        #       for now, we are only using the first target in the PR
-        if len(response.targets) > 1:
-            get_logger().warning(
-                "Multiple targets in one PR is not supported for CodeCommit yet. Continuing, using the first target only..."
-            )
-
-        # Return our object that mimics PullRequest class from the PyGithub library
-        # (This strategy was copied from the LocalGitProvider)
-        mimic = PullRequestCCMimic(response.title, self.diff_files)
-        mimic.description = response.description
-        mimic.source_commit = response.targets[0].source_commit
-        mimic.source_branch = response.targets[0].source_branch
-        mimic.destination_commit = response.targets[0].destination_commit
-        mimic.destination_branch = response.targets[0].destination_branch
-
-        return mimic
-
-    def get_commit_messages(self):
-        return ""  # not implemented yet
-
-    @staticmethod
-    def _add_additional_newlines(body: str) -> str:
-        """
-        Replace single newlines in a PR body with double newlines.
-
-        CodeCommit Markdown does not seem to render as well as GitHub Markdown,
-        so we add additional newlines to the PR body to make it more readable in CodeCommit.
-
-        Args:
-        - body: the PR body
-
-        Returns:
-        - str: the PR body with the double newlines added
-        """
-        return re.sub(r'(?<!\n)\n(?!\n)', '\n\n', body)
-
-    @staticmethod
-    def _remove_markdown_html(comment: str) -> str:
-        """
-        Remove the HTML tags from a PR comment.
-
-        CodeCommit Markdown does not seem to render as well as GitHub Markdown,
-        so we remove the HTML tags from the PR comment to make it more readable in CodeCommit.
-
-        Args:
-        - comment: the PR comment
-
-        Returns:
-        - str: the PR comment with the HTML tags removed
-        """
-        comment = comment.replace("<details>", "")
-        comment = comment.replace("</details>", "")
-        comment = comment.replace("<summary>", "")
-        comment = comment.replace("</summary>", "")
-        return comment
-
-    @staticmethod
-    def _get_edit_type(codecommit_change_type: str):
-        """
-        Convert the CodeCommit change type string to the EDIT_TYPE enum.
-        The CodeCommit change type string is returned from the get_differences SDK method.
-
-        Args:
-        - codecommit_change_type: the CodeCommit change type string
-
-        Returns:
-        - An EDIT_TYPE enum representing the modified, added, deleted, or renamed file in the PR diff.
-        """
-        t = codecommit_change_type.upper()
-        edit_type = None
-        if t == "A":
-            edit_type = EDIT_TYPE.ADDED
-        elif t == "D":
-            edit_type = EDIT_TYPE.DELETED
-        elif t == "M":
-            edit_type = EDIT_TYPE.MODIFIED
-        elif t == "R":
-            edit_type = EDIT_TYPE.RENAMED
-        return edit_type
-
-    @staticmethod
-    def _get_file_extensions(filenames):
-        """
-        Return a list of file extensions from a list of filenames.
-        The returned extensions will include the dot "." prefix,
-        to accommodate for the dots in the existing language_extension_map settings.
-        Filenames with no extension will return an empty string for the extension.
-
-        Args:
-        - filenames: a list of filenames
-
-        Returns:
-        - list: A list of file extensions, including the dot "." prefix.
-        """
-        extensions = []
-        for filename in filenames:
-            filename, ext = os.path.splitext(filename)
-            if ext:
-                extensions.append(ext.lower())
-            else:
-                extensions.append("")
-        return extensions
-
-    @staticmethod
-    def _get_language_percentages(extensions):
-        """
-        Return a dictionary containing the programming language name (as the key),
-        and the percentage that language is used (as the value),
-        given a list of file extensions.
-
-        Args:
-        - extensions: a list of file extensions
-
-        Returns:
-        - dict: A dictionary where each key is a language name and the corresponding value is the percentage of that language in the PR.
-        """
-        total_files = len(extensions)
-        if total_files == 0:
-            return {}
-
-        # Identify language by file extension and count
-        lang_count = Counter(extensions)
-        # Convert counts to percentages
-        lang_percentage = {
-            lang: round(count / total_files * 100) for lang, count in lang_count.items()
-        }
-        return lang_percentage

pr_agent/git_providers/gerrit_provider.py

@@ -1,403 +0,0 @@
-import json
-import os
-import pathlib
-import shutil
-import subprocess
-import uuid
-from collections import Counter, namedtuple
-from pathlib import Path
-from tempfile import NamedTemporaryFile, mkdtemp
-
-import requests
-import urllib3.util
-from git import Repo
-
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers.git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from pr_agent.git_providers.local_git_provider import PullRequestMimic
-from pr_agent.log import get_logger
-
-
-def _call(*command, **kwargs) -> (int, str, str):
-    res = subprocess.run(
-        command,
-        stdout=subprocess.PIPE,
-        stderr=subprocess.PIPE,
-        check=True,
-        **kwargs,
-    )
-    return res.stdout.decode()
-
-
-def clone(url, directory):
-    get_logger().info("Cloning %s to %s", url, directory)
-    stdout = _call('git', 'clone', "--depth", "1", url, directory)
-    get_logger().info(stdout)
-
-
-def fetch(url, refspec, cwd):
-    get_logger().info("Fetching %s %s", url, refspec)
-    stdout = _call(
-        'git', 'fetch', '--depth', '2', url, refspec,
-        cwd=cwd
-    )
-    get_logger().info(stdout)
-
-
-def checkout(cwd):
-    get_logger().info("Checking out")
-    stdout = _call('git', 'checkout', "FETCH_HEAD", cwd=cwd)
-    get_logger().info(stdout)
-
-
-def show(*args, cwd=None):
-    get_logger().info("Show")
-    return _call('git', 'show', *args, cwd=cwd)
-
-
-def diff(*args, cwd=None):
-    get_logger().info("Diff")
-    patch = _call('git', 'diff', *args, cwd=cwd)
-    if not patch:
-        get_logger().warning("No changes found")
-        return
-    return patch
-
-
-def reset_local_changes(cwd):
-    get_logger().info("Reset local changes")
-    _call('git', 'checkout', "--force", cwd=cwd)
-
-
-def add_comment(url: urllib3.util.Url, refspec, message):
-    *_, patchset, changenum = refspec.rsplit("/")
-    message = "'" + message.replace("'", "'\"'\"'") + "'"
-    return _call(
-        "ssh",
-        "-p", str(url.port),
-        f"{url.auth}@{url.host}",
-        "gerrit", "review",
-        "--message", message,
-        # "--code-review", score,
-        f"{patchset},{changenum}",
-    )
-
-
-def list_comments(url: urllib3.util.Url, refspec):
-    *_, patchset, _ = refspec.rsplit("/")
-    stdout = _call(
-        "ssh",
-        "-p", str(url.port),
-        f"{url.auth}@{url.host}",
-        "gerrit", "query",
-        "--comments",
-        "--current-patch-set", patchset,
-        "--format", "JSON",
-    )
-    change_set, *_ = stdout.splitlines()
-    return json.loads(change_set)["currentPatchSet"]["comments"]
-
-
-def prepare_repo(url: urllib3.util.Url, project, refspec):
-    repo_url = (f"{url.scheme}://{url.auth}@{url.host}:{url.port}/{project}")
-
-    directory = pathlib.Path(mkdtemp())
-    clone(repo_url, directory),
-    fetch(repo_url, refspec, cwd=directory)
-    checkout(cwd=directory)
-    return directory
-
-
-def adopt_to_gerrit_message(message):
-    lines = message.splitlines()
-    buf = []
-    for line in lines:
-        # remove markdown formatting
-        line = (line.replace("*", "")
-                .replace("``", "`")
-                .replace("<details>", "")
-                .replace("</details>", "")
-                .replace("<summary>", "")
-                .replace("</summary>", ""))
-
-        line = line.strip()
-        if line.startswith('#'):
-            buf.append("\n" +
-                       line.replace('#', '').removesuffix(":").strip() +
-                       ":")
-            continue
-        elif line.startswith('-'):
-            buf.append(line.removeprefix('-').strip())
-            continue
-        else:
-            buf.append(line)
-    return "\n".join(buf).strip()
-
-
-def add_suggestion(src_filename, context: str, start, end: int):
-    with (
-        NamedTemporaryFile("w", delete=False) as tmp,
-        open(src_filename, "r") as src
-    ):
-        lines = src.readlines()
-        tmp.writelines(lines[:start - 1])
-        if context:
-            tmp.write(context)
-        tmp.writelines(lines[end:])
-
-    shutil.copy(tmp.name, src_filename)
-    os.remove(tmp.name)
-
-
-def upload_patch(patch, path):
-    patch_server_endpoint = get_settings().get(
-        'gerrit.patch_server_endpoint')
-    patch_server_token = get_settings().get(
-        'gerrit.patch_server_token')
-
-    response = requests.post(
-        patch_server_endpoint,
-        json={
-            "content": patch,
-            "path": path,
-        },
-        headers={
-            "Content-Type": "application/json",
-            "Authorization": f"Bearer {patch_server_token}",
-        }
-    )
-    response.raise_for_status()
-    patch_server_endpoint = patch_server_endpoint.rstrip("/")
-    return patch_server_endpoint + "/" + path
-
-
-class GerritProvider(GitProvider):
-
-    def __init__(self, key: str, incremental=False):
-        self.project, self.refspec = key.split(':')
-        assert self.project, "Project name is required"
-        assert self.refspec, "Refspec is required"
-        base_url = get_settings().get('gerrit.url')
-        assert base_url, "Gerrit URL is required"
-        user = get_settings().get('gerrit.user')
-        assert user, "Gerrit user is required"
-
-        parsed = urllib3.util.parse_url(base_url)
-        self.parsed_url = urllib3.util.parse_url(
-            f"{parsed.scheme}://{user}@{parsed.host}:{parsed.port}"
-        )
-
-        self.repo_path = prepare_repo(
-            self.parsed_url, self.project, self.refspec
-        )
-        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):
-        """
-        Substitutes the branch-name as the PR-mimic title.
-        """
-        return self.repo.branches[0].name
-
-    def get_issue_comments(self):
-        comments = list_comments(self.parsed_url, self.refspec)
-        Comments = namedtuple('Comments', ['reversed'])
-        Comment = namedtuple('Comment', ['body'])
-        return Comments([Comment(c['message']) for c in reversed(comments)])
-
-    def get_pr_labels(self):
-        raise NotImplementedError(
-            'Getting labels is not implemented for the gerrit provider')
-
-    def add_eyes_reaction(self, issue_comment_id: int):
-        raise NotImplementedError(
-            'Adding reactions is not implemented for the gerrit provider')
-
-    def remove_reaction(self, issue_comment_id: int, reaction_id: int):
-        raise NotImplementedError(
-            'Removing reactions is not implemented for the gerrit provider')
-
-    def get_commit_messages(self):
-        return [self.repo.head.commit.message]
-
-    def get_repo_settings(self):
-        try:
-            with open(self.repo_path / ".pr_agent.toml", 'rb') as f:
-                contents = f.read()
-            return contents
-        except OSError:
-            return b""
-
-    def get_diff_files(self) -> list[FilePatchInfo]:
-        diffs = self.repo.head.commit.diff(
-            self.repo.head.commit.parents[0],  # previous commit
-            create_patch=True,
-            R=True
-        )
-
-        diff_files = []
-        for diff_item in diffs:
-            if diff_item.a_blob is not None:
-                original_file_content_str = (
-                    diff_item.a_blob.data_stream.read().decode('utf-8')
-                )
-            else:
-                original_file_content_str = ""  # empty file
-            if diff_item.b_blob is not None:
-                new_file_content_str = diff_item.b_blob.data_stream.read(). \
-                    decode('utf-8')
-            else:
-                new_file_content_str = ""  # empty file
-            edit_type = EDIT_TYPE.MODIFIED
-            if diff_item.new_file:
-                edit_type = EDIT_TYPE.ADDED
-            elif diff_item.deleted_file:
-                edit_type = EDIT_TYPE.DELETED
-            elif diff_item.renamed_file:
-                edit_type = EDIT_TYPE.RENAMED
-            diff_files.append(
-                FilePatchInfo(
-                    original_file_content_str,
-                    new_file_content_str,
-                    diff_item.diff.decode('utf-8'),
-                    diff_item.b_path,
-                    edit_type=edit_type,
-                    old_filename=None
-                    if diff_item.a_path == diff_item.b_path
-                    else diff_item.a_path
-                )
-            )
-        self.diff_files = diff_files
-        return diff_files
-
-    def get_files(self):
-        diff_index = self.repo.head.commit.diff(
-            self.repo.head.commit.parents[0],  # previous commit
-            R=True
-        )
-        # Get the list of changed files
-        diff_files = [item.a_path for item in diff_index]
-        return diff_files
-
-    def get_languages(self):
-        """
-        Calculate percentage of languages in repository. Used for hunk
-        prioritisation.
-        """
-        # Get all files in repository
-        filepaths = [Path(item.path) for item in
-                     self.repo.tree().traverse() if item.type == 'blob']
-        # Identify language by file extension and count
-        lang_count = Counter(
-            ext.lstrip('.') for filepath in filepaths for ext in
-            [filepath.suffix.lower()])
-        # Convert counts to percentages
-        total_files = len(filepaths)
-        lang_percentage = {lang: count / total_files * 100 for lang, count
-                           in lang_count.items()}
-        return lang_percentage
-
-    def get_pr_description_full(self):
-        return self.repo.head.commit.message
-
-    def get_user_id(self):
-        return self.repo.head.commit.author.email
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in [
-            # 'get_issue_comments',
-            'create_inline_comment',
-            'publish_inline_comments',
-            'get_labels',
-            'gfm_markdown'
-        ]:
-            return False
-        return True
-
-    def split_suggestion(self, msg) -> tuple[str, str]:
-        is_code_context = False
-        description = []
-        context = []
-        for line in msg.splitlines():
-            if line.startswith('```suggestion'):
-                is_code_context = True
-                continue
-            if line.startswith('```'):
-                is_code_context = False
-                continue
-            if is_code_context:
-                context.append(line)
-            else:
-                description.append(
-                    line.replace('*', '')
-                )
-
-        return (
-            '\n'.join(description),
-            '\n'.join(context) + '\n' if context else ''
-        )
-
-    def publish_code_suggestions(self, code_suggestions: list):
-        msg = []
-        for suggestion in code_suggestions:
-            description, code = self.split_suggestion(suggestion['body'])
-            add_suggestion(
-                pathlib.Path(self.repo_path) / suggestion["relevant_file"],
-                code,
-                suggestion["relevant_lines_start"],
-                suggestion["relevant_lines_end"],
-            )
-            patch = diff(cwd=self.repo_path)
-            patch_id = uuid.uuid4().hex[0:4]
-            path = "/".join(["codium-ai", self.refspec, patch_id])
-            full_path = upload_patch(patch, path)
-            reset_local_changes(self.repo_path)
-            msg.append(f'* {description}\n{full_path}')
-
-        if msg:
-            add_comment(self.parsed_url, self.refspec, "\n".join(msg))
-            return True
-
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        if not is_temporary:
-            msg = adopt_to_gerrit_message(pr_comment)
-            add_comment(self.parsed_url, self.refspec, msg)
-
-    def publish_description(self, pr_title: str, pr_body: str):
-        msg = adopt_to_gerrit_message(pr_body)
-        add_comment(self.parsed_url, self.refspec, pr_title + '\n' + msg)
-
-    def publish_inline_comments(self, comments: list[dict]):
-        raise NotImplementedError(
-            'Publishing inline comments is not implemented for the gerrit '
-            'provider')
-
-    def publish_inline_comment(self, body: str, relevant_file: str,
-                               relevant_line_in_file: str):
-        raise NotImplementedError(
-            'Publishing inline comments is not implemented for the gerrit '
-            'provider')
-
-    def create_inline_comment(self, body: str, relevant_file: str,
-                              relevant_line_in_file: str):
-        raise NotImplementedError(
-            'Creating inline comments is not implemented for the gerrit '
-            'provider')
-
-    def publish_labels(self, labels):
-        # Not applicable to the local git provider,
-        # but required by the interface
-        pass
-
-    def remove_initial_comment(self):
-        # remove repo, cloned in previous steps
-        # 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

@@ -3,10 +3,6 @@ from dataclasses import dataclass
 
 # enum EDIT_TYPE (ADDED, DELETED, MODIFIED, RENAMED)
 from enum import Enum
-from typing import Optional
-
-from pr_agent.config_loader import get_settings
-from pr_agent.log import get_logger
 
 
 class EDIT_TYPE(Enum):
@@ -14,7 +10,6 @@ class EDIT_TYPE(Enum):
     DELETED = 2
     MODIFIED = 3
     RENAMED = 4
-    UNKNOWN = 5
 
 
 @dataclass
@@ -24,10 +19,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):
@@ -44,7 +37,31 @@ class GitProvider(ABC):
         pass
 
     @abstractmethod
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
+    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):
+        pass
+
+    @abstractmethod
+    def publish_labels(self, labels):
+        pass
+
+    @abstractmethod
+    def remove_initial_comment(self):
         pass
 
     @abstractmethod
@@ -60,167 +77,50 @@ class GitProvider(ABC):
         pass
 
     @abstractmethod
-    def get_pr_description_full(self) -> str:
-        pass
-
-    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)
-        description = self.get_pr_description_full() if full else self.get_user_description()
-        if max_tokens_description:
-            return clip_tokens(description, max_tokens_description)
-        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")):
-            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
-        if "## User Description:" not in description:
-            return ""
-        # 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):
+    def get_pr_description(self):
         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):
-        pass
-
-    @abstractmethod
-    def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
-        pass
-
-    @abstractmethod
-    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:
-        return ""
 
 def get_main_pr_language(languages, files) -> str:
     """
     Get the main language of the commit. Return an empty string if cannot determine.
     """
     main_language_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()
 
         # 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
+        # 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 == 'swift' and top_language == 'swift':
+            main_language_str = top_language
 
-        ## old approach:
-        # most_common_extension = max(set(extension_list), key=extension_list.count)
-        # if most_common_extension == 'py' and top_language == 'python' or \
-        #         most_common_extension == 'js' and top_language == 'javascript' or \
-        #         most_common_extension == 'ts' and top_language == 'typescript' or \
-        #         most_common_extension == 'tsx' and top_language == 'typescript' or \
-        #         most_common_extension == 'go' and top_language == 'go' or \
-        #         most_common_extension == 'java' and top_language == 'java' or \
-        #         most_common_extension == 'c' and top_language == 'c' or \
-        #         most_common_extension == 'cpp' and top_language == 'c++' or \
-        #         most_common_extension == 'cs' and top_language == 'c#' or \
-        #         most_common_extension == 'swift' and top_language == 'swift' or \
-        #         most_common_extension == 'php' and top_language == 'php' or \
-        #         most_common_extension == 'rb' and top_language == 'ruby' or \
-        #         most_common_extension == 'rs' and top_language == 'rust' or \
-        #         most_common_extension == 'scala' and top_language == 'scala' or \
-        #         most_common_extension == 'kt' and top_language == 'kotlin' or \
-        #         most_common_extension == 'pl' and top_language == 'perl' or \
-        #         most_common_extension == top_language:
-        #     main_language_str = top_language
-
-    except Exception as e:
-        get_logger().exception(e)
+    except Exception:
         pass
 
     return main_language_str
@@ -230,13 +130,5 @@ 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
-
-    @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
+        self.first_new_commit_sha = None
+        self.last_seen_commit_sha = None

pr_agent/git_providers/github_provider.py

@@ -1,40 +1,31 @@
-import hashlib
+import logging
 from datetime import datetime
 from typing import Optional, Tuple
 from urllib.parse import urlparse
 
-from github import AppAuthentication, Auth, Github, GithubException
-from retry import retry
-from starlette_context import context
+from github import AppAuthentication, Github, Auth
 
+from pr_agent.config_loader import settings
+
+from .git_provider import FilePatchInfo, GitProvider, IncrementalPR
 from ..algo.language_handler import is_valid_file
-from ..algo.pr_processing import find_line_number_of_relevant_line_in_file
-from ..algo.utils import load_large_diff, clip_tokens
-from ..config_loader import get_settings
-from ..log import get_logger
-from ..servers.utils import RateLimitExceeded
-from .git_provider import FilePatchInfo, GitProvider, IncrementalPR, EDIT_TYPE
+from ..algo.utils import load_large_diff
 
 
 class GithubProvider(GitProvider):
     def __init__(self, pr_url: Optional[str] = None, incremental=IncrementalPR(False)):
         self.repo_obj = None
-        try:
-            self.installation_id = context.get("installation_id", None)
-        except Exception:
-            self.installation_id = None
+        self.installation_id = settings.get("GITHUB.INSTALLATION_ID")
         self.github_client = self._get_github_client()
         self.repo = None
         self.pr_num = None
         self.pr = None
         self.github_user_id = None
         self.diff_files = None
-        self.git_files = None
         self.incremental = incremental
-        if pr_url and 'pull' in pr_url:
+        if 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,149 +42,72 @@ class GithubProvider(GitProvider):
     def get_incremental_commits(self):
         self.commits = list(self.pr.get_commits())
 
-        self.previous_review = self.get_previous_review(full=True, incremental=True)
+        self.get_previous_review()
         if self.previous_review:
             self.incremental.commits_range = self.get_commit_range()
             # Get all files changed during the commit range
             self.file_set = dict()
             for commit in self.incremental.commits_range:
                 if commit.commit.message.startswith(f"Merge branch '{self._get_repo().default_branch}'"):
-                    get_logger().info(f"Skipping merge commit {commit.commit.message}")
+                    logging.info(f"Skipping merge commit {commit.commit.message}")
                     continue
                 self.file_set.update({file.filename: file for file in commit.files})
-        else:
-            raise ValueError("No previous review found")
 
     def get_commit_range(self):
         last_review_time = self.previous_review.created_at
-        first_new_commit_index = None
+        first_new_commit_index = 0
         for index in range(len(self.commits) - 1, -1, -1):
             if self.commits[index].commit.author.date > last_review_time:
-                self.incremental.first_new_commit = self.commits[index]
+                self.incremental.first_new_commit_sha = self.commits[index].sha
                 first_new_commit_index = index
             else:
-                self.incremental.last_seen_commit = self.commits[index]
+                self.incremental.last_seen_commit_sha = self.commits[index].sha
                 break
-        return self.commits[first_new_commit_index:] if first_new_commit_index is not None else []
+        return self.commits[first_new_commit_index:]
 
-    def get_previous_review(self, *, full: bool, incremental: bool):
-        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"):
+                self.previous_review = self.comments[index]
+                break
 
     def get_files(self):
         if self.incremental.is_incremental and self.file_set:
             return self.file_set.values()
-        if not self.git_files:
-            # bring files from GitHub only once
-            self.git_files = self.pr.get_files()
-        return self.git_files
+        return self.pr.get_files()
 
-    @retry(exceptions=RateLimitExceeded,
-           tries=get_settings().github.ratelimit_retries, delay=2, backoff=2, jitter=(1, 3))
     def get_diff_files(self) -> list[FilePatchInfo]:
-        """
-        Retrieves the list of files that have been modified, added, deleted, or renamed in a pull request in GitHub,
-        along with their content and patch information.
-
-        Returns:
-            diff_files (List[FilePatchInfo]): List of FilePatchInfo objects representing the modified, added, deleted,
-            or renamed files in the merge request.
-        """
-        try:
-            if self.diff_files:
-                return self.diff_files
-
-            files = self.get_files()
-            diff_files = []
-
-            for file in files:
-                if not is_valid_file(file.filename):
-                    continue
-
-                new_file_content_str = self._get_pr_file_content(file, self.pr.head.sha)  # communication with GitHub
+        files = self.get_files()
+        diff_files = []
+        for file in files:
+            if is_valid_file(file.filename):
+                new_file_content_str = self._get_pr_file_content(file, self.pr.head.sha)
                 patch = file.patch
-
                 if self.incremental.is_incremental and self.file_set:
                     original_file_content_str = self._get_pr_file_content(file, self.incremental.last_seen_commit_sha)
-                    patch = load_large_diff(file.filename, new_file_content_str, original_file_content_str)
+                    patch = load_large_diff(file,
+                                            new_file_content_str,
+                                            original_file_content_str,
+                                             None)
                     self.file_set[file.filename] = patch
                 else:
                     original_file_content_str = self._get_pr_file_content(file, self.pr.base.sha)
-                    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)
-
-            self.diff_files = diff_files
-            return diff_files
-
-        except GithubException.RateLimitExceededException as e:
-            get_logger().error(f"Rate limit exceeded for GitHub API. Original message: {e}")
-            raise RateLimitExceeded("Rate limit exceeded for GitHub API.") from e
+                diff_files.append(
+                    FilePatchInfo(original_file_content_str, new_file_content_str, patch, file.filename))
+        self.diff_files = diff_files
+        return diff_files
 
     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)
+        # self.pr.create_issue_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}")
+        if is_temporary and not settings.config.publish_output_progress:
+            logging.debug(f"Skipping publish_comment for temporary comment: {pr_comment}")
             return
-
         response = self.pr.create_issue_comment(pr_comment)
         if hasattr(response, "user") and hasattr(response.user, "login"):
             self.github_user_id = response.user.login
@@ -205,22 +119,37 @@ class GithubProvider(GitProvider):
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
         self.publish_inline_comments([self.create_inline_comment(body, relevant_file, relevant_line_in_file)])
 
-
     def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        position, absolute_position = find_line_number_of_relevant_line_in_file(self.diff_files, relevant_file.strip('`'), relevant_line_in_file)
+        self.diff_files = self.diff_files if self.diff_files else self.get_diff_files()
+        position = -1
+        for file in self.diff_files:
+            if file.filename.strip() == relevant_file:
+                patch = file.patch
+                patch_lines = patch.splitlines()
+                for i, line in enumerate(patch_lines):
+                    if relevant_line_in_file in line:
+                        position = i
+                        break
+                    elif relevant_line_in_file[0] == '+' and relevant_line_in_file[1:].lstrip() in line:
+                        # The model often adds a '+' to the beginning of the relevant_line_in_file even if originally
+                        # it's a context line
+                        position = i
+                        break
         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}")
+            if settings.config.verbosity_level >= 2:
+                logging.info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
             subject_type = "FILE"
         else:
             subject_type = "LINE"
         path = relevant_file.strip()
+        # placeholder for future API support (already supported in single inline comment)
+        # return dict(body=body, path=path, position=position, subject_type=subject_type)
         return dict(body=body, path=path, position=position) if subject_type == "LINE" else {}
 
     def publish_inline_comments(self, comments: list[dict]):
         self.pr.create_review(commit=self.last_commit_id, comments=comments)
 
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
+    def publish_code_suggestions(self, code_suggestions: list):
         """
         Publishes code suggestions as comments on the PR.
         """
@@ -232,14 +161,14 @@ class GithubProvider(GitProvider):
             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(
+                if settings.config.verbosity_level >= 2:
+                    logging.exception(
                         f"Failed to publish code suggestion, relevant_lines_start is {relevant_lines_start}")
                 continue
 
             if relevant_lines_end < relevant_lines_start:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().exception(f"Failed to publish code suggestion, "
+                if settings.config.verbosity_level >= 2:
+                    logging.exception(f"Failed to publish code suggestion, "
                                       f"relevant_lines_end is {relevant_lines_end} and "
                                       f"relevant_lines_start is {relevant_lines_start}")
                 continue
@@ -265,23 +194,17 @@ class GithubProvider(GitProvider):
             self.pr.create_review(commit=self.last_commit_id, 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}")
+            if settings.config.verbosity_level >= 2:
+                logging.error(f"Failed to publish code suggestion, error: {e}")
             return False
 
     def remove_initial_comment(self):
         try:
             for comment in getattr(self.pr, 'comments_list', []):
                 if comment.is_temporary:
-                    self.remove_comment(comment)
+                    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}")
+            logging.exception(f"Failed to remove initial comment, error: {e}")
 
     def get_title(self):
         return self.pr.title
@@ -293,20 +216,19 @@ class GithubProvider(GitProvider):
     def get_pr_branch(self):
         return self.pr.head.ref
 
-    def get_pr_description_full(self):
+    def get_pr_description(self):
         return self.pr.body
 
     def get_user_id(self):
         if not self.github_user_id:
             try:
-                self.github_user_id = self.github_client.get_user().raw_data['login']
+                self.github_user_id = self.github_client.get_user().login
             except Exception as e:
-                self.github_user_id = ""
-                # logging.exception(f"Failed to get user id, error: {e}")
+                logging.exception(f"Failed to get user id, error: {e}")
         return self.github_user_id
 
     def get_notifications(self, since: datetime):
-        deployment_type = get_settings().get("GITHUB.DEPLOYMENT_TYPE", "user")
+        deployment_type = settings.get("GITHUB.DEPLOYMENT_TYPE", "user")
 
         if deployment_type != 'user':
             raise ValueError("Deployment mode must be set to 'user' to get notifications")
@@ -317,33 +239,6 @@ class GithubProvider(GitProvider):
     def get_issue_comments(self):
         return self.pr.get_issue_comments()
 
-    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
-            return contents
-        except Exception:
-            return ""
-
-    def add_eyes_reaction(self, issue_comment_id: int) -> Optional[int]:
-        try:
-            reaction = self.pr.get_issue_comment(issue_comment_id).create_reaction("eyes")
-            return reaction.id
-        except Exception as e:
-            get_logger().exception(f"Failed to add eyes reaction, error: {e}")
-            return None
-
-    def remove_reaction(self, issue_comment_id: int, reaction_id: int) -> bool:
-        try:
-            self.pr.get_issue_comment(issue_comment_id).delete_reaction(reaction_id)
-            return True
-        except Exception as e:
-            get_logger().exception(f"Failed to remove eyes reaction, error: {e}")
-            return False
-
-
     @staticmethod
     def _parse_pr_url(pr_url: str) -> Tuple[str, int]:
         parsed_url = urlparse(pr_url)
@@ -373,58 +268,29 @@ class GithubProvider(GitProvider):
 
         return repo_name, pr_number
 
-    @staticmethod
-    def _parse_issue_url(issue_url: str) -> Tuple[str, int]:
-        parsed_url = urlparse(issue_url)
-
-        if 'github.com' not in parsed_url.netloc:
-            raise ValueError("The provided URL is not a valid GitHub URL")
-
-        path_parts = parsed_url.path.strip('/').split('/')
-        if 'api.github.com' in parsed_url.netloc:
-            if len(path_parts) < 5 or path_parts[3] != 'issues':
-                raise ValueError("The provided URL does not appear to be a GitHub ISSUE URL")
-            repo_name = '/'.join(path_parts[1:3])
-            try:
-                issue_number = int(path_parts[4])
-            except ValueError as e:
-                raise ValueError("Unable to convert issue number to integer") from e
-            return repo_name, issue_number
-
-        if len(path_parts) < 4 or path_parts[2] != 'issues':
-            raise ValueError("The provided URL does not appear to be a GitHub PR issue")
-
-        repo_name = '/'.join(path_parts[:2])
-        try:
-            issue_number = int(path_parts[3])
-        except ValueError as e:
-            raise ValueError("Unable to convert issue number to integer") from e
-
-        return repo_name, issue_number
-
     def _get_github_client(self):
-        deployment_type = get_settings().get("GITHUB.DEPLOYMENT_TYPE", "user")
+        deployment_type = settings.get("GITHUB.DEPLOYMENT_TYPE", "user")
 
         if deployment_type == 'app':
             try:
-                private_key = get_settings().github.private_key
-                app_id = get_settings().github.app_id
+                private_key = settings.github.private_key
+                app_id = settings.github.app_id
             except AttributeError as e:
                 raise ValueError("GitHub app ID and private key are required when using GitHub app deployment") from e
             if not self.installation_id:
                 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:
-                token = get_settings().github.user_token
+                token = settings.github.user_token
             except AttributeError as e:
                 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 \
@@ -448,9 +314,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",
-                               "Other": "d1bcf9"}
+            label_color_map = {"Bug fix": "1d76db", "Tests": "e99695", "Bug fix with tests": "c5def5", "Refactoring": "bfdadc", "Enhancement": "bfd4f2", "Documentation": "d4c5f9", "Other": "d1bcf9"}
             post_parameters = []
             for p in pr_types:
                 color = label_color_map.get(p, "d1bcf9")  # default to "Other" color
@@ -458,77 +322,5 @@ class GithubProvider(GitProvider):
             headers, data = self.pr._requester.requestJsonAndCheck(
                 "PUT", f"{self.pr.issue_url}/labels", input=post_parameters
             )
-        except Exception as e:
-            get_logger().exception(f"Failed to publish labels, error: {e}")
-
-    def get_pr_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.
-
-        Returns:
-            str: A string containing the commit messages of the pull request.
-        """
-        max_tokens = get_settings().get("CONFIG.MAX_COMMITS_TOKENS", None)
-        try:
-            commit_list = self.pr.get_commits()
-            commit_messages = [commit.commit.message for commit in commit_list]
-            commit_messages_str = "\n".join([f"{i + 1}. {message}" for i, message in enumerate(commit_messages)])
-        except Exception:
-            commit_messages_str = ""
-        if max_tokens:
-            commit_messages_str = clip_tokens(commit_messages_str, max_tokens)
-        return commit_messages_str
-
-    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 ""
-
-            position, absolute_position = find_line_number_of_relevant_line_in_file \
-                (self.diff_files, relevant_file, relevant_line_str)
-
-            if absolute_position != -1:
-                # # link to right file only
-                # link = f"https://github.com/{self.repo}/blob/{self.pr.head.sha}/{relevant_file}" \
-                #        + "#" + f"L{absolute_position}"
-
-                # link to diff
-                sha_file = hashlib.sha256(relevant_file.encode('utf-8')).hexdigest()
-                link = f"https://github.com/{self.repo}/pull/{self.pr_num}/files#diff-{sha_file}R{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 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 ""
+            logging.exception("Failed to publish labels")

pr_agent/git_providers/gitlab_provider.py

@@ -1,4 +1,4 @@
-import hashlib
+import logging
 import re
 from typing import Optional, Tuple
 from urllib.parse import urlparse
@@ -6,45 +6,36 @@ from urllib.parse import urlparse
 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 ..config_loader import get_settings
+from pr_agent.config_loader import settings
+
 from .git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from ..log import get_logger
+from ..algo.language_handler import is_valid_file
 
 
-class DiffNotFoundError(Exception):
-    """Raised when the diff for a merge request cannot be found."""
-    pass
-
 class GitLabProvider(GitProvider):
-
     def __init__(self, merge_request_url: Optional[str] = None, incremental: Optional[bool] = False):
-        gitlab_url = get_settings().get("GITLAB.URL", None)
+        gitlab_url = settings.get("GITLAB.URL", None)
         if not gitlab_url:
             raise ValueError("GitLab URL is not set in the config file")
-        gitlab_access_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
+        gitlab_access_token = settings.get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
         if not gitlab_access_token:
             raise ValueError("GitLab personal access token is not set in the config file")
         self.gl = gitlab.Gitlab(
-            url=gitlab_url,
-            oauth_token=gitlab_access_token
+            gitlab_url,
+            gitlab_access_token
         )
         self.id_project = None
         self.id_mr = None
         self.mr = None
         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']:
             return False
         return True
 
@@ -56,12 +47,7 @@ class GitLabProvider(GitProvider):
     def _set_merge_request(self, merge_request_url: str):
         self.id_project, self.id_mr = self._parse_merge_request_url(merge_request_url)
         self.mr = self._get_merge_request()
-        try:
-            self.last_diff = self.mr.diffs.list(get_all=True)[-1]
-        except IndexError as e:
-            get_logger().error(f"Could not get diff for merge request {self.id_mr}")
-            raise DiffNotFoundError(f"Could not get diff for merge request {self.id_mr}") from e
-
+        self.last_diff = self.mr.diffs.list()[-1]
 
     def _get_pr_file_content(self, file_path: str, branch: str) -> str:
         try:
@@ -72,36 +58,12 @@ class GitLabProvider(GitProvider):
             return ''
 
     def get_diff_files(self) -> list[FilePatchInfo]:
-        """
-        Retrieves the list of files that have been modified, added, deleted, or renamed in a pull request in GitLab,
-        along with their content and patch information.
-
-        Returns:
-            diff_files (List[FilePatchInfo]): List of FilePatchInfo objects representing the modified, added, deleted,
-            or renamed files in the merge request.
-        """
-
-        if self.diff_files:
-            return self.diff_files
-
         diffs = self.mr.changes()['changes']
         diff_files = []
         for diff in diffs:
             if is_valid_file(diff['new_path']):
-                # original_file_content_str = self._get_pr_file_content(diff['old_path'], self.mr.target_branch)
-                # new_file_content_str = self._get_pr_file_content(diff['new_path'], self.mr.source_branch)
-                original_file_content_str = self._get_pr_file_content(diff['old_path'], self.mr.diff_refs['base_sha'])
-                new_file_content_str = self._get_pr_file_content(diff['new_path'], self.mr.diff_refs['head_sha'])
-
-                try:
-                    if isinstance(original_file_content_str, bytes):
-                        original_file_content_str = bytes.decode(original_file_content_str, 'utf-8')
-                    if isinstance(new_file_content_str, bytes):
-                        new_file_content_str = bytes.decode(new_file_content_str, 'utf-8')
-                except UnicodeDecodeError:
-                    get_logger().warning(
-                        f"Cannot decode file {diff['old_path']} or {diff['new_path']} in merge request {self.id_mr}")
-
+                original_file_content_str = self._get_pr_file_content(diff['old_path'], self.mr.target_branch)
+                new_file_content_str = self._get_pr_file_content(diff['new_path'], self.mr.source_branch)
                 edit_type = EDIT_TYPE.MODIFIED
                 if diff['new_file']:
                     edit_type = EDIT_TYPE.ADDED
@@ -109,33 +71,23 @@ class GitLabProvider(GitProvider):
                     edit_type = EDIT_TYPE.DELETED
                 elif diff['renamed_file']:
                     edit_type = EDIT_TYPE.RENAMED
-
-                filename = diff['new_path']
-                patch = diff['diff']
-                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('-')])
+                try:
+                    if isinstance(original_file_content_str, bytes):
+                        original_file_content_str = bytes.decode(original_file_content_str, 'utf-8')
+                    if isinstance(new_file_content_str, bytes):
+                        new_file_content_str = bytes.decode(new_file_content_str, 'utf-8')
+                except UnicodeDecodeError:
+                    logging.warning(
+                        f"Cannot decode file {diff['old_path']} or {diff['new_path']} in merge request {self.id_mr}")
                 diff_files.append(
-                    FilePatchInfo(original_file_content_str, new_file_content_str,
-                                  patch=patch,
-                                  filename=filename,
+                    FilePatchInfo(original_file_content_str, new_file_content_str, diff['diff'], diff['new_path'],
                                   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
 
     def get_files(self):
-        if not self.git_files:
-            self.git_files = [change['new_path'] for change in self.mr.changes()['changes']]
-        return self.git_files
+        return [change['new_path'] for change in self.mr.changes()['changes']]
 
     def publish_description(self, pr_title: str, pr_body: str):
         try:
@@ -143,34 +95,7 @@ class GitLabProvider(GitProvider):
             self.mr.description = pr_body
             self.mr.save()
         except Exception as e:
-            get_logger().exception(f"Could not update merge request {self.id_mr} description: {e}")
-
-    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)
+            logging.exception(f"Could not update merge request {self.id_mr} description: {e}")
 
     def publish_comment(self, mr_comment: str, is_temporary: bool = False):
         comment = self.mr.notes.create({'body': mr_comment})
@@ -178,6 +103,7 @@ class GitLabProvider(GitProvider):
             self.temp_comments.append(comment)
 
     def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
+        self.diff_files = self.diff_files if self.diff_files else self.get_diff_files()
         edit_type, found, source_line_no, target_file, target_line_no = self.search_line(relevant_file,
                                                                                          relevant_line_in_file)
         self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
@@ -186,23 +112,19 @@ class GitLabProvider(GitProvider):
     def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
         raise NotImplementedError("Gitlab provider does not support creating inline comments yet")
 
-    def create_inline_comments(self, comments: list[dict]):
+    def create_inline_comment(self, comments: list[dict]):
         raise NotImplementedError("Gitlab provider does not support publishing inline comments yet")
 
-    def send_inline_comment(self,body: str,edit_type: str,found: bool,relevant_file: str,relevant_line_in_file: int,
-                            source_line_no: int, target_file: str,target_line_no: int) -> None:
+    def send_inline_comment(self, body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
+                            target_file, target_line_no):
         if not found:
-            get_logger().info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
+            logging.info(f"Could not find position for {relevant_file} {relevant_line_in_file}")
         else:
-            # in order to have exact sha's we have to find correct diff for this change
-            diff = self.get_relevant_diff(relevant_file, relevant_line_in_file)
-            if diff is None:
-                get_logger().error(f"Could not get diff for merge request {self.id_mr}")
-                raise DiffNotFoundError(f"Could not get diff for merge request {self.id_mr}")
+            d = self.last_diff
             pos_obj = {'position_type': 'text',
                        'new_path': target_file.filename,
                        'old_path': target_file.old_filename if target_file.old_filename else target_file.filename,
-                       'base_sha': diff.base_commit_sha, 'start_sha': diff.start_commit_sha, 'head_sha': diff.head_commit_sha}
+                       'base_sha': d.base_commit_sha, 'start_sha': d.start_commit_sha, 'head_sha': d.head_commit_sha}
             if edit_type == 'deletion':
                 pos_obj['old_line'] = source_line_no - 1
             elif edit_type == 'addition':
@@ -210,71 +132,38 @@ class GitLabProvider(GitProvider):
             else:
                 pos_obj['new_line'] = target_line_no - 1
                 pos_obj['old_line'] = source_line_no - 1
-            get_logger().debug(f"Creating comment in {self.id_mr} with body {body} and position {pos_obj}")
-            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
-        if not changes:
-            get_logger().error('No changes found for the merge request.')
-            return None
-        all_diffs = self.mr.diffs.list(get_all=True)
-        if not all_diffs:
-            get_logger().error('No diffs found for the merge request.')
-            return None
-        for diff in all_diffs:
-            for change in changes['changes']:
-                if change['new_path'] == relevant_file and relevant_line_in_file in change['diff']:
-                    return diff
-            get_logger().debug(
-                f'No relevant diff found for {relevant_file} {relevant_line_in_file}. Falling back to last diff.')
-        return self.last_diff  # fallback to last_diff if no relevant diff is found
-
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
+    def publish_code_suggestions(self, code_suggestions: list):
         for suggestion in code_suggestions:
-            try:
-                body = suggestion['body']
-                relevant_file = suggestion['relevant_file']
-                relevant_lines_start = suggestion['relevant_lines_start']
-                relevant_lines_end = suggestion['relevant_lines_end']
+            body = suggestion['body']
+            relevant_file = suggestion['relevant_file']
+            relevant_lines_start = suggestion['relevant_lines_start']
+            relevant_lines_end = suggestion['relevant_lines_end']
 
-                diff_files = self.get_diff_files()
-                target_file = None
-                for file in diff_files:
+            self.diff_files = self.diff_files if self.diff_files else self.get_diff_files()
+            target_file = None
+            for file in self.diff_files:
+                if file.filename == relevant_file:
                     if file.filename == relevant_file:
-                        if file.filename == relevant_file:
-                            target_file = file
-                            break
-                range = relevant_lines_end - relevant_lines_start # no need to add 1
-                body = body.replace('```suggestion', f'```suggestion:-0+{range}')
-                lines = target_file.head_file.splitlines()
-                relevant_line_in_file = lines[relevant_lines_start - 1]
+                        target_file = file
+                        break
+            range = relevant_lines_end - relevant_lines_start + 1
+            body = body.replace('```suggestion', f'```suggestion:-0+{range}')
 
-                # edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file,
-                #                                                                            relevant_line_in_file)
-                # for code suggestions, we want to edit the new code
-                source_line_no = None
-                target_line_no = relevant_lines_start + 1
-                found = True
-                edit_type = 'addition'
-
-                self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
-                                         target_file, target_line_no)
-            except Exception as e:
-                get_logger().exception(f"Could not publish code suggestion:\nsuggestion: {suggestion}\nerror: {e}")
-
-        # note that we publish suggestions one-by-one. so, if one fails, the rest will still be published
-        return True
+            lines = target_file.head_file.splitlines()
+            relevant_line_in_file = lines[relevant_lines_start - 1]
+            edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(target_file,
+                                                                                              relevant_line_in_file)
+            self.send_inline_comment(body, edit_type, found, relevant_file, relevant_line_in_file, source_line_no,
+                                     target_file, target_line_no)
 
     def search_line(self, relevant_file, relevant_line_in_file):
         target_file = None
 
         edit_type = self.get_edit_type(relevant_line_in_file)
-        for file in self.get_diff_files():
+        for file in self.diff_files:
             if file.filename == relevant_file:
                 edit_type, found, source_line_no, target_file, target_line_no = self.find_in_file(file,
                                                                                                   relevant_line_in_file)
@@ -327,15 +216,9 @@ 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}")
+            logging.exception(f"Failed to remove temp comments, error: {e}")
 
     def get_title(self):
         return self.mr.title
@@ -347,49 +230,26 @@ class GitLabProvider(GitProvider):
     def get_pr_branch(self):
         return self.mr.source_branch
 
-    def get_pr_description_full(self):
+    def get_pr_description(self):
         return self.mr.description
 
     def get_issue_comments(self):
         raise NotImplementedError("GitLab provider does not support issue comments yet")
 
-    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()
-            return contents
-        except Exception:
-            return ""
-
-    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
-
-    def _parse_merge_request_url(self, merge_request_url: str) -> Tuple[str, int]:
+    def _parse_merge_request_url(self, merge_request_url: str) -> Tuple[int, int]:
         parsed_url = urlparse(merge_request_url)
 
         path_parts = parsed_url.path.strip('/').split('/')
-        if 'merge_requests' not in path_parts:
+        if path_parts[-2] != 'merge_requests':
             raise ValueError("The provided URL does not appear to be a GitLab merge request URL")
 
-        mr_index = path_parts.index('merge_requests')
-        # Ensure there is an ID after 'merge_requests'
-        if len(path_parts) <= mr_index + 1:
-            raise ValueError("The provided URL does not contain a merge request ID")
-
         try:
-            mr_id = int(path_parts[mr_index + 1])
+            mr_id = int(path_parts[-1])
         except ValueError as e:
             raise ValueError("Unable to convert merge request ID to integer") from e
 
-        # Handle special delimiter (-)
-        project_path = "/".join(path_parts[:mr_index])
-        if project_path.endswith('/-'):
-            project_path = project_path[:-2]
-
-        # Return the path before 'merge_requests' and the ID
-        return project_path, mr_id
+        # Gitlab supports access by both project numeric ID as well as 'namespace/project_name'
+        return "/".join(path_parts[:2]), mr_id
 
     def _get_merge_request(self):
         mr = self.gl.projects.get(self.id_project).mergerequests.get(self.id_mr)
@@ -398,73 +258,8 @@ class GitLabProvider(GitProvider):
     def get_user_id(self):
         return None
 
-    def publish_labels(self, pr_types):
-        try:
-            self.mr.labels = list(set(pr_types))
-            self.mr.save()
-        except Exception as e:
-            get_logger().exception(f"Failed to publish labels, error: {e}")
-
-    def publish_inline_comments(self, comments: list[dict]):
+    def publish_labels(self, labels):
         pass
 
-    def get_pr_labels(self):
-        return self.mr.labels
-
-    def get_commit_messages(self):
-        """
-        Retrieves the commit messages of a pull request.
-
-        Returns:
-            str: A string containing the commit messages of the pull request.
-        """
-        max_tokens = get_settings().get("CONFIG.MAX_COMMITS_TOKENS", None)
-        try:
-            commit_messages_list = [commit['message'] for commit in self.mr.commits()._list]
-            commit_messages_str = "\n".join([f"{i + 1}. {message}" for i, message in enumerate(commit_messages_list)])
-        except Exception:
-            commit_messages_str = ""
-        if max_tokens:
-            commit_messages_str = clip_tokens(commit_messages_str, max_tokens)
-        return commit_messages_str
-
-    def get_pr_id(self):
-        try:
-            pr_id = self.mr.web_url
-            return pr_id
-        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("'")
-            relevant_line_str = suggestion['relevant line']
-            if not relevant_line_str:
-                return ""
-
-            position, absolute_position = find_line_number_of_relevant_line_in_file \
-                (self.diff_files, relevant_file, relevant_line_str)
-
-            if absolute_position != -1:
-                # link to right file only
-                link = f"https://gitlab.com/codiumai/pr-agent/-/blob/{self.mr.source_branch}/{relevant_file}?ref_type=heads#L{absolute_position}"
-
-                # # link to diff
-                # sha_file = hashlib.sha1(relevant_file.encode('utf-8')).hexdigest()
-                # link = f"{self.pr.web_url}/diffs#{sha_file}_{absolute_position}_{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]):
+        pass

pr_agent/git_providers/local_git_provider.py

@@ -1,182 +0,0 @@
-from collections import Counter
-from pathlib import Path
-from typing import List
-
-from git import Repo
-
-from pr_agent.config_loader import _find_repository_root, get_settings
-from pr_agent.git_providers.git_provider import EDIT_TYPE, FilePatchInfo, GitProvider
-from pr_agent.log import get_logger
-
-
-class PullRequestMimic:
-    """
-    This class mimics the PullRequest class from the PyGithub library for the LocalGitProvider.
-    """
-
-    def __init__(self, title: str, diff_files: List[FilePatchInfo]):
-        self.title = title
-        self.diff_files = diff_files
-
-
-class LocalGitProvider(GitProvider):
-    """
-    This class implements the GitProvider interface for local git repositories.
-    It mimics the PR functionality of the GitProvider interface,
-    but does not require a hosted git repository.
-    Instead of providing a PR url, the user provides a local branch path to generate a diff-patch.
-    For the MVP it only supports the /review and /describe capabilities.
-    """
-
-    def __init__(self, target_branch_name, incremental=False):
-        self.repo_path = _find_repository_root()
-        if self.repo_path is None:
-            raise ValueError('Could not find repository root')
-        self.repo = Repo(self.repo_path)
-        self.head_branch_name = self.repo.head.ref.name
-        self.target_branch_name = target_branch_name
-        self._prepare_repo()
-        self.diff_files = None
-        self.pr = PullRequestMimic(self.get_pr_title(), self.get_diff_files())
-        self.description_path = get_settings().get('local.description_path') \
-            if get_settings().get('local.description_path') is not None else self.repo_path / 'description.md'
-        self.review_path = get_settings().get('local.review_path') \
-            if get_settings().get('local.review_path') is not None else self.repo_path / 'review.md'
-        # inline code comments are not supported for local git repositories
-        get_settings().pr_reviewer.inline_code_comments = False
-
-    def _prepare_repo(self):
-        """
-        Prepare the repository for PR-mimic generation.
-        """
-        get_logger().debug('Preparing repository for PR-mimic generation...')
-        if self.repo.is_dirty():
-            raise ValueError('The repository is not in a clean state. Please commit or stash pending changes.')
-        if self.target_branch_name not in self.repo.heads:
-            raise KeyError(f'Branch: {self.target_branch_name} does not exist')
-
-    def is_supported(self, capability: str) -> bool:
-        if capability in ['get_issue_comments', 'create_inline_comment', 'publish_inline_comments', 'get_labels',
-                          'gfm_markdown']:
-            return False
-        return True
-
-    def get_diff_files(self) -> list[FilePatchInfo]:
-        diffs = self.repo.head.commit.diff(
-            self.repo.merge_base(self.repo.head, self.repo.branches[self.target_branch_name]),
-            create_patch=True,
-            R=True
-        )
-        diff_files = []
-        for diff_item in diffs:
-            if diff_item.a_blob is not None:
-                original_file_content_str = diff_item.a_blob.data_stream.read().decode('utf-8')
-            else:
-                original_file_content_str = ""  # empty file
-            if diff_item.b_blob is not None:
-                new_file_content_str = diff_item.b_blob.data_stream.read().decode('utf-8')
-            else:
-                new_file_content_str = ""  # empty file
-            edit_type = EDIT_TYPE.MODIFIED
-            if diff_item.new_file:
-                edit_type = EDIT_TYPE.ADDED
-            elif diff_item.deleted_file:
-                edit_type = EDIT_TYPE.DELETED
-            elif diff_item.renamed_file:
-                edit_type = EDIT_TYPE.RENAMED
-            diff_files.append(
-                FilePatchInfo(original_file_content_str,
-                              new_file_content_str,
-                              diff_item.diff.decode('utf-8'),
-                              diff_item.b_path,
-                              edit_type=edit_type,
-                              old_filename=None if diff_item.a_path == diff_item.b_path else diff_item.a_path
-                              )
-            )
-        self.diff_files = diff_files
-        return diff_files
-
-    def get_files(self) -> List[str]:
-        """
-        Returns a list of files with changes in the diff.
-        """
-        diff_index = self.repo.head.commit.diff(
-            self.repo.merge_base(self.repo.head, self.repo.branches[self.target_branch_name]),
-            R=True
-        )
-        # Get the list of changed files
-        diff_files = [item.a_path for item in diff_index]
-        return diff_files
-
-    def publish_description(self, pr_title: str, pr_body: str):
-        with open(self.description_path, "w") as file:
-            # Write the string to the file
-            file.write(pr_title + '\n' + pr_body)
-
-    def publish_comment(self, pr_comment: str, is_temporary: bool = False):
-        with open(self.review_path, "w") as file:
-            # Write the string to the file
-            file.write(pr_comment)
-
-    def publish_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        raise NotImplementedError('Publishing inline comments is not implemented for the local git provider')
-
-    def create_inline_comment(self, body: str, relevant_file: str, relevant_line_in_file: str):
-        raise NotImplementedError('Creating inline comments is not implemented for the local git provider')
-
-    def publish_inline_comments(self, comments: list[dict]):
-        raise NotImplementedError('Publishing inline comments is not implemented for the local git provider')
-
-    def publish_code_suggestion(self, body: str, relevant_file: str,
-                                relevant_lines_start: int, relevant_lines_end: int):
-        raise NotImplementedError('Publishing code suggestions is not implemented for the local git provider')
-
-    def publish_code_suggestions(self, code_suggestions: list) -> bool:
-        raise NotImplementedError('Publishing code suggestions is not implemented for the local git provider')
-
-    def publish_labels(self, labels):
-        pass  # Not applicable to the local git provider, but required by the interface
-
-    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.
-        """
-        # Get all files in repository
-        filepaths = [Path(item.path) for item in self.repo.tree().traverse() if item.type == 'blob']
-        # Identify language by file extension and count
-        lang_count = Counter(ext.lstrip('.') for filepath in filepaths for ext in [filepath.suffix.lower()])
-        # Convert counts to percentages
-        total_files = len(filepaths)
-        lang_percentage = {lang: count / total_files * 100 for lang, count in lang_count.items()}
-        return lang_percentage
-
-    def get_pr_branch(self):
-        return self.repo.head
-
-    def get_user_id(self):
-        return -1  # Not used anywhere for the local provider, but required by the interface
-
-    def get_pr_description_full(self):
-        commits_diff = list(self.repo.iter_commits(self.target_branch_name + '..HEAD'))
-        # Get the commit messages and concatenate
-        commit_messages = " ".join([commit.message for commit in commits_diff])
-        # TODO Handle the description better - maybe use gpt-3.5 summarisation here?
-        return commit_messages[:200]  # Use max 200 characters
-
-    def get_pr_title(self):
-        """
-        Substitutes the branch-name as the PR-mimic title.
-        """
-        return self.head_branch_name
-
-    def get_issue_comments(self):
-        raise NotImplementedError('Getting issue comments is not implemented for the local git provider')
-
-    def get_pr_labels(self):
-        raise NotImplementedError('Getting labels is not implemented for the local git provider')

pr_agent/git_providers/utils.py

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

pr_agent/log/__init__.py

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

pr_agent/secret_providers/__init__.py

@@ -1,16 +0,0 @@
-from pr_agent.config_loader import get_settings
-
-
-def get_secret_provider():
-    try:
-        provider_id = get_settings().config.secret_provider
-    except AttributeError as e:
-        raise ValueError("secret_provider is a required attribute in the configuration file") from e
-    try:
-        if provider_id == 'google_cloud_storage':
-            from pr_agent.secret_providers.google_cloud_storage_secret_provider import GoogleCloudStorageSecretProvider
-            return GoogleCloudStorageSecretProvider()
-        else:
-            raise ValueError(f"Unknown secret provider: {provider_id}")
-    except Exception as e:
-        raise ValueError(f"Failed to initialize secret provider {provider_id}") from e

pr_agent/secret_providers/google_cloud_storage_secret_provider.py

@@ -1,34 +0,0 @@
-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.secret_providers.secret_provider import SecretProvider
-
-
-class GoogleCloudStorageSecretProvider(SecretProvider):
-    def __init__(self):
-        try:
-            self.client = storage.Client.from_service_account_info(ujson.loads(get_settings().google_cloud_storage.
-                                                                               service_account))
-            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}")
-            raise e
-
-    def get_secret(self, secret_name: str) -> str:
-        try:
-            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}")
-            return ""
-
-    def store_secret(self, secret_name: str, secret_value: str):
-        try:
-            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}")
-            raise e

pr_agent/secret_providers/secret_provider.py

@@ -1,12 +0,0 @@
-from abc import ABC, abstractmethod
-
-
-class SecretProvider(ABC):
-
-    @abstractmethod
-    def get_secret(self, secret_name: str) -> str:
-        pass
-
-    @abstractmethod
-    def store_secret(self, secret_name: str, secret_value: str):
-        pass

pr_agent/servers/atlassian-connect.json

@@ -1,33 +0,0 @@
-{
-  "name": "CodiumAI PR-Agent",
-  "description": "CodiumAI PR-Agent",
-  "key": "app_key",
-  "vendor": {
-    "name": "CodiumAI",
-    "url": "https://codium.ai"
-  },
-  "authentication": {
-    "type": "jwt"
-  },
-  "baseUrl": "base_url",
-  "lifecycle": {
-    "installed": "/installed",
-    "uninstalled": "/uninstalled"
-  },
-  "scopes": [
-    "account",
-    "repository",
-    "pullrequest"
-  ],
-  "contexts": [
-    "account"
-  ],
-  "modules": {
-    "webhooks": [
-      {
-        "event": "*",
-        "url": "/webhook"
-      }
-    ]
-  }
-}

pr_agent/servers/bitbucket_app.py

@@ -1,166 +0,0 @@
-import copy
-import hashlib
-import json
-import os
-import time
-
-import jwt
-import requests
-import uvicorn
-from fastapi import APIRouter, FastAPI, Request, Response
-from starlette.background import BackgroundTasks
-from starlette.middleware import Middleware
-from starlette.responses import JSONResponse
-from starlette_context import context
-from starlette_context.middleware import RawContextMiddleware
-
-from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.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()
-secret_provider = get_secret_provider()
-
-async def get_bearer_token(shared_secret: str, client_key: str):
-    try:
-        now = int(time.time())
-        url = "https://bitbucket.org/site/oauth2/access_token"
-        canonical_url = "GET&/site/oauth2/access_token&"
-        qsh = hashlib.sha256(canonical_url.encode("utf-8")).hexdigest()
-        app_key = get_settings().bitbucket.app_key
-
-        payload = {
-            "iss": app_key,
-            "iat": now,
-            "exp": now + 240,
-            "qsh": qsh,
-            "sub": client_key,
-            }
-        token = jwt.encode(payload, shared_secret, algorithm="HS256")
-        payload = 'grant_type=urn%3Abitbucket%3Aoauth2%3Ajwt'
-        headers = {
-            'Authorization': f'JWT {token}',
-            'Content-Type': 'application/x-www-form-urlencoded'
-        }
-        response = requests.request("POST", url, headers=headers, data=payload)
-        bearer_token = response.json()["access_token"]
-        return bearer_token
-    except Exception as e:
-        get_logger().error(f"Failed to get bearer token: {e}")
-        raise e
-
-@router.get("/")
-async def handle_manifest(request: Request, response: Response):
-    cur_dir = os.path.dirname(os.path.abspath(__file__))
-    manifest = open(os.path.join(cur_dir, "atlassian-connect.json"), "rt").read()
-    try:
-        manifest = manifest.replace("app_key", get_settings().bitbucket.app_key)
-        manifest = manifest.replace("base_url", get_settings().bitbucket.base_url)
-    except:
-        get_logger().error("Failed to replace api_key in Bitbucket manifest, trying to continue")
-    manifest_obj = json.loads(manifest)
-    return JSONResponse(manifest_obj)
-
-@router.post("/webhook")
-async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "bitbucket_app"}
-    get_logger().debug(request.headers)
-    jwt_header = request.headers.get("authorization", None)
-    if jwt_header:
-        input_jwt = jwt_header.split(" ")[1]
-    data = await request.json()
-    get_logger().debug(data)
-    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"]
-            jwt.decode(input_jwt, shared_secret, audience=client_key, algorithms=["HS256"])
-            bearer_token = await get_bearer_token(shared_secret, client_key)
-            context['bitbucket_bearer_token'] = bearer_token
-            context["settings"] = copy.deepcopy(global_settings)
-            event = data["event"]
-            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")
-            elif event == "pullrequest:comment_created":
-                pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
-                log_context["api_url"] = pr_url
-                log_context["event"] = "comment"
-                comment_body = data["data"]["comment"]["content"]["raw"]
-                with get_logger().contextualize(**log_context):
-                    await agent.handle_request(pr_url, comment_body)
-        except Exception as e:
-            get_logger().error(f"Failed to handle webhook: {e}")
-    background_tasks.add_task(inner)
-    return "OK"
-
-@router.get("/webhook")
-async def handle_github_webhooks(request: Request, response: Response):
-    return "Webhook server online!"
-
-@router.post("/installed")
-async def handle_installed_webhooks(request: Request, response: Response):
-    try:
-        get_logger().info("handle_installed_webhooks")
-        get_logger().info(request.headers)
-        data = await request.json()
-        get_logger().info(data)
-        shared_secret = data["sharedSecret"]
-        client_key = data["clientKey"]
-        username = data["principal"]["username"]
-        secrets = {
-            "shared_secret": shared_secret,
-            "client_key": client_key
-        }
-        secret_provider.store_secret(username, json.dumps(secrets))
-    except Exception as e:
-        get_logger().error(f"Failed to register user: {e}")
-        return JSONResponse({"error": "Unable to register user"}, status_code=500)
-
-@router.post("/uninstalled")
-async def handle_uninstalled_webhooks(request: Request, response: Response):
-    get_logger().info("handle_uninstalled_webhooks")
-
-    data = await request.json()
-    get_logger().info(data)
-
-
-def start():
-    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
-    get_settings().set("CONFIG.GIT_PROVIDER", "bitbucket")
-    get_settings().set("PR_DESCRIPTION.PUBLISH_DESCRIPTION_AS_COMMENT", True)
-    middleware = [Middleware(RawContextMiddleware)]
-    app = FastAPI(middleware=middleware)
-    app.include_router(router)
-
-    uvicorn.run(app, host="0.0.0.0", port=int(os.getenv("PORT", "3000")))
-
-
-if __name__ == '__main__':
-    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/gerrit_server.py

@@ -1,77 +0,0 @@
-import copy
-from enum import Enum
-from json import JSONDecodeError
-
-import uvicorn
-from fastapi import APIRouter, FastAPI, HTTPException
-from pydantic import BaseModel
-from starlette.middleware import Middleware
-from starlette_context import context
-from starlette_context.middleware import RawContextMiddleware
-
-from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.log import get_logger, setup_logger
-
-setup_logger()
-router = APIRouter()
-
-
-class Action(str, Enum):
-    review = "review"
-    describe = "describe"
-    ask = "ask"
-    improve = "improve"
-    reflect = "reflect"
-    answer = "answer"
-
-
-class Item(BaseModel):
-    refspec: str
-    project: str
-    msg: str
-
-
-@router.post("/api/v1/gerrit/{action}")
-async def handle_gerrit_request(action: Action, item: Item):
-    get_logger().debug("Received a Gerrit request")
-    context["settings"] = copy.deepcopy(global_settings)
-
-    if action == Action.ask:
-        if not item.msg:
-            return HTTPException(
-                status_code=400,
-                detail="msg is required for ask command"
-            )
-    await PRAgent().handle_request(
-        f"{item.project}:{item.refspec}",
-        f"/{item.msg.strip()}"
-    )
-
-
-async def get_body(request):
-    try:
-        body = await request.json()
-    except JSONDecodeError as e:
-        get_logger().error("Error parsing request body", e)
-        return {}
-    return body
-
-
-@router.get("/")
-async def root():
-    return {"status": "ok"}
-
-
-def start():
-    # to prevent adding help messages with the output
-    get_settings().set("CONFIG.CLI_MODE", True)
-    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,118 +1,56 @@
 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.config_loader import settings
 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')
-    GITHUB_EVENT_PATH = os.environ.get('GITHUB_EVENT_PATH')
-    OPENAI_KEY = os.environ.get('OPENAI_KEY') or os.environ.get('OPENAI.KEY')
-    OPENAI_ORG = os.environ.get('OPENAI_ORG') or os.environ.get('OPENAI.ORG')
-    GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN')
-    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
-
-    # Check if required environment variables are set
+    GITHUB_EVENT_NAME = os.environ.get('GITHUB_EVENT_NAME', None)
     if not GITHUB_EVENT_NAME:
         print("GITHUB_EVENT_NAME not set")
         return
+    GITHUB_EVENT_PATH = os.environ.get('GITHUB_EVENT_PATH', None)
     if not GITHUB_EVENT_PATH:
         print("GITHUB_EVENT_PATH not set")
         return
-    if not OPENAI_KEY:
-        print("OPENAI_KEY not set")
-        return
-    if not GITHUB_TOKEN:
-        print("GITHUB_TOKEN not set")
-        return
-
-    # Set the environment variables in the settings
-    get_settings().set("OPENAI.KEY", OPENAI_KEY)
-    if OPENAI_ORG:
-        get_settings().set("OPENAI.ORG", OPENAI_ORG)
-    get_settings().set("GITHUB.USER_TOKEN", GITHUB_TOKEN)
-    get_settings().set("GITHUB.DEPLOYMENT_TYPE", "user")
-
-    # Load the event payload
     try:
-        with open(GITHUB_EVENT_PATH, 'r') as f:
-            event_payload = json.load(f)
+        event_payload = json.load(open(GITHUB_EVENT_PATH, 'r'))
     except json.decoder.JSONDecodeError as e:
         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
+    OPENAI_KEY = os.environ.get('OPENAI_KEY', None)
+    if not OPENAI_KEY:
+        print("OPENAI_KEY not set")
+        return
+    OPENAI_ORG = os.environ.get('OPENAI_ORG', None)
+    GITHUB_TOKEN = os.environ.get('GITHUB_TOKEN', None)
+    if not GITHUB_TOKEN:
+        print("GITHUB_TOKEN not set")
+        return
+    settings.set("OPENAI.KEY", OPENAI_KEY)
+    if OPENAI_ORG:
+        settings.set("OPENAI.ORG", OPENAI_ORG)
+    settings.set("GITHUB.USER_TOKEN", GITHUB_TOKEN)
+    settings.set("GITHUB.DEPLOYMENT_TYPE", "user")
     if GITHUB_EVENT_NAME == "pull_request":
-        action = event_payload.get("action")
+        action = event_payload.get("action", None)
         if action in ["opened", "reopened"]:
-            pr_url = event_payload.get("pull_request", {}).get("url")
+            pr_url = event_payload.get("pull_request", {}).get("url", None)
             if pr_url:
-                auto_review = get_setting_or_env("GITHUB_ACTION.AUTO_REVIEW", None)
-                if auto_review is None or is_true(auto_review):
-                    await PRReviewer(pr_url).run()
-                auto_describe = get_setting_or_env("GITHUB_ACTION.AUTO_DESCRIBE", None)
-                if is_true(auto_describe):
-                    await PRDescription(pr_url).run()
-                auto_improve = get_setting_or_env("GITHUB_ACTION.AUTO_IMPROVE", None)
-                if is_true(auto_improve):
-                    await PRCodeSuggestions(pr_url).run()
+                await PRReviewer(pr_url).review()
 
-    # Handle issue comment event
     elif GITHUB_EVENT_NAME == "issue_comment":
-        action = event_payload.get("action")
+        action = event_payload.get("action", None)
         if action in ["created", "edited"]:
-            comment_body = event_payload.get("comment", {}).get("body")
+            comment_body = event_payload.get("comment", {}).get("body", None)
             if comment_body:
-                is_pr = False
-                # check if issue is pull request
-                if event_payload.get("issue", {}).get("pull_request"):
-                    url = event_payload.get("issue", {}).get("pull_request", {}).get("url")
-                    is_pr = True
-                else:
-                    url = event_payload.get("issue", {}).get("url")
-                if url:
+                pr_url = event_payload.get("issue", {}).get("pull_request", {}).get("url", None)
+                if pr_url:
                     body = comment_body.strip().lower()
-                    comment_id = event_payload.get("comment", {}).get("id")
-                    provider = get_git_provider()(pr_url=url)
-                    if is_pr:
-                        await PRAgent().handle_request(url, body, notify=lambda: provider.add_eyes_reaction(comment_id))
-                    else:
-                        await PRAgent().handle_request(url, body)
+                    await PRAgent().handle_request(pr_url, body)
 
 
 if __name__ == '__main__':

pr_agent/servers/github_app.py

@@ -1,239 +1,64 @@
-import copy
-import os
-import asyncio.locks
-from typing import Any, Dict, List, Tuple
+import logging
+import sys
 
 import uvicorn
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
-from starlette.middleware import Middleware
-from starlette_context import context
-from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.algo.utils import update_settings_from_args
-from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.git_providers import get_git_provider
-from pr_agent.git_providers.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
-
-setup_logger(fmt=LoggingFormat.JSON)
+from pr_agent.config_loader import settings
+from pr_agent.servers.utils import verify_signature
 
+logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 router = APIRouter()
 
 
 @router.post("/api/v1/github_webhooks")
 async def handle_github_webhooks(request: Request, response: Response):
-    """
-    Receives and processes incoming GitHub webhook requests.
-    Verifies the request signature, parses the request body, and passes it to the handle_request function for further
-    processing.
-    """
-    get_logger().debug("Received a GitHub webhook")
-
-    body = await get_body(request)
-
-    get_logger().debug(f'Request body:\n{body}')
-    installation_id = body.get("installation", {}).get("id")
-    context["installation_id"] = installation_id
-    context["settings"] = copy.deepcopy(global_settings)
-
-    response = await handle_request(body, event=request.headers.get("X-GitHub-Event", None))
-    return response or {}
-
-
-@router.post("/api/v1/marketplace_webhooks")
-async def handle_marketplace_webhooks(request: Request, response: Response):
-    body = await get_body(request)
-    get_logger().info(f'Request body:\n{body}')
-
-
-async def get_body(request):
+    logging.debug("Received a github webhook")
     try:
         body = await request.json()
     except Exception as e:
-        get_logger().error("Error parsing request body", e)
+        logging.error("Error parsing request body", e)
         raise HTTPException(status_code=400, detail="Error parsing request body") from e
-    webhook_secret = getattr(get_settings().github, 'webhook_secret', None)
+    body_bytes = await request.body()
+    signature_header = request.headers.get('x-hub-signature-256', None)
+    try:
+        webhook_secret = settings.github.webhook_secret
+    except AttributeError:
+        webhook_secret = None
     if webhook_secret:
-        body_bytes = await request.body()
-        signature_header = request.headers.get('x-hub-signature-256', None)
         verify_signature(body_bytes, webhook_secret, signature_header)
-    return body
+    logging.debug(f'Request body:\n{body}')
+    return await handle_request(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)
-
-
-async def handle_request(body: Dict[str, Any], event: str):
-    """
-    Handle incoming GitHub webhook requests.
-
-    Args:
-        body: The request body.
-        event: The GitHub event type.
-    """
-    action = body.get("action")
-    if not action:
-        return {}
+async def handle_request(body):
+    action = body.get("action", None)
+    installation_id = body.get("installation", {}).get("id", None)
+    settings.set("GITHUB.INSTALLATION_ID", installation_id)
     agent = PRAgent()
-    bot_user = get_settings().github_app.bot_user
-    sender = body.get("sender", {}).get("login")
-    log_context = {"action": action, "event": event, "sender": sender, "server_type": "github_app"}
-
-    if get_settings().github_app.duplicate_requests_cache and _is_duplicate_request(body):
-        return {}
-
-    # handle all sorts of comment events (e.g. issue_comment)
     if action == 'created':
         if "comment" not in body:
             return {}
-        comment_body = body.get("comment", {}).get("body")
-        if sender and bot_user in sender:
-            get_logger().info(f"Ignoring comment from {bot_user} user")
+        comment_body = body.get("comment", {}).get("body", None)
+        if 'sender' in body and 'login' in body['sender'] and 'bot' in body['sender']['login']:
             return {}
-        get_logger().info(f"Processing comment from {sender} user")
-        if "issue" in body and "pull_request" in body["issue"] and "url" in body["issue"]["pull_request"]:
-            api_url = body["issue"]["pull_request"]["url"]
-        elif "comment" in body and "pull_request_url" in body["comment"]:
-            api_url = body["comment"]["pull_request_url"]
-        else:
+        if "issue" not in body and "pull_request" not in body["issue"]:
             return {}
-        log_context["api_url"] = api_url
-        get_logger().info(body)
-        get_logger().info(f"Handling comment because of event={event} and action={action}")
-        comment_id = body.get("comment", {}).get("id")
-        provider = get_git_provider()(pr_url=api_url)
-        with get_logger().contextualize(**log_context):
-            await agent.handle_request(api_url, comment_body, notify=lambda: provider.add_eyes_reaction(comment_id))
+        pull_request = body["issue"]["pull_request"]
+        api_url = pull_request.get("url", None)
+        await agent.handle_request(api_url, comment_body)
 
-    # 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 action in ["opened"] or 'reopened' in action:
+        pull_request = body.get("pull_request", None)
+        if not pull_request:
             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):
+        api_url = pull_request.get("url", None)
+        if api_url is None:
             return {}
-
-        apply_repo_settings(api_url)
-        if not get_settings().github_app.handle_push_trigger:
-            return {}
-
-        # TODO: do we still want to get the list of commits to filter bot/merge commits?
-        before_sha = body.get("before")
-        after_sha = body.get("after")
-        merge_commit_sha = pull_request.get("merge_commit_sha")
-        if before_sha == after_sha:
-            return {}
-        if get_settings().github_app.push_trigger_ignore_merge_commits and after_sha == merge_commit_sha:
-            return {}
-        if get_settings().github_app.push_trigger_ignore_bot_commits and body.get("sender", {}).get("login", "") == bot_user:
-            return {}
-
-        # Prevent triggering multiple times for subsequent push triggers when one is enough:
-        # The first push will trigger the processing, and if there's a second push in the meanwhile it will wait.
-        # Any more events will be discarded, because they will all trigger the exact same processing on the PR.
-        # We let the second event wait instead of discarding it because while the first event was being processed,
-        # more commits may have been pushed that led to the subsequent events,
-        # so we keep just one waiting as a delegate to trigger the processing for the new commits when done waiting.
-        current_active_tasks = _duplicate_push_triggers.setdefault(api_url, 0)
-        max_active_tasks = 2 if get_settings().github_app.push_trigger_pending_tasks_backlog else 1
-        if current_active_tasks < max_active_tasks:
-            # first task can enter, and second tasks too if backlog is enabled
-            get_logger().info(
-                f"Continue processing push trigger for {api_url=} because there are {current_active_tasks} active tasks"
-            )
-            _duplicate_push_triggers[api_url] += 1
-        else:
-            get_logger().info(
-                f"Skipping push trigger for {api_url=} because another event already triggered the same processing"
-            )
-            return {}
-        async with _pending_task_duplicate_push_conditions[api_url]:
-            if current_active_tasks == 1:
-                # second task waits
-                get_logger().info(
-                    f"Waiting to process push trigger for {api_url=} because the first task is still in progress"
-                )
-                await _pending_task_duplicate_push_conditions[api_url].wait()
-                get_logger().info(f"Finished waiting to process push trigger for {api_url=} - continue with flow")
-
-        try:
-            if get_settings().github_app.push_trigger_wait_for_initial_review and not get_git_provider()(api_url, incremental=IncrementalPR(True)).previous_review:
-                get_logger().info(f"Skipping incremental review because there was no initial review for {api_url=} yet")
-                return {}
-            get_logger().info(f"Performing incremental review for {api_url=} because of {event=} and {action=}")
-            await _perform_commands("push_commands", agent, body, api_url, log_context)
-
-        finally:
-            # release the waiting task block
-            async with _pending_task_duplicate_push_conditions[api_url]:
-                _pending_task_duplicate_push_conditions[api_url].notify(1)
-                _duplicate_push_triggers[api_url] -= 1
-
-    get_logger().info("event or action does not require handling")
-    return {}
-
-
-def _check_pull_request_event(action: str, body: dict, log_context: dict, bot_user: str) -> Tuple[Dict[str, Any], str]:
-    invalid_result = {}, ""
-    pull_request = body.get("pull_request")
-    if not pull_request:
-        return invalid_result
-    api_url = pull_request.get("url")
-    if not api_url:
-        return invalid_result
-    log_context["api_url"] = api_url
-    if pull_request.get("draft", True) or pull_request.get("state") != "open" or pull_request.get("user", {}).get("login", "") == bot_user:
-        return invalid_result
-    if action in ("review_requested", "synchronize") and pull_request.get("created_at") == pull_request.get("updated_at"):
-        # avoid double reviews when opening a PR for the first time
-        return invalid_result
-    return 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,
-    This function checks if the request is duplicate and if so - ignores it.
-    """
-    request_hash = hash(str(body))
-    get_logger().info(f"request_hash: {request_hash}")
-    is_duplicate = _duplicate_requests_cache.get(request_hash, False)
-    _duplicate_requests_cache[request_hash] = True
-    if is_duplicate:
-        get_logger().info(f"Ignoring duplicate request {request_hash}")
-    return is_duplicate
+        await agent.handle_request(api_url, "/review")
+    else:
+        return {}
 
 
 @router.get("/")
@@ -242,15 +67,12 @@ async def root():
 
 
 def start():
-    if get_settings().github_app.override_deployment_type:
-        # Override the deployment type to app
-        get_settings().set("GITHUB.DEPLOYMENT_TYPE", "app")
-    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
-    middleware = [Middleware(RawContextMiddleware)]
-    app = FastAPI(middleware=middleware)
+    # Override the deployment type to app
+    settings.set("GITHUB.DEPLOYMENT_TYPE", "app")
+    app = FastAPI()
     app.include_router(router)
 
-    uvicorn.run(app, host="0.0.0.0", port=int(os.environ.get("PORT", "3000")))
+    uvicorn.run(app, host="0.0.0.0", port=3000)
 
 
 if __name__ == '__main__':

pr_agent/servers/github_polling.py

@@ -1,54 +1,42 @@
 import asyncio
+import logging
+import sys
 from datetime import datetime, timezone
 
 import aiohttp
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import get_settings
+from pr_agent.config_loader import settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.help import bot_help_text
 
-setup_logger(fmt=LoggingFormat.JSON)
+logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
 NOTIFICATION_URL = "https://api.github.com/notifications"
 
 
 def now() -> str:
-    """
-    Get the current UTC time in ISO 8601 format.
-    
-    Returns:
-        str: The current UTC time in ISO 8601 format.
-    """
     now_utc = datetime.now(timezone.utc).isoformat()
     now_utc = now_utc.replace("+00:00", "Z")
     return now_utc
 
 
 async def polling_loop():
-    """
-    Polls for notifications and handles them accordingly.
-    """
     handled_ids = set()
     since = [now()]
     last_modified = [None]
     git_provider = get_git_provider()()
     user_id = git_provider.get_user_id()
     agent = PRAgent()
-    get_settings().set("CONFIG.PUBLISH_OUTPUT_PROGRESS", False)
-
     try:
-        deployment_type = get_settings().github.deployment_type
-        token = get_settings().github.user_token
+        deployment_type = settings.github.deployment_type
+        token = settings.github.user_token
     except AttributeError:
         deployment_type = 'none'
         token = None
-
     if deployment_type != 'user':
         raise ValueError("Deployment mode must be set to 'user' to get notifications")
     if not token:
         raise ValueError("User token must be set to get notifications")
-
     async with aiohttp.ClientSession() as session:
         while True:
             try:
@@ -64,7 +52,6 @@ async def polling_loop():
                     params["since"] = since[0]
                 if last_modified[0]:
                     headers["If-Modified-Since"] = last_modified[0]
-
                 async with session.get(NOTIFICATION_URL, headers=headers, params=params) as response:
                     if response.status == 200:
                         if 'Last-Modified' in response.headers:
@@ -93,15 +80,13 @@ async def polling_loop():
                                             comment_body = comment['body'] if 'body' in comment else ''
                                             commenter_github_user = comment['user']['login'] \
                                                 if 'user' in comment else ''
-                                            get_logger().info(f"Commenter: {commenter_github_user}\nComment: {comment_body}")
+                                            logging.info(f"Commenter: {commenter_github_user}\nComment: {comment_body}")
                                             user_tag = "@" + user_id
                                             if user_tag not in comment_body:
                                                 continue
                                             rest_of_comment = comment_body.split(user_tag)[1].strip()
-                                            comment_id = comment['id']
-                                            git_provider.set_pr(pr_url)
-                                            success = await agent.handle_request(pr_url, rest_of_comment,
-                                                                                 notify=lambda: git_provider.add_eyes_reaction(comment_id))  # noqa E501
+
+                                            success = await agent.handle_request(pr_url, rest_of_comment)
                                             if not success:
                                                 git_provider.set_pr(pr_url)
                                                 git_provider.publish_comment("### How to use PR-Agent\n" +
@@ -111,8 +96,8 @@ async def polling_loop():
                         print(f"Failed to fetch notifications. Status code: {response.status}")
 
             except Exception as e:
-                get_logger().error(f"Exception during processing of a notification: {e}")
+                logging.error(f"Exception during processing of a notification: {e}")
 
 
 if __name__ == '__main__':
-    asyncio.run(polling_loop())
+    asyncio.run(polling_loop())

pr_agent/servers/gitlab_webhook.py

@@ -1,88 +0,0 @@
-import copy
-import json
-
-import uvicorn
-from fastapi import APIRouter, FastAPI, Request, status
-from fastapi.encoders import jsonable_encoder
-from fastapi.responses import JSONResponse
-from starlette.background import BackgroundTasks
-from starlette.middleware import Middleware
-from starlette_context import context
-from starlette_context.middleware import RawContextMiddleware
-
-from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import get_settings, global_settings
-from pr_agent.log import LoggingFormat, get_logger, setup_logger
-from pr_agent.secret_providers import get_secret_provider
-
-setup_logger(fmt=LoggingFormat.JSON)
-router = APIRouter()
-
-secret_provider = get_secret_provider() if get_settings().get("CONFIG.SECRET_PROVIDER") else None
-
-
-def handle_request(background_tasks: BackgroundTasks, url: str, body: str, log_context: dict):
-    log_context["action"] = body
-    log_context["event"] = "pull_request" if body == "/review" else "comment"
-    log_context["api_url"] = url
-    with get_logger().contextualize(**log_context):
-        background_tasks.add_task(PRAgent().handle_request, url, body)
-
-
-@router.post("/webhook")
-async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
-    log_context = {"server_type": "gitlab_app"}
-    if request.headers.get("X-Gitlab-Token") and secret_provider:
-        request_token = request.headers.get("X-Gitlab-Token")
-        secret = secret_provider.get_secret(request_token)
-        try:
-            secret_dict = json.loads(secret)
-            gitlab_token = secret_dict["gitlab_token"]
-            log_context["sender"] = secret_dict.get("token_name", secret_dict.get("id", "unknown"))
-            context["settings"] = copy.deepcopy(global_settings)
-            context["settings"].gitlab.personal_access_token = gitlab_token
-        except Exception as e:
-            get_logger().error(f"Failed to validate secret {request_token}: {e}")
-            return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
-    elif get_settings().get("GITLAB.SHARED_SECRET"):
-        secret = get_settings().get("GITLAB.SHARED_SECRET")
-        if not request.headers.get("X-Gitlab-Token") == secret:
-            return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
-    else:
-        return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
-    gitlab_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
-    if not gitlab_token:
-        return JSONResponse(status_code=status.HTTP_401_UNAUTHORIZED, content=jsonable_encoder({"message": "unauthorized"}))
-    data = await request.json()
-    get_logger().info(json.dumps(data))
-    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)
-    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)
-    return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
-
-
-@router.get("/")
-async def root():
-    return {"status": "ok"}
-
-def start():
-    gitlab_url = get_settings().get("GITLAB.URL", None)
-    if not gitlab_url:
-        raise ValueError("GITLAB.URL is not set")
-    get_settings().config.git_provider = "gitlab"
-    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/help.py

@@ -1,19 +1,14 @@
-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**: Suggest improvements to the code in the PR. " \
+                "These will be provided as pull request comments, ready to commit.\n" \
+                "> **/ask \\<QUESTION\\>**: Pose a question about the PR.\n"
 
 
 def bot_help_text(user: str):
-    return f"> Tag me in a comment '@{user}' and add one of the following commands:  \n" + commands_text
+    return f"> Tag me in a comment '@{user}' and add one of the following commands:\n" + commands_text
 
 
-actions_help_text = "> To invoke the PR-Agent, add a comment using one of the following commands:  \n" + \
+actions_help_text = "> To invoke the PR-Agent, add a comment using one of the following commands:\n" + \
                     commands_text

pr_agent/servers/serverless.py

@@ -1,13 +1,14 @@
+import logging
+
 from fastapi import FastAPI
 from mangum import Mangum
-from starlette.middleware import Middleware
-from starlette_context.middleware import RawContextMiddleware
 
 from pr_agent.servers.github_app import router
 
+logger = logging.getLogger()
+logger.setLevel(logging.DEBUG)
 
-middleware = [Middleware(RawContextMiddleware)]
-app = FastAPI(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
 
@@ -24,63 +21,3 @@ def verify_signature(payload_body, secret_token, signature_header):
     if not hmac.compare_digest(expected_signature, signature_header):
         raise HTTPException(status_code=403, detail="Request signatures didn't match!")
 
-
-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

@@ -7,46 +7,17 @@
 # See README for details about GitHub App deployment.
 
 [openai]
-key = ""  # Acquire through https://platform.openai.com
-#org = "<ORGANIZATION>"  # Optional, may be commented out.
+key = "<API_KEY>"  # Acquire through https://platform.openai.com
+org = "<ORGANIZATION>"  # Optional, may be commented out.
 # Uncomment the following for Azure OpenAI
 #api_type = "azure"
 #api_version = '2023-05-15'  # Check Azure documentation for the current API version
-#api_base = ""  # The base URL for your Azure OpenAI resource. e.g. "https://<your resource name>.openai.azure.com"
-#deployment_id = ""  # The deployment name you chose when you deployed the engine
-#fallback_deployments = []  # For each fallback model specified in configuration.toml in the [config] section, specify the appropriate deployment_id
-
-[pinecone]
-api_key = "..."
-environment = "gcp-starter"
-
-[anthropic]
-key = "" # Optional, uncomment if you want to use Anthropic. Acquire through https://www.anthropic.com/
-
-[cohere]
-key = "" # Optional, uncomment if you want to use Cohere. Acquire through https://dashboard.cohere.ai/
-
-[replicate]
-key = "" # Optional, uncomment if you want to use Replicate. Acquire through https://replicate.com/
-
-[huggingface]
-key = "" # Optional, uncomment if you want to use Huggingface Inference API. Acquire through https://huggingface.co/docs/api-inference/quicktour
-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 = "<API_BASE>"  # The base URL for your Azure OpenAI resource. e.g. "https://<your resource name>.openai.azure.com"
+#deployment_id = "<DEPLOYMENT_ID>"  # The deployment name you chose when you deployed the engine
 
 [github]
 # ---- Set the following only for deployment type == "user"
-user_token = ""  # A GitHub personal access token with 'repo' scope.
-deployment_type = "user" #set to user by default 
+user_token = "<TOKEN>"  # A GitHub personal access token with 'repo' scope.
 
 # ---- Set the following only for deployment type == "app", see README for details.
 private_key = """\
@@ -62,12 +33,5 @@ webhook_secret = "<WEBHOOK SECRET>"  # Optional, may be commented out.
 personal_access_token = ""
 
 [bitbucket]
-# For Bitbucket personal/repository bearer token
+# Bitbucket personal bearer token
 bearer_token = ""
-
-# For Bitbucket app
-app_key = ""
-base_url = ""
-
-[litellm]
-LITELLM_TOKEN = "" # see https://docs.litellm.ai/docs/debugging/hosted_debugging for details and instructions on how to get a token

pr_agent/settings/configuration.toml

@@ -1,134 +1,32 @@
 [config]
-model="gpt-4" # "gpt-4-1106-preview"
-fallback_models=["gpt-3.5-turbo-16k"]
+model="gpt-4"
+fallback-models=["gpt-3.5-turbo-16k", "gpt-3.5-turbo"]
 git_provider="github"
 publish_output=true
 publish_output_progress=true
 verbosity_level=0 # 0,1,2
 use_extra_bad_extensions=false
-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
+[pr_reviewer]
+require_focused_review=true
 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
+num_code_suggestions=0
+inline_code_comments = true
 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
+[pr_description]
 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
 
+[pr_questions]
 
-# 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 #
+[pr_code_suggestions]
 num_code_suggestions=4
-summarize = false
-extra_instructions = ""
-rank_suggestions = false
-# params for '/improve --extended' mode
-num_code_suggestions_per_chunk=8
-rank_extended_suggestions = true
-max_number_of_calls = 5
-final_clip_factor = 0.9
-
-[pr_add_docs] # /add_docs #
-extra_instructions = ""
-docs_style = "Sphinx Style" # "Google Style with Args, Returns, Attributes...etc", "Numpy Style", "Sphinx Style", "PEP257", "reStructuredText"
-
-[pr_update_changelog] # /update_changelog #
-push_changelog_changes=false
-extra_instructions = ""
-
-[pr_config] # /config #
 
 [github]
 # The type of deployment to create. Valid values are 'app' or 'user'.
 deployment_type = "user"
-ratelimit_retries = 5
-base_url = "https://api.github.com"
-
-[github_action]
-# auto_review = true    # set as env var in .github/workflows/pr-agent.yaml
-# auto_describe = true  # set as env var in .github/workflows/pr-agent.yaml
-# auto_improve = true   # set as env var in .github/workflows/pr-agent.yaml
-
-[github_app]
-# these toggles allows running the github app from custom deployments
-bot_user = "github-actions[bot]"
-override_deployment_type = true
-# in some deployments it's possible to get duplicate requests if the handling is long,
-# these settings are used to avoid handling duplicate requests.
-duplicate_requests_cache = false
-duplicate_requests_cache_ttl = 60  # in seconds
-# settings for "pull_request" event
-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",
-]
-# 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
@@ -142,38 +40,3 @@ 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"
-# review_path= "path/to/review.md"
-
-[gerrit]
-# endpoint to the gerrit service
-# url = "ssh://gerrit.example.com:29418"
-# user for gerrit authentication
-# user = "ai-reviewer"
-# patch server where patches will be saved
-# patch_server_endpoint = "http://127.0.0.1:5000/patch"
-# token to authenticate in the patch server
-# patch_server_token = ""
-
-[litellm]
-#use_client = false
-
-[pr_similar_issue]
-skip_comments = false
-force_update_dataset = false
-max_issues_to_scan = 500
-
-[pinecone]
-# fill and place in .secrets.toml
-#api_key = ...
-# 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/ignore.toml

@@ -1,11 +0,0 @@
-[ignore]
-
-glob = [
-    # Ignore files and directories matching these glob patterns.
-    # See https://docs.python.org/3/library/glob.html
-    'vendor/**',
-]
-regex = [
-    # Ignore files and directories matching these regex patterns.
-    # See https://learnbyexample.github.io/python-regex-cheatsheet/
-]

pr_agent/settings/language_extensions.toml

@@ -53,8 +53,7 @@ default = [
     'xz',
     'zip',
     'zst',
-    'snap',
-    'lockb'
+    'snap'
 ]
 extra = [
     'md',
@@ -433,6 +432,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,126 +0,0 @@
-[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.
-
-
-Example for the PR Diff format:
-======
-## src/file1.py
-
-@@ -12,3 +12,4 @@ def func1():
-__new hunk__
-12  code line1 that remained unchanged in the PR
-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
-__old hunk__
- code line1 that remained unchanged in the PR
--code line that was removed in the PR
- code line2 that remained unchanged in the PR
-
-
-@@ ... @@ def func2():
-__new hunk__
-...
-__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.
-- 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.
-- 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.
-
-
-{%- 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:
-  type: array
-  uniqueItems: true
-  items:
-    relevant file:
-      type: string
-      description: the relevant file full path
-    relevant line:
-      type: integer
-      description: |-
-        The relevant line number from a '__new hunk__' section where the {{ docs_for_language }} should be added.
-    doc placement:
-      type: string
-      enum:
-        - before
-        - after
-      description: |-
-        The {{ docs_for_language }} placement relative to the relevant line (code component).
-    documentation:
-      type: string
-      description: |-
-        The {{ docs_for_language }} content. It should be complete, correctly formatted and indented, and without line numbers.
-```
-
-Example output:
-```yaml
-Code Documentation:
--   relevant file: |-
-        src/file1.py
-    relevant lines: 12
-    doc placement: after
-    documentation: |-
-        \"\"\"
-        This is a python docstring for func1.
-        \"\"\"
-- ...
-...
-```
-
-
-Each YAML output MUST be after a newline, indented, with block scalar indicator ('|-').
-Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
-"""
-
-user="""PR Info:
-
-Title: '{{ title }}'
-
-Branch: '{{ branch }}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
-{%- if language %}
-
-Main PR language: '{{language}}'
-{%- endif %}
-
-
-The PR Diff:
-======
-{{ diff|trim }}
-======
-
-
-Response (should be a valid YAML, and nothing else):
-```yaml
-"""

pr_agent/settings/pr_code_suggestions_prompts.toml

@@ -1,141 +1,79 @@
 [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 CodiumAI-PR-Code-Reviewer.
+Your task is to provide meaningfull non-trivial code suggestions to improve the new code in a PR (the '+' lines).
+- Try to give important suggestions like fixing code problems, issues and bugs. As a second priority, provide suggestions for meaningfull code improvements, like performance, vulnerability, modularity, and best practices.
+- Suggestions should refer only to the 'new hunk' code, and focus on improving the new added code lines, with '+'.
+- Provide the exact line number range (inclusive) for each issue.
+- Assume there is additional code in the relevant file that is not included in the diff.
+- Provide up to {{ num_code_suggestions }} code suggestions.
+- Make sure not to provide suggestions repeating modifications already implemented in the new PR code (the '+' lines).
+- Don't output line numbers in the 'improved code' snippets.
 
-Example for the PR Diff format:
-======
+You must use the following JSON schema to format your answer:
+```json
+{
+    "Code suggestions": {
+      "type": "array",
+      "minItems": 1,
+      "maxItems": {{ num_code_suggestions }},
+      "uniqueItems": "true",
+      "items": {
+        "relevant file": {
+          "type": "string",
+          "description": "the relevant file full path"
+        },
+        "suggestion content": {
+          "type": "string",
+          "description": "a concrete suggestion for meaningfully improving the new PR code."
+        },
+        "existing code": {
+          "type": "string",
+          "description": "a code snippet showing authentic relevant code lines from a 'new hunk' section. It must be continuous, correctly formatted and indented, and without line numbers."
+        },
+        "relevant lines": {
+          "type": "string",
+          "description": "the relevant lines in the 'new hunk' sections, in the format of 'start_line-end_line'. For example: '10-15'. They should be derived from the hunk line numbers, and correspond to the 'existing code' snippet above."
+        },
+        "improved code": {
+          "type": "string",
+          "description": "a new code snippet that can be used to replace the relevant lines in 'new hunk' code. Replacement suggestions should be complete, correctly formatted and indented, and without line numbers."
+        }
+      }
+    }
+}
+```
+
+Example input:
+'
 ## src/file1.py
-
-@@ -12,3 +12,4 @@ def func1():
-__new hunk__
-12  code line1 that remained unchanged in the PR
-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
-__old hunk__
- code line1 that remained unchanged in the PR
--code line that was removed in the PR
- code line2 that remained unchanged in the PR
-
-
-@@ ... @@ def func2():
-__new hunk__
-...
-__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.
-- 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.
-- 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:
-  type: array
-  minItems: 1
-  maxItems: {{ num_code_suggestions }}
-  uniqueItems: true
-  items:
-    relevant file:
-      type: string
-      description: the relevant file full path
-    suggestion content:
-      type: string
-      description: |-
-        a concrete suggestion for meaningfully improving the new PR code.
-    existing code:
-      type: string
-      description: |-
-        a code snippet showing the relevant code lines from a '__new hunk__' section.
-        It must be contiguous, correctly formatted and indented, and without line numbers.
-    relevant lines start:
-      type: integer
-      description: |-
-        The relevant line number from a '__new hunk__' section where the suggestion starts (inclusive).
-        Should be derived from the hunk line numbers, and correspond to the 'existing code' snippet above.
-    relevant lines end:
-      type: integer
-      description: |-
-        The relevant line number from a '__new hunk__' section where the suggestion ends (inclusive).
-        Should be derived from the hunk line numbers, and correspond to the 'existing code' snippet above.
-    improved code:
-      type: string
-      description: |-
-        a new code snippet that can be used to replace the relevant lines in '__new hunk__' code.
-        Replacement suggestions should be complete, correctly formatted and indented, and without line numbers.
+---new_hunk---
 ```
-
-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: |-
-    ...
-...
+[new hunk code, annotated with line numbers]
 ```
+---old_hunk---
+```
+[old hunk code]
+```
+...
+'
 
-
-Each YAML output MUST be after a newline, indented, with block scalar indicator ('|-').
 Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
 """
 
 user="""PR Info:
-
 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}}
+```
 
-
-Response (should be a valid YAML, and nothing else):
-```yaml
+Response (should be a valid JSON, and nothing else):
+```json
 """

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,45 @@
 [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).
 
-{%- if extra_instructions %}
+You must use the following JSON schema to format your answer:
+```json
+{
+  "PR Title": {
+      "type": "string",
+      "description": "an informative title for the PR, describing its main theme"
+  },
+  "PR Type": {
+      "type": "string",
+      "description": possible values are: ["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": "string",
+      "description": "a walkthrough of the PR changes. Review main files, in bullet points, and shortly describe the changes in each file (up to 10 most important files). Format: -`filename`: description of changes\n..."
+  }
+}
 
-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 %}
-=====
-
-
-Example output:
-
-```yaml
-title: |-
-  ...
-type:
-- ...
-- ...
-{%- if enable_custom_labels %}
-labels:
-- ...
-- ...
-{%- endif %}
-description: |-
-  ...
-{%- if enable_file_walkthrough %}
-main_files_walkthrough:
-- ...
-- ...
-{%- endif %}
-{%- if enable_semantic_files_types %}
-pr_files:
-- filename: |
-    ...
-  changes_summary: |
-    ...
-  label: |
-    ...
-...
-{%- endif %}
-```
-
-Answer should be a valid YAML, and nothing else. Each YAML output MUST be after a newline, with proper indent, and block scalar indicator ('|-')
+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 %}
-
 Branch: '{{branch}}'
 {%- if language %}
-
-Main PR language: '{{ language }}'
-{%- endif %}
-{%- if commit_messages_str %}
-
-Commit messages:
-=====
-{{ commit_messages_str|trim }}
-=====
+Main language: {{language}}
 {%- 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
+Response (should be a valid JSON, and nothing else):
+```json
 """

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,17 @@ 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 }}'
-{%- endif %}
-{%- if commit_messages_str %}
-
-
-Commit messages:
-======
-{{ commit_messages_str|trim }}
-======
+Main language: {{language}}
 {%- 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,31 @@
 [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 PR language: '{{ language }}'
+Main language: {{language}}
 {%- 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,231 +1,152 @@
 [pr_review_prompt]
-system="""You are PR-Reviewer, a language model designed to review a Git Pull Request (PR).
-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:
-======
-## 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 was removed in the PR
-+code line added in the PR
-code line 3 that remained unchanged in the PR
-
-
-@@ ... @@ def func2():
-...
-
-
-## src/file2.py
-...
-======
-
+system="""You are CodiumAI-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 meaningfull code suggestions to improve the new PR code (the '+' lines).
+- Provide up to {{ num_code_suggestions }} code suggestions.
 {%- if num_code_suggestions > 0 %}
-
-
-Code suggestions guidelines:
-- Provide up to {{ num_code_suggestions }} code suggestions. Try to provide diverse and insightful suggestions.
-- Focus on important suggestions like fixing code problems, issues and bugs. As a second priority, provide suggestions for meaningful code improvements, like performance, vulnerability, modularity, and best practices.
-- Avoid making suggestions that have already been implemented in the PR code. For example, if you want to add logs, or change a variable to const, or anything else, make sure it isn't already in the PR code.
-- Don't suggest to add docstring, type hints, or comments.
-- Suggestions should focus on the new code added in the PR diff (lines starting with '+')
+- Try to focus on important suggestions like fixing code problems, issues and bugs. As a second priority, provide suggestions for meaningfull code improvements, like performance, vulnerability, modularity, and best practices.
+- Suggestions should focus on improving the new added code lines.
+- Make sure not to provide suggestions repeating modifications already implemented in the new PR code (the '+' lines).
 {%- 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:
-  Main theme:
-    type: string
-    description: a short explanation of the PR
-  PR summary:
-    type: string
-    description: summary of the PR in 2-3 sentences.
-  Type of PR:
-    type: string
-    enum:
-      - Bug fix
-      - Tests
-      - Enhancement
-      - Documentation
-      - Other
+You must use the following JSON schema to format your answer:
+```json
+{
+  "PR Analysis": {
+    "Main theme": {
+      "type": "string",
+      "description": "a short explanation of the PR"
+    },
+    "Type of PR": {
+      "type": "string",
+      "enum": ["Bug fix", "Tests", "Bug fix with tests", "Refactoring", "Enhancement", "Documentation", "Other"]
+    },
 {%- if require_score %}
-  Score:
-    type: int
-    description: |-
-      Rate this PR on a scale of 0-100 (inclusive), where 0 means the worst
-      possible PR code, and 100 means PR code of the highest quality, without
-      any bugs or performance issues, that is ready to be merged immediately and
-      run in production at scale.
+    "Score": {
+      "type": "int",
+      "description": "Rate this PR on a scale of 0-100 (inclusive), where 0 means the worst possible PR code, and 100 means PR code of the highest quality, without any bugs or performance issues, that is ready to be merged immediately and run in production at scale."
+    },
 {%- endif %}
 {%- if require_tests %}
-  Relevant tests added:
-    type: string
-    description: yes\\no question: does this PR have relevant tests ?
+    "Relevant tests added": {
+      "type": "string",
+      "description": "yes\\no question: does this PR have relevant tests ?"
+    },
 {%- endif %}
 {%- if question_str %}
-  Insights from user's answer:
-    type: string
-    description: |-
-      shortly summarize the insights you gained from the user's answers to the questions
+    "Insights from user's answer": {
+      "type": "string",
+      "description": "shortly summarize the insights you gained from the user's answers to the questions"
+    },
 {%- endif %}
 {%- if require_focused %}
-  Focused PR:
-    type: string
-    description: |-
-      Is this a focused PR, in the sense that all the PR code diff changes are
-      united under a single focused theme ? If the theme is too broad, or the PR
-      code diff changes are too scattered, then the PR is not focused. Explain
-      your answer shortly.
+    "Focused PR": {
+      "type": "string",
+      "description": "Is this a focused PR, in the sense that it has a clear and coherent title and description, and all PR code diff changes are properly derived from the title and description? Explain your response."
+    }
+  },
 {%- endif %}
-{%- if require_estimate_effort_to_review %}
-  Estimated effort to review [1-5]:
-    type: string
-    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 ...'
-{%- 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.
+  "PR Feedback": {
+    "General PR 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. Explain your suggestions."
+    },
 {%- if num_code_suggestions > 0 %}
-  Code feedback:
-    type: array
-    maxItems: {{ num_code_suggestions }}
-    uniqueItems: true
-    items:
-      relevant file:
-        type: string
-        description: the relevant file full path
-      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.
-      relevant line:
-        type: string
-        description: |-
-          a single code line taken from the relevant file, to which the suggestion applies.
-          The code line should start with a '+'.
-          Make sure to output the line exactly as it appears in the relevant file
+    "Code suggestions": {
+      "type": "array",
+      "maxItems": {{ num_code_suggestions }},
+      "uniqueItems": true,
+      "items": {
+        "relevant file": {
+          "type": "string",
+          "description": "the relevant file full path"
+        },
+        "suggestion content": {
+          "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.
+        },
+        "relevant line in file": {
+          "type": "string",
+          "description": "an authentic single code line from the PR git diff section, to which the suggestion applies."
+        }
+      }
+    },
 {%- endif %}
 {%- if require_security %}
-  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.
+    "Security concerns": {
+      "type": "string",
+      "description": "yes\\no question: does this PR code introduce possible security concerns or issues, like SQL injection, XSS, CSRF, and others ? explain your answer"
+       ? explain your answer"
+    }
 {%- endif %}
+  }
+}
 ```
 
 Example output:
-```yaml
-PR Analysis:
-  Main theme: |-
-    xxx
-  PR summary: |-
-    xxx
-  Type of PR: |-
-    ...
+'
+{
+    "PR Analysis":
+    {
+        "Main theme": "xxx",
+        "Type of PR": "Bug fix",
 {%- if require_score %}
-  Score: 89
+        "Score": 89,
+{%- endif %}
+{%- if require_tests %}
+        "Relevant tests added": "No",
 {%- endif %}
-  Relevant tests added: |-
-    No
 {%- if require_focused %}
-  Focused PR: no, because ...
+        "Focused PR": "yes\\no, because ..."
 {%- endif %}
-{%- if require_estimate_effort_to_review %}
-  Estimated effort to review [1-5]: |-
-    3, because ...
-{%- endif %}
-PR Feedback:
-  General PR suggestions: |-
-    ...
+    },
+    "PR Feedback":
+    {
+        "General PR suggestions": "..., `xxx`...",
 {%- if num_code_suggestions > 0 %}
-  Code feedback:
-    - relevant file: |-
-        directory/xxx.py
-      suggestion: |-
-        xxx [important]
-      relevant line: |-
-        xxx
-    ...
+        "Code suggestions": [
+            {
+                "relevant file": "directory/xxx.py",
+                "suggestion content": "xxx [important]",
+                "relevant line in file": "xxx",
+            },
+            ...
+        ]
 {%- endif %}
 {%- if require_security %}
-  Security concerns: No
+        "Security concerns": "No, because ..."
 {%- endif %}
-```
+    }
+}
+'
 
-Each YAML output MUST be after a newline, indented, with block scalar indicator ('|-').
 Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
 """
 
 user="""PR Info:
-
 Title: '{{title}}'
-
 Branch: '{{branch}}'
-
-{%- if description %}
-
-Description:
-======
-{{ description|trim }}
-======
-{%- endif %}
-
+Description: '{{description}}'
 {%- if language %}
-
-Main PR language: '{{ language }}'
-{%- endif %}
-{%- if commit_messages_str %}
-
-Commit messages:
-======
-{{commit_messages_str}}
-======
+Main language: {{language}}
 {%- endif %}
 
 {%- if question_str %}
-=====
+######
 Here are questions to better understand the PR. Use the answers to provide better feedback.
 
-{{ question_str|trim }}
+{{question_str|trim}}
 
 User answers:
-'
-{{ answer_str|trim }}
-'
-=====
+{{answer_str|trim}}
+######
 {%- endif %}
 
+The PR Git Diff:
+```
+{{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 Diff:
-======
-{{ diff|trim }}
-======
-
-
-Response (should be a valid YAML, and nothing else):
-```yaml
+Response (should be a valid JSON, and nothing else):
+```json
 """

pr_agent/settings/pr_sort_code_suggestions_prompts.toml

@@ -1,46 +0,0 @@
-[pr_sort_code_suggestions_prompt]
-system="""
-"""
-
-user="""You are given a list of code suggestions to improve a Git Pull Request (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.
-Rank the suggestions based on their importance to improving the PR, with critical issues first and minor issues last.
-
-You must use the following YAML schema to format your answer:
-```yaml
-Sort Order:
-    type: array
-    maxItems: {{ suggestion_list|length }}
-    uniqueItems: true
-    items:
-        suggestion number:
-            type: integer
-            minimum: 1
-            maximum: {{ suggestion_list|length }}
-        importance order:
-            type: integer
-            minimum: 1
-            maximum: {{ suggestion_list|length }}
-```
-
-Example output:
-```yaml
-Sort Order:
-    - suggestion number: 1
-      importance order: 2
-    - suggestion number: 2
-      importance order: 3
-    - suggestion number: 3
-      importance order: 1
-```
-
-Make sure to output a valid YAML. Use multi-line block scalar ('|') if needed.
-Don't repeat the prompt in the answer, and avoid outputting the 'type' and 'description' fields.
-Response (should be a valid YAML, and nothing else):
-```yaml
-"""

pr_agent/settings/pr_update_changelog_prompts.toml

@@ -1,62 +0,0 @@
-[pr_update_changelog_prompt]
-system="""You are a language model called PR-Changelog-Updater.
-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.
-- Be general, and avoid specific details, files, etc. The output should be minimal, no more than 3-4 short lines. Ignore non-relevant subsections.
-
-{%- if extra_instructions %}
-
-Extra instructions from the user:
-======
-{{ extra_instructions|trim }}
-======
-{%- endif %}
-"""
-
-user="""PR Info:
-
-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 }}
-======
-
-Current date:
-```
-{{today}}
-```
-
-The current CHANGELOG.md:
-======
-{{ changelog_file_str }}
-======
-
-
-Response:
-"""

pr_agent/tools/pr_add_docs.py

@@ -1,179 +0,0 @@
-import copy
-import textwrap
-from typing import Dict
-
-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
-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 PRAddDocs:
-    def __init__(self, pr_url: str, cli_mode=False, args: list = None):
-
-        self.git_provider = get_git_provider()(pr_url)
-        self.main_language = get_main_pr_language(
-            self.git_provider.get_languages(), self.git_provider.get_files()
-        )
-
-        self.ai_handler = AiHandler()
-        self.patches_diff = None
-        self.prediction = None
-        self.cli_mode = cli_mode
-        self.vars = {
-            "title": self.git_provider.pr.title,
-            "branch": self.git_provider.get_pr_branch(),
-            "description": self.git_provider.get_pr_description(),
-            "language": self.main_language,
-            "diff": "",  # empty diff for initial calculation
-            "extra_instructions": get_settings().pr_add_docs.extra_instructions,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
-            'docs_for_language': get_docs_for_language(self.main_language,
-                                                       get_settings().pr_add_docs.docs_style),
-        }
-        self.token_handler = TokenHandler(self.git_provider.pr,
-                                          self.vars,
-                                          get_settings().pr_add_docs_prompt.system,
-                                          get_settings().pr_add_docs_prompt.user)
-
-    async def run(self):
-        try:
-            get_logger().info('Generating code Docs for PR...')
-            if get_settings().config.publish_output:
-                self.git_provider.publish_comment("Generating Documentation...", is_temporary=True)
-
-            get_logger().info('Preparing PR documentation...')
-            await retry_with_fallback_models(self._prepare_prediction)
-            data = self._prepare_pr_code_docs()
-            if (not data) or (not 'Code Documentation' in data):
-                get_logger().info('No code documentation found for PR.')
-                return
-
-            if get_settings().config.publish_output:
-                get_logger().info('Pushing PR documentation...')
-                self.git_provider.remove_initial_comment()
-                get_logger().info('Pushing inline code documentation...')
-                self.push_inline_docs(data)
-        except Exception as e:
-            get_logger().error(f"Failed to generate code documentation for PR, error: {e}")
-
-    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,
-                                        add_line_numbers_to_hunks=True,
-                                        disable_extra_lines=False)
-
-        get_logger().info('Getting AI prediction...')
-        self.prediction = await self._get_prediction(model)
-
-    async def _get_prediction(self, model: str):
-        variables = copy.deepcopy(self.vars)
-        variables["diff"] = self.patches_diff  # update diff
-        environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_add_docs_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_add_docs_prompt.user).render(variables)
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            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)
-
-        return response
-
-    def _prepare_pr_code_docs(self) -> Dict:
-        docs = self.prediction.strip()
-        data = load_yaml(docs)
-        if isinstance(data, list):
-            data = {'Code Documentation': data}
-        return data
-
-    def push_inline_docs(self, data):
-        docs = []
-
-        if not data['Code Documentation']:
-            return self.git_provider.publish_comment('No code documentation found to improve this PR.')
-
-        for d in data['Code Documentation']:
-            try:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"add_docs: {d}")
-                relevant_file = d['relevant file'].strip()
-                relevant_line = int(d['relevant line'])  # absolute position
-                documentation = d['documentation']
-                doc_placement = d['doc placement'].strip()
-                if documentation:
-                    new_code_snippet = self.dedent_code(relevant_file, relevant_line, documentation, doc_placement,
-                                                        add_original_line=True)
-
-                    body = f"**Suggestion:** Proposed documentation\n```suggestion\n" + new_code_snippet + "\n```"
-                    docs.append({'body': body, 'relevant_file': relevant_file,
-                                             'relevant_lines_start': relevant_line,
-                                             'relevant_lines_end': relevant_line})
-            except Exception:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"Could not parse code docs: {d}")
-
-        is_successful = self.git_provider.publish_code_suggestions(docs)
-        if not is_successful:
-            get_logger().info("Failed to publish code docs, trying to publish each docs separately")
-            for doc_suggestion in docs:
-                self.git_provider.publish_code_suggestions([doc_suggestion])
-
-    def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet, doc_placement='after',
-                    add_original_line=False):
-        try:  # dedent code snippet
-            self.diff_files = self.git_provider.diff_files if self.git_provider.diff_files \
-                else self.git_provider.get_diff_files()
-            original_initial_line = None
-            for file in self.diff_files:
-                if file.filename.strip() == relevant_file:
-                    original_initial_line = file.head_file.splitlines()[relevant_lines_start - 1]
-                    break
-            if original_initial_line:
-                if doc_placement == 'after':
-                    line = file.head_file.splitlines()[relevant_lines_start]
-                else:
-                    line = original_initial_line
-                suggested_initial_line = new_code_snippet.splitlines()[0]
-                original_initial_spaces = len(line) - len(line.lstrip())
-                suggested_initial_spaces = len(suggested_initial_line) - len(suggested_initial_line.lstrip())
-                delta_spaces = original_initial_spaces - suggested_initial_spaces
-                if delta_spaces > 0:
-                    new_code_snippet = textwrap.indent(new_code_snippet, delta_spaces * " ").rstrip('\n')
-                if add_original_line:
-                    if doc_placement == 'after':
-                        new_code_snippet = original_initial_line + "\n" + new_code_snippet
-                    else:
-                        new_code_snippet = new_code_snippet.rstrip() + "\n" + original_initial_line
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
-
-        return new_code_snippet
-
-
-def get_docs_for_language(language, style):
-    language = language.lower()
-    if language == 'java':
-        return "Javadocs"
-    elif language in ['python', 'lisp', 'clojure']:
-        return f"Docstring ({style})"
-    elif language in ['javascript', 'typescript']:
-        return "JSdocs"
-    elif language == 'c++':
-        return "Doxygen"
-    else:
-        return "Docs"

pr_agent/tools/pr_code_suggestions.py

@@ -1,36 +1,26 @@
 import copy
+import json
+import logging
 import textwrap
-from typing import Dict, List
+
 from jinja2 import Environment, StrictUndefined
 
 from pr_agent.algo.ai_handler import AiHandler
-from pr_agent.algo.pr_processing import get_pr_diff, get_pr_multi_diffs, retry_with_fallback_models
+from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models
 from pr_agent.algo.token_handler import TokenHandler
-from pr_agent.algo.utils import load_yaml
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider
+from pr_agent.algo.utils import try_fix_json
+from pr_agent.config_loader import settings
+from pr_agent.git_providers import BitbucketProvider, get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
 
 
 class PRCodeSuggestions:
-    def __init__(self, pr_url: str, cli_mode=False, args: list = None):
+    def __init__(self, pr_url: str, cli_mode=False):
 
         self.git_provider = get_git_provider()(pr_url)
         self.main_language = get_main_pr_language(
             self.git_provider.get_languages(), self.git_provider.get_files()
         )
-
-        # extended mode
-        try:
-            self.is_extended = any(["extended" in arg for arg in args])
-        except:
-            self.is_extended = False
-        if self.is_extended:
-            num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions_per_chunk
-        else:
-            num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions
-
         self.ai_handler = AiHandler()
         self.patches_diff = None
         self.prediction = None
@@ -41,113 +31,84 @@ class PRCodeSuggestions:
             "description": self.git_provider.get_pr_description(),
             "language": self.main_language,
             "diff": "",  # empty diff for initial calculation
-            "num_code_suggestions": num_code_suggestions,
-            "extra_instructions": get_settings().pr_code_suggestions.extra_instructions,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
+            'num_code_suggestions': settings.pr_code_suggestions.num_code_suggestions,
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,
-                                          get_settings().pr_code_suggestions_prompt.system,
-                                          get_settings().pr_code_suggestions_prompt.user)
+                                          settings.pr_code_suggestions_prompt.system,
+                                          settings.pr_code_suggestions_prompt.user)
 
-    async def run(self):
-        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)
+    async def suggest(self):
+        assert type(self.git_provider) != BitbucketProvider, "Bitbucket is not supported for now"
 
-            get_logger().info('Preparing PR code suggestions...')
-            if not self.is_extended:
-                await retry_with_fallback_models(self._prepare_prediction)
-                data = self._prepare_pr_code_suggestions()
-            else:
-                data = await retry_with_fallback_models(self._prepare_prediction_extended)
-            if (not data) or (not 'Code suggestions' in data):
-                get_logger().info('No code suggestions found for PR.')
-                return
-
-            if (not self.is_extended and get_settings().pr_code_suggestions.rank_suggestions) or \
-                    (self.is_extended and get_settings().pr_code_suggestions.rank_extended_suggestions):
-                get_logger().info('Ranking Suggestions...')
-                data['Code suggestions'] = await self.rank_suggestions(data['Code suggestions'])
-
-            if get_settings().config.publish_output:
-                get_logger().info('Pushing PR code suggestions...')
-                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)
-        except Exception as e:
-            get_logger().error(f"Failed to generate code suggestions for PR, error: {e}")
+        logging.info('Generating code suggestions for PR...')
+        if settings.config.publish_output:
+            self.git_provider.publish_comment("Preparing review...", is_temporary=True)
+        await retry_with_fallback_models(self._prepare_prediction)
+        logging.info('Preparing PR review...')
+        data = self._prepare_pr_code_suggestions()
+        if settings.config.publish_output:
+            logging.info('Pushing PR review...')
+            self.git_provider.remove_initial_comment()
+            logging.info('Pushing inline code comments...')
+            self.push_inline_code_suggestions(data)
 
     async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
+        # we are using extended hunk with line numbers for code suggestions
         self.patches_diff = get_pr_diff(self.git_provider,
                                         self.token_handler,
                                         model,
                                         add_line_numbers_to_hunks=True,
                                         disable_extra_lines=True)
-
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
         variables = copy.deepcopy(self.vars)
         variables["diff"] = self.patches_diff  # update diff
         environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_code_suggestions_prompt.user).render(variables)
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+        system_prompt = environment.from_string(settings.pr_code_suggestions_prompt.system).render(variables)
+        user_prompt = environment.from_string(settings.pr_code_suggestions_prompt.user).render(variables)
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
 
         return response
 
-    def _prepare_pr_code_suggestions(self) -> Dict:
+    def _prepare_pr_code_suggestions(self) -> str:
         review = self.prediction.strip()
-        data = load_yaml(review)
-        if isinstance(data, list):
-            data = {'Code suggestions': data}
+        try:
+            data = json.loads(review)
+        except json.decoder.JSONDecodeError:
+            if settings.config.verbosity_level >= 2:
+                logging.info(f"Could not parse json response: {review}")
+            data = try_fix_json(review, code_suggestions=True)
         return data
 
     def push_inline_code_suggestions(self, data):
         code_suggestions = []
-
-        if not data['Code suggestions']:
-            get_logger().info('No suggestions found to improve this PR.')
-            return self.git_provider.publish_comment('No suggestions found to improve this PR.')
-
         for d in data['Code suggestions']:
-            try:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"suggestion: {d}")
-                relevant_file = d['relevant file'].strip()
-                relevant_lines_start = int(d['relevant lines start'])  # absolute position
-                relevant_lines_end = int(d['relevant lines end'])
-                content = d['suggestion content']
-                new_code_snippet = d['improved code']
+            if settings.config.verbosity_level >= 2:
+                logging.info(f"suggestion: {d}")
+            relevant_file = d['relevant file'].strip()
+            relevant_lines_str = d['relevant lines'].strip()
+            relevant_lines_start = int(relevant_lines_str.split('-')[0])  # absolute position
+            relevant_lines_end = int(relevant_lines_str.split('-')[-1])
+            content = d['suggestion content']
+            new_code_snippet = d['improved code']
 
-                if new_code_snippet:
-                    new_code_snippet = self.dedent_code(relevant_file, relevant_lines_start, new_code_snippet)
+            if new_code_snippet:
+                new_code_snippet = self.dedent_code(relevant_file, relevant_lines_start, new_code_snippet)
 
-                body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```"
-                code_suggestions.append({'body': body, 'relevant_file': relevant_file,
-                                         'relevant_lines_start': relevant_lines_start,
-                                         'relevant_lines_end': relevant_lines_end})
-            except Exception:
-                if get_settings().config.verbosity_level >= 2:
-                    get_logger().info(f"Could not parse suggestion: {d}")
+            body = f"**Suggestion:** {content}\n```suggestion\n" + new_code_snippet + "\n```"
+            code_suggestions.append({'body': body,'relevant_file': relevant_file,
+                                     'relevant_lines_start': relevant_lines_start,
+                                     'relevant_lines_end': relevant_lines_end})
 
-        is_successful = self.git_provider.publish_code_suggestions(code_suggestions)
-        if not is_successful:
-            get_logger().info("Failed to publish code suggestions, trying to publish each suggestion separately")
-            for code_suggestion in code_suggestions:
-                self.git_provider.publish_code_suggestions([code_suggestion])
+        self.git_provider.publish_code_suggestions(code_suggestions)
 
     def dedent_code(self, relevant_file, relevant_lines_start, new_code_snippet):
         try:  # dedent code snippet
@@ -166,123 +127,7 @@ class PRCodeSuggestions:
                 if delta_spaces > 0:
                     new_code_snippet = textwrap.indent(new_code_snippet, delta_spaces * " ").rstrip('\n')
         except Exception as e:
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
+            if settings.config.verbosity_level >= 2:
+                logging.info(f"Could not dedent code snippet for file {relevant_file}, error: {e}")
 
         return new_code_snippet
-
-    async def _prepare_prediction_extended(self, model: str) -> dict:
-        get_logger().info('Getting PR diff...')
-        patches_diff_list = get_pr_multi_diffs(self.git_provider, self.token_handler, model,
-                                               max_calls=get_settings().pr_code_suggestions.max_number_of_calls)
-
-        get_logger().info('Getting multi AI predictions...')
-        prediction_list = []
-        for i, patches_diff in enumerate(patches_diff_list):
-            get_logger().info(f"Processing chunk {i + 1} of {len(patches_diff_list)}")
-            self.patches_diff = patches_diff
-            prediction = await self._get_prediction(model)
-            prediction_list.append(prediction)
-        self.prediction_list = prediction_list
-
-        data = {}
-        for prediction in prediction_list:
-            self.prediction = prediction
-            data_per_chunk = self._prepare_pr_code_suggestions()
-            if "Code suggestions" in data:
-                data["Code suggestions"].extend(data_per_chunk["Code suggestions"])
-            else:
-                data.update(data_per_chunk)
-        self.data = data
-        return data
-
-    async def rank_suggestions(self, data: List) -> List:
-        """
-        Call a model to rank (sort) code suggestions based on their importance order.
-
-        Args:
-            data (List): A list of code suggestions to be ranked.
-
-        Returns:
-            List: The ranked list of code suggestions.
-        """
-
-        suggestion_list = []
-        # remove invalid suggestions
-        for i, suggestion in enumerate(data):
-            if suggestion['existing code'] != suggestion['improved code']:
-                suggestion_list.append(suggestion)
-
-        data_sorted = [[]] * len(suggestion_list)
-
-        try:
-            suggestion_str = ""
-            for i, suggestion in enumerate(suggestion_list):
-                suggestion_str += f"suggestion {i + 1}: " + str(suggestion) + '\n\n'
-
-            variables = {'suggestion_list': suggestion_list, 'suggestion_str': suggestion_str}
-            model = get_settings().config.model
-            environment = Environment(undefined=StrictUndefined)
-            system_prompt = environment.from_string(get_settings().pr_sort_code_suggestions_prompt.system).render(
-                variables)
-            user_prompt = environment.from_string(get_settings().pr_sort_code_suggestions_prompt.user).render(variables)
-            if get_settings().config.verbosity_level >= 2:
-                get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-                get_logger().info(f"\nUser prompt:\n{user_prompt}")
-            response, finish_reason = await self.ai_handler.chat_completion(model=model, system=system_prompt,
-                                                                            user=user_prompt)
-
-            sort_order = load_yaml(response)
-            for s in sort_order['Sort Order']:
-                suggestion_number = s['suggestion number']
-                importance_order = s['importance order']
-                data_sorted[importance_order - 1] = suggestion_list[suggestion_number - 1]
-
-            if get_settings().pr_code_suggestions.final_clip_factor != 1:
-                new_len = int(0.5 + len(data_sorted) * get_settings().pr_code_suggestions.final_clip_factor)
-                data_sorted = data_sorted[:new_len]
-        except Exception as e:
-            if get_settings().config.verbosity_level >= 1:
-                get_logger().info(f"Could not sort suggestions, error: {e}")
-            data_sorted = suggestion_list
-
-        return data_sorted
-
-    def publish_summarizes_suggestions(self, data: Dict):
-        try:
-            data_markdown = "## PR Code Suggestions\n\n"
-
-            language_extension_map_org = get_settings().language_extension_map_org
-            extension_to_language = {}
-            for language, extensions in language_extension_map_org.items():
-                for ext in extensions:
-                    extension_to_language[ext] = language
-
-            for s in data['Code suggestions']:
-                try:
-                    extension_s = s['relevant file'].rsplit('.')[-1]
-                    code_snippet_link = self.git_provider.get_line_link(s['relevant file'], s['relevant lines start'],
-                                                                        s['relevant lines end'])
-                    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_config.py

@@ -1,47 +0,0 @@
-from pr_agent.config_loader import get_settings
-from pr_agent.git_providers import get_git_provider
-from pr_agent.log import get_logger
-
-
-class PRConfig:
-    """
-    The PRConfig class is responsible for listing all configuration options available for the user.
-    """
-    def __init__(self, pr_url: str, args=None):
-        """
-        Initialize the PRConfig object with the necessary attributes and objects to comment on a pull request.
-
-        Args:
-            pr_url (str): The URL of the pull request to be reviewed.
-            args (list, optional): List of arguments passed to the PRReviewer class. Defaults to None.
-        """
-        self.git_provider = get_git_provider()(pr_url)
-
-    async def run(self):
-        get_logger().info('Getting configuration settings...')
-        get_logger().info('Preparing configs...')
-        pr_comment = self._prepare_pr_configs()
-        if get_settings().config.publish_output:
-            get_logger().info('Pushing configs...')
-            self.git_provider.publish_comment(pr_comment)
-            self.git_provider.remove_initial_comment()
-        return ""
-
-    def _prepare_pr_configs(self) -> str:
-        import tomli
-        with open(get_settings().find_file("configuration.toml"), "rb") as conf_file:
-            configuration_headers = [header.lower() for header in tomli.load(conf_file).keys()]
-        relevant_configs = {
-            header: configs for header, configs in get_settings().to_dict().items()
-            if header.lower().startswith("pr_") and header.lower() in configuration_headers
-        }
-        comment_str = "Possible Configurations:"
-        for header, configs in relevant_configs.items():
-            if configs:
-                comment_str += "\n"
-            for key, value in configs.items():
-                comment_str += f"\n{header.lower()}.{key.lower()} = {repr(value) if isinstance(value, str) else value}"
-                comment_str += "  "
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"comment_str:\n{comment_str}")
-        return comment_str

pr_agent/tools/pr_description.py

@@ -1,397 +1,92 @@
 import copy
-import re
-from typing import List, Tuple
+import json
+import logging
 
 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.config_loader import settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
 
 
 class PRDescription:
-    def __init__(self, pr_url: str, args: list = None):
-        """
-        Initialize the PRDescription object with the necessary attributes and objects for generating a PR description
-        using an AI model.
-        Args:
-            pr_url (str): The URL of the pull request.
-            args (list, optional): List of arguments passed to the PRDescription class. Defaults to None.
-        """
-        # Initialize the git provider and main PR language
+    def __init__(self, pr_url: str):
         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()
-
-        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()
-    
-        # 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),
+            "description": self.git_provider.get_pr_description(),
             "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,
         }
-
-        self.user_description = self.git_provider.get_user_description()
-    
-        # Initialize the token handler
-        self.token_handler = TokenHandler(
-            self.git_provider.pr,
-            self.vars,
-            get_settings().pr_description_prompt.system,
-            get_settings().pr_description_prompt.user,
-        )
-    
-        # Initialize patches_diff and prediction attributes
+        self.token_handler = TokenHandler(self.git_provider.pr,
+                                          self.vars,
+                                          settings.pr_description_prompt.system,
+                                          settings.pr_description_prompt.user)
         self.patches_diff = None
         self.prediction = None
 
-    async def run(self):
-        """
-        Generates a PR description using an AI model and publishes it to the PR.
-        """
-
-        try:
-            get_logger().info(f"Generating a PR description {self.pr_id}")
-            if get_settings().config.publish_output:
-                self.git_provider.publish_comment("Preparing PR description...", is_temporary=True)
-
-            await retry_with_fallback_models(self._prepare_prediction)
-
-            get_logger().info(f"Preparing answer {self.pr_id}")
-            if self.prediction:
-                self._prepare_data()
+    async def describe(self):
+        logging.info('Generating a PR description...')
+        if settings.config.publish_output:
+            self.git_provider.publish_comment("Preparing pr description...", is_temporary=True)
+        await retry_with_fallback_models(self._prepare_prediction)
+        logging.info('Preparing answer...')
+        pr_title, pr_body, pr_types, markdown_text = self._prepare_pr_answer()
+        if settings.config.publish_output:
+            logging.info('Pushing answer...')
+            if settings.pr_description.publish_description_as_comment:
+                self.git_provider.publish_comment(markdown_text)
             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()
-
-            if get_settings().pr_description.use_description_markers:
-                pr_title, pr_body = self._prepare_pr_answer_with_markers()
-            else:
-                pr_title, pr_body,  = self._prepare_pr_answer()
-            full_markdown_description = f"## Title\n\n{pr_title}\n\n___\n{pr_body}"
-
-            if get_settings().config.publish_output:
-                get_logger().info(f"Pushing answer {self.pr_id}")
-                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})")
-                self.git_provider.remove_initial_comment()
-        except Exception as e:
-            get_logger().error(f"Error generating PR description {self.pr_id}: {e}")
-        
+                self.git_provider.publish_description(pr_title, pr_body)
+                self.git_provider.publish_labels(pr_types)
+            self.git_provider.remove_initial_comment()
         return ""
 
-    async def _prepare_prediction(self, model: str) -> None:
-        """
-        Prepare the AI prediction for the PR description 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.
-
-        """
-        if get_settings().pr_description.use_description_markers and 'pr_agent:' not in self.user_description:
-            return None
-
-        get_logger().info(f"Getting PR diff {self.pr_id}")
+    async def _prepare_prediction(self, model: str):
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info(f"Getting AI prediction {self.pr_id}")
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
-    async def _get_prediction(self, model: str) -> str:
-        """
-        Generate an AI prediction for the PR description 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.
-        """
+    async def _get_prediction(self, model: str):
         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_description_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_description_prompt.user).render(variables)
-
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            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}")
-
+        system_prompt = environment.from_string(settings.pr_description_prompt.system).render(variables)
+        user_prompt = environment.from_string(settings.pr_description_prompt.user).render(variables)
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
+        response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
+                                                                        system=system_prompt, user=user_prompt)
         return response
 
-    def _prepare_data(self):
-        # Load the AI prediction data into a dictionary
-        self.data = load_yaml(self.prediction.strip())
-
-        if get_settings().pr_description.add_original_user_description and self.user_description:
-            self.data["User Description"] = self.user_description
-
-
-    def _prepare_labels(self) -> List[str]:
-        pr_types = []
-
-        # If the 'PR Type' key is present in the dictionary, split its value by comma and assign it to 'pr_types'
-        if 'labels' in self.data:
-            if 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(',')
-        return pr_types
-
-    def _prepare_pr_answer_with_markers(self) -> Tuple[str, str]:
-        get_logger().info(f"Using description marker replacements {self.pr_id}")
-        title = self.vars["title"]
-        body = self.user_description
-        if get_settings().pr_description.include_generated_by_header:
-            ai_header = f"### 🤖 Generated by PR Agent at {self.git_provider.last_commit_id.sha}\n\n"
-        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')
-        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)
-
-        if not re.search(r'<!--\s*pr_agent:walkthrough\s*-->', body):
-            ai_walkthrough = self.data.get('PR Main Files Walkthrough')
-            if ai_walkthrough:
-                walkthrough = str(ai_header)
-                for file in ai_walkthrough:
-                    filename = file['filename'].replace("'", "`")
-                    description = file['changes in file'].replace("'", "`")
-                    walkthrough += f'- `{filename}`: {description}\n'
-
-                body = body.replace('pr_agent:walkthrough', walkthrough)
-
-        return title, body
-
-    def _prepare_pr_answer(self) -> Tuple[str, str]:
-        """
-        Prepare the PR description based on the AI prediction data.
-
-        Returns:
-        - title: a string containing the PR title.
-        - pr_body: a string containing the PR description body in a markdown format.
-        """
-
-        # Iterate over the dictionary items and append the key and value to 'markdown_text' in a markdown format
+    def _prepare_pr_answer(self):
+        data = json.loads(self.prediction)
         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():
+        for key, value in 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"])
-        if get_settings().pr_description.keep_original_user_title:
-            # Assign the original PR title to the 'title' variable
-            title = self.vars["title"]
-        else:
-            # Assign the value of the 'PR Title' key to 'title' variable
-            title = ai_title
-
-        # Iterate over the remaining dictionary items and append the key and value to 'pr_body' in a markdown format,
-        # 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_types = []
+        if 'PR Type' in data:
+            pr_types = data['PR Type'].split(',')
+        title = data['PR Title']
+        del data['PR Title']
+        for key, value in data.items():
+            pr_body += f"{key}:\n"
             if 'walkthrough' in key.lower():
-                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'
-                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)
-            else:
-                # if the value is a list, join its items by comma
-                if isinstance(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"
-
-        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
+            else:
+                pr_body += f"**{value}**\n\n___\n"
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"title:\n{title}\n{pr_body}")
+        return title, pr_body, pr_types, markdown_text

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_information_from_user.py

@@ -1,18 +1,20 @@
 import copy
+import logging
 
 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.config_loader import get_settings
+from pr_agent.config_loader import settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
+
+
 
 
 class PRInformationFromUser:
-    def __init__(self, pr_url: str, args: list = None):
+    def __init__(self, pr_url: str):
         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()
@@ -24,51 +26,50 @@ class PRInformationFromUser:
             "description": self.git_provider.get_pr_description(),
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
-            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,
-                                          get_settings().pr_information_from_user_prompt.system,
-                                          get_settings().pr_information_from_user_prompt.user)
+                                          settings.pr_information_from_user_prompt.system,
+                                          settings.pr_information_from_user_prompt.user)
         self.patches_diff = None
         self.prediction = None
 
-    async def run(self):
-        get_logger().info('Generating question to the user...')
-        if get_settings().config.publish_output:
+    async def generate_questions(self):
+        logging.info('Generating question to the user...')
+        if settings.config.publish_output:
             self.git_provider.publish_comment("Preparing questions...", is_temporary=True)
         await retry_with_fallback_models(self._prepare_prediction)
-        get_logger().info('Preparing questions...')
+        logging.info('Preparing questions...')
         pr_comment = self._prepare_pr_answer()
-        if get_settings().config.publish_output:
-            get_logger().info('Pushing questions...')
+        if settings.config.publish_output:
+            logging.info('Pushing questions...')
             self.git_provider.publish_comment(pr_comment)
             self.git_provider.remove_initial_comment()
         return ""
 
     async def _prepare_prediction(self, model):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
         variables = copy.deepcopy(self.vars)
         variables["diff"] = self.patches_diff  # update diff
         environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_information_from_user_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_information_from_user_prompt.user).render(variables)
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+        system_prompt = environment.from_string(settings.pr_information_from_user_prompt.system).render(variables)
+        user_prompt = environment.from_string(settings.pr_information_from_user_prompt.user).render(variables)
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
         return response
 
     def _prepare_pr_answer(self) -> str:
         model_output = self.prediction.strip()
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"answer_str:\n{model_output}")
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"answer_str:\n{model_output}")
         answer_str = f"{model_output}\n\n Please respond to the questions above in the following format:\n\n" +\
                      "\n>/answer\n>1) ...\n>2) ...\n>...\n"
         return answer_str

pr_agent/tools/pr_questions.py

@@ -1,14 +1,14 @@
 import copy
+import logging
 
 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.config_loader import get_settings
+from pr_agent.config_loader import settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.git_providers.git_provider import get_main_pr_language
-from pr_agent.log import get_logger
 
 
 class PRQuestions:
@@ -27,12 +27,11 @@ class PRQuestions:
             "language": self.main_pr_language,
             "diff": "",  # empty diff for initial calculation
             "questions": self.question_str,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
         }
         self.token_handler = TokenHandler(self.git_provider.pr,
                                           self.vars,
-                                          get_settings().pr_questions_prompt.system,
-                                          get_settings().pr_questions_prompt.user)
+                                          settings.pr_questions_prompt.system,
+                                          settings.pr_questions_prompt.user)
         self.patches_diff = None
         self.prediction = None
 
@@ -43,34 +42,34 @@ class PRQuestions:
             question_str = ""
         return question_str
 
-    async def run(self):
-        get_logger().info('Answering a PR question...')
-        if get_settings().config.publish_output:
+    async def answer(self):
+        logging.info('Answering a PR question...')
+        if settings.config.publish_output:
             self.git_provider.publish_comment("Preparing answer...", is_temporary=True)
         await retry_with_fallback_models(self._prepare_prediction)
-        get_logger().info('Preparing answer...')
+        logging.info('Preparing answer...')
         pr_comment = self._prepare_pr_answer()
-        if get_settings().config.publish_output:
-            get_logger().info('Pushing answer...')
+        if settings.config.publish_output:
+            logging.info('Pushing answer...')
             self.git_provider.publish_comment(pr_comment)
             self.git_provider.remove_initial_comment()
         return ""
 
     async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
     async def _get_prediction(self, model: str):
         variables = copy.deepcopy(self.vars)
         variables["diff"] = self.patches_diff  # update diff
         environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_questions_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_questions_prompt.user).render(variables)
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"\nSystem prompt:\n{system_prompt}")
-            get_logger().info(f"\nUser prompt:\n{user_prompt}")
+        system_prompt = environment.from_string(settings.pr_questions_prompt.system).render(variables)
+        user_prompt = environment.from_string(settings.pr_questions_prompt.user).render(variables)
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
         response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
                                                                         system=system_prompt, user=user_prompt)
         return response
@@ -78,6 +77,6 @@ class PRQuestions:
     def _prepare_pr_answer(self) -> str:
         answer_str = f"Question: {self.question_str}\n\n"
         answer_str += f"Answer:\n{self.prediction.strip()}\n\n"
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"answer_str:\n{answer_str}")
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"answer_str:\n{answer_str}")
         return answer_str

pr_agent/tools/pr_reviewer.py

@@ -1,37 +1,23 @@
 import copy
-import datetime
+import json
+import logging
 from collections import OrderedDict
-from typing import List, Tuple
 
-import yaml
 from jinja2 import Environment, StrictUndefined
-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.config_loader import get_settings
+from pr_agent.algo.utils import convert_to_markdown, try_fix_json
+from pr_agent.config_loader import settings
 from pr_agent.git_providers import get_git_provider
-from pr_agent.git_providers.git_provider import IncrementalPR, get_main_pr_language
-from pr_agent.log import get_logger
+from pr_agent.git_providers.git_provider import get_main_pr_language, IncrementalPR
 from pr_agent.servers.help import actions_help_text, bot_help_text
 
 
 class PRReviewer:
-    """
-    The PRReviewer class is responsible for reviewing a pull request and generating feedback using an AI model.
-    """
-    def __init__(self, pr_url: str, is_answer: bool = False, is_auto: bool = False, args: list = None):
-        """
-        Initialize the PRReviewer object with the necessary attributes and objects to review a pull request.
-
-        Args:
-            pr_url (str): The URL of the pull request to be reviewed.
-            is_answer (bool, optional): Indicates whether the review is being done in answer mode. Defaults to False.
-            args (list, optional): List of arguments passed to the PRReviewer class. Defaults to None.
-        """
-        self.parse_args(args) # -i command
+    def __init__(self, pr_url: str, cli_mode=False, is_answer: bool = False, args=None):
+        self.parse_args(args)
 
         self.git_provider = get_git_provider()(pr_url, incremental=self.incremental)
         self.main_language = get_main_pr_language(
@@ -39,52 +25,34 @@ class PRReviewer:
         )
         self.pr_url = pr_url
         self.is_answer = is_answer
-        self.is_auto = is_auto
-
         if self.is_answer and not self.git_provider.is_supported("get_issue_comments"):
-            raise Exception(f"Answer mode is not supported for {get_settings().config.git_provider} for now")
+            raise Exception(f"Answer mode is not supported for {settings.config.git_provider} for now")
+        answer_str, question_str = self._get_user_answers()
         self.ai_handler = AiHandler()
         self.patches_diff = None
         self.prediction = None
-
-        answer_str, question_str = self._get_user_answers()
+        self.cli_mode = cli_mode
         self.vars = {
             "title": self.git_provider.pr.title,
             "branch": self.git_provider.get_pr_branch(),
             "description": self.git_provider.get_pr_description(),
             "language": self.main_language,
             "diff": "",  # empty diff for initial calculation
-            "require_score": get_settings().pr_reviewer.require_score_review,
-            "require_tests": get_settings().pr_reviewer.require_tests_review,
-            "require_security": get_settings().pr_reviewer.require_security_review,
-            "require_focused": get_settings().pr_reviewer.require_focused_review,
-            "require_estimate_effort_to_review": get_settings().pr_reviewer.require_estimate_effort_to_review,
-            'num_code_suggestions': get_settings().pr_reviewer.num_code_suggestions,
+            "require_score": settings.pr_reviewer.require_score_review,
+            "require_tests": settings.pr_reviewer.require_tests_review,
+            "require_security": settings.pr_reviewer.require_security_review,
+            "require_focused": settings.pr_reviewer.require_focused_review,
+            'num_code_suggestions': settings.pr_reviewer.num_code_suggestions,
+            #
             'question_str': question_str,
             '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(self.git_provider.pr,
+                                          self.vars,
+                                          settings.pr_review_prompt.system,
+                                          settings.pr_review_prompt.user)
 
-        self.token_handler = TokenHandler(
-            self.git_provider.pr,
-            self.vars,
-            get_settings().pr_review_prompt.system,
-            get_settings().pr_review_prompt.user
-        )
-
-    def parse_args(self, args: List[str]) -> None:
-        """
-        Parse the arguments passed to the PRReviewer class and set the 'incremental' attribute accordingly.
-
-        Args:
-            args: A list of arguments passed to the PRReviewer class.
-
-        Returns:
-            None
-        """
+    def parse_args(self, args):
         is_incremental = False
         if args and len(args) >= 1:
             arg = args[0]
@@ -92,200 +60,106 @@ class PRReviewer:
                 is_incremental = True
         self.incremental = IncrementalPR(is_incremental)
 
-    async def run(self) -> None:
-        """
-        Review the pull request and generate feedback.
-        """
+    async def review(self):
+        logging.info('Reviewing PR...')
+        if settings.config.publish_output:
+            self.git_provider.publish_comment("Preparing review...", is_temporary=True)
+        await retry_with_fallback_models(self._prepare_prediction)
+        logging.info('Preparing PR review...')
+        pr_comment = self._prepare_pr_review()
+        if settings.config.publish_output:
+            logging.info('Pushing PR review...')
+            self.git_provider.publish_comment(pr_comment)
+            self.git_provider.remove_initial_comment()
+            if settings.pr_reviewer.inline_code_comments:
+                logging.info('Pushing inline code comments...')
+                self._publish_inline_code_comments()
+        return ""
 
-        try:
-            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} ...')
-
-            if get_settings().config.publish_output:
-                self.git_provider.publish_comment("Preparing review...", is_temporary=True)
-
-            await retry_with_fallback_models(self._prepare_prediction)
-
-            get_logger().info('Preparing PR review...')
-            pr_comment = self._prepare_pr_review()
-
-            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.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()
-        except Exception as e:
-            get_logger().error(f"Failed to review PR: {e}")
-
-    async def _prepare_prediction(self, model: str) -> None:
-        """
-        Prepare the AI prediction for the pull request review.
-
-        Args:
-            model: A string representing the AI model to be used for the prediction.
-
-        Returns:
-            None
-        """
-        get_logger().info('Getting PR diff...')
+    async def _prepare_prediction(self, model: str):
+        logging.info('Getting PR diff...')
         self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
+        logging.info('Getting AI prediction...')
         self.prediction = await self._get_prediction(model)
 
-    async def _get_prediction(self, model: str) -> str:
-        """
-        Generate an AI prediction for the pull request review.
-
-        Args:
-            model: A string representing the AI model to be used for the prediction.
-
-        Returns:
-            A string representing the AI prediction for the pull request review.
-        """
+    async def _get_prediction(self, model: str):
         variables = copy.deepcopy(self.vars)
         variables["diff"] = self.patches_diff  # update diff
-
         environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_review_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_review_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}")
+        system_prompt = environment.from_string(settings.pr_review_prompt.system).render(variables)
+        user_prompt = environment.from_string(settings.pr_review_prompt.user).render(variables)
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"\nSystem prompt:\n{system_prompt}")
+            logging.info(f"\nUser prompt:\n{user_prompt}")
+        response, finish_reason = await self.ai_handler.chat_completion(model=model, temperature=0.2,
+                                                                        system=system_prompt, user=user_prompt)
 
         return response
 
     def _prepare_pr_review(self) -> str:
-        """
-        Prepare the PR review by processing the AI prediction and generating a markdown-formatted text that summarizes
-        the feedback.
-        """
-        data = load_yaml(self.prediction.strip())
+        review = self.prediction.strip()
+        try:
+            data = json.loads(review)
+        except json.decoder.JSONDecodeError:
+            data = try_fix_json(review)
 
-        # Move 'Security concerns' key to 'PR Analysis' section for better display
-        pr_feedback = data.get('PR Feedback', {})
-        security_concerns = pr_feedback.get('Security concerns')
-        if security_concerns is not None:
-            del pr_feedback['Security concerns']
-            if type(security_concerns) == bool and security_concerns == False:
-                data.setdefault('PR Analysis', {})['Security concerns'] = 'No security concerns found'
-            else:
-                data.setdefault('PR Analysis', {})['Security concerns'] = security_concerns
+        # reordering for nicer display
+        if 'PR Feedback' in data:
+            if 'Security concerns' in data['PR Feedback']:
+                val = data['PR Feedback']['Security concerns']
+                del data['PR Feedback']['Security concerns']
+                data['PR Analysis']['Security concerns'] = val
 
-        #
-        if 'Code feedback' in pr_feedback:
-            code_feedback = pr_feedback['Code feedback']
+        if settings.config.git_provider != 'bitbucket' and \
+                settings.pr_reviewer.inline_code_comments and \
+                'Code suggestions' in data['PR Feedback']:
+            # keeping only code suggestions that can't be submitted as inline comments
+            data['PR Feedback']['Code suggestions'] = [
+                d for d in data['PR Feedback']['Code suggestions']
+                if any(key not in d for key in ('relevant file', 'relevant line in file', 'suggestion content'))
+            ]
+            if not data['PR Feedback']['Code suggestions']:
+                del data['PR Feedback']['Code suggestions']
 
-            # Filter out code suggestions that can be submitted as inline comments
-            if get_settings().pr_reviewer.inline_code_comments:
-                del pr_feedback['Code feedback']
-            else:
-                for suggestion in code_feedback:
-                    if ('relevant file' in suggestion) and (not suggestion['relevant file'].startswith('``')):
-                        suggestion['relevant file'] = f"``{suggestion['relevant file']}``"
-
-                    if 'relevant line' not in suggestion:
-                        suggestion['relevant line'] = ''
-
-                    relevant_line_str = suggestion['relevant line'].split('\n')[0]
-
-                    # removing '+'
-                    suggestion['relevant line'] = relevant_line_str.lstrip('+').strip()
-
-                    # try to add line numbers link to code suggestions
-                    if hasattr(self.git_provider, 'generate_link_to_relevant_line_number'):
-                        link = self.git_provider.generate_link_to_relevant_line_number(suggestion)
-                        if link:
-                            suggestion['relevant line'] = f"[{suggestion['relevant line']}]({link})"
-                    else:
-                        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})_"
+            # Rename title when incremental review - Add to the beginning of the dict
+            last_commit_url = f"{self.git_provider.get_pr_url()}/commits/{self.git_provider.incremental.first_new_commit_sha}"
             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"))
+        markdown_text = convert_to_markdown(data)
         user = self.git_provider.get_user_id()
 
-        # Add help text if not in CLI mode
-        if not get_settings().get("CONFIG.CLI_MODE", False):
+        if not self.cli_mode:
             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:
+            if user and '[bot]' 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:
-            get_logger().info(f"Markdown response:\n{markdown_text}")
-
-        if markdown_text == None or len(markdown_text) == 0:
-            markdown_text = ""
 
+        if settings.config.verbosity_level >= 2:
+            logging.info(f"Markdown response:\n{markdown_text}")
         return markdown_text
 
-    def _publish_inline_code_comments(self) -> None:
-        """
-        Publishes inline comments on a pull request with code suggestions generated by the AI model.
-        """
-        if get_settings().pr_reviewer.num_code_suggestions == 0:
+    def _publish_inline_code_comments(self):
+        if settings.pr_reviewer.num_code_suggestions == 0:
             return
 
-        data = load_yaml(self.prediction.strip())
-        comments: List[str] = []
-        for suggestion in data.get('PR Feedback', {}).get('Code feedback', []):
-            relevant_file = suggestion.get('relevant file', '').strip()
-            relevant_line_in_file = suggestion.get('relevant line', '').strip()
-            content = suggestion.get('suggestion', '')
+        review = self.prediction.strip()
+        try:
+            data = json.loads(review)
+        except json.decoder.JSONDecodeError:
+            data = try_fix_json(review)
+
+        comments = []
+        for d in data['PR Feedback']['Code suggestions']:
+            relevant_file = d.get('relevant file', '').strip()
+            relevant_line_in_file = d.get('relevant line in file', '').strip()
+            content = d.get('suggestion content', '')
             if not relevant_file or not relevant_line_in_file or not content:
-                get_logger().info("Skipping inline comment with missing file/line/content")
+                logging.info("Skipping inline comment with missing file/line/content")
                 continue
 
             if self.git_provider.is_supported("create_inline_comment"):
@@ -296,108 +170,17 @@ class PRReviewer:
                 self.git_provider.publish_inline_comment(content, relevant_file, relevant_line_in_file)
 
         if comments:
-                self.git_provider.publish_inline_comments(comments)
-
-    def _get_user_answers(self) -> Tuple[str, str]:
-        """
-        Retrieves the question and answer strings from the discussion messages related to a pull request.
-
-        Returns:
-            A tuple containing the question and answer strings.
-        """
-        question_str = ""
-        answer_str = ""
+            self.git_provider.publish_inline_comments(comments)
 
+    def _get_user_answers(self):
+        answer_str = question_str = ""
         if self.is_answer:
             discussion_messages = self.git_provider.get_issue_comments()
-
             for message in discussion_messages.reversed:
                 if "Questions to better understand the PR:" in message.body:
                     question_str = message.body
                 elif '/answer' in message.body:
                     answer_str = message.body
-
                 if answer_str and question_str:
                     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

@@ -1,295 +0,0 @@
-import time
-from enum import Enum
-from typing import List
-
-import openai
-import pandas as pd
-import pinecone
-from pinecone_datasets import Dataset, DatasetMetadata
-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
-
-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.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('_/', '-')
-        index_name = self.index_name = "codium-ai-pr-agent-issues"
-
-        # assuming pinecone api key and environment are set in secrets file
-        try:
-            api_key = get_settings().pinecone.api_key
-            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)
-                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")
-
-        # check if index exists, and if repo is already indexed
-        run_from_scratch = False
-        if run_from_scratch:  # for debugging
-            pinecone.init(api_key=api_key, environment=environment)
-            if index_name in pinecone.list_indexes():
-                get_logger().info('Removing index...')
-                pinecone.delete_index(index_name)
-                get_logger().info('Done')
-
-        upsert = True
-        pinecone.init(api_key=api_key, environment=environment)
-        if not index_name in pinecone.list_indexes():
-            run_from_scratch = True
-            upsert = False
-        else:
-            if get_settings().pr_similar_issue.force_update_dataset:
-                upsert = True
-            else:
-                pinecone_index = pinecone.Index(index_name=index_name)
-                res = pinecone_index.fetch([f"example_issue_{repo_name_for_index}"]).to_dict()
-                if res["vectors"]:
-                    upsert = False
-
-        if run_from_scratch or upsert:  # index the entire repo
-            get_logger().info('Indexing the entire repo...')
-
-            get_logger().info('Getting issues...')
-            issues = list(repo_obj.get_issues(state='all'))
-            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')
-            counter = 1
-            for issue in issues_paginated_list:
-                if issue.pull_request:
-                    continue
-                issue_str, comments, number = self._process_issue(issue)
-                issue_key = f"issue_{number}"
-                id = issue_key + "." + "issue"
-                res = pinecone_index.fetch([id]).to_dict()
-                is_new_issue = True
-                for vector in res["vectors"].values():
-                    if vector['metadata']['repo'] == repo_name_for_index:
-                        is_new_issue = False
-                        break
-                if is_new_issue:
-                    counter += 1
-                    issues_to_update.append(issue)
-                else:
-                    break
-
-            if issues_to_update:
-                get_logger().info(f'Updating index with {counter} new issues...')
-                self._update_index_with_issues(issues_to_update, repo_name_for_index, upsert=True)
-            else:
-                get_logger().info('No new issues to update')
-
-    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)
-        issue_str, comments, number = self._process_issue(issue_main)
-        openai.api_key = get_settings().openai.key
-        get_logger().info('Done')
-
-        get_logger().info('Querying...')
-        res = openai.Embedding.create(input=[issue_str], engine=MODEL)
-        embeds = [record['embedding'] for record in res['data']]
-        pinecone_index = pinecone.Index(index_name=self.index_name)
-        res = pinecone_index.query(embeds[0],
-                                   top_k=5,
-                                   filter={"repo": self.repo_name_for_index},
-                                   include_metadata=True).to_dict()
-        relevant_issues_number_list = []
-        relevant_comment_number_list = []
-        score_list = []
-        for r in res['matches']:
-            # skip example issue
-            if 'example_issue_' in r["id"]:
-                continue
-
-            try:
-                issue_number = int(r["id"].split('.')[0].split('_')[-1])
-            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:
-                relevant_issues_number_list.append(issue_number)
-            if 'comment' in r["id"]:
-                relevant_comment_number_list.append(int(r["id"].split('.')[1].split('_')[-1]))
-            else:
-                relevant_comment_number_list.append(-1)
-            score_list.append(str("{:.2f}".format(r['score'])))
-        get_logger().info('Done')
-
-        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)
-            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
-            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)
-        get_logger().info(similar_issues_str)
-        get_logger().info('Done')
-
-    def _process_issue(self, issue):
-        header = issue.title
-        body = issue.body
-        number = issue.number
-        if get_settings().pr_similar_issue.skip_comments:
-            comments = []
-        else:
-            comments = list(issue.get_comments())
-        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()
-        example_issue_record = Record(
-            id=f"example_issue_{repo_name_for_index}",
-            text="example_issue",
-            metadata=Metadata(repo=repo_name_for_index)
-        )
-        corpus.append(example_issue_record)
-
-        counter = 0
-        for issue in issues_list:
-            if issue.pull_request:
-                continue
-
-            counter += 1
-            if counter % 100 == 0:
-                get_logger().info(f"Scanned {counter} issues")
-            if counter >= self.max_issues_to_scan:
-                get_logger().info(f"Scanned {self.max_issues_to_scan} issues, stopping")
-                break
-
-            issue_str, comments, number = self._process_issue(issue)
-            issue_key = f"issue_{number}"
-            username = issue.user.login
-            created_at = str(issue.created_at)
-            if len(issue_str) < 8000 or \
-                    self.token_handler.count_tokens(issue_str) < get_max_tokens(MODEL):  # fast reject first
-                issue_record = Record(
-                    id=issue_key + "." + "issue",
-                    text=issue_str,
-                    metadata=Metadata(repo=repo_name_for_index,
-                                      username=username,
-                                      created_at=created_at,
-                                      level=IssueLevel.ISSUE)
-                )
-                corpus.append(issue_record)
-                if comments:
-                    for j, comment in enumerate(comments):
-                        comment_body = comment.body
-                        num_words_comment = len(comment_body.split())
-                        if num_words_comment < 10 or not isinstance(comment_body, str):
-                            continue
-
-                        if len(comment_body) < 8000 or \
-                                self.token_handler.count_tokens(comment_body) < MAX_TOKENS[MODEL]:
-                            comment_record = Record(
-                                id=issue_key + ".comment_" + str(j + 1),
-                                text=comment_body,
-                                metadata=Metadata(repo=repo_name_for_index,
-                                                  username=username,  # use issue username for all comments
-                                                  created_at=created_at,
-                                                  level=IssueLevel.COMMENT)
-                            )
-                            corpus.append(comment_record)
-        df = pd.DataFrame(corpus.dict()["documents"])
-        get_logger().info('Done')
-
-        get_logger().info('Embedding...')
-        openai.api_key = get_settings().openai.key
-        list_to_encode = list(df["text"].values)
-        try:
-            res = openai.Embedding.create(input=list_to_encode, engine=MODEL)
-            embeds = [record['embedding'] for record in res['data']]
-        except:
-            embeds = []
-            get_logger().error('Failed to embed entire list, embedding one by one...')
-            for i, text in enumerate(list_to_encode):
-                try:
-                    res = openai.Embedding.create(input=[text], engine=MODEL)
-                    embeds.append(res['data'][0]['embedding'])
-                except:
-                    embeds.append([0] * 1536)
-        df["values"] = embeds
-        meta = DatasetMetadata.empty()
-        meta.dense_model.dimension = len(embeds[0])
-        ds = Dataset.from_pandas(df, meta)
-        get_logger().info('Done')
-
-        api_key = get_settings().pinecone.api_key
-        environment = get_settings().pinecone.environment
-        if not upsert:
-            get_logger().info('Creating index from scratch...')
-            ds.to_pinecone_index(self.index_name, api_key=api_key, environment=environment)
-            time.sleep(15)  # wait for pinecone to finalize indexing before querying
-        else:
-            get_logger().info('Upserting index...')
-            namespace = ""
-            batch_size: int = 100
-            concurrency: int = 10
-            pinecone.init(api_key=api_key, environment=environment)
-            ds._upsert_to_index(self.index_name, namespace, batch_size, concurrency)
-            time.sleep(5)  # wait for pinecone to finalize upserting before querying
-        get_logger().info('Done')
-
-
-class IssueLevel(str, Enum):
-    ISSUE = "issue"
-    COMMENT = "comment"
-
-
-class Metadata(BaseModel):
-    repo: str
-    username: str = Field(default="@codium")
-    created_at: str = Field(default="01-01-1970 00:00:00.00000")
-    level: IssueLevel = Field(default=IssueLevel.ISSUE)
-
-    class Config:
-        use_enum_values = True
-
-
-class Record(BaseModel):
-    id: str
-    text: str
-    metadata: Metadata
-
-
-class Corpus(BaseModel):
-    documents: List[Record] = Field(default=[])
-
-    def append(self, r: Record):
-        self.documents.append(r)

pr_agent/tools/pr_update_changelog.py

@@ -1,160 +0,0 @@
-import copy
-from datetime import date
-from time import sleep
-from typing import 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.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
-
-CHANGELOG_LINES = 50
-
-
-class PRUpdateChangelog:
-    def __init__(self, pr_url: str, cli_mode=False, args=None):
-
-        self.git_provider = get_git_provider()(pr_url)
-        self.main_language = get_main_pr_language(
-            self.git_provider.get_languages(), self.git_provider.get_files()
-        )
-        self.commit_changelog = get_settings().pr_update_changelog.push_changelog_changes
-        self._get_changlog_file()  # self.changelog_file_str
-        self.ai_handler = AiHandler()
-        self.patches_diff = None
-        self.prediction = None
-        self.cli_mode = cli_mode
-        self.vars = {
-            "title": self.git_provider.pr.title,
-            "branch": self.git_provider.get_pr_branch(),
-            "description": self.git_provider.get_pr_description(),
-            "language": self.main_language,
-            "diff": "",  # empty diff for initial calculation
-            "changelog_file_str": self.changelog_file_str,
-            "today": date.today(),
-            "extra_instructions": get_settings().pr_update_changelog.extra_instructions,
-            "commit_messages_str": self.git_provider.get_commit_messages(),
-        }
-        self.token_handler = TokenHandler(self.git_provider.pr,
-                                          self.vars,
-                                          get_settings().pr_update_changelog_prompt.system,
-                                          get_settings().pr_update_changelog_prompt.user)
-
-    async def run(self):
-        # assert type(self.git_provider) == GithubProvider, "Currently only Github is supported"
-
-        get_logger().info('Updating the changelog...')
-        if get_settings().config.publish_output:
-            self.git_provider.publish_comment("Preparing changelog updates...", is_temporary=True)
-        await retry_with_fallback_models(self._prepare_prediction)
-        get_logger().info('Preparing PR changelog updates...')
-        new_file_content, answer = self._prepare_changelog_update()
-        if get_settings().config.publish_output:
-            self.git_provider.remove_initial_comment()
-            get_logger().info('Publishing changelog updates...')
-            if self.commit_changelog:
-                get_logger().info('Pushing PR changelog updates to repo...')
-                self._push_changelog_update(new_file_content, answer)
-            else:
-                get_logger().info('Publishing PR changelog as comment...')
-                self.git_provider.publish_comment(f"**Changelog updates:**\n\n{answer}")
-
-    async def _prepare_prediction(self, model: str):
-        get_logger().info('Getting PR diff...')
-        self.patches_diff = get_pr_diff(self.git_provider, self.token_handler, model)
-        get_logger().info('Getting AI prediction...')
-        self.prediction = await self._get_prediction(model)
-
-    async def _get_prediction(self, model: str):
-        variables = copy.deepcopy(self.vars)
-        variables["diff"] = self.patches_diff  # update diff
-        environment = Environment(undefined=StrictUndefined)
-        system_prompt = environment.from_string(get_settings().pr_update_changelog_prompt.system).render(variables)
-        user_prompt = environment.from_string(get_settings().pr_update_changelog_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)
-
-        return response
-
-    def _prepare_changelog_update(self) -> Tuple[str, str]:
-        answer = self.prediction.strip().strip("```").strip()  # noqa B005
-        if hasattr(self, "changelog_file"):
-            existing_content = self.changelog_file.decoded_content.decode()
-        else:
-            existing_content = ""
-        if existing_content:
-            new_file_content = answer + "\n\n" + self.changelog_file.decoded_content.decode()
-        else:
-            new_file_content = answer
-
-        if not self.commit_changelog:
-            answer += "\n\n\n>to commit the new content to the CHANGELOG.md file, please type:" \
-                      "\n>'/update_changelog --pr_update_changelog.push_changelog_changes=true'\n"
-
-        if get_settings().config.verbosity_level >= 2:
-            get_logger().info(f"answer:\n{answer}")
-
-        return new_file_content, answer
-
-    def _push_changelog_update(self, new_file_content, answer):
-        self.git_provider.repo_obj.update_file(path=self.changelog_file.path,
-                                               message="Update CHANGELOG.md",
-                                               content=new_file_content,
-                                               sha=self.changelog_file.sha,
-                                               branch=self.git_provider.get_pr_branch())
-        d = dict(body="CHANGELOG.md update",
-                 path=self.changelog_file.path,
-                 line=max(2, len(answer.splitlines())),
-                 start_line=1)
-
-        sleep(5)  # wait for the file to be updated
-        last_commit_id = list(self.git_provider.pr.get_commits())[-1]
-        try:
-            self.git_provider.pr.create_review(commit=last_commit_id, comments=[d])
-        except Exception:
-            # we can't create a review for some reason, let's just publish a comment
-            self.git_provider.publish_comment(f"**Changelog updates:**\n\n{answer}")
-
-
-    def _get_default_changelog(self):
-        example_changelog = \
-"""
-Example:
-## <current_date>
-
-### Added
-...
-### Changed
-...
-### Fixed
-...
-"""
-        return example_changelog
-
-    def _get_changlog_file(self):
-        try:
-            self.changelog_file = self.git_provider.repo_obj.get_contents("CHANGELOG.md",
-                                                                          ref=self.git_provider.get_pr_branch())
-            changelog_file_lines = self.changelog_file.decoded_content.decode().splitlines()
-            changelog_file_lines = changelog_file_lines[:CHANGELOG_LINES]
-            self.changelog_file_str = "\n".join(changelog_file_lines)
-        except Exception:
-            self.changelog_file_str = ""
-            if self.commit_changelog:
-                get_logger().info("No CHANGELOG.md file found in the repository. Creating one...")
-                changelog_file = self.git_provider.repo_obj.create_file(path="CHANGELOG.md",
-                                                                             message='add CHANGELOG.md',
-                                                                             content="",
-                                                                             branch=self.git_provider.get_pr_branch())
-                self.changelog_file = changelog_file['content']
-
-        if not self.changelog_file_str:
-            self.changelog_file_str = self._get_default_changelog()

pyproject.toml

@@ -1,51 +1,3 @@
-[build-system]
-requires = ["setuptools>=61.0"]
-build-backend = "setuptools.build_meta"
-
-[project]
-name = "pr_agent"
-version = "0.0.1"
-
-authors = [
-  {name = "Itamar Friedman", email = "itamar.f@codium.ai"},
-]
-maintainers = [
-  {name = "Ori Kotek", email = "ori.k@codium.ai"},
-  {name = "Tal Ridnik", email = "tal.r@codium.ai"},
-  {name = "Hussam Lawen", email = "hussam.l@codium.ai"},
-  {name = "Sagi Medina", email = "sagi.m@codium.ai"}
-]
-description = "CodiumAI PR-Agent is an open-source tool to automatically analyze a pull request and provide several types of feedback"
-readme = "README.md"
-requires-python = ">=3.9"
-keywords = ["ai", "tool", "developer", "review", "agent"]
-license = {file = "LICENSE", name = "Apache 2.0 License"}
-classifiers = [
-  "Development Status :: 3 - Alpha",
-  "Intended Audience :: Developers",
-  "Operating System :: Independent",
-  "Programming Language :: Python :: 3",
-]
-dynamic = ["dependencies"]
-
-[tool.setuptools.dynamic]
-dependencies = {file = ["requirements.txt"]}
-
-[project.urls]
-"Homepage" = "https://github.com/Codium-ai/pr-agent"
-
-[tool.setuptools]
-include-package-data = false
-license-files = ["LICENSE"]
-
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["pr_agent"]
-
-[project.scripts]
-pr-agent = "pr_agent.cli:run"
-
-
 [tool.ruff]
 
 line-length = 120

requirements.txt

@@ -1,25 +1,12 @@
-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
-openai==0.27.8
-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
+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

setup.py

@@ -1,5 +0,0 @@
-# for compatibility with legacy tools
-# see: https://setuptools.pypa.io/en/latest/userguide/pyproject_config.html
-from setuptools import setup
-
-setup()

tests/unit/test_convert_to_markdown.py

@@ -51,7 +51,7 @@ class TestConvertToMarkdown:
             'Unrelated changes': 'n/a',  # won't be included in the output
             'Focused PR': 'Yes',
             'General PR suggestions': 'general suggestion...',
-            'Code feedback': [
+            'Code suggestions': [
                 {
                     'Code example': {
                         'Before': 'Code before',
@@ -67,11 +67,33 @@ class TestConvertToMarkdown:
             ]
         }
         expected_output = """\
-- 🎯 **Main theme:** Test\n\
-- 📌 **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>\
+- 🎯 **Main theme:** Test
+- 📌 **Type of PR:** Test type
+- 🧪 **Relevant tests added:** no
+- ✨ **Focused PR:** Yes
+- 💡 **General PR suggestions:** general suggestion...
+
+- 🤖 **Code suggestions:**
+
+  - **Code example:**
+    - **Before:**
+        ```
+        Code before
+        ```
+    - **After:**
+        ```
+        Code after
+        ```
+
+  - **Code example:**
+    - **Before:**
+        ```
+        Code before 2
+        ```
+    - **After:**
+        ```
+        Code after 2
+        ```
 """
         assert convert_to_markdown(input_data).strip() == expected_output.strip()
 
@@ -91,5 +113,5 @@ class TestConvertToMarkdown:
             'General PR suggestions': {},
             'Code suggestions': {}
         }
-        expected_output = ''
+        expected_output = ""
         assert convert_to_markdown(input_data).strip() == expected_output.strip()

tests/unit/test_handle_patch_deletions.py

@@ -2,7 +2,7 @@
 import logging
 
 from pr_agent.algo.git_patch_processing import handle_patch_deletions
-from pr_agent.config_loader import get_settings
+from pr_agent.config_loader import settings
 
 """
 Code Analysis
@@ -43,6 +43,18 @@ class TestHandlePatchDeletions:
         assert handle_patch_deletions(patch, original_file_content_str, new_file_content_str,
                                       file_name) == patch.rstrip()
 
+    # Tests that handle_patch_deletions logs a message when verbosity_level is greater than 0
+    def test_handle_patch_deletions_happy_path_verbosity_level_greater_than_0(self, caplog):
+        patch = '--- a/file.py\n+++ b/file.py\n@@ -1,2 +1,2 @@\n-foo\n-bar\n+baz\n'
+        original_file_content_str = 'foo\nbar\n'
+        new_file_content_str = ''
+        file_name = 'file.py'
+        settings.config.verbosity_level = 1
+
+        with caplog.at_level(logging.INFO):
+            handle_patch_deletions(patch, original_file_content_str, new_file_content_str, file_name)
+            assert any("Processing file" in message for message in caplog.messages)
+
     # Tests that handle_patch_deletions returns 'File was deleted' when new_file_content_str is empty
     def test_handle_patch_deletions_edge_case_new_file_content_empty(self):
         patch = '--- a/file.py\n+++ b/file.py\n@@ -1,2 +1,2 @@\n-foo\n-bar\n'

tests/unit/test_language_handler.py

@@ -61,7 +61,7 @@ class TestSortFilesByMainLanguages:
             type('', (object,), {'filename': 'file1.py'})(),
             type('', (object,), {'filename': 'file2.java'})()
         ]
-        expected_output = [{'language': 'Other', 'files': files}]
+        expected_output = [{'language': 'Other', 'files': []}]
         assert sort_files_by_main_languages(languages, files) == expected_output
 
     # Tests that function handles empty files list

tests/unit/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