Bitbucket server, WIP

pr_agent/servers/atlassian-connect.json

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

pr_agent/servers/bitbucket_app.py

@@ -1,22 +1,26 @@
+import copy
 import hashlib
 import json
 import logging
 import os
+import sys
 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
+from pr_agent.config_loader import get_settings, global_settings
 from pr_agent.secret_providers import get_secret_provider
 
+logging.basicConfig(stream=sys.stdout, level=logging.INFO)
 router = APIRouter()
 secret_provider = get_secret_provider()
 
@@ -51,29 +55,44 @@ async def get_bearer_token(shared_secret: str, client_key: str):
 @router.get("/")
 async def handle_manifest(request: Request, response: Response):
     manifest = open("atlassian-connect.json", "rt").read()
+    try:
+        manifest = manifest.replace("app_key", get_settings().bitbucket.app_key)
+    except:
+        logging.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(request: Request, response: Response):
-    try:
-        print(request.headers)
-        data = await request.json()
-        print(data)
-        owner = data["data"]["repository"]["owner"]["username"]
-        secrets = json.loads(secret_provider.get_secret(owner))
-        shared_secret = secrets["shared_secret"]
-        client_key = secrets["client_key"]
-        bearer_token = await get_bearer_token(shared_secret, client_key)
-        context['bitbucket_bearer_token'] = bearer_token
-        event = data["event"]
-        agent = PRAgent()
-        if event == "pullrequest:created":
-            pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
-            await agent.handle_request(pr_url, "review")
-    except Exception as e:
-        logging.error(f"Failed to handle webhook: {e}")
-        return JSONResponse({"error": "Unable to handle webhook"}, status_code=500)
+async def handle_github_webhooks(background_tasks: BackgroundTasks, request: Request):
+    print(request.headers)
+    jwt_header = request.headers.get("authorization", None)
+    if jwt_header:
+        input_jwt = jwt_header.split(" ")[1]
+    data = await request.json()
+    print(data)
+    async def inner():
+        try:
+            owner = data["data"]["repository"]["owner"]["username"]
+            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"]
+                await agent.handle_request(pr_url, "review")
+            elif event == "pullrequest:comment_created":
+                pr_url = data["data"]["pullrequest"]["links"]["html"]["href"]
+                comment_body = data["data"]["comment"]["content"]["raw"]
+                await agent.handle_request(pr_url, comment_body)
+        except Exception as e:
+            logging.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):
@@ -106,6 +125,7 @@ async def handle_uninstalled_webhooks(request: Request, response: Response):
 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)

pr_agent/servers/github_app.py

@@ -167,4 +167,4 @@ def start():
 
 
 if __name__ == '__main__':
-    start()
+    start()