wip: supbase search

apps/masterbots.ai/app/(browse)/page.tsx

@@ -20,7 +20,7 @@ export default async function HomePage({ searchParams }: HomePageProps) {
   const query = searchParams.query ? decodeQuery(searchParams.query) : null
   const limit = searchParams.limit ? parseInt(searchParams.limit) : 20
   const page = searchParams.page ? parseInt(searchParams.page) : 1
-  console.log('hey hey hey', { query, limit, page })
+  // console.log({ query, limit, page })
   const formData = new FormData()
 
   // Append the limit parameter to the FormData
@@ -34,7 +34,7 @@ export default async function HomePage({ searchParams }: HomePageProps) {
       <div>Your query: {query}</div>
       <ul>
         {threads.map(t => (
-          <li key={t.threadId}>{t.messages[0]?.content || 'not found'}</li>
+          <li key={t.threadId}>{t.message[0]?.content || 'not found'}</li>
         ))}
       </ul>
 

apps/masterbots.ai/app/actions.ts

@@ -1,7 +1,9 @@
 'use server'
 
 import { createSupabaseServerClient } from '@/services/supabase'
+import { getErrorMessage } from '@repo/mb-lib'
 import { Dub } from 'dub'
+import { objectToCamel } from 'ts-case-convert'
 
 const dub = new Dub({
   projectSlug: 'bitcash'
@@ -47,22 +49,42 @@ export async function getThreads(formData: FormData) {
   const supabase = await createSupabaseServerClient()
   const query = formData.get('query')
 
-  let supaQuery = supabase.from('thread').select(
-    `
+  const threadsQuery = supabase
+    .from('thread')
+    .select(
+      `
       *,
       message (
-        * order(created_at desc)
+        * 
       )
     `
-  )
-
-  if (query) {
-    supaQuery = supaQuery
-      .filter('message.role', 'neq', 'system')
-      .textSearch('message.content', query.toString())
-  }
+    )
+    .range(0, 20)
+  const { data, error } = await threadsQuery
+  if (error) throw new Error(getErrorMessage(error))
 
-  const { data, error } = await supaQuery
+  // Filter to get the first assistant and user message
+  const filteredData = objectToCamel(data).map(thread => {
+    const firstAssistantMessage = thread.message.find(
+      msg => msg.role === 'assistant'
+    )
+    const firstUserMessage = thread.message.find(msg => msg.role === 'user')
+    return {
+      ...thread,
+      // new props in response for easier reference
+      firstUserMessage,
+      firstAssistantMessage,
+      // for backward campat with current code
+      message: [firstUserMessage, firstAssistantMessage].filter(Boolean), // Removes undefined entries
+      messageCount: thread.message.length
+    }
+  })
 
-  return error ? null : data
+  return error ? null : filteredData
 }
+
+// if (query) {
+//   supaQuery = supaQuery
+//     .filter('message.role', 'neq', 'system')
+//     .textSearch('message.content', query.toString())
+// }

apps/masterbots.ai/package.json

@@ -67,6 +67,7 @@
     "react-use": "^17.5.0",
     "remark-gfm": "^3.0.1",
     "remark-math": "^5.1.1",
+    "ts-case-convert": "^2.0.7",
     "use-debounce": "^10.0.0",
     "zod": "^3.22.4"
   },

package.json

@@ -43,5 +43,8 @@
     "*.rs": [
       "cargo fmt --"
     ]
+  },
+  "dependencies": {
+    "ts-case-convert": "^2.0.7"
   }
 }