Merge branch 'main' into add-magi-1

Author: jiahy0825

.github/workflows/mcp-client-publish.yml

@@ -0,0 +1,72 @@
+name: MCP Client - Version and Release
+
+on:
+  workflow_dispatch:
+    inputs:
+      newversion:
+        type: choice
+        description: "Semantic Version Bump Type"
+        default: patch
+        options:
+          - patch
+          - minor
+          - major
+
+concurrency:
+  group: "push-to-main"
+
+defaults:
+  run:
+    working-directory: packages/mcp-client
+
+jobs:
+  version_and_release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.BOT_ACCESS_TOKEN }}
+      - run: npm install -g corepack@latest && corepack enable
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          cache: "pnpm"
+          cache-dependency-path: |
+            packages/mcp-client/pnpm-lock.yaml
+            packages/doc-internal/pnpm-lock.yaml
+          registry-url: "https://registry.npmjs.org"
+      - run: pnpm install
+      - run: git config --global user.name machineuser
+      - run: git config --global user.email [email protected]
+      - run: |
+          PACKAGE_VERSION=$(node -p "require('./package.json').version")
+          BUMPED_VERSION=$(node -p "require('semver').inc('$PACKAGE_VERSION', '${{ github.event.inputs.newversion }}')")
+          # Update package.json with the new version
+          node -e "const fs = require('fs'); const package = JSON.parse(fs.readFileSync('./package.json')); package.version = '$BUMPED_VERSION'; fs.writeFileSync('./package.json', JSON.stringify(package, null, '\t') + '\n');"
+          pnpm --filter doc-internal run fix-cdn-versions
+          git add ../..
+          git commit -m "🔖 @huggingface/mcp-client $BUMPED_VERSION"
+          git tag "mcp-client-v$BUMPED_VERSION"
+
+      # Add checks for dependencies if needed, similar to hub-publish.yml
+      - name: "Check Deps are published before publishing this package"
+        run: pnpm -w check-deps inference && pnpm -w check-deps tasks
+
+      - run: pnpm publish --no-git-checks .
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+      - run: git pull --rebase && git push --follow-tags
+      # hack - reuse actions/setup-node@v3 just to set a new registry
+      - uses: actions/setup-node@v3
+        with:
+          node-version: "20"
+          registry-url: "https://npm.pkg.github.com"
+      # Disable for now, until github supports PATs for writing github packages (https://github.com/github/roadmap/issues/558)
+      # - run: pnpm publish --no-git-checks .
+      #   env:
+      #     NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: "Update Doc"
+        uses: peter-evans/repository-dispatch@v2
+        with:
+          event-type: doc-build
+          token: ${{ secrets.BOT_ACCESS_TOKEN }}

README.md

@@ -97,7 +97,7 @@ You can run our packages with vanilla JS, without any bundler, by using a CDN or
 
 ```html
 <script type="module">
-    import { InferenceClient } from 'https://cdn.jsdelivr.net/npm/@huggingface/[email protected].1/+esm';
+    import { InferenceClient } from 'https://cdn.jsdelivr.net/npm/@huggingface/[email protected].2/+esm';
     import { createRepo, commit, deleteRepo, listFiles } from "https://cdn.jsdelivr.net/npm/@huggingface/[email protected]/+esm";
 </script>
 ```

docs/_toctree.yml

@@ -14,6 +14,11 @@
       title: Interact with the Hub
     - local: hub/modules
       title: API Reference
+- title: "@huggingface/mcp-client"
+  isExpanded: true
+  sections:
+    - local: mcp-client/README
+      title: Simple MCP Client and smol Agent built on top of Inference Client
 - title: "@huggingface/agent"
   isExpanded: true
   sections:

package.json

