rollback and switch to a more vanilla method

src/gradio_space_ci/webhook.py

@@ -30,7 +30,7 @@ from huggingface_hub import (
     upload_folder,
     delete_space_secret,
     delete_space_variable,
-    delete_space_storage
+    delete_space_storage,
 )
 from huggingface_hub.repocard import RepoCard
 from huggingface_hub.utils import (
@@ -248,22 +248,33 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
     space_id = payload.repo.name
 
     has_task = False
-
-    pr_num = payload.discussion.num
-    details = get_discussion_details(repo_id=space_id, repo_type="space", discussion_num=pr_num)
-    event_author = details.events[-1]._event["author"]["name"]  # username of that event
-
     if (
-        # Means "a new PR has been opened"
+        # Means "a new PR has been opened" or a new comment
         payload.event.scope.startswith("discussion")
         and payload.event.action == "create"
         and payload.discussion is not None
         and payload.discussion.isPullRequest
         and payload.discussion.status == "open"
     ):
-        if not is_pr_synced(space_id=space_id, pr_num=pr_num):
+        # A comment, is it by a trusted author ?
+        if payload.event.scope == "discussion.comment":
+            pr_num = payload.discussion.num
+            details = get_discussion_details(repo_id=space_id, repo_type="space", discussion_num=pr_num)
+            event_author = details.events[-1]._event["author"]["name"]  # username of that event
+            if event_author in EPHEMERAL_SPACES_CONFIG["trusted_authors"]:
+                print("Comment detected with content:\n", payload.comment.content)
+                if payload.comment.content == "/trust_pr":
+                    print("trusting pr ...")
+                    set_config(space_id=space_id, pr_num=pr_num)
+                    print("pr has been trusted")
+                elif payload.comment.content == "/untrust_pr":
+                    print("untrusting pr ...")
+                    unset_config(space_id=space_id, pr_num=pr_num)
+                    print("pr has been untrusted")
+        # Always sync (in case the space was sleeping or building)
+        if not is_pr_synced(space_id=space_id, pr_num=payload.discussion.num):
             # New PR! Sync task scheduled
-            task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=pr_num)
+            task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=payload.discussion.num)
             has_task = True
     elif (
         # Means "a PR has been merged or closed"
@@ -276,7 +287,7 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
         task_queue.add_task(
             delete_ci_space,
             space_id=space_id,
-            pr_num=pr_num,
+            pr_num=payload.discussion.num,
         )
         has_task = True
     elif (
@@ -287,30 +298,16 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
         # => loop through all PRs and check if new changes happened
         for discussion in get_repo_discussions(repo_id=space_id, repo_type="space"):
             if discussion.is_pull_request and discussion.status == "open":
+                # Was the pr updated by an untrusted author ?
+                details = get_discussion_details(repo_id=space_id, repo_type="space", discussion_num=discussion.num)
+                event_author = details.events[-1]._event["author"]["name"]  # username of that event
+                if event_author not in EPHEMERAL_SPACES_CONFIG["trusted_authors"]:
+                    # Untrusted author, we unset the config as part or security reasons
+                    unset_config(space_id=space_id, pr_num=discussion.num)
                 if not is_pr_synced(space_id=space_id, pr_num=discussion.num):
                     # Found a PR that is not yet synced
-                    if event_author not in EPHEMERAL_SPACES_CONFIG["trusted_authors"] : 
-                        # if change by untrusted author unset config
-                        unset_config(space_id=space_id,pr_num=pr_num)
                     task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=discussion.num)
                     has_task = True
-    if (
-        # Means comment by a trusted author
-        payload.event.scope == "discussion.comment"
-        and payload.event.action == "create"
-        and payload.discussion.isPullRequest
-        and payload.discussion.status == "open"
-        and event_author in EPHEMERAL_SPACES_CONFIG["trusted_authors"]
-    ):
-        print("Comment detected with content:\n", payload.comment.content)
-        if payload.comment.content == "/trust_pr":
-            print("trusting pr ...")
-            set_config(space_id=space_id,pr_num=pr_num)
-            print("pr has been trusted")
-        elif payload.comment.content == "/untrust_pr":
-            print("untrusting pr ...")
-            unset_config(space_id=space_id,pr_num=pr_num)
-            print("pr has been untrusted")
 
     if has_task:
         return Response("Task scheduled to sync/delete Space", status_code=status.HTTP_202_ACCEPTED)
@@ -503,16 +500,15 @@ def unset_config(space_id: str, pr_num: int) -> None:
     variables: Dict[str, str] = EPHEMERAL_SPACES_CONFIG["variables"]
     secrets: Dict[str, str] = EPHEMERAL_SPACES_CONFIG["secrets"]
     # Unset space variables and secrets
-    for key  in variables.keys():
+    for key in variables.keys():
         delete_space_variable(ci_space_id, key)
-    for key in secrets.keys(): 
+    for key in secrets.keys():
         delete_space_secret(ci_space_id, key)
     # Reset hardware
-    request_space_hardware(ci_space_id,SpaceHardware.CPU_BASIC)
+    request_space_hardware(ci_space_id, SpaceHardware.CPU_BASIC)
     delete_space_storage(ci_space_id)
 
 
-
 NOTIFICATION_TEMPLATE_CREATED_AND_CONFIGURED = """\
 Following the creation of this PR, an ephemeral Space [{ci_space_id}](https://huggingface.co/spaces/{ci_space_id}) has been started. Any changes pushed to this PR will be synced with the test Space.
 Since this PR has been created by a trusted author, the ephemeral Space has been configured with the correct hardware, storage, and secrets.