npm - promptfoo - Versions diffs - 0.71.1 → 0.72.1 - Mend

promptfoo 0.71.1 → 0.72.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (121) hide show

package/dist/src/util/index.d.ts CHANGED Viewed

@@ -15,7 +15,7 @@ export declare function writeResultsToDatabase(results: EvaluateSummary, config:
  *
  * @returns Last n evals in descending order.
  */
-export declare function listPreviousResults(limit?: number, filterDescription?: string): ResultLightweight[];
+export declare function listPreviousResults(limit?: number, filterDescription?: string, datasetId?: string): ResultLightweight[];
 /**
  * @deprecated Used only for migration to sqlite
  */
@@ -51,9 +51,527 @@ export declare function getPromptsForTestCasesHash(testCasesSha256: string, limi
 export declare function getPromptsForTestCases(testCases: TestCase[]): Promise<PromptWithMetadata[]>;
 export declare function getTestCasesWithPredicate(predicate: (result: ResultsFile) => boolean, limit: number): Promise<TestCasesWithMetadata[]>;
 export declare function getPrompts(limit?: number): Promise<PromptWithMetadata[]>;
-export declare function getTestCases(limit?: number): Promise<TestCasesWithMetadata[]>;
+export declare function getTestCases(limit?: number): Promise<{
+    prompts: {
+        id: string;
+        prompt: {
+            label: string;
+            provider: string;
+            raw: string;
+            function?: ((args_0: {
+                vars: Record<string, any>;
+                provider?: {
+                    id: (...args: unknown[]) => string;
+                    callApi: (((args_0: string, args_1: {
+                        vars: Record<string, string | {}>;
+                        logger?: any;
+                        fetchWithCache?: any;
+                        getCache?: any;
+                    } | undefined, args_2: {
+                        includeLogProbs?: boolean | undefined;
+                        originalProvider?: any;
+                    } | undefined, ...args_3: unknown[]) => Promise<{
+                        output?: any;
+                        cached?: boolean | undefined;
+                        cost?: number | undefined;
+                        error?: string | undefined;
+                        logProbs?: number[] | undefined;
+                        metadata?: import("zod").objectOutputType<{
+                            redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                        }, import("zod").ZodAny, "strip"> | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                    }>) & {
+                        label?: string | undefined;
+                    }) | (((args_0: string, args_1: {
+                        includeLogProbs?: boolean | undefined;
+                        originalProvider?: any;
+                    } | undefined, ...args_2: unknown[]) => Promise<{
+                        output?: any;
+                        cached?: boolean | undefined;
+                        cost?: number | undefined;
+                        error?: string | undefined;
+                        logProbs?: number[] | undefined;
+                        metadata?: import("zod").objectOutputType<{
+                            redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                        }, import("zod").ZodAny, "strip"> | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                    }>) & {
+                        label?: string | undefined;
+                    });
+                    delay?: number | undefined;
+                    label?: string | undefined;
+                    transform?: string | undefined;
+                    callEmbeddingApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                        error?: string | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                        embedding?: number[] | undefined;
+                    }>) | undefined;
+                    callClassificationApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                        error?: string | undefined;
+                        classification?: Record<string, number> | undefined;
+                    }>) | undefined;
+                } | undefined;
+            }, ...args_1: unknown[]) => Promise<any>) | undefined;
+            id?: string | undefined;
+            display?: string | undefined;
+            metrics?: {
+                cost: number;
+                tokenUsage: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                };
+                score: number;
+                testPassCount: number;
+                testFailCount: number;
+                assertPassCount: number;
+                assertFailCount: number;
+                totalLatencyMs: number;
+                namedScores: Record<string, number>;
+            } | undefined;
+        };
+        evalId: string;
+    }[];
+    id: string;
+    testCases: string | (string | {
+        options?: ({
+            prefix?: string | undefined;
+            suffix?: string | undefined;
+        } & {
+            transform?: string | undefined;
+            postprocess?: string | undefined;
+            storeOutputAs?: string | undefined;
+        } & {
+            rubricPrompt?: string | string[] | undefined;
+            provider?: any;
+            factuality?: {
+                subset?: number | undefined;
+                superset?: number | undefined;
+                agree?: number | undefined;
+                disagree?: number | undefined;
+                differButFactual?: number | undefined;
+            } | undefined;
+        } & {
+            disableVarExpansion?: boolean | undefined;
+            disableConversationVar?: boolean | undefined;
+        }) | undefined;
+        vars?: Record<string, string | string[] | {}> | undefined;
+        provider?: string | {
+            prompts?: string[] | undefined;
+            delay?: number | undefined;
+            config?: any;
+            id?: string | undefined;
+            label?: string | undefined;
+            transform?: string | undefined;
+            env?: {
+                ANTHROPIC_API_KEY?: string | undefined;
+                BAM_API_KEY?: string | undefined;
+                BAM_API_HOST?: string | undefined;
+                AZURE_OPENAI_API_HOST?: string | undefined;
+                AZURE_OPENAI_API_KEY?: string | undefined;
+                AZURE_OPENAI_API_BASE_URL?: string | undefined;
+                AZURE_OPENAI_BASE_URL?: string | undefined;
+                AWS_BEDROCK_REGION?: string | undefined;
+                COHERE_API_KEY?: string | undefined;
+                OPENAI_API_KEY?: string | undefined;
+                OPENAI_API_HOST?: string | undefined;
+                OPENAI_API_BASE_URL?: string | undefined;
+                OPENAI_BASE_URL?: string | undefined;
+                OPENAI_ORGANIZATION?: string | undefined;
+                REPLICATE_API_KEY?: string | undefined;
+                REPLICATE_API_TOKEN?: string | undefined;
+                LOCALAI_BASE_URL?: string | undefined;
+                MISTRAL_API_HOST?: string | undefined;
+                MISTRAL_API_BASE_URL?: string | undefined;
+                PALM_API_KEY?: string | undefined;
+                PALM_API_HOST?: string | undefined;
+                GOOGLE_API_KEY?: string | undefined;
+                GOOGLE_API_HOST?: string | undefined;
+                VERTEX_API_KEY?: string | undefined;
+                VERTEX_API_HOST?: string | undefined;
+                VERTEX_PROJECT_ID?: string | undefined;
+                VERTEX_REGION?: string | undefined;
+                VERTEX_PUBLISHER?: string | undefined;
+                MISTRAL_API_KEY?: string | undefined;
+                CLOUDFLARE_API_KEY?: string | undefined;
+                CLOUDFLARE_ACCOUNT_ID?: string | undefined;
+            } | undefined;
+        } | {
+            id: (...args: unknown[]) => string;
+            callApi: (((args_0: string, args_1: {
+                vars: Record<string, string | {}>;
+                logger?: any;
+                fetchWithCache?: any;
+                getCache?: any;
+            } | undefined, args_2: {
+                includeLogProbs?: boolean | undefined;
+                originalProvider?: any;
+            } | undefined, ...args_3: unknown[]) => Promise<{
+                output?: any;
+                cached?: boolean | undefined;
+                cost?: number | undefined;
+                error?: string | undefined;
+                logProbs?: number[] | undefined;
+                metadata?: import("zod").objectOutputType<{
+                    redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                }, import("zod").ZodAny, "strip"> | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+            }>) & {
+                label?: string | undefined;
+            }) | (((args_0: string, args_1: {
+                includeLogProbs?: boolean | undefined;
+                originalProvider?: any;
+            } | undefined, ...args_2: unknown[]) => Promise<{
+                output?: any;
+                cached?: boolean | undefined;
+                cost?: number | undefined;
+                error?: string | undefined;
+                logProbs?: number[] | undefined;
+                metadata?: import("zod").objectOutputType<{
+                    redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                }, import("zod").ZodAny, "strip"> | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+            }>) & {
+                label?: string | undefined;
+            });
+            delay?: number | undefined;
+            label?: string | undefined;
+            transform?: string | undefined;
+            callEmbeddingApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                error?: string | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+                embedding?: number[] | undefined;
+            }>) | undefined;
+            callClassificationApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                error?: string | undefined;
+                classification?: Record<string, number> | undefined;
+            }>) | undefined;
+        } | undefined;
+        description?: string | undefined;
+        providerOutput?: string | {} | undefined;
+        assert?: ({
+            type: import("../types").AssertionType;
+            value?: import("../types").AssertionValue | undefined;
+            transform?: string | undefined;
+            rubricPrompt?: string | string[] | undefined;
+            provider?: any;
+            threshold?: number | undefined;
+            weight?: number | undefined;
+            metric?: string | undefined;
+        } | {
+            type: "assert-set";
+            assert: {
+                type: import("../types").AssertionType;
+                value?: import("../types").AssertionValue | undefined;
+                transform?: string | undefined;
+                rubricPrompt?: string | string[] | undefined;
+                provider?: any;
+                threshold?: number | undefined;
+                weight?: number | undefined;
+                metric?: string | undefined;
+            }[];
+            threshold?: number | undefined;
+            weight?: number | undefined;
+            metric?: string | undefined;
+        })[] | undefined;
+        threshold?: number | undefined;
+    })[];
+    recentEvalDate: Date;
+    recentEvalId: string;
+    count: number;
+}[]>;
 export declare function getPromptFromHash(hash: string): Promise<PromptWithMetadata | undefined>;
