diff --git a/README.md b/README.md index c9ba9eb4..6a930b51 100644 --- a/README.md +++ b/README.md @@ -107,7 +107,7 @@ Supported commands per platform: | | ⮑ [Ask on code lines](https://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines) | ✅ | ✅ | | | | | | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval) | ✅ | ✅ | ✅ | | | | | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/) | ✅ | ✅ | ✅ | ✅ | | -| | [PR Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎 | ✅ | ✅ | | | | +| | [Add Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎 | ✅ | ✅ | | | | | | [Analyze](https://qodo-merge-docs.qodo.ai/tools/analyze/) 💎 | ✅ | ✅ | | | | | | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎 | ✅ | ✅ | ✅ | | | | | [CI Feedback](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) 💎 | ✅ | | | | | diff --git a/docs/docs/core-abilities/fetching_ticket_context.md b/docs/docs/core-abilities/fetching_ticket_context.md index 73096040..d31f4b1b 100644 --- a/docs/docs/core-abilities/fetching_ticket_context.md +++ b/docs/docs/core-abilities/fetching_ticket_context.md @@ -195,7 +195,7 @@ This following steps will help you check if the basic auth is working correctly, 2. run the following Python script (after replacing the placeholders with your actual values): -??? example "Script to validate basic auth" +???- example "Script to validate basic auth" ```python from jira import JIRA @@ -251,7 +251,7 @@ This following steps will help you check if the token is working correctly, and 2. run the following Python script (after replacing the placeholders with your actual values): -??? example "Script to validate PAT token" +??? example- "Script to validate PAT token" ```python from jira import JIRA @@ -286,6 +286,83 @@ This following steps will help you check if the token is working correctly, and print(f"Error fetching JIRA ticket details: {e}") ``` + +### Multi-JIRA Server Configuration 💎 + +Qodo Merge supports connecting to multiple JIRA servers using different authentication methods. + +=== "Email/Token (Basic Auth)" + + Configure multiple servers using Email/Token authentication: + + - `jira_servers`: List of JIRA server URLs + - `jira_api_token`: List of API tokens (for Cloud) or passwords (for Data Center) + - `jira_api_email`: List of emails (for Cloud) or usernames (for Data Center) + - `jira_base_url`: Default server for ticket IDs like `PROJ-123`, Each repository can configure (local config file) its own `jira_base_url` to choose which server to use by default. + + **Example Configuration:** + ```toml + [jira] + # Server URLs + jira_servers = ["https://company.atlassian.net", "https://datacenter.jira.com"] + + # API tokens/passwords + jira_api_token = ["cloud_api_token_here", "datacenter_password"] + + # Emails/usernames (both required) + jira_api_email = ["user@company.com", "datacenter_username"] + + # Default server for ticket IDs + jira_base_url = "https://company.atlassian.net" + ``` + +=== "PAT Auth" + + Configure multiple servers using Personal Access Token authentication: + + - `jira_servers`: List of JIRA server URLs + - `jira_api_token`: List of PAT tokens + - `jira_api_email`: Not needed (can be omitted or left empty) + - `jira_base_url`: Default server for ticket IDs like `PROJ-123`, Each repository can configure (local config file) its own `jira_base_url` to choose which server to use by default. + + **Example Configuration:** + ```toml + [jira] + # Server URLs + jira_servers = ["https://server1.jira.com", "https://server2.jira.com"] + + # PAT tokens only + jira_api_token = ["pat_token_1", "pat_token_2"] + + # Default server for ticket IDs + jira_base_url = "https://server1.jira.com" + ``` + + **Mixed Authentication (Email/Token + PAT):** + ```toml + [jira] + jira_servers = ["https://company.atlassian.net", "https://server.jira.com"] + jira_api_token = ["cloud_api_token", "server_pat_token"] + jira_api_email = ["user@company.com", ""] # Empty for PAT + ``` + +=== "Jira Cloud App" + + For Jira Cloud instances using App Authentication: + + 1. Install the Qodo Merge app on each JIRA Cloud instance you want to connect to + 2. Set the default server for ticket ID resolution: + + ```toml + [jira] + jira_base_url = "https://primary-team.atlassian.net" + ``` + + Full URLs (e.g., `https://other-team.atlassian.net/browse/TASK-456`) will automatically use the correct connected instance. + + + + ### How to link a PR to a Jira ticket To integrate with Jira, you can link your PR to a ticket using either of these methods: @@ -339,12 +416,11 @@ Include a ticket reference in your PR description using either: Name your branch with the ticket ID as a prefix (e.g., `ABC-123-feature-description` or `feature/ABC-123/feature-description`). !!! note "Linear Base URL" - - For shortened ticket IDs or branch detection (method 2), you must configure the Linear base URL in your configuration file under the [linear] section: + For shortened ticket IDs or branch detection (method 2), you must configure the Linear base URL in your configuration file under the [linear] section: - ```toml - [linear] - linear_base_url = "https://linear.app/[ORG_ID]" - ``` + ```toml + [linear] + linear_base_url = "https://linear.app/[ORG_ID]" + ``` - Replace `[ORG_ID]` with your Linear organization identifier. \ No newline at end of file + Replace `[ORG_ID]` with your Linear organization identifier. diff --git a/docs/docs/core-abilities/rag_context_enrichment.md b/docs/docs/core-abilities/rag_context_enrichment.md index 05ebbaff..0fc64620 100644 --- a/docs/docs/core-abilities/rag_context_enrichment.md +++ b/docs/docs/core-abilities/rag_context_enrichment.md @@ -27,7 +27,7 @@ In order to enable the RAG feature, add the following lines to your configuratio enable_rag=true ``` -!!! example "RAG Arguments Options" +???+ example "RAG Arguments Options" diff --git a/docs/docs/index.md b/docs/docs/index.md index 79a06e5d..46f49ff2 100644 --- a/docs/docs/index.md +++ b/docs/docs/index.md @@ -26,48 +26,52 @@ To search the documentation site using natural language: PR-Agent and Qodo Merge offers extensive pull request functionalities across various git providers: -| | | GitHub | GitLab | Bitbucket | Azure DevOps | -| ----- | ------------------------------------------------------------------------------------------------------- |:------:|:------:|:---------:|:------------:| -| TOOLS | [Review](https://qodo-merge-docs.qodo.ai/tools/review/) | ✅ | ✅ | ✅ | ✅ | -| | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/) | ✅ | ✅ | ✅ | ✅ | -| | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/) | ✅ | ✅ | ✅ | ✅ | -| | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/) | ✅ | ✅ | ✅ | ✅ | -| | ⮑ [Ask on code lines](https://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines) | ✅ | ✅ | | | -| | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/) | ✅ | ✅ | ✅ | ✅ | -| | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval) | ✅ | ✅ | ✅ | | -| | [Ticket Context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) 💎 | ✅ | ✅ | ✅ | | -| | [Utilizing Best Practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) 💎 | ✅ | ✅ | ✅ | | -| | [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) 💎 | ✅ | | | | -| | [Suggestion Tracking](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) 💎 | ✅ | ✅ | | | -| | [CI Feedback](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) 💎 | ✅ | | | | -| | [PR Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎 | ✅ | ✅ | | | -| | [Custom Labels](https://qodo-merge-docs.qodo.ai/tools/custom_labels/) 💎 | ✅ | ✅ | | | -| | [Analyze](https://qodo-merge-docs.qodo.ai/tools/analyze/) 💎 | ✅ | ✅ | | | -| | [Similar Code](https://qodo-merge-docs.qodo.ai/tools/similar_code/) 💎 | ✅ | | | | -| | [Custom Prompt](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) 💎 | ✅ | ✅ | ✅ | | -| | [Test](https://qodo-merge-docs.qodo.ai/tools/test/) 💎 | ✅ | ✅ | | | -| | [Implement](https://qodo-merge-docs.qodo.ai/tools/implement/) 💎 | ✅ | ✅ | ✅ | | -| | [Scan Repo Discussions](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/) 💎 | ✅ | | | | -| | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎 | ✅ | ✅ | ✅ | | -| | | | | | | -| USAGE | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli) | ✅ | ✅ | ✅ | ✅ | -| | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app) | ✅ | ✅ | ✅ | ✅ | -| | [Tagging bot](https://github.com/Codium-ai/pr-agent#try-it-now) | ✅ | | | | -| | [Actions](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) | ✅ | ✅ | ✅ | ✅ | -| | | | | | | -| CORE | [PR compression](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/) | ✅ | ✅ | ✅ | ✅ | -| | Adaptive and token-aware file patch fitting | ✅ | ✅ | ✅ | ✅ | -| | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/) | ✅ | ✅ | ✅ | ✅ | -| | [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/) | ✅ | ✅ | ✅ | ✅ | -| | [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/) | ✅ | ✅ | ✅ | ✅ | -| | [Self reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/) | ✅ | ✅ | ✅ | ✅ | -| | [Static code analysis](https://qodo-merge-docs.qodo.ai/core-abilities/static_code_analysis/) 💎 | ✅ | ✅ | | | -| | [Global and wiki configurations](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ | | -| | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎 | ✅ | ✅ | | | -| | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎 | ✅ | ✅ | | | -| | [Code Validation 💎](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/) | ✅ | ✅ | ✅ | ✅ | -| | [Auto Best Practices 💎](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/) | ✅ | | | | -| | [Incremental Update 💎](https://qodo-merge-docs.qodo.ai/core-abilities/incremental_update/) | ✅ | | | | +| | | GitHub | GitLab | Bitbucket | Azure DevOps | Gitea | +| ----- |---------------------------------------------------------------------------------------------------------------------|:------:|:------:|:---------:|:------------:|:-----:| +| [TOOLS](https://qodo-merge-docs.qodo.ai/tools/) | [Describe](https://qodo-merge-docs.qodo.ai/tools/describe/) | ✅ | ✅ | ✅ | ✅ | ✅ | +| | [Review](https://qodo-merge-docs.qodo.ai/tools/review/) | ✅ | ✅ | ✅ | ✅ | ✅ | +| | [Improve](https://qodo-merge-docs.qodo.ai/tools/improve/) | ✅ | ✅ | ✅ | ✅ | ✅ | +| | [Ask](https://qodo-merge-docs.qodo.ai/tools/ask/) | ✅ | ✅ | ✅ | ✅ | | +| | ⮑ [Ask on code lines](https://qodo-merge-docs.qodo.ai/tools/ask/#ask-lines) | ✅ | ✅ | | | | +| | [Help Docs](https://qodo-merge-docs.qodo.ai/tools/help_docs/?h=auto#auto-approval) | ✅ | ✅ | ✅ | | | +| | [Update CHANGELOG](https://qodo-merge-docs.qodo.ai/tools/update_changelog/) | ✅ | ✅ | ✅ | ✅ | | +| | [Add Documentation](https://qodo-merge-docs.qodo.ai/tools/documentation/) 💎 | ✅ | ✅ | | | | +| | [Analyze](https://qodo-merge-docs.qodo.ai/tools/analyze/) 💎 | ✅ | ✅ | | | | +| | [Auto-Approve](https://qodo-merge-docs.qodo.ai/tools/improve/?h=auto#auto-approval) 💎 | ✅ | ✅ | ✅ | | | +| | [CI Feedback](https://qodo-merge-docs.qodo.ai/tools/ci_feedback/) 💎 | ✅ | | | | | +| | [Custom Prompt](https://qodo-merge-docs.qodo.ai/tools/custom_prompt/) 💎 | ✅ | ✅ | ✅ | | | +| | [Generate Custom Labels](https://qodo-merge-docs.qodo.ai/tools/custom_labels/) 💎 | ✅ | ✅ | | | | +| | [Generate Tests](https://qodo-merge-docs.qodo.ai/tools/test/) 💎 | ✅ | ✅ | | | | +| | [Implement](https://qodo-merge-docs.qodo.ai/tools/implement/) 💎 | ✅ | ✅ | ✅ | | | +| | [Scan Repo Discussions](https://qodo-merge-docs.qodo.ai/tools/scan_repo_discussions/) 💎 | ✅ | | | | | +| | [Similar Code](https://qodo-merge-docs.qodo.ai/tools/similar_code/) 💎 | ✅ | | | | | +| | [Ticket Context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) 💎 | ✅ | ✅ | ✅ | | | +| | [Utilizing Best Practices](https://qodo-merge-docs.qodo.ai/tools/improve/#best-practices) 💎 | ✅ | ✅ | ✅ | | | +| | [PR Chat](https://qodo-merge-docs.qodo.ai/chrome-extension/features/#pr-chat) 💎 | ✅ | | | | | +| | [Suggestion Tracking](https://qodo-merge-docs.qodo.ai/tools/improve/#suggestion-tracking) 💎 | ✅ | ✅ | | | | +| | | | | | | | +| [USAGE](https://qodo-merge-docs.qodo.ai/usage-guide/) | [CLI](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#local-repo-cli) | ✅ | ✅ | ✅ | ✅ | ✅ | +| | [App / webhook](https://qodo-merge-docs.qodo.ai/usage-guide/automations_and_usage/#github-app) | ✅ | ✅ | ✅ | ✅ | ✅ | +| | [Tagging bot](https://github.com/Codium-ai/pr-agent#try-it-now) | ✅ | | | | | +| | [Actions](https://qodo-merge-docs.qodo.ai/installation/github/#run-as-a-github-action) | ✅ | ✅ | ✅ | ✅ | | +| | | | | | | | +| [CORE](https://qodo-merge-docs.qodo.ai/core-abilities/) | [Adaptive and token-aware file patch fitting](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/) | ✅ | ✅ | ✅ | ✅ | | +| | [Auto Best Practices 💎](https://qodo-merge-docs.qodo.ai/core-abilities/auto_best_practices/) | ✅ | | | | | +| | [Chat on code suggestions](https://qodo-merge-docs.qodo.ai/core-abilities/chat_on_code_suggestions/) | ✅ | ✅ | | | | +| | [Code Validation 💎](https://qodo-merge-docs.qodo.ai/core-abilities/code_validation/) | ✅ | ✅ | ✅ | ✅ | | +| | [Dynamic context](https://qodo-merge-docs.qodo.ai/core-abilities/dynamic_context/) | ✅ | ✅ | ✅ | ✅ | | +| | [Fetching ticket context](https://qodo-merge-docs.qodo.ai/core-abilities/fetching_ticket_context/) | ✅ | ✅ | ✅ | | | +| | [Global and wiki configurations](https://qodo-merge-docs.qodo.ai/usage-guide/configuration_options/) 💎 | ✅ | ✅ | ✅ | | | +| | [Impact Evaluation](https://qodo-merge-docs.qodo.ai/core-abilities/impact_evaluation/) 💎 | ✅ | ✅ | | | | +| | [Incremental Update 💎](https://qodo-merge-docs.qodo.ai/core-abilities/incremental_update/) | ✅ | | | | | +| | [Interactivity](https://qodo-merge-docs.qodo.ai/core-abilities/interactivity/) | ✅ | ✅ | | | | +| | [Local and global metadata](https://qodo-merge-docs.qodo.ai/core-abilities/metadata/) | ✅ | ✅ | ✅ | ✅ | | +| | [Multiple models support](https://qodo-merge-docs.qodo.ai/usage-guide/changing_a_model/) | ✅ | ✅ | ✅ | ✅ | | +| | [PR compression](https://qodo-merge-docs.qodo.ai/core-abilities/compression_strategy/) | ✅ | ✅ | ✅ | ✅ | | +| | [PR interactive actions](https://www.qodo.ai/images/pr_agent/pr-actions.mp4) 💎 | ✅ | ✅ | | | | +| | [RAG context enrichment](https://qodo-merge-docs.qodo.ai/core-abilities/rag_context_enrichment/) | ✅ | | ✅ | | | +| | [Self reflection](https://qodo-merge-docs.qodo.ai/core-abilities/self_reflection/) | ✅ | ✅ | ✅ | ✅ | | +| | [Static code analysis](https://qodo-merge-docs.qodo.ai/core-abilities/static_code_analysis/) 💎 | ✅ | ✅ | | | | !!! note "💎 means Qodo Merge only" All along the documentation, 💎 marks a feature available only in [Qodo Merge](https://www.codium.ai/pricing/){:target="_blank"}, and not in the open-source version. diff --git a/docs/docs/tools/describe.md b/docs/docs/tools/describe.md index 143fd2d6..25b3c6fc 100644 --- a/docs/docs/tools/describe.md +++ b/docs/docs/tools/describe.md @@ -73,7 +73,7 @@ enable_pr_diagram = true ## Configuration options -!!! example "Possible configurations" +???+ example "Possible configurations"
diff --git a/docs/docs/tools/documentation.md b/docs/docs/tools/documentation.md index 47222f51..77920f41 100644 --- a/docs/docs/tools/documentation.md +++ b/docs/docs/tools/documentation.md @@ -46,9 +46,6 @@ pr_commands = [ The `pr_commands` list defines commands that run automatically when a PR is opened. Since this is under the [github_app] section, it only applies when using the Qodo Merge GitHub App in GitHub environments. -!!! note -By default, /add_docs is not triggered automatically. You must explicitly include it in pr_commands to enable this behavior. - ## 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`. diff --git a/docs/docs/tools/improve.md b/docs/docs/tools/improve.md index 6adfec83..70cec345 100644 --- a/docs/docs/tools/improve.md +++ b/docs/docs/tools/improve.md @@ -586,7 +586,7 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 600 line ## Configuration options -??? example "General options" +???+ example "General options"
@@ -646,7 +646,7 @@ Note: Chunking is primarily relevant for large PRs. For most PRs (up to 600 line
-??? example "Params for number of suggestions and AI calls" +???+ example "Params for number of suggestions and AI calls" diff --git a/docs/docs/tools/review.md b/docs/docs/tools/review.md index e12f9aa8..fad93d95 100644 --- a/docs/docs/tools/review.md +++ b/docs/docs/tools/review.md @@ -51,7 +51,7 @@ extra_instructions = "..." ## Configuration options -!!! example "General options" +???+ example "General options"
@@ -76,7 +76,7 @@ extra_instructions = "..."
-!!! example "Enable\\disable specific sub-sections" +???+ example "Enable\\disable specific sub-sections" @@ -105,7 +105,7 @@ extra_instructions = "..."
-!!! example "Adding PR labels" +???+ example "Adding PR labels" You can enable\disable the `review` tool to add specific labels to the PR: diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml index 74f98fb8..6210ed1c 100644 --- a/docs/mkdocs.yml +++ b/docs/mkdocs.yml @@ -16,7 +16,6 @@ nav: - Introduction: 'usage-guide/introduction.md' - Enabling a Wiki: 'usage-guide/enabling_a_wiki.md' - Configuration File: 'usage-guide/configuration_options.md' - - AWS Secrets Manager: 'usage-guide/aws_secrets_manager.md' - Usage and Automation: 'usage-guide/automations_and_usage.md' - Managing Mail Notifications: 'usage-guide/mail_notifications.md' - Changing a Model: 'usage-guide/changing_a_model.md' diff --git a/pr_agent/algo/__init__.py b/pr_agent/algo/__init__.py index a2b35e71..d6f45de7 100644 --- a/pr_agent/algo/__init__.py +++ b/pr_agent/algo/__init__.py @@ -61,6 +61,7 @@ MAX_TOKENS = { 'vertex_ai/gemini-1.5-pro': 1048576, 'vertex_ai/gemini-2.5-pro-preview-03-25': 1048576, 'vertex_ai/gemini-2.5-pro-preview-05-06': 1048576, + 'vertex_ai/gemini-2.5-pro-preview-06-05': 1048576, 'vertex_ai/gemini-1.5-flash': 1048576, 'vertex_ai/gemini-2.0-flash': 1048576, 'vertex_ai/gemini-2.5-flash-preview-04-17': 1048576, @@ -73,6 +74,7 @@ MAX_TOKENS = { 'gemini/gemini-2.5-flash-preview-05-20': 1048576, 'gemini/gemini-2.5-pro-preview-03-25': 1048576, 'gemini/gemini-2.5-pro-preview-05-06': 1048576, + 'gemini/gemini-2.5-pro-preview-06-05': 1048576, 'codechat-bison': 6144, 'codechat-bison-32k': 32000, 'anthropic.claude-instant-v1': 100000, @@ -101,6 +103,9 @@ MAX_TOKENS = { "bedrock/us.anthropic.claude-3-5-sonnet-20241022-v2:0": 100000, "bedrock/us.anthropic.claude-3-7-sonnet-20250219-v1:0": 200000, "bedrock/us.anthropic.claude-sonnet-4-20250514-v1:0": 200000, + "bedrock/apac.anthropic.claude-3-5-sonnet-20241022-v2:0": 100000, + "bedrock/apac.anthropic.claude-3-7-sonnet-20250219-v1:0": 200000, + "bedrock/apac.anthropic.claude-sonnet-4-20250514-v1:0": 200000, 'claude-3-5-sonnet': 100000, 'groq/meta-llama/llama-4-scout-17b-16e-instruct': 131072, 'groq/meta-llama/llama-4-maverick-17b-128e-instruct': 131072, diff --git a/pr_agent/git_providers/gitea_provider.py b/pr_agent/git_providers/gitea_provider.py index 8805d8f4..d7dd2462 100644 --- a/pr_agent/git_providers/gitea_provider.py +++ b/pr_agent/git_providers/gitea_provider.py @@ -409,7 +409,7 @@ class GiteaProvider(GitProvider): def _get_file_content_from_base(self, filename: str) -> str: return self.repo_api.get_file_content( owner=self.owner, - repo=self.base_ref, + repo=self.repo, commit_sha=self.base_sha, filepath=filename ) @@ -417,7 +417,7 @@ class GiteaProvider(GitProvider): def _get_file_content_from_latest_commit(self, filename: str) -> str: return self.repo_api.get_file_content( owner=self.owner, - repo=self.base_ref, + repo=self.repo, commit_sha=self.last_commit.sha, filepath=filename ) @@ -471,11 +471,11 @@ class GiteaProvider(GitProvider): if status == 'added': edit_type = EDIT_TYPE.ADDED - elif status == 'removed': + elif status == 'removed' or status == 'deleted': edit_type = EDIT_TYPE.DELETED elif status == 'renamed': edit_type = EDIT_TYPE.RENAMED - elif status == 'modified': + elif status == 'modified' or status == 'changed': edit_type = EDIT_TYPE.MODIFIED else: self.logger.error(f"Unknown edit type: {status}") diff --git a/pr_agent/servers/atlassian-connect.json b/pr_agent/servers/atlassian-connect.json index 9330ae12..29fa0f7a 100644 --- a/pr_agent/servers/atlassian-connect.json +++ b/pr_agent/servers/atlassian-connect.json @@ -30,5 +30,9 @@ "url": "/webhook" } ] + }, + "links": { + "privacy": "https://qodo.ai/privacy-policy", + "terms": "https://qodo.ai/terms" } }