First gradio webhooks try

Dockerfile

@@ -1,16 +0,0 @@
-FROM python:3.10
-
-RUN useradd -m -u 1000 user
-USER user
-ENV HOME=/home/user \
-	PATH=/home/user/.local/bin:$PATH
-
-WORKDIR $HOME/app
-
-COPY --chown=user requirements.txt requirements.txt
-RUN pip install --no-cache-dir --upgrade -r requirements.txt
-
-COPY --chown=user . .
-
-CMD ["uvicorn", "app:app", "--host", "0.0.0.0", "--port", "7860", "--log-level", "info"]
-

README.md

@@ -3,10 +3,12 @@ title: Spaces Ci Bot
 emoji: 😻
 colorFrom: pink
 colorTo: green
-sdk: docker
+sdk: gradio
+sdk_version: 3.17.0
+app_file: app.py
 pinned: false
 ---
 
-Check out the configuration reference at https://huggingface.co/docs/hub/spaces-config-reference
+## Spaces CI webhook
 
-Project structure taken from https://huggingface.co/spaces/huggingface-projects/auto-retrain.
+This is a webhook space to build temporary Spaces when a PR is submitted.

app.py

@@ -1,11 +1,9 @@
 # Taken from https://huggingface.co/spaces/huggingface-projects/auto-retrain
-import logging
 import os
 from pathlib import Path
 from typing import Literal, Optional
 
-from fastapi import BackgroundTasks, FastAPI, Header, HTTPException
-from fastapi.responses import FileResponse
+from fastapi import BackgroundTasks, Header, HTTPException
 from huggingface_hub import (
     CommitOperationAdd,
     CommitOperationDelete,
@@ -21,7 +19,7 @@ from huggingface_hub.repocard import RepoCard
 from pydantic import BaseModel
 from requests import HTTPError
 
-logger = logging.getLogger(__file__)
+from gradio_webhooks import WebhookGradioApp
 
 WEBHOOK_SECRET = os.getenv("WEBHOOK_SECRET")
 HF_TOKEN = os.getenv("HF_TOKEN")
@@ -50,30 +48,25 @@ class WebhookPayload(BaseModel):
     discussion: Optional[WebhookPayloadDiscussion]
 
 
-app = FastAPI()
+app = WebhookGradioApp()
 
 
-@app.get("/")
-async def home():
-    return FileResponse("home.html")
-
-
-@app.post("/webhook")
+@app.add_webhook("/webhook")
 async def post_webhook(
     payload: WebhookPayload,
     task_queue: BackgroundTasks,
     x_webhook_secret: Optional[str] = Header(default=None),
 ):
-    logger.info("Received new hook!")
+    print("Received new hook!")
     if x_webhook_secret is None:
-        logger.warning("HTTP 401: No webhook secret")
+        print("HTTP 401: No webhook secret")
         raise HTTPException(401)
     if x_webhook_secret != WEBHOOK_SECRET:
-        logger.warning("HTTP 403: wrong webhook secret")
+        print("HTTP 403: wrong webhook secret")
         raise HTTPException(403)
 
     if payload.repo.type != "space":
-        logger.warning("HTTP 400: not a space")
+        print("HTTP 400: not a space")
         raise HTTPException(400, f"Must be a Space, not {payload.repo.type}")
 
     space_id = payload.repo.name
@@ -93,9 +86,9 @@ async def post_webhook(
                 pr_num=payload.discussion.num,
                 private=payload.repo.private,
             )
-            logger.info("New PR! Sync task scheduled")
+            print("New PR! Sync task scheduled")
         else:
-            logger.info("New comment on PR but CI space already synced")
+            print("New comment on PR but CI space already synced")
     elif (
         payload.event.scope.startswith("discussion")
         and payload.event.action == "update"
@@ -112,14 +105,14 @@ async def post_webhook(
             space_id=space_id,
             pr_num=payload.discussion.num,
         )
-        logger.info("PR is merged (or closed)! Delete task scheduled")
+        print("PR is merged (or closed)! 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.")
+        print("New repo content update. Checking PRs state.")
         for discussion in get_repo_discussions(
             repo_id=space_id, repo_type="space", token=HF_TOKEN
         ):
@@ -131,12 +124,12 @@ async def post_webhook(
                         pr_num=discussion.num,
                         private=payload.repo.private,
                     )
-                    logger.info(f"Scheduled update for PR {discussion.num}.")
-        logger.info(f"Done looping over PRs.")
+                    print(f"Scheduled update for PR {discussion.num}.")
+        print(f"Done looping over PRs.")
     else:
-        logger.info(f"Webhook ignored.")
+        print(f"Webhook ignored.")
 
-    logger.info(f"Done.")
+    print(f"Done.")
     return {"processed": True}
 
 
@@ -278,3 +271,6 @@ PR is now merged/closed. The temporary test Space has been deleted.
 
 (This is an automated message)
 """
+
+
+app.block_thread()

gradio_webhooks.py

@@ -0,0 +1,57 @@
+from pathlib import Path
+from typing import Set, Union
+
+import gradio as gr
+
+
+class WebhookGradioApp:
+    """
+    ```py
+    from gradio_webhooks import WebhookGradioApp
+
+    app = WebhookGradioApp()
+
+
+    @app.add_webhook("/test_webhook")
+    async def hello():
+        return {"in_gradio": True}
+
+
+    app.block_thread()
+    ```
+    """
+
+    def __init__(self, landing_path: Union[str, Path] = "README.md") -> None:
+        # Use README.md as landing page or provide any markdown file
+        landing_path = Path(landing_path)
+        landing_content = landing_path.read_text()
+        if landing_path.name == "README.md":
+            landing_content = landing_content.split("---")[-1].strip()
+
+        # Simple gradio app with landing content
+        block = gr.Blocks()
+        with block:
+            gr.Markdown(landing_content)
+
+        # Launch gradio app:
+        #   - as non-blocking so that webhooks can be added afterwards
+        #   - as shared if launch locally (to receive webhooks)
+        app, _, _ = block.launch(prevent_thread_lock=True, share=not block.is_space)
+        self.gradio_app = block
+        self.fastapi_app = app
+        self.webhook_paths: Set[str] = set()
+
+    def add_webhook(self, path: str):
+        self.webhook_paths.add(path)
+        return self.fastapi_app.post(path)
+
+    def block_thread(self) -> None:
+        url = (
+            self.gradio_app.share_url
+            if self.gradio_app.share_url is not None
+            else self.gradio_app.local_url
+        ).strip("/")
+        print("\nWebhooks are correctly setup and ready to use:")
+        print("\n".join(f"  - POST {url}{webhook}" for webhook in self.webhook_paths))
+        print(f"Checkout {url}/docs for more details.")
+        self.gradio_app.block_thread()

home.html

@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8" />
-		<meta name="viewport" content="width=device-width" />
-		<title>Spaces CI bot</title>
-		<link rel="stylesheet" href="style.css" />
-	</head>
-    <body>
-        <div class="card">
-            <h1>Spaces CI webhook</h1>
-
-            <p>This is a webhook space to build temporary Spaces when a PR is submitted.</p>
-
-            <!-- <p>Check out the guide <a href="https://huggingface.co/docs/hub/webhooks-guide-auto-retrain" target="_blank">here</a>!</p> -->
-        </div>
-    </body>
-</html>

requirements.txt

@@ -1,4 +1,2 @@
-fastapi==0.74.*
-requests==2.27.*
-huggingface_hub==0.12.*
-uvicorn[standard]==0.17.*
+fastapi
+huggingface_hub==0.12.*