diff --git a/public/css/st-tailwind.css b/public/css/st-tailwind.css index ecc55c074..44664ddfd 100644 --- a/public/css/st-tailwind.css +++ b/public/css/st-tailwind.css @@ -86,6 +86,10 @@ margin: 5px; } +.marginLeft5 { + margin-left: 5px; +} + .overflowYAuto { overflow-y: auto; } @@ -257,6 +261,10 @@ flex-basis: 48% } +.flexBasis30p { + flex-basis: 30%; +} + .flex-container { display: flex; gap: 5px; @@ -555,4 +563,4 @@ textarea:disabled { height: 30px; text-align: center; padding: 5px; -} +} \ No newline at end of file diff --git a/public/index.html b/public/index.html index 224435481..ab7329d76 100644 --- a/public/index.html +++ b/public/index.html @@ -141,10 +141,10 @@
- -
+
@@ -163,10 +163,10 @@
- -
+
@@ -184,7 +184,7 @@ -
+
@@ -200,7 +200,7 @@
-
+
@@ -321,7 +321,7 @@
- Repetition Penalty Range + Rep Pen Range
@@ -373,7 +373,7 @@
- Tail Free Sampling + TFS
@@ -788,7 +788,7 @@
-
+
Temperature
@@ -796,7 +796,7 @@
-
+
Top K
@@ -804,7 +804,7 @@
-
+
Top P
@@ -812,7 +812,7 @@
-
+
Typical P
@@ -820,7 +820,7 @@
-
+
Min P
@@ -828,7 +828,7 @@
-
+
Top A
@@ -836,29 +836,29 @@
-
+
- Tail Free Sampling + TFS
-
+
Repetition Penalty
-
+
- Repetition Penalty Range + Rep Pen Range
-
+
Repetition Penalty Slope @@ -892,7 +892,7 @@

-
+
-
+
Seed @@ -1185,7 +1185,7 @@
-
+
Temperature
@@ -1193,7 +1193,7 @@
-
+
Top K
@@ -1201,7 +1201,7 @@
-
+
Top P
@@ -1209,7 +1209,7 @@
-
+
Typical P
@@ -1217,7 +1217,7 @@
-
+
Min P
@@ -1225,7 +1225,7 @@
-
+
Top A
@@ -1233,15 +1233,15 @@
-
+
- Tail Free Sampling + TFS
-
+
Epsilon Cutoff
@@ -1249,7 +1249,7 @@
-
+
Eta Cutoff
@@ -1257,42 +1257,42 @@
-
+
Repetition Penalty
-
- Repetition Penalty Range +
+ Rep Pen Range
-
+
Encoder Penalty
-
+
Frequency Penalty
-
+
Presence Penalty
-
+
No Repeat Ngram Size
-
+
Min Length
-
+
Maximum tokens/second @@ -3544,7 +3544,7 @@ - @@ -4461,9 +4461,7 @@
@@ -6072,4 +6065,4 @@ - + \ No newline at end of file diff --git a/public/script.js b/public/script.js index c68afdd8c..278b81d29 100644 --- a/public/script.js +++ b/public/script.js @@ -4132,8 +4132,12 @@ async function Generate(type, { automatic_trigger, force_name2, quiet_prompt, qu // regenerate with character speech reenforced // to make sure we leave on swipe type while also adding the name2 appendage await delay(1000); + // A message was already deleted on regeneration, so instead treat is as a normal gen + if (type === 'regenerate') { + type = 'normal'; + } // The first await is for waiting for the generate to start. The second one is waiting for it to finish - const result = await await Generate(type, { automatic_trigger, force_name2: true, quiet_prompt, skipWIAN, force_chid, maxLoops: maxLoops - 1 }); + const result = await await Generate(type, { automatic_trigger, force_name2: true, quiet_prompt, quietToLoud, skipWIAN, force_chid, signal, quietImage, quietName, maxLoops: maxLoops - 1 }); return result; } diff --git a/public/scripts/RossAscends-mods.js b/public/scripts/RossAscends-mods.js index 8504c65ee..7c12d5763 100644 --- a/public/scripts/RossAscends-mods.js +++ b/public/scripts/RossAscends-mods.js @@ -1202,7 +1202,7 @@ export function initRossMods() { if (event.ctrlKey && /^[1-9]$/.test(event.key)) { // This will eventually be to trigger quick replies - event.preventDefault(); + // event.preventDefault(); console.log('Ctrl +' + event.key + ' pressed!'); } }