mirror of
https://github.com/ItzCrazyKns/Perplexica.git
synced 2026-04-17 11:14:23 +00:00
Merge branch 'master' of https://github.com/ItzCrazyKns/Vane
This commit is contained in:
@@ -19,6 +19,9 @@ class APISearchAgent {
|
||||
chatHistory: input.chatHistory,
|
||||
followUp: input.followUp,
|
||||
llm: input.config.llm,
|
||||
}).catch((err) => {
|
||||
console.error(`Error executing widgets: ${err}`);
|
||||
return [];
|
||||
});
|
||||
|
||||
let searchPromise: Promise<ResearcherOutput> | null = null;
|
||||
|
||||
@@ -30,7 +30,7 @@ const academicSearchAction: ResearchAction<typeof schema> = {
|
||||
config.classification.classification.skipSearch === false &&
|
||||
config.classification.classification.academicSearch === true,
|
||||
execute: async (input, additionalConfig) => {
|
||||
input.queries = input.queries.slice(0, 3);
|
||||
input.queries = (Array.isArray(input.queries) ? input.queries : [input.queries]).slice(0, 3);
|
||||
|
||||
const researchBlock = additionalConfig.session.getBlock(
|
||||
additionalConfig.researchBlockId,
|
||||
|
||||
@@ -30,7 +30,7 @@ const socialSearchAction: ResearchAction<typeof schema> = {
|
||||
config.classification.classification.skipSearch === false &&
|
||||
config.classification.classification.discussionSearch === true,
|
||||
execute: async (input, additionalConfig) => {
|
||||
input.queries = input.queries.slice(0, 3);
|
||||
input.queries = (Array.isArray(input.queries) ? input.queries : [input.queries]).slice(0, 3);
|
||||
|
||||
const researchBlock = additionalConfig.session.getBlock(
|
||||
additionalConfig.researchBlockId,
|
||||
|
||||
@@ -85,7 +85,7 @@ const webSearchAction: ResearchAction<typeof actionSchema> = {
|
||||
config.sources.includes('web') &&
|
||||
config.classification.classification.skipSearch === false,
|
||||
execute: async (input, additionalConfig) => {
|
||||
input.queries = input.queries.slice(0, 3);
|
||||
input.queries = (Array.isArray(input.queries) ? input.queries : [input.queries]).slice(0, 3);
|
||||
|
||||
const researchBlock = additionalConfig.session.getBlock(
|
||||
additionalConfig.researchBlockId,
|
||||
|
||||
@@ -38,11 +38,30 @@ export const searchSearxng = async (
|
||||
});
|
||||
}
|
||||
|
||||
const res = await fetch(url);
|
||||
const data = await res.json();
|
||||
const controller = new AbortController();
|
||||
const timeoutId = setTimeout(() => controller.abort(), 10000);
|
||||
|
||||
const results: SearxngSearchResult[] = data.results;
|
||||
const suggestions: string[] = data.suggestions;
|
||||
try {
|
||||
const res = await fetch(url, {
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
return { results, suggestions };
|
||||
if (!res.ok) {
|
||||
throw new Error(`SearXNG error: ${res.statusText}`);
|
||||
}
|
||||
|
||||
const data = await res.json();
|
||||
|
||||
const results: SearxngSearchResult[] = data.results;
|
||||
const suggestions: string[] = data.suggestions;
|
||||
|
||||
return { results, suggestions };
|
||||
} catch (err: any) {
|
||||
if (err.name === 'AbortError') {
|
||||
throw new Error('SearXNG search timed out');
|
||||
}
|
||||
throw err;
|
||||
} finally {
|
||||
clearTimeout(timeoutId);
|
||||
}
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user