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

.github/FUNDING.yml

@@ -1 +0,0 @@
-patreon: itzcrazykns

README.md

@@ -146,9 +146,9 @@ If you find Perplexica useful, consider giving us a star on GitHub. This helps m
 
 We also accept donations to help sustain our project. If you would like to contribute, you can use the following options to donate. Thank you for your support!
 
-| Cards                               | Ethereum                                              |
+| Ethereum                                              |
-| ----------------------------------- | ----------------------------------------------------- |
+| ----------------------------------------------------- |
-| https://www.patreon.com/itzcrazykns | Address: `0xB025a84b2F269570Eb8D4b05DEdaA41D8525B6DD` |
+| Address: `0xB025a84b2F269570Eb8D4b05DEdaA41D8525B6DD` |
 
 ## Contribution
 

docs/installation/UPDATING.md

@@ -17,6 +17,7 @@ To update Perplexica to the latest version, follow these steps:
 ```bash
 docker compose up -d --build
 ```
+
 4. Once the command completes running go to http://localhost:3000 and verify the latest changes.
 
 ## For non Docker users

src/agents/redditSearchAgent.ts

@@ -52,8 +52,8 @@ const basicRedditSearchResponsePrompt = `
     Place these citations at the end of that particular sentence. You can cite the same sentence multiple times if it is relevant to the user's query like [number1][number2].
     However you do not need to cite it using the same number. You can use different numbers to cite the same sentence multiple times. The number refers to the number of the search result (passed in the context) used to generate that part of the answer.
 
-    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by Reddit and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to 
+    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by Reddit and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to
-    talk about the context in your response. 
+    talk about the context in your response.
 
     <context>
     {context}
@@ -177,9 +177,9 @@ const createBasicRedditSearchAnsweringChain = (
     });
 
     const sortedDocs = similarity
+      .filter((sim) => sim.similarity > 0.3)
       .sort((a, b) => b.similarity - a.similarity)
       .slice(0, 15)
-      .filter((sim) => sim.similarity > 0.3)
       .map((sim) => docsWithContent[sim.index]);
 
     return sortedDocs;

src/agents/webSearchAgent.ts

@@ -52,8 +52,8 @@ const basicWebSearchResponsePrompt = `
     Place these citations at the end of that particular sentence. You can cite the same sentence multiple times if it is relevant to the user's query like [number1][number2].
     However you do not need to cite it using the same number. You can use different numbers to cite the same sentence multiple times. The number refers to the number of the search result (passed in the context) used to generate that part of the answer.
 
-    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by the search engine and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to 
+    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by the search engine and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to
-    talk about the context in your response. 
+    talk about the context in your response.
 
     <context>
     {context}
@@ -175,8 +175,8 @@ const createBasicWebSearchAnsweringChain = (
     });
 
     const sortedDocs = similarity
-      .sort((a, b) => b.similarity - a.similarity)
       .filter((sim) => sim.similarity > 0.5)
+      .sort((a, b) => b.similarity - a.similarity)
       .slice(0, 15)
       .map((sim) => docsWithContent[sim.index]);
 

src/agents/youtubeSearchAgent.ts

