From a577bb4ce8c198d4bf534dae9c3d5468439de881 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Fri, 21 Jun 2024 11:39:37 +0800 Subject: [PATCH] [dev] rename constants name --- config/config_show.json | 1 - memory_scope/chat/base_memory_chat.py | 6 ++---- memory_scope/chat/memory_chat.py | 2 +- memory_scope/chat/memory_service.py | 7 +------ memory_scope/constants/common_constants.py | 4 ++-- memory_scope/{definition => scheme}/__init__.py | 0 memory_scope/{definition => scheme}/memory_node.py | 0 memory_scope/{definition => scheme}/message.py | 0 memory_scope/utils/pipeline.py | 10 ++++------ memory_scope/worker/memory_base_worker.py | 8 ++++---- 10 files changed, 14 insertions(+), 24 deletions(-) rename memory_scope/{definition => scheme}/__init__.py (100%) rename memory_scope/{definition => scheme}/memory_node.py (100%) rename memory_scope/{definition => scheme}/message.py (100%) diff --git a/config/config_show.json b/config/config_show.json index 43d53b94..7adce564 100644 --- a/config/config_show.json +++ b/config/config_show.json @@ -9,7 +9,6 @@ ] }, "memory_chat": { - "memory_user_name": "用户", "clazz": "chat.memory_chat", "retrieve": "parse_params,load_profile,extract_time,es_similar,es_keyword,semantic_rank,fuse_rerank", "generation_model": "dashscope_generation", diff --git a/memory_scope/chat/base_memory_chat.py b/memory_scope/chat/base_memory_chat.py index 3cc92392..27aa28b3 100644 --- a/memory_scope/chat/base_memory_chat.py +++ b/memory_scope/chat/base_memory_chat.py @@ -5,10 +5,8 @@ from memory_scope.chat.memory_service import MemoryService class BaseMemoryChat(metaclass=ABCMeta): - def __init__(self, chat_name: str, memory_user_name: str, **kwargs): - self.memory_service = MemoryService(chat_name=chat_name, - memory_user_name=memory_user_name, - **kwargs) + def __init__(self, chat_name: str, **kwargs): + self.memory_service = MemoryService(chat_name=chat_name, **kwargs) @abstractmethod def chat_with_memory(self, query: str): diff --git a/memory_scope/chat/memory_chat.py b/memory_scope/chat/memory_chat.py index 5526561d..360180d1 100644 --- a/memory_scope/chat/memory_chat.py +++ b/memory_scope/chat/memory_chat.py @@ -3,10 +3,10 @@ from typing import List from memory_scope.chat.base_memory_chat import BaseMemoryChat from memory_scope.chat.global_context import GLOBAL_CONTEXT -from memory_scope.definition.message import Message from memory_scope.enumeration.message_role_enum import MessageRoleEnum from memory_scope.models.base_model import BaseModel from memory_scope.prompts.memory_chat_prompt import SYSTEM_PROMPT, MEMORY_PROMPT +from memory_scope.scheme.message import Message class MemoryChat(BaseMemoryChat): diff --git a/memory_scope/chat/memory_service.py b/memory_scope/chat/memory_service.py index 8fc340e9..0f9984ec 100644 --- a/memory_scope/chat/memory_service.py +++ b/memory_scope/chat/memory_service.py @@ -1,6 +1,6 @@ from memory_scope.constants.common_constants import RELATED_MEMORIES -from memory_scope.definition.message import Message from memory_scope.enumeration.memory_method_enum import MemoryMethodEnum +from memory_scope.scheme.message import Message from memory_scope.utils.pipeline import Pipeline @@ -8,7 +8,6 @@ class MemoryService(object): def __init__(self, chat_name: str, - memory_user_name: str, retrieve_pipeline: str, retrieve_all_pipeline: str, summary_short_pipeline: str, @@ -19,24 +18,20 @@ class MemoryService(object): summary_long_minimum_count: int = 5 * 5, **kwargs): self.retrieve_pipeline = Pipeline(chat_name=chat_name, - user_name=memory_user_name, memory_method_type=MemoryMethodEnum.RETRIEVE, pipeline_str=retrieve_pipeline) self.retrieve_all_pipeline = Pipeline(chat_name=chat_name, - user_name=memory_user_name, memory_method_type=MemoryMethodEnum.RETRIEVE_ALL, pipeline_str=retrieve_all_pipeline) self.summary_short_pipeline = Pipeline(chat_name=chat_name, - user_name=memory_user_name, memory_method_type=MemoryMethodEnum.SUMMARY_SHORT, pipeline_str=summary_short_pipeline, loop_interval_time=summary_short_interval_time, loop_minimum_count=summary_short_minimum_count) self.summary_long_pipeline = Pipeline(chat_name=chat_name, - user_name=memory_user_name, memory_method_type=MemoryMethodEnum.SUMMARY_LONG, pipeline_str=summary_long_pipeline, loop_interval_time=summary_long_interval_time, diff --git a/memory_scope/constants/common_constants.py b/memory_scope/constants/common_constants.py index e41a92ab..61681538 100644 --- a/memory_scope/constants/common_constants.py +++ b/memory_scope/constants/common_constants.py @@ -1,5 +1,5 @@ -USER_NAME = "user_name" - RELATED_MEMORIES = "related_memories" MESSAGES = "messages" + +CHAT_NAME = "chat_name" diff --git a/memory_scope/definition/__init__.py b/memory_scope/scheme/__init__.py similarity index 100% rename from memory_scope/definition/__init__.py rename to memory_scope/scheme/__init__.py diff --git a/memory_scope/definition/memory_node.py b/memory_scope/scheme/memory_node.py similarity index 100% rename from memory_scope/definition/memory_node.py rename to memory_scope/scheme/memory_node.py diff --git a/memory_scope/definition/message.py b/memory_scope/scheme/message.py similarity index 100% rename from memory_scope/definition/message.py rename to memory_scope/scheme/message.py diff --git a/memory_scope/utils/pipeline.py b/memory_scope/utils/pipeline.py index a4badd61..152743ce 100644 --- a/memory_scope/utils/pipeline.py +++ b/memory_scope/utils/pipeline.py @@ -6,9 +6,9 @@ from itertools import zip_longest from typing import Dict, Any, List from memory_scope.chat.global_context import GLOBAL_CONTEXT -from memory_scope.constants.common_constants import MESSAGES, USER_NAME -from memory_scope.definition.message import Message +from memory_scope.constants.common_constants import MESSAGES, CHAT_NAME from memory_scope.enumeration.memory_method_enum import MemoryMethodEnum +from memory_scope.scheme.message import Message from memory_scope.utils.logger import Logger from memory_scope.utils.timer import Timer from memory_scope.worker.base_worker import BaseWorker @@ -17,7 +17,6 @@ from memory_scope.worker.base_worker import BaseWorker class Pipeline(object): def __init__(self, chat_name: str, - user_name: str, memory_method_type: MemoryMethodEnum, pipeline_str: str, history_msg_count: int = 3, @@ -25,7 +24,6 @@ class Pipeline(object): loop_minimum_count: int = 20): self.chat_name: str = chat_name - self.user_name: str = user_name self.memory_method_type: MemoryMethodEnum = memory_method_type self.pipeline_str: str = pipeline_str self.history_msg_count: int = history_msg_count @@ -126,9 +124,9 @@ class Pipeline(object): def _run(self): self._visit_and_inject_workers() - with Timer(f"pipeline_{self.user_name}_{self.memory_method_type.value}"): + with Timer(f"pipeline_{self.chat_name}_{self.memory_method_type.value}"): self.context[MESSAGES] = self.history_message_list + self.current_message_list - self.context[USER_NAME] = self.user_name + self.context[CHAT_NAME] = self.chat_name for pipeline_part in self.pipeline_list: if len(pipeline_part) == 1: diff --git a/memory_scope/worker/memory_base_worker.py b/memory_scope/worker/memory_base_worker.py index d964e3b0..a33da647 100644 --- a/memory_scope/worker/memory_base_worker.py +++ b/memory_scope/worker/memory_base_worker.py @@ -1,9 +1,9 @@ from typing import List from memory_scope.chat.global_context import GLOBAL_CONTEXT -from memory_scope.constants.common_constants import MESSAGES, USER_NAME -from memory_scope.definition.message import Message +from memory_scope.constants.common_constants import MESSAGES, CHAT_NAME from memory_scope.models.base_model import BaseModel +from memory_scope.scheme.message import Message from memory_scope.storage.base_monitor import BaseMonitor from memory_scope.storage.base_vector_store import BaseVectorStore from memory_scope.worker.base_worker import BaseWorker @@ -36,8 +36,8 @@ class MemoryBaseWorker(BaseWorker): self.set_context(MESSAGES, value) @property - def user_name(self): - return self.get_context(USER_NAME) + def chat_name(self): + return self.get_context(CHAT_NAME) @property def embedding_model(self):