Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .server-changes/cap-list-endpoint-page-size.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
area: webapp
type: improvement
---

List API endpoints now clamp the page size to a maximum of 100. Requests asking for a larger page size return up to 100 items and keep paginating, rather than pulling an unbounded page.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ const ParamsSchema = z.object({
const SearchParamsSchema = z.object({
verbose: z.string().default("0"),
page: z.coerce.number().optional(),
per_page: z.coerce.number().optional(),
per_page: z.coerce
.number()
.int()
.positive()
.transform((n) => Math.min(n, 100))
.optional(),
});

export async function loader({ request, params }: LoaderFunctionArgs) {
Expand Down
5 changes: 4 additions & 1 deletion apps/webapp/app/routes/admin.api.v1.llm-models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ export async function loader({ request }: LoaderFunctionArgs) {

const url = new URL(request.url);
const page = parseInt(url.searchParams.get("page") ?? "1");
const pageSize = parseInt(url.searchParams.get("pageSize") ?? "50");
const pageSize = Math.max(
1,
Math.min(parseInt(url.searchParams.get("pageSize") ?? "50") || 50, 100)
);

const [models, total] = await Promise.all([
prisma.llmModel.findMany({
Expand Down
7 changes: 6 additions & 1 deletion apps/webapp/app/routes/api.v1.queues.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ import { ServiceValidationError } from "~/v3/services/baseService.server";

const SearchParamsSchema = z.object({
page: z.coerce.number().int().positive().optional(),
perPage: z.coerce.number().int().positive().optional(),
perPage: z.coerce
.number()
.int()
.positive()
.transform((n) => Math.min(n, 100))
.optional(),
});

export const loader = createLoaderApiRoute(
Expand Down
7 changes: 6 additions & 1 deletion apps/webapp/app/routes/api.v1.schedules.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,12 @@ import { UpsertTaskScheduleService } from "~/v3/services/upsertTaskSchedule.serv

const SearchParamsSchema = z.object({
page: z.coerce.number().int().positive().optional(),
perPage: z.coerce.number().int().positive().optional(),
perPage: z.coerce
.number()
.int()
.positive()
.transform((n) => Math.min(n, 100))
.optional(),
});

export async function action({ request }: ActionFunctionArgs) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,11 @@ import { EnvironmentParamSchema } from "~/utils/pathBuilder";
const SearchParamsSchema = z.object({
query: z.string().optional(),
page: z.coerce.number().min(1).default(1),
per_page: z.coerce.number().min(1).default(20),
per_page: z.coerce
.number()
.min(1)
.transform((n) => Math.min(n, 100))
.default(20),
type: z.enum(["task", "custom"]).optional(),
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import { EnvironmentParamSchema } from "~/utils/pathBuilder";

const SearchParamsSchema = z.object({
query: z.string().optional(),
per_page: z.coerce.number().min(1).default(25),
per_page: z.coerce
.number()
.min(1)
.transform((n) => Math.min(n, 100))
.default(25),
});

export async function loader({ request, params }: LoaderFunctionArgs) {
Expand Down