WIP on tags listing

Author: matt-aitken

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

@@ -2,12 +2,15 @@ import { RunsRepository } from "~/services/runsRepository/runsRepository.server"
 import { BasePresenter } from "./basePresenter.server";
 import { clickhouseClient } from "~/services/clickhouseInstance.server";
 import { type PrismaClient } from "@trigger.dev/database";
+import { timeFilters } from "~/components/runs/v3/SharedFilters";
 
 export type TagListOptions = {
   organizationId: string;
   environmentId: string;
   projectId: string;
-  createdAfter?: Date;
+  period?: string;
+  from?: Date;
+  to?: Date;
   //filters
   name?: string;
   //pagination
@@ -26,7 +29,9 @@ export class RunTagListPresenter extends BasePresenter {
     environmentId,
     projectId,
     name,
-    createdAfter,
+    period,
+    from,
+    to,
     page = 1,
     pageSize = DEFAULT_PAGE_SIZE,
   }: TagListOptions) {
@@ -37,15 +42,14 @@ export class RunTagListPresenter extends BasePresenter {
       prisma: this._replica as PrismaClient,
     });
 
-    // Passed in or past 30 days
-    const createdAt = createdAfter ?? new Date(Date.now() - 30 * 24 * 60 * 60 * 1000);
-
     const tags = await runsRepository.listTags({
       organizationId,
       projectId,
       environmentId,
       query: name,
-      createdAfter: createdAt,
+      period,
+      from: from ? from.getTime() : undefined,
+      to: to ? to.getTime() : undefined,
       offset: (page - 1) * pageSize,
       limit: pageSize + 1,
     });

apps/webapp/app/routes/resources.environments.$envId.runs.tags.tsx

@@ -1,5 +1,6 @@
 import { type LoaderFunctionArgs } from "@remix-run/server-runtime";
 import { z } from "zod";
+import { timeFilters } from "~/components/runs/v3/SharedFilters";
 import { $replica } from "~/db.server";
 import { RunTagListPresenter } from "~/presenters/v3/RunTagListPresenter.server";
 import { requireUserId } from "~/services/session.server";
@@ -34,9 +35,6 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
 
   const search = new URL(request.url).searchParams;
   const name = search.get("name");
-  const period = search.get("period");
-  const from = search.get("from");
-  const to = search.get("to");
 
   const parsedSearchParams = SearchParams.safeParse({
     name: name ? decodeURIComponent(name) : undefined,
@@ -49,13 +47,21 @@ export async function loader({ request, params }: LoaderFunctionArgs) {
     throw new Response("Invalid search params", { status: 400 });
   }
 
+  const { period, from, to } = timeFilters({
+    period: parsedSearchParams.data.period,
+    from: parsedSearchParams.data.from,
+    to: parsedSearchParams.data.to,
+  });
+
   const presenter = new RunTagListPresenter();
   const result = await presenter.call({
     environmentId: environment.id,
     projectId: environment.projectId,
     organizationId: environment.organizationId,
     name: parsedSearchParams.data.name,
-    createdAfter: parsedSearchParams.data.createdAfter,
+    period,
+    from,
+    to,
   });
   return result;
 }

apps/webapp/app/routes/resources.orgs.$organizationSlug.projects.$projectParam.env.$envParam.runs.ai-filter.tsx

@@ -65,13 +65,16 @@ export async function action({ request, params }: ActionFunctionArgs) {
     query: async (search) => {
       const tagPresenter = new RunTagListPresenter();
       const tags = await tagPresenter.call({
+        organizationId: environment.organizationId,
         projectId: environment.projectId,
+        environmentId: environment.id,
         name: search,
         page: 1,
         pageSize: 50,
+        period: "1y",
       });
       return {
-        tags: tags.tags.map((t) => t.name),
+        tags: tags.tags,
       };
     },
   };

apps/webapp/app/services/runsRepository/clickhouseRunsRepository.server.ts

@@ -6,9 +6,10 @@ import {
   type ListRunsOptions,
   type RunListInputOptions,
   type RunsRepositoryOptions,
-  TagListOptions,
+  type TagListOptions,
   convertRunListInputOptionsToFilterRunsOptions,
 } from "./runsRepository.server";
+import parseDuration from "parse-duration";
 
 export class ClickHouseRunsRepository implements IRunsRepository {
   constructor(private readonly options: RunsRepositoryOptions) {}
@@ -177,6 +178,23 @@ export class ClickHouseRunsRepository implements IRunsRepository {
         environmentId: options.environmentId,
       });
 
+    const periodMs = options.period ? parseDuration(options.period) ?? undefined : undefined;
+    if (periodMs) {
+      queryBuilder.where("created_at >= fromUnixTimestamp64Milli({period: Int64})", {
+        period: new Date(Date.now() - periodMs).getTime(),
+      });
+    }
+
+    if (options.from) {
+      queryBuilder.where("created_at >= fromUnixTimestamp64Milli({from: Int64})", {
+        from: options.from,
+      });
+    }
+
+    if (options.to) {
+      queryBuilder.where("created_at <= fromUnixTimestamp64Milli({to: Int64})", { to: options.to });
+    }
+
     const [queryError, result] = await queryBuilder.execute();
 
     if (queryError) {
@@ -187,8 +205,6 @@ export class ClickHouseRunsRepository implements IRunsRepository {
       throw new Error("No count rows returned");
     }
 
-    //todo process them
-
     return {
       tags: result[0].tags,
     };

apps/webapp/app/services/runsRepository/postgresRunsRepository.server.ts

@@ -8,7 +8,7 @@ import {
   type ListedRun,
   type RunListInputOptions,
   type RunsRepositoryOptions,
-  TagListOptions,
+  type TagListOptions,
   convertRunListInputOptionsToFilterRunsOptions,
 } from "./runsRepository.server";
 

apps/webapp/app/services/runsRepository/runsRepository.server.ts

@@ -113,7 +113,9 @@ export type TagListOptions = {
   organizationId: string;
   projectId: string;
   environmentId: string;
-  createdAfter: Date;
+  period?: string;
+  from?: number;
+  to?: number;
   /** Performs a case insensitive contains search on the tag name */
   query?: string;
 } & OffsetPagination;
@@ -313,9 +315,20 @@ export class RunsRepository implements IRunsRepository {
 
   async listTags(options: TagListOptions): Promise<TagList> {
     const repository = await this.#getRepository();
-    return startActiveSpan("runsRepository.listTags", async () => {
-      return await repository.listTags(options);
-    });
+    return startActiveSpan(
+      "runsRepository.listTags",
+      async () => {
+        return await repository.listTags(options);
+      },
+      {
+        attributes: {
+          "repository.name": repository.name,
+          organizationId: options.organizationId,
+          projectId: options.projectId,
+          environmentId: options.environmentId,
+        },
+      }
+    );
   }
 }