Support context aware settings (for each incoming request), support override of settings, refactor CLI to use pr_agent.py

pr_agent/servers/github_action_runner.py

@@ -3,7 +3,7 @@ import json
 import os
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import settings
+from pr_agent.config_loader import get_settings
 from pr_agent.tools.pr_reviewer import PRReviewer
 
 
@@ -30,11 +30,11 @@ async def run_action():
         return
 
     # Set the environment variables in the settings
-    settings.set("OPENAI.KEY", OPENAI_KEY)
+    get_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")
+        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:
@@ -50,7 +50,7 @@ async def run_action():
         if action in ["opened", "reopened"]:
             pr_url = event_payload.get("pull_request", {}).get("url")
             if pr_url:
-                await PRReviewer(pr_url).review()
+                await PRReviewer(pr_url).run()
 
     # Handle issue comment event
     elif GITHUB_EVENT_NAME == "issue_comment":

pr_agent/servers/github_app.py

@@ -1,6 +1,7 @@
-from typing import Dict, Any
+import copy
 import logging
 import sys
+from typing import Any, Dict
 
 import uvicorn
 from fastapi import APIRouter, FastAPI, HTTPException, Request, Response
@@ -9,7 +10,7 @@ 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 settings
+from pr_agent.config_loader import get_settings, global_settings
 from pr_agent.servers.utils import verify_signature
 
 logging.basicConfig(stream=sys.stdout, level=logging.DEBUG)
@@ -20,7 +21,8 @@ router = APIRouter()
 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.
+    Verifies the request signature, parses the request body, and passes it to the handle_request function for further
+    processing.
     """
     logging.debug("Received a GitHub webhook")
 
@@ -29,6 +31,7 @@ async def handle_github_webhooks(request: Request, response: Response):
     logging.debug(f'Request body:\n{body}')
     installation_id = body.get("installation", {}).get("id")
     context["installation_id"] = installation_id
+    context["settings"] = copy.deepcopy(global_settings)
 
     return await handle_request(body)
 
@@ -46,7 +49,7 @@ async def get_body(request):
         raise HTTPException(status_code=400, detail="Error parsing request body") from e
     body_bytes = await request.body()
     signature_header = request.headers.get('x-hub-signature-256', None)
-    webhook_secret = getattr(settings.github, 'webhook_secret', None)
+    webhook_secret = getattr(get_settings().github, 'webhook_secret', None)
     if webhook_secret:
         verify_signature(body_bytes, webhook_secret, signature_header)
     return body
@@ -96,7 +99,7 @@ async def root():
 
 def start():
     # Override the deployment type to app
-    settings.set("GITHUB.DEPLOYMENT_TYPE", "app")
+    get_settings().set("GITHUB.DEPLOYMENT_TYPE", "app")
     middleware = [Middleware(RawContextMiddleware)]
     app = FastAPI(middleware=middleware)
     app.include_router(router)

pr_agent/servers/github_polling.py

@@ -6,7 +6,7 @@ from datetime import datetime, timezone
 import aiohttp
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import settings
+from pr_agent.config_loader import get_settings
 from pr_agent.git_providers import get_git_provider
 from pr_agent.servers.help import bot_help_text
 
@@ -38,8 +38,8 @@ async def polling_loop():
     agent = PRAgent()
 
     try:
-        deployment_type = settings.github.deployment_type
-        token = settings.github.user_token
+        deployment_type = get_settings().github.deployment_type
+        token = get_settings().github.user_token
     except AttributeError:
         deployment_type = 'none'
         token = None

pr_agent/servers/gitlab_webhook.py

@@ -7,7 +7,7 @@ from fastapi.responses import JSONResponse
 from starlette.background import BackgroundTasks
 
 from pr_agent.agent.pr_agent import PRAgent
-from pr_agent.config_loader import settings
+from pr_agent.config_loader import get_settings
 
 app = FastAPI()
 router = APIRouter()
@@ -29,13 +29,13 @@ async def gitlab_webhook(background_tasks: BackgroundTasks, request: Request):
     return JSONResponse(status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"}))
 
 def start():
-    gitlab_url = settings.get("GITLAB.URL", None)
+    gitlab_url = get_settings().get("GITLAB.URL", None)
     if not gitlab_url:
         raise ValueError("GITLAB.URL is not set")
-    gitlab_token = settings.get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
+    gitlab_token = get_settings().get("GITLAB.PERSONAL_ACCESS_TOKEN", None)
     if not gitlab_token:
         raise ValueError("GITLAB.PERSONAL_ACCESS_TOKEN is not set")
-    settings.config.git_provider = "gitlab"
+    get_settings().config.git_provider = "gitlab"
 
     app = FastAPI()
     app.include_router(router)