Merge branch 'main' into style/truncate-model-names

packages/backend/src/api/v1/runs/index.ts

@@ -150,39 +150,21 @@ runs.get("/", async (ctx: Context) => {
       eu.last_seen as user_last_seen,
       eu.props as user_props,
       t.slug as template_slug,
-      rpfc.feedback as parent_feedback,
-      coalesce(array_agg(
-          jsonb_build_object(
-              'evaluatorName', e.name,
-              'evaluatorSlug', e.slug,
-              'evaluatorId', e.id,
-              'result', er.result, 
-              'createdAt', er.created_at,
-              'updatedAt', er.updated_at
-          )
-      ) filter (where er.run_id is not null), '{}') as evaluation_results
+      rpfc.feedback as parent_feedback
     from
-      public.run r
+      run r
       left join external_user eu on r.external_user_id = eu.id
       left join run_parent_feedback_cache rpfc on r.id = rpfc.id
       left join template_version tv on r.template_version_id = tv.id
       left join template t on tv.template_id = t.id
-      left join evaluation_result_v2 er on r.id = er.run_id 
-      left join evaluator e on er.evaluator_id = e.id
     where
       r.project_id = ${projectId}
       ${parentRunCheck}
       and (${filtersQuery})
-    group by
-      r.id,
-      eu.id,
-      t.slug,
-      rpfc.feedback
     order by
       r.created_at desc
     limit ${exportType ? 10000 : Number(limit)}
-    offset ${Number(page) * Number(limit)}
-      `
+    offset ${Number(page) * Number(limit)}`
 
   const runs = rows.map(formatRun)
 

packages/backend/src/checks/index.ts

@@ -319,8 +319,7 @@ export const CHECK_RUNNERS: CheckRunner[] = [
   {
     id: "search",
     sql: ({ query }) =>
-      sql`(to_tsvector('simple', substring(r.input_text, 1, 948575)) @@ plainto_tsquery('simple', ${query})
-        or to_tsvector('simple', substring(r.output_text, 1, 948575)) @@ plainto_tsquery('simple', ${query}))`,
+      sql`(r.input_text ilike ${`%${query}%`} or r.output_text ilike ${`%${query}%`})`,
   },
   {
     id: "string",

packages/backend/src/utils/db.ts

@@ -23,6 +23,11 @@ function debugFn(
   parameters: any[],
   paramTypes: any[],
 ) {
+  // for (let i = 0; i <= parameters.length; i++) {
+  //   let regex = new RegExp(`\\$${i + 1}`, "g")
+  //   query = query.replace(regex, `'${parameters[i]}'`)
+  // }
+
   console.log("connection:", connection)
   console.log("query:", query)
   console.log("parameters:", parameters)

packages/db/0021.sql

@@ -0,0 +1,2 @@
+create index on run using gin (input_text gin_trgm_ops);
+create index on run using gin (output_text gin_trgm_ops);

packages/frontend/next.config-monolith.js

@@ -0,0 +1,51 @@
+/** @type {import('next').NextConfig} */
+const nextConfig = {
+  reactStrictMode: true,
+  eslint: {
+    // Warning: This allows production builds to successfully complete even if
+    // your project has ESLint errors.
+    ignoreDuringBuilds: true,
+  },
+  typescript: {
+    // !! WARN !!
+    // Dangerously allow production builds to successfully complete even if
+    // your project has type errors.
+    // !! WARN !!
+    ignoreBuildErrors: true,
+  },
+  images: {
+    remotePatterns: [
+      {
+        protocol: "https",
+        hostname: "**",
+      },
+    ],
+  },
+  async rewrites() {
+    const redirects =  [
+      {
+        source: '/api/:path*',
+        destination: 'http://localhost:3333/:path*'
+      },
+      {
+        source: '/api/auth/:path*',
+        destination: 'http://localhost:3333/auth/:path*'
+      }
+    ]
+
+
+    return redirects
+  },
+  webpack: (config, { webpack }) => {
+    config.plugins.push(
+      new webpack.IgnorePlugin({
+        resourceRegExp: /^pg-native$|^cloudflare:sockets$/,
+      }),
+    )
+
+    return config
+  },
+  transpilePackages: ["shared"],
+}
+
+module.exports = nextConfig

packages/frontend/next.config.js

@@ -47,13 +47,6 @@ const nextConfig = {
       },
     ]
 
-    if(process.env.IS_SELF_HOSTED_MONOLITHIC) {
-      redirects.push({
-        source: '/api/path:*',
-        destination: 'http://localhost:3333/api/path:*'
-      })
-    }
-
     return redirects
   },
   webpack: (config, { webpack }) => {

packages/frontend/pages/analytics.tsx

@@ -365,7 +365,6 @@ export default function Analytics() {
       serializedChecks,
     )
 
-  console.log(tokensData)
   const { data: costData, isLoading: costDataLoading } = useAnalyticsChartData(
     "costs",
     startDate,

packages/frontend/pages/settings.tsx

@@ -154,7 +154,6 @@ export default function AppAnalytics() {
   const { data: projectUsage, isLoading: projectUsageLoading } = useSWR(
     project?.id && org && `/orgs/${org.id}/usage?projectId=${project?.id}`,
   )
-  console.log(projectUsage)
 
   return (
     <Container className="unblockable">