Update with h2oGPT hash 23aaa9c9839867b3f0c86e7722cc7fbdae414fc4

src/db_utils.py

@@ -0,0 +1,54 @@
+import uuid
+
+from enums import LangChainMode
+
+
+def set_userid(db1s, requests_state1, get_userid_auth):
+    db1 = db1s[LangChainMode.MY_DATA.value]
+    assert db1 is not None and len(db1) == length_db1()
+    if not db1[1]:
+        db1[1] = get_userid_auth(requests_state1)
+    if not db1[2]:
+        username1 = None
+        if 'username' in requests_state1:
+            username1 = requests_state1['username']
+        db1[2] = username1
+
+
+def set_userid_direct(db1s, userid, username):
+    db1 = db1s[LangChainMode.MY_DATA.value]
+    db1[1] = userid
+    db1[2] = username
+
+
+def get_userid_direct(db1s):
+    return db1s[LangChainMode.MY_DATA.value][1] if db1s is not None else ''
+
+
+def get_username_direct(db1s):
+    return db1s[LangChainMode.MY_DATA.value][2] if db1s is not None else ''
+
+
+def get_dbid(db1):
+    return db1[1]
+
+
+def set_dbid(db1):
+    # can only call this after function called so for specific user, not in gr.State() that occurs during app init
+    assert db1 is not None and len(db1) == length_db1()
+    if db1[1] is None:
+        #  uuid in db is used as user ID
+        db1[1] = str(uuid.uuid4())
+
+
+def length_db1():
+    # For MyData:
+    # 0: db
+    # 1: userid and dbid
+    # 2: username
+
+    # For others:
+    # 0: db
+    # 1: dbid
+    # 2: None
+    return 3

src/gpt_langchain.py

@@ -37,6 +37,8 @@ from langchain.tools import PythonREPLTool
 from langchain.tools.json.tool import JsonSpec
 from tqdm import tqdm
 
+from src.db_utils import length_db1, set_dbid, set_userid, get_dbid, get_userid_direct, get_username_direct, \
+    set_userid_direct
 from utils import wrapped_partial, EThread, import_matplotlib, sanitize_filename, makedirs, get_url, flatten_list, \
     get_device, ProgressParallel, remove, hash_file, clear_torch_cache, NullContext, get_hf_server, FakeTokenizer, \
     have_libreoffice, have_arxiv, have_playwright, have_selenium, have_tesseract, have_doctr, have_pymupdf, set_openai, \
@@ -4655,57 +4657,6 @@ def get_sources_answer(query, docs, answer, scores, show_rank,
     return ret, extra
 
 
-def set_userid(db1s, requests_state1, get_userid_auth):
-    db1 = db1s[LangChainMode.MY_DATA.value]
-    assert db1 is not None and len(db1) == length_db1()
-    if not db1[1]:
-        db1[1] = get_userid_auth(requests_state1)
-    if not db1[2]:
-        username1 = None
-        if 'username' in requests_state1:
-            username1 = requests_state1['username']
-        db1[2] = username1
-
-
-def set_userid_direct(db1s, userid, username):
-    db1 = db1s[LangChainMode.MY_DATA.value]
-    db1[1] = userid
-    db1[2] = username
-
-
-def get_userid_direct(db1s):
-    return db1s[LangChainMode.MY_DATA.value][1] if db1s is not None else ''
-
-
-def get_username_direct(db1s):
-    return db1s[LangChainMode.MY_DATA.value][2] if db1s is not None else ''
-
-
-def get_dbid(db1):
-    return db1[1]
-
-
-def set_dbid(db1):
-    # can only call this after function called so for specific user, not in gr.State() that occurs during app init
-    assert db1 is not None and len(db1) == length_db1()
-    if db1[1] is None:
-        #  uuid in db is used as user ID
-        db1[1] = str(uuid.uuid4())
-
-
-def length_db1():
-    # For MyData:
-    # 0: db
-    # 1: userid and dbid
-    # 2: username
-
-    # For others:
-    # 0: db
-    # 1: dbid
-    # 2: None
-    return 3
-
-
 def get_any_db(db1s, langchain_mode, langchain_mode_paths, langchain_mode_types,
                dbs=None,
                load_db_if_exists=None, db_type=None,

src/gradio_runner.py

@@ -20,6 +20,7 @@ from iterators import TimeoutIterator
 
 from gradio_utils.css import get_css
 from gradio_utils.prompt_form import make_chatbots
+from src.db_utils import set_userid, get_username_direct
 
 # This is a hack to prevent Gradio from phoning home when it gets imported
 os.environ['GRADIO_ANALYTICS_ENABLED'] = 'False'
@@ -459,7 +460,6 @@ def go_gradio(**kwargs):
             if not requests_state1.get('host2', '') and hasattr(request, 'client') and hasattr(request.client, 'host'):
                 requests_state1.update(dict(host2=request.client.host))
             if not requests_state1.get('username', '') and hasattr(request, 'username'):
-                from src.gpt_langchain import get_username_direct
                 # use already-defined username instead of keep changing to new uuid
                 # should be same as in requests_state1
                 db_username = get_username_direct(db1s)
@@ -469,7 +469,6 @@ def go_gradio(**kwargs):
 
     def user_state_setup(db1s, requests_state1, request: gr.Request, *args):
         requests_state1 = get_request_state(requests_state1, request, db1s)
-        from src.gpt_langchain import set_userid
         set_userid(db1s, requests_state1, get_userid_auth)
         args_list = [db1s, requests_state1] + list(args)
         return tuple(args_list)
@@ -500,6 +499,8 @@ def go_gradio(**kwargs):
                  inference_server=kwargs['inference_server'],
                  prompt_type=kwargs['prompt_type'],
                  prompt_dict=kwargs['prompt_dict'],
+                 visible_models=kwargs['visible_models'],
+                 h2ogpt_key=kwargs['h2ogpt_key'],
                  )
         )
 
@@ -3746,6 +3747,8 @@ def go_gradio(**kwargs):
                                    base_model=model_name, tokenizer_base_model=tokenizer_base_model,
                                    lora_weights=lora_weights, inference_server=server_name,
                                    prompt_type=prompt_type1, prompt_dict=prompt_dict1,
+                                   # FIXME: not typically required, unless want to expose adding h2ogpt endpoint in UI
+                                   visible_models=None, h2ogpt_key=None,
                                    )
 
             max_max_new_tokens1 = get_max_max_new_tokens(model_state_new, **kwargs)