@@ -52,8 +52,8 @@ const basicYoutubeSearchResponsePrompt = `
     Place these citations at the end of that particular sentence. You can cite the same sentence multiple times if it is relevant to the user's query like [number1][number2].
     However you do not need to cite it using the same number. You can use different numbers to cite the same sentence multiple times. The number refers to the number of the search result (passed in the context) used to generate that part of the answer.
 
-    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by Youtube and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to 
+    Anything inside the following \`context\` HTML block provided below is for your knowledge returned by Youtube and is not shared by the user. You have to answer question on the basis of it and cite the relevant information from it but you do not have to
-    talk about the context in your response. 
+    talk about the context in your response.
 
     <context>
     {context}
@@ -177,9 +177,9 @@ const createBasicYoutubeSearchAnsweringChain = (
     });
 
     const sortedDocs = similarity
+      .filter((sim) => sim.similarity > 0.3)
       .sort((a, b) => b.similarity - a.similarity)
       .slice(0, 15)
-      .filter((sim) => sim.similarity > 0.3)
       .map((sim) => docsWithContent[sim.index]);
 
     return sortedDocs;

src/lib/providers/groq.ts

@@ -9,6 +9,26 @@ export const loadGroqChatModels = async () => {
 
   try {
     const chatModels = {
+      'Llama 3.1 70B': new ChatOpenAI(
+        {
+          openAIApiKey: groqApiKey,
+          modelName: 'llama-3.1-70b-versatile',
+          temperature: 0.7,
+        },
+        {
+          baseURL: 'https://api.groq.com/openai/v1',
+        },
+      ),
+      'Llama 3.1 8B': new ChatOpenAI(
+        {
+          openAIApiKey: groqApiKey,
+          modelName: 'llama-3.1-8b-instant',
+          temperature: 0.7,
+        },
+        {
+          baseURL: 'https://api.groq.com/openai/v1',
+        },
+      ),
       'LLaMA3 8b': new ChatOpenAI(
         {
           openAIApiKey: groqApiKey,

ui/app/layout.tsx

@@ -34,7 +34,7 @@ export default function RootLayout({
               unstyled: true,
               classNames: {
                 toast:
-                  'bg-light-primary dark:bg-dark-primary text-white rounded-lg p-4 flex flex-row items-center space-x-2',
+                  'bg-light-primary dark:bg-dark-secondary dark:text-white/70 text-black-70 rounded-lg p-4 flex flex-row items-center space-x-2',
               },
             }}
           />

ui/components/ChatWindow.tsx

@@ -54,13 +54,26 @@ const useSocket = (
           ).then(async (res) => await res.json());
 
           const chatModelProviders = providers.chatModelProviders;
-          const embeddingModelProviders = providers.embeddingModelProviders;
 
-          if (
+          chatModelProvider = Object.keys(chatModelProviders)[0];
-            !chatModelProviders ||
+
-            Object.keys(chatModelProviders).length === 0
+          if (chatModelProvider === 'custom_openai') {
-          )
+            toast.error(
-            return toast.error('No chat models available');
+              'Seems like you are using the custom OpenAI provider, please open the settings and configure the API key and base URL',
+            );
+            setError(true);
+            return;
+          } else {
+            chatModel = Object.keys(chatModelProviders[chatModelProvider])[0];
+
+            if (
+              !chatModelProviders ||
+              Object.keys(chatModelProviders).length === 0
+            )
+              return toast.error('No chat models available');
+          }
+
+          const embeddingModelProviders = providers.embeddingModelProviders;
 
           if (
             !embeddingModelProviders ||
@@ -68,9 +81,6 @@ const useSocket = (
           )
             return toast.error('No embedding models available');
 
-          chatModelProvider = Object.keys(chatModelProviders)[0];
-          chatModel = Object.keys(chatModelProviders[chatModelProvider])[0];
-
           embeddingModelProvider = Object.keys(embeddingModelProviders)[0];
           embeddingModel = Object.keys(
             embeddingModelProviders[embeddingModelProvider],
@@ -88,7 +98,7 @@ const useSocket = (
             `${process.env.NEXT_PUBLIC_API_URL}/models`,
             {
               headers: {
-                'Content-Type': 'application/json',
+                'Content-Type': 'app  lication/json',
               },
             },
           ).then(async (res) => await res.json());
@@ -106,6 +116,7 @@ const useSocket = (
 
           if (
             chatModelProvider &&
+            chatModelProvider != 'custom_openai' &&
             !chatModelProviders[chatModelProvider][chatModel]
           ) {
             chatModel = Object.keys(chatModelProviders[chatModelProvider])[0];
@@ -187,6 +198,13 @@ 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);
       };
 

ui/components/SettingsDialog.tsx

@@ -225,9 +225,13 @@ const SettingsDialog = ({
                           value={selectedChatModelProvider ?? undefined}
                           onChange={(e) => {
                             setSelectedChatModelProvider(e.target.value);
-                            setSelectedChatModel(
+                            if (e.target.value === 'custom_openai') {
-                              config.chatModelProviders[e.target.value][0],
+                              setSelectedChatModel('');
-                            );
+                            } else {
+                              setSelectedChatModel(
+                                config.chatModelProviders[e.target.value][0],
+                              );
+                            }
                           }}
                           options={Object.keys(config.chatModelProviders).map(
                             (provider) => ({