Merge branch 'main' into fix-video-filename-issue

.changeset/busy-wolves-joke.md

@@ -0,0 +1,5 @@
+---
+"gradio": minor
+---
+
+feat:Lazy-import altair

.changeset/clever-masks-melt.md

@@ -0,0 +1,6 @@
+---
+"gradio": patch
+"gradio_client": patch
+---
+
+feat:Small fix to client.view_api() in the case of default file values

.changeset/old-dolls-pump.md

@@ -0,0 +1,5 @@
+---
+"gradio": patch
+---
+
+feat:Decrease latency: do not run pre and postprocess in threadpool

.changeset/ripe-coins-poke.md

@@ -0,0 +1,5 @@
+---
+"gradio": patch
+---
+
+fix:Fix root url resolution from `x_forwarded_host` headers

.changeset/two-suns-trade.md

@@ -0,0 +1,5 @@
+---
+"gradio": patch
+---
+
+fix:Adds trigger_mode to gr.on. Use it to set trigger_model="always_last" for live interfaces.

.changeset/upset-pens-tie.md

@@ -0,0 +1,6 @@
+---
+"gradio": minor
+"website": minor
+---
+
+feat:Convert Docs Demos to Lite

.changeset/whole-jokes-drum.md

@@ -0,0 +1,6 @@
+---
+"@gradio/wasm": patch
+"gradio": patch
+---
+
+feat:Remove the aiohttp mock from the Wasm worker as it's removed in https://github.com/gradio-app/gradio/pull/5244

client/python/gradio_client/client.py

@@ -679,10 +679,15 @@ def _render_endpoints_info(
                     else ""
                 )
                 default_value = info.get("parameter_default")
+                default_value = utils.traverse(
+                    default_value,
+                    lambda x: f"file(\"{x['url']}\")",
+                    utils.is_file_obj_with_meta,
+                )
                 default_info = (
                     "(required)"
                     if not info.get("parameter_has_default", False)
-                    else f"(not required, defaults to {default_value})"
+                    else f"(not required, defaults to:   {default_value})"
                 )
                 type_ = info["python_type"]["type"]
                 if info.get("parameter_has_default", False) and default_value is None:

demo/chatbot_multimodal/run.ipynb

