Removing .update and get_config, attempt 2 (#5240)

* changes * add changeset * changes * changes * Update many-tips-create.md * notebooks * chanegs * changes * changes * changes * changes * changes * changes * changes * changes * changes * changes * changew * changes * changes * changes * changes * chanegs * changes * changes * changes * changes * changes * changes * changes * changes * changes * changes * changes * changes * changes * Revert "changes" This reverts commit 0868c25. * changes * changes * changes * changes * changes * changes * change * changes * chaneges * changes * chagnes * changes * changes * changes * changes * changes * fix typing * changes --------- Co-authored-by: gradio-pr-bot <[email protected]> Co-authored-by: Abubakar Abid <[email protected]> Co-authored-by: Ali Abdalla <[email protected]>
gradio-app · Sep 19, 2023 · da05e59 · da05e59
1 parent ab2f9e0
commit da05e59
Show file tree

Hide file tree

Showing 101 changed files with 2,797 additions and 1,665 deletions.
diff --git a/.changeset/many-tips-create.md b/.changeset/many-tips-create.md
@@ -0,0 +1,9 @@
+---
+"gradio": minor
+---
+
+feat:Cleanup of .update and .get_config per component
+
+get_config is removed, the config used is simply any attribute that is in the Block that shares a name with one of the constructor paramaters.
+
+update is not removed for backwards compatibility, but deprecated. Instead return the component itself. Created a updateable decorator that simply checks to see if we're in an update, and if so, skips the constructor and wraps the args and kwargs in an update dictionary. easy peasy.
diff --git a/demo/all_demos/image.png b/demo/all_demos/image.png
diff --git a/demo/all_demos/tmp.zip b/demo/all_demos/tmp.zip
diff --git a/demo/bar_plot/run.ipynb b/demo/bar_plot/run.ipynb
@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": 302934307671667531413257853548643485645, "metadata": {}, "source": ["# Gradio Demo: bar_plot"]}, {"cell_type": "code", "execution_count": null, "id": 272996653310673477252411125948039410165, "metadata": {}, "outputs": [], "source": ["!pip install -q gradio pandas"]}, {"cell_type": "code", "execution_count": null, "id": 288918539441861185822528903084949547379, "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import pandas as pd\n", "import random\n", "\n", "simple = pd.DataFrame(\n", "    {\n", "        \"a\": [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\", \"I\"],\n", "        \"b\": [28, 55, 43, 91, 81, 53, 19, 87, 52],\n", "    }\n", ")\n", "\n", "fake_barley = pd.DataFrame(\n", "    {\n", "        \"site\": [\n", "            random.choice(\n", "                [\n", "                    \"University Farm\",\n", "                    \"Waseca\",\n", "                    \"Morris\",\n", "                    \"Crookston\",\n", "                    \"Grand Rapids\",\n", "                    \"Duluth\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "        \"yield\": [random.randint(25, 75) for _ in range(120)],\n", "        \"variety\": [\n", "            random.choice(\n", "                [\n", "                    \"Manchuria\",\n", "                    \"Wisconsin No. 38\",\n", "                    \"Glabron\",\n", "                    \"No. 457\",\n", "                    \"No. 462\",\n", "                    \"No. 475\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "        \"year\": [\n", "            random.choice(\n", "                [\n", "                    \"1931\",\n", "                    \"1932\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "    }\n", ")\n", "\n", "\n", "def bar_plot_fn(display):\n", "    if display == \"simple\":\n", "        return gr.BarPlot.update(\n", "            simple,\n", "            x=\"a\",\n", "            y=\"b\",\n", "            title=\"Simple Bar Plot with made up data\",\n", "            tooltip=[\"a\", \"b\"],\n", "            y_lim=[20, 100],\n", "        )\n", "    elif display == \"stacked\":\n", "        return gr.BarPlot.update(\n", "            fake_barley,\n", "            x=\"variety\",\n", "            y=\"yield\",\n", "            color=\"site\",\n", "            title=\"Barley Yield Data\",\n", "            tooltip=[\"variety\", \"site\"],\n", "        )\n", "    elif display == \"grouped\":\n", "        return gr.BarPlot.update(\n", "            fake_barley.astype({\"year\": str}),\n", "            x=\"year\",\n", "            y=\"yield\",\n", "            color=\"year\",\n", "            group=\"site\",\n", "            title=\"Barley Yield by Year and Site\",\n", "            group_title=\"\",\n", "            tooltip=[\"yield\", \"site\", \"year\"],\n", "        )\n", "    elif display == \"simple-horizontal\":\n", "        return gr.BarPlot.update(\n", "            simple,\n", "            x=\"a\",\n", "            y=\"b\",\n", "            x_title=\"Variable A\",\n", "            y_title=\"Variable B\",\n", "            title=\"Simple Bar Plot with made up data\",\n", "            tooltip=[\"a\", \"b\"],\n", "            vertical=False,\n", "            y_lim=[20, 100],\n", "        )\n", "    elif display == \"stacked-horizontal\":\n", "        return gr.BarPlot.update(\n", "            fake_barley,\n", "            x=\"variety\",\n", "            y=\"yield\",\n", "            color=\"site\",\n", "            title=\"Barley Yield Data\",\n", "            vertical=False,\n", "            tooltip=[\"variety\", \"site\"],\n", "        )\n", "    elif display == \"grouped-horizontal\":\n", "        return gr.BarPlot.update(\n", "            fake_barley.astype({\"year\": str}),\n", "            x=\"year\",\n", "            y=\"yield\",\n", "            color=\"year\",\n", "            group=\"site\",\n", "            title=\"Barley Yield by Year and Site\",\n", "            group_title=\"\",\n", "            tooltip=[\"yield\", \"site\", \"year\"],\n", "            vertical=False,\n", "        )\n", "\n", "\n", "with gr.Blocks() as bar_plot:\n", "    with gr.Row():\n", "        with gr.Column():\n", "            display = gr.Dropdown(\n", "                choices=[\n", "                    \"simple\",\n", "                    \"stacked\",\n", "                    \"grouped\",\n", "                    \"simple-horizontal\",\n", "                    \"stacked-horizontal\",\n", "                    \"grouped-horizontal\",\n", "                ],\n", "                value=\"simple\",\n", "                label=\"Type of Bar Plot\",\n", "            )\n", "        with gr.Column():\n", "            plot = gr.BarPlot()\n", "    display.change(bar_plot_fn, inputs=display, outputs=plot)\n", "    bar_plot.load(fn=bar_plot_fn, inputs=display, outputs=plot)\n", "\n", "bar_plot.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
+{"cells": [{"cell_type": "markdown", "id": 302934307671667531413257853548643485645, "metadata": {}, "source": ["# Gradio Demo: bar_plot"]}, {"cell_type": "code", "execution_count": null, "id": 272996653310673477252411125948039410165, "metadata": {}, "outputs": [], "source": ["!pip install -q gradio pandas"]}, {"cell_type": "code", "execution_count": null, "id": 288918539441861185822528903084949547379, "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import pandas as pd\n", "import random\n", "\n", "simple = pd.DataFrame(\n", "    {\n", "        \"a\": [\"A\", \"B\", \"C\", \"D\", \"E\", \"F\", \"G\", \"H\", \"I\"],\n", "        \"b\": [28, 55, 43, 91, 81, 53, 19, 87, 52],\n", "    }\n", ")\n", "\n", "fake_barley = pd.DataFrame(\n", "    {\n", "        \"site\": [\n", "            random.choice(\n", "                [\n", "                    \"University Farm\",\n", "                    \"Waseca\",\n", "                    \"Morris\",\n", "                    \"Crookston\",\n", "                    \"Grand Rapids\",\n", "                    \"Duluth\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "        \"yield\": [random.randint(25, 75) for _ in range(120)],\n", "        \"variety\": [\n", "            random.choice(\n", "                [\n", "                    \"Manchuria\",\n", "                    \"Wisconsin No. 38\",\n", "                    \"Glabron\",\n", "                    \"No. 457\",\n", "                    \"No. 462\",\n", "                    \"No. 475\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "        \"year\": [\n", "            random.choice(\n", "                [\n", "                    \"1931\",\n", "                    \"1932\",\n", "                ]\n", "            )\n", "            for _ in range(120)\n", "        ],\n", "    }\n", ")\n", "\n", "\n", "def bar_plot_fn(display):\n", "    if display == \"simple\":\n", "        return gr.BarPlot(\n", "            simple,\n", "            x=\"a\",\n", "            y=\"b\",\n", "            title=\"Simple Bar Plot with made up data\",\n", "            tooltip=[\"a\", \"b\"],\n", "            y_lim=[20, 100],\n", "        )\n", "    elif display == \"stacked\":\n", "        return gr.BarPlot(\n", "            fake_barley,\n", "            x=\"variety\",\n", "            y=\"yield\",\n", "            color=\"site\",\n", "            title=\"Barley Yield Data\",\n", "            tooltip=[\"variety\", \"site\"],\n", "        )\n", "    elif display == \"grouped\":\n", "        return gr.BarPlot(\n", "            fake_barley.astype({\"year\": str}),\n", "            x=\"year\",\n", "            y=\"yield\",\n", "            color=\"year\",\n", "            group=\"site\",\n", "            title=\"Barley Yield by Year and Site\",\n", "            group_title=\"\",\n", "            tooltip=[\"yield\", \"site\", \"year\"],\n", "        )\n", "    elif display == \"simple-horizontal\":\n", "        return gr.BarPlot(\n", "            simple,\n", "            x=\"a\",\n", "            y=\"b\",\n", "            x_title=\"Variable A\",\n", "            y_title=\"Variable B\",\n", "            title=\"Simple Bar Plot with made up data\",\n", "            tooltip=[\"a\", \"b\"],\n", "            vertical=False,\n", "            y_lim=[20, 100],\n", "        )\n", "    elif display == \"stacked-horizontal\":\n", "        return gr.BarPlot(\n", "            fake_barley,\n", "            x=\"variety\",\n", "            y=\"yield\",\n", "            color=\"site\",\n", "            title=\"Barley Yield Data\",\n", "            vertical=False,\n", "            tooltip=[\"variety\", \"site\"],\n", "        )\n", "    elif display == \"grouped-horizontal\":\n", "        return gr.BarPlot(\n", "            fake_barley.astype({\"year\": str}),\n", "            x=\"year\",\n", "            y=\"yield\",\n", "            color=\"year\",\n", "            group=\"site\",\n", "            title=\"Barley Yield by Year and Site\",\n", "            group_title=\"\",\n", "            tooltip=[\"yield\", \"site\", \"year\"],\n", "            vertical=False,\n", "        )\n", "\n", "\n", "with gr.Blocks() as bar_plot:\n", "    with gr.Row():\n", "        with gr.Column():\n", "            display = gr.Dropdown(\n", "                choices=[\n", "                    \"simple\",\n", "                    \"stacked\",\n", "                    \"grouped\",\n", "                    \"simple-horizontal\",\n", "                    \"stacked-horizontal\",\n", "                    \"grouped-horizontal\",\n", "                ],\n", "                value=\"simple\",\n", "                label=\"Type of Bar Plot\",\n", "            )\n", "        with gr.Column():\n", "            plot = gr.BarPlot()\n", "    display.change(bar_plot_fn, inputs=display, outputs=plot)\n", "    bar_plot.load(fn=bar_plot_fn, inputs=display, outputs=plot)\n", "\n", "bar_plot.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
diff --git a/demo/bar_plot/run.py b/demo/bar_plot/run.py
@@ -53,7 +53,7 @@
 
 def bar_plot_fn(display):
     if display == "simple":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             simple,
             x="a",
             y="b",
@@ -62,7 +62,7 @@ def bar_plot_fn(display):
             y_lim=[20, 100],
         )
     elif display == "stacked":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             fake_barley,
             x="variety",
             y="yield",
@@ -71,7 +71,7 @@ def bar_plot_fn(display):
             tooltip=["variety", "site"],
         )
     elif display == "grouped":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             fake_barley.astype({"year": str}),
             x="year",
             y="yield",
@@ -82,7 +82,7 @@ def bar_plot_fn(display):
             tooltip=["yield", "site", "year"],
         )
     elif display == "simple-horizontal":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             simple,
             x="a",
             y="b",
@@ -94,7 +94,7 @@ def bar_plot_fn(display):
             y_lim=[20, 100],
         )
     elif display == "stacked-horizontal":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             fake_barley,
             x="variety",
             y="yield",
