rixty/KoboldAI-Client
1
1
Fork 0
mirror of https://github.com/KoboldAI/KoboldAI-Client.git synced 2025-06-05 21:59:24 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'UI2' of https://github.com/ebolam/KoboldAI into UI2

Browse Source
This commit is contained in:
GuiAworld
2022-08-15 22:59:30 -03:00
parent 2d44a2c815 fa37484eb3
commit 10fc04a441
4 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
aiserver.py
View File

@@ -6382,6 +6382,7 @@ def UI_2_Pinning(data):
@socketio.on('back') @socketio.on('back')
def UI_2_back(data): def UI_2_back(data):
print("back") print("back")
koboldai_vars.actions.clear_unused_options()
ignore = koboldai_vars.actions.pop() ignore = koboldai_vars.actions.pop()
#==================================================================# #==================================================================#
@@ -6392,12 +6393,14 @@ def UI_2_redo(data):
if len(koboldai_vars.actions.get_current_options()) == 1: if len(koboldai_vars.actions.get_current_options()) == 1:
koboldai_vars.actions.use_option(0) koboldai_vars.actions.use_option(0)
#==================================================================# #==================================================================#
# Event triggered when user clicks the retry button # Event triggered when user clicks the retry button
#==================================================================# #==================================================================#
@socketio.on('retry') @socketio.on('retry')
def UI_2_retry(data): def UI_2_retry(data):
if koboldai_vars.numseqs == 1:
if len(koboldai_vars.actions.get_current_options()) == 0:
UI_2_back(None) UI_2_back(None)
koboldai_vars.actions.clear_unused_options() koboldai_vars.actions.clear_unused_options()
koboldai_vars.lua_koboldbridge.feedback = None koboldai_vars.lua_koboldbridge.feedback = None

10
static/koboldai.css
View File

@@ -199,6 +199,8 @@ input[type="range"]::-ms-fill-upper {
z-index: 2; z-index: 2;
border-bottom-color: #FFF; border-bottom-color: #FFF;
} }
.tabrow:before { .tabrow:before {
position: absolute; position: absolute;
content: " "; content: " ";
@@ -300,6 +302,8 @@ input[type="range"]::-ms-fill-upper {
padding-top: 6px; padding-top: 6px;
grid-area: minlabel; grid-area: minlabel;
overflow: hidden; overflow: hidden;
padding: 5px;
padding-top: 0px;
font-size: 0.8em; font-size: 0.8em;
} }
@@ -307,6 +311,8 @@ input[type="range"]::-ms-fill-upper {
padding-top: 6px; padding-top: 6px;
grid-area: maxlabel; grid-area: maxlabel;
overflow: hidden; overflow: hidden;
padding: 5px;
padding-top: 0px;
text-align: right; text-align: right;
font-size: 0.8em; font-size: 0.8em;
} }
@@ -314,11 +320,15 @@ input[type="range"]::-ms-fill-upper {
.setting_label { .setting_label {
grid-area: label; grid-area: label;
overflow: hidden; overflow: hidden;
padding: 5px;
padding-top: 0px;
} }
.setting_value { .setting_value {
text-align: right; text-align: right;
grid-area: value; grid-area: value;
padding: 5px;
padding-top: 0px;
background-color: inherit; background-color: inherit;
color: inherit; color: inherit;
border: none; border: none;

25
templates/index_new.html
View File

@@ -45,20 +45,25 @@
<div id="Select Options" class="sequence_area"></div> <div id="Select Options" class="sequence_area"></div>
<!------------ Theme Area---------------------> <!------------ Theme Area--------------------->
<div class="themerow" id="themerow"> <div class="themerow" id="themerow">
<h4>If you want to generate a random prompt, insert a theme here:</h4> <div class="tabrow nomenu_icon">
<input type="text" autocomplete="off" style="width: 100%; border-radius: 5px;" id="themetext" placeholder="Theme for Random Story" oninput='if (this.value != "") { <span class="prompt_menu selected" id="prompt_menu_random" onclick="this.classList.add('selected');
document.getElementById("input_text").disabled = true; document.getElementById('prompt_menu_normal').classList.remove('selected');
} else { document.getElementById('random_game_prompt').classList.add('hidden');
document.getElementById("input_text").disabled = false; document.getElementById('input_text').classList.remove('hidden');">Prompt</span>
}'/> <span class="prompt_menu" id="prompt_menu_normal" onclick="this.classList.add('selected');
<h4>If you want to write your prompt, insert it here:</h4> document.getElementById('prompt_menu_random').classList.remove('selected');
document.getElementById('random_game_prompt').classList.remove('hidden');
document.getElementById('input_text').classList.add('hidden');">Random Prompt</span>
</div>
</div> </div>
<!------------ Input Area---------------------> <!------------ Input Area--------------------->
<div class="inputrow" id="inputrow_container"> <div class="inputrow" id="inputrow_container">
<div id="random_game_prompt" class="hidden">
<input type="text" autocomplete="off" style="width: 100%;" id="themetext" placeholder="Theme for Random Story" oninput='if (this.value != "") {
document.getElementById("input_text").value = "";'/>
</div>
<textarea autocomplete="off" row=5 id="input_text" placeholder="Enter Prompt Here" oninput='if (this.value != "") { <textarea autocomplete="off" row=5 id="input_text" placeholder="Enter Prompt Here" oninput='if (this.value != "") {
document.getElementById("themetext").disabled = true; document.getElementById("themetext").value = "";
} else {
document.getElementById("themetext").disabled = false;
}'></textarea> }'></textarea>
<div class="statusbar_outer hidden"> <div class="statusbar_outer hidden">
<div class="statusbar_inner" style="width:0%">0%</div> <div class="statusbar_inner" style="width:0%">0%</div>

4
templates/settings item.html
View File

@@ -36,8 +36,8 @@
{% endif %} {% endif %}
</span> </span>
<!---Slider Labels---> <!---Slider Labels--->
<span class="setting_minlabel"><span style="top: -4px; position: relative;">{% if item["uitype"] == "slider" %}{{ item['min'] }}{% endif %}</span></span> <span class="setting_minlabel"><span style="position: relative;">{% if item["uitype"] == "slider" %}{{ item['min'] }}{% endif %}</span></span>
<span class="setting_maxlabel"><span style="top: -4px; position: relative;">{% if item["uitype"] == "slider" %}{{ item['max'] }}{% endif %}</span></span> <span class="setting_maxlabel"><span style="position: relative;">{% if item["uitype"] == "slider" %}{{ item['max'] }}{% endif %}</span></span>
</div> </div>
{% endif %} {% endif %}
{% endfor %} {% endfor %}