Merge branch 'huggingface:main' into restructure-inference-docs

huggingface · Oct 30, 2023 · 07fa24b · 07fa24b
2 parents fa6f57b + 95c509b
commit 07fa24b
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 15 deletions.
diff --git a/packages/hub/src/consts.ts b/packages/hub/src/consts.ts
@@ -1,4 +1 @@
 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 { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import type { CommitFile } from "./commit";
 import { commit } from "./commit";

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 { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../test/consts";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";
 import { deleteRepo } from "./delete-repo";

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 { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../consts";
+import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";

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 { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";

diff --git a/packages/hub/src/lib/upload-file.spec.ts b/packages/hub/src/lib/upload-file.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../consts";
+import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";

diff --git a/packages/hub/src/lib/upload-files-with-progress.spec.ts b/packages/hub/src/lib/upload-files-with-progress.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../consts";
+import { TEST_HUB_URL, TEST_ACCESS_TOKEN, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";

diff --git a/packages/hub/src/lib/upload-files.spec.ts b/packages/hub/src/lib/upload-files.spec.ts
@@ -1,6 +1,6 @@
 import { assert, it, describe } from "vitest";
 
-import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../consts";
+import { TEST_ACCESS_TOKEN, TEST_HUB_URL, TEST_USER } from "../test/consts";
 import type { RepoId } from "../types/public";
 import { insecureRandomString } from "../utils/insecureRandomString";
 import { createRepo } from "./create-repo";

diff --git a/packages/hub/src/lib/who-am-i.spec.ts b/packages/hub/src/lib/who-am-i.spec.ts
@@ -1,5 +1,5 @@
 import { assert, it, describe } from "vitest";
-import { TEST_ACCESS_TOKEN, TEST_HUB_URL } from "../consts";
+import { TEST_ACCESS_TOKEN, TEST_HUB_URL } from "../test/consts";
 import { whoAmI } from "./who-am-i";
 
 describe("whoAmI", () => {

diff --git a/packages/hub/src/test/consts.ts b/packages/hub/src/test/consts.ts
@@ -0,0 +1,3 @@
+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/inference/src/tasks/nlp/translation.ts b/packages/inference/src/tasks/nlp/translation.ts
@@ -6,27 +6,29 @@ export type TranslationArgs = BaseArgs & {
 	/**
 	 * A string to be translated
 	 */
-	inputs: string;
+	inputs: string | string[];
 };
 
-export interface TranslationOutput {
+export interface TranslationOutputValue {
 	/**
 	 * The string after translation
 	 */
 	translation_text: string;
 }
 
+export type TranslationOutput = TranslationOutputValue | TranslationOutputValue[];
+
 /**
  * This task is well known to translate text from one language to another. Recommended model: Helsinki-NLP/opus-mt-ru-en.
  */
 export async function translation(args: TranslationArgs, options?: Options): Promise<TranslationOutput> {
-	const res = await request<TranslationOutput[]>(args, {
+	const res = await request<TranslationOutputValue[]>(args, {
 		...options,
 		taskHint: "translation",
 	});
 	const isValidOutput = Array.isArray(res) && res.every((x) => typeof x?.translation_text === "string");
 	if (!isValidOutput) {
 		throw new InferenceOutputError("Expected type Array<{translation_text: string}>");
 	}
-	return res?.[0];
+	return res?.length === 1 ? res?.[0] : res;
 }
diff --git a/packages/inference/test/HfInference.spec.ts b/packages/inference/test/HfInference.spec.ts
@@ -293,6 +293,20 @@ describe.concurrent(
 			).toMatchObject({
 				translation_text: "Mein Name ist Wolfgang und ich lebe in Berlin",
 			});
+			// input is a list
+			expect(
+				await hf.translation({
+					model: "t5-base",
+					inputs: ["My name is Wolfgang and I live in Berlin", "I work as programmer"],
+				})
+			).toMatchObject([
+				{
+					translation_text: "Mein Name ist Wolfgang und ich lebe in Berlin",
+				},
+				{
+					translation_text: "Ich arbeite als Programmierer",
+				},
+			]);
 		});
 		it("zeroShotClassification", async () => {
 			expect.extend({

diff --git a/packages/inference/test/tapes.json b/packages/inference/test/tapes.json
@@ -942,5 +942,26 @@
         "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers"
       }
     }
+  },
+  "f7b0286fa03058c95425a91aa758f949ce7772fbe7bd52f2b777e636251a2b8e": {
+    "url": "https://api-inference.huggingface.co/models/t5-base",
+    "init": {
+      "headers": {
+        "Content-Type": "application/json"
+      },
+      "method": "POST",
+      "body": "{\"inputs\":[\"My name is Wolfgang and I live in Berlin\",\"I work as programmer\"],\"options\":{}}"
+    },
+    "response": {
+      "body": "[{\"translation_text\":\"Mein Name ist Wolfgang und ich lebe in Berlin\"},{\"translation_text\":\"Ich arbeite als Programmierer\"}]",
+      "status": 200,
+      "statusText": "OK",
+      "headers": {
+        "access-control-allow-credentials": "true",
+        "connection": "keep-alive",
+        "content-type": "application/json",
+        "vary": "Origin, Access-Control-Request-Method, Access-Control-Request-Headers"
+      }
+    }
   }
 }