[mcp-client] cleaner base url (#1423)

Author: julien-c

packages/mcp-client/cli.ts

@@ -11,7 +11,7 @@ import { version as packageVersion } from "./package.json";
 
 const MODEL_ID = process.env.MODEL_ID ?? "Qwen/Qwen2.5-72B-Instruct";
 const PROVIDER = (process.env.PROVIDER as InferenceProvider) ?? "nebius";
-const BASE_URL = process.env.BASE_URL;
+const ENDPOINT_URL = process.env.ENDPOINT_URL ?? process.env.BASE_URL;
 
 const SERVERS: StdioServerParameters[] = [
 	{
@@ -50,9 +50,9 @@ async function main() {
 	}
 
 	const agent = new Agent(
-		BASE_URL
+		ENDPOINT_URL
 			? {
-					baseUrl: BASE_URL,
+					endpointUrl: ENDPOINT_URL,
 					model: MODEL_ID,
 					apiKey: process.env.HF_TOKEN,
 					servers: SERVERS,

packages/mcp-client/src/Agent.ts

@@ -49,18 +49,18 @@ export class Agent extends McpClient {
 
 	constructor({
 		provider,
-		baseUrl,
+		endpointUrl,
 		model,
 		apiKey,
 		servers,
 		prompt,
 	}: (
 		| {
 				provider: InferenceProvider;
-				baseUrl?: undefined;
+				endpointUrl?: undefined;
 		  }
 		| {
-				baseUrl: string;
+				endpointUrl: string;
 				provider?: undefined;
 		  }
 	) & {
@@ -69,7 +69,7 @@ export class Agent extends McpClient {
 		servers: StdioServerParameters[];
 		prompt?: string;
 	}) {
-		super(provider ? { provider, baseUrl, model, apiKey } : { provider, baseUrl, model, apiKey });
+		super(provider ? { provider, endpointUrl, model, apiKey } : { provider, endpointUrl, model, apiKey });
 		/// ^This shenanigan is just here to please an overzealous TS type-checker.
 		this.servers = servers;
 		this.messages = [

packages/mcp-client/src/McpClient.ts

@@ -2,7 +2,7 @@ import { Client } from "@modelcontextprotocol/sdk/client/index.js";
 import type { StdioServerParameters } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { StdioClientTransport } from "@modelcontextprotocol/sdk/client/stdio.js";
 import { InferenceClient } from "@huggingface/inference";
-import type { InferenceClientEndpoint, InferenceProviderOrPolicy } from "@huggingface/inference";
+import type { InferenceProviderOrPolicy } from "@huggingface/inference";
 import type {
 	ChatCompletionInputMessage,
 	ChatCompletionInputTool,
@@ -22,7 +22,7 @@ export interface ChatCompletionInputMessageTool extends ChatCompletionInputMessa
 }
 
 export class McpClient {
-	protected client: InferenceClient | InferenceClientEndpoint;
+	protected client: InferenceClient;
 	protected provider: InferenceProviderOrPolicy | undefined;
 
 	protected model: string;
@@ -31,23 +31,23 @@ export class McpClient {
 
 	constructor({
 		provider,
-		baseUrl,
+		endpointUrl,
 		model,
 		apiKey,
 	}: (
 		| {
 				provider: InferenceProviderOrPolicy;
-				baseUrl?: undefined;
+				endpointUrl?: undefined;
 		  }
 		| {
-				baseUrl: string;
+				endpointUrl: string;
 				provider?: undefined;
 		  }
 	) & {
 		model: string;
 		apiKey: string;
 	}) {
-		this.client = baseUrl ? new InferenceClient(apiKey).endpoint(baseUrl) : new InferenceClient(apiKey);
+		this.client = endpointUrl ? new InferenceClient(apiKey, { endpointUrl: endpointUrl }) : new InferenceClient(apiKey);
 		this.provider = provider;
 		this.model = model;
 	}