Filter for ts

langchain-ai · Nov 3, 2023 · cb3333c · cb3333c
1 parent 6d53e81
commit cb3333c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 3 deletions.
diff --git a/js/src/client.ts b/js/src/client.ts
@@ -166,6 +166,13 @@ function hideOutputs(outputs: KVMap): KVMap {
   }
   return outputs;
 }
+
+function assertUuid(str: string): void {
+  if (!uuid.validate(str)) {
+    throw new Error(`Invalid UUID: ${str}`);
+  }
+}
+
 export class Client {
   private apiKey?: string;
 
@@ -331,6 +338,7 @@ export class Client {
   }
 
   public async updateRun(runId: string, run: RunUpdate): Promise<void> {
+    assertUuid(runId);
     if (run.inputs) {
       run.inputs = hideInputs(run.inputs);
     }
@@ -356,6 +364,7 @@ export class Client {
     runId: string,
     { loadChildRuns }: { loadChildRuns: boolean } = { loadChildRuns: false }
   ): Promise<Run> {
+    assertUuid(runId);
     let run = await this._get<Run>(`/runs/${runId}`);
     if (loadChildRuns && run.child_run_ids) {
       run = await this._loadChildRuns(run);
@@ -509,6 +518,7 @@ export class Client {
       run_id: runId,
       share_token: shareId || uuid.v4(),
     };
+    assertUuid(runId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/runs/${runId}/share`,
@@ -527,6 +537,7 @@ export class Client {
   }
 
   public async unshareRun(runId: string): Promise<void> {
+    assertUuid(runId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/runs/${runId}/share`,
@@ -540,6 +551,7 @@ export class Client {
   }
 
   public async readRunSharedLink(runId: string): Promise<string | undefined> {
+    assertUuid(runId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/runs/${runId}/share`,
@@ -572,6 +584,7 @@ export class Client {
         queryParams.append("id", runId);
       }
     }
+    assertUuid(shareToken);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/public/${shareToken}/runs${queryParams}`,
@@ -596,6 +609,7 @@ export class Client {
       const dataset = await this.readDataset({ datasetName });
       datasetId = dataset.id;
     }
+    assertUuid(datasetId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/datasets/${datasetId}/share`,
@@ -626,6 +640,7 @@ export class Client {
     const data = {
       dataset_id: datasetId,
     };
+    assertUuid(datasetId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/datasets/${datasetId}/share`,
@@ -644,6 +659,7 @@ export class Client {
   }
 
   public async unshareDataset(datasetId: string): Promise<void> {
+    assertUuid(datasetId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/datasets/${datasetId}/share`,
@@ -657,6 +673,7 @@ export class Client {
   }
 
   public async readSharedDataset(shareToken: string): Promise<Dataset> {
+    assertUuid(shareToken);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/public/${shareToken}/datasets`,
@@ -719,6 +736,7 @@ export class Client {
     if (projectId !== undefined && projectName !== undefined) {
       throw new Error("Must provide either projectName or projectId, not both");
     } else if (projectId !== undefined) {
+      assertUuid(projectId);
       path += `/${projectId}`;
     } else if (projectName !== undefined) {
       params.append("name", projectName);
@@ -822,6 +840,7 @@ export class Client {
     } else {
       projectId_ = projectId;
     }
+    assertUuid(projectId_);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/sessions/${projectId_}`,
@@ -935,6 +954,7 @@ export class Client {
     if (datasetId !== undefined && datasetName !== undefined) {
       throw new Error("Must provide either datasetName or datasetId, not both");
     } else if (datasetId !== undefined) {
+      assertUuid(datasetId);
       path += `/${datasetId}`;
     } else if (datasetName !== undefined) {
       params.append("name", datasetName);
@@ -1030,6 +1050,7 @@ export class Client {
       datasetId_ = dataset.id;
     }
     if (datasetId_ !== undefined) {
+      assertUuid(datasetId_);
       path += `/${datasetId_}`;
     } else {
       throw new Error("Must provide datasetName or datasetId");
@@ -1118,6 +1139,7 @@ export class Client {
   }
 
   public async readExample(exampleId: string): Promise<Example> {
+    assertUuid(exampleId);
     const path = `/examples/${exampleId}`;
     return await this._get<Example>(path);
   }
@@ -1157,6 +1179,7 @@ export class Client {
   }
 
   public async deleteExample(exampleId: string): Promise<void> {
+    assertUuid(exampleId);
     const path = `/examples/${exampleId}`;
     const response = await this.caller.call(fetch, this.apiUrl + path, {
       method: "DELETE",
@@ -1175,6 +1198,7 @@ export class Client {
     exampleId: string,
     update: ExampleUpdate
   ): Promise<object> {
+    assertUuid(exampleId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/examples/${exampleId}`,
@@ -1268,6 +1292,12 @@ export class Client {
     ) {
       feedback_source.metadata["__run"] = { run_id: sourceRunId };
     }
+    if (
+      feedback_source?.metadata !== undefined &&
+      feedback_source.metadata["__run"]?.run_id !== undefined
+    ) {
+      assertUuid(feedback_source.metadata["__run"].run_id);
+    }
     const feedback: FeedbackCreate = {
       id: feedbackId ?? uuid.v4(),
       run_id: runId,
@@ -1316,6 +1346,7 @@ export class Client {
     if (comment !== undefined && comment !== null) {
       feedbackUpdate["comment"] = comment;
     }
+    assertUuid(feedbackId);
     const response = await this.caller.call(
       fetch,
       `${this.apiUrl}/feedback/${feedbackId}`,
@@ -1330,12 +1361,14 @@ export class Client {
   }
 
   public async readFeedback(feedbackId: string): Promise<Feedback> {
+    assertUuid(feedbackId);
     const path = `/feedback/${feedbackId}`;
     const response = await this._get<Feedback>(path);
     return response;
   }
 
   public async deleteFeedback(feedbackId: string): Promise<void> {
+    assertUuid(feedbackId);
     const path = `/feedback/${feedbackId}`;
     const response = await this.caller.call(fetch, this.apiUrl + path, {
       method: "DELETE",

diff --git a/js/src/tests/client.int.test.ts b/js/src/tests/client.int.test.ts
@@ -1,9 +1,11 @@
-import { Client } from "../client.js";
+import { Dataset, Feedback, Run } from "../schemas.js";
+import { FunctionMessage, HumanMessage } from "langchain/schema";
 import { RunTree, RunTreeConfig } from "../run_trees.js";
+
+import { Client } from "../client.js";
 import { StringEvaluator } from "../evaluation/string_evaluator.js";
-import { Dataset, Feedback, Run } from "../schemas.js";
 import { v4 as uuidv4 } from "uuid";
-import { HumanMessage, FunctionMessage } from "langchain/schema";
+
 async function toArray<T>(iterable: AsyncIterable<T>): Promise<T[]> {
   const result: T[] = [];
   for await (const item of iterable) {

diff --git a/python/langsmith/client.py b/python/langsmith/client.py
@@ -2034,6 +2034,11 @@ def create_feedback(
         )
         if source_run_id is not None and "__run" not in feedback_source.metadata:
             feedback_source.metadata["__run"] = {"run_id": str(source_run_id)}
+        if feedback_source.metadata and "__run" in feedback_source.metadata:
+            # Validate that the linked run ID is a valid UUID
+            feedback_source.metadata["__run"]["run_id"] = str(
+                _as_uuid(feedback_source.metadata["__run"]["run_id"])
+            )
         feedback = ls_schemas.FeedbackCreate(
             id=feedback_id or uuid.uuid4(),
             run_id=run_id,