@@ -11,9 +11,9 @@
 		"check-deps": "tsx scripts/check-deps.ts"
 	},
 	"devDependencies": {
+		"@types/node": "^22.14.1",
 		"@typescript-eslint/eslint-plugin": "^7.2.0",
 		"@typescript-eslint/parser": "^7.2.0",
-		"@types/node": "^18.16.1",
 		"@vitest/browser": "^0.34.6",
 		"eslint": "^8.57.0",
 		"eslint-config-prettier": "^9.0.0",

packages/doc-internal/package.json

@@ -5,7 +5,7 @@
 	"description": "Package to generate doc for other @huggingface packages",
 	"private": true,
 	"scripts": {
-		"start": "pnpm run fix-cdn-versions && pnpm run doc-hub && pnpm run doc-inference && pnpm run doc-agents && pnpm run doc-space-header && pnpm run doc-gguf && cp ../../README.md ../../docs/index.md && pnpm run update-toc && pnpm run fix-md-links && pnpm run fix-md-headinghashlinks",
+		"start": "pnpm run fix-cdn-versions && pnpm run doc-hub && pnpm run doc-inference && pnpm run doc-agents && pnpm run doc-space-header && pnpm run doc-gguf && pnpm run doc-mcp-client && cp ../../README.md ../../docs/index.md && pnpm run update-toc && pnpm run fix-md-links && pnpm run fix-md-headinghashlinks",
 		"lint": "eslint --quiet --fix --ext .cjs,.ts .",
 		"lint:check": "eslint --ext .cjs,.ts .",
 		"format": "prettier --write .",
@@ -14,6 +14,7 @@
 		"doc-inference": "typedoc --tsconfig ../inference/tsconfig.json --githubPages false --plugin typedoc-plugin-markdown --out ../../docs/inference --hideBreadcrumbs --hideInPageTOC --sourceLinkTemplate https://github.com/huggingface/huggingface.js/blob/main/{path}#L{line} ../inference/src/index.ts",
 		"doc-agents": "typedoc --tsconfig ../agents/tsconfig.json --githubPages false --plugin typedoc-plugin-markdown --out ../../docs/agents --hideBreadcrumbs --hideInPageTOC --sourceLinkTemplate https://github.com/huggingface/huggingface.js/blob/main/{path}#L{line} ../agents/src/index.ts",
 		"doc-gguf": "mkdir -p ../../docs/gguf && cp ../../packages/gguf/README.md ../../docs/gguf/README.md",
+		"doc-mcp-client": "mkdir -p ../../docs/mcp-client && cp ../../packages/mcp-client/README.md ../../docs/mcp-client/README.md",
 		"doc-space-header": "mkdir -p ../../docs/space-header && cp ../../packages/space-header/README.md ../../docs/space-header/README.md",
 		"update-toc": "tsx update-toc.ts",
 		"fix-cdn-versions": "tsx fix-cdn-versions.ts",

packages/inference/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@huggingface/inference",
-	"version": "3.9.1",
+	"version": "3.9.2",
 	"packageManager": "[email protected]",
 	"license": "MIT",
 	"author": "Hugging Face and Tim Mikeladze <[email protected]>",

packages/inference/src/lib/getInferenceProviderMapping.ts

@@ -8,7 +8,7 @@ import { typedInclude } from "../utils/typedInclude";
 export const inferenceProviderMappingCache = new Map<ModelId, InferenceProviderMapping>();
 
 export type InferenceProviderMapping = Partial<
-	Record<InferenceProvider, Omit<InferenceProviderModelMapping, "hfModelId" | "adapterWeightsPath">>
+	Record<InferenceProvider, Omit<InferenceProviderModelMapping, "hfModelId">>
 >;
 
 export interface InferenceProviderModelMapping {
@@ -74,22 +74,6 @@ export async function getInferenceProviderMapping(
 				`Model ${params.modelId} is in staging mode for provider ${params.provider}. Meant for test purposes only.`
 			);
 		}
-		if (providerMapping.adapter === "lora") {
-			const treeResp = await (options?.fetch ?? fetch)(`${HF_HUB_URL}/api/models/${params.modelId}/tree/main`);
-			if (!treeResp.ok) {
-				throw new Error(`Unable to fetch the model tree for ${params.modelId}.`);
-			}
-			const tree: Array<{ type: "file" | "directory"; path: string }> = await treeResp.json();
-			const adapterWeightsPath = tree.find(({ type, path }) => type === "file" && path.endsWith(".safetensors"))?.path;
-			if (!adapterWeightsPath) {
-				throw new Error(`No .safetensors file found in the model tree for ${params.modelId}.`);
-			}
-			return {
-				...providerMapping,
-				hfModelId: params.modelId,
-				adapterWeightsPath,
-			};
-		}
 		return { ...providerMapping, hfModelId: params.modelId };
 	}
 	return null;

packages/inference/src/providers/fal-ai.ts

@@ -86,16 +86,6 @@ export class FalAITextToImageTask extends FalAITask implements TextToImageTaskHe
 			...(params.args.parameters as Record<string, unknown>),
 			sync_mode: true,
 			prompt: params.args.inputs,
-			...(params.mapping?.adapter === "lora" && params.mapping.adapterWeightsPath
-				? {
-						loras: [
-							{
-								path: buildLoraPath(params.mapping.hfModelId, params.mapping.adapterWeightsPath),
-								scale: 1,
-							},
-						],
-				  }
-				: undefined),
 		};
 
 		if (params.mapping?.adapter === "lora" && params.mapping.adapterWeightsPath) {

packages/inference/src/snippets/getInferenceSnippets.ts

@@ -8,11 +8,11 @@ import {
 } from "@huggingface/tasks";
 import type { PipelineType, WidgetType } from "@huggingface/tasks/src/pipelines.js";
 import type { ChatCompletionInputMessage, GenerationParameters } from "@huggingface/tasks/src/tasks/index.js";
+import type { InferenceProviderModelMapping } from "../lib/getInferenceProviderMapping";
+import { getProviderHelper } from "../lib/getProviderHelper";
 import { makeRequestOptionsFromResolvedModel } from "../lib/makeRequestOptions";
 import type { InferenceProvider, InferenceTask, RequestArgs } from "../types";
 import { templates } from "./templates.exported";
-import type { InferenceProviderModelMapping } from "../lib/getInferenceProviderMapping";
-import { getProviderHelper } from "../lib/getProviderHelper";
 
 export type InferenceSnippetOptions = { streaming?: boolean; billTo?: string } & Record<string, unknown>;
 
@@ -112,6 +112,7 @@ const HF_JS_METHODS: Partial<Record<WidgetType, string>> = {
 	"text-generation": "textGeneration",
 	"text2text-generation": "textGeneration",
 	"token-classification": "tokenClassification",
+	"text-to-speech": "textToSpeech",
 	translation: "translation",
 };
 
@@ -310,7 +311,7 @@ const snippets: Partial<
 	"text-generation": snippetGenerator("basic"),
 	"text-to-audio": snippetGenerator("textToAudio"),
 	"text-to-image": snippetGenerator("textToImage"),
-	"text-to-speech": snippetGenerator("textToAudio"),
+	"text-to-speech": snippetGenerator("textToSpeech"),
 	"text-to-video": snippetGenerator("textToVideo"),
 	"text2text-generation": snippetGenerator("basic"),
 	"token-classification": snippetGenerator("basic"),

packages/inference/src/snippets/templates/js/fetch/textToSpeech.jinja

@@ -0,0 +1,43 @@
+{% if model.library_name == "transformers" %}
+async function query(data) {
+	const response = await fetch(
+		"{{ fullUrl }}",
+		{
+			headers: {
+				Authorization: "{{ authorizationHeader }}",
+				"Content-Type": "application/json",
+{% if billTo %}
+				"X-HF-Bill-To": "{{ billTo }}",
+{% endif %}			},
+			method: "POST",
+			body: JSON.stringify(data),
+		}
+	);
+	const result = await response.blob();
+    return result;
+}
+
+query({ text: {{ inputs.asObj.inputs }} }).then((response) => {
+    // Returns a byte object of the Audio wavform. Use it directly!
+});
+{% else %}
+async function query(data) {
+	const response = await fetch(
+		"{{ fullUrl }}",
+		{
+			headers: {
+				Authorization: "{{ authorizationHeader }}",
+				"Content-Type": "application/json",
+			},
+			method: "POST",
+			body: JSON.stringify(data),
+		}
+	);
+    const result = await response.json();
+    return result;
+}
+
+query({ text: {{ inputs.asObj.inputs }} }).then((response) => {
+    console.log(JSON.stringify(response));
+});
+{% endif %}