diff --git a/pr_agent/algo/ai_handler.py b/pr_agent/algo/ai_handler.py index 819ba25b..ba6e3567 100644 --- a/pr_agent/algo/ai_handler.py +++ b/pr_agent/algo/ai_handler.py @@ -7,10 +7,11 @@ from litellm import acompletion from openai.error import APIError, RateLimitError, Timeout, TryAgain from retry import retry from pr_agent.config_loader import get_settings +from pr_agent.algo.base_ai_handler import BaseAiHandler OPENAI_RETRIES = 5 -class AiHandler: +class AiHandler(BaseAiHandler): """ This class handles interactions with the OpenAI API for chat completions. It initializes the API key and other settings from a configuration file, diff --git a/pr_agent/algo/base_ai_handler.py b/pr_agent/algo/base_ai_handler.py new file mode 100644 index 00000000..9cb40b5c --- /dev/null +++ b/pr_agent/algo/base_ai_handler.py @@ -0,0 +1,48 @@ +from abc import ABC, abstractmethod + +class BaseAiHandler(ABC): + """ + This class defines the interface for an AI handler. + """ + + @abstractmethod + def __init__(self): + pass + + @property + @abstractmethod + def deployment_id(self): + pass + + @abstractmethod + async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2): + pass + + +class AiHandler(BaseAiHandler): + """ + This class handles interactions with the OpenAI API for chat completions. + It initializes the API key and other settings from a configuration file, + and provides a method for performing chat completions using the OpenAI ChatCompletion API. + """ + + # ... rest of your code ... + + +class CustomAiHandler(BaseAiHandler): + """ + This class is your custom AI handler that uses a different LLM library. + """ + + def __init__(self): + # Initialize your custom AI handler + pass + + @property + def deployment_id(self): + # Return the deployment ID for your custom AI handler + pass + + async def chat_completion(self, model: str, system: str, user: str, temperature: float = 0.2): + # Implement the chat completion method for your custom AI handler + pass \ No newline at end of file diff --git a/pr_agent/tools/pr_code_suggestions.py b/pr_agent/tools/pr_code_suggestions.py index 7f0b1264..befc3dcd 100644 --- a/pr_agent/tools/pr_code_suggestions.py +++ b/pr_agent/tools/pr_code_suggestions.py @@ -4,7 +4,7 @@ import textwrap from typing import List, Dict from jinja2 import Environment, StrictUndefined -from pr_agent.algo.ai_handler import AiHandler +from pr_agent.algo.ai_handler import BaseAiHandler, AiHandler from pr_agent.algo.pr_processing import get_pr_diff, retry_with_fallback_models, get_pr_multi_diffs from pr_agent.algo.token_handler import TokenHandler from pr_agent.algo.utils import load_yaml @@ -14,7 +14,7 @@ from pr_agent.git_providers.git_provider import get_main_pr_language class PRCodeSuggestions: - def __init__(self, pr_url: str, cli_mode=False, args: list = None): + def __init__(self, pr_url: str, cli_mode=False, args: list = None, ai_handler: BaseAiHandler = AiHandler()): self.git_provider = get_git_provider()(pr_url) self.main_language = get_main_pr_language( @@ -31,7 +31,7 @@ class PRCodeSuggestions: else: num_code_suggestions = get_settings().pr_code_suggestions.num_code_suggestions - self.ai_handler = AiHandler() + self.ai_handler = ai_handler self.patches_diff = None self.prediction = None self.cli_mode = cli_mode diff --git a/pr_agent/tools/pr_description.py b/pr_agent/tools/pr_description.py index 41f0b781..94c15d6b 100644 --- a/pr_agent/tools/pr_description.py +++ b/pr_agent/tools/pr_description.py @@ -6,7 +6,7 @@ from typing import List, Tuple from jinja2 import Environment, StrictUndefined -from pr_agent.algo.ai_handler import AiHandler +from pr_agent.algo.ai_handler import BaseAiHandler, 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 @@ -16,7 +16,7 @@ from pr_agent.git_providers.git_provider import get_main_pr_language class PRDescription: - def __init__(self, pr_url: str, args: list = None): + def __init__(self, pr_url: str, args: list = None, ai_handler: BaseAiHandler = AiHandler()): """ Initialize the PRDescription object with the necessary attributes and objects for generating a PR description using an AI model. @@ -32,7 +32,7 @@ class PRDescription: self.pr_id = self.git_provider.get_pr_id() # Initialize the AI handler - self.ai_handler = AiHandler() + self.ai_handler = ai_handler # Initialize the variables dictionary self.vars = { diff --git a/pr_agent/tools/pr_information_from_user.py b/pr_agent/tools/pr_information_from_user.py index c049250f..fbc4c5b3 100644 --- a/pr_agent/tools/pr_information_from_user.py +++ b/pr_agent/tools/pr_information_from_user.py @@ -3,7 +3,7 @@ import logging from jinja2 import Environment, StrictUndefined -from pr_agent.algo.ai_handler import AiHandler +from pr_agent.algo.ai_handler import BaseAiHandler, 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 @@ -12,12 +12,12 @@ from pr_agent.git_providers.git_provider import get_main_pr_language class PRInformationFromUser: - def __init__(self, pr_url: str, args: list = None): + def __init__(self, pr_url: str, args: list = None, ai_handler: BaseAiHandler = AiHandler()): self.git_provider = get_git_provider()(pr_url) self.main_pr_language = get_main_pr_language( self.git_provider.get_languages(), self.git_provider.get_files() ) - self.ai_handler = AiHandler() + self.ai_handler = ai_handler self.vars = { "title": self.git_provider.pr.title, "branch": self.git_provider.get_pr_branch(), diff --git a/pr_agent/tools/pr_questions.py b/pr_agent/tools/pr_questions.py index 959bebe7..965d863e 100644 --- a/pr_agent/tools/pr_questions.py +++ b/pr_agent/tools/pr_questions.py @@ -3,7 +3,7 @@ import logging from jinja2 import Environment, StrictUndefined -from pr_agent.algo.ai_handler import AiHandler +from pr_agent.algo.ai_handler import BaseAiHandler, 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 @@ -12,13 +12,13 @@ from pr_agent.git_providers.git_provider import get_main_pr_language class PRQuestions: - def __init__(self, pr_url: str, args=None): + def __init__(self, pr_url: str, args=None, ai_handler: BaseAiHandler = AiHandler()): question_str = self.parse_args(args) self.git_provider = get_git_provider()(pr_url) self.main_pr_language = get_main_pr_language( self.git_provider.get_languages(), self.git_provider.get_files() ) - self.ai_handler = AiHandler() + self.ai_handler = ai_handler self.question_str = question_str self.vars = { "title": self.git_provider.pr.title, diff --git a/pr_agent/tools/pr_reviewer.py b/pr_agent/tools/pr_reviewer.py index 01e3f276..6a27bd57 100644 --- a/pr_agent/tools/pr_reviewer.py +++ b/pr_agent/tools/pr_reviewer.py @@ -8,9 +8,8 @@ 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, \ - find_line_number_of_relevant_line_in_file, clip_tokens +from pr_agent.algo.ai_handler import BaseAiHandler, 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, try_fix_json, try_fix_yaml, load_yaml from pr_agent.config_loader import get_settings @@ -23,7 +22,7 @@ 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): + def __init__(self, pr_url: str, is_answer: bool = False, is_auto: bool = False, args: list = None, ai_handler: BaseAiHandler = AiHandler()): """ Initialize the PRReviewer object with the necessary attributes and objects to review a pull request. @@ -44,7 +43,7 @@ class PRReviewer: 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") - self.ai_handler = AiHandler() + self.ai_handler = ai_handler self.patches_diff = None self.prediction = None diff --git a/pr_agent/tools/pr_update_changelog.py b/pr_agent/tools/pr_update_changelog.py index 547ce84b..3146eedc 100644 --- a/pr_agent/tools/pr_update_changelog.py +++ b/pr_agent/tools/pr_update_changelog.py @@ -6,7 +6,7 @@ from typing import Tuple from jinja2 import Environment, StrictUndefined -from pr_agent.algo.ai_handler import AiHandler +from pr_agent.algo.ai_handler import BaseAiHandler, 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 @@ -17,7 +17,7 @@ CHANGELOG_LINES = 50 class PRUpdateChangelog: - def __init__(self, pr_url: str, cli_mode=False, args=None): + def __init__(self, pr_url: str, cli_mode=False, args=None, ai_handler: BaseAiHandler = AiHandler()): self.git_provider = get_git_provider()(pr_url) self.main_language = get_main_pr_language( @@ -25,7 +25,7 @@ class PRUpdateChangelog: ) self.commit_changelog = get_settings().pr_update_changelog.push_changelog_changes self._get_changlog_file() # self.changelog_file_str - self.ai_handler = AiHandler() + self.ai_handler = ai_handler self.patches_diff = None self.prediction = None self.cli_mode = cli_mode