update conflicts

tests/metagpt/document_store/test_faiss_store.py

@@ -6,11 +6,6 @@
 @File    : test_faiss_store.py
 """
 
-<<<<<<< HEAD
-from typing import Optional
-=======
->>>>>>> f14fee9b (memory_storage use rag_pipeline)
-
 import numpy as np
 import pytest
 

tests/metagpt/memory/mock_text_embed.py

@@ -27,7 +27,6 @@ text_embed_arr = [
 text_idx_dict = {item["text"]: idx for idx, item in enumerate(text_embed_arr)}
 
 
-
 def mock_openai_embed_documents(self, texts: list[str], show_progress: bool = False) -> list[list[float]]:
     idx = text_idx_dict.get(texts[0])
     embed = text_embed_arr[idx].get("embed")

tests/metagpt/memory/test_memory_storage.py

@@ -61,13 +61,9 @@ async def test_idea_message(mocker):
 async def test_actionout_message(mocker):
     mocker.patch("llama_index.embeddings.openai.base.OpenAIEmbedding._get_text_embeddings", mock_openai_embed_documents)
     mocker.patch("llama_index.embeddings.openai.base.OpenAIEmbedding._get_text_embedding", mock_openai_embed_document)
-<<<<<<< HEAD
-    mocker.patch("llama_index.embeddings.openai.base.OpenAIEmbedding._aget_query_embedding", mock_openai_aembed_document)
-=======
     mocker.patch(
         "llama_index.embeddings.openai.base.OpenAIEmbedding._aget_query_embedding", mock_openai_aembed_document
     )
->>>>>>> c2a280d7 (fix)
 
     out_mapping = {"field1": (str, ...), "field2": (List[str], ...)}
     out_data = {"field1": "field1 value", "field2": ["field2 value1", "field2 value2"]}