From 2182cb8b523377536fde97e6587a6091c45fcf51 Mon Sep 17 00:00:00 2001 From: infinitelydense Date: Thu, 12 Dec 2024 11:35:56 -0700 Subject: [PATCH 1/2] remove automatic json parsing and update error check --- mikupad.html | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/mikupad.html b/mikupad.html index 1f53175..badea98 100644 --- a/mikupad.html +++ b/mikupad.html @@ -5835,7 +5835,7 @@ dry_base: dryBase, dry_allowed_length: dryAllowedLength, dry_penalty_last_n: dryPenaltyRange, - dry_sequence_breakers: JSON.parse(drySequenceBreakers), + dry_sequence_breakers: drySequenceBreakers, }: {}), ...(enabledSamplers.includes('ban_tokens') ? { banned_tokens: JSON.parse(bannedTokens), @@ -6005,7 +6005,15 @@ JSON.parse(drySequenceBreakers); setDrySequenceBreakersError(undefined); } catch (e) { - setDrySequenceBreakersError(e.toString()); + try { + const unescapedString = drySequenceBreakers + .replace(/\\\\/g, '\\') + .replace(/\\"/g, '"'); + JSON.parse(unescapedString); + setDrySequenceBreakersError(undefined); + } catch (e2) { + setDrySequenceBreakersError(e2.toString()); + } } }, [drySequenceBreakers]); From dc040a2f40f2b8cff5d31e6eb45e0ca0a8d3e1c5 Mon Sep 17 00:00:00 2001 From: infinitelydense Date: Sun, 15 Dec 2024 14:09:06 -0700 Subject: [PATCH 2/2] no json parse when open ai compatible api --- mikupad.html | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/mikupad.html b/mikupad.html index badea98..ee70e87 100644 --- a/mikupad.html +++ b/mikupad.html @@ -5835,7 +5835,9 @@ dry_base: dryBase, dry_allowed_length: dryAllowedLength, dry_penalty_last_n: dryPenaltyRange, - dry_sequence_breakers: drySequenceBreakers, + dry_sequence_breakers: endpointAPI == API_OPENAI_COMPAT ? + drySequenceBreakers : + JSON.parse(drySequenceBreakers), }: {}), ...(enabledSamplers.includes('ban_tokens') ? { banned_tokens: JSON.parse(bannedTokens), @@ -6005,15 +6007,7 @@ JSON.parse(drySequenceBreakers); setDrySequenceBreakersError(undefined); } catch (e) { - try { - const unescapedString = drySequenceBreakers - .replace(/\\\\/g, '\\') - .replace(/\\"/g, '"'); - JSON.parse(unescapedString); - setDrySequenceBreakersError(undefined); - } catch (e2) { - setDrySequenceBreakersError(e2.toString()); - } + setDrySequenceBreakersError(e.toString()); } }, [drySequenceBreakers]);