🐛 Fix tests in browser?

huggingface · Oct 24, 2023 · 3879a5e · 3879a5e
1 parent 26302b8
commit 3879a5e
Show file tree

Hide file tree

Showing 14 changed files with 81 additions and 43 deletions.
diff --git a/packages/hub/src/consts.ts b/packages/hub/src/consts.ts
@@ -1,6 +1,4 @@
-export const HUB_URL =
-	typeof process !== "undefined" && process.env.NODE_ENV === "test"
-		? "https://hub-ci.huggingface.co"
-		: "https://huggingface.co";
+export const HUB_URL = "https://huggingface.co";
+export const TEST_HUB_URL = "https://hub-ci.huggingface.co";
 export const TEST_USER = "hub.js";
 export const TEST_ACCESS_TOKEN = "hf_hub.js";
diff --git a/packages/hub/src/lib/commit.spec.ts b/packages/hub/src/lib/commit.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
 import type { RepoId } from "../types/public";
 import type { CommitFile } from "./commit";
 import { commit } from "./commit";
@@ -28,12 +28,13 @@ describe("commit", () => {
 			credentials: {
 				accessToken: TEST_ACCESS_TOKEN,
 			},
+			hubUrl: TEST_HUB_URL,
 			repo,
 			license: "mit",
 		});
 
 		try {
-			const readme1 = await downloadFile({ repo, path: "README.md" });
+			const readme1 = await downloadFile({ repo, path: "README.md", hubUrl: TEST_HUB_URL });
 			assert.strictEqual(readme1?.status, 200);
 
 			const nodeOperation: CommitFile[] = isFrontend
@@ -52,6 +53,7 @@ describe("commit", () => {
 				credentials: {
 					accessToken: TEST_ACCESS_TOKEN,
 				},
+				hubUrl: TEST_HUB_URL,
 				operations: [
 					{
 						operation: "addOrUpdate",
@@ -78,15 +80,15 @@ describe("commit", () => {
 				useWebWorkers: { minSize: 5_000 },
 			});
 
-			const fileContent = await downloadFile({ repo, path: "test.txt" });
+			const fileContent = await downloadFile({ repo, path: "test.txt", hubUrl: TEST_HUB_URL });
 			assert.strictEqual(fileContent?.status, 200);
 			assert.strictEqual(await fileContent?.text(), "This is me");
 
-			const lfsFileContent = await downloadFile({ repo, path: "test.lfs.txt" });
+			const lfsFileContent = await downloadFile({ repo, path: "test.lfs.txt", hubUrl: TEST_HUB_URL });
 			assert.strictEqual(lfsFileContent?.status, 200);
 			assert.strictEqual(await lfsFileContent?.text(), lfsContent);
 
-			const lfsFileUrl = `${HUB_URL}/${repoName}/raw/main/test.lfs.txt`;
+			const lfsFileUrl = `${TEST_HUB_URL}/${repoName}/raw/main/test.lfs.txt`;
 			const lfsFilePointer = await fetch(lfsFileUrl);
 			assert.strictEqual(lfsFilePointer.status, 200);
 			assert.strictEqual(
@@ -99,26 +101,27 @@ size ${lfsContent.length}
 			);
 
 			if (!isFrontend) {
-				const fileUrlContent = await downloadFile({ repo, path: "tsconfig.json" });
+				const fileUrlContent = await downloadFile({ repo, path: "tsconfig.json", hubUrl: TEST_HUB_URL });
 				assert.strictEqual(fileUrlContent?.status, 200);
 				assert.strictEqual(
 					await fileUrlContent?.text(),
 					(await import("node:fs")).readFileSync("./tsconfig.json", "utf-8")
 				);
 			}
 
-			const webResourceContent = await downloadFile({ repo, path: "lamaral.json" });
+			const webResourceContent = await downloadFile({ repo, path: "lamaral.json", hubUrl: TEST_HUB_URL });
 			assert.strictEqual(webResourceContent?.status, 200);
 			assert.strictEqual(await webResourceContent?.text(), await (await fetch(tokenizerJsonUrl)).text());
 
-			const readme2 = await downloadFile({ repo, path: "README.md" });
+			const readme2 = await downloadFile({ repo, path: "README.md", hubUrl: TEST_HUB_URL });
 			assert.strictEqual(readme2, null);
 		} finally {
 			await deleteRepo({
 				repo: {
 					name: repoName,
 					type: "model",
 				},
+				hubUrl: TEST_HUB_URL,
 				credentials: { accessToken: TEST_ACCESS_TOKEN },
 			});
 		}
@@ -136,6 +139,7 @@ size ${lfsContent.length}
 				accessToken: TEST_ACCESS_TOKEN,
 			},
 			repo,
+			hubUrl: TEST_HUB_URL,
 		});
 
 		try {
@@ -162,15 +166,22 @@ size ${lfsContent.length}
 				credentials: {
 					accessToken: TEST_ACCESS_TOKEN,
 				},
+				hubUrl: TEST_HUB_URL,
 				title: "upload model",
 				operations,
 			});
 
