feat: tabbed multi-app UI

app.py

@@ -1,14 +1,3 @@
-# ─────────────────────────────────────────────────────────────────────────────
-# Deploy each app by setting APP_ID before launching:
-#
-#   APP_ID=allergen_lens   python app.py   # food label scanner
-#   APP_ID=fridge_dinner   python app.py   # fridge-to-dinner planner
-#   APP_ID=object_oracle   python app.py   # tarot-style reading
-#   APP_ID=whats_that_error python app.py  # error code fixer
-#
-# On Hugging Face Spaces: set APP_ID in Space → Settings → Variables & Secrets.
-# ─────────────────────────────────────────────────────────────────────────────
-
 import spaces  # MUST be the first import for ZeroGPU
 
 import os
@@ -21,14 +10,6 @@ from core.apps import APP_REGISTRY, _error_html, _error_updates
 from core.model import vision_infer
 from core.parse import parse_json
 
-# ── Config ────────────────────────────────────────────────────────────────────
-
-APP_ID = os.environ.get("APP_ID", "allergen_lens")
-if APP_ID not in APP_REGISTRY:
-    raise ValueError(f"Unknown APP_ID '{APP_ID}'. Choose from: {list(APP_REGISTRY)}")
-
-spec = APP_REGISTRY[APP_ID]
-
 # ── Image helpers ─────────────────────────────────────────────────────────────
 
 def _pil(item) -> "Image.Image | None":
@@ -59,53 +40,48 @@ def _collect_images(raw) -> list:
 
 # ── Status constants ──────────────────────────────────────────────────────────
 
-_STATUS_WARM = "⏳ Warming up the model — first run takes a few seconds…"
+_STATUS_WARM  = "⏳ Warming up the model — first run takes a few seconds…"
 _STATUS_CLEAR = ""
 
-# ── Inference handler (generator — enables warm-up status) ────────────────────
-
-def _run(image_input, *extra_inputs):
-    """
-    Generator so we can yield the warm-up message before the GPU call blocks,
-    then yield the result (+ cleared status) when done.
-    Outputs: [status_md] + one gr.update per spec.output_components entry.
-    """
-    n_out = len(spec.output_components)
+# ── Per-spec inference handler factory ────────────────────────────────────────
 
-    # Phase 1: show warm-up status immediately; leave result components unchanged
-    yield [gr.update(value=_STATUS_WARM)] + [gr.update()] * n_out
+def _make_run(spec):
+    def _run(image_input, *extra_inputs):
+        n_out = len(spec.output_components)
+        yield [gr.update(value=_STATUS_WARM)] + [gr.update()] * n_out
 
-    images = _collect_images(image_input)
-    if not images:
-        yield [gr.update(value=_STATUS_CLEAR)] + _error_updates(
-            n_out, "Please upload at least one image."
-        )
-        return
+        images = _collect_images(image_input)
+        if not images:
+            yield [gr.update(value=_STATUS_CLEAR)] + _error_updates(
+                n_out, "Please upload at least one image."
+            )
+            return
 
-    instruction = spec.instruction_fn(*extra_inputs)
+        instruction = spec.instruction_fn(*extra_inputs)
 
-    try:
-        raw = vision_infer(
-            images=images,
-            instruction=instruction,
-            json_mode=(spec.output_mode == "json"),
-            max_tokens=spec.max_tokens,
-        )
-    except Exception as exc:
-        yield [gr.update(value=_STATUS_CLEAR)] + _error_updates(n_out, f"Inference error: {exc}")
-        return
+        try:
+            raw = vision_infer(
+                images=images,
+                instruction=instruction,
+                json_mode=(spec.output_mode == "json"),
+                max_tokens=spec.max_tokens,
+            )
+        except Exception as exc:
+            yield [gr.update(value=_STATUS_CLEAR)] + _error_updates(
+                n_out, f"Inference error: {exc}"
+            )
+            return
 
-    data = parse_json(raw) if spec.output_mode == "json" else raw
-    updates = spec.render_fn(data)
+        data = parse_json(raw) if spec.output_mode == "json" else raw
+        updates = spec.render_fn(data)
+        yield [gr.update(value=_STATUS_CLEAR)] + updates
 
-    # Phase 2: clear status, deliver result
-    yield [gr.update(value=_STATUS_CLEAR)] + updates
+    return _run
 
 
-# ── UI builder (generic — driven entirely by AppSpec) ─────────────────────────
+# ── Output component builder ─────��────────────────────────────────────────────
 
 def _build_output_components(component_types: list[str]) -> list:
-    """Create one Gradio component per declared output slot."""
     comps = []
     for kind in component_types:
         if kind == "html":
@@ -126,98 +102,99 @@ def _build_output_components(component_types: list[str]) -> list:
     return comps
 
 
-def build_demo(spec) -> gr.Blocks:
-    css = """
-    .submit-btn { font-size: 16px !important; padding: 12px 0 !important; }
-    footer { display: none !important; }
-    """
+# ── Tab builder ───────────────────────────────────────────────────────────────
 
-    with gr.Blocks(title=spec.title, css=css, theme=gr.themes.Soft()) as demo:
-        gr.HTML(
-            f'<div style="padding:16px 0 8px">'
-            f'<h1 style="margin:0;font-size:26px">{spec.title}</h1>'
-            f'<p style="margin:4px 0 0;color:#555;font-size:15px">{spec.tagline}</p>'
-            f'</div>'
-        )
+def _build_tab(spec):
+    status_md = gr.Markdown(_STATUS_CLEAR, visible=True)
 
-        # Shared status indicator — one per page, always present
-        status_md = gr.Markdown(_STATUS_CLEAR, visible=True)
-
-        with gr.Row(equal_height=False):
-            # ── Left column: inputs ───────────────────────────────────────────
-            with gr.Column(scale=1):
-                image_comp = gr.Image(
-                    label="Upload image",
-                    type="pil",
-                    sources=["upload", "webcam", "clipboard"],
-                    height=300,
-                )
+    with gr.Row(equal_height=False):
+        with gr.Column(scale=1):
+            image_comp = gr.Image(
+                label="Upload image",
+                type="pil",
+                sources=["upload", "webcam", "clipboard"],
+                height=300,
+            )
 
-                extra_comps = []
+            extra_comps = []
 
-                if spec.input_spec.text_label:
-                    text_comp = gr.Textbox(
-                        label=spec.input_spec.text_label,
-                        placeholder=spec.input_spec.text_placeholder,
-                        lines=2,
-                    )
-                    extra_comps.append(text_comp)
+            if spec.input_spec.text_label:
+                extra_comps.append(gr.Textbox(
+                    label=spec.input_spec.text_label,
+                    placeholder=spec.input_spec.text_placeholder,
+                    lines=2,
+                ))
 
-                if spec.input_spec.dropdown_choices:
-                    drop_comp = gr.Dropdown(
-                        choices=spec.input_spec.dropdown_choices,
-                        value=spec.input_spec.dropdown_default,
-                        label=spec.input_spec.dropdown_label,
-                    )
-                    extra_comps.append(drop_comp)
+            if spec.input_spec.dropdown_choices:
+                extra_comps.append(gr.Dropdown(
+                    choices=spec.input_spec.dropdown_choices,
+                    value=spec.input_spec.dropdown_default,
+                    label=spec.input_spec.dropdown_label,
+                ))
 
-                submit = gr.Button("Analyze ✦", variant="primary", elem_classes=["submit-btn"])
+            submit = gr.Button("Analyze ✦", variant="primary", elem_classes=["submit-btn"])
 
-            # ── Right column: outputs (built from spec) ───────────────────────
-            with gr.Column(scale=1):
-                output_comps = _build_output_components(spec.output_components)
+        with gr.Column(scale=1):
+            output_comps = _build_output_components(spec.output_components)
 
-        all_inputs = [image_comp] + extra_comps
-        all_outputs = [status_md] + output_comps
+    all_inputs  = [image_comp] + extra_comps
+    all_outputs = [status_md]  + output_comps
 
-        submit.click(fn=_run, inputs=all_inputs, outputs=all_outputs)
+    submit.click(fn=_make_run(spec), inputs=all_inputs, outputs=all_outputs)
 
-        # Reset outputs when a new image is uploaded
-        def _on_image_change(*_):
-            placeholder = (
-                '<div style="min-height:180px;display:flex;align-items:center;'
-                'justify-content:center;color:#aaa;font-family:system-ui">'
-                'Click Analyze ✦ to process</div>'
-            )
-            return [gr.update(value=_STATUS_CLEAR)] + [
-                gr.update(value=placeholder) for _ in spec.output_components
-            ]
-
-        image_comp.change(fn=_on_image_change, inputs=[image_comp], outputs=all_outputs)
+    placeholder = (
+        '<div style="min-height:180px;display:flex;align-items:center;'
+        'justify-content:center;color:#aaa;font-family:system-ui">'
+        'Click Analyze ✦ to process</div>'
+    )
 
-        # Examples (only when local files exist)
-        valid_examples = [
-            row for row in spec.examples
-            if row and Path(str(row[0])).exists()
+    def _on_image_change(*_):
+        return [gr.update(value=_STATUS_CLEAR)] + [
+            gr.update(value=placeholder) for _ in spec.output_components
         ]
-        if valid_examples:
-            gr.Examples(
-                examples=valid_examples,
-                inputs=all_inputs,
-                label="Try an example",
-                cache_examples=False,
-            )
 
-        gr.HTML(
-            '<div style="text-align:center;color:#aaa;font-size:12px;margin-top:16px">'
-            f'Powered by <b>MiniCPM-V 4.6 (1.3B)</b> · ZeroGPU · App: <code>{APP_ID}</code>'
-            '</div>'
+    image_comp.change(fn=_on_image_change, inputs=[image_comp], outputs=all_outputs)
+
+    valid_examples = [
+        row for row in spec.examples
+        if row and Path(str(row[0])).exists()
+    ]
+    if valid_examples:
+        gr.Examples(
+            examples=valid_examples,
+            inputs=all_inputs,
+            label="Try an example",
+            cache_examples=False,
         )
 
-    return demo
-
 
-demo = build_demo(spec)
+# ── Main demo ─────────────────────────────────────────────────────────────────
+
+css = """
+.submit-btn { font-size: 16px !important; padding: 12px 0 !important; }
+footer { display: none !important; }
+"""
+
+with gr.Blocks(title="Vision Base", css=css, theme=gr.themes.Soft()) as demo:
+    gr.HTML(
+        '<div style="padding:16px 0 8px">'
+        '<h1 style="margin:0;font-size:28px">👁️ Vision Base</h1>'
+        '<p style="margin:4px 0 0;color:#555;font-size:15px">'
+        'Four vision tools powered by MiniCPM-V 4.6 · ZeroGPU'
+        '</p></div>'
+    )
+
+    with gr.Tabs():
+        for spec in APP_REGISTRY.values():
+            with gr.Tab(spec.title):
+                gr.Markdown(f"*{spec.tagline}*")
+                _build_tab(spec)
+
+    gr.HTML(
+        '<div style="text-align:center;color:#aaa;font-size:12px;margin-top:16px">'
+        'Powered by <b>MiniCPM-V 4.6 (1.3B)</b> · ZeroGPU'
+        '</div>'
+    )
 
 if __name__ == "__main__":
     demo.launch(show_error=True)