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 errors fix

Browse Source
This commit is contained in:
ebolam
2022-12-05 14:07:32 -05:00
parent 84cfba782c
commit 5a526bea8e
5 changed files with 30 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
aiserver.py
View File

@@ -511,9 +511,6 @@ class ImportBuffer:
import_buffer = ImportBuffer() import_buffer = ImportBuffer()
with open("data/genres.json", "r") as file:
genre_list = json.load(file)
# Set logging level to reduce chatter from Flask # Set logging level to reduce chatter from Flask
import logging import logging
log = logging.getLogger('werkzeug') log = logging.getLogger('werkzeug')
@@ -9807,6 +9804,8 @@ def UI_2_privacy_mode(data):
#==================================================================# #==================================================================#
@app.route("/genre_data.json", methods=["GET"]) @app.route("/genre_data.json", methods=["GET"])
def UI_2_get_applicable_genres(): def UI_2_get_applicable_genres():
with open("data/genres.json", "r") as file:
genre_list = json.load(file)
return Response(json.dumps({ return Response(json.dumps({
"list": genre_list, "list": genre_list,
"init": koboldai_vars.genres, "init": koboldai_vars.genres,

14
static/koboldai.css
View File

@@ -199,6 +199,20 @@ border-top-right-radius: var(--tabs_rounding);
margin: 2px; margin: 2px;
} }
.setting_container_sp {
display: grid;
grid-template-areas: "label value"
"item item";
grid-template-rows: 20px 43px;
grid-template-columns: 147px 30px;
row-gap: 0.2em;
background-color: var(--setting_background);
color: var(--setting_text);
border-radius: var(--radius_settings_background);
padding: 2px;
margin: 2px;
}
.setting_container.var_sync_alt_system_alt_gen[system_alt_gen="true"] { .setting_container.var_sync_alt_system_alt_gen[system_alt_gen="true"] {
display: none; display: none;
} }

3
static/koboldai.js
View File

@@ -2623,11 +2623,14 @@ function create_new_softprompt() {
"sp_author": document.getElementById("sp_author").value, "sp_author": document.getElementById("sp_author").value,
"sp_description": document.getElementById("sp_description").value "sp_description": document.getElementById("sp_description").value
}); });
closePopups();
} }
async function download_story_to_json() { async function download_story_to_json() {
//document.getElementById('download_iframe').src = 'json'; //document.getElementById('download_iframe').src = 'json';
downloaded = false; downloaded = false;
}
async function download_story() { async function download_story() {
if (socket.connected) { if (socket.connected) {
try { try {

3
templates/popups.html
View File

@@ -284,7 +284,8 @@
</form> </form>
</div> </div>
<div class="popup_load_cancel"> <div class="popup_load_cancel">
<button type="button" class="btn btn-primary popup_load_cancel_button" onclick="create_new_softprompt(); closePopups();">Ok</button> <button type="button" class="btn btn-primary popup_load_cancel_button" onclick="create_new_softprompt();">Ok</button>
<button type="button" class="btn btn-primary popup_load_cancel_button" onclick="closePopups();">Cancel</button>
</div> </div>
</div> </div>

17
templates/settings flyout.html
View File

@@ -199,7 +199,7 @@
{% with sub_path='Modifiers' %} {% with sub_path='Modifiers' %}
{% include 'settings item.html' %} {% include 'settings item.html' %}
{% endwith %} {% endwith %}
<div class="setting_container" ui_level=1> <div class="setting_container_sp" ui_level=1>
<!---Top Row----> <!---Top Row---->
<span class="setting_label"> <span class="setting_label">
<span style="white-space: pre-wrap;">Soft Prompt: </span> <span style="white-space: pre-wrap;">Soft Prompt: </span>
@@ -207,14 +207,15 @@
</span> </span>
<!---Bottom Row----> <!---Bottom Row---->
<span class="setting_item"> <span class="setting_item">
<!---<span class="material-icons-outlined cursor" onclick="socket.emit('load_softprompt_list', '');">folder_open</span> <span class="var_sync_system_spname"></span>---> <div style="display: flex;flex-direction: row;">
<select autocomplete="off" id="sp" class="var_sync_system_splist var_sync_system_spfilename settings_select" style="width: 140px;margin-right:0px;padding-bottom: 0px;" onclick="socket.emit('load_softprompt', this.value);"> <select autocomplete="off" id="sp" class="var_sync_system_splist var_sync_system_spfilename settings_select" style="width: 140px;margin-right:0px;padding-bottom: 0px;" onclick="socket.emit('load_softprompt', this.value);">
</select> </select>
<span class="material-icons-outlined cursor" style="font-size: 18px;" tooltip="Refresh List" onclick="socket.emit('sp_list_refresh', '');">autorenew</span> <div style="display: flex;flex-direction: column;">
<span class="material-icons-outlined cursor" style="font-size: 18px;" tooltip="Refresh List" onclick="socket.emit('sp_list_refresh', '');">autorenew</span>
<span class="material-icons-outlined cursor" style="font-size: 18px;" tooltip="Create New Soft Prompt" onclick="openPopup('sp-trainer-popup');">note_add</span>
</div>
</div>
</span> </span>
<!---Slider Labels--->
<span class="setting_minlabel"><span style="top: -4px; position: relative;"></span></span>
<span class="setting_maxlabel"><span style="top: -4px; position: relative;"></span></span>
</div> </div>
<div class="setting_container_single_wide" ui_level=2> <div class="setting_container_single_wide" ui_level=2>
<!---Top Row----> <!---Top Row---->