-export declare function getDatasetFromHash(hash: string): Promise<TestCasesWithMetadata | undefined>;
+export declare function getDatasetFromHash(hash: string): Promise<{
+    prompts: {
+        id: string;
+        prompt: {
+            label: string;
+            provider: string;
+            raw: string;
+            function?: ((args_0: {
+                vars: Record<string, any>;
+                provider?: {
+                    id: (...args: unknown[]) => string;
+                    callApi: (((args_0: string, args_1: {
+                        vars: Record<string, string | {}>;
+                        logger?: any;
+                        fetchWithCache?: any;
+                        getCache?: any;
+                    } | undefined, args_2: {
+                        includeLogProbs?: boolean | undefined;
+                        originalProvider?: any;
+                    } | undefined, ...args_3: unknown[]) => Promise<{
+                        output?: any;
+                        cached?: boolean | undefined;
+                        cost?: number | undefined;
+                        error?: string | undefined;
+                        logProbs?: number[] | undefined;
+                        metadata?: import("zod").objectOutputType<{
+                            redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                        }, import("zod").ZodAny, "strip"> | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                    }>) & {
+                        label?: string | undefined;
+                    }) | (((args_0: string, args_1: {
+                        includeLogProbs?: boolean | undefined;
+                        originalProvider?: any;
+                    } | undefined, ...args_2: unknown[]) => Promise<{
+                        output?: any;
+                        cached?: boolean | undefined;
+                        cost?: number | undefined;
+                        error?: string | undefined;
+                        logProbs?: number[] | undefined;
+                        metadata?: import("zod").objectOutputType<{
+                            redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                        }, import("zod").ZodAny, "strip"> | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                    }>) & {
+                        label?: string | undefined;
+                    });
+                    delay?: number | undefined;
+                    label?: string | undefined;
+                    transform?: string | undefined;
+                    callEmbeddingApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                        error?: string | undefined;
+                        tokenUsage?: {
+                            prompt?: number | undefined;
+                            cached?: number | undefined;
+                            completion?: number | undefined;
+                            total?: number | undefined;
+                        } | undefined;
+                        embedding?: number[] | undefined;
+                    }>) | undefined;
+                    callClassificationApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                        error?: string | undefined;
+                        classification?: Record<string, number> | undefined;
+                    }>) | undefined;
+                } | undefined;
+            }, ...args_1: unknown[]) => Promise<any>) | undefined;
+            id?: string | undefined;
+            display?: string | undefined;
+            metrics?: {
+                cost: number;
+                tokenUsage: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                };
+                score: number;
+                testPassCount: number;
+                testFailCount: number;
+                assertPassCount: number;
+                assertFailCount: number;
+                totalLatencyMs: number;
+                namedScores: Record<string, number>;
+            } | undefined;
+        };
+        evalId: string;
+    }[];
+    id: string;
+    testCases: string | (string | {
+        options?: ({
+            prefix?: string | undefined;
+            suffix?: string | undefined;
+        } & {
+            transform?: string | undefined;
+            postprocess?: string | undefined;
+            storeOutputAs?: string | undefined;
+        } & {
+            rubricPrompt?: string | string[] | undefined;
+            provider?: any;
+            factuality?: {
+                subset?: number | undefined;
+                superset?: number | undefined;
+                agree?: number | undefined;
+                disagree?: number | undefined;
+                differButFactual?: number | undefined;
+            } | undefined;
+        } & {
+            disableVarExpansion?: boolean | undefined;
+            disableConversationVar?: boolean | undefined;
+        }) | undefined;
+        vars?: Record<string, string | string[] | {}> | undefined;
+        provider?: string | {
+            prompts?: string[] | undefined;
+            delay?: number | undefined;
+            config?: any;
+            id?: string | undefined;
+            label?: string | undefined;
+            transform?: string | undefined;
+            env?: {
+                ANTHROPIC_API_KEY?: string | undefined;
+                BAM_API_KEY?: string | undefined;
+                BAM_API_HOST?: string | undefined;
+                AZURE_OPENAI_API_HOST?: string | undefined;
+                AZURE_OPENAI_API_KEY?: string | undefined;
+                AZURE_OPENAI_API_BASE_URL?: string | undefined;
+                AZURE_OPENAI_BASE_URL?: string | undefined;
+                AWS_BEDROCK_REGION?: string | undefined;
+                COHERE_API_KEY?: string | undefined;
+                OPENAI_API_KEY?: string | undefined;
+                OPENAI_API_HOST?: string | undefined;
+                OPENAI_API_BASE_URL?: string | undefined;
+                OPENAI_BASE_URL?: string | undefined;
+                OPENAI_ORGANIZATION?: string | undefined;
+                REPLICATE_API_KEY?: string | undefined;
+                REPLICATE_API_TOKEN?: string | undefined;
+                LOCALAI_BASE_URL?: string | undefined;
+                MISTRAL_API_HOST?: string | undefined;
+                MISTRAL_API_BASE_URL?: string | undefined;
+                PALM_API_KEY?: string | undefined;
+                PALM_API_HOST?: string | undefined;
+                GOOGLE_API_KEY?: string | undefined;
+                GOOGLE_API_HOST?: string | undefined;
+                VERTEX_API_KEY?: string | undefined;
+                VERTEX_API_HOST?: string | undefined;
+                VERTEX_PROJECT_ID?: string | undefined;
+                VERTEX_REGION?: string | undefined;
+                VERTEX_PUBLISHER?: string | undefined;
+                MISTRAL_API_KEY?: string | undefined;
+                CLOUDFLARE_API_KEY?: string | undefined;
+                CLOUDFLARE_ACCOUNT_ID?: string | undefined;
+            } | undefined;
+        } | {
+            id: (...args: unknown[]) => string;
+            callApi: (((args_0: string, args_1: {
+                vars: Record<string, string | {}>;
+                logger?: any;
+                fetchWithCache?: any;
+                getCache?: any;
+            } | undefined, args_2: {
+                includeLogProbs?: boolean | undefined;
+                originalProvider?: any;
+            } | undefined, ...args_3: unknown[]) => Promise<{
+                output?: any;
+                cached?: boolean | undefined;
+                cost?: number | undefined;
+                error?: string | undefined;
+                logProbs?: number[] | undefined;
+                metadata?: import("zod").objectOutputType<{
+                    redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                }, import("zod").ZodAny, "strip"> | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+            }>) & {
+                label?: string | undefined;
+            }) | (((args_0: string, args_1: {
+                includeLogProbs?: boolean | undefined;
+                originalProvider?: any;
+            } | undefined, ...args_2: unknown[]) => Promise<{
+                output?: any;
+                cached?: boolean | undefined;
+                cost?: number | undefined;
+                error?: string | undefined;
+                logProbs?: number[] | undefined;
+                metadata?: import("zod").objectOutputType<{
+                    redteamFinalPrompt: import("zod").ZodOptional<import("zod").ZodString>;
+                }, import("zod").ZodAny, "strip"> | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+            }>) & {
+                label?: string | undefined;
+            });
+            delay?: number | undefined;
+            label?: string | undefined;
+            transform?: string | undefined;
+            callEmbeddingApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                error?: string | undefined;
+                tokenUsage?: {
+                    prompt?: number | undefined;
+                    cached?: number | undefined;
+                    completion?: number | undefined;
+                    total?: number | undefined;
+                } | undefined;
+                embedding?: number[] | undefined;
+            }>) | undefined;
+            callClassificationApi?: ((args_0: string, ...args_1: unknown[]) => Promise<{
+                error?: string | undefined;
+                classification?: Record<string, number> | undefined;
+            }>) | undefined;
+        } | undefined;
+        description?: string | undefined;
+        providerOutput?: string | {} | undefined;
+        assert?: ({
+            type: import("../types").AssertionType;
+            value?: import("../types").AssertionValue | undefined;
+            transform?: string | undefined;
+            rubricPrompt?: string | string[] | undefined;
+            provider?: any;
+            threshold?: number | undefined;
+            weight?: number | undefined;
+            metric?: string | undefined;
+        } | {
+            type: "assert-set";
+            assert: {
+                type: import("../types").AssertionType;
+                value?: import("../types").AssertionValue | undefined;
+                transform?: string | undefined;
+                rubricPrompt?: string | string[] | undefined;
+                provider?: any;
+                threshold?: number | undefined;
+                weight?: number | undefined;
+                metric?: string | undefined;
+            }[];
+            threshold?: number | undefined;
+            weight?: number | undefined;
+            metric?: string | undefined;
+        })[] | undefined;
+        threshold?: number | undefined;
+    })[];
+    recentEvalDate: Date;
+    recentEvalId: string;
+    count: number;
+} | undefined>;
 export declare function getEvalsWithPredicate(predicate: (result: ResultsFile) => boolean, limit: number): Promise<EvalWithMetadata[]>;
 export declare function getEvals(limit?: number): Promise<EvalWithMetadata[]>;
 export declare function getEvalFromId(hash: string): Promise<EvalWithMetadata | undefined>;

