From 5fbd83e573a3a8253b9d4416841968556a07b8d0 Mon Sep 17 00:00:00 2001
From: csunny <cfqcsunny@gmail.com>
Date: Sat, 6 May 2023 01:13:47 +0800
Subject: [PATCH] fix

---
 pilot/app.py              |  6 +++---
 pilot/server/webserver.py | 18 ++++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/pilot/app.py b/pilot/app.py
index 1cbcd79b0..7cb3aad7f 100644
--- a/pilot/app.py
+++ b/pilot/app.py
@@ -40,13 +40,13 @@ def get_answer(q):
     return response.response
 
 def get_similar(q):
-    from pilot.vector_store.extract_tovec import knownledge_tovec, load_knownledge_from_doc 
-    docsearch = load_knownledge_from_doc()
+    from pilot.vector_store.extract_tovec import knownledge_tovec, knownledge_tovec_st
+    docsearch = knownledge_tovec_st("./datasets/plan.md")
     docs = docsearch.similarity_search_with_score(q, k=1)
 
     for doc in docs:
         dc, s = doc 
-        print(dc.page_content)
+        print(s)
         yield dc.page_content 
 
 if __name__ == "__main__":
diff --git a/pilot/server/webserver.py b/pilot/server/webserver.py
index b7a0ef816..5aa3c6526 100644
--- a/pilot/server/webserver.py
+++ b/pilot/server/webserver.py
@@ -160,7 +160,7 @@ def http_bot(state, db_selector, temperature, max_new_tokens, request: gr.Reques
         yield (state, state.to_gradio_chatbot()) + (no_change_btn,) * 5
         return
 
-    query = state.messages[-2][1]
+   
     if len(state.messages) == state.offset + 2:
         # 第一轮对话需要加入提示Prompt 
         
@@ -168,6 +168,8 @@ def http_bot(state, db_selector, temperature, max_new_tokens, request: gr.Reques
         new_state = conv_templates[template_name].copy()
         new_state.conv_id = uuid.uuid4().hex
         
+        query = state.messages[-2][1]
+
         # prompt 中添加上下文提示
         if db_selector:
             new_state.append_message(new_state.roles[0], gen_sqlgen_conversation(dbname) + query)
@@ -178,13 +180,13 @@ def http_bot(state, db_selector, temperature, max_new_tokens, request: gr.Reques
             new_state.append_message(new_state.roles[1], None)
             state = new_state
 
-    try: 
-        if not db_selector: 
-            sim_q = get_simlar(query)
-            print("********vector similar info*************: ", sim_q)
-            state.append_message(new_state.roles[0], sim_q + query)
-    except Exception as e:
-        print(e)
+    # try: 
+    #     if not db_selector: 
+    #         sim_q = get_simlar(query)
+    #         print("********vector similar info*************: ", sim_q)
+    #         state.append_message(new_state.roles[0], sim_q + query)
+    # except Exception as e:
+    #     print(e)
 
     prompt = state.get_prompt()