@@ -104,7 +104,7 @@ def bar_plot_fn(display):
             tooltip=["variety", "site"],
         )
     elif display == "grouped-horizontal":
-        return gr.BarPlot.update(
+        return gr.BarPlot(
             fake_barley.astype({"year": str}),
             x="year",
             y="yield",

diff --git a/demo/blocks_essay/run.ipynb b/demo/blocks_essay/run.ipynb
@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": 302934307671667531413257853548643485645, "metadata": {}, "source": ["# Gradio Demo: blocks_essay"]}, {"cell_type": "code", "execution_count": null, "id": 272996653310673477252411125948039410165, "metadata": {}, "outputs": [], "source": ["!pip install -q gradio "]}, {"cell_type": "code", "execution_count": null, "id": 288918539441861185822528903084949547379, "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "\n", "\n", "def change_textbox(choice):\n", "    if choice == \"short\":\n", "        return gr.Textbox.update(lines=2, visible=True)\n", "    elif choice == \"long\":\n", "        return gr.Textbox.update(lines=8, visible=True)\n", "    else:\n", "        return gr.Textbox.update(visible=False)\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    radio = gr.Radio(\n", "        [\"short\", \"long\", \"none\"], label=\"What kind of essay would you like to write?\"\n", "    )\n", "    text = gr.Textbox(lines=2, interactive=True, show_copy_button=True)\n", "\n", "    radio.change(fn=change_textbox, inputs=radio, outputs=text)\n", "\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
+{"cells": [{"cell_type": "markdown", "id": 302934307671667531413257853548643485645, "metadata": {}, "source": ["# Gradio Demo: blocks_essay"]}, {"cell_type": "code", "execution_count": null, "id": 272996653310673477252411125948039410165, "metadata": {}, "outputs": [], "source": ["!pip install -q gradio "]}, {"cell_type": "code", "execution_count": null, "id": 288918539441861185822528903084949547379, "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "\n", "\n", "def change_textbox(choice):\n", "    if choice == \"short\":\n", "        return gr.Textbox(lines=2, visible=True)\n", "    elif choice == \"long\":\n", "        return gr.Textbox(lines=8, visible=True, value=\"Lorem ipsum dolor sit amet\")\n", "    else:\n", "        return gr.Textbox(visible=False)\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    radio = gr.Radio(\n", "        [\"short\", \"long\", \"none\"], label=\"What kind of essay would you like to write?\"\n", "    )\n", "    text = gr.Textbox(lines=2, interactive=True, show_copy_button=True)\n", "    radio.change(fn=change_textbox, inputs=radio, outputs=text)\n", "\n", "    with gr.Row():\n", "        num = gr.Number(minimum=0, maximum=100, label=\"input\")\n", "        out = gr.Number(label=\"output\")\n", "    min = gr.Slider(0, 100, 0, label=\"min\")\n", "    max = gr.Slider(0, 100, 100, label=\"max\")\n", "\n", "    def reset_bounds(min, max):\n", "        return gr.Number(minimum=min, maximum=max)\n", "    \n", "    min.change(reset_bounds, [min, max], outputs=num)\n", "    max.change(reset_bounds, [min, max], outputs=num)\n", "    num.submit(lambda x:x, num, out)\n", "\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
diff --git a/demo/blocks_essay/run.py b/demo/blocks_essay/run.py
@@ -3,21 +3,33 @@
 
 def change_textbox(choice):
     if choice == "short":
-        return gr.Textbox.update(lines=2, visible=True)
+        return gr.Textbox(lines=2, visible=True)
     elif choice == "long":
-        return gr.Textbox.update(lines=8, visible=True)
+        return gr.Textbox(lines=8, visible=True, value="Lorem ipsum dolor sit amet")
     else:
-        return gr.Textbox.update(visible=False)
+        return gr.Textbox(visible=False)
 
 
 with gr.Blocks() as demo:
     radio = gr.Radio(
         ["short", "long", "none"], label="What kind of essay would you like to write?"
     )
     text = gr.Textbox(lines=2, interactive=True, show_copy_button=True)
-
     radio.change(fn=change_textbox, inputs=radio, outputs=text)
 
+    with gr.Row():
+        num = gr.Number(minimum=0, maximum=100, label="input")
+        out = gr.Number(label="output")
+    min = gr.Slider(0, 100, 0, label="min")
+    max = gr.Slider(0, 100, 100, label="max")
+
+    def reset_bounds(min, max):
+        return gr.Number(minimum=min, maximum=max)
+
+    min.change(reset_bounds, [min, max], outputs=num)
+    max.change(reset_bounds, [min, max], outputs=num)
+    num.submit(lambda x:x, num, out)
+
 
 if __name__ == "__main__":
     demo.launch()
diff --git a/demo/blocks_essay_simple/run.ipynb b/demo/blocks_essay_simple/run.ipynb
@@ -0,0 +1 @@
+{"cells": [{"cell_type": "markdown", "id": 302934307671667531413257853548643485645, "metadata": {}, "source": ["# Gradio Demo: blocks_essay_simple"]}, {"cell_type": "code", "execution_count": null, "id": 272996653310673477252411125948039410165, "metadata": {}, "outputs": [], "source": ["!pip install -q gradio "]}, {"cell_type": "code", "execution_count": null, "id": 288918539441861185822528903084949547379, "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "\n", "\n", "def change_textbox(choice):\n", "    if choice == \"short\":\n", "        return gr.Textbox(lines=2, visible=True)\n", "    elif choice == \"long\":\n", "        return gr.Textbox(lines=8, visible=True, value=\"Lorem ipsum dolor sit amet\")\n", "    else:\n", "        return gr.Textbox(visible=False)\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    radio = gr.Radio(\n", "        [\"short\", \"long\", \"none\"], label=\"What kind of essay would you like to write?\"\n", "    )\n", "    text = gr.Textbox(lines=2, interactive=True, show_copy_button=True)\n", "    radio.change(fn=change_textbox, inputs=radio, outputs=text)\n", "\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
diff --git a/demo/blocks_essay_simple/run.py b/demo/blocks_essay_simple/run.py
@@ -0,0 +1,22 @@
+import gradio as gr
+
+
+def change_textbox(choice):
+    if choice == "short":
+        return gr.Textbox(lines=2, visible=True)
+    elif choice == "long":
+        return gr.Textbox(lines=8, visible=True, value="Lorem ipsum dolor sit amet")
+    else:
+        return gr.Textbox(visible=False)
+
+
+with gr.Blocks() as demo:
+    radio = gr.Radio(
+        ["short", "long", "none"], label="What kind of essay would you like to write?"
+    )
+    text = gr.Textbox(lines=2, interactive=True, show_copy_button=True)
+    radio.change(fn=change_textbox, inputs=radio, outputs=text)
+
+
+if __name__ == "__main__":
+    demo.launch()
diff --git a/demo/blocks_essay_update/run.ipynb b/demo/blocks_essay_update/run.ipynb