-			const LFSSize = (await fileDownloadInfo({ repo, path: "mobilenet/group1-shard1of2" }))?.size;
+			const LFSSize = (await fileDownloadInfo({ repo, path: "mobilenet/group1-shard1of2", hubUrl: TEST_HUB_URL }))
+				?.size;
 
 			assert.strictEqual(LFSSize, 4_194_304);
 
-			const pointerFile = await downloadFile({ repo, path: "mobilenet/group1-shard1of2", raw: true });
+			const pointerFile = await downloadFile({
+				repo,
+				path: "mobilenet/group1-shard1of2",
+				raw: true,
+				hubUrl: TEST_HUB_URL,
+			});
 
 			// Make sure SHA is computed properly as well
 			assert.strictEqual(
@@ -187,6 +198,7 @@ size 4194304
 					name: repoName,
 					type: "model",
 				},
+				hubUrl: TEST_HUB_URL,
 				credentials: { accessToken: TEST_ACCESS_TOKEN },
 			});
 		}

diff --git a/packages/hub/src/lib/create-repo.spec.ts b/packages/hub/src/lib/create-repo.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe, expect } from "vitest";
 
-import { HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";
 import { deleteRepo } from "./delete-repo";
@@ -18,11 +18,12 @@ describe("createRepo", () => {
 				name: repoName,
 				type: "model",
 			},
+			hubUrl: TEST_HUB_URL,
 			files: [{ path: ".gitattributes", content: new Blob(["*.html filter=lfs diff=lfs merge=lfs -text"]) }],
 		});
 
 		assert.deepStrictEqual(result, {
-			repoUrl: `${HUB_URL}/${repoName}`,
+			repoUrl: `${TEST_HUB_URL}/${repoName}`,
 		});
 
 		const content = await downloadFile({
@@ -31,6 +32,7 @@ describe("createRepo", () => {
 				type: "model",
 			},
 			path: ".gitattributes",
+			hubUrl: TEST_HUB_URL,
 		});
 
 		assert(content);
@@ -42,13 +44,15 @@ describe("createRepo", () => {
 				type: "model",
 			},
 			credentials: { accessToken: TEST_ACCESS_TOKEN },
+			hubUrl: TEST_HUB_URL,
 		});
 	});
 
 	it("should throw a client error when trying to create a repo without a fully-qualified name", async () => {
 		const tryCreate = createRepo({
 			repo: { name: "canonical", type: "model" },
 			credentials: { accessToken: TEST_ACCESS_TOKEN },
+			hubUrl: TEST_HUB_URL,
 		});
 
 		await expect(tryCreate).rejects.toBeInstanceOf(TypeError);
@@ -61,19 +65,21 @@ describe("createRepo", () => {
 			credentials: {
 				accessToken: TEST_ACCESS_TOKEN,
 			},
+			hubUrl: TEST_HUB_URL,
 			repo: repoName,
 			files: [{ path: ".gitattributes", content: new Blob(["*.html filter=lfs diff=lfs merge=lfs -text"]) }],
 		});
 
 		assert.deepStrictEqual(result, {
-			repoUrl: `${HUB_URL}/${repoName}`,
+			repoUrl: `${TEST_HUB_URL}/${repoName}`,
 		});
 
 		await deleteRepo({
 			repo: {
 				name: repoName,
 				type: "model",
 			},
+			hubUrl: TEST_HUB_URL,
 			credentials: { accessToken: TEST_ACCESS_TOKEN },
 		});
 	});
@@ -85,16 +91,18 @@ describe("createRepo", () => {
 			credentials: {
 				accessToken: TEST_ACCESS_TOKEN,
 			},
+			hubUrl: TEST_HUB_URL,
 			repo: repoName,
 			files: [{ path: ".gitattributes", content: new Blob(["*.html filter=lfs diff=lfs merge=lfs -text"]) }],
 		});
 
 		assert.deepStrictEqual(result, {
-			repoUrl: `${HUB_URL}/${repoName}`,
+			repoUrl: `${TEST_HUB_URL}/${repoName}`,
 		});
 
 		await deleteRepo({
 			repo: repoName,
+			hubUrl: TEST_HUB_URL,
 			credentials: { accessToken: TEST_ACCESS_TOKEN },
 		});
 	});

