feat(app): lint & beautify

This commit is contained in:
ItzCrazyKns
2025-03-02 15:35:08 +05:30
parent 07776d8699
commit 10f9cd2f79
12 changed files with 135 additions and 107 deletions

View File

@@ -2,7 +2,6 @@
[![Discord](https://dcbadge.vercel.app/api/server/26aArMy8tT?style=flat&compact=true)](https://discord.gg/26aArMy8tT) [![Discord](https://dcbadge.vercel.app/api/server/26aArMy8tT?style=flat&compact=true)](https://discord.gg/26aArMy8tT)
![preview](.assets/perplexica-screenshot.png?) ![preview](.assets/perplexica-screenshot.png?)
## Table of Contents <!-- omit in toc --> ## Table of Contents <!-- omit in toc -->

View File

@@ -4,7 +4,7 @@ services:
volumes: volumes:
- ./searxng:/etc/searxng:rw - ./searxng:/etc/searxng:rw
ports: ports:
- "4000:8080" - '4000:8080'
networks: networks:
- perplexica-network - perplexica-network
restart: unless-stopped restart: unless-stopped
@@ -19,7 +19,7 @@ services:
depends_on: depends_on:
- searxng - searxng
ports: ports:
- "3001:3001" - '3001:3001'
volumes: volumes:
- backend-dbstore:/home/perplexica/data - backend-dbstore:/home/perplexica/data
- uploads:/home/perplexica/uploads - uploads:/home/perplexica/uploads
@@ -41,7 +41,7 @@ services:
depends_on: depends_on:
- perplexica-backend - perplexica-backend
ports: ports:
- "3000:3000" - '3000:3000'
networks: networks:
- perplexica-network - perplexica-network
restart: unless-stopped restart: unless-stopped

View File

@@ -48,16 +48,18 @@ async function performImageSearch(query: string) {
switch (searchEngine) { switch (searchEngine) {
case 'google': { case 'google': {
const googleResult = await searchGooglePSE(query); const googleResult = await searchGooglePSE(query);
images = googleResult.results.map((result) => { images = googleResult.results
if (result.img_src && result.url && result.title) { .map((result) => {
return { if (result.img_src && result.url && result.title) {
img_src: result.img_src, return {
url: result.url, img_src: result.img_src,
title: result.title, url: result.url,
source: result.displayLink title: result.title,
}; source: result.displayLink,
} };
}).filter(Boolean); }
})
.filter(Boolean);
break; break;
} }
@@ -80,46 +82,52 @@ async function performImageSearch(query: string) {
case 'brave': { case 'brave': {
const braveResult = await searchBraveAPI(query); const braveResult = await searchBraveAPI(query);
images = braveResult.results.map((result) => { images = braveResult.results
if (result.img_src && result.url && result.title) { .map((result) => {
return { if (result.img_src && result.url && result.title) {
img_src: result.img_src, return {
url: result.url, img_src: result.img_src,
title: result.title, url: result.url,
source: result.url title: result.title,
}; source: result.url,
} };
}).filter(Boolean); }
})
.filter(Boolean);
break; break;
} }
case 'yacy': { case 'yacy': {
const yacyResult = await searchYaCy(query); const yacyResult = await searchYaCy(query);
images = yacyResult.results.map((result) => { images = yacyResult.results
if (result.img_src && result.url && result.title) { .map((result) => {
return { if (result.img_src && result.url && result.title) {
img_src: result.img_src, return {
url: result.url, img_src: result.img_src,
title: result.title, url: result.url,
source: result.url title: result.title,
source: result.url,
};
} }
} })
}).filter(Boolean); .filter(Boolean);
break; break;
} }
case 'bing': { case 'bing': {
const bingResult = await searchBingAPI(query); const bingResult = await searchBingAPI(query);
images = bingResult.results.map((result) => { images = bingResult.results
if (result.img_src && result.url && result.title) { .map((result) => {
return { if (result.img_src && result.url && result.title) {
img_src: result.img_src, return {
url: result.url, img_src: result.img_src,
title: result.title, url: result.url,
source: result.url title: result.title,
source: result.url,
};
} }
} })
}).filter(Boolean); .filter(Boolean);
break; break;
} }

View File

@@ -50,14 +50,17 @@ async function performVideoSearch(query: string) {
switch (searchEngine) { switch (searchEngine) {
case 'google': { case 'google': {
const googleResult = await searchGooglePSE(youtubeQuery); const googleResult = await searchGooglePSE(youtubeQuery);
googleResult.results.forEach((result) => { // Use .results instead of .originalres googleResult.results.forEach((result) => {
// Use .results instead of .originalres
if (result.img_src && result.url && result.title) { if (result.img_src && result.url && result.title) {
const videoId = new URL(result.url).searchParams.get('v'); const videoId = new URL(result.url).searchParams.get('v');
videos.push({ videos.push({
img_src: result.img_src, img_src: result.img_src,
url: result.url, url: result.url,
title: result.title, title: result.title,
iframe_src: videoId ? `https://www.youtube.com/embed/${videoId}` : null iframe_src: videoId
? `https://www.youtube.com/embed/${videoId}`
: null,
}); });
} }
}); });
@@ -95,7 +98,9 @@ async function performVideoSearch(query: string) {
img_src: result.img_src, img_src: result.img_src,
url: result.url, url: result.url,
title: result.title, title: result.title,
iframe_src: videoId ? `https://www.youtube.com/embed/${videoId}` : null iframe_src: videoId
? `https://www.youtube.com/embed/${videoId}`
: null,
}); });
} }
}); });
@@ -117,7 +122,9 @@ async function performVideoSearch(query: string) {
img_src: result.img_src, img_src: result.img_src,
url: result.url, url: result.url,
title: result.title, title: result.title,
iframe_src: videoId ? `https://www.youtube.com/embed/${videoId}` : null iframe_src: videoId
? `https://www.youtube.com/embed/${videoId}`
: null,
}); });
} }
}); });
@@ -159,4 +166,4 @@ const handleVideoSearch = (
return VideoSearchChain.invoke(input); return VideoSearchChain.invoke(input);
}; };
export default handleVideoSearch; export default handleVideoSearch;

