Fix URL Parse (#352)

js/package.json

@@ -1,6 +1,6 @@
 {
   "name": "langsmith",
-  "version": "0.0.57",
+  "version": "0.0.58",
   "description": "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform.",
   "files": [
     "dist/",

js/src/client.ts

@@ -204,7 +204,7 @@ export class Client {
     const apiKey = getEnvironmentVariable("LANGCHAIN_API_KEY");
     const apiUrl =
       getEnvironmentVariable("LANGCHAIN_ENDPOINT") ??
-      (apiKey ? "https://api.smith.langchain.com" : "http://localhost:1984");
+      "https://api.smith.langchain.com";
     return {
       apiUrl: apiUrl,
       apiKey: apiKey,
@@ -227,7 +227,10 @@ export class Client {
     } else if (isLocalhost(this.apiUrl)) {
       this.webUrl = "http://localhost";
       return "http://localhost";
-    } else if (this.apiUrl.includes("/api")) {
+    } else if (
+      this.apiUrl.includes("/api") &&
+      !this.apiUrl.split(".", 1)[0].endsWith("api")
+    ) {
       this.webUrl = this.apiUrl.replace("/api", "");
       return this.webUrl;
     } else if (this.apiUrl.split(".", 1)[0].includes("dev")) {
@@ -310,10 +313,10 @@ export class Client {
   private async *_getCursorPaginatedList<T>(
     path: string,
     body: Record<string, any> | null = null,
-    requestMethod: string = "POST",
-    dataKey: string = "runs"
+    requestMethod = "POST",
+    dataKey = "runs"
   ): AsyncIterable<T[]> {
-    let bodyParams = body ? { ...body } : {};
+    const bodyParams = body ? { ...body } : {};
     while (true) {
       const response = await this.caller.call(fetch, `${this.apiUrl}${path}`, {
         method: requestMethod,

js/src/tests/client.test.ts

@@ -4,7 +4,7 @@ import { Client } from "../client.js";
 describe("Client", () => {
   describe("createLLMExample", () => {
     it("should create an example with the given input and generation", async () => {
-      const client = new Client();
+      const client = new Client({ apiKey: "test-api-key" });
       const createExampleSpy = jest
         .spyOn(client, "createExample")
         .mockResolvedValue({
@@ -32,7 +32,7 @@ describe("Client", () => {
 
   describe("createChatExample", () => {
     it("should convert LangChainBaseMessage objects to examples", async () => {
-      const client = new Client();
+      const client = new Client({ apiKey: "test-api-key" });
       const createExampleSpy = jest
         .spyOn(client, "createExample")
         .mockResolvedValue({
@@ -74,4 +74,48 @@ describe("Client", () => {
       );
     });
   });
+
+  describe("getHostUrl", () => {
+    it("should return the webUrl if it exists", () => {
+      const client = new Client({
+        webUrl: "http://example.com",
+        apiKey: "test-api-key",
+      });
+      const result = (client as any).getHostUrl();
+      expect(result).toBe("http://example.com");
+    });
+
+    it("should return 'http://localhost' if apiUrl is localhost", () => {
+      const client = new Client({ apiUrl: "http://localhost/api" });
+      const result = (client as any).getHostUrl();
+      expect(result).toBe("http://localhost");
+    });
+
+    it("should return the webUrl without '/api' if apiUrl contains '/api'", () => {
+      const client = new Client({
+        webUrl: "https://example.com",
+        apiKey: "test-api-key",
+      });
+      const result = (client as any).getHostUrl();
+      expect(result).toBe("https://example.com");
+    });
+
+    it("should return 'https://dev.smith.langchain.com' if apiUrl contains 'dev'", () => {
+      const client = new Client({
+        apiUrl: "https://dev.smith.langchain.com/api",
+        apiKey: "test-api-key",
+      });
+      const result = (client as any).getHostUrl();
+      expect(result).toBe("https://dev.smith.langchain.com");
+    });
+
+    it("should return 'https://smith.langchain.com' for any other apiUrl", () => {
+      const client = new Client({
+        apiUrl: "https://smith.langchain.com/api",
+        apiKey: "test-api-key",
+      });
+      const result = (client as any).getHostUrl();
+      expect(result).toBe("https://smith.langchain.com");
+    });
+  });
 });

python/langsmith/client.py

@@ -215,7 +215,7 @@ def _get_api_url(api_url: Optional[str], api_key: Optional[str]) -> str:
         if api_url is not None
         else os.getenv(
             "LANGCHAIN_ENDPOINT",
-            "https://api.smith.langchain.com" if api_key else "http://localhost:1984",
+            "https://api.smith.langchain.com",
         )
     )
     if not _api_url.strip():
@@ -275,7 +275,7 @@ def __init__(
         ----------
         api_url : str or None, default=None
             URL for the LangSmith API. Defaults to the LANGCHAIN_ENDPOINT
-            environment variable or http://localhost:1984 if not set.
+            environment variable or https://api.smith.langchain.com if not set.
         api_key : str or None, default=None
             API key for the LangSmith API. Defaults to the LANGCHAIN_API_KEY
             environment variable.

python/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "langsmith"
-version = "0.0.79"
+version = "0.0.80"
 description = "Client library to connect to the LangSmith LLM Tracing and Evaluation Platform."
 authors = ["LangChain <[email protected]>"]
 license = "MIT"

python/tests/unit_tests/test_client.py

@@ -165,7 +165,7 @@ def test_get_api_url() -> None:
         assert _get_api_url(None, "api_key") == "https://api.smith.langchain.com"
 
     with patch.dict(os.environ, {}, clear=True):
-        assert _get_api_url(None, None) == "http://localhost:1984"
+        assert _get_api_url(None, None) == "https://api.smith.langchain.com"
 
     with patch.dict(os.environ, {"LANGCHAIN_ENDPOINT": "http://env.url"}):
         assert _get_api_url(None, None) == "http://env.url"