sync with upstream

src/gradio_space_ci/webhook.py

@@ -57,6 +57,9 @@ if SPACE_ID is not None:  # If running in a Space (i.e. not locally)
 
 EPHEMERAL_SPACES_CONFIG: Dict[str, Any] = {}
 
+# Draft and open PRs are considered as active (in opposition to closed and merged PRs)
+ACTIVE_PR_STATUS = ("draft", "open")
+
 
 def enable_space_ci() -> None:
     """Enable Space CI for the current Space based on config from the README.md file.
@@ -201,13 +204,13 @@ background_pool = ThreadPoolExecutor(max_workers=1)
 def recover_after_restart(space_id: str) -> None:
     print("Looping through PRs to check if any needs to be synced.")
     for discussion in get_repo_discussions(repo_id=space_id, repo_type="space", discussion_type="pull_request"):
-        if discussion.status == "open":
+        if discussion.status in ACTIVE_PR_STATUS:
+            # check pr trust status
+            handle_modification(space_id=space_id, discussion=discussion)
             if not is_pr_synced(space_id=space_id, pr_num=discussion.num):
                 # Found a PR that is not yet synced
                 print(f"Recovery. Found an open PR that is not synced: {discussion.url}. Syncing it.")
                 background_pool.submit(sync_ci_space, space_id=space_id, pr_num=discussion.num)
-                # Check if this pr should be trusted or not
-                handle_trust_status(space_id=space_id, pr_num=discussion.num)
         if discussion.status == "merged" or discussion.status == "closed":
             ci_space_id = _get_ci_space_id(space_id=space_id, pr_num=discussion.num)
             if repo_exists(repo_id=ci_space_id, repo_type="space"):
@@ -216,42 +219,6 @@ def recover_after_restart(space_id: str) -> None:
                 background_pool.submit(delete_ci_space, space_id=space_id, pr_num=discussion.num)
 
 
-def handle_trust_status(space_id: str, pr_num: int) -> None:
-    """after recovering we check each pr if it is trusted or not"""
-    events = get_discussion_details(repo_id=space_id, repo_type="space", discussion_num=pr_num).events
-    # flip history, last event is the first one
-    events.reverse()
-    for event in events:
-        # a commit and no commands found yet
-        # is it by a trusted author or not ?
-        if event.type == "commit":
-            if event.author not in EPHEMERAL_SPACES_CONFIG["trusted_authors"]:
-                # a commit by untrusted author
-                unset_config(space_id=space_id, pr_num=pr_num)
-                return
-            else:
-                # a commit by a trusted author
-                set_config(space_id=space_id, pr_num=pr_num)
-        
-        # a comment by a trusted author
-        elif (
-            event.type == "comment"
-            and event.author in EPHEMERAL_SPACES_CONFIG["trusted_authors"]
-            and event._event["data"]["edited"] is False
-            and event._event["data"]["hidden"] is False
-        ):
-            comment = event._event["data"]["latest"]["raw"]
-            if comment == "/trust_pr":
-                set_config(space_id=space_id, pr_num=pr_num)
-                return
-            elif comment == "/untrust_pr":
-                unset_config(space_id=space_id, pr_num=pr_num)
-                return
-            elif "<em>(This is an automated message.)</em>" in comment:
-                # synced and no commands yet
-                return
-
-
 ###
 # Define webhook on the Hub logic
 ###
@@ -292,7 +259,7 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
         and payload.event.action == "create"
         and payload.discussion is not None
         and payload.discussion.isPullRequest
-        and payload.discussion.status == "open"
+        and payload.discussion.status in ACTIVE_PR_STATUS
     ):
         # A comment, is it by a command ?
         if payload.event.scope == "discussion.comment":
@@ -323,9 +290,7 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
         # New repo change. Is it a commit on a PR?
         # => 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":
-                # If untrusted author made a modification we unset the config
-                handle_modification(space_id=space_id, discussion=discussion)
+            if discussion.is_pull_request and discussion.status in ACTIVE_PR_STATUS:
                 if not is_pr_synced(space_id=space_id, pr_num=discussion.num):
                     # Found a PR that is not yet synced
                     task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=discussion.num)