View File

@@ -15,7 +15,7 @@ interface Config {
IMAGE: string; IMAGE: string;
VIDEO: string; VIDEO: string;
NEWS: string; NEWS: string;
} };
MODELS: { MODELS: {
OPENAI: { OPENAI: {
API_KEY: string; API_KEY: string;
@@ -103,7 +103,8 @@ export const getBraveApiKey = () => loadConfig().SEARCH_ENGINES.BRAVE.API_KEY;
export const getBingSubscriptionKey = () => export const getBingSubscriptionKey = () =>
loadConfig().SEARCH_ENGINES.BING.SUBSCRIPTION_KEY; loadConfig().SEARCH_ENGINES.BING.SUBSCRIPTION_KEY;
export const getYacyJsonEndpoint = () => loadConfig().SEARCH_ENGINES.YACY.ENDPOINT; export const getYacyJsonEndpoint = () =>
loadConfig().SEARCH_ENGINES.YACY.ENDPOINT;
export const getSearxngApiEndpoint = () => export const getSearxngApiEndpoint = () =>
process.env.SEARXNG_API_URL || loadConfig().SEARCH_ENGINES.SEARXNG.ENDPOINT; process.env.SEARXNG_API_URL || loadConfig().SEARCH_ENGINES.SEARXNG.ENDPOINT;

View File

@@ -60,8 +60,8 @@ export const searchBingAPI = async (query: string) => {
const res = await axios.get(url.toString(), { const res = await axios.get(url.toString(), {
headers: { headers: {
'Ocp-Apim-Subscription-Key': bingApiKey, 'Ocp-Apim-Subscription-Key': bingApiKey,
'Accept': 'application/json' Accept: 'application/json',
} },
}); });
if (res.data.error) { if (res.data.error) {
@@ -79,17 +79,20 @@ export const searchBingAPI = async (query: string) => {
title: item.name, title: item.name,
url: item.url, url: item.url,
content: item.snippet, content: item.snippet,
img_src: item.primaryImageOfPage?.thumbnailUrl img_src:
|| imageResults.find((img: any) => img.hostPageUrl === item.url)?.thumbnailUrl item.primaryImageOfPage?.thumbnailUrl ||
|| videoResults.find((vid: any) => vid.hostPageUrl === item.url)?.thumbnailUrl, imageResults.find((img: any) => img.hostPageUrl === item.url)
?.thumbnailUrl ||
videoResults.find((vid: any) => vid.hostPageUrl === item.url)
?.thumbnailUrl,
...(item.video && { ...(item.video && {
videoData: { videoData: {
duration: item.video.duration, duration: item.video.duration,
embedUrl: item.video.embedHtml?.match(/src="(.*?)"/)?.[1] embedUrl: item.video.embedHtml?.match(/src="(.*?)"/)?.[1],
}, },
publisher: item.publisher, publisher: item.publisher,
datePublished: item.datePublished datePublished: item.datePublished,
}) }),
})); }));
return { results, originalres }; return { results, originalres };
@@ -99,4 +102,4 @@ export const searchBingAPI = async (query: string) => {
: error.message || 'Unknown error'; : error.message || 'Unknown error';
throw new Error(`Bing API Error: ${errorMessage}`); throw new Error(`Bing API Error: ${errorMessage}`);
} }
}; };

