bitbucket server

pr_agent/servers/bitbucket_server_webhook.py

@@ -1,5 +1,7 @@
+import ast
 import json
 import os
+from typing import List
 
 import uvicorn
 from fastapi import APIRouter, FastAPI
@@ -10,11 +12,14 @@ from starlette.middleware import Middleware
 from starlette.requests import Request
 from starlette.responses import JSONResponse
 from starlette_context.middleware import RawContextMiddleware
-
 from pr_agent.agent.pr_agent import PRAgent
+from pr_agent.algo.utils import update_settings_from_args
 from pr_agent.config_loader import get_settings
+from pr_agent.git_providers.utils import apply_repo_settings
 from pr_agent.log import LoggingFormat, get_logger, setup_logger
 from pr_agent.servers.utils import verify_signature
+from fastapi.responses import RedirectResponse
+
 
 setup_logger(fmt=LoggingFormat.JSON, level="DEBUG")
 router = APIRouter()
@@ -25,7 +30,7 @@ def handle_request(
 ):
     log_context["action"] = body
     log_context["api_url"] = url
-    
+
     async def inner():
         try:
             with get_logger().contextualize(**log_context):
@@ -35,8 +40,11 @@ def handle_request(
 
     background_tasks.add_task(inner)
 
-
 @router.post("/")
+async def redirect_to_webhook():
+    return RedirectResponse(url="/webhook")
+
+@router.post("/webhook")
 async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
     log_context = {"server_type": "bitbucket_server"}
     data = await request.json()
@@ -45,6 +53,10 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
     webhook_secret = get_settings().get("BITBUCKET_SERVER.WEBHOOK_SECRET", None)
     if webhook_secret:
         body_bytes = await request.body()
+        if body_bytes.decode('utf-8') == '{"test": true}':
+            return JSONResponse(
+                status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "connection test successful"})
+            )
         signature_header = request.headers.get("x-hub-signature", None)
         verify_signature(body_bytes, webhook_secret, signature_header)
 
@@ -57,22 +69,81 @@ async def handle_webhook(background_tasks: BackgroundTasks, request: Request):
     log_context["api_url"] = pr_url
     log_context["event"] = "pull_request"
 
+    commands_to_run = []
+
     if data["eventKey"] == "pr:opened":
-        body = "review"
+        commands_to_run.extend(_get_commands_list_from_settings('BITBUCKET_SERVER.PR_COMMANDS'))
     elif data["eventKey"] == "pr:comment:added":
-        body = data["comment"]["text"]
+        commands_to_run.append(data["comment"]["text"])
     else:
         return JSONResponse(
             status_code=status.HTTP_400_BAD_REQUEST,
             content=json.dumps({"message": "Unsupported event"}),
         )
 
-    handle_request(background_tasks, pr_url, body, log_context)
+    async def inner():
+        try:
+            await _run_commands_sequentially(commands_to_run, pr_url, log_context)
+        except Exception as e:
+            get_logger().error(f"Failed to handle webhook: {e}")
+
+    background_tasks.add_task(inner)
+
     return JSONResponse(
         status_code=status.HTTP_200_OK, content=jsonable_encoder({"message": "success"})
     )
 
 
+async def _run_commands_sequentially(commands: List[str], url: str, log_context: dict):
+    get_logger().info(f"Running commands sequentially: {commands}")
+    if commands is None:
+        return
+
+    for command in commands:
+        try:
+            body = _process_command(command, url)
+
+            log_context["action"] = body
+            log_context["api_url"] = url
+
+            with get_logger().contextualize(**log_context):
+                await PRAgent().handle_request(url, body)
+        except Exception as e:
+            get_logger().error(f"Failed to handle command: {command} , error: {e}")
+
+def _process_command(command: str, url) -> str:
+    # don't think we need this
+    apply_repo_settings(url)
+    # Process the command string
+    split_command = command.split(" ")
+    command = split_command[0]
+    args = split_command[1:]
+    # do I need this? if yes, shouldn't this be done in PRAgent?
+    other_args = update_settings_from_args(args)
+    new_command = ' '.join([command] + other_args)
+    return new_command
+
+
+def _to_list(command_string: str) -> list:
+    try:
+        # Use ast.literal_eval to safely parse the string into a list
+        commands = ast.literal_eval(command_string)
+        # Check if the parsed object is a list of strings
+        if isinstance(commands, list) and all(isinstance(cmd, str) for cmd in commands):
+            return commands
+        else:
+            raise ValueError("Parsed data is not a list of strings.")
+    except (SyntaxError, ValueError, TypeError) as e:
+        raise ValueError(f"Invalid command string: {e}")
+
+
+def _get_commands_list_from_settings(setting_key:str ) -> list:
+    try:
+        return get_settings().get(setting_key, [])
+    except ValueError as e:
+        get_logger().error(f"Failed to get commands list from settings {setting_key}: {e}")
+
+
 @router.get("/")
 async def root():
     return {"status": "ok"}