package/dist/src/util/index.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"AA6BA,OAAO,EACL,KAAK,gBAAgB,EACrB,KAAK,cAAc,EACnB,KAAK,eAAe,EACpB,KAAK,aAAa,EAElB,KAAK,iBAAiB,EACtB,KAAK,kBAAkB,EACvB,KAAK,WAAW,EAChB,KAAK,QAAQ,EACb,KAAK,qBAAqB,EAE1B,KAAK,aAAa,EAClB,KAAK,UAAU,EACf,KAAK,MAAM,EACX,KAAK,eAAe,EAEpB,KAAK,iBAAiB,EAIvB,MAAM,UAAU,CAAC;AAKlB,wBAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,iBAqF5B;AAED,wBAAsB,oBAAoB,CACxC,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,MAAM,GAAG,IAAI,EACrB,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAC9B,YAAY,EAAE,MAAM,GAAG,IAAI,iBAK5B;AAED,wBAAgB,MAAM,CAAC,GAAG,EAAE,MAAM,UAEjC;AAED,wBAAsB,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CASxE;AAID,wBAAgB,sBAAsB,CAAC,iBAAiB,GAAE,OAAe,GAAG,MAAM,CAMjF;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAE5D;AAED;;;GAGG;AACH,wBAAgB,oBAAoB,IAAI,MAAM,CAE7C;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,eAAe,EACxB,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,EAC9B,SAAS,CAAC,EAAE,IAAI,GACf,OAAO,CAAC,MAAM,CAAC,CA4FjB;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CACjC,KAAK,GAAE,MAA4B,EACnC,iBAAiB,CAAC,EAAE,MAAM,~~GACzB~~,iBAAiB,EAAE,~~CAyBrB~~;AAED;;GAEG;AACH,wBAAgB,sCAAsC,IAAI,MAAM,EAAE,CAYjE;AAID;;GAEG;AACH,wBAAgB,8BAA8B,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,WAAW,CAAC,EAAE,MAAM,CAAA;CAAE,EAAE,CAqB7F;AAED,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,QAqB9C;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,UAExC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,GACX;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,CAgBlE;AAID,wBAAsB,sCAAsC,kBA0D3D;AAKD,wBAAgB,qBAAqB,CAAC,SAAS,SAAwB,QAKtE;AAED,wBAAsB,UAAU,CAC9B,EAAE,EAAE,MAAM,GACT,OAAO,CAAC;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,WAAW,CAAC;IAAC,SAAS,EAAE,IAAI,CAAA;CAAE,GAAG,SAAS,CAAC,~~CAmC3E~~;AAED,wBAAsB,YAAY,CAChC,EAAE,EAAE,MAAM,EACV,SAAS,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,EAClC,QAAQ,CAAC,EAAE,aAAa,GACvB,OAAO,CAAC,IAAI,CAAC,CAyCf;AAED,wBAAsB,iBAAiB,CACrC,iBAAiB,CAAC,EAAE,MAAM,GACzB,OAAO,CAAC,WAAW,GAAG,SAAS,CAAC,CAgClC;AAED,wBAAsB,uBAAuB,CAC3C,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,EAC3C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,kBAAkB,EAAE,CAAC,CAkE/B;AAED,wBAAgB,0BAA0B,CACxC,eAAe,EAAE,MAAM,EACvB,KAAK,GAAE,MAA4B,iCAOpC;AAED,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,QAAQ,EAAE,iCAI3D;AAED,wBAAsB,yBAAyB,CAC7C,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,EAC3C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,qBAAqB,EAAE,CAAC,CAuElC;AAED,wBAAgB,UAAU,CAAC,KAAK,GAAE,MAA4B,iCAE7D;AAED,wBAAsB,YAAY,CAAC,KAAK,GAAE,MAA4B~~,oCAErE~~;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,2CAQnD;AAED,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,MAAM~~,8CAQpD~~;AAED,wBAAsB,qBAAqB,CACzC,SAAS,EAAE,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,EAC3C,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAwC7B;AAED,wBAAsB,QAAQ,CAAC,KAAK,GAAE,MAA4B,+BAEjE;AAED,wBAAsB,aAAa,CAAC,IAAI,EAAE,MAAM,yCAQ/C;AAED,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,iBAa9C;AAED,wBAAsB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAc7F;AAED,wBAAgB,WAAW,SAG1B;AAED,wBAAsB,eAAe,CACnC,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,EACnC,OAAO,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAC,CAAC;IAAC,MAAM,EAAE,OAAO,CAAC,MAAM,CAAC,CAAA;CAAE,gBA0CzF;AAED,wBAAgB,QAAQ,CAAC,OAAO,EAAE,MAAM,GAAG,SAAS,QAOnD;AAED,MAAM,MAAM,cAAc,GAAG,eAAe,GAAG;IAC7C,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,QAAQ,EAAE,MAAM,GAAG,IAAI,CAAC;CACzB,CAAC;AAEF,wBAAgB,kBAAkB,CAAC,KAAK,GAAE,MAA4B,GAAG,cAAc,EAAE,CA+BxF;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,QAAQ,CAAC,UAAU,CAAC,GAAG,MAAM,GAAG,SAAS,CAQvF;AAED,wBAAgB,SAAS,CACvB,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS,EAC7D,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,SAAS,WAG9D;AAED,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAMvF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,WAAW,GAAE,OAAe,GAAG,MAAM,CAelF;AAED,wBAAgB,kBAAkB,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAsBvF;AAED,wBAAgB,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAOhD;AAED,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CA4BxD;AAED;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAC7B,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,GACjB;IACD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,EAAE,OAAO,CAAC;IACvB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAoCA"}
1	+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/util/index.ts"],"names":[],"mappings":"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"}

