more logs + delete repo

app.py

@@ -1,3 +1,5 @@
+# Taken from https://huggingface.co/spaces/huggingface-projects/auto-retrain
+import logging
 import os
 from pathlib import Path
 from typing import Literal, Optional
@@ -19,6 +21,8 @@ from huggingface_hub.repocard import RepoCard
 from pydantic import BaseModel
 from requests import HTTPError
 
+logger = logging.getLogger(__file__)
+
 WEBHOOK_SECRET = os.getenv("WEBHOOK_SECRET")
 HF_TOKEN = os.getenv("HF_TOKEN")
 
@@ -37,6 +41,7 @@ class WebhookPayloadRepo(BaseModel):
 class WebhookPayloadDiscussion(BaseModel):
     num: int
     isPullRequest: bool
+    status: Literal["open", "closed", "merged"]
 
 
 class WebhookPayload(BaseModel):
@@ -59,22 +64,25 @@ async def post_webhook(
     task_queue: BackgroundTasks,
     x_webhook_secret: Optional[str] = Header(default=None),
 ):
-    # Taken from https://huggingface.co/spaces/huggingface-projects/auto-retrain
+    logger.info("Received new hook!")
     if x_webhook_secret is None:
+        logger.warning("HTTP 401: No webhook secret")
         raise HTTPException(401)
     if x_webhook_secret != WEBHOOK_SECRET:
+        logger.warning("HTTP 403: wrong webhook secret")
         raise HTTPException(403)
 
     if payload.repo.type != "space":
+        logger.warning("HTTP 400: not a space")
         raise HTTPException(400, f"Must be a Space, not {payload.repo.type}")
 
     space_id = payload.repo.name
 
     if (
         payload.event.scope.startswith("discussion")
+        and payload.event.action == "create"
         and payload.discussion is not None
         and payload.discussion.isPullRequest
-        and payload.event.action == "create"
     ):
         # New PR!
         task_queue.add_task(
@@ -83,12 +91,28 @@ async def post_webhook(
             pr_num=payload.discussion.num,
             private=payload.repo.private,
         )
+        logger.info("New PR! Sync task scheduled")
+    elif (
+        payload.event.scope.startswith("discussion")
+        and payload.event.action == "update"
+        and payload.discussion is not None
+        and payload.discussion.isPullRequest
+        and payload.discussion.status == "merged"
+    ):
+        # PR merged!
+        task_queue.add_task(
+            delete_ci_space,
+            space_id=space_id,
+            pr_num=payload.discussion.num,
+        )
+        logger.info("PR is merged! Delete task scheduled")
     elif (
         payload.event.scope.startswith("repo.content")
         and payload.event.action == "update"
     ):
         # New repo change. Is it a commit on a PR?
         # => loop through all PRs and check if new changes happened
+        logger.info("New repo content update. Checking PRs state.")
         for discussion in get_repo_discussions(
             repo_id=space_id, repo_type="space", token=HF_TOKEN
         ):
@@ -100,15 +124,13 @@ async def post_webhook(
                         pr_num=discussion.num,
                         private=payload.repo.private,
                     )
-    elif False:
-        # PR merged!
-        task_queue.add_task(
-            delete_ci_space,
-            space_id=payload.repo.name,
-            pr_num=payload.discussion.num,
-        )
+                    logger.info(f"Scheduled update for PR {discussion.num}.")
+        logger.info(f"Done looping over PRs.")
+    else:
+        logger.info(f"Webhook ignored.")
 
-    return "Processed."
+    logger.info(f"Done.")
+    return {"processed": True}
 
 
 def is_pr_synced(space_id: str, pr_num: int) -> bool: