diff --git a/memory_scope/memory/worker/memory_base_worker.py b/memory_scope/memory/worker/memory_base_worker.py index 7309af49..57b7e616 100644 --- a/memory_scope/memory/worker/memory_base_worker.py +++ b/memory_scope/memory/worker/memory_base_worker.py @@ -76,7 +76,6 @@ class MemoryBaseWorker(BaseWorker, metaclass=ABCMeta): @property def user_name(self) -> str: - # FIXME: complex situations require adjustment if self._user_name is None: message = [x for x in self.messages if x.role == MessageRoleEnum.ASSISTANT.value][-1] self._user_name = message.role_name @@ -84,7 +83,6 @@ class MemoryBaseWorker(BaseWorker, metaclass=ABCMeta): @property def target_name(self) -> str: - # FIXME: complex situations require adjustment if self._target_name is None: message = [x for x in self.messages if x.role == MessageRoleEnum.USER.value][-1] self._target_name = message.role_name @@ -100,7 +98,7 @@ class MemoryBaseWorker(BaseWorker, metaclass=ABCMeta): return self.kwargs[key] @staticmethod - def get_language_value(languages: dict | list) -> str | list[str]: + def get_language_value(languages: dict | list[dict]) -> str | list[str]: if isinstance(languages, list): return [x[G_CONTEXT.language] for x in languages] return languages[G_CONTEXT.language] diff --git a/memory_scope/memory/worker/read/fuse_rerank_worker.py b/memory_scope/memory/worker/read/fuse_rerank_worker.py index 639afeee..e00406ce 100644 --- a/memory_scope/memory/worker/read/fuse_rerank_worker.py +++ b/memory_scope/memory/worker/read/fuse_rerank_worker.py @@ -9,40 +9,6 @@ from memory_scope.utils.datetime_handler import DatetimeHandler class FuseRerankWorker(MemoryBaseWorker): - @staticmethod - def format_time_infer(time_infer: str, extract_time_dict: Dict[str, str], meta_data: Dict[str, str]): - if time_infer: - return time_infer - - time_infer = "" - if "year" in extract_time_dict: - value = meta_data.get("msg_year") - if value: - time_infer += f"{value}年" - elif value == "-1": - time_infer += f"每年" - - if "month" in extract_time_dict: - value = meta_data.get("msg_month") - if value: - time_infer += f"{value}月" - elif value == "-1": - time_infer += f"每月" - - if "day" in extract_time_dict: - value = meta_data.get("msg_day") - if value: - time_infer += f"{value}日" - elif value == "-1": - time_infer += f"每日" - - if "weekday" in extract_time_dict: - value = meta_data.get("msg_weekday") - if value: - time_infer += value - - return time_infer - @staticmethod def match_node_time(extract_time_dict: Dict[str, str], node: MemoryNode): if extract_time_dict: diff --git a/memory_scope/models/llama_index_generation_model.py b/memory_scope/models/llama_index_generation_model.py index a23bf756..e0accfa2 100644 --- a/memory_scope/models/llama_index_generation_model.py +++ b/memory_scope/models/llama_index_generation_model.py @@ -1,4 +1,3 @@ -import datetime from typing import List from llama_index.core.base.llms.types import ChatMessage, ChatResponse, CompletionResponse @@ -7,8 +6,8 @@ from llama_index.llms.dashscope import DashScope from memory_scope.enumeration.message_role_enum import MessageRoleEnum from memory_scope.enumeration.model_enum import ModelEnum from memory_scope.models.base_model import BaseModel, MODEL_REGISTRY -from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen from memory_scope.scheme.message import Message +from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen class LlamaIndexGenerationModel(BaseModel):