package/dist/src/util/index.js CHANGED Viewed

@@ -278,28 +278,26 @@ async function writeResultsToDatabase(results, config, createdAt) {
  *
  * @returns Last n evals in descending order.
  */
-function listPreviousResults(limit = DEFAULT_QUERY_LIMIT, filterDescription) {
+function listPreviousResults(limit = DEFAULT_QUERY_LIMIT, filterDescription, datasetId) {
     const db = (0, database_1.getDb)();
-    let results = db
+    const query = db
         .select({
         evalId: database_1.evals.id,
         createdAt: database_1.evals.createdAt,
         description: database_1.evals.description,
         config: database_1.evals.config,
+        datasetId: database_1.evalsToDatasets.datasetId,
     })
         .from(database_1.evals)
-        .orderBy((0, drizzle_orm_1.desc)(database_1.evals.createdAt))
-        .limit(limit)
-        .all();
-    if (filterDescription) {
-        const regex = new RegExp(filterDescription, 'i');
-        results = results.filter((result) => regex.test(result.description || ''));
-    }
+        .leftJoin(database_1.evalsToDatasets, (0, drizzle_orm_1.eq)(database_1.evals.id, database_1.evalsToDatasets.evalId))
+        .where((0, drizzle_orm_1.and)(datasetId ? (0, drizzle_orm_1.eq)(database_1.evalsToDatasets.datasetId, datasetId) : undefined, filterDescription ? (0, drizzle_orm_1.like)(database_1.evals.description, `%${filterDescription}%`) : undefined));
+    const results = query.orderBy((0, drizzle_orm_1.desc)(database_1.evals.createdAt)).limit(limit).all();
     return results.map((result) => ({
         evalId: result.evalId,
         createdAt: result.createdAt,
         description: result.description,
         numTests: result.config.tests?.length || 0,
+        datasetId: result.datasetId,
     }));
 }
 /**
@@ -459,20 +457,23 @@ async function readResult(id) {
             author: database_1.evals.author,
             results: database_1.evals.results,
             config: database_1.evals.config,
+            datasetId: database_1.evalsToDatasets.datasetId,
         })
             .from(database_1.evals)
+            .leftJoin(database_1.evalsToDatasets, (0, drizzle_orm_1.eq)(database_1.evals.id, database_1.evalsToDatasets.evalId))
             .where((0, drizzle_orm_1.eq)(database_1.evals.id, id))
             .execute();
         if (evalResult.length === 0) {
             return undefined;
         }
-        const { id: resultId, createdAt, results, config, author } = evalResult[0];
+        const { id: resultId, createdAt, results, config, author, datasetId } = evalResult[0];
         const result = {
             version: 3,
             createdAt: new Date(createdAt).toISOString().slice(0, 10),
             author,
             results,
             config,
+            datasetId,
         };
         return {
             id: resultId,