diff --git a/packages/hub/src/lib/delete-file.spec.ts b/packages/hub/src/lib/delete-file.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";
@@ -19,6 +19,7 @@ describe("deleteFile", () => {
 		try {
 			const result = await createRepo({
 				credentials,
+				hubUrl: TEST_HUB_URL,
 				repo,
 				files: [
 					{ path: "file1", content: new Blob(["file1"]) },
@@ -27,10 +28,11 @@ describe("deleteFile", () => {
 			});
 
 			assert.deepStrictEqual(result, {
-				repoUrl: `${HUB_URL}/${repoName}`,
+				repoUrl: `${TEST_HUB_URL}/${repoName}`,
 			});
 
 			let content = await downloadFile({
+				hubUrl: TEST_HUB_URL,
 				repo,
 				path: "file1",
 			});
@@ -42,20 +44,23 @@ describe("deleteFile", () => {
 			content = await downloadFile({
 				repo,
 				path: "file1",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(content, null);
 
 			content = await downloadFile({
 				repo,
 				path: "file2",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(await content?.text(), "file2");
 		} finally {
 			await deleteRepo({
 				repo,
 				credentials,
+				hubUrl: TEST_HUB_URL,
 			});
 		}
 	});

diff --git a/packages/hub/src/lib/delete-files.spec.ts b/packages/hub/src/lib/delete-files.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";
@@ -25,52 +25,59 @@ describe("deleteFiles", () => {
 					{ path: "file2", content: new Blob(["file2"]) },
 					{ path: "file3", content: new Blob(["file3"]) },
 				],
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.deepStrictEqual(result, {
-				repoUrl: `${HUB_URL}/${repoName}`,
+				repoUrl: `${TEST_HUB_URL}/${repoName}`,
 			});
 
 			let content = await downloadFile({
 				repo,
 				path: "file1",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(await content?.text(), "file1");
 
 			content = await downloadFile({
 				repo,
 				path: "file2",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(await content?.text(), "file2");
 
-			await deleteFiles({ paths: ["file1", "file2"], repo, credentials });
+			await deleteFiles({ paths: ["file1", "file2"], repo, credentials, hubUrl: TEST_HUB_URL });
 
 			content = await downloadFile({
 				repo,
 				path: "file1",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(content, null);
 
 			content = await downloadFile({
 				repo,
 				path: "file2",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(content, null);
 
 			content = await downloadFile({
 				repo,
 				path: "file3",
+				hubUrl: TEST_HUB_URL,
 			});
 
 			assert.strictEqual(await content?.text(), "file3");
 		} finally {
 			await deleteRepo({
 				repo,
 				credentials,
+				hubUrl: TEST_HUB_URL,
 			});
 		}
 	});

diff --git a/packages/hub/src/lib/file-download-info.spec.ts b/packages/hub/src/lib/file-download-info.spec.ts
@@ -10,7 +10,6 @@ describe("fileDownloadInfo", () => {
 			},
 			path: "tf_model.h5",
 			revision: "dd4bc8b21efa05ec961e3efc4ee5e3832a3679c7",
-			hubUrl: "https://huggingface.co",
 		});
 
 		assert.strictEqual(info?.size, 536063208);
@@ -26,7 +25,6 @@ describe("fileDownloadInfo", () => {
 			},
 			path: "tf_model.h5",
 			revision: "dd4bc8b21efa05ec961e3efc4ee5e3832a3679c7",
-			hubUrl: "https://huggingface.co",
 			raw: true,
 		});
 
@@ -43,7 +41,6 @@ describe("fileDownloadInfo", () => {
 			},
 			path: "tokenizer_config.json",
 			revision: "1a7dd4986e3dab699c24ca19b2afd0f5e1a80f37",
-			hubUrl: "https://huggingface.co",
 		});
 
 		assert.strictEqual(info?.size, 28);

diff --git a/packages/hub/src/lib/list-datasets.spec.ts b/packages/hub/src/lib/list-datasets.spec.ts
@@ -6,7 +6,7 @@ describe("listDatasets", () => {
 	it("should list datasets from hf-doc-builder", async () => {
 		const results: DatasetEntry[] = [];
 
-		for await (const entry of listDatasets({ search: { owner: "hf-doc-build" }, hubUrl: "https://huggingface.co" })) {
+		for await (const entry of listDatasets({ search: { owner: "hf-doc-build" } })) {
 			if (typeof entry.downloads === "number") {
 				entry.downloads = 0;
 			}

diff --git a/packages/hub/src/lib/list-files.spec.ts b/packages/hub/src/lib/list-files.spec.ts
@@ -10,7 +10,6 @@ describe("listFiles", () => {
 				type: "model",
 			},
 			revision: "dd4bc8b21efa05ec961e3efc4ee5e3832a3679c7",
-			hubUrl: "https://huggingface.co",
 		});
 
 		const files: ListFileEntry[] = [];
@@ -71,7 +70,6 @@ describe("listFiles", () => {
 			},
 			revision: "dd4bc8b21efa05ec961e3efc4ee5e3832a3679c7",
 			expand: true,
-			hubUrl: "https://huggingface.co",
 		});
 
 		const files: ListFileEntry[] = [];
@@ -157,7 +155,6 @@ describe("listFiles", () => {
 				type: "dataset",
 			},
 			revision: "0f3ea2f2b55fcb11e71fb1e3aec6822e44ddcb0f",
-			hubUrl: "https://huggingface.co",
 			recursive: true,
 		});