Improve File Explorer performance (#7337)

* changes * add changeset * changes * changes * add changeset * changes * changes * changes * changes * changes * Update gradio/components/file_explorer.py Co-authored-by: Abubakar Abid <abubakar@huggingface.co> * Update gradio/components/file_explorer.py Co-authored-by: Abubakar Abid <abubakar@huggingface.co> * Update demo/file_explorer_component_events/run.py Co-authored-by: Abubakar Abid <abubakar@huggingface.co> * changes * changes * changes --------- Co-authored-by: Ali Abid <aliabid94@gmail.com> Co-authored-by: gradio-pr-bot <gradio-pr-bot@users.noreply.github.com> Co-authored-by: Abubakar Abid <abubakar@huggingface.co>
gradio-app · Feb 13, 2024 · 65437ce · 65437ce
1 parent 547517b
commit 65437ce
Show file tree

Hide file tree

Showing 19 changed files with 250 additions and 748 deletions.
diff --git a/.changeset/chatty-rules-press.md b/.changeset/chatty-rules-press.md
@@ -0,0 +1,6 @@
+---
+"@gradio/fileexplorer": patch
+"gradio": patch
+---
+
+fix:Improve File Explorer performance
diff --git a/demo/file_explorer/run.ipynb b/demo/file_explorer/run.ipynb
@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: file_explorer"]}, {"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", "from pathlib import Path\n", "\n", "current_file_path = Path(__file__).resolve()\n", "relative_path = \"path/to/file\"\n", "absolute_path = (current_file_path.parent / \"..\" / \"..\" / \"gradio\").resolve()\n", "\n", "\n", "def get_file_content(file):\n", "    return (file,)\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    gr.Markdown('### `FileExplorer` to `FileExplorer` -- `file_count=\"multiple\"`')\n", "    submit_btn = gr.Button(\"Select\")\n", "    with gr.Row():\n", "        file = gr.FileExplorer(\n", "            glob=\"**/{components,themes}/*.py\",\n", "            # value=[\"themes/utils\"],\n", "            root=absolute_path,\n", "            ignore_glob=\"**/__init__.py\",\n", "        )\n", "\n", "        file2 = gr.FileExplorer(\n", "            glob=\"**/{components,themes}/**/*.py\",\n", "            root=absolute_path,\n", "            ignore_glob=\"**/__init__.py\",\n", "        )\n", "    submit_btn.click(lambda x: x, file, file2)\n", "\n", "    gr.Markdown(\"---\")\n", "    gr.Markdown('### `FileExplorer` to `Code` -- `file_count=\"single\"`')\n", "    with gr.Group():\n", "        with gr.Row():\n", "            file_3 = gr.FileExplorer(\n", "                scale=1,\n", "                glob=\"**/{components,themes}/**/*.py\",\n", "                value=[\"themes/utils\"],\n", "                file_count=\"single\",\n", "                root=absolute_path,\n", "                ignore_glob=\"**/__init__.py\",\n", "                elem_id=\"file\",\n", "            )\n", "\n", "            code = gr.Code(lines=30, scale=2, language=\"python\")\n", "\n", "    file_3.change(get_file_content, file_3, code)\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: file_explorer"]}, {"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", "from pathlib import Path\n", "\n", "current_file_path = Path(__file__).resolve()\n", "relative_path = \"path/to/file\"\n", "absolute_path = (current_file_path.parent / \"..\" / \"..\" / \"gradio\").resolve()\n", "\n", "\n", "def get_file_content(file):\n", "    return (file,)\n", "\n", "\n", "with gr.Blocks() as demo:\n", "    gr.Markdown('### `FileExplorer` to `FileExplorer` -- `file_count=\"multiple\"`')\n", "    submit_btn = gr.Button(\"Select\")\n", "    with gr.Row():\n", "        file = gr.FileExplorer(\n", "            glob=\"**/components/*.py\",\n", "            # value=[\"themes/utils\"],\n", "            root=absolute_path,\n", "            ignore_glob=\"**/__init__.py\",\n", "        )\n", "\n", "        file2 = gr.FileExplorer(\n", "            glob=\"**/components/**/*.py\",\n", "            root=absolute_path,\n", "            ignore_glob=\"**/__init__.py\",\n", "        )\n", "    submit_btn.click(lambda x: x, file, file2)\n", "\n", "    gr.Markdown(\"---\")\n", "    gr.Markdown('### `FileExplorer` to `Code` -- `file_count=\"single\"`')\n", "    with gr.Group():\n", "        with gr.Row():\n", "            file_3 = gr.FileExplorer(\n", "                scale=1,\n", "                glob=\"**/components/**/*.py\",\n", "                value=[\"themes/utils\"],\n", "                file_count=\"single\",\n", "                root=absolute_path,\n", "                ignore_glob=\"**/__init__.py\",\n", "                elem_id=\"file\",\n", "            )\n", "\n", "            code = gr.Code(lines=30, scale=2, language=\"python\")\n", "\n", "    file_3.change(get_file_content, file_3, code)\n", "\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
diff --git a/demo/file_explorer/run.py b/demo/file_explorer/run.py
@@ -15,14 +15,14 @@ def get_file_content(file):
     submit_btn = gr.Button("Select")
     with gr.Row():
         file = gr.FileExplorer(
-            glob="**/{components,themes}/*.py",
+            glob="**/components/*.py",
             # value=["themes/utils"],
             root=absolute_path,
             ignore_glob="**/__init__.py",
         )
 
         file2 = gr.FileExplorer(
-            glob="**/{components,themes}/**/*.py",
+            glob="**/components/**/*.py",
             root=absolute_path,
             ignore_glob="**/__init__.py",
         )
@@ -34,7 +34,7 @@ def get_file_content(file):
         with gr.Row():
             file_3 = gr.FileExplorer(
                 scale=1,
-                glob="**/{components,themes}/**/*.py",
+                glob="**/components/**/*.py",
                 value=["themes/utils"],
                 file_count="single",
                 root=absolute_path,

diff --git a/demo/file_explorer_component_events/dir3/dir3_bar.log b/demo/file_explorer_component_events/dir3/dir3_bar.log
diff --git a/demo/file_explorer_component_events/dir3/dir4/dir_4_bar.log b/demo/file_explorer_component_events/dir3/dir4/dir_4_bar.log
diff --git a/demo/file_explorer_component_events/run.ipynb b/demo/file_explorer_component_events/run.ipynb
@@ -1 +1 @@
-{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: file_explorer_component_events"]}, {"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('dir1')\n", "!wget -q -O dir1/bar.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir1/bar.txt\n", "!wget -q -O dir1/foo.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir1/foo.txt\n", "os.mkdir('dir2')\n", "!wget -q -O dir2/baz.png https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir2/baz.png\n", "!wget -q -O dir2/foo.png https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir2/foo.png\n", "os.mkdir('dir3')\n", "!wget -q -O dir3/dir3_foo.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir3/dir3_foo.txt\n", "!wget -q -O dir3/dir4 https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir3/dir4"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "from pathlib import Path\n", "\n", "base_root = Path(__file__).parent.resolve()\n", "\n", "with gr.Blocks() as demo:\n", "    with gr.Row():\n", "        dd = gr.Dropdown(label=\"Select File Explorer Root\",\n", "                        value=str(base_root / \"dir1\"),\n", "                        choices=[str(base_root / \"dir1\"), str(base_root / \"dir2\"),\n", "                                 str(base_root / \"dir3\")])\n", "        with gr.Group():\n", "            dir_only_glob = gr.Checkbox(label=\"Show only directories\", value=False)\n", "            ignore_dir_in_glob = gr.Checkbox(label=\"Ignore directories in glob\", value=False)\n", "\n", "    fe = gr.FileExplorer(root=str(base_root / \"dir1\"),\n", "                         glob=\"**/*\", interactive=True)\n", "    textbox = gr.Textbox(label=\"Selected Directory\")\n", "    run = gr.Button(\"Run\")\n", "    \n", "    dir_only_glob.select(lambda s: gr.FileExplorer(glob=\"**/\" if s else \"**/*.*\",\n", "                                                   file_count=\"multiple\",\n", "                                                   root=str(base_root / \"dir3\")) ,\n", "                         inputs=[dir_only_glob], outputs=[fe])\n", "    ignore_dir_in_glob.select(lambda s: gr.FileExplorer(glob=\"**/*\",\n", "                                                        ignore_glob=\"**/\",\n", "                                                        root=str(base_root / \"dir3\")),\n", "                            inputs=[ignore_dir_in_glob], outputs=[fe])            \n", "\n", "    dd.select(lambda s: gr.FileExplorer(root=s), inputs=[dd], outputs=[fe])\n", "    run.click(lambda s: \",\".join(s) if isinstance(s, list) else s, inputs=[fe], outputs=[textbox])\n", "\n", "    with gr.Row():\n", "        a = gr.Textbox(elem_id=\"input-box\")\n", "        a.change(lambda x: x, inputs=[a])\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: file_explorer_component_events"]}, {"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('dir1')\n", "!wget -q -O dir1/bar.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir1/bar.txt\n", "!wget -q -O dir1/foo.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir1/foo.txt\n", "os.mkdir('dir2')\n", "!wget -q -O dir2/baz.png https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir2/baz.png\n", "!wget -q -O dir2/foo.png https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir2/foo.png\n", "os.mkdir('dir3')\n", "!wget -q -O dir3/dir3_bar.log https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir3/dir3_bar.log\n", "!wget -q -O dir3/dir3_foo.txt https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir3/dir3_foo.txt\n", "!wget -q -O dir3/dir4 https://github.com/gradio-app/gradio/raw/main/demo/file_explorer_component_events/dir3/dir4"]}, {"cell_type": "code", "execution_count": null, "id": "44380577570523278879349135829904343037", "metadata": {}, "outputs": [], "source": ["import gradio as gr\n", "from pathlib import Path\n", "\n", "base_root = Path(__file__).parent.resolve()\n", "\n", "with gr.Blocks() as demo:\n", "    with gr.Row():\n", "        dd = gr.Dropdown(label=\"Select File Explorer Root\",\n", "                        value=str(base_root / \"dir1\"),\n", "                        choices=[str(base_root / \"dir1\"), str(base_root / \"dir2\"),\n", "                                 str(base_root / \"dir3\")])\n", "        with gr.Group():\n", "            txt_only_glob = gr.Checkbox(label=\"Show only text files\", value=False)\n", "            ignore_txt_in_glob = gr.Checkbox(label=\"Ignore text files in glob\", value=False)\n", "\n", "    fe = gr.FileExplorer(root_dir=str(base_root / \"dir1\"),\n", "                         glob=\"**/*\", interactive=True)\n", "    textbox = gr.Textbox(label=\"Selected Directory\")\n", "    run = gr.Button(\"Run\")\n", "    \n", "    txt_only_glob.select(lambda s: gr.FileExplorer(glob=\"*.txt\" if s else \"*\") ,\n", "                         inputs=[txt_only_glob], outputs=[fe])\n", "    ignore_txt_in_glob.select(lambda s: gr.FileExplorer(ignore_glob=\"*.txt\" if s else None),\n", "                            inputs=[ignore_txt_in_glob], outputs=[fe])            \n", "\n", "    dd.select(lambda s: gr.FileExplorer(root=s), inputs=[dd], outputs=[fe])\n", "    run.click(lambda s: \",\".join(s) if isinstance(s, list) else s, inputs=[fe], outputs=[textbox])\n", "\n", "    with gr.Row():\n", "        a = gr.Textbox(elem_id=\"input-box\")\n", "        a.change(lambda x: x, inputs=[a])\n", "\n", "\n", "if __name__ == \"__main__\":\n", "    demo.launch()"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}
diff --git a/demo/file_explorer_component_events/run.py b/demo/file_explorer_component_events/run.py
@@ -10,22 +10,18 @@
                         choices=[str(base_root / "dir1"), str(base_root / "dir2"),
                                  str(base_root / "dir3")])
         with gr.Group():
-            dir_only_glob = gr.Checkbox(label="Show only directories", value=False)
-            ignore_dir_in_glob = gr.Checkbox(label="Ignore directories in glob", value=False)
+            txt_only_glob = gr.Checkbox(label="Show only text files", value=False)
+            ignore_txt_in_glob = gr.Checkbox(label="Ignore text files in glob", value=False)
 
-    fe = gr.FileExplorer(root=str(base_root / "dir1"),
+    fe = gr.FileExplorer(root_dir=str(base_root / "dir1"),
                          glob="**/*", interactive=True)
     textbox = gr.Textbox(label="Selected Directory")
     run = gr.Button("Run")
 
-    dir_only_glob.select(lambda s: gr.FileExplorer(glob="**/" if s else "**/*.*",
-                                                   file_count="multiple",
-                                                   root=str(base_root / "dir3")) ,
-                         inputs=[dir_only_glob], outputs=[fe])
-    ignore_dir_in_glob.select(lambda s: gr.FileExplorer(glob="**/*",
-                                                        ignore_glob="**/",
-                                                        root=str(base_root / "dir3")),
-                            inputs=[ignore_dir_in_glob], outputs=[fe])            
+    txt_only_glob.select(lambda s: gr.FileExplorer(glob="*.txt" if s else "*") ,
+                         inputs=[txt_only_glob], outputs=[fe])
+    ignore_txt_in_glob.select(lambda s: gr.FileExplorer(ignore_glob="*.txt" if s else None),
+                            inputs=[ignore_txt_in_glob], outputs=[fe])            
 
     dd.select(lambda s: gr.FileExplorer(root=s), inputs=[dd], outputs=[fe])
     run.click(lambda s: ",".join(s) if isinstance(s, list) else s, inputs=[fe], outputs=[textbox])
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"cells": [{"cell_type": "markdown", "id": "302934307671667531413257853548643485645", "metadata": {}, "source": ["# Gradio Demo: file_explorer"]}, {"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", "from pathlib import Path\n", "\n", "current_file_path = Path(__file__).resolve()\n", "relative_path = \"path/to/file\"\n", "absolute_path = (current_file_path.parent / \"..\" / \"..\" / \"gradio\").resolve()\n", "\n", "\n", "def get_file_content(file):\n", " return (file,)\n", "\n", "\n", "with gr.Blocks() as demo:\n", " gr.Markdown('### `FileExplorer` to `FileExplorer` -- `file_count=\"multiple\"`')\n", " submit_btn = gr.Button(\"Select\")\n", " with gr.Row():\n", " file = gr.FileExplorer(\n", " glob=\"*/{components,themes}/.py\",\n", " # value=[\"themes/utils\"],\n", " root=absolute_path,\n", " ignore_glob=\"/__init__.py\",\n", " )\n", "\n", " file2 = gr.FileExplorer(\n", " glob=\"/{components,themes}/*/.py\",\n", " root=absolute_path,\n", " ignore_glob=\"/__init__.py\",\n", " )\n", " submit_btn.click(lambda x: x, file, file2)\n", "\n", " gr.Markdown(\"---\")\n", " gr.Markdown('### `FileExplorer` to `Code` -- `file_count=\"single\"`')\n", " with gr.Group():\n", " with gr.Row():\n", " file_3 = gr.FileExplorer(\n", " scale=1,\n", " glob=\"/{components,themes}/*/.py\",\n", " value=[\"themes/utils\"],\n", " file_count=\"single\",\n", " root=absolute_path,\n", " ignore_glob=\"**/__init__.py\",\n", " elem_id=\"file\",\n", " )\n", "\n", " code = gr.Code(lines=30, scale=2, language=\"python\")\n", "\n", " file_3.change(get_file_content, file_3, code)\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: file_explorer"]}, {"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", "from pathlib import Path\n", "\n", "current_file_path = Path(__file__).resolve()\n", "relative_path = \"path/to/file\"\n", "absolute_path = (current_file_path.parent / \"..\" / \"..\" / \"gradio\").resolve()\n", "\n", "\n", "def get_file_content(file):\n", " return (file,)\n", "\n", "\n", "with gr.Blocks() as demo:\n", " gr.Markdown('### `FileExplorer` to `FileExplorer` -- `file_count=\"multiple\"`')\n", " submit_btn = gr.Button(\"Select\")\n", " with gr.Row():\n", " file = gr.FileExplorer(\n", " glob=\"*/components/.py\",\n", " # value=[\"themes/utils\"],\n", " root=absolute_path,\n", " ignore_glob=\"/__init__.py\",\n", " )\n", "\n", " file2 = gr.FileExplorer(\n", " glob=\"/components/*/.py\",\n", " root=absolute_path,\n", " ignore_glob=\"/__init__.py\",\n", " )\n", " submit_btn.click(lambda x: x, file, file2)\n", "\n", " gr.Markdown(\"---\")\n", " gr.Markdown('### `FileExplorer` to `Code` -- `file_count=\"single\"`')\n", " with gr.Group():\n", " with gr.Row():\n", " file_3 = gr.FileExplorer(\n", " scale=1,\n", " glob=\"/components/*/.py\",\n", " value=[\"themes/utils\"],\n", " file_count=\"single\",\n", " root=absolute_path,\n", " ignore_glob=\"**/__init__.py\",\n", " elem_id=\"file\",\n", " )\n", "\n", " code = gr.Code(lines=30, scale=2, language=\"python\")\n", "\n", " file_3.change(get_file_content, file_3, code)\n", "\n", "\n", "if __name__ == \"__main__\":\n", " demo.launch()\n"]}], "metadata": {}, "nbformat": 4, "nbformat_minor": 5}