Delete Experiments (#3348)

bifrost/lib/clients/jawnTypes/private.ts

@@ -53,6 +53,7 @@ export interface paths {
   };
   "/v2/experiment/{experimentId}": {
     get: operations["GetExperimentById"];
+    delete: operations["DeleteExperiment"];
   };
   "/v2/experiment/{experimentId}/prompt-version": {
     post: operations["CreateNewPromptVersionForExperiment"];
@@ -2500,6 +2501,21 @@ export interface operations {
       };
     };
   };
+  DeleteExperiment: {
+    parameters: {
+      path: {
+        experimentId: string;
+      };
+    };
+    responses: {
+      /** @description Ok */
+      200: {
+        content: {
+          "application/json": components["schemas"]["Result_null.string_"];
+        };
+      };
+    };
+  };
   CreateNewPromptVersionForExperiment: {
     parameters: {
       path: {

bifrost/lib/clients/jawnTypes/public.ts

@@ -114,6 +114,7 @@ export interface paths {
   };
   "/v2/experiment/{experimentId}": {
     get: operations["GetExperimentById"];
+    delete: operations["DeleteExperiment"];
   };
   "/v2/experiment/{experimentId}/prompt-version": {
     post: operations["CreateNewPromptVersionForExperiment"];
@@ -3202,6 +3203,21 @@ export interface operations {
       };
     };
   };
+  DeleteExperiment: {
+    parameters: {
+      path: {
+        experimentId: string;
+      };
+    };
+    responses: {
+      /** @description Ok */
+      200: {
+        content: {
+          "application/json": components["schemas"]["Result_null.string_"];
+        };
+      };
+    };
+  };
   CreateNewPromptVersionForExperiment: {
     parameters: {
       path: {

docs/swagger.json

@@ -9647,6 +9647,39 @@
 			}
 		},
 		"/v2/experiment/{experimentId}": {
+			"delete": {
+				"operationId": "DeleteExperiment",
+				"responses": {
+					"200": {
+						"description": "Ok",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Result_null.string_"
+								}
+							}
+						}
+					}
+				},
+				"tags": [
+					"Experiment"
+				],
+				"security": [
+					{
+						"api_key": []
+					}
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "experimentId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					}
+				]
+			},
 			"get": {
 				"operationId": "GetExperimentById",
 				"responses": {

helicone-cron/src/db/database.types.ts

@@ -758,6 +758,7 @@ export type Database = {
           name: string
           organization: string
           original_prompt_version: string
+          soft_delete: boolean
         }
         Insert: {
           copied_original_prompt_version?: string | null
@@ -767,6 +768,7 @@ export type Database = {
           name: string
           organization: string
           original_prompt_version: string
+          soft_delete?: boolean
         }
         Update: {
           copied_original_prompt_version?: string | null
@@ -776,6 +778,7 @@ export type Database = {
           name?: string
           organization?: string
           original_prompt_version?: string
+          soft_delete?: boolean
         }
         Relationships: [
           {
@@ -2932,14 +2935,6 @@ export type Database = {
             }
             Returns: boolean
           }
-      create_main_org: {
-        Args: {
-          user_id: string
-        }
-        Returns: {
-          organization_id: string
-        }[]
-      }
       date_count:
         | {
             Args: {
@@ -3245,7 +3240,7 @@ export type Database = {
         Args: {
           name: string
         }
-        Returns: unknown
+        Returns: string[]
       }
       get_size_by_bucket: {
         Args: Record<PropertyKey, never>

supabase/migrations/20250301041914_experiments_soft_delete.sql

@@ -0,0 +1 @@
+alter table "public"."experiment_v3" add column "soft_delete" boolean not null default false;

valhalla/jawn/src/controllers/public/experimentV2Controller.ts

@@ -229,6 +229,23 @@ export class ExperimentV2Controller extends Controller {
     return result;
   }
 
+  @Delete("/{experimentId}")
+  public async deleteExperiment(
+    @Path() experimentId: string,
+    @Request() request: JawnAuthenticatedRequest
+  ): Promise<Result<null, string>> {
+    const experimentManager = new ExperimentV2Manager(request.authParams);
+    const result = await experimentManager.deleteExperiment(experimentId);
+
+    if (result.error) {
+      this.setStatus(500);
+    } else {
+      this.setStatus(200);
+    }
+
+    return result;
+  }
+
   @Get("/{experimentId}")
   public async getExperimentById(
     @Path() experimentId: string,

valhalla/jawn/src/lib/db/database.types.ts

@@ -758,6 +758,7 @@ export type Database = {
           name: string
           organization: string
           original_prompt_version: string
+          soft_delete: boolean
         }
         Insert: {
           copied_original_prompt_version?: string | null
@@ -767,6 +768,7 @@ export type Database = {
           name: string
           organization: string
           original_prompt_version: string
+          soft_delete?: boolean
         }
         Update: {
           copied_original_prompt_version?: string | null
@@ -776,6 +778,7 @@ export type Database = {
           name?: string
           organization?: string
           original_prompt_version?: string
+          soft_delete?: boolean
         }
         Relationships: [
           {
@@ -2932,14 +2935,6 @@ export type Database = {
             }
             Returns: boolean
           }
-      create_main_org: {
-        Args: {
-          user_id: string
-        }
-        Returns: {
-          organization_id: string
-        }[]
-      }
       date_count:
         | {
             Args: {
@@ -3245,7 +3240,7 @@ export type Database = {
         Args: {
           name: string
         }
-        Returns: unknown
+        Returns: string[]
       }
       get_size_by_bucket: {
         Args: Record<PropertyKey, never>

valhalla/jawn/src/managers/experiment/ExperimentV2Manager.ts

@@ -110,7 +110,9 @@ export class ExperimentV2Manager extends BaseManager {
       const response = await supabaseServer.client
         .from("experiment_v3")
         .select("*")
-        .eq("organization", this.authParams.organizationId);
+        .eq("organization", this.authParams.organizationId)
+        .eq("soft_delete", false)
+        .order("created_at", { ascending: false });
 
       return ok(response.data ?? []);
     } catch (e) {
@@ -128,6 +130,25 @@ export class ExperimentV2Manager extends BaseManager {
     return experiment.data ?? null;
   }
 
+  async deleteExperiment(experimentId: string): Promise<Result<null, string>> {
+    const experiment = await this.hasAccessToExperiment(experimentId);
+    if (!experiment) {
+      return err("Experiment not found");
+    }
+
+    const result = await supabaseServer.client
+      .from("experiment_v3")
+      .update({ soft_delete: true })
+      .eq("id", experimentId)
+      .eq("organization", this.authParams.organizationId);
+
+    if (result.error) {
+      return err("Failed to delete experiment");
+    }
+
+    return ok(null);
+  }
+
   // this query needs to be better imo
   async createNewExperiment(
     name: string,

valhalla/jawn/src/tsoa-build/private/routes.ts

@@ -2470,6 +2470,38 @@ export function RegisterRoutes(app: Router) {
             }
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+        app.delete('/v2/experiment/:experimentId',
+            authenticateMiddleware([{"api_key":[]}]),
+            ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller)),
+            ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller.prototype.deleteExperiment)),
+
+            async function ExperimentV2Controller_deleteExperiment(request: ExRequest, response: ExResponse, next: any) {
+            const args: Record<string, TsoaRoute.ParameterSchema> = {
+                    experimentId: {"in":"path","name":"experimentId","required":true,"dataType":"string"},
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
+            };
+
+            // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+
+            let validatedArgs: any[] = [];
+            try {
+                validatedArgs = templateService.getValidatedArgs({ args, request, response });
+
+                const controller = new ExperimentV2Controller();
+
+              await templateService.apiHandler({
+                methodName: 'deleteExperiment',
+                controller,
+                response,
+                next,
+                validatedArgs,
+                successStatus: undefined,
+              });
+            } catch (err) {
+                return next(err);
+            }
+        });
+        // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.get('/v2/experiment/:experimentId',
             authenticateMiddleware([{"api_key":[]}]),
             ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller)),

valhalla/jawn/src/tsoa-build/private/swagger.json

@@ -6718,6 +6718,39 @@
 			}
 		},
 		"/v2/experiment/{experimentId}": {
+			"delete": {
+				"operationId": "DeleteExperiment",
+				"responses": {
+					"200": {
+						"description": "Ok",
+						"content": {
+							"application/json": {
+								"schema": {
+									"$ref": "#/components/schemas/Result_null.string_"
+								}
+							}
+						}
+					}
+				},
+				"tags": [
+					"Experiment"
+				],
+				"security": [
+					{
+						"api_key": []
+					}
+				],
+				"parameters": [
+					{
+						"in": "path",
+						"name": "experimentId",
+						"required": true,
+						"schema": {
+							"type": "string"
+						}
+					}
+				]
+			},
 			"get": {
 				"operationId": "GetExperimentById",
 				"responses": {

valhalla/jawn/src/tsoa-build/public/routes.ts

@@ -3920,6 +3920,38 @@ export function RegisterRoutes(app: Router) {
             }
         });
         // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+        app.delete('/v2/experiment/:experimentId',
+            authenticateMiddleware([{"api_key":[]}]),
+            ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller)),
+            ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller.prototype.deleteExperiment)),
+
+            async function ExperimentV2Controller_deleteExperiment(request: ExRequest, response: ExResponse, next: any) {
+            const args: Record<string, TsoaRoute.ParameterSchema> = {
+                    experimentId: {"in":"path","name":"experimentId","required":true,"dataType":"string"},
+                    request: {"in":"request","name":"request","required":true,"dataType":"object"},
+            };
+
+            // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
+
+            let validatedArgs: any[] = [];
+            try {
+                validatedArgs = templateService.getValidatedArgs({ args, request, response });
+
+                const controller = new ExperimentV2Controller();
+
+              await templateService.apiHandler({
+                methodName: 'deleteExperiment',
+                controller,
+                response,
+                next,
+                validatedArgs,
+                successStatus: undefined,
+              });
+            } catch (err) {
+                return next(err);
+            }
+        });
+        // WARNING: This file was auto-generated with tsoa. Please do not modify it. Re-run tsoa to re-generate this file: https://github.com/lukeautry/tsoa
         app.get('/v2/experiment/:experimentId',
             authenticateMiddleware([{"api_key":[]}]),
             ...(fetchMiddlewares<RequestHandler>(ExperimentV2Controller)),