better logic for rebuilding a space

src/gradio_space_ci/webhook.py

@@ -207,7 +207,7 @@ def recover_after_restart(space_id: str) -> None:
             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)
+                background_pool.submit(sync_ci_space, space_id=space_id, pr_num=discussion.num, skip_config=False)
         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"):
@@ -264,7 +264,7 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
         # 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=payload.discussion.num)
+            task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=payload.discussion.num, skip_config=False)
             has_task = True
     elif (
         # Means "a PR has been merged or closed"
@@ -286,7 +286,7 @@ async def trigger_ci_on_pr(payload: WebhookPayload, task_queue: BackgroundTasks)
             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)
+                    task_queue.add_task(sync_ci_space, space_id=space_id, pr_num=discussion.num, skip_config=False)
                     has_task = True
 
     if has_task:
@@ -317,9 +317,9 @@ def is_pr_synced(space_id: str, pr_num: int) -> bool:
     return last_synced_sha == last_pr_sha
 
 
-def sync_ci_space(space_id: str, pr_num: int) -> None:
+def sync_ci_space(space_id: str, pr_num: int, skip_config: bool = False) -> None:
     print(f"New task: sync ephemeral env for {space_id} (PR {pr_num})")
-    if is_pr_synced(space_id=space_id, pr_num=pr_num):
+    if is_pr_synced(space_id=space_id, pr_num=pr_num) and not skip_config:
         print("Already synced. Nothing to do.")
         return
 
@@ -330,7 +330,7 @@ def sync_ci_space(space_id: str, pr_num: int) -> None:
 
     # Configure ephemeral Space if trusted author
     is_configured = False
-    if is_new:
+    if not skip_config and is_new:
         is_configured = configure_ephemeral_space(space_id=space_id, pr_num=pr_num)
 
     # Download space codebase from PR revision
@@ -477,7 +477,7 @@ def rebuild_space(space_id: str, pr_num: int) -> None:
     # the ephemeral space
     delete_ci_space(space_id=space_id, pr_num=pr_num, notify=False)
     # create a new synced ephemeral space
-    sync_ci_space(space_id=space_id, pr_num=pr_num)
+    sync_ci_space(space_id=space_id, pr_num=pr_num, skip_config=True)
 
 
 def handle_modification(space_id: str, discussion: Any) -> None: