Merge branch 'main' into webui-add-bypass
This commit is contained in:
@@ -1 +1 @@
|
||||
__api_version__ = "0145"
|
||||
__api_version__ = "0146"
|
||||
|
File diff suppressed because one or more lines are too long
2
lightrag/api/webui/index.html
generated
2
lightrag/api/webui/index.html
generated
@@ -8,7 +8,7 @@
|
||||
<link rel="icon" type="image/svg+xml" href="logo.png" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Lightrag</title>
|
||||
<script type="module" crossorigin src="/webui/assets/index-BPm_J2w3.js"></script>
|
||||
<script type="module" crossorigin src="/webui/assets/index-DSVCuARS.js"></script>
|
||||
<link rel="stylesheet" crossorigin href="/webui/assets/index-CTB4Vp_z.css">
|
||||
</head>
|
||||
<body>
|
||||
|
@@ -245,10 +245,10 @@ export const checkHealth = async (): Promise<
|
||||
try {
|
||||
const response = await axiosInstance.get('/health')
|
||||
return response.data
|
||||
} catch (e) {
|
||||
} catch (error) {
|
||||
return {
|
||||
status: 'error',
|
||||
message: errorMessage(e)
|
||||
message: errorMessage(error)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -278,65 +278,100 @@ export const queryTextStream = async (
|
||||
onChunk: (chunk: string) => void,
|
||||
onError?: (error: string) => void
|
||||
) => {
|
||||
const apiKey = useSettingsStore.getState().apiKey;
|
||||
const token = localStorage.getItem('LIGHTRAG-API-TOKEN');
|
||||
const headers: HeadersInit = {
|
||||
'Content-Type': 'application/json',
|
||||
'Accept': 'application/x-ndjson',
|
||||
};
|
||||
if (token) {
|
||||
headers['Authorization'] = `Bearer ${token}`;
|
||||
}
|
||||
if (apiKey) {
|
||||
headers['X-API-Key'] = apiKey;
|
||||
}
|
||||
|
||||
try {
|
||||
let buffer = ''
|
||||
await axiosInstance
|
||||
.post('/query/stream', request, {
|
||||
responseType: 'text',
|
||||
headers: {
|
||||
Accept: 'application/x-ndjson'
|
||||
},
|
||||
transformResponse: [
|
||||
(data: string) => {
|
||||
// Accumulate the data and process complete lines
|
||||
buffer += data
|
||||
const lines = buffer.split('\n')
|
||||
// Keep the last potentially incomplete line in the buffer
|
||||
buffer = lines.pop() || ''
|
||||
const response = await fetch(`${backendBaseUrl}/query/stream`, {
|
||||
method: 'POST',
|
||||
headers: headers,
|
||||
body: JSON.stringify(request),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
// Handle HTTP errors (e.g., 4xx, 5xx)
|
||||
let errorBody = 'Unknown error';
|
||||
try {
|
||||
errorBody = await response.text(); // Try to get error details from body
|
||||
} catch { /* ignore */ }
|
||||
throw new Error(`HTTP error ${response.status}: ${response.statusText}\n${errorBody}`);
|
||||
}
|
||||
|
||||
if (!response.body) {
|
||||
throw new Error('Response body is null');
|
||||
}
|
||||
|
||||
const reader = response.body.getReader();
|
||||
const decoder = new TextDecoder();
|
||||
let buffer = '';
|
||||
|
||||
while (true) {
|
||||
const { done, value } = await reader.read();
|
||||
if (done) {
|
||||
break; // Stream finished
|
||||
}
|
||||
|
||||
// Decode the chunk and add to buffer
|
||||
buffer += decoder.decode(value, { stream: true }); // stream: true handles multi-byte chars split across chunks
|
||||
|
||||
// Process complete lines (NDJSON)
|
||||
const lines = buffer.split('\n');
|
||||
buffer = lines.pop() || ''; // Keep potentially incomplete line in buffer
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.trim()) {
|
||||
try {
|
||||
const parsed = JSON.parse(line)
|
||||
const parsed = JSON.parse(line);
|
||||
if (parsed.response) {
|
||||
onChunk(parsed.response)
|
||||
console.log('Received chunk:', parsed.response); // Log for debugging
|
||||
onChunk(parsed.response);
|
||||
} else if (parsed.error && onError) {
|
||||
onError(parsed.error)
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing stream chunk:', e)
|
||||
if (onError) onError('Error parsing server response')
|
||||
}
|
||||
}
|
||||
}
|
||||
return data
|
||||
}
|
||||
]
|
||||
})
|
||||
.catch((error) => {
|
||||
if (onError) onError(errorMessage(error))
|
||||
})
|
||||
|
||||
// Process any remaining data in the buffer
|
||||
if (buffer.trim()) {
|
||||
try {
|
||||
const parsed = JSON.parse(buffer)
|
||||
if (parsed.response) {
|
||||
onChunk(parsed.response)
|
||||
} else if (parsed.error && onError) {
|
||||
onError(parsed.error)
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Error parsing final chunk:', e)
|
||||
if (onError) onError('Error parsing server response')
|
||||
}
|
||||
onError(parsed.error);
|
||||
}
|
||||
} catch (error) {
|
||||
const message = errorMessage(error)
|
||||
console.error('Stream request failed:', message)
|
||||
if (onError) onError(message)
|
||||
console.error('Error parsing stream chunk:', line, error);
|
||||
if (onError) onError(`Error parsing server response: ${line}`);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Process any remaining data in the buffer after the stream ends
|
||||
if (buffer.trim()) {
|
||||
try {
|
||||
const parsed = JSON.parse(buffer);
|
||||
if (parsed.response) {
|
||||
onChunk(parsed.response);
|
||||
} else if (parsed.error && onError) {
|
||||
onError(parsed.error);
|
||||
}
|
||||
} catch (error) {
|
||||
console.error('Error parsing final chunk:', buffer, error);
|
||||
if (onError) onError(`Error parsing final server response: ${buffer}`);
|
||||
}
|
||||
}
|
||||
|
||||
} catch (error) {
|
||||
const message = errorMessage(error);
|
||||
console.error('Stream request failed:', message);
|
||||
if (onError) {
|
||||
onError(message);
|
||||
} else {
|
||||
// If no specific onError handler, maybe throw or log more prominently
|
||||
console.error('Unhandled stream error:', message);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export const insertText = async (text: string): Promise<DocActionResponse> => {
|
||||
const response = await axiosInstance.post('/documents/text', { text })
|
||||
|
@@ -60,6 +60,7 @@ export default function RetrievalTesting() {
|
||||
}
|
||||
return newMessages
|
||||
})
|
||||
scrollToBottom()
|
||||
}
|
||||
|
||||
// Prepare query parameters
|
||||
@@ -69,6 +70,7 @@ export default function RetrievalTesting() {
|
||||
query: userMessage.content,
|
||||
conversation_history: prevMessages
|
||||
.filter((m) => m.isError !== true)
|
||||
.slice(-(state.querySettings.history_turns || 0) * 2)
|
||||
.map((m) => ({ role: m.role, content: m.content }))
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user