From b00a47a0ee4c3a1dbbc921fb1bed4ede2df5e764 Mon Sep 17 00:00:00 2001 From: csunny Date: Thu, 25 May 2023 23:56:03 +0800 Subject: [PATCH] fix: lint --- pilot/server/vectordb_qa.py | 2 +- pilot/server/webserver.py | 29 +++++++++++++++++++++++------ pilot/vector_store/milvus_store.py | 20 ++++++++++---------- 3 files changed, 34 insertions(+), 17 deletions(-) diff --git a/pilot/server/vectordb_qa.py b/pilot/server/vectordb_qa.py index a3fe9be4a..e64f68097 100644 --- a/pilot/server/vectordb_qa.py +++ b/pilot/server/vectordb_qa.py @@ -52,4 +52,4 @@ class KnownLedgeBaseQA: prompt = state.get_prompt() print("new prompt length:" + str(len(prompt))) - return prompt \ No newline at end of file + return prompt diff --git a/pilot/server/webserver.py b/pilot/server/webserver.py index fdcb149bc..8b33706a7 100644 --- a/pilot/server/webserver.py +++ b/pilot/server/webserver.py @@ -385,13 +385,16 @@ def http_bot( cfg.set_last_plugin_return(plugin_resp) print(plugin_resp) state.messages[-1][-1] = ( - "Model推理信息:\n" + ai_response + "\n\nDB-GPT执行结果:\n" + plugin_resp + "Model推理信息:\n" + + ai_response + + "\n\nDB-GPT执行结果:\n" + + plugin_resp ) yield (state, state.to_gradio_chatbot()) + (no_change_btn,) * 5 except NotCommands as e: print("命令执行:" + e.message) state.messages[-1][-1] = ( - "命令执行:" + e.message + "\n模型输出:\n" + str(ai_response) + "命令执行:" + e.message + "\n模型输出:\n" + str(ai_response) ) yield (state, state.to_gradio_chatbot()) + (no_change_btn,) * 5 else: @@ -422,18 +425,32 @@ def http_bot( output = post_process_code(output) state.messages[-1][-1] = output + "▌" - yield (state, state.to_gradio_chatbot()) + (disable_btn,) * 5 + yield (state, state.to_gradio_chatbot()) + ( + disable_btn, + ) * 5 else: - output = data["text"] + f" (error_code: {data['error_code']})" + output = ( + data["text"] + f" (error_code: {data['error_code']})" + ) state.messages[-1][-1] = output yield (state, state.to_gradio_chatbot()) + ( - disable_btn, disable_btn, disable_btn, enable_btn, enable_btn) + disable_btn, + disable_btn, + disable_btn, + enable_btn, + enable_btn, + ) return except requests.exceptions.RequestException as e: state.messages[-1][-1] = server_error_msg + f" (error_code: 4)" yield (state, state.to_gradio_chatbot()) + ( - disable_btn, disable_btn, disable_btn, enable_btn, enable_btn) + disable_btn, + disable_btn, + disable_btn, + enable_btn, + enable_btn, + ) return state.messages[-1][-1] = state.messages[-1][-1][:-1] diff --git a/pilot/vector_store/milvus_store.py b/pilot/vector_store/milvus_store.py index 78977cce8..c9fc985e4 100644 --- a/pilot/vector_store/milvus_store.py +++ b/pilot/vector_store/milvus_store.py @@ -32,7 +32,6 @@ class MilvusStore(VectorStoreBase): self.fields = [] self.alias = "default" - # use HNSW by default. self.index_params = { "metric_type": "L2", @@ -105,9 +104,7 @@ class MilvusStore(VectorStoreBase): embeddings = self.embedding.embed_query(texts[0]) if utility.has_collection(self.collection_name): - self.col = Collection( - self.collection_name, using=self.alias - ) + self.col = Collection(self.collection_name, using=self.alias) self.fields = [] for x in self.col.schema.fields: self.fields.append(x.name) @@ -115,7 +112,10 @@ class MilvusStore(VectorStoreBase): self.fields.remove(x.name) if x.is_primary: self.primary_field = x.name - if x.dtype == DataType.FLOAT_VECTOR or x.dtype == DataType.BINARY_VECTOR: + if ( + x.dtype == DataType.FLOAT_VECTOR + or x.dtype == DataType.BINARY_VECTOR + ): self.vector_field = x.name self._add_documents(texts, metadatas) return self.collection_name @@ -132,9 +132,7 @@ class MilvusStore(VectorStoreBase): for y in texts: max_length = max(max_length, len(y)) # Create the text field - fields.append( - FieldSchema(text_field, DataType.VARCHAR, max_length= 65535) - ) + fields.append(FieldSchema(text_field, DataType.VARCHAR, max_length=65535)) # primary key field fields.append( FieldSchema(primary_field, DataType.INT64, is_primary=True, auto_id=True) @@ -252,7 +250,9 @@ class MilvusStore(VectorStoreBase): """load document in vector database.""" # self.init_schema_and_load(self.collection_name, documents) batch_size = 500 - batched_list = [documents[i:i + batch_size] for i in range(0, len(documents), batch_size)] + batched_list = [ + documents[i : i + batch_size] for i in range(0, len(documents), batch_size) + ] # docs = [] for doc_batch in batched_list: self.init_schema_and_load(self.collection_name, doc_batch) @@ -320,4 +320,4 @@ class MilvusStore(VectorStoreBase): return data[0], ret def close(self): - connections.disconnect() \ No newline at end of file + connections.disconnect()