@proofhound/core 0.1.7 → 0.1.9

package/dist/worker/runners/run-result-writer.js

@@ -3,14 +3,18 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DrizzleRunResultWriter = void 0;
 const node_buffer_1 = require("node:buffer");
 const drizzle_orm_1 = require("drizzle-orm");
-// ph_runs.run_results is a monthly-partitioned table by created_at; a UNIQUE constraint cannot be applied to a single id column;
-// use INSERT ... SELECT ... WHERE NOT EXISTS instead for idempotency, ensuring:
+const logger_1 = require("@proofhound/logger");
+const usage_metering_hook_1 = require("../../server/common/contracts/usage-metering.hook");
+// ph_runs.run_results is monthly-partitioned by created_at, so UNIQUE(id) cannot live on that table.
+// Reserve id in unpartitioned ph_runs.run_result_ids first, then insert into the partitioned fact table, ensuring:
 //  1. worker stalled retries do not write duplicate rows
 //  2. when the consumer writes the final error row in OnWorkerEvent('failed'), an already-landed success row is not overwritten
 class DrizzleRunResultWriter {
-    constructor(db, quotaPolicy) {
+    constructor(db, quotaPolicy, usageMetering) {
         this.db = db;
         this.quotaPolicy = quotaPolicy;
+        this.usageMetering = usageMetering;
+        this.logger = (0, logger_1.createLogger)('worker.run-result-writer', { service: 'worker' });
     }
     async writeRunResult(record) {
         const sampleId = record.sampleId ?? null;
@@ -32,25 +36,31 @@ class DrizzleRunResultWriter {
         const dbosWorkflowId = record.dbosWorkflowId ?? null;
         const bullmqJobId = record.bullmqJobId ?? null;
         const roundIndex = record.roundIndex ?? null;
-        const releaseVariantId = record.releaseVariantId ?? null;
+        const releaseVersionId = record.releaseVersionId ?? null;
         const webhookTokenId = record.webhookTokenId ?? null;
         await this.quotaPolicy.assertCanStore({
             bytes: estimateRunResultBytes(record),
             project: { projectId: record.projectId, source: 'local' },
             source: 'run_result',
         });
-        await this.db.execute((0, drizzle_orm_1.sql) `
+        const insertResult = await this.db.execute((0, drizzle_orm_1.sql) `
+      WITH reserved_run_result AS (
+        INSERT INTO ph_runs.run_result_ids (id)
+        VALUES (${record.id}::uuid)
+        ON CONFLICT (id) DO NOTHING
+        RETURNING id, created_at
+      )
       INSERT INTO ph_runs.run_results (
-        id, project_id, source, source_id, release_variant_id, prompt_version_id, model_id,
+        id, project_id, source, source_id, release_version_id, prompt_version_id, model_id,
         sample_id, external_id, rendered_prompt, input_variables,
         raw_response, parsed_output, decision_output, expected_output, is_correct, judgment_status,
         status, error_class, error_message,
         latency_ms, input_tokens, output_tokens, cost_estimate, attempt,
-        dbos_workflow_id, bullmq_job_id, round_index, webhook_token_id
+        dbos_workflow_id, bullmq_job_id, round_index, webhook_token_id, created_at
       )
       SELECT
-        ${record.id}::uuid, ${record.projectId}::uuid, ${record.source},
-        ${record.sourceId}::uuid, ${releaseVariantId}::uuid, ${record.promptVersionId}::uuid, ${record.modelId}::uuid,
+        reserved_run_result.id, ${record.projectId}::uuid, ${record.source},
+        ${record.sourceId}::uuid, ${releaseVersionId}::uuid, ${record.promptVersionId}::uuid, ${record.modelId}::uuid,
         ${sampleId}::uuid, ${externalId},
         ${JSON.stringify(record.renderedPrompt)}::jsonb,
         ${JSON.stringify(inputVariables)}::jsonb,
@@ -60,11 +70,36 @@ class DrizzleRunResultWriter {
         ${record.status}, ${errorClass}, ${errorMessage},
         ${latencyMs}, ${inputTokens}, ${outputTokens},
         ${costEstimate}, ${attempt},
-        ${dbosWorkflowId}, ${bullmqJobId}, ${roundIndex}, ${webhookTokenId}::uuid
-      WHERE NOT EXISTS (
-        SELECT 1 FROM ph_runs.run_results WHERE id = ${record.id}::uuid
-      )
+        ${dbosWorkflowId}, ${bullmqJobId}, ${roundIndex}, ${webhookTokenId}::uuid,
+        reserved_run_result.created_at
+      FROM reserved_run_result
+      RETURNING id, created_at
     `);
+        const insertedRows = unwrapRows(insertResult);
+        if (insertedRows.length > 0 && this.usageMetering) {
+            const occurredAt = coerceDate(insertedRows[0]?.created_at);
+            await (0, usage_metering_hook_1.safeRecordUsageEvent)(this.usageMetering, {
+                idempotencyKey: `run_result:${record.id}:created`,
+                dimension: 'run_result',
+                eventType: 'run_result.created',
+                projectId: record.projectId,
+                occurredAt,
+                source: 'worker',
+                payload: {
+                    runResultId: record.id,
+                    source: record.source,
+                    sourceId: record.sourceId,
+                    promptVersionId: record.promptVersionId,
+                    modelId: record.modelId,
+                    status: record.status,
+                    inputTokens,
+                    outputTokens,
+                    costEstimate,
+                    latencyMs,
+                    createdAt: occurredAt.toISOString(),
+                },
+            }, this.logger);
+        }
     }
 }
 exports.DrizzleRunResultWriter = DrizzleRunResultWriter;
@@ -81,4 +116,19 @@ function estimateRunResultBytes(record) {
 function utf8Bytes(value) {
     return node_buffer_1.Buffer.byteLength(typeof value === 'string' ? value : JSON.stringify(value ?? null), 'utf8');
 }
+function unwrapRows(result) {
+    if (Array.isArray(result))
+        return result;
+    if (result && typeof result === 'object' && 'rows' in result) {
+        return (result.rows ?? []);
+    }
+    return [];
+}
+function coerceDate(value) {
+    if (value instanceof Date)
+        return value;
+    if (value)
+        return new Date(value);
+    return new Date();
+}
 //# sourceMappingURL=run-result-writer.js.map

package/dist/worker/runners/run-result-writer.js.map

@@ -1 +1 @@
-{"version":3,"file":"run-result-writer.js","sourceRoot":"","sources":["../../../src/worker/runners/run-result-writer.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"run-result-writer.js","sourceRoot":"","sources":["../../../src/worker/runners/run-result-writer.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proofhound/core",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "ProofHound reusable backend runtime: server / webhook / worker NestJS modules, contracts, local defaults, Services, Repositories",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -36,17 +36,17 @@
     "rxjs": "^7.8.2",
     "sharp": "^0.34.5",
     "zod": "^4.4.3",
-    "@proofhound/db": "0.1.7",
-    "@proofhound/connector-client": "0.1.7",
-    "@proofhound/crypto": "0.1.7",
-    "@proofhound/judgment": "0.1.7",
-    "@proofhound/limiter": "0.1.7",
-    "@proofhound/llm-client": "0.1.7",
-    "@proofhound/logger": "0.1.7",
-    "@proofhound/optimization-strategy": "0.1.7",
-    "@proofhound/shared": "0.1.7",
-    "@proofhound/metrics": "0.1.7",
-    "@proofhound/orchestration-shared": "0.1.7"
+    "@proofhound/connector-client": "0.1.9",
+    "@proofhound/crypto": "0.1.9",
+    "@proofhound/db": "0.1.9",
+    "@proofhound/judgment": "0.1.9",
+    "@proofhound/limiter": "0.1.9",
+    "@proofhound/llm-client": "0.1.9",
+    "@proofhound/logger": "0.1.9",
+    "@proofhound/metrics": "0.1.9",
+    "@proofhound/optimization-strategy": "0.1.9",
+    "@proofhound/orchestration-shared": "0.1.9",
+    "@proofhound/shared": "0.1.9"
   },
   "devDependencies": {
     "@nestjs/testing": "^11.1.21",