vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 17db6beda4 into 19f65187cb

Browse source
This commit is contained in:
Robert 2025-01-26 16:35:29 +00:00 • committed by GitHub
commit aeeb88094c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
examples/server/public_simplechat/datautils.mjs
View file

@ -41,7 +41,7 @@ export function trim_repeat_garbage_at_end(sIn, maxSubL=10, maxMatchLenThreshold
let refS = sIn.substring(sIn.length-subL, sIn.length); let refS = sIn.substring(sIn.length-subL, sIn.length);
for(i=sIn.length; i > 0; i -= subL) { for(i=sIn.length; i > 0; i -= subL) {
let curS = sIn.substring(i-subL, i); let curS = sIn.substring(i-subL, i);
if (refS != curS) { if (refS !== curS) {
let curMatchLen = rCnt[subL]*subL; let curMatchLen = rCnt[subL]*subL;
if (maxMatchLen < curMatchLen) { if (maxMatchLen < curMatchLen) {
maxMatchLen = curMatchLen; maxMatchLen = curMatchLen;
@ -53,7 +53,7 @@ export function trim_repeat_garbage_at_end(sIn, maxSubL=10, maxMatchLenThreshold
} }
} }
console.debug("DBUG:DU:TrimRepeatGarbage:", rCnt); console.debug("DBUG:DU:TrimRepeatGarbage:", rCnt);
if ((iMML == -1) || (maxMatchLen < maxMatchLenThreshold)) { if ((iMML === -1) || (maxMatchLen < maxMatchLenThreshold)) {
return {trimmed: false, data: sIn}; return {trimmed: false, data: sIn};
} }
console.debug("DBUG:TrimRepeatGarbage:TrimmedCharLen:", maxMatchLen); console.debug("DBUG:TrimRepeatGarbage:TrimmedCharLen:", maxMatchLen);
@ -71,6 +71,7 @@ export function trim_repeat_garbage_at_end(sIn, maxSubL=10, maxMatchLenThreshold
* @param {string} sIn * @param {string} sIn
* @param {number} maxSubL * @param {number} maxSubL
* @param {number | undefined} [maxMatchLenThreshold] * @param {number | undefined} [maxMatchLenThreshold]
* @param {number | undefined} [skipMax]
*/ */
export function trim_repeat_garbage_at_end_loop(sIn, maxSubL, maxMatchLenThreshold, skipMax=16) { export function trim_repeat_garbage_at_end_loop(sIn, maxSubL, maxMatchLenThreshold, skipMax=16) {
let sCur = sIn; let sCur = sIn;
@ -78,8 +79,8 @@ export function trim_repeat_garbage_at_end_loop(sIn, maxSubL, maxMatchLenThresho
let iTry = 0; let iTry = 0;
while(true) { while(true) {
let got = trim_repeat_garbage_at_end(sCur, maxSubL, maxMatchLenThreshold); let got = trim_repeat_garbage_at_end(sCur, maxSubL, maxMatchLenThreshold);
if (got.trimmed != true) { if (got.trimmed !== true) {
if (iTry == 0) { if (iTry === 0) {
sSaved = got.data; sSaved = got.data;
} }
iTry += 1; iTry += 1;
@ -221,7 +222,8 @@ export class NewLines {
add_append(sLines) { add_append(sLines) {
let aLines = sLines.split("\n"); let aLines = sLines.split("\n");
let lCnt = 0; let lCnt = 0;
for(let line of aLines) { for(let aline of aLines) {
let line = aline;
lCnt += 1; lCnt += 1;
// Add back newline removed if any during split // Add back newline removed if any during split
if (lCnt < aLines.length) { if (lCnt < aLines.length) {
@ -232,9 +234,9 @@ export class NewLines {
} }
} }
// Append if required // Append if required
if (lCnt == 1) { if (lCnt === 1) {
let lastLine = this.lines[this.lines.length-1]; let lastLine = this.lines[this.lines.length-1];
if (lastLine != undefined) { if (lastLine !== undefined) {
if (!lastLine.endsWith("\n")) { if (!lastLine.endsWith("\n")) {
this.lines[this.lines.length-1] += line; this.lines[this.lines.length-1] += line;
continue; continue;
@ -254,10 +256,10 @@ export class NewLines {
*/ */
shift(bFullWithNewLineOnly=true) { shift(bFullWithNewLineOnly=true) {
let line = this.lines[0]; let line = this.lines[0];
if (line == undefined) { if (line === undefined) {
return undefined; return undefined;
} }
if ((line[line.length-1] != "\n") && bFullWithNewLineOnly){ if ((line[line.length-1] !== "\n") && bFullWithNewLineOnly){
return undefined; return undefined;
} }
return this.lines.shift(); return this.lines.shift();