Update app.py

app.py

@@ -1,70 +1,119 @@
+"""
+app.py  –  Anime Object-Detection Space (ZeroGPU ready)
+
+• Gradio ≥ 4.44 (no more `concurrency_count=`).
+• Pydantic pinned (>=2.10.0,<2.11) to avoid schema bug.
+• One global @spaces.GPU wrapper so ZeroGPU is happy.
+• Each detector class gets its own tab via .make_ui().
+"""
+
 import os
-import spaces
 import gradio as gr
-from detection import EyesDetection   # your existing class
+import spaces
+
+# ---- your existing detector classes --------------------------
+from detection import (
+    EyesDetection, FaceDetection, HeadDetection, PersonDetection,
+    HandDetection, CensorDetection, HalfBodyDetection,
+    NudeNetDetection, BooruYOLODetection,
+)
 
 # ──────────────────────────────────────────────────────────────
-# 1. Instantiate the detector once (so the model loads just once)
+# 0.  Instantiate detectors once (they cache their models)
 # ──────────────────────────────────────────────────────────────
-eyes_detector = EyesDetection()
+face_det       = FaceDetection()
+head_det       = HeadDetection()
+person_det     = PersonDetection()
+halfbody_det   = HalfBodyDetection()
+eyes_det       = EyesDetection()
+hand_det       = HandDetection()
+censor_det     = CensorDetection()
+nudenet_det    = NudeNetDetection()
+booruyolo_det  = BooruYOLODetection()
+
+# A mapping so the GPU wrapper can call the right detector
+DETECTORS = {
+    "face"      : face_det,
+    "head"      : head_det,
+    "person"    : person_det,
+    "halfbody"  : halfbody_det,
+    "eyes"      : eyes_det,
+    "hand"      : hand_det,
+    "censor"    : censor_det,
+    "nudenet"   : nudenet_det,
+    "booruyolo" : booruyolo_det,
+}
 
 # ──────────────────────────────────────────────────────────────
-# 2. Top-level GPU function (required by ZeroGPU)
-#    – Must receive every argument the detector needs.
+# 1.  Single top-level GPU function   (ZeroGPU REQUIREMENT)
 # ──────────────────────────────────────────────────────────────
-@spaces.GPU
-def run_detection(img, model_name):
+@spaces.GPU            # <- makes HF allocate a ZeroGPU worker
+def run_detection(img, det_key, model_name=None):
     """
-    img        : numpy array / PIL.Image from gr.Image
-    model_name : str chosen by the user (e.g. 'anime-eyes')
+    Parameters
+    ----------
+    img       : PIL.Image | numpy.ndarray  – image from gr.Image
+    det_key   : str  – one of DETECTORS.keys()
+    model_name: str | None – optional model override
     """
-    return eyes_detector.detect(img, model_name=model_name)
+    detector = DETECTORS[det_key]
+    # Every detector already exposes .detect(img, model_name=...)
+    return detector.detect(img, model_name=model_name)
 
 # ──────────────────────────────────────────────────────────────
-# 3. Build the Gradio UI
+# 2.  Build the UI (mirrors the working public Space layout)
 # ──────────────────────────────────────────────────────────────
-GLOBAL_CSS = """
-.limit-height { max-height: 55vh; }
-"""
+_GLOBAL_CSS = ".limit-height { max-height: 55vh; }"
 
-def build_ui():
-    with gr.Blocks(css=GLOBAL_CSS) as demo:
-        # ─ Header ───────────────────────────────────────────────
+def build_ui() -> gr.Blocks:
+    with gr.Blocks(css=_GLOBAL_CSS) as demo:
         with gr.Row():
             gr.HTML(
-                "<h2 style='text-align:center'>Anime Object (Eyes) Detection</h2>"
+                "<h2 style='text-align:center'>Object Detections For Anime</h2>"
             )
         gr.Markdown(
-            "Online demo for the eye-detection functions in "
-            "[imgutils.detect](https://dghs-imgutils.deepghs.org/main/api_doc/detect/index.html). "
+            "Online demo for detection functions of "
+            "[imgutils.detect](https://dghs-imgutils.deepghs.org/main/api_doc/detect/index.html).  \n"
             "Install locally with `pip install dghs-imgutils`."
         )
 
-        # ─ Detection tab ────────────────────────────────────────
-        with gr.Tab("Eyes Detection"):
-            with gr.Row():
-                input_img = gr.Image(type="numpy", label="Upload image")
-                output    = gr.JSON(label="Detection result")
-            with gr.Row():
-                model_dropdown = gr.Dropdown(
-                    choices=["anime-eyes", "cartoon-eyes", "real-eyes"],
-                    value="anime-eyes",
-                    label="Model",
-                )
-                run_btn = gr.Button("Detect Eyes")
-
-            run_btn.click(
-                fn=run_detection,
-                inputs=[input_img, model_dropdown],
-                outputs=output,
-            )
+        with gr.Row():
+            with gr.Tabs():
+
+                # ---- each tab reuses the detector's built-in UI -----------
+                with gr.Tab("Face Detection"):
+                    face_det.make_ui()
+
+                with gr.Tab("Head Detection"):
+                    head_det.make_ui()
+
+                with gr.Tab("Person Detection"):
+                    person_det.make_ui()
+
+                with gr.Tab("Half Body Detection"):
+                    halfbody_det.make_ui()
+
+                with gr.Tab("Eyes Detection"):
+                    eyes_det.make_ui()
+
+                with gr.Tab("Hand Detection"):
+                    hand_det.make_ui()
+
+                with gr.Tab("Censor Point Detection"):
+                    censor_det.make_ui()
+
+                with gr.Tab("NudeNet"):
+                    nudenet_det.make_ui()
+
+                with gr.Tab("BooruYOLO"):
+                    booruyolo_det.make_ui()
 
     return demo
 
 # ──────────────────────────────────────────────────────────────
-# 4. Launch
+# 3.  Launch (Gradio ≥4 syntax)
 # ──────────────────────────────────────────────────────────────
 if __name__ == "__main__":
-    app = build_ui()
-    # Keep queue size small (ZeroGPU sessions are short-lived)
-    app.queue(concurrency_count=os.cpu_count()).launch()
+    demo = build_ui()
+    # default_concurrency_limit → replaces old concurrency_count
+    demo.queue(default_concurrency_limit=os.cpu_count()).launch()