@proofhound/core 0.1.7 → 0.1.9

package/dist/server/infrastructure/llm/run-result-writer.js

@@ -16,16 +16,20 @@ exports.DrizzleRunResultWriter = void 0;
 const node_buffer_1 = require("node:buffer");
 const common_1 = require("@nestjs/common");
 const drizzle_orm_1 = require("drizzle-orm");
+const logger_1 = require("@proofhound/logger");
 const quota_policy_hook_1 = require("../../common/contracts/quota-policy.hook");
+const usage_metering_hook_1 = require("../../common/contracts/usage-metering.hook");
 const database_constants_1 = require("../../../shared/database/database.constants");
-// ph_runs.run_results is monthly-partitioned by created_at, so a UNIQUE constraint cannot be applied to a single id column;
-// use INSERT ... SELECT ... WHERE NOT EXISTS for idempotency (SPEC 25 §11.2):
+// 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:
 //  - DBOS workflow retry / replay never writes a duplicate row for the same runResultId
 //  - Behaviorally equivalent to apps/worker/src/runners/run-result-writer.ts (the dual implementation will be reconciled when extracted into a package)
 let DrizzleRunResultWriter = class DrizzleRunResultWriter {
-    constructor(db, quotaPolicy) {
+    constructor(db, quotaPolicy, usageMetering) {
         this.db = db;
         this.quotaPolicy = quotaPolicy;
+        this.usageMetering = usageMetering;
+        this.logger = (0, logger_1.createLogger)('server.run-result-writer', { service: 'server' });
     }
     async writeRunResult(record) {
         const sampleId = record.sampleId ?? null;
@@ -47,24 +51,30 @@ let DrizzleRunResultWriter = 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;
         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
+        dbos_workflow_id, bullmq_job_id, round_index, 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,
@@ -74,18 +84,45 @@ let DrizzleRunResultWriter = class DrizzleRunResultWriter {
         ${record.status}, ${errorClass}, ${errorMessage},
         ${latencyMs}, ${inputTokens}, ${outputTokens},
         ${costEstimate}, ${attempt},
-        ${dbosWorkflowId}, ${bullmqJobId}, ${roundIndex}
-      WHERE NOT EXISTS (
-        SELECT 1 FROM ph_runs.run_results WHERE id = ${record.id}::uuid
-      )
+        ${dbosWorkflowId}, ${bullmqJobId}, ${roundIndex},
+        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: 'workflow',
+                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;
 exports.DrizzleRunResultWriter = DrizzleRunResultWriter = __decorate([
     (0, common_1.Injectable)(),
     __param(0, (0, common_1.Inject)(database_constants_1.DATABASE_CLIENT)),
-    __metadata("design:paramtypes", [Object, quota_policy_hook_1.QuotaPolicyHook])
+    __param(2, (0, common_1.Optional)()),
+    __metadata("design:paramtypes", [Object, quota_policy_hook_1.QuotaPolicyHook,
+        usage_metering_hook_1.UsageMeteringHook])
 ], DrizzleRunResultWriter);
 function estimateRunResultBytes(record) {
     return (utf8Bytes(record.renderedPrompt) +
@@ -100,4 +137,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/server/infrastructure/llm/run-result-writer.js.map

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

package/dist/server/modules/annotation/annotation.controller.d.ts

@@ -9,11 +9,12 @@ export declare class AnnotationController {
             id: string;
             projectId: string;
             name: string;
-            scope: "canary" | "online";
+            scope: "canary" | "online" | "all";
             releaseLineId: string;
             releaseLineName: string;
-            releaseVariantId: string;
-            releaseVariantLabel: string;
+            releaseVersionId: string;
+            releaseVersionLabel: string;
+            releaseVersionScope: "exact" | "journey";
             promptName: string;
             promptVersionId: string;
             promptVersionNumber: number | null;
@@ -22,7 +23,7 @@ export declare class AnnotationController {
             modelId: string;
             modelName: string | null;
             modelProvider: string | null;
-            status: "active" | "completed" | "archived";
+            status: "archived" | "active" | "completed";
             progress: {
                 total: number;
                 pending: number;
@@ -47,10 +48,14 @@ export declare class AnnotationController {
             status: string;
             promptName: string;
             inputConnectorName: string | null;
-            variants: {
+            versions: {
                 id: string;
                 releaseLineId: string;
                 label: string;
+                kind: "production" | "candidate";
+                productionVersionNumber: number | null;
+                targetProductionVersionNumber: number;
+                candidateNumber: number | null;
                 promptVersionId: string;
                 promptVersionNumber: number | null;
                 promptVersionLabel: string | null;
@@ -58,8 +63,16 @@ export declare class AnnotationController {
                 modelId: string;
                 modelName: string | null;
                 modelProvider: string | null;
+                runResultCount: number;
                 canaryCount: number;
                 onlineCount: number;
+                journeyCanaryCount: number;
+                journeyOnlineCount: number;
+                journeyCompatible: boolean;
+                categoryCounts: {
+                    category: string;
+                    count: number;
+                }[];
             }[];
         }[];
         total: number;
@@ -68,11 +81,12 @@ export declare class AnnotationController {
         id: string;
         projectId: string;
         name: string;
-        scope: "canary" | "online";
+        scope: "canary" | "online" | "all";
         releaseLineId: string;
         releaseLineName: string;
-        releaseVariantId: string;
-        releaseVariantLabel: string;
+        releaseVersionId: string;
+        releaseVersionLabel: string;
+        releaseVersionScope: "exact" | "journey";
         promptName: string;
         promptVersionId: string;
         promptVersionNumber: number | null;
@@ -81,7 +95,7 @@ export declare class AnnotationController {
         modelId: string;
         modelName: string | null;
         modelProvider: string | null;
-        status: "active" | "completed" | "archived";
+        status: "archived" | "active" | "completed";
         progress: {
             total: number;
             pending: number;
@@ -101,11 +115,12 @@ export declare class AnnotationController {
         id: string;
         projectId: string;
         name: string;
-        scope: "canary" | "online";
+        scope: "canary" | "online" | "all";
         releaseLineId: string;
         releaseLineName: string;
-        releaseVariantId: string;
-        releaseVariantLabel: string;
+        releaseVersionId: string;
+        releaseVersionLabel: string;
+        releaseVersionScope: "exact" | "journey";
         promptName: string;
         promptVersionId: string;
         promptVersionNumber: number | null;
@@ -114,7 +129,7 @@ export declare class AnnotationController {
         modelId: string;
         modelName: string | null;
         modelProvider: string | null;
-        status: "active" | "completed" | "archived";
+        status: "archived" | "active" | "completed";
         progress: {
             total: number;
             pending: number;

package/dist/server/modules/annotation/annotation.controller.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation.controller.d.ts","sourceRoot":"","sources":["../../../../src/server/modules/annotation/annotation.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGtG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,qBAEa,oBAAoB;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGjD,IAAI,CAAgB,KAAK,EAAE,kBAAkB,EAAoB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKxF,OAAO,CAAgB,KAAK,EAAE,kBAAkB,EAAoB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;IAK3F,MAAM,CACF,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,MAAM,CACO,MAAM,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAMrC,OAAO,CACM,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,KAAK,CACQ,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,MAAM,CACO,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,OAAO,CACM,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;IAO3C,OAAO,CAAC,SAAS;CAKlB"}
+{"version":3,"file":"annotation.controller.d.ts","sourceRoot":"","sources":["../../../../src/server/modules/annotation/annotation.controller.ts"],"names":[],"mappings":"AAQA,OAAO,EAAe,KAAK,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAGtG,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AASzD,qBAEa,oBAAoB;IACnB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAAP,OAAO,EAAE,iBAAiB;IAGjD,IAAI,CAAgB,KAAK,EAAE,kBAAkB,EAAoB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAKxF,OAAO,CAAgB,KAAK,EAAE,kBAAkB,EAAoB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAK3F,MAAM,CACF,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,MAAM,CACO,MAAM,EAAE,MAAM,EAChB,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAMrC,OAAO,CACM,MAAM,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAC1B,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,KAAK,CACQ,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,MAAM,CACO,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;IAQrC,OAAO,CACM,MAAM,EAAE,MAAM,EACvB,OAAO,EAAE,OAAO,EACT,KAAK,EAAE,kBAAkB,EACtB,OAAO,EAAE,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;IAO3C,OAAO,CAAC,SAAS;CAKlB"}

package/dist/server/modules/annotation/annotation.repository.d.ts

@@ -7,8 +7,12 @@ export declare class AnnotationRepository {
         id: string;
     } | null>;
     listOptions(projectId: string): Promise<AnnotationReleaseLineOptionDto[]>;
-    countMatchingRunResults(projectId: string, releaseLineId: string, releaseVariantId: string, scope: AnnotationTaskScopeDto): Promise<number>;
-    findVariantCategoryOptions(projectId: string, releaseLineId: string, releaseVariantId: string): Promise<string[]>;
+    countMatchingRunResults(projectId: string, releaseLineId: string, releaseVersionId: string, releaseVersionScope: 'exact' | 'journey', scope: AnnotationTaskScopeDto): Promise<number>;
+    countMatchingRunResultsByCategory(projectId: string, releaseLineId: string, releaseVersionId: string, releaseVersionScope: 'exact' | 'journey', scope: AnnotationTaskScopeDto): Promise<Map<string, number>>;
+    findReleaseVersionCategoryOptions(projectId: string, releaseLineId: string, releaseVersionId: string, releaseVersionScope: 'exact' | 'journey'): Promise<{
+        options: string[];
+        compatible: boolean;
+    }>;
     createTask(projectId: string, input: CreateAnnotationTaskInputDto, actorUserId: string, availableCount: number, categoryOptions: string[]): Promise<string>;
     listTasks(projectId: string): Promise<AnnotationTaskDto[]>;
     findTask(projectId: string, taskId: string): Promise<AnnotationTaskDto | null>;

package/dist/server/modules/annotation/annotation.repository.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"annotation.repository.d.ts","sourceRoot":"","sources":["../../../../src/server/modules/annotation/annotation.repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAK/C,OAAO,KAAK,EACV,8BAA8B,EAC9B,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,EACjB,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAI5B,qBACa,oBAAoB;IACM,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ;IAE5D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAW9D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,EAAE,CAAC;IAsFzE,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,MAAM,CAAC;IAgBZ,0BAA0B,CAC9B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAkBd,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B,EACnC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,MAAM,CAAC;IAkGZ,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAK1D,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAO9E,WAAW,CACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,yBAAyB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAC5E,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAY3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjF,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA0BpG,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GACxD,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IA2DhC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;CAmBpH"}
+{"version":3,"file":"annotation.repository.d.ts","sourceRoot":"","sources":["../../../../src/server/modules/annotation/annotation.repository.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAK/C,OAAO,KAAK,EACV,8BAA8B,EAC9B,mBAAmB,EACnB,yBAAyB,EACzB,iBAAiB,EACjB,sBAAsB,EACtB,4BAA4B,EAC7B,MAAM,oBAAoB,CAAC;AAI5B,qBACa,oBAAoB;IACM,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAAF,EAAE,EAAE,QAAQ;IAE5D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,EAAE,EAAE,MAAM,CAAA;KAAE,GAAG,IAAI,CAAC;IAW9D,WAAW,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,8BAA8B,EAAE,CAAC;IAmKzE,uBAAuB,CAC3B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,OAAO,GAAG,SAAS,EACxC,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,MAAM,CAAC;IAoBZ,iCAAiC,CACrC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,OAAO,GAAG,SAAS,EACxC,KAAK,EAAE,sBAAsB,GAC5B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwBzB,iCAAiC,CACrC,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,EACrB,gBAAgB,EAAE,MAAM,EACxB,mBAAmB,EAAE,OAAO,GAAG,SAAS,GACvC,OAAO,CAAC;QAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAAC,UAAU,EAAE,OAAO,CAAA;KAAE,CAAC;IA8BhD,UAAU,CACd,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,4BAA4B,EACnC,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,MAAM,EACtB,eAAe,EAAE,MAAM,EAAE,GACxB,OAAO,CAAC,MAAM,CAAC;IA4FZ,SAAS,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAK1D,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAO9E,WAAW,CACf,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;QAAE,MAAM,CAAC,EAAE,yBAAyB,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,GAC5E,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAY3B,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,yBAAyB,GAAG,OAAO,CAAC,MAAM,CAAC;IAUjF,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IA0BpG,YAAY,CAChB,MAAM,EAAE,MAAM,EACd,YAAY,EAAE,MAAM,EACpB,WAAW,EAAE,MAAM,EACnB,OAAO,EAAE;QAAE,cAAc,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GACxD,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IA2DhC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;CAmBpH"}