Merge branch 'staging' of http://github.com/cohee1207/SillyTavern into staging

2023-07-22 13:50:22 +03:00 · 2023-07-22 13:50:22 +03:00 · ed366b15ca
parent 7205255d18 d7b895b92d
commit ed366b15ca
32 changed files with 57 additions and 0 deletions
--- a/Settings/Asterism.settings
+++ b/Settings/Asterism.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.02,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Search.settings
+++ b/Search.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 4.5,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 2,
    "penalty_alpha": 0,
    "num_beams": 10,
--- a/public/TextGen
+++ b/public/TextGen
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.01,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Contrastive
+++ b/Settings/Contrastive
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0.6,
    "num_beams": 1,
--- a/Settings/Default.settings
+++ b/Settings/Default.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.2,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Deterministic.settings
+++ b/Settings/Deterministic.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Intellect.settings
+++ b/Intellect.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 1.49,
    "eta_cutoff": 10.42,
    "rep_pen": 1.17,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Godlike).settings
+++ b/(Godlike).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Drift).settings
+++ b/Drift).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/LLaMa-Precise.settings
+++ b/Settings/LLaMa-Precise.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.18,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Midnight
+++ b/Settings/Midnight
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.18,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Mirostat.settings
+++ b/Settings/Mirostat.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Naive.settings
+++ b/Settings/Naive.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/NovelAI
+++ b/Settings/NovelAI
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Decadence).settings
+++ b/(Decadence).settings
@ -8,6 +8,7 @@
    "tfs": 1,
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Genesis).settings
+++ b/(Genesis).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.05,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Lycaenidae).settings
+++ b/(Lycaenidae).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Ouroboros).settings
+++ b/(Ouroboros).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.05,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Results).settings
+++ b/Results).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/NovelAI
+++ b/Settings/NovelAI
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/(Storywriter).settings
+++ b/(Storywriter).settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Pygmalion.settings
+++ b/Settings/Pygmalion.settings
@ -6,6 +6,7 @@
    "top_a": 0,
    "tfs": 1,
    "rep_pen": 1.1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Shortwave.settings
+++ b/Settings/Shortwave.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.07,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Simple-1.settings
+++ b/Settings/Simple-1.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Alien.settings
+++ b/Alien.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.09,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/StarChat.settings
+++ b/Settings/StarChat.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/TFS-with-Top-A.settings
+++ b/Settings/TFS-with-Top-A.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.15,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Titanic.settings
+++ b/Settings/Titanic.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 10.78,
    "rep_pen": 1.21,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/Settings/Yara.settings
+++ b/Settings/Yara.settings
@ -8,6 +8,7 @@
    "epsilon_cutoff": 0,
    "eta_cutoff": 0,
    "rep_pen": 1.19,
+    "rep_pen_range": 0,
    "no_repeat_ngram_size": 0,
    "penalty_alpha": 0,
    "num_beams": 1,
--- a/public/index.html
+++ b/public/index.html
@ -440,6 +440,21 @@
                                        </div>
                                    </div>
                                </div>
+                                <div class="range-block">
+                                    <div class="range-block-title" data-i18n="rep.pen range">
+                                        Rep. Pen. Range
+                                    </div>
+                                    <div class="range-block-range-and-counter">
+                                        <div class="range-block-range">
+                                            <input type="range" id="rep_pen_range_textgenerationwebui" name="volume" min="0" max="4096" step="1">
+                                        </div>
+                                        <div class="range-block-counter">
+                                            <div contenteditable="true" data-for="rep_pen_range_textgenerationwebui" id="rep_pen_range_counter_textgenerationwebui">
+                                                select
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
                                <div class="range-block">
                                    <div class="range-block-title" data-i18n="Encoder Rep. Pen.">
                                        Encoder Rep. Pen.
--- a/public/instruct/Llama2.json
+++ b/public/instruct/Llama2.json
@ -0,0 +1,10 @@
+{
+    "name": "Llama 2",
+    "system_prompt": "Write {{user}}'s next reply in this fictional roleplay with {{char}}.\n<</SYS>>\n",
+    "system_sequence": "[INST] <<SYS>>\n",
+    "stop_sequence": "",
+    "input_sequence": "[INST]",
+    "output_sequence": "[/INST]",
+    "separator_sequence": "\n",
+    "wrap": false
+}
--- a/public/scripts/textgen-settings.js
+++ b/public/scripts/textgen-settings.js
@ -21,6 +21,7 @@ let textgenerationwebui_settings = {
    eta_cutoff: 0,
    typical_p: 1,
    rep_pen: 1.2,
+    rep_pen_range: 0,
    no_repeat_ngram_size: 0,
    penalty_alpha: 0,
    num_beams: 1,
@ -49,6 +50,7 @@ let textgenerationwebui_preset_names = [];
 const setting_names = [
    "temp",
    "rep_pen",
+    "rep_pen_range",
    "no_repeat_ngram_size",
    "top_k",
    "top_p",
@ -212,6 +214,7 @@ export function getTextGenGenerationData(finalPromt, this_amount_gen, isImperson
        'top_p': textgenerationwebui_settings.top_p,
        'typical_p': textgenerationwebui_settings.typical_p,
        'repetition_penalty': textgenerationwebui_settings.rep_pen,
+        'repetition_penalty_range': textgenerationwebui_settings.rep_pen_range,
        'encoder_repetition_penalty': textgenerationwebui_settings.encoder_rep_pen,
        'top_k': textgenerationwebui_settings.top_k,
        'min_length': textgenerationwebui_settings.min_length,