fix: expand the model after deploying from catalog
This commit is contained in:
jialin
@@ -199,20 +199,32 @@ export const readStreamData = async (
|
||||
};
|
||||
|
||||
// Process the remainder of the buffer
|
||||
const processBuffer = (buffer: string, callback: (data: any) => void) => {
|
||||
const processBuffer = async (buffer: string, callback: (data: any) => void) => {
|
||||
if (!buffer) return;
|
||||
|
||||
const lines = buffer.split('\n');
|
||||
for (const line of lines) {
|
||||
if (line.startsWith('data: ')) {
|
||||
const jsonStr = line.slice(6).trim();
|
||||
const trimmedLine = line.trim();
|
||||
|
||||
if (trimmedLine.startsWith('data: ')) {
|
||||
const jsonStr = trimmedLine.slice(6).trim();
|
||||
try {
|
||||
const jsonData = JSON.parse(jsonStr);
|
||||
callback(jsonData);
|
||||
if (jsonStr !== '[DONE]') {
|
||||
console.log('jsonStr>>>>>>>>>>>>>done:', jsonStr);
|
||||
const jsonData = JSON.parse(jsonStr);
|
||||
callback(jsonData);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error(
|
||||
'Failed to parse JSON from remaining buffer:',
|
||||
jsonStr,
|
||||
e
|
||||
);
|
||||
console.error('Failed to parse JSON from line:', jsonStr, e);
|
||||
}
|
||||
} else if (trimmedLine.startsWith('error:')) {
|
||||
const errorStr = trimmedLine.slice(7).trim();
|
||||
console.log('jsonStr>>>>>>>>>>>>>error:', errorStr);
|
||||
try {
|
||||
const jsonData = JSON.parse(errorStr);
|
||||
callback({ error: jsonData });
|
||||
} catch (e) {
|
||||
console.error('Failed to parse error JSON from line:', errorStr, e);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -221,47 +233,89 @@ const processBuffer = (buffer: string, callback: (data: any) => void) => {
|
||||
export const readLargeStreamData = async (
|
||||
reader: any,
|
||||
decoder: TextDecoder,
|
||||
callback: (data: any) => void
|
||||
callback: (data: any) => void,
|
||||
throttleDelay = 200
|
||||
) => {
|
||||
let buffer = ''; // cache incomplete line
|
||||
|
||||
class BufferManager {
|
||||
private buffer: any[] = [];
|
||||
private failed: boolean = false;
|
||||
private isFlushing: boolean = false;
|
||||
private callback: (data: any) => void;
|
||||
|
||||
constructor(callback: (data: any) => void) {
|
||||
this.callback = callback;
|
||||
}
|
||||
|
||||
public add(data: any) {
|
||||
this.buffer.push(data);
|
||||
}
|
||||
|
||||
public async flush() {
|
||||
if (this.buffer.length === 0 || this.isFlushing) {
|
||||
return;
|
||||
}
|
||||
this.failed = false;
|
||||
this.isFlushing = true;
|
||||
|
||||
while (this.buffer.length > 0) {
|
||||
const data = this.buffer.shift();
|
||||
|
||||
try {
|
||||
processBuffer(data, this.callback);
|
||||
} catch (error) {
|
||||
console.error('Error processing buffer:', error);
|
||||
this.failed = true;
|
||||
this.buffer.unshift(data);
|
||||
break;
|
||||
}
|
||||
}
|
||||
this.isFlushing = false;
|
||||
}
|
||||
|
||||
public getBuffer() {
|
||||
return this.buffer;
|
||||
}
|
||||
}
|
||||
|
||||
const bufferManager = new BufferManager(callback);
|
||||
|
||||
const throttledCallback = throttle(async () => {
|
||||
bufferManager.flush();
|
||||
}, throttleDelay);
|
||||
|
||||
let isReading = true;
|
||||
|
||||
while (true) {
|
||||
const { done, value } = await reader?.read?.();
|
||||
|
||||
if (done) {
|
||||
isReading = false;
|
||||
// Process remaining buffered data
|
||||
if (buffer.trim()) {
|
||||
processBuffer(buffer, callback);
|
||||
if (buffer) {
|
||||
bufferManager.add(buffer);
|
||||
}
|
||||
bufferManager.flush();
|
||||
break;
|
||||
}
|
||||
|
||||
// Decode new chunk of data and append to buffer
|
||||
buffer += decoder.decode(value, { stream: true });
|
||||
try {
|
||||
// Decode new chunk of data and append to buffer
|
||||
buffer += decoder.decode(value, { stream: true });
|
||||
|
||||
// Try to process the complete line in the buffer
|
||||
const lines = buffer.split('\n');
|
||||
buffer = lines.pop() || ''; // Keep last line (may be incomplete)
|
||||
// Try to process the complete line in the buffer
|
||||
const lines = buffer.split('\n');
|
||||
buffer = lines.pop() || ''; // Keep last line (may be incomplete)
|
||||
|
||||
for (const line of lines) {
|
||||
if (line.startsWith('data: ')) {
|
||||
const jsonStr = line.slice(6).trim();
|
||||
|
||||
try {
|
||||
if (jsonStr !== '[DONE]') {
|
||||
const jsonData = JSON.parse(jsonStr);
|
||||
callback(jsonData);
|
||||
}
|
||||
} catch (e) {
|
||||
console.error('Failed to parse JSON:', jsonStr, e);
|
||||
}
|
||||
for (const line of lines) {
|
||||
bufferManager.add(line);
|
||||
}
|
||||
|
||||
if (line.startsWith('error:')) {
|
||||
const errorStr = line.slice(7).trim();
|
||||
const jsonData = JSON.parse(errorStr);
|
||||
callback({ error: jsonData });
|
||||
}
|
||||
throttledCallback();
|
||||
} catch (error) {
|
||||
console.log('Error reading stream data:', error);
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
+32
-21
@@ -149,35 +149,46 @@ export const generateRandomNumber = () => {
|
||||
};
|
||||
|
||||
function base64ToBlob(base64: string, contentType = '', sliceSize = 512) {
|
||||
const base64Content = base64.replace(/^data:image\/(png|jpg);base64,/, '');
|
||||
const byteCharacters = atob(base64Content);
|
||||
const byteArrays = [];
|
||||
try {
|
||||
const base64Content = base64.replace(/^data:image\/(png|jpg);base64,/, '');
|
||||
const byteCharacters = atob(base64Content);
|
||||
const byteArrays = [];
|
||||
|
||||
for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
|
||||
const slice = byteCharacters.slice(offset, offset + sliceSize);
|
||||
for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
|
||||
const slice = byteCharacters.slice(offset, offset + sliceSize);
|
||||
|
||||
const byteNumbers = new Array(slice.length);
|
||||
for (let i = 0; i < slice.length; i++) {
|
||||
byteNumbers[i] = slice.charCodeAt(i);
|
||||
const byteNumbers = new Array(slice.length);
|
||||
for (let i = 0; i < slice.length; i++) {
|
||||
byteNumbers[i] = slice.charCodeAt(i);
|
||||
}
|
||||
|
||||
const byteArray = new Uint8Array(byteNumbers);
|
||||
byteArrays.push(byteArray);
|
||||
}
|
||||
|
||||
const byteArray = new Uint8Array(byteNumbers);
|
||||
byteArrays.push(byteArray);
|
||||
return new Blob(byteArrays, { type: contentType });
|
||||
} catch (error) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return new Blob(byteArrays, { type: contentType });
|
||||
}
|
||||
|
||||
export const base64ToFile = (base64String: string, fileName: string) => {
|
||||
if (!base64String) {
|
||||
try {
|
||||
if (!base64String) {
|
||||
return null;
|
||||
}
|
||||
console.log('base64String:', base64String);
|
||||
const match = base64String.match(/data:(.*?);base64,/);
|
||||
if (!match) {
|
||||
throw new Error('Invalid base64 string');
|
||||
}
|
||||
const contentType = match[1];
|
||||
const blob = base64ToBlob(base64String, contentType);
|
||||
if (!blob) {
|
||||
throw new Error('Failed to convert base64 to blob');
|
||||
}
|
||||
return new File([blob], fileName || contentType, { type: contentType });
|
||||
} catch (error) {
|
||||
return null;
|
||||
}
|
||||
console.log('base64String:', base64String);
|
||||
const match = base64String.match(/data:(.*?);base64,/);
|
||||
if (!match) {
|
||||
throw new Error('Invalid base64 string');
|
||||
}
|
||||
const contentType = match[1];
|
||||
const blob = base64ToBlob(base64String, contentType);
|
||||
return new File([blob], fileName || contentType, { type: contentType });
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user