Skip to content

Commit 5dc0548

Browse files
committed
move validation to zod layer
1 parent 934bb91 commit 5dc0548

2 files changed

Lines changed: 45 additions & 33 deletions

File tree

‎packages/trueforge/src/apis/sessions.ts‎

Lines changed: 11 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@ import {
1010
SessionStoreNotFoundError,
1111
TurnNotFoundError,
1212
} from '@truefoundry/trueforge-core/agent-session';
13-
import {
14-
buildSessionMetricsCharts,
15-
MAX_SESSION_METRICS_WINDOW_MS,
16-
} from '@truefoundry/trueforge-core/agent-session/store/sessionMetrics';
13+
import { buildSessionMetricsCharts } from '@truefoundry/trueforge-core/agent-session/store/sessionMetrics';
1714
import { extractErrorLogFields } from '@truefoundry/trueforge-core/core';
1815
import {
1916
redisRequest,
@@ -358,33 +355,22 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
358355
}
359356
};
360357

361-
const validateSessionMetricsQuery = async (
362-
query: {
363-
agent_id: string;
364-
start_timestamp: Date;
365-
end_timestamp: Date;
366-
},
358+
const requireNamedAgentForSessionMetrics = async (
359+
agent_id: string,
367360
c: Parameters<RouteHandler<typeof getSessionMetricsMetersRoute>>[0],
368361
) => {
369-
const windowMs = query.end_timestamp.getTime() - query.start_timestamp.getTime();
370-
if (windowMs < 0) {
371-
return c.json({ error: { message: 'end_timestamp must be on or after start_timestamp' } }, 400);
372-
}
373-
if (windowMs > MAX_SESSION_METRICS_WINDOW_MS) {
374-
return c.json({ error: { message: 'metrics window must not exceed 30 days' } }, 400);
375-
}
376-
const agent = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, id: query.agent_id });
362+
const agent = await deps.agentStore.getAgent({ tenant_id: TENANT_ID, id: agent_id });
377363
if (agent === undefined) {
378-
return c.json({ error: { message: `Agent not found: ${query.agent_id}` } }, 404);
364+
return c.json({ error: { message: `Agent not found: ${agent_id}` } }, 404);
379365
}
380366
return null;
381367
};
382368

383369
const getSessionMetricsMetersHandler: RouteHandler<typeof getSessionMetricsMetersRoute> = async c => {
384370
const query = c.req.valid('query');
385-
const validationError = await validateSessionMetricsQuery(query, c);
386-
if (validationError !== null) {
387-
return validationError;
371+
const missingAgent = await requireNamedAgentForSessionMetrics(query.agent_id, c);
372+
if (missingAgent !== null) {
373+
return missingAgent;
388374
}
389375
const user = deps.resolveUserContext(c);
390376
const metrics = await deps.sessionStore.getSessionMetricsMeters({
@@ -403,9 +389,9 @@ export function createSessionsRouter(deps: SessionsRouterDeps) {
403389

404390
const getSessionMetricsChartsDataHandler: RouteHandler<typeof getSessionMetricsChartsDataRoute> = async c => {
405391
const query = c.req.valid('query');
406-
const validationError = await validateSessionMetricsQuery(query, c);
407-
if (validationError !== null) {
408-
return validationError;
392+
const missingAgent = await requireNamedAgentForSessionMetrics(query.agent_id, c);
393+
if (missingAgent !== null) {
394+
return missingAgent;
409395
}
410396
const user = deps.resolveUserContext(c);
411397
const chartData = await deps.sessionStore.getSessionMetricsChartData({

‎packages/trueforge/src/schemas/session.ts‎

Lines changed: 34 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import {
99
SessionSchema,
1010
TokenPaginationSchema,
1111
} from '@truefoundry/trueforge-core/agent-session';
12+
import { MAX_SESSION_METRICS_WINDOW_MS } from '@truefoundry/trueforge-core/agent-session/store/sessionMetrics';
1213
import { NameSchema, PAGE_LIMIT } from './common';
1314

1415
/** Create arm: bind by unique registry agent name. */
@@ -88,19 +89,44 @@ export const ListSessionsRequestQuerySchema = z
8889
})
8990
.openapi('ListSessionsRequestQuery');
9091

91-
export const GetSessionMetricsRequestQuerySchema = z
92-
.object({
93-
agent_id: z.string().min(1).max(64).describe('Named agent identifier.'),
94-
start_timestamp: IsoTimestampQueryParam.describe('Inclusive lower bound on session `created_at`.'),
95-
end_timestamp: IsoTimestampQueryParam.describe('Inclusive upper bound on session `created_at`.'),
96-
})
97-
.openapi('GetSessionMetricsRequestQuery');
92+
const GetSessionMetricsRequestQueryObjectSchema = z.object({
93+
agent_id: z.string().min(1).max(64).describe('Named agent identifier.'),
94+
start_timestamp: IsoTimestampQueryParam.describe('Inclusive lower bound on session `created_at`.'),
95+
end_timestamp: IsoTimestampQueryParam.describe('Inclusive upper bound on session `created_at`.'),
96+
});
97+
98+
function refineSessionMetricsTimeWindow(
99+
query: { start_timestamp: Date; end_timestamp: Date },
100+
ctx: z.RefinementCtx,
101+
): void {
102+
const windowMs = query.end_timestamp.getTime() - query.start_timestamp.getTime();
103+
if (windowMs < 0) {
104+
ctx.addIssue({
105+
code: 'custom',
106+
message: 'end_timestamp must be on or after start_timestamp',
107+
path: ['end_timestamp'],
108+
});
109+
return;
110+
}
111+
if (windowMs > MAX_SESSION_METRICS_WINDOW_MS) {
112+
ctx.addIssue({
113+
code: 'custom',
114+
message: 'metrics window must not exceed 30 days',
115+
path: ['end_timestamp'],
116+
});
117+
}
118+
}
119+
120+
export const GetSessionMetricsRequestQuerySchema = GetSessionMetricsRequestQueryObjectSchema.superRefine(
121+
refineSessionMetricsTimeWindow,
122+
).openapi('GetSessionMetricsRequestQuery');
98123

99124
export const GetSessionMetricsChartsDataRequestQuerySchema = z
100125
.object({
101-
...GetSessionMetricsRequestQuerySchema.shape,
126+
...GetSessionMetricsRequestQueryObjectSchema.shape,
102127
chart_name: SessionMetricsChartNameSchema,
103128
})
129+
.superRefine(refineSessionMetricsTimeWindow)
104130
.openapi('GetSessionMetricsChartsDataRequestQuery');
105131

106132
export const GetSessionMetricsMetersResponseSchema = z

0 commit comments

Comments
 (0)