Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fix code duplication, add error handling & improve checks #5729

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

chore: fix code duplication, add error handling & improve checks #5729

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 27 additions & 32 deletions libs/remix-ai-core/src/helpers/streamHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
import { ChatHistory } from '../prompts/chat';
import { JsonStreamParser } from '../types/types'
import { JsonStreamParser } from '../types/types';

export const HandleSimpleResponse = async (response,
cb?: (streamText: string) => void) => {
let resultText = ''
export const HandleSimpleResponse = async (response, cb?: (streamText: string) => void) => {
let resultText = '';
const parser = new JsonStreamParser();

const chunk = parser.safeJsonParse<{ generatedText: string; isGenerating: boolean }>(response);
for (const parsedData of chunk) {
if (parsedData.isGenerating) {
resultText += parsedData.generatedText
cb(parsedData.generatedText)
} else {
resultText += parsedData.generatedText
cb(parsedData.generatedText)
resultText += parsedData.generatedText;
if (cb) {
cb(parsedData.generatedText);
}
}
}
};

export const HandleStreamResponse = async (streamResponse,
cb: (streamText: string) => void,
done_cb?: (result: string) => void) => {
export const HandleStreamResponse = async (streamResponse, cb: (streamText: string) => void, done_cb?: (result: string) => void) => {
try {
let resultText = ''
let resultText = '';
const parser = new JsonStreamParser();
const reader = streamResponse.body?.getReader();
const decoder = new TextDecoder();

// Check for missing body in the streamResponse
if (!reader) {
console.error('Stream response body is missing.');
return;
}

// eslint-disable-next-line no-constant-condition
while (true) {
const { done, value } = await reader.read();
Expand All @@ -35,30 +35,25 @@ export const HandleStreamResponse = async (streamResponse,
try {
const chunk = parser.safeJsonParse<{ generatedText: string; isGenerating: boolean }>(decoder.decode(value, { stream: true }));
for (const parsedData of chunk) {
if (parsedData.isGenerating) {
resultText += parsedData.generatedText
cb(parsedData.generatedText)
} else {
resultText += parsedData.generatedText
cb(parsedData.generatedText)
resultText += parsedData.generatedText;
if (cb) {
cb(parsedData.generatedText);
}
}
}
catch (error) {
} catch (error) {
console.error('Error parsing JSON:', error);
return { 'generateText': 'Try again!', 'isGenerating': false }
return; // Just log the error, without unnecessary return value
}
}

if (done_cb) {
done_cb(resultText)
done_cb(resultText);
}
} catch (error) {
console.error('Error processing stream response:', error);
}
catch (error) {
console.error('Error parsing JSON:', error);
return { 'generateText': 'Try again!', 'isGenerating': false }
}
}
};

export const UpdateChatHistory = (userPrompt: string, AIAnswer: string) => {
ChatHistory.pushHistory(userPrompt, AIAnswer)
}
ChatHistory.pushHistory(userPrompt, AIAnswer);
};