Merge remote-tracking branch 'origin/master' into ollama-auth

README.md

@@ -144,8 +144,8 @@ For more details, check out the full documentation [here](https://github.com/Itz
 - [x] History Saving features
 - [x] Introducing various Focus Modes
 - [x] Adding API support
+- [x] Adding Discover
 - [ ] Finalizing Copilot Mode
-- [ ] Adding Discover
 
 ## Support Us
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "perplexica-backend",
-  "version": "1.9.0-rc3",
+  "version": "1.9.0",
   "license": "MIT",
   "author": "ItzCrazyKns",
   "scripts": {
@@ -18,6 +18,7 @@
     "@types/html-to-text": "^9.0.4",
     "@types/pdf-parse": "^1.1.4",
     "@types/readable-stream": "^4.0.11",
+    "@types/ws": "^8.5.12",
     "drizzle-kit": "^0.22.7",
     "nodemon": "^3.1.0",
     "prettier": "^3.2.5",

src/agents/academicSearchAgent.ts

@@ -115,11 +115,7 @@ const createBasicAcademicSearchRetrieverChain = (llm: BaseChatModel) => {
 
       const res = await searchSearxng(input, {
         language: 'en',
-        engines: [
+        engines: ['arxiv', 'google scholar', 'pubmed'],
-          'arxiv',
-          'google scholar',
-          'pubmed',
-        ],
       });
 
       const documents = res.results.map(
@@ -171,7 +167,6 @@ const createBasicAcademicSearchAnsweringChain = (
     if (optimizationMode === 'speed') {
       return docsWithContent.slice(0, 15);
     } else if (optimizationMode === 'balanced') {
-      console.log('Balanced mode');
       const [docEmbeddings, queryEmbedding] = await Promise.all([
         embeddings.embedDocuments(
           docsWithContent.map((doc) => doc.pageContent),

src/agents/webSearchAgent.ts

@@ -227,7 +227,7 @@ const createBasicWebSearchRetrieverChain = (llm: BaseChatModel) => {
             The text will be shared inside the \`text\` XML tag, and the query inside the \`query\` XML tag.
 
             <example>
-            <text>
+            1. \`<text>
             Docker is a set of platform-as-a-service products that use OS-level virtualization to deliver software in packages called containers. 
             It was first released in 2013 and is developed by Docker, Inc. Docker is designed to make it easier to create, deploy, and run applications 
             by using containers.
@@ -241,6 +241,26 @@ const createBasicWebSearchRetrieverChain = (llm: BaseChatModel) => {
             Docker is a revolutionary platform-as-a-service product developed by Docker, Inc., that uses container technology to make application 
             deployment more efficient. It allows developers to package their software with all necessary dependencies, making it easier to run in 
             any environment. Released in 2013, Docker has transformed the way applications are built, deployed, and managed.
+            \`
+            2. \`<text>
+            The theory of relativity, or simply relativity, encompasses two interrelated theories of Albert Einstein: special relativity and general
+            relativity. However, the word "relativity" is sometimes used in reference to Galilean invariance. The term "theory of relativity" was based
+            on the expression "relative theory" used by Max Planck in 1906. The theory of relativity usually encompasses two interrelated theories by
+            Albert Einstein: special relativity and general relativity. Special relativity applies to all physical phenomena in the absence of gravity.
+            General relativity explains the law of gravitation and its relation to other forces of nature. It applies to the cosmological and astrophysical
+            realm, including astronomy.
+            </text>
+
+            <query>
+            summarize
+            </query>
+
+            Response:
+            The theory of relativity, developed by Albert Einstein, encompasses two main theories: special relativity and general relativity. Special
+            relativity applies to all physical phenomena in the absence of gravity, while general relativity explains the law of gravitation and its
+            relation to other forces of nature. The theory of relativity is based on the concept of "relative theory," as introduced by Max Planck in
+            1906. It is a fundamental theory in physics that has revolutionized our understanding of the universe.
+            \`
             </example>
 
             Everything below is the actual data you will be working with. Good luck!

src/routes/discover.ts

@@ -0,0 +1,48 @@
+import express from 'express';
+import { searchSearxng } from '../lib/searxng';
+import logger from '../utils/logger';
+
+const router = express.Router();
+
+router.get('/', async (req, res) => {
+  try {
+    const data = (
+      await Promise.all([
+        searchSearxng('site:businessinsider.com AI', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+        searchSearxng('site:www.exchangewire.com AI', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+        searchSearxng('site:yahoo.com AI', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+        searchSearxng('site:businessinsider.com tech', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+        searchSearxng('site:www.exchangewire.com tech', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+        searchSearxng('site:yahoo.com tech', {
+          engines: ['bing news'],
+          pageno: 1,
+        }),
+      ])
+    )
+      .map((result) => result.results)
+      .flat()
+      .sort(() => Math.random() - 0.5);
+
+    return res.json({ blogs: data });
+  } catch (err: any) {
+    logger.error(`Error in discover route: ${err.message}`);
+    return res.status(500).json({ message: 'An error has occurred' });
+  }
+});
+
+export default router;

src/routes/index.ts

@@ -7,6 +7,7 @@ import suggestionsRouter from './suggestions';
 import chatsRouter from './chats';
 import settingsRouter from './settings';
 import searchRouter from './search';
+import discoverRouter from './discover';
 
 const router = express.Router();
 
@@ -18,5 +19,6 @@ router.use('/suggestions', suggestionsRouter);
 router.use('/chats', chatsRouter);
 router.use('/settings', settingsRouter);
 router.use('/search', searchRouter);
+router.use('/discover', discoverRouter);
 
 export default router;

src/routes/search.ts

@@ -121,7 +121,13 @@ router.post('/', async (req, res) => {
       return res.status(400).json({ message: 'Invalid focus mode' });
     }
 
-    const emitter = searchHandler(body.query, history, llm, embeddings, body.optimizationMode);
+    const emitter = searchHandler(
+      body.query,
+      history,
+      llm,
+      embeddings,
+      body.optimizationMode,
+    );
 
     let message = '';
     let sources = [];

src/websocket/connectionManager.ts

@@ -78,6 +78,18 @@ export const handleConnection = async (
       ws.close();
     }
 
+    const interval = setInterval(() => {
+      if (ws.readyState === ws.OPEN) {
+        ws.send(
+          JSON.stringify({
+            type: 'signal',
+            data: 'open',
+          }),
+        );
+        clearInterval(interval);
+      }
+    }, 5);
+
     ws.on(
       'message',
       async (message) =>

ui/app/discover/page.tsx

@@ -0,0 +1,112 @@
+'use client';
+
+import { Search } from 'lucide-react';
+import { useEffect, useState } from 'react';
+import Link from 'next/link';
+import { toast } from 'sonner';
+
+interface Discover {
+  title: string;
+  content: string;
+  url: string;
+  thumbnail: string;
+}
+
+const Page = () => {
+  const [discover, setDiscover] = useState<Discover[] | null>(null);
+  const [loading, setLoading] = useState(true);
+
+  useEffect(() => {
+    const fetchData = async () => {
+      try {
+        const res = await fetch(`${process.env.NEXT_PUBLIC_API_URL}/discover`, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+        });
+
+        const data = await res.json();
+
+        if (!res.ok) {
+          throw new Error(data.message);
+        }
+
+        data.blogs = data.blogs.filter((blog: Discover) => blog.thumbnail);
+
+        setDiscover(data.blogs);
+      } catch (err: any) {
+        console.error('Error fetching data:', err.message);
+        toast.error('Error fetching data');
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchData();
+  }, []);
+
+  return loading ? (
+    <div className="flex flex-row items-center justify-center min-h-screen">
+      <svg
+        aria-hidden="true"
+        className="w-8 h-8 text-light-200 fill-light-secondary dark:text-[#202020] animate-spin dark:fill-[#ffffff3b]"
+        viewBox="0 0 100 101"
+        fill="none"
+        xmlns="http://www.w3.org/2000/svg"
+      >
+        <path
+          d="M100 50.5908C100.003 78.2051 78.1951 100.003 50.5908 100C22.9765 99.9972 0.997224 78.018 1 50.4037C1.00281 22.7993 22.8108 0.997224 50.4251 1C78.0395 1.00281 100.018 22.8108 100 50.4251ZM9.08164 50.594C9.06312 73.3997 27.7909 92.1272 50.5966 92.1457C73.4023 92.1642 92.1298 73.4365 92.1483 50.6308C92.1669 27.8251 73.4392 9.0973 50.6335 9.07878C27.8278 9.06026 9.10003 27.787 9.08164 50.594Z"
+          fill="currentColor"
+        />
+        <path
+          d="M93.9676 39.0409C96.393 38.4037 97.8624 35.9116 96.9801 33.5533C95.1945 28.8227 92.871 24.3692 90.0681 20.348C85.6237 14.1775 79.4473 9.36872 72.0454 6.45794C64.6435 3.54717 56.3134 2.65431 48.3133 3.89319C45.869 4.27179 44.3768 6.77534 45.014 9.20079C45.6512 11.6262 48.1343 13.0956 50.5786 12.717C56.5073 11.8281 62.5542 12.5399 68.0406 14.7911C73.527 17.0422 78.2187 20.7487 81.5841 25.4923C83.7976 28.5886 85.4467 32.059 86.4416 35.7474C87.1273 38.1189 89.5423 39.6781 91.9676 39.0409Z"
+          fill="currentFill"
+        />
+      </svg>
+    </div>
+  ) : (
+    <>
+      <div>
+        <div className="flex flex-col pt-4">
+          <div className="flex items-center">
+            <Search />
+            <h1 className="text-3xl font-medium p-2">Discover</h1>
+          </div>
+          <hr className="border-t border-[#2B2C2C] my-4 w-full" />
+        </div>
+
+        <div className="grid lg:grid-cols-3 sm:grid-cols-2 grid-cols-1 gap-4 pb-28 lg:pb-8 w-full justify-items-center lg:justify-items-start">
+          {discover &&
+            discover?.map((item, i) => (
+              <Link
+                href={`/?q=Summary: ${item.url}`}
+                key={i}
+                className="max-w-sm rounded-lg overflow-hidden bg-light-secondary dark:bg-dark-secondary hover:-translate-y-[1px] transition duration-200"
+              >
+                <img
+                  className="object-cover w-full aspect-video"
+                  src={
+                    new URL(item.thumbnail).origin +
+                    new URL(item.thumbnail).pathname +
+                    `?id=${new URL(item.thumbnail).searchParams.get('id')}`
+                  }
+                  alt={item.title}
+                />
+                <div className="px-6 py-4">
+                  <div className="font-bold text-lg mb-2">
+                    {item.title.slice(0, 100)}...
+                  </div>
+                  <p className="text-black-70 dark:text-white/70 text-sm">
+                    {item.content.slice(0, 100)}...
+                  </p>
+                </div>
+              </Link>
+            ))}
+        </div>
+      </div>
+    </>
+  );
+};
+
+export default Page;

ui/app/library/page.tsx

@@ -1,7 +1,7 @@
 'use client';
 
 import DeleteChat from '@/components/DeleteChat';
-import { formatTimeDifference } from '@/lib/utils';
+import { cn, formatTimeDifference } from '@/lib/utils';
 import { BookOpenText, ClockIcon, Delete, ScanEye } from 'lucide-react';
 import Link from 'next/link';
 import { useEffect, useState } from 'react';
@@ -58,13 +58,12 @@ const Page = () => {
     </div>
   ) : (
     <div>
-      <div className="fixed z-40 top-0 left-0 right-0 lg:pl-[104px] lg:pr-6 lg:px-8 px-4 py-4 lg:py-6 border-b border-light-200 dark:border-dark-200">
+      <div className="flex flex-col pt-4">
-        <div className="flex flex-row items-center space-x-2 max-w-screen-lg lg:mx-auto">
+        <div className="flex items-center">
           <BookOpenText />
-          <h2 className="text-black dark:text-white lg:text-3xl lg:font-medium">
+          <h1 className="text-3xl font-medium p-2">Library</h1>
-            Library
-          </h2>
         </div>
+        <hr className="border-t border-[#2B2C2C] my-4 w-full" />
       </div>
       {chats.length === 0 && (
         <div className="flex flex-row items-center justify-center min-h-screen">
@@ -74,10 +73,15 @@ const Page = () => {
         </div>
       )}
       {chats.length > 0 && (
-        <div className="flex flex-col pt-16 lg:pt-24">
+        <div className="flex flex-col pb-20 lg:pb-2">
           {chats.map((chat, i) => (
             <div
-              className="flex flex-col space-y-4 border-b border-white-200 dark:border-dark-200 py-6 lg:mx-4"
+              className={cn(
+                'flex flex-col space-y-4 py-6',
+                i !== chats.length - 1
+                  ? 'border-b border-white-200 dark:border-dark-200'
+                  : '',
+              )}
               key={i}
             >
               <Link

ui/components/ChatWindow.tsx

@@ -195,13 +195,24 @@ const useSocket = (
           }
         }, 10000);
 
-        ws.onopen = () => {
+        ws.addEventListener('message', (e) => {
-          console.log('[DEBUG] open');
+          const data = JSON.parse(e.data);
+          if (data.type === 'signal' && data.data === 'open') {
+            const interval = setInterval(() => {
+              if (ws.readyState === 1) {
+                	  reconnectTimeout.current = 0;setIsWSReady(true);
+                clearInterval(interval);
+              }
+            }, 5);
+            clearTimeout(timeoutId);
 	    reconnectTimeout.current = 0;
 	    reconnectAttempts.current = 0;
-          clearTimeout(timeoutId);
+            console.log('[DEBUG] opened');
-          setIsWSReady(true);
+          }
-        };
+          if (data.type === 'error') {
+            toast.error(data.data);
+          }
+        });
 
         ws.onerror = () => {
           clearTimeout(timeoutId);
@@ -217,13 +228,6 @@ const useSocket = (
           console.log('[DEBUG] closed');
         };
 
-        ws.addEventListener('message', (e) => {
-          const data = JSON.parse(e.data);
-          if (data.type === 'error') {
-            toast.error(data.data);
-          }
-        });
-
         setWs(ws);
       };
 
@@ -365,6 +369,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
   useEffect(() => {
     if (isMessagesLoaded && isWSReady) {
       setIsReady(true);
+      console.log('[DEBUG] ready');
     }
   }, [isMessagesLoaded, isWSReady]);
 
@@ -513,11 +518,11 @@ const ChatWindow = ({ id }: { id?: string }) => {
   };
 
   useEffect(() => {
-    if (isReady && initialMessage) {
+    if (isReady && initialMessage && ws?.readyState === 1) {
       sendMessage(initialMessage);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isReady, initialMessage]);
+  }, [ws?.readyState, isReady, initialMessage, isWSReady]);
 
   if (hasError) {
     return (

ui/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perplexica-frontend",
-  "version": "1.9.0-rc3",
+  "version": "1.9.0",
   "license": "MIT",
   "author": "ItzCrazyKns",
   "scripts": {

yarn.lock

@@ -690,6 +690,13 @@
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-9.0.8.tgz#7545ba4fc3c003d6c756f651f3bf163d8f0f29ba"
   integrity sha512-jg+97EGIcY9AGHJJRaaPVgetKDsrTgbRjQ5Msgjh/DQKEFl0DtyRr/VCOyD1T2R1MNeWPK/u7JoGhlDZnKBAfA==
 
+"@types/ws@^8.5.12":
+  version "8.5.12"
+  resolved "https://registry.yarnpkg.com/@types/ws/-/ws-8.5.12.tgz#619475fe98f35ccca2a2f6c137702d85ec247b7e"
+  integrity sha512-3tPRkv1EtkDpzlgyKyI8pGsGZAGPEaXeu0DOj5DI25Ja91bdAYddYHbADRYVrZMRbfW+1l5YwXVDKohDJNQxkQ==
+  dependencies:
+    "@types/node" "*"
+
 "@xenova/transformers@^2.17.1":
   version "2.17.1"
   resolved "https://registry.yarnpkg.com/@xenova/transformers/-/transformers-2.17.1.tgz#712f7a72c76c8aa2075749382f83dc7dd4e5a9a5"