Skip to content

Commit 6996dfb

Browse files
committed
SpanPresenter: use org event repository
1 parent f6adfad commit 6996dfb

File tree

1 file changed

+10
-15
lines changed

1 file changed

+10
-15
lines changed

apps/webapp/app/presenters/v3/SpanPresenter.server.ts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import { isFailedRunStatus, isFinalRunStatus } from "~/v3/taskStatus";
2121
import { BasePresenter } from "./basePresenter.server";
2222
import { WaitpointPresenter } from "./WaitpointPresenter.server";
2323
import { engine } from "~/v3/runEngine.server";
24-
import { resolveEventRepositoryForStore } from "~/v3/eventRepository/index.server";
2524
import { IEventRepository, SpanDetail } from "~/v3/eventRepository/eventRepository.types";
2625
import { safeJsonParse } from "~/utils/json";
2726
import {
@@ -30,6 +29,7 @@ import {
3029
extractAIToolCallData,
3130
extractAIEmbedData,
3231
} from "~/components/runs/v3/ai";
32+
import { clickhouseFactory } from "~/services/clickhouse/clickhouseFactory.server";
3333

3434
export type PromptSpanData = {
3535
slug: string;
@@ -42,9 +42,7 @@ export type PromptSpanData = {
4242
config?: string;
4343
};
4444

45-
function extractPromptSpanData(
46-
properties: Record<string, unknown>
47-
): PromptSpanData | undefined {
45+
function extractPromptSpanData(properties: Record<string, unknown>): PromptSpanData | undefined {
4846
// Properties come as an unflattened nested object from ClickHouse,
4947
// e.g. { prompt: { slug: "...", version: 3, ... } }
5048
const prompt = properties.prompt;
@@ -132,14 +130,17 @@ export class SpanPresenter extends BasePresenter {
132130

133131
const { traceId } = parentRun;
134132

135-
const eventRepository = resolveEventRepositoryForStore(parentRun.taskEventStore);
133+
const { repository } = await clickhouseFactory.getEventRepositoryForOrganization(
134+
parentRun.taskEventStore,
135+
project.organizationId
136+
);
136137

137138
const eventStore = getTaskEventStoreTableForRun(parentRun);
138139

139140
const run = await this.getRun({
140141
eventStore,
141142
traceId,
142-
eventRepository,
143+
eventRepository: repository,
143144
spanId,
144145
linkedRunId,
145146
createdAt: parentRun.createdAt,
@@ -161,7 +162,7 @@ export class SpanPresenter extends BasePresenter {
161162
projectId: parentRun.projectId,
162163
createdAt: parentRun.createdAt,
163164
completedAt: parentRun.completedAt,
164-
eventRepository,
165+
eventRepository: repository,
165166
});
166167

167168
if (!span) {
@@ -592,10 +593,7 @@ export class SpanPresenter extends BasePresenter {
592593
triggeredRuns,
593594
aiData:
594595
span.properties && typeof span.properties === "object"
595-
? extractAISpanData(
596-
span.properties as Record<string, unknown>,
597-
span.duration / 1_000_000
598-
)
596+
? extractAISpanData(span.properties as Record<string, unknown>, span.duration / 1_000_000)
599597
: undefined,
600598
};
601599

@@ -739,10 +737,7 @@ export class SpanPresenter extends BasePresenter {
739737
"ai.streamObject",
740738
];
741739

742-
if (
743-
typeof span.message === "string" &&
744-
AI_SUMMARY_MESSAGES.includes(span.message)
745-
) {
740+
if (typeof span.message === "string" && AI_SUMMARY_MESSAGES.includes(span.message)) {
746741
const aiSummaryData = extractAISummarySpanData(
747742
span.properties as Record<string, unknown>,
748743
span.duration / 1_000_000

0 commit comments

Comments
 (0)