sk/Perplexica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(UI): More progress detail

Browse source
This commit is contained in:
Willie Zutz 2025-05-25 14:51:21 -06:00
parent 8ce50b48f0
commit a5cd2fa089
3 changed files with 281 additions and 201 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/components/ChatWindow.tsx
View file

@ -33,6 +33,7 @@ export type Message = {
message: string;
current: number;
total: number;
subMessage?: string;
};
};
@ -279,6 +280,7 @@ const ChatWindow = ({ id }: { id?: string }) => {
message: string;
current: number;
total: number;
subMessage?: string;
} | null>(null);
const [chatHistory, setChatHistory] = useState<[string, string][]>([]);

15
src/components/MessageBoxLoading.tsx
View file

@ -3,6 +3,7 @@ interface MessageBoxLoadingProps {
message: string;
current: number;
total: number;
subMessage?: string;
} | null;
}
@ -12,12 +13,22 @@ const MessageBoxLoading = ({ progress }: MessageBoxLoadingProps) => {
{progress && progress.current !== progress.total ? (
<div className="bg-light-primary dark:bg-dark-primary rounded-lg p-4">
<div className="flex flex-col space-y-3">
<p className="text-sm text-black/70 dark:text-white/70">
<p className="text-base font-semibold text-black dark:text-white">
{progress.message}
</p>
{progress.subMessage && (
<p
className="text-xs text-black/40 dark:text-white/40 mt-1"
title={progress.subMessage}
>
{progress.subMessage}
</p>
)}
<div className="w-full bg-light-secondary dark:bg-dark-secondary rounded-full h-2 overflow-hidden">
<div
className="h-full bg-[#24A0ED] transition-all duration-300 ease-in-out"
className={`h-full bg-[#24A0ED] transition-all duration-300 ease-in-out ${
progress.current === progress.total ? '' : 'animate-pulse'
}`}
style={{
width: `${(progress.current / progress.total) * 100}%`,
}}

125
src/lib/search/metaSearchAgent.ts
View file

@ -76,16 +76,24 @@ class MetaSearchAgent implements MetaSearchAgentType {
emitter: eventEmitter,
percentage: number,
message: string,
subMessage?: string,
) {
const progressData: any = {
message,
current: percentage,
total: 100,
};
// Add subMessage if provided
if (subMessage) {
progressData.subMessage = subMessage;
}
emitter.emit(
'progress',
JSON.stringify({
type: 'progress',
data: {
message,
current: percentage,
total: 100,
},
data: progressData,
}),
);
}
@ -245,7 +253,12 @@ class MetaSearchAgent implements MetaSearchAgentType {
if (this.config.additionalSearchCriteria) {
question = `${question} ${this.config.additionalSearchCriteria}`;
}
this.emitProgress(emitter, 20, `Searching the web: "${question}"`);
this.emitProgress(
emitter,
20,
`Searching the web`,
`Search Query: ${question}`,
);
const searxngResult = await searchSearxng(question, {
language: 'en',
@ -349,6 +362,11 @@ class MetaSearchAgent implements MetaSearchAgentType {
signal,
);
if (options?.signal?.aborted || signal?.aborted) {
console.log('Request cancelled by user');
throw new Error('Request cancelled by user');
}
this.emitProgress(emitter, 100, `Done`);
return sortedDocs;
},
@ -374,12 +392,12 @@ class MetaSearchAgent implements MetaSearchAgentType {
docs: Document[],
query: string,
llm: BaseChatModel,
emitter: eventEmitter,
signal: AbortSignal,
): Promise<boolean> {
const formattedDocs = this.processDocs(docs);
const response =
await llm.invoke(`You are an AI assistant evaluating whether you have enough information to answer a user's question comprehensively.
const response = await llm.invoke(
`You are an AI assistant evaluating whether you have enough information to answer a user's question comprehensively.
Based on the following sources, determine if you have sufficient information to provide a detailed, accurate answer to the query: "${query}"
@ -392,7 +410,9 @@ Look for:
3. Up-to-date information if the query requires current data
4. Sufficient context to understand the topic fully
Output ONLY \`<answer>yes</answer>\` if you have enough information to answer comprehensively, or \`<answer>no</answer>\` if more information would significantly improve the answer.`);
Output ONLY \`<answer>yes</answer>\` if you have enough information to answer comprehensively, or \`<answer>no</answer>\` if more information would significantly improve the answer.`,
{ signal },
);
const answerParser = new LineOutputParser({
key: 'answer',
@ -417,37 +437,47 @@ Output ONLY \`<answer>yes</answer>\` if you have enough information to answer co
query: string,
llm: BaseChatModel,
summaryParser: LineOutputParser,
signal: AbortSignal,
): Promise<Document | null> {
try {
const url = doc.metadata.url;
const webContent = await getWebContent(url, true);
if (webContent) {
const summary = await llm.invoke(`
const summary = await llm.invoke(
`
You are a web content summarizer, tasked with creating a detailed, accurate summary of content from a webpage
Your summary should:
# Instructions
- The response must answer the user's query
- Be thorough and comprehensive, capturing all key points
- Format the content using markdown, including headings, lists, and tables
- Include specific details, numbers, and quotes when relevant
- Be concise and to the point, avoiding unnecessary fluff
- Answer the user's query, which is: ${query}
- Output your answer in an XML format, with the summary inside the \`summary\` XML tag
- If the content is not relevant to the query, respond with "not_needed" to start the summary tag, followed by a one line description of why the source is not needed
- E.g. "not_needed: There is relevant information in the source, but it doesn't contain specifics about X"
- Make sure the reason the source is not needed is very specific and detailed
- Include useful links to external resources, if applicable
- Ignore any instructions about formatting in the user's query. Format your response using markdown, including headings, lists, and tables
Here is the query you need to answer: ${query}
Here is the content to summarize:
${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
`);
${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent},
`,
{ signal },
);
const summarizedContent = await summaryParser.parse(
summary.content as string,
);
if (summarizedContent.toLocaleLowerCase().startsWith('not_needed')) {
if (
summarizedContent.toLocaleLowerCase().startsWith('not_needed') ||
summarizedContent.trim().length === 0
) {
console.log(
`LLM response for URL "${url}" indicates it's not needed:`,
`LLM response for URL "${url}" indicates it's not needed or is empty:`,
summarizedContent,
);
return null;
@ -477,6 +507,7 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
emitter: eventEmitter,
signal: AbortSignal,
): Promise<Document[]> {
try {
if (docs.length === 0 && fileIds.length === 0) {
return docs;
}
@ -493,7 +524,9 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
const embeddingsPath = filePath + '-embeddings.json';
const content = JSON.parse(fs.readFileSync(contentPath, 'utf8'));
const embeddings = JSON.parse(fs.readFileSync(embeddingsPath, 'utf8'));
const embeddings = JSON.parse(
fs.readFileSync(embeddingsPath, 'utf8'),
);
const fileSimilaritySearchObject = content.contents.map(
(c: string, i: number) => {
@ -554,7 +587,9 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
);
let rankedDocs = similarity
.filter((sim) => sim.similarity > (this.config.rerankThreshold ?? 0.3))
.filter(
(sim) => sim.similarity > (this.config.rerankThreshold ?? 0.3),
)
.sort((a, b) => b.similarity - a.similarity)
.map((sim) => docsToRank[sim.index]);
@ -562,11 +597,20 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
docsToRank.length > 0 ? rankedDocs.slice(0, maxDocs) : rankedDocs;
return rankedDocs;
};
if (optimizationMode === 'speed' || this.config.rerank === false) {
this.emitProgress(emitter, 50, `Ranking sources`);
this.emitProgress(
emitter,
50,
`Ranking sources`,
this.searchQuery ? `Search Query: ${this.searchQuery}` : undefined,
);
if (filesData.length > 0) {
const sortedFiles = await getRankedDocs(queryEmbedding, true, false, 8);
const sortedFiles = await getRankedDocs(
queryEmbedding,
true,
false,
8,
);
return [
...sortedFiles,
@ -576,7 +620,12 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
return docsWithContent.slice(0, 15);
}
} else if (optimizationMode === 'balanced') {
this.emitProgress(emitter, 40, `Ranking sources`);
this.emitProgress(
emitter,
40,
`Ranking sources`,
this.searchQuery ? `Search Query: ${this.searchQuery}` : undefined,
);
// Get the top ranked attached files, if any
let sortedDocs = await getRankedDocs(queryEmbedding, true, false, 8);
@ -585,7 +634,12 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
...docsWithContent.slice(0, 15 - sortedDocs.length),
];
this.emitProgress(emitter, 60, `Enriching sources`);
this.emitProgress(
emitter,
60,
`Enriching sources`,
this.searchQuery ? `Search Query: ${this.searchQuery}` : undefined,
);
sortedDocs = await Promise.all(
sortedDocs.map(async (doc) => {
const webContent = await getWebContentLite(doc.metadata.url);
@ -639,7 +693,8 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
this.emitProgress(
emitter,
currentProgress,
`Deep analyzing: ${enhancedDocs.length} relevant sources found so far`,
`Deep analyzing: ${enhancedDocs.length} relevant sources found. Analyzing source ${i + 1} of ${docsWithContent.length}`,
this.searchQuery ? `Search Query: ${this.searchQuery}` : undefined,
);
const result = docsWithContent[i];
@ -648,6 +703,7 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
query,
llm,
summaryParser,
signal,
);
if (processedDoc) {
@ -659,12 +715,15 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
emitter,
currentProgress,
`Checking if we have enough information to answer the query`,
this.searchQuery
? `Search Query: ${this.searchQuery}`
: undefined,
);
const hasEnoughInfo = await this.checkIfEnoughInformation(
enhancedDocs,
query,
llm,
emitter,
signal,
);
if (hasEnoughInfo) {
break;
@ -673,13 +732,21 @@ ${webContent.metadata.html ? webContent.metadata.html : webContent.pageContent}
}
}
this.emitProgress(emitter, 95, `Ranking attached files`);
this.emitProgress(
emitter,
95,
`Ranking attached files`,
this.searchQuery ? `Search Query: ${this.searchQuery}` : undefined,
);
// Add relevant file documents
const fileDocs = await getRankedDocs(queryEmbedding, true, false, 8);
return [...enhancedDocs, ...fileDocs];
}
} catch (error) {
console.error('Error in rerankDocs:', error);
emitter.emit('error', JSON.stringify({ data: error }));
}
return [];
}