feat:fix conflict

Author: fridayL

src/memos/reranker/concat.py

@@ -1,10 +1,9 @@
-from typing import List, Dict, Any, Union, Tuple
+from typing import Any
 
 
 def process_source(
-    items: List[Tuple[Any, Union[str, Dict[str, Any], List[Any]]]] | None = None, 
-    recent_num: int = 3
-    ) -> str:
+    items: list[tuple[Any, str | dict[str, Any] | list[Any]]] | None = None, recent_num: int = 3
+) -> str:
     """
     Args:
         items: List of tuples where each tuple contains (memory, source).
@@ -13,6 +12,8 @@ def process_source(
     Returns:
         str: Concatenated source.
     """
+    if items is None:
+        items = []
     concat_data = []
     for item in items:
         memory, source = item
@@ -24,7 +25,7 @@ def process_source(
 
 def concat_original_source(
     graph_results: list,
-    merge_field: List[str]=["sources"],
+    merge_field: list[str] | None = None,
 ) -> list[str]:
     """
     Merge memory items with original dialogue.
@@ -34,6 +35,8 @@ def concat_original_source(
     Returns:
         list[str]: List of memory and concat orginal memory.
     """
+    if merge_field is None:
+        merge_field = ["sources"]
     documents = []
     for item in graph_results:
         memory = getattr(item, "memory", "")
@@ -43,4 +46,4 @@ def concat_original_source(
             sources.append((memory, source))
         concat_string = process_source(sources)
         documents.append(concat_string)
-    return documents
+    return documents

src/memos/reranker/http_bge.py

@@ -7,9 +7,11 @@
 
 import requests
 
+from memos.log import get_logger
+
 from .base import BaseReranker
 from .concat import concat_original_source
-from memos.log import get_logger
+
 
 logger = get_logger(__name__)
 
@@ -32,7 +34,7 @@ def __init__(
         model: str = "bge-reranker-v2-m3",
         timeout: int = 10,
         headers_extra: dict | None = None,
-        concat_source: List[str]=["sources"],
+        concat_source: list[str] | None = None,
     ):
         if not reranker_url:
             raise ValueError("reranker_url must not be empty")
@@ -41,7 +43,7 @@ def __init__(
         self.model = model
         self.timeout = timeout
         self.headers_extra = headers_extra or {}
-        self.concat_source = concat_source
+        self.concat_source = concat_source or ["sources"]
 
     def rerank(
         self,