View File

@@ -33,7 +33,7 @@ interface BraveSearchResult {
export const searchBraveAPI = async ( export const searchBraveAPI = async (
query: string, query: string,
numResults: number = 20 numResults: number = 20,
): Promise<{ results: BraveSearchResult[]; originalres: any }> => { ): Promise<{ results: BraveSearchResult[]; originalres: any }> => {
try { try {
const braveApiKey = await getBraveApiKey(); const braveApiKey = await getBraveApiKey();
@@ -45,8 +45,8 @@ export const searchBraveAPI = async (
const res = await axios.get(url.toString(), { const res = await axios.get(url.toString(), {
headers: { headers: {
'X-Subscription-Token': braveApiKey, 'X-Subscription-Token': braveApiKey,
'Accept': 'application/json' Accept: 'application/json',
} },
}); });
if (res.data.error) { if (res.data.error) {
@@ -64,26 +64,32 @@ export const searchBraveAPI = async (
age: item.age, age: item.age,
family_friendly: item.family_friendly, family_friendly: item.family_friendly,
language: item.language, language: item.language,
video: item.video ? { video: item.video
embedUrl: item.video.embed_url, ? {
duration: item.video.duration embedUrl: item.video.embed_url,
} : undefined, duration: item.video.duration,
rating: item.rating ? { }
value: item.rating.value, : undefined,
scale: item.rating.scale_max rating: item.rating
} : undefined, ? {
value: item.rating.value,
scale: item.rating.scale_max,
}
: undefined,
products: item.deep_results?.product_cluster?.map((p: any) => ({ products: item.deep_results?.product_cluster?.map((p: any) => ({
name: p.name, name: p.name,
price: p.price price: p.price,
})), })),
recipe: item.recipe ? { recipe: item.recipe
ingredients: item.recipe.ingredients, ? {
cookTime: item.recipe.cook_time ingredients: item.recipe.ingredients,
} : undefined, cookTime: item.recipe.cook_time,
}
: undefined,
meta: { meta: {
fetched: item.meta?.fetched, fetched: item.meta?.fetched,
lastCrawled: item.meta?.last_crawled lastCrawled: item.meta?.last_crawled,
} },
})); }));
return { results, originalres }; return { results, originalres };

View File

@@ -21,7 +21,7 @@ interface GooglePSESearchResult {
}>; }>;
metatags?: Array<{ metatags?: Array<{
[key: string]: string; [key: string]: string;
'author'?: string; author?: string;
}>; }>;
cse_image?: Array<{ cse_image?: Array<{
src: string; src: string;
@@ -43,7 +43,7 @@ export const searchGooglePSE = async (query: string) => {
try { try {
const [googleApiKey, googleCseID] = await Promise.all([ const [googleApiKey, googleCseID] = await Promise.all([
getGoogleApiKey(), getGoogleApiKey(),
getGoogleCseId() getGoogleCseId(),
]); ]);
const url = new URL(`https://www.googleapis.com/customsearch/v1`); const url = new URL(`https://www.googleapis.com/customsearch/v1`);
@@ -63,15 +63,16 @@ export const searchGooglePSE = async (query: string) => {
title: item.title, title: item.title,
url: item.link, url: item.link,
content: item.snippet, content: item.snippet,
img_src: item.pagemap?.cse_image?.[0]?.src img_src:
|| item.pagemap?.cse_thumbnail?.[0]?.src item.pagemap?.cse_image?.[0]?.src ||
|| item.image?.thumbnailLink, item.pagemap?.cse_thumbnail?.[0]?.src ||
item.image?.thumbnailLink,
...(item.pagemap?.videoobject?.[0] && { ...(item.pagemap?.videoobject?.[0] && {
videoData: { videoData: {
duration: item.pagemap.videoobject[0].duration, duration: item.pagemap.videoobject[0].duration,
embedUrl: item.pagemap.videoobject[0].embedurl embedUrl: item.pagemap.videoobject[0].embedurl,
} },
}) }),
})); }));
return { results, originalres }; return { results, originalres };

View File

@@ -48,11 +48,7 @@ interface YaCySearchResult {
}[]; }[];
} }
export const searchYaCy = async (query: string, numResults: number = 20) => {
export const searchYaCy = async (
query: string,
numResults: number = 20
) => {
try { try {
const yacyBaseUrl = getYacyJsonEndpoint(); const yacyBaseUrl = getYacyJsonEndpoint();
@@ -64,7 +60,7 @@ export const searchYaCy = async (
const originalres = res.data as YaCySearchResult; const originalres = res.data as YaCySearchResult;
const results = originalres.channels[0].items.map(item => ({ const results = originalres.channels[0].items.map((item) => ({
title: item.title, title: item.title,
url: item.link, url: item.link,
content: item.description, content: item.description,

View File

@@ -15,7 +15,7 @@ async function performSearch(query: string, site: string) {
case 'google': { case 'google': {
const googleResult = await searchGooglePSE(query); const googleResult = await searchGooglePSE(query);
return googleResult.originalres.map(item => { return googleResult.originalres.map((item) => {
const imageSources = [ const imageSources = [
item.pagemap?.cse_image?.[0]?.src, item.pagemap?.cse_image?.[0]?.src,
item.pagemap?.cse_thumbnail?.[0]?.src, item.pagemap?.cse_thumbnail?.[0]?.src,
@@ -29,10 +29,11 @@ async function performSearch(query: string, site: string) {
url: item.link, url: item.link,
content: item.snippet, content: item.snippet,
thumbnail: imageSources[0], // First available image thumbnail: imageSources[0], // First available image
img_src: imageSources[0], // Same as thumbnail for consistency img_src: imageSources[0], // Same as thumbnail for consistency
iframe_src: null, iframe_src: null,
author: item.pagemap?.metatags?.[0]?.['og:site_name'] || site, author: item.pagemap?.metatags?.[0]?.['og:site_name'] || site,
publishedDate: item.pagemap?.metatags?.[0]?.['article:published_time'] publishedDate:
item.pagemap?.metatags?.[0]?.['article:published_time'],
}; };
}); });
} }
@@ -47,7 +48,7 @@ async function performSearch(query: string, site: string) {
case 'brave': { case 'brave': {
const braveResult = await searchBraveAPI(query); const braveResult = await searchBraveAPI(query);
return braveResult.results.map(item => ({ return braveResult.results.map((item) => ({
title: item.title, title: item.title,
url: item.url, url: item.url,
content: item.content, content: item.content,
@@ -55,7 +56,7 @@ async function performSearch(query: string, site: string) {
img_src: item.img_src, img_src: item.img_src,
iframe_src: null, iframe_src: null,
author: item.meta?.fetched || site, author: item.meta?.fetched || site,
publishedDate: item.meta?.lastCrawled publishedDate: item.meta?.lastCrawled,
})); }));
} }
@@ -69,13 +70,13 @@ async function performSearch(query: string, site: string) {
img_src: item.img_src, img_src: item.img_src,
iframe_src: null, iframe_src: null,
author: item?.host || site, author: item?.host || site,
publishedDate: item?.pubDate publishedDate: item?.pubDate,
})) }));
} }
case 'bing': { case 'bing': {
const bingResult = await searchBingAPI(query); const bingResult = await searchBingAPI(query);
return bingResult.results.map(item => ({ return bingResult.results.map((item) => ({
title: item.title, title: item.title,
url: item.url, url: item.url,
content: item.content, content: item.content,
@@ -83,8 +84,8 @@ async function performSearch(query: string, site: string) {
img_src: item.img_src, img_src: item.img_src,
iframe_src: null, iframe_src: null,
author: item?.publisher || site, author: item?.publisher || site,
publishedDate: item?.datePublished publishedDate: item?.datePublished,
})) }));
} }
default: default:
@@ -92,7 +93,6 @@ async function performSearch(query: string, site: string) {
} }
} }
router.get('/', async (req, res) => { router.get('/', async (req, res) => {
try { try {
const queries = [ const queries = [
@@ -114,12 +114,12 @@ router.get('/', async (req, res) => {
logger.error(`Error searching ${site}: ${error.message}`); logger.error(`Error searching ${site}: ${error.message}`);
return []; return [];
} }
}) }),
) )
) )
.flat() .flat()
.sort(() => Math.random() - 0.5) .sort(() => Math.random() - 0.5)
.filter(item => item.title && item.url && item.content); .filter((item) => item.title && item.url && item.content);
return res.json({ blogs: data }); return res.json({ blogs: data });
} catch (err: any) { } catch (err: any) {

View File

@@ -208,7 +208,6 @@ class MetaSearchAgent implements MetaSearchAgentType {
return { query: question, docs: docs }; return { query: question, docs: docs };
} else { } else {
const searchEngine = getSearchEngineBackend(); const searchEngine = getSearchEngineBackend();
let res; let res;
@@ -236,7 +235,9 @@ class MetaSearchAgent implements MetaSearchAgentType {
} }
if (!res?.results) { if (!res?.results) {
throw new Error(`No results found for search engine: ${searchEngine}`); throw new Error(
`No results found for search engine: ${searchEngine}`,
);
} }
const documents = res.results.map( const documents = res.results.map(

View File

@@ -68,7 +68,13 @@ const MessageBox = ({
return ( return (
<div> <div>
{message.role === 'user' && ( {message.role === 'user' && (
<div className={cn('w-full', messageIndex === 0 ? 'pt-16' : 'pt-8', 'break-words')}> <div
className={cn(
'w-full',
messageIndex === 0 ? 'pt-16' : 'pt-8',
'break-words',
)}
>
<h2 className="text-black dark:text-white font-medium text-3xl lg:w-9/12"> <h2 className="text-black dark:text-white font-medium text-3xl lg:w-9/12">
{message.content} {message.content}
</h2> </h2>