@mastra/pg 1.21.1-alpha.0 → 1.21.1

package/dist/index.js

@@ -6314,7 +6314,7 @@ var DatasetsPG = class DatasetsPG extends DatasetsStorage {
 				schemaName: getSchemaName$5(this.#schema)
 			});
 			let result;
-			if (args.datasetVersion !== void 0) result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" = $2 AND "isDeleted" = false`, [args.id, args.datasetVersion]);
+			if (args.datasetVersion !== void 0) result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "datasetVersion" <= $2 AND ("validTo" IS NULL OR "validTo" > $2) AND "isDeleted" = false ORDER BY "datasetVersion" DESC LIMIT 1`, [args.id, args.datasetVersion]);
 			else result = await this.#db.client.oneOrNone(`SELECT * FROM ${tableName} WHERE "id" = $1 AND "validTo" IS NULL AND "isDeleted" = false`, [args.id]);
 			return result ? this.transformItemRow(result) : null;
 		} catch (error) {
@@ -6572,7 +6572,8 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				"experimentSetId",
 				"comparisonId",
 				"variantId",
-				"trialIndex"
+				"trialIndex",
+				"scorerIds"
 			]
 		});
 		await this.#db.alterTable({
@@ -6584,7 +6585,8 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				"comment",
 				"toolMockReport",
 				"organizationId",
-				"projectId"
+				"projectId",
+				"attempt"
 			]
 		});
 		await this.createDefaultIndexes();
@@ -6694,9 +6696,13 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				columns: ["experimentId"]
 			},
 			{
-				name: "idx_experiment_results_exp_item",
+				name: "idx_experiment_results_exp_item_attempt",
 				table: TABLE_EXPERIMENT_RESULTS,
-				columns: ["experimentId", "itemId"],
+				columns: [
+					"experimentId",
+					"itemId",
+					"attempt"
+				],
 				unique: true
 			},
 			{
@@ -6713,6 +6719,11 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 	}
 	async createDefaultIndexes() {
 		if (this.#skipDefaultIndexes) return;
+		try {
+			await this.#db.dropIndex("idx_experiment_results_exp_item");
+		} catch (error) {
+			this.logger?.warn?.("Failed to drop legacy index idx_experiment_results_exp_item:", error);
+		}
 		for (const indexDef of this.getDefaultIndexDefinitions()) try {
 			await this.#db.createIndex(indexDef);
 		} catch (error) {
@@ -6744,8 +6755,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			agentVersion: row.agentVersion ?? null,
 			organizationId: row.organizationId ?? null,
 			projectId: row.projectId ?? null,
-			targetType: row.targetType,
-			targetId: row.targetId,
+			targetType: row.targetType ?? null,
+			targetId: row.targetId ?? null,
+			scorerIds: row.scorerIds ? safelyParseJSON(row.scorerIds) : null,
 			status: row.status,
 			totalItems: row.totalItems,
 			succeededCount: row.succeededCount,
@@ -6772,6 +6784,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			startedAt: ensureDate(row.startedAtZ || row.startedAt),
 			completedAt: ensureDate(row.completedAtZ || row.completedAt),
 			retryCount: row.retryCount,
+			attempt: row.attempt != null ? row.attempt : 0,
 			traceId: row.traceId ?? null,
 			status: row.status ?? null,
 			tags: row.tags ? safelyParseJSON(row.tags) : null,
@@ -6803,8 +6816,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					agentVersion: input.agentVersion ?? null,
 					organizationId: input.organizationId ?? null,
 					projectId: input.projectId ?? null,
-					targetType: input.targetType,
-					targetId: input.targetId,
+					targetType: input.targetType ?? null,
+					targetId: input.targetId ?? null,
+					scorerIds: input.scorerIds ?? null,
 					status: "pending",
 					totalItems: input.totalItems,
 					succeededCount: 0,
@@ -6832,8 +6846,9 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				agentVersion: input.agentVersion ?? null,
 				organizationId: input.organizationId ?? null,
 				projectId: input.projectId ?? null,
-				targetType: input.targetType,
-				targetId: input.targetId,
+				targetType: input.targetType ?? null,
+				targetId: input.targetId ?? null,
+				scorerIds: input.scorerIds ?? null,
 				status: "pending",
 				totalItems: input.totalItems,
 				succeededCount: 0,
@@ -7077,6 +7092,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 					startedAt: input.startedAt.toISOString(),
 					completedAt: input.completedAt.toISOString(),
 					retryCount: input.retryCount,
+					attempt: input.attempt ?? 0,
 					traceId: input.traceId ?? null,
 					status: input.status ?? null,
 					tags: input.tags ?? null,
@@ -7098,6 +7114,7 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 				startedAt: input.startedAt,
 				completedAt: input.completedAt,
 				retryCount: input.retryCount,
+				attempt: input.attempt ?? 0,
 				traceId: input.traceId ?? null,
 				status: input.status ?? null,
 				tags: input.tags ?? null,
@@ -7112,6 +7129,81 @@ var ExperimentsPG = class ExperimentsPG extends ExperimentsStorage {
 			}, error);
 		}
 	}
+	async upsertExperimentResult(input) {
+		try {
+			const tableName = getTableName$5({
+				indexName: TABLE_EXPERIMENT_RESULTS,
+				schemaName: getSchemaName$5(this.#schema)
+			});
+			const attempt = input.attempt ?? 0;
+			const row = await this.#db.client.tx(async (t) => {
+				const existing = await t.oneOrNone(`SELECT "id" FROM ${tableName} WHERE "experimentId" = $1 AND "itemId" = $2 AND COALESCE("attempt", 0) = $3 FOR UPDATE`, [
+					input.experimentId,
+					input.itemId,
+					attempt
+				]);
+				if (!existing) {
+					const id = crypto.randomUUID();
+					return t.one(`INSERT INTO ${tableName} (
+              "id", "experimentId", "itemId", "itemDatasetVersion", "organizationId", "projectId",
+              "input", "output", "groundTruth", "error", "startedAt", "completedAt",
+              "retryCount", "attempt", "traceId", "status", "tags", "toolMockReport", "createdAt"
+            ) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19)
+            RETURNING *`, [
+						id,
+						input.experimentId,
+						input.itemId,
+						input.itemDatasetVersion ?? null,
+						input.organizationId ?? null,
+						input.projectId ?? null,
+						JSON.stringify(input.input),
+						input.output != null ? JSON.stringify(input.output) : null,
+						input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
+						input.error != null ? JSON.stringify(input.error) : null,
+						input.startedAt.toISOString(),
+						input.completedAt.toISOString(),
+						input.retryCount,
+						attempt,
+						input.traceId ?? null,
+						input.status ?? null,
+						input.tags != null ? JSON.stringify(input.tags) : null,
+						input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null,
+						(/* @__PURE__ */ new Date()).toISOString()
+					]);
+				}
+				return t.one(`UPDATE ${tableName} SET
+            "itemDatasetVersion" = $2, "organizationId" = $3, "projectId" = $4,
+            "input" = $5, "output" = $6, "groundTruth" = $7, "error" = $8,
+            "startedAt" = $9, "completedAt" = $10, "retryCount" = $11, "attempt" = $12,
+            "traceId" = $13, "status" = $14, "tags" = $15, "toolMockReport" = $16
+          WHERE "id" = $1 RETURNING *`, [
+					existing.id,
+					input.itemDatasetVersion ?? null,
+					input.organizationId ?? null,
+					input.projectId ?? null,
+					JSON.stringify(input.input),
+					input.output != null ? JSON.stringify(input.output) : null,
+					input.groundTruth != null ? JSON.stringify(input.groundTruth) : null,
+					input.error != null ? JSON.stringify(input.error) : null,
+					input.startedAt.toISOString(),
+					input.completedAt.toISOString(),
+					input.retryCount,
+					attempt,
+					input.traceId ?? null,
+					input.status ?? null,
+					input.tags != null ? JSON.stringify(input.tags) : null,
+					input.toolMockReport != null ? JSON.stringify(input.toolMockReport) : null
+				]);
+			});
+			return this.transformExperimentResultRow(row);
+		} catch (error) {
+			throw new MastraError({
+				id: createStorageErrorId("PG", "UPSERT_EXPERIMENT_RESULT", "FAILED"),
+				domain: ErrorDomain.STORAGE,
+				category: ErrorCategory.THIRD_PARTY
+			}, error);
+		}
+	}
 	async updateExperimentResult(input) {
 		try {
 			const tableName = getTableName$5({
@@ -18916,9 +19008,14 @@ var ScoresPG = class ScoresPG extends ScoresStorage {
 			}, error);
 		}
 		try {
-			const id = crypto.randomUUID();
+			const suppliedId = parsedScore.id;
+			const id = suppliedId ?? crypto.randomUUID();
 			const now = /* @__PURE__ */ new Date();
-			const { scorer, preprocessStepResult, analyzeStepResult, metadata, input, output, additionalContext, requestContext, entity, ...rest } = parsedScore;
+			const { id: _suppliedId, scorer, preprocessStepResult, analyzeStepResult, metadata, input, output, additionalContext, requestContext, entity, ...rest } = parsedScore;
+			if (suppliedId) await this.#db.client.none(`DELETE FROM ${getTableName$1({
+				indexName: TABLE_SCORERS,
+				schemaName: getSchemaName$1(this.#schema)
+			})} WHERE id = $1`, [suppliedId]);
 			await this.#db.insert({
 				tableName: TABLE_SCORERS,
 				record: {