Update with h2oGPT hash c0762b9528f67797cf2d2ec3a99ae7880d324fec

app.py

@@ -2,10 +2,8 @@ import functools
 import inspect
 import sys
 import os
-import time
 import traceback
 import typing
-import filelock
 from utils import set_seed, flatten_list, clear_torch_cache, system_info_print, zip_data, save_generate_output
 
 SEED = 1236
@@ -60,7 +58,7 @@ def main(
 
         llama_type: bool = None,
         debug: bool = False,
-        save_path: str = None,
+        save_dir: str = None,
         share: bool = True,
         local_files_only: bool = False,
         resume_download: bool = True,
@@ -114,7 +112,7 @@ def main(
     if is_hf:
         # must override share if in spaces
         share = False
-    save_path = os.getenv('SAVE_PATH')
+    save_dir = os.getenv('SAVE_DIR', save_dir)
 
     # get defaults
     model_lower = base_model.lower()
@@ -182,7 +180,7 @@ def main(
             if not eval_sharegpt_as_output:
                 model, tokenizer, device = get_model(**locals())
                 model_state = [model, tokenizer, device, base_model]
-                fun = partial(evaluate, model_state, debug=debug, chat=chat, save_path=save_path)
+                fun = partial(evaluate, model_state, debug=debug, chat=chat, save_dir=save_dir)
             else:
                 assert eval_sharegpt_prompts_only > 0
 
@@ -816,7 +814,7 @@ body.dark{background:linear-gradient(#0d0d0d,#333333);}"""
                             file_output = gr.File()
 
         # Get flagged data
-        zip_data1 = functools.partial(zip_data, root_dirs=['flagged_data_points', kwargs['save_path']])
+        zip_data1 = functools.partial(zip_data, root_dirs=['flagged_data_points', kwargs['save_dir']])
         zip_btn.click(zip_data1, inputs=None, outputs=file_output)
 
         def check_admin_pass(x):
@@ -1143,7 +1141,7 @@ body.dark{background:linear-gradient(#0d0d0d,#333333);}"""
 
 
 input_args_list = ['model_state']
-inputs_kwargs_list = ['debug', 'chat', 'save_path', 'hard_stop_list', 'sanitize_bot_response', 'model_state0']
+inputs_kwargs_list = ['debug', 'chat', 'save_dir', 'hard_stop_list', 'sanitize_bot_response', 'model_state0']
 
 
 def get_inputs_list(inputs_dict, model_lower):
@@ -1206,7 +1204,7 @@ def evaluate(
         src_lang=None,
         tgt_lang=None,
         debug=False,
-        save_path=None,
+        save_dir=None,
         chat=False,
         hard_stop_list=None,
         sanitize_bot_response=True,
@@ -1269,7 +1267,7 @@ def evaluate(
             # encounters = [prompt.count(human) + 1, prompt.count(bot) + 1]
             # stopping only starts once output is beyond prompt
             # 1 human is enough to trigger, but need 2 bots, because very first view back will be bot we added
-            stop_words = [human, bot]
+            stop_words = [human, bot, '\n' + human, '\n' + bot]
             encounters = [1, 2]
         elif prompt_type == 'instruct_vicuna':
             # even below is not enough, generic strings and many ways to encode
@@ -1300,6 +1298,9 @@ def evaluate(
         # avoid padding in front of tokens
         if tokenizer.pad_token:
             stop_words_ids = [x[1:] if x[0] == tokenizer.pad_token_id and len(x) > 1 else x for x in stop_words_ids]
+        # handle fake \n added
+        stop_words_ids = [x[1:] if y[0] == '\n' else x for x,y in zip(stop_words_ids, stop_words)]
+        # build stopper
         stopping_criteria = StoppingCriteriaList([StoppingCriteriaSub(stops=stop_words_ids, encounters=encounters)])
     else:
         stopping_criteria = StoppingCriteriaList()
@@ -1420,14 +1421,16 @@ def evaluate(
                     raise StopIteration
                 yield prompter.get_response(decoded_output, prompt=inputs_decoded,
                                             sanitize_bot_response=sanitize_bot_response)
-            if save_path and decoded_output:
-                save_generate_output(output=decoded_output, base_model=base_model, json_file_path=save_path)
-            return
+            if save_dir and decoded_output:
+                save_generate_output(output=decoded_output, base_model=base_model, save_dir=save_dir)
         else:
             outputs = model.generate(**gen_kwargs)
             outputs = [decoder(s) for s in outputs.sequences]
             yield prompter.get_response(outputs, prompt=inputs_decoded,
                                         sanitize_bot_response=sanitize_bot_response)
+            if save_dir and outputs and len(outputs) >= 1:
+                decoded_output = prompt + outputs[0]
+                save_generate_output(output=decoded_output, base_model=base_model, save_dir=save_dir)
 
 
 def get_generate_params(model_lower, chat,

utils.py

@@ -118,33 +118,31 @@ def _zip_data(root_dirs=None, zip_path='data.zip', base_dir='./'):
     return "data.zip"
 
 
-def save_generate_output(output=None, base_model=None, json_file_path=None):
+def save_generate_output(output=None, base_model=None, save_dir=None):
     try:
-        return _save_generate_output(output=output, base_model=base_model, json_file_path=json_file_path)
+        return _save_generate_output(output=output, base_model=base_model, save_dir=save_dir)
     except Exception as e:
         traceback.print_exc()
         print('Exception in saving: %s' % str(e))
 
 
-def _save_generate_output(output=None, base_model=None, json_file_path=None):
+def _save_generate_output(output=None, base_model=None, save_dir=None):
     """
-    Save conversation to .json, row by row
+    Save conversation to .json, row by row.
+    json_file_path is path to final JSON file. If not in ., then will attempt to make directories.
     Appends if file exists
     """
-    assert isinstance(json_file_path, str), "must provide save_path"
-    as_file = os.path.normpath(json_file_path)
-    if os.path.isfile(as_file):
-        # protection if had file there before
-        os.remove(as_file)
-    os.makedirs(json_file_path, exist_ok=True)
-    json_file_file = os.path.join(json_file_path, 'save.json')
+    assert save_dir, "save_dir must be provided"
+    if os.path.exists(save_dir) and not os.path.isdir(save_dir):
+        raise RuntimeError("save_dir already exists and is not a directory!")
+    os.makedirs(save_dir, exist_ok=True)
     import json
     if output[-10:] == '\n\n<human>:':
         # remove trailing <human>:
         output = output[:-10]
-    with filelock.FileLock("save_path.lock"):
+    with filelock.FileLock("save_dir.lock"):
         # lock logging in case have concurrency
-        with open(json_file_file, "a") as f:
+        with open(os.path.join(save_dir, "history.json"), "a") as f:
             # just add [ at start, and ] at end, and have proper JSON dataset
             f.write(
                 "  " + json.dumps(