@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: chatbot_multimodal"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "os.mkdir('files')\n", "!wget -q -O files/avatar.png https://github.com/gradio-app/gradio/raw/main/demo/chatbot_multimodal/files/avatar.png\n", "!wget -q -O files/lion.jpg https://github.com/gradio-app/gradio/raw/main/demo/chatbot_multimodal/files/lion.jpg"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import os\n", "import time\n", "\n", "# Chatbot demo with multimodal input (text, markdown, LaTeX, code blocks, image, audio, & video). Plus shows support for streaming text.\n", "\n", "\n", "def print_like_dislike(x: gr.LikeData):\n", "    print(x.index, x.value, x.liked)\n", "\n", "def add_message(history, message):\n", "    for x in message[\"files\"]:\n", "        history.append(((x,), None))\n", "    if message[\"text\"] is not None:\n", "        history.append((message[\"text\"], None))\n", "    return history, gr.MultimodalTextbox(value=None, interactive=False)\n", "\n", "def bot(history):\n", "    response = \"**That's cool!**\"\n", "    history[-1][1] = \"\"\n", "    for character in response:\n", "        history[-1][1] += character\n", "        time.sleep(0.05)\n", "        yield history\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    chatbot = gr.Chatbot(\n", "        [],\n", "        elem_id=\"chatbot\",\n", "        bubble_full_width=False,\n", "        avatar_images=(None, (os.path.join(os.path.abspath(''), \"files/avatar.png\"))),\n", "    )\n", "\n", "    chat_input = gr.MultimodalTextbox(interactive=True, file_types=[\"image\"], placeholder=\"Enter message or upload file...\", show_label=False)\n", "\n", "    chat_msg = chat_input.submit(add_message, [chatbot, chat_input], [chatbot, chat_input])\n", "    bot_msg = chat_msg.then(bot, chatbot, chatbot, api_name=\"bot_response\")\n", "    bot_msg.then(lambda: gr.MultimodalTextbox(interactive=True), None, [chat_input])\n", "\n", "    chatbot.like(print_like_dislike, None, None)\n", "\n", "demo.queue()\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
+{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: chatbot_multimodal"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "os.mkdir('files')\n", "!wget -q -O files/avatar.png https://github.com/gradio-app/gradio/raw/main/demo/chatbot_multimodal/files/avatar.png\n", "!wget -q -O files/lion.jpg https://github.com/gradio-app/gradio/raw/main/demo/chatbot_multimodal/files/lion.jpg"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import os\n", "import time\n", "\n", "# Chatbot demo with multimodal input (text, markdown, LaTeX, code blocks, image, audio, & video). Plus shows support for streaming text.\n", "\n", "\n", "def print_like_dislike(x: gr.LikeData):\n", "    print(x.index, x.value, x.liked)\n", "\n", "def add_message(history, message):\n", "    for x in message[\"files\"]:\n", "        history.append(((x,), None))\n", "    if message[\"text\"] is not None:\n", "        history.append((message[\"text\"], None))\n", "    return history, gr.MultimodalTextbox(value=None, interactive=False)\n", "\n", "def bot(history):\n", "    response = \"**That's cool!**\"\n", "    history[-1][1] = \"\"\n", "    for character in response:\n", "        history[-1][1] += character\n", "        time.sleep(0.05)\n", "        yield history\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    chatbot = gr.Chatbot(\n", "        [],\n", "        elem_id=\"chatbot\",\n", "        bubble_full_width=False,\n", "    )\n", "\n", "    chat_input = gr.MultimodalTextbox(interactive=True, file_types=[\"image\"], placeholder=\"Enter message or upload file...\", show_label=False)\n", "\n", "    chat_msg = chat_input.submit(add_message, [chatbot, chat_input], [chatbot, chat_input])\n", "    bot_msg = chat_msg.then(bot, chatbot, chatbot, api_name=\"bot_response\")\n", "    bot_msg.then(lambda: gr.MultimodalTextbox(interactive=True), None, [chat_input])\n", "\n", "    chatbot.like(print_like_dislike, None, None)\n", "\n", "demo.queue()\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}

demo/chatbot_multimodal/run.py

@@ -29,7 +29,6 @@ def bot(history):
         [],
         elem_id="chatbot",
         bubble_full_width=False,
-        avatar_images=(None, (os.path.join(os.path.dirname(__file__), "files/avatar.png"))),
     )
 
     chat_input = gr.MultimodalTextbox(interactive=True, file_types=["image"], placeholder="Enter message or upload file...", show_label=False)

demo/color_picker/run.ipynb

@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: color_picker"]}, {"cell_type": "code", "execution_count": null, "id": "272996653310673477252411125948039410165", "metadata": {}, "outputs": [], "source": ["!pip install -q gradio Pillow"]}, {"cell_type": "code", "execution_count": null, "id": "288918539441861185822528903084949547379", "metadata": {}, "outputs": [], "source": ["# Downloading files from the demo repo\n", "import os\n", "!wget -q https://github.com/gradio-app/gradio/raw/main/demo/color_picker/rabbit.png"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import numpy as np\n", "import os\n", "from PIL import Image, ImageColor\n", "\n", "\n", "def change_color(icon, color):\n", "\n", "    \"\"\"\n", "    Function that given an icon in .png format changes its color\n", "    Args:\n", "        icon: Icon whose color needs to be changed.\n", "        color: Chosen color with which to edit the input icon.\n", "    Returns:\n", "        edited_image: Edited icon.\n", "    \"\"\"\n", "    img = icon.convert(\"LA\")\n", "    img = img.convert(\"RGBA\")\n", "    image_np = np.array(icon)\n", "    _, _, _, alpha = image_np.T\n", "    mask = alpha > 0\n", "    image_np[..., :-1][mask.T] = ImageColor.getcolor(color, \"RGB\")\n", "    edited_image = Image.fromarray(image_np)\n", "    return edited_image\n", "\n", "\n", "inputs = [\n", "    gr.Image(label=\"icon\", type=\"pil\", image_mode=\"RGBA\"),\n", "    gr.ColorPicker(label=\"color\"),\n", "]\n", "outputs = gr.Image(label=\"colored icon\")\n", "\n", "demo = gr.Interface(\n", "    fn=change_color,\n", "    inputs=inputs,\n", "    outputs=outputs,\n", "    examples=[\n", "        [os.path.join(os.path.abspath(''), \"rabbit.png\"), \"#ff0000\"],\n", "        [os.path.join(os.path.abspath(''), \"rabbit.png\"), \"#0000FF\"],\n", "    ],\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: color_picker"]}, {"cell_type": "code", "execution_count": null, "id": "272996653310673477252411125948039410165", "metadata": {}, "outputs": [], "source": ["!pip install -q gradio Pillow"]}, {"cell_type": "code", "execution_count": null, "id": "288918539441861185822528903084949547379", "metadata": {}, "outputs": [], "source": ["# Downloading files from the demo repo\n", "import os\n", "!wget -q https://github.com/gradio-app/gradio/raw/main/demo/color_picker/rabbit.png"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import numpy as np\n", "import os\n", "from PIL import Image, ImageColor\n", "\n", "\n", "def change_color(icon, color):\n", "\n", "    \"\"\"\n", "    Function that given an icon in .png format changes its color\n", "    Args:\n", "        icon: Icon whose color needs to be changed.\n", "        color: Chosen color with which to edit the input icon.\n", "    Returns:\n", "        edited_image: Edited icon.\n", "    \"\"\"\n", "    img = icon.convert(\"LA\")\n", "    img = img.convert(\"RGBA\")\n", "    image_np = np.array(icon)\n", "    _, _, _, alpha = image_np.T\n", "    mask = alpha > 0\n", "    image_np[..., :-1][mask.T] = ImageColor.getcolor(color, \"RGB\")\n", "    edited_image = Image.fromarray(image_np)\n", "    return edited_image\n", "\n", "\n", "inputs = [\n", "    gr.Image(label=\"icon\", type=\"pil\", image_mode=\"RGBA\"),\n", "    gr.ColorPicker(label=\"color\"),\n", "]\n", "outputs = gr.Image(label=\"colored icon\")\n", "\n", "demo = gr.Interface(\n", "    fn=change_color,\n", "    inputs=inputs,\n", "    outputs=outputs\n", ")\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}

demo/color_picker/run.py

@@ -33,11 +33,7 @@ def change_color(icon, color):
 demo = gr.Interface(
     fn=change_color,
     inputs=inputs,
-    outputs=outputs,
-    examples=[
-        [os.path.join(os.path.dirname(__file__), "rabbit.png"), "#ff0000"],
-        [os.path.join(os.path.dirname(__file__), "rabbit.png"), "#0000FF"],
-    ],
+    outputs=outputs
 )
 
 if __name__ == "__main__":

demo/reverse_audio/run.ipynb

@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: reverse_audio"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "os.mkdir('audio')\n", "!wget -q -O audio/cantina.wav https://github.com/gradio-app/gradio/raw/main/demo/reverse_audio/audio/cantina.wav\n", "!wget -q -O audio/recording1.wav https://github.com/gradio-app/gradio/raw/main/demo/reverse_audio/audio/recording1.wav"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import os\n", "\n", "import numpy as np\n", "\n", "import gradio as gr\n", "\n", "\n", "def reverse_audio(audio):\n", "    sr, data = audio\n", "    return (sr, np.flipud(data))\n", "\n", "\n", "input_audio = gr.Audio(\n", "    sources=[\"microphone\"],\n", "    waveform_options=gr.WaveformOptions(\n", "        waveform_color=\"#01C6FF\",\n", "        waveform_progress_color=\"#0066B4\",\n", "        skip_length=2,\n", "        show_controls=False,\n", "    ),\n", ")\n", "demo = gr.Interface(\n", "    fn=reverse_audio,\n", "    inputs=input_audio,\n", "    outputs=\"audio\",\n", "    examples=[\n", "        \"https://samplelib.com/lib/preview/mp3/sample-3s.mp3\",\n", "        os.path.join(os.path.abspath(''), \"audio/recording1.wav\"),\n", "    ],\n", "    cache_examples=True,\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: reverse_audio"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "os.mkdir('audio')\n", "!wget -q -O audio/cantina.wav https://github.com/gradio-app/gradio/raw/main/demo/reverse_audio/audio/cantina.wav\n", "!wget -q -O audio/recording1.wav https://github.com/gradio-app/gradio/raw/main/demo/reverse_audio/audio/recording1.wav"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import os\n", "\n", "import numpy as np\n", "\n", "import gradio as gr\n", "\n", "\n", "def reverse_audio(audio):\n", "    sr, data = audio\n", "    return (sr, np.flipud(data))\n", "\n", "\n", "input_audio = gr.Audio(\n", "    sources=[\"microphone\"],\n", "    waveform_options=gr.WaveformOptions(\n", "        waveform_color=\"#01C6FF\",\n", "        waveform_progress_color=\"#0066B4\",\n", "        skip_length=2,\n", "        show_controls=False,\n", "    ),\n", ")\n", "demo = gr.Interface(\n", "    fn=reverse_audio,\n", "    inputs=input_audio,\n", "    outputs=\"audio\"\n", ")\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}

demo/reverse_audio/run.py

@@ -22,12 +22,7 @@ def reverse_audio(audio):
 demo = gr.Interface(
     fn=reverse_audio,
     inputs=input_audio,
-    outputs="audio",
-    examples=[
-        "https://samplelib.com/lib/preview/mp3/sample-3s.mp3",
-        os.path.join(os.path.dirname(__file__), "audio/recording1.wav"),
-    ],
-    cache_examples=True,
+    outputs="audio"
 )
 
 if __name__ == "__main__":

demo/sort_records/run.ipynb

@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: sort_records"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "!wget -q https://github.com/gradio-app/gradio/raw/main/demo/sort_records/polars_sort.csv"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import os\n", "\n", "def sort_records(records):\n", "    return records.sort(\"Quantity\")\n", "\n", "demo = gr.Interface(\n", "    sort_records,\n", "    gr.Dataframe(\n", "        headers=[\"Item\", \"Quantity\"],\n", "        datatype=[\"str\", \"number\"],\n", "        row_count=3,\n", "        col_count=(2, \"fixed\"),\n", "        type=\"polars\"\n", "    ),\n", "    \"dataframe\",\n", "    description=\"Sort by Quantity\",\n", "    examples=[\n", "        [os.path.join(os.path.abspath(''), \"polars_sort.csv\")],\n", "    ],\n", ")\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
+{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: sort_records"]}, {"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": ["# Downloading files from the demo repo\n", "import os\n", "!wget -q https://github.com/gradio-app/gradio/raw/main/demo/sort_records/polars_sort.csv"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "import os\n", "\n", "def sort_records(records):\n", "    return records.sort(\"Quantity\")\n", "\n", "demo = gr.Interface(\n", "    sort_records,\n", "    gr.Dataframe(\n", "        headers=[\"Item\", \"Quantity\"],\n", "        datatype=[\"str\", \"number\"],\n", "        row_count=3,\n", "        col_count=(2, \"fixed\"),\n", "        type=\"polars\"\n", "    ),\n", "    \"dataframe\",\n", "    description=\"Sort by Quantity\"\n", ")\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}

demo/sort_records/run.py

@@ -14,10 +14,7 @@ def sort_records(records):
         type="polars"
     ),
     "dataframe",
-    description="Sort by Quantity",
-    examples=[
-        [os.path.join(os.path.dirname(__file__), "polars_sort.csv")],
-    ],
+    description="Sort by Quantity"
 )
 
 if __name__ == "__main__":