xiaxinhang/pr-agent
1
0
Fork 0
mirror of https://github.com/qodo-ai/pr-agent.git synced 2025-07-04 21:00:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Updated handling of installation id

Browse Source
This commit is contained in:
Ori Kotek
2023-07-28 02:44:11 +03:00
parent 8519b106f9
commit 1a8fce1505
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pr_agent/git_providers/github_provider.py
View File

@ -5,6 +5,7 @@ from urllib.parse import urlparse
from github import AppAuthentication, Auth, Github, GithubException from github import AppAuthentication, Auth, Github, GithubException
from retry import retry from retry import retry
from starlette_context import context
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
@ -17,7 +18,7 @@ from ..servers.utils import RateLimitExceeded
class GithubProvider(GitProvider): class GithubProvider(GitProvider):
def __init__(self, pr_url: Optional[str] = None, incremental=IncrementalPR(False)): def __init__(self, pr_url: Optional[str] = None, incremental=IncrementalPR(False)):
self.repo_obj = None self.repo_obj = None
self.installation_id = settings.get("GITHUB.INSTALLATION_ID") self.installation_id = context.get("installation_id", None)
self.github_client = self._get_github_client() self.github_client = self._get_github_client()
self.repo = None self.repo = None
self.pr_num = None self.pr_num = None

12
pr_agent/servers/github_app.py
View File

@ -4,6 +4,9 @@ import sys
import uvicorn import uvicorn
from fastapi import APIRouter, FastAPI, HTTPException, Request, Response 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.agent.pr_agent import PRAgent
from pr_agent.config_loader import settings from pr_agent.config_loader import settings
@ -36,7 +39,9 @@ async def handle_github_webhooks(request: Request, response: Response):
verify_signature(body_bytes, webhook_secret, signature_header) verify_signature(body_bytes, webhook_secret, signature_header)
logging.debug(f'Request body:\n{body}') logging.debug(f'Request body:\n{body}')
installation_id = body.get("installation", {}).get("id")
context["installation_id"] = installation_id
return await handle_request(body) return await handle_request(body)
@ -48,8 +53,6 @@ async def handle_request(body: Dict[str, Any]):
body: The request body. body: The request body.
""" """
action = body.get("action") action = body.get("action")
installation_id = body.get("installation", {}).get("id")
settings.set("GITHUB.INSTALLATION_ID", installation_id)
agent = PRAgent() agent = PRAgent()
if action == 'created': if action == 'created':
@ -85,7 +88,8 @@ async def root():
def start(): def start():
# Override the deployment type to app # Override the deployment type to app
settings.set("GITHUB.DEPLOYMENT_TYPE", "app") settings.set("GITHUB.DEPLOYMENT_TYPE", "app")
app = FastAPI() middleware = [Middleware(RawContextMiddleware)]
app = FastAPI(middleware=middleware)
app.include_router(router) app.include_router(router)
uvicorn.run(app, host="0.0.0.0", port=3000) uvicorn.run(app, host="0.0.0.0", port=3000)

1
pyproject.toml
View File

@ -41,6 +41,7 @@ dependencies = [
"aiohttp~=3.8.4", "aiohttp~=3.8.4",
"atlassian-python-api==3.39.0", "atlassian-python-api==3.39.0",
"GitPython~=3.1.32", "GitPython~=3.1.32",
"starlette-context==0.3.6"
] ]
[project.urls] [project.urls]