fix-tests (#7345)

* fix-tests

* [tmp] Comment-out

* Fix the URL constructor calls in `resolve_wasm_src()`, `should_proxy_wasm_src()`, and `<DownloadLink />` to handle relative URLs

* Remove a circular dependency between lite/index.ts and lite/custom-element/index.ts to solve a bug that the dev app is mounted twice sometimes

* Fix js/app/test/image_component_events.spec.ts

* Set the `testIgnore` in `.config/playwright.config.js`

* Fix the Lite dev mode only to create an app and expose the controller for Playwright, without editors etc.

* add changeset

* Set the mocked ruff version as 0.2.2

* Extend timeout

* Fix to use the built lite files instead of the dev server

* add changeset

* comment out failed tests

* Revert "comment out failed tests"

This reverts commit 3580d79.

* Fix the Gellery component to work in Wasm

* Fix js/app/test/file_explorer_component_events.spec.ts to run on Wasm

* Ignore queue_full_e2e_test.spec.ts

* Revert "[tmp] Comment-out"

This reverts commit c775c0c.

* Revert "Extend timeout"

This reverts commit 742d1e1.

* Remove a commented out line

* Refactor file_explorer_component_events.spec.ts

* Revert "fix-tests", restoring the original test-functional.yml content

This reverts commit 9ff2a7d.

* Set CI step names

* [tmp] Revert "Revert "fix-tests", restoring the original test-functional.yml content"

This reverts commit de2dbe3.

* Revert "[tmp] Revert "Revert "fix-tests", restoring the original test-functional.yml content""

This reverts commit 32154f3.

* [tmp] Revert "Revert "[tmp] Revert "Revert "fix-tests", restoring the original test-functional.yml content"""

This reverts commit 204075e.

* Fix vite.config.js removing unnecessary code

* Revert "Set the `testIgnore` in `.config/playwright.config.js`"

This reverts commit 98dccc5.

* Add gallery_component_events.spec.ts

* Revert js/app/test

* tweak

* tweak

* revert workflow changes

* add changeset

---------

Co-authored-by: Yuichiro Tachibana (Tsuchiya) <[email protected]>
Co-authored-by: gradio-pr-bot <[email protected]>

.changeset/tired-pants-relax.md

@@ -0,0 +1,9 @@
+---
+"@gradio/app": patch
+"@gradio/lite": patch
+"@gradio/tootils": patch
+"@gradio/wasm": patch
+"gradio": patch
+---
+
+feat:fix-tests

.config/playwright.config.js

@@ -25,21 +25,24 @@ const base = defineConfig({
 const normal = defineConfig(base, {
 	globalSetup: "./playwright-setup.js"
 });
+
 normal.projects = undefined; // Explicitly unset this field due to https://github.com/microsoft/playwright/issues/28795
 
 const lite = defineConfig(base, {
 	webServer: {
-		command: "pnpm --filter @gradio/app dev:lite",
-		url: "http://localhost:9876/lite.html",
+		command: "python -m http.server 8000 --directory ../js/lite",
+		url: "http://localhost:8000/",
 		reuseExistingServer: !process.env.CI
 	},
 	testMatch: [
 		"**/file_component_events.spec.ts",
 		"**/chatbot_multimodal.spec.ts",
-		"**/kitchen_sink.spec.ts"
+		"**/kitchen_sink.spec.ts",
+		"**/gallery_component_events.spec.ts"
 	],
 	workers: 1
 });
+
 lite.projects = undefined; // Explicitly unset this field due to https://github.com/microsoft/playwright/issues/28795
 
 export default !!process.env.GRADIO_E2E_TEST_LITE ? lite : normal;

.github/actions/install-all-deps/action.yml

@@ -14,6 +14,9 @@ inputs:
   skip_build:
     description: 'Skip build'
     default: 'false'
+  build-lite:
+    description: 'Build lite'
+    default: 'false'
   test:
     description: 'Test'
     default: 'false'
@@ -91,6 +94,7 @@ runs:
         node_auth_token: ${{ inputs.node_auth_token }}
         npm_token: ${{ inputs.npm_token }}
         skip_build: ${{ inputs.skip_build }}
+        build-lite: ${{ inputs.build-lite }}
     - name: generate json
       shell: bash
       if: inputs.os == 'ubuntu-latest'

.github/actions/install-frontend-deps/action.yml

@@ -14,6 +14,9 @@ inputs:
   skip_build:
     description: 'Skip build'
     default: 'false'
+  build-lite:
+    description: 'Build lite'
+    default: 'false'
   os:
     description: 'OS'
     default: 'ubuntu-latest'
@@ -47,4 +50,11 @@ runs:
     - name: Build frontend
       if: inputs.skip_build == 'false' && steps.frontend-cache.outputs.cache-hit != 'true'
       shell: bash
-      run: pnpm build
+      run: pnpm build
+    - name: Build frontend lite
+      if: inputs.build-lite == 'true'
+      shell: bash
+      run: |
+        . venv/bin/activate
+        python -m pip install build
+        pnpm --filter @gradio/app build:lite

.github/workflows/test-functional.yml

@@ -73,7 +73,10 @@ jobs:
         run: |
           . venv/bin/activate
           pnpm run test:ct
-      # - run: pnpm --filter @gradio/app test:browser:lite
+      - name: Run Lite E2E tests
+        run: |
+          . venv/bin/activate
+          pnpm --filter @gradio/app test:browser:lite
       - name: do check
         if: always()
         uses: "gradio-app/github/actions/commit-status@main"

gradio/components/gallery.py

@@ -12,7 +12,7 @@
 from gradio_client.documentation import document
 from gradio_client.utils import is_http_url_like
 
-from gradio import processing_utils, utils
+from gradio import processing_utils, utils, wasm_utils
 from gradio.components.base import Component
 from gradio.data_classes import FileData, GradioModel, GradioRootModel
 from gradio.events import Events
@@ -201,9 +201,13 @@ def _save(img):
                 caption=caption,
             )
 
-        with ThreadPoolExecutor() as executor:
-            for o in executor.map(_save, value):
-                output.append(o)
+        if wasm_utils.IS_WASM:
+            for img in value:
+                output.append(_save(img))
+        else:
+            with ThreadPoolExecutor() as executor:
+                for o in executor.map(_save, value):
+                    output.append(o)
         return GalleryData(root=output)
 
     @staticmethod

js/app/src/lite/custom-element/index.ts

@@ -1,4 +1,6 @@
-import { create, type Options } from "..";
+// NOTE: We should only import the types from ".." to avoid the circular dependency of implementations,
+// which causes repeated executions of the ".." module in †he dev mode and can lead to multiple instances of the dev app.
+import type { create as createLiteAppFunc, Options } from "..";
 
 interface GradioComponentOptions {
 	info: Options["info"];
@@ -28,7 +30,9 @@ function parseRequirementsTxt(content: string): string[] {
 		.filter((r) => r !== "");
 }
 
-export function bootstrap_custom_element(): void {
+export function bootstrap_custom_element(
+	create: typeof createLiteAppFunc
+): void {
 	const CUSTOM_ELEMENT_NAME = "gradio-lite";
 
 	if (customElements.get(CUSTOM_ELEMENT_NAME)) {

js/app/src/lite/dev/App.svelte

@@ -79,12 +79,8 @@ def hi(name):
 			controlPageTitle: false,
 			appMode: true
 		});
-		// @ts-ignore
-		window.controller = controller; // For Playwright
 	});
 	onDestroy(() => {
-		// @ts-ignore
-		window.controller = undefined;
 		controller.unmount();
 	});
 

js/app/src/lite/index.ts

@@ -258,7 +258,7 @@ export function create(options: Options): GradioAppController {
 // @ts-ignore
 globalThis.createGradioApp = create;
 
-bootstrap_custom_element();
+bootstrap_custom_element(create);
 
 declare let BUILD_MODE: string;
 if (BUILD_MODE === "dev") {

js/app/vite.config.ts

@@ -50,14 +50,12 @@ export default defineConfig(({ mode }) => {
 	const development = mode === "development" || mode === "development:lite";
 	const is_lite = mode.endsWith(":lite");
 
-	const is_e2e_test = process.env.GRADIO_E2E_TEST_LITE;
-
 	return {
 		base: "./",
 
 		server: {
 			port: 9876,
-			open: is_e2e_test ? false : is_lite ? "/lite.html" : "/"
+			open: is_lite ? "/lite.html" : "/"
 		},
 
 		build: {

js/lite/for_e2e.html

@@ -0,0 +1,50 @@
+<!doctype html>
+<!-- A demo HTML file to test the bundled JS and CSS files -->
+<html style="margin: 0; padding: 0; height: 100%">
+	<head>
+		<meta charset="utf-8" />
+		<meta
+			name="viewport"
+			content="width=device-width, initial-scale=1, shrink-to-fit=no, maximum-scale=1"
+		/>
+
+		<link rel="preconnect" href="https://fonts.googleapis.com" />
+		<link
+			rel="preconnect"
+			href="https://fonts.gstatic.com"
+			crossorigin="anonymous"
+		/>
+
+		<script type="module" crossorigin src="./dist/lite.js"></script>
+		<link rel="stylesheet" href="./dist/lite.css" />
+	</head>
+
+	<body style="margin: 0; padding: 0; height: 100%">
+		<div id="gradio-app"></div>
+
+		<script type="module">
+			// type="module" is necessary to use `createGradioApp()`, which is loaded with <script type="module" /> tag above.
+			// For the Playwright tests, set the controller to the global scope.
+			window.controller = createGradioApp({
+				target: document.getElementById("gradio-app"),
+				code: `
+import gradio as gr
+
+def greet(name):
+		return "Hello, " + name + "!"
+
+gr.Interface(fn=greet, inputs="text", outputs="text").launch()
+`,
+				info: true,
+				container: true,
+				isEmbed: false,
+				initialHeight: "300px",
+				eager: false,
+				themeMode: null,
+				autoScroll: false,
+				controlPageTitle: false,
+				appMode: true
+			});
+		</script>
+	</body>
+</html>

js/tootils/src/index.ts

@@ -37,7 +37,7 @@ const test_normal = base.extend<{ setup: void }>({
 	]
 });
 
-const lite_url = "http://localhost:9876/lite.html";
+const lite_url = "http://localhost:8000/for_e2e.html";
 // LIte taks a long time to initialize, so we share the page across tests, sacrificing the test isolation.
 let shared_page_for_lite: Page;
 const test_lite = base.extend<{ setup: void }>({

js/wasm/src/webworker/index.ts

@@ -80,7 +80,7 @@ async function initializeEnvironment(
 	await micropip.install(["markdown-it-py[linkify]~=2.2.0"]); // On 3rd June 2023, markdown-it-py 3.0.0 has been released. The `gradio` package depends on its `>=2.0.0` version so its 3.x will be resolved. However, it conflicts with `mdit-py-plugins`'s dependency `markdown-it-py >=1.0.0,<3.0.0` and micropip currently can't resolve it. So we explicitly install the compatible version of the library here.
 	await micropip.install(["anyio==3.*"]); // `fastapi` depends on `anyio>=3.4.0,<5` so its 4.* can be installed, but it conflicts with the anyio version `httpx` depends on, `==3.*`. Seems like micropip can't resolve it for now, so we explicitly install the compatible version of the library here.
 	await micropip.add_mock_package("pydantic", "2.4.2"); // PydanticV2 is not supported on Pyodide yet. Mock it here for installing the `gradio` package to pass the version check. Then, install PydanticV1 below.
-	await micropip.add_mock_package("ruff", "0.1.7"); // `ruff` was added to the requirements of `gradio` for the custom components (https://github.com/gradio-app/gradio/pull/7030), but it's not working on PYodide yet. Also Lite doesn't need it, so mock it here for installing the `gradio` package to pass the version check.
+	await micropip.add_mock_package("ruff", "0.2.2"); // `ruff` was added to the requirements of `gradio` for the custom components (https://github.com/gradio-app/gradio/pull/7030), but it's not working on PYodide yet. Also Lite doesn't need it, so mock it here for installing the `gradio` package to pass the version check.
 	await micropip.install.callKwargs(gradioWheelUrls, {
 		keep_going: true
 	});

js/wasm/svelte/DownloadLink.svelte

@@ -33,7 +33,7 @@
 			throw new Error("Wasm worker proxy is not available.");
 		}
 
-		const url = new URL(href);
+		const url = new URL(href, window.location.href);
 		const path = url.pathname;
 
 		is_downloading = true;

js/wasm/svelte/file-url.ts

@@ -9,7 +9,7 @@ export function should_proxy_wasm_src(src: MediaSrc): boolean {
 		return false;
 	}
 
-	const url = new URL(src);
+	const url = new URL(src, window.location.href);
 	if (!is_self_host(url)) {
 		// `src` is not accessing a local server resource, so we don't need to proxy this request to the Wasm worker.
 		return false;
@@ -33,7 +33,7 @@ export async function resolve_wasm_src(src: MediaSrc): Promise<MediaSrc> {
 		return src;
 	}
 
-	const url = new URL(src);
+	const url = new URL(src, window.location.href);
 	const path = url.pathname;
 	return maybeWorkerProxy
 		.httpRequest({