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

utils updated to current

Browse Source
This commit is contained in:
ebolam
2022-08-01 14:38:52 -04:00
parent 3aae99d4e0
commit 05946cf3c2
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
static/koboldai.css
View File

@@ -406,7 +406,7 @@ td.server_vars {
width: 100%; width: 100%;
border: 2px outset var(--wi_card_border_color); border: 2px outset var(--wi_card_border_color);
background-color: var(--wi_card_bg_color); background-color: var(--wi_card_bg_color);
margin-bottom: 10px; margin-bottom: 20px;
} }
.world_info_card.world_info_included { .world_info_card.world_info_included {

19
utils.py
View File

@@ -21,7 +21,7 @@ try:
except ImportError: except ImportError:
HAS_ACCELERATE = False HAS_ACCELERATE = False
vars = None koboldai_vars = None
num_shards: Optional[int] = None num_shards: Optional[int] = None
current_shard = 0 current_shard = 0
from_pretrained_model_name = "" from_pretrained_model_name = ""
@@ -93,8 +93,8 @@ def replaceblanklines(txt):
#==================================================================# #==================================================================#
# #
#==================================================================# #==================================================================#
def removespecialchars(txt, vars=None): def removespecialchars(txt, koboldai_vars=None):
if vars is None or koboldai_vars.actionmode == 0: if koboldai_vars is None or koboldai_vars.actionmode == 0:
txt = re.sub(r"[#/@%<>{}+=~|\^]", "", txt) txt = re.sub(r"[#/@%<>{}+=~|\^]", "", txt)
else: else:
txt = re.sub(r"[#/@%{}+=~|\^]", "", txt) txt = re.sub(r"[#/@%{}+=~|\^]", "", txt)
@@ -103,7 +103,10 @@ def removespecialchars(txt, vars=None):
#==================================================================# #==================================================================#
# If the next action follows a sentence closure, add a space # If the next action follows a sentence closure, add a space
#==================================================================# #==================================================================#
def addsentencespacing(txt, vars): def addsentencespacing(txt, koboldai_vars):
# Don't add sentence spacing if submission is empty or starts with whitespace
if(len(txt) == 0 or len(txt) != len(txt.lstrip())):
return txt
# Get last character of last action # Get last character of last action
if(len(koboldai_vars.actions) > 0): if(len(koboldai_vars.actions) > 0):
if(len(koboldai_vars.actions[koboldai_vars.actions.get_last_key()]) > 0): if(len(koboldai_vars.actions[koboldai_vars.actions.get_last_key()]) > 0):
@@ -116,11 +119,11 @@ def addsentencespacing(txt, vars):
else: else:
action = koboldai_vars.prompt action = koboldai_vars.prompt
lastchar = action[-1] if len(action) else "" lastchar = action[-1] if len(action) else ""
if(lastchar == "." or lastchar == "!" or lastchar == "?" or lastchar == "," or lastchar == ";" or lastchar == ":"): if(lastchar != " "):
txt = " " + txt txt = " " + txt
return txt return txt
def singlelineprocessing(txt, vars): def singlelineprocessing(txt, koboldai_vars):
txt = koboldai_vars.regex_sl.sub('', txt) txt = koboldai_vars.regex_sl.sub('', txt)
if(len(koboldai_vars.actions) > 0): if(len(koboldai_vars.actions) > 0):
if(len(koboldai_vars.actions[koboldai_vars.actions.get_last_key()]) > 0): if(len(koboldai_vars.actions[koboldai_vars.actions.get_last_key()]) > 0):
@@ -178,7 +181,7 @@ class Send_to_socketio(object):
emit('from_server', {'cmd': 'model_load_status', 'data': bar.replace(" ", "&nbsp;")}, broadcast=True, room="UI_1") emit('from_server', {'cmd': 'model_load_status', 'data': bar.replace(" ", "&nbsp;")}, broadcast=True, room="UI_1")
except: except:
pass pass
def aria2_hook(pretrained_model_name_or_path: str, force_download=False, cache_dir=None, proxies=None, resume_download=False, local_files_only=False, use_auth_token=None, user_agent=None, revision=None, mirror=None, **kwargs): def aria2_hook(pretrained_model_name_or_path: str, force_download=False, cache_dir=None, proxies=None, resume_download=False, local_files_only=False, use_auth_token=None, user_agent=None, revision=None, mirror=None, **kwargs):
import transformers import transformers
import transformers.modeling_utils import transformers.modeling_utils
@@ -207,7 +210,7 @@ def aria2_hook(pretrained_model_name_or_path: str, force_download=False, cache_d
def is_cached(url): def is_cached(url):
try: try:
transformers.file_utils.get_from_cache(url, cache_dir=cache_dir, local_files_only=True) transformers.file_utils.get_from_cache(url, cache_dir=cache_dir, local_files_only=True)
except FileNotFoundError: except (FileNotFoundError, transformers.file_utils.EntryNotFoundError):
return False return False
return True return True
while True: # Try to get the huggingface.co URL of the model's pytorch_model.bin or pytorch_model.bin.index.json file while True: # Try to get the huggingface.co URL of the model's pytorch_model.bin or pytorch_model.bin.index.json file