cleanup

app/tools/serp-api.ts

@@ -17,8 +17,9 @@ function createSerpApi({ apiKey }: { apiKey: string }) {
             q: input,
             location: "Seattle, Washington",
         });
-      
-      return JSON.stringify(response);
+
+        console.log(response);      
+        return JSON.stringify(response);
     } catch (error) {
       throw new Error(`Error in serpApi: ${error}`);
     }

app/tools/surfer.ts

@@ -8,29 +8,7 @@ function createUrlSurfer() {
   const name = 'surfer';
   const description = 'A custom URL navigator. Useful when a URL is provided with a question. Input should be a prompt with a URL. Outputs a JSON array of relevant results.';
 
-  const execute = async ({ input }: z.infer<typeof paramsSchema>) => {
-    try {
-      const res = await fetch('/api/surfer', {
-        method: 'POST',
-        headers: {
-          'Content-Type': 'application/json',
-        },
-        body: JSON.stringify({ prompt: input }),
-      });
-
-      if (!res.ok) {
-        throw new Error(`HTTP error! status: ${res.status}`);
-      }
-
-      const data = await res.json();
-      return data;
-    } catch (error) {
-      // @ts-ignore
-      throw new Error(`Error in UrlSurfer: ${error.message}`);
-    }
-  };
-
-  return new Tool(paramsSchema, name, description, execute).tool;
+  return new Tool(paramsSchema, name, description, {} as any).tool;
 }
 
 export { createUrlSurfer };

pages/api/functions/index.ts

@@ -64,39 +64,40 @@ const handleContentText = async (targetUrl: string) => {
   return content;
 }
 
-export default async function handler(req: NextApiRequest, res: NextApiResponse) {
-  const prompt = req.body.prompt as string;
-  const functionName = req.body.name as string;
-  const urls = prompt.match(urlRegex);
+const surferApi = async ({ input }: any) => {
+  const urls = input.match(urlRegex);
   const targetUrl = urls ? urls[0] : null;
-  const promptWithoutUrl = urls ? prompt.replace(urlRegex, '').trim() : prompt;
+  const promptWithoutUrl = urls ? input.replace(urlRegex, '').trim() : input;
 
-  if (!targetUrl) {
-    return `Couldn't find url, here is the ${prompt}`;
+  const content: string = await handleContentText(targetUrl)
+  if (!content) {
+    return `Couldn't find ${targetUrl}, here is the prompt: ${promptWithoutUrl}`;
   }
   
+  const documents = await textSplitter.createDocuments([content]);
+
+  const vectorStore = await MemoryVectorStore.fromTexts(
+    // @ts-ignore
+    [...documents.map(doc => doc.pageContent)],
+    // @ts-ignore
+    [...documents.map((v, k) => k)],
+    model
+  )
+  const queryResult = await vectorStore.similaritySearch(promptWithoutUrl, VECTOR_STORE_SIZE);
+  return `Here is the context: ${JSON.stringify(queryResult.map(result => result.pageContent))} from using the prompt to lookup relevant information. Here is the prompt: ${promptWithoutUrl}`;
+}
+
+export default async function handler(req: NextApiRequest, res: NextApiResponse) {
+  const prompt = req.body.prompt as string;
+  const functionName = req.body.name as string;
+  
   try {
     if (functionName === 'serpApi') {
       const result = await serpApi({ input: prompt });
       return res.status(200).send(result);
     } else {
-      const content: string = await handleContentText(targetUrl)
-      if (!content) {
-        return `Couldn't find ${targetUrl}, here is the prompt: ${promptWithoutUrl}`;
-      }
-      
-      const documents = await textSplitter.createDocuments([content]);
-
-      const vectorStore = await MemoryVectorStore.fromTexts(
-        // @ts-ignore
-        [...documents.map(doc => doc.pageContent)],
-        // @ts-ignore
-        [...documents.map((v, k) => k)],
-        model
-      )
-      const queryResult = await vectorStore.similaritySearch(promptWithoutUrl, VECTOR_STORE_SIZE);
-      return res.status(200).send(
-        `Here is the context: ${JSON.stringify(queryResult.map(result => result.pageContent))} from using the prompt to lookup relevant information. Here is the prompt: ${promptWithoutUrl}`);
+      const result = await surferApi({ input: prompt })
+      return res.status(200).send(result);
     }
   } catch (error) {
     console.error(error);