SQL migration part 1

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "singleQuote": false
+}

app/api/agents/route.ts

@@ -1,8 +1,7 @@
-import { Agent } from "@/lib/types";
 import { NextRequest, NextResponse } from "next/server";
-import { write, queryAgents } from "@/lib/firestore";
-import { COLLECTIONS } from "@/lib/constants";
+import { queryAgents } from "@/lib/firestore";
 import { kv } from "@vercel/kv";
+import { listAiAgents, createAiAgent, ai_agent } from "@bitte-ai/data";
 
 export async function GET(request: NextRequest) {
   try {
@@ -13,13 +12,17 @@ export async function GET(request: NextRequest) {
     const verifiedOnly = searchParams.get("verifiedOnly") !== "false";
     const category = searchParams.get("category") || undefined;
 
-    const agents = await queryAgents<Agent>({
+    // TODO: remove firestore after migration
+    const firestoreAgents = await queryAgents({
       verified: verifiedOnly,
       chainIds,
       offset,
       limit,
       category: category === "" ? undefined : category,
     });
+    // FIXME: wait for version that is camel case
+    const sqlAgents = await listAiAgents();
+    const agents = [...firestoreAgents, ...sqlAgents];
 
     const agentIds = agents.map((agent) => agent.id);
     const pingsByAgent = await getTotalPingsByAgentIds(agentIds);
@@ -47,7 +50,7 @@ export async function POST(request: NextRequest) {
   try {
     const body = await request.json();
 
-    const newAgent: Agent = {
+    const newAgent: ai_agent = {
       ...body,
       verified: false,
       id: crypto.randomUUID(),
@@ -73,11 +76,7 @@ export async function POST(request: NextRequest) {
       );
     }
 
-    const result = await write(COLLECTIONS.AGENTS, newAgent.id, newAgent);
-
-    if (!result.success) {
-      throw result.error;
-    }
+    await createAiAgent(newAgent);
 
     return NextResponse.json(newAgent, { status: 201 });
   } catch (error) {

lib/firestore.ts

@@ -135,26 +135,32 @@ export const catchDocumentNotFound = (err: Error): null => {
   throw err;
 };
 
-export const queryAgents = async <T>(options: {
-  verified?: boolean;
-  withTools?: boolean;
-  chainIds?: string[];
-  offset?: number;
-  limit?: number;
-  category?: string | null;
-} = {}): Promise<T[]> => {
+export const queryAgents = async (
+  options: {
+    verified?: boolean;
+    withTools?: boolean;
+    chainIds?: string[];
+    offset?: number;
+    limit?: number;
+    category?: string | null;
+  } = {}
+): Promise<Agent[]> => {
   let query: FirebaseFirestore.Query = db.collection(COLLECTIONS.AGENTS);
-  
+
   if (options.verified) {
-    query = query.where('verified', '==', true);
+    query = query.where("verified", "==", true);
   }
 
   if (options.chainIds?.length) {
-    query = query.where('chainIds', 'array-contains-any', options.chainIds.map(id => parseInt(id)));
+    query = query.where(
+      "chainIds",
+      "array-contains-any",
+      options.chainIds.map((id) => parseInt(id))
+    );
   }
 
   if (options.category) {
-    query = query.where('category', '==', options.category);
+    query = query.where("category", "==", options.category);
   }
 
   if (options.limit) {
@@ -166,59 +172,66 @@ export const queryAgents = async <T>(options: {
   }
 
   const snapshot = await query.get();
-  const agents = snapshot.docs.map(doc => doc.data());
-  
+  const agents = snapshot.docs.map((doc) => doc.data());
+
   if (!options.withTools) {
-    return agents.map(agent => {
+    return agents.map((agent) => {
       const { ...rest } = agent;
-      return rest as T;
+      return rest as Agent;
     });
   }
-  
-  return agents as T[];
+
+  return agents as Agent[];
 };
 
-export const queryTools = async <T>(options: {
-  verified?: boolean;
-  functionName?: string;
-  offset?: number;
-  chainId?: string;
-} = {}): Promise<T[]> => {
-  let query: FirebaseFirestore.Query = db.collection(COLLECTIONS.AGENTS)
-    .select('tools', 'image', 'chainIds');
-
+export const queryTools = async <T>(
+  options: {
+    verified?: boolean;
+    functionName?: string;
+    offset?: number;
+    chainId?: string;
+  } = {}
+): Promise<T[]> => {
+  let query: FirebaseFirestore.Query = db
+    .collection(COLLECTIONS.AGENTS)
+    .select("tools", "image", "chainIds");
+
   if (options.verified) {
-    query = query.where('verified', '==', true);
+    query = query.where("verified", "==", true);
   }
 
   if (options.chainId) {
-    query = query.where('chainIds', 'array-contains', options.chainId);
+    query = query.where("chainIds", "array-contains", options.chainId);
   }
 
   const limit = 100;
   query = query.limit(limit);
 
   const snapshot = await query.get();
   const tools: Tool[] = [];
-  
+
   for (const doc of snapshot.docs) {
     const agent = doc.data();
     if (!agent.tools?.length) continue;
 
     const baseToolData = {
       image: agent.image,
-      chainIds: agent.chainIds || []
+      chainIds: agent.chainIds || [],
     };
 
     for (const tool of agent.tools) {
-      if (options.functionName && 
-          !tool.function.name.toLowerCase().includes(options.functionName.toLowerCase())) {
+      if (
+        options.functionName &&
+        !tool.function.name
+          .toLowerCase()
+          .includes(options.functionName.toLowerCase())
+      ) {
         continue;
       }
 
       tools.push({
         ...tool,
-        ...baseToolData
+        ...baseToolData,
       });
     }
   }

package.json

@@ -12,6 +12,7 @@
   },
   "dependencies": {
     "@ai-sdk/openai": "^1.1.11",
+    "@bitte-ai/data": "0.1.0-fix-cicd2-460c6c4",
     "@google-cloud/firestore": "^7.11.0",
     "@jest/globals": "^29.7.0",
     "@radix-ui/react-dialog": "^1.1.6",