Update app.py

app.py

@@ -1,147 +1,58 @@
-import time
-
-from theme_dropdown import create_theme_dropdown  # noqa: F401
-
+from __future__ import annotations
+from typing import Iterable
 import gradio as gr
+from gradio.themes.base import Base
+from gradio.themes.utils import colors, fonts, sizes
+import time
 
-dropdown, js = create_theme_dropdown()
-
-with gr.Blocks(theme='bethecloud/storj_theme') as demo:
-    with gr.Row().style(equal_height=True):
-        with gr.Column(scale=10):
-            gr.Markdown(
-                """
-                # Theme preview: `storj_theme`
-                To use this theme, set `theme='bethecloud/storj_theme'` in `gr.Blocks()` or `gr.Interface()`.
-                You can append an `@` and a semantic version expression, e.g. @>=1.0.0,<2.0.0 to pin to a given version
-                of this theme.
-                """
-            )
-        with gr.Column(scale=3):
-            with gr.Box():
-                dropdown.render()
-                toggle_dark = gr.Button(value="Toggle Dark").style(full_width=True)
-
-    dropdown.change(None, dropdown, None, _js=js)
-    toggle_dark.click(
-        None,
-        _js="""
-        () => {
-            document.body.classList.toggle('dark');
-            document.querySelector('gradio-app').style.backgroundColor = 'var(--color-background-primary)'
-        }
-        """,
-    )
-
-    name = gr.Textbox(
-        label="Name",
-        info="Full name, including middle name. No special characters.",
-        placeholder="John Doe",
-        value="John Doe",
-        interactive=True,
-    )
-
-    with gr.Row():
-        slider1 = gr.Slider(label="Slider 1")
-        slider2 = gr.Slider(label="Slider 2")
-    gr.CheckboxGroup(["A", "B", "C"], label="Checkbox Group")
-
-    with gr.Row():
-        with gr.Column(variant="panel", scale=1):
-            gr.Markdown("## Panel 1")
-            radio = gr.Radio(
-                ["A", "B", "C"],
-                label="Radio",
-                info="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.",
-            )
-            drop = gr.Dropdown(["Option 1", "Option 2", "Option 3"], show_label=False)
-            drop_2 = gr.Dropdown(
-                ["Option A", "Option B", "Option C"],
-                multiselect=True,
-                value=["Option A"],
-                label="Dropdown",
-                interactive=True,
-            )
-            check = gr.Checkbox(label="Go")
-        with gr.Column(variant="panel", scale=2):
-            img = gr.Image(
-                "https://gradio.app/assets/img/header-image.jpg", label="Image"
-            ).style(height=320)
-            with gr.Row():
-                go_btn = gr.Button("Go", label="Primary Button", variant="primary")
-                clear_btn = gr.Button(
-                    "Clear", label="Secondary Button", variant="secondary"
-                )
-
-                def go(*args):
-                    time.sleep(3)
-                    return "https://gradio.app/assets/img/header-image.jpg"
-
-                go_btn.click(go, [radio, drop, drop_2, check, name], img, api_name="go")
-
-                def clear():
-                    time.sleep(0.2)
-                    return None
-
-                clear_btn.click(clear, None, img)
-
-            with gr.Row():
-                btn1 = gr.Button("Button 1").style(size="sm")
-                btn2 = gr.UploadButton().style(size="sm")
-                stop_btn = gr.Button("Stop", label="Stop Button", variant="stop").style(
-                    size="sm"
-                )
-
-    with gr.Row():
-        gr.Dataframe(value=[[1, 2, 3], [4, 5, 6], [7, 8, 9]], label="Dataframe")
-        gr.JSON(
-            value={"a": 1, "b": 2, "c": {"test": "a", "test2": [1, 2, 3]}}, label="JSON"
+class StorjTheme(Base):
+    def __init__(
+        self,
+        *,
+        primary_hue: colors.Color | str = colors.blue,
+        secondary_hue: colors.Color | str = colors.cyan,
+        neutral_hue: colors.Color | str = colors.gray,
+        spacing_size: sizes.Size | str = sizes.spacing_md,
+        radius_size: sizes.Size | str = sizes.radius_md,
+        text_size: sizes.Size | str = sizes.text_lg,
+        font: fonts.Font
+        | str
+        | Iterable[fonts.Font | str] = (
+            fonts.GoogleFont("Montserrat"),
+            "ui-sans-serif",
+            "sans-serif",
+        ),
+        font_mono: fonts.Font
+        | str
+        | Iterable[fonts.Font | str] = (
+            fonts.GoogleFont("Roboto"),
+            "ui-monospace",
+            "monospace",
+        ),
+    ):
+        super().__init__(
+            primary_hue=primary_hue,
+            secondary_hue=secondary_hue,
+            neutral_hue=neutral_hue,
+            spacing_size=spacing_size,
+            radius_size=radius_size,
+            text_size=text_size,
+            font=font,
+            font_mono=font_mono,
         )
-        gr.Label(value={"cat": 0.7, "dog": 0.2, "fish": 0.1})
-        gr.File()
-    with gr.Row():
-        gr.ColorPicker()
-        gr.Video("https://gradio-static-files.s3.us-west-2.amazonaws.com/world.mp4")
-        gr.Gallery(
-            [
-                (
-                    "https://gradio-static-files.s3.us-west-2.amazonaws.com/lion.jpg",
-                    "lion",
-                ),
-                (
-                    "https://gradio-static-files.s3.us-west-2.amazonaws.com/logo.png",
-                    "logo",
-                ),
-                (
-                    "https://gradio-static-files.s3.us-west-2.amazonaws.com/tower.jpg",
-                    "tower",
-                ),
-            ]
-        ).style(height="200px", grid=2)
 
-    with gr.Row():
-        with gr.Column(scale=2):
-            chatbot = gr.Chatbot([("Hello", "Hi")], label="Chatbot")
-            chat_btn = gr.Button("Add messages")
+storj_theme = StorjTheme()
 
-            def chat(history):
-                time.sleep(2)
-                yield [["How are you?", "I am good."]]
-
-            chat_btn.click(
-                lambda history: history
-                + [["How are you?", "I am good."]]
-                + (time.sleep(2) or []),
-                chatbot,
-                chatbot,
-            )
-        with gr.Column(scale=1):
-            with gr.Accordion("Advanced Settings"):
-                gr.Markdown("Hello")
-                gr.Number(label="Chatbot control 1")
-                gr.Number(label="Chatbot control 2")
-                gr.Number(label="Chatbot control 3")
+with gr.Blocks(theme=storj_theme) as demo:
+    textbox = gr.Textbox(label="Name")
+    slider = gr.Slider(label="Count", minimum=0, maximum=100, step=1)
+    with gr.Row():
+        button = gr.Button("Submit", variant="primary")
+        clear = gr.Button("Clear")
+    output = gr.Textbox(label="Output")
 
+    def repeat(name, count):
+        time.sleep(3)
+        return name * count
 
-if __name__ == "__main__":
-    demo.queue().launch()
+    button.click(repeat, [textbox, slider], output)