remove username when selecting

microsoft · Apr 5, 2024 · c80d8ff · c80d8ff
1 parent fe4855e
commit c80d8ff
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/util/Database.py b/app/util/Database.py
@@ -13,8 +13,8 @@ def __init__(self, cache, db_name) -> None:
     def create_table(self, name, attributes = []):
         self.connection.execute(f"CREATE TABLE IF NOT EXISTS {name} ({', '.join(attributes)})")
 
-    def select_embedding_from_hash(self, hash_text, username = ''):
-        return self.connection.execute(f"SELECT embedding FROM embeddings WHERE hash_text = '{hash_text}' and username = '{username}'").fetchone()
+    def select_embedding_from_hash(self, hash_text):
+        return self.connection.execute(f"SELECT embedding FROM embeddings WHERE hash_text = '{hash_text}'").fetchone()
 
     def insert_into_embeddings(self, hash_text, embedding, username = ''):
         self.connection.execute(f"INSERT OR IGNORE INTO embeddings VALUES ('{username}','{hash_text}', {embedding})")

diff --git a/app/util/Embedder.py b/app/util/Embedder.py
@@ -4,6 +4,7 @@
 from util.Database import Database
 import util.session_variables
 from util.openai_instance import _OpenAI
+import streamlit as st
 
 gen_model = 'gpt-4-turbo-preview'
 embed_model = 'text-embedding-3-small'
@@ -73,7 +74,7 @@ def encode(self, text, auto_save = True):
             try:
                 embedding = openai.client().embeddings.create(input = [text], model=self.model).data[0].embedding
                 if auto_save:
-                    self.connection.insert_into_embeddings(hsh, embedding)
+                    self.connection.insert_into_embeddings(hsh, embedding, self.username)
                 return embedding
             except:
                 print(f'Error embedding text: {text}')

diff --git a/app/workflows/question_answering/functions.py b/app/workflows/question_answering/functions.py
@@ -61,7 +61,8 @@ def chunk_files(sv, files):
         all_embeddings_list.append((hash(formatted_chunk), chunk_vec))
         file.add_chunk(chunk, np.array(chunk_vec), cx+1)   
     pb.progress(99, 'Saving embeddings...')
-    embedder.connection.insert_multiple_into_embeddings(all_embeddings_list)
+    if len(all_embeddings_list) > 0:
+        embedder.connection.insert_multiple_into_embeddings(all_embeddings_list)
     pb.empty()
 
 def update_question(sv, question_history, new_questions, placeholder, prefix):