From c0d9a225744446d8f2e021d9a2da2c1681d155dd Mon Sep 17 00:00:00 2001 From: hs Date: Tue, 2 Jul 2024 14:33:21 +0800 Subject: [PATCH] language word --- .../memory/worker/summary/long_contra_repeat_worker.py | 8 +------- .../memory/worker/summary/update_insight_prompt.yaml | 5 +---- .../memory/worker/summary/update_insight_worker.py | 4 ++-- .../memory/worker/summary/update_profile_prompt.yaml | 3 --- .../memory/worker/summary/update_profile_worker.py | 4 ++-- 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/memory_scope/memory/worker/summary/long_contra_repeat_worker.py b/memory_scope/memory/worker/summary/long_contra_repeat_worker.py index c99217ce..97f5bc40 100644 --- a/memory_scope/memory/worker/summary/long_contra_repeat_worker.py +++ b/memory_scope/memory/worker/summary/long_contra_repeat_worker.py @@ -113,13 +113,7 @@ class LongContraRepeatWorker(MemoryBaseWorker): self.logger.warning(f"idx={idx} is invalid!") continue - long_contra_repeat_keep_flag = [ - self.get_language_value(CONTRADICTORY_WORD), - self.get_language_value(INCLUDED_WORD), - self.get_language_value(NONE_WORD), - ] - - if keep_flag not in long_contra_repeat_keep_flag.values(): + if keep_flag not in self.get_language_value([CONTRADICTORY_WORD, INCLUDED_WORD, NONE_WORD]): self.logger.warning(f"keep_flag={keep_flag} is invalid!") continue diff --git a/memory_scope/memory/worker/summary/update_insight_prompt.yaml b/memory_scope/memory/worker/summary/update_insight_prompt.yaml index f5d6e362..2d501b22 100644 --- a/memory_scope/memory/worker/summary/update_insight_prompt.yaml +++ b/memory_scope/memory/worker/summary/update_insight_prompt.yaml @@ -61,7 +61,4 @@ user_query_prompt: user_query: cn: "句子:{content}" - -insight_value: - cn: ["无", "重复"] - en: \ No newline at end of file + \ No newline at end of file diff --git a/memory_scope/memory/worker/summary/update_insight_worker.py b/memory_scope/memory/worker/summary/update_insight_worker.py index a1195445..f1cab3f3 100644 --- a/memory_scope/memory/worker/summary/update_insight_worker.py +++ b/memory_scope/memory/worker/summary/update_insight_worker.py @@ -8,7 +8,7 @@ from memory_scope.constants.common_constants import ( from memory_scope.utils.tool_functions import prompt_to_msg from memory_scope.scheme.memory_node import MemoryNode from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.constants.language_constants import COMMA_WORD, COLON_WORD +from memory_scope.constants.language_constants import COMMA_WORD, COLON_WORD, NONE_WORD, REPEATED_WORD class UpdateInsightWorker(MemoryBaseWorker): @@ -112,7 +112,7 @@ class UpdateInsightWorker(MemoryBaseWorker): return insight_node insight_value = profile_list[0] - if not insight_value or insight_value in self.prompt_handler.insight_value: + if not insight_value or insight_value in self.get_language_value([NONE_WORD, REPEATED_WORD]): self.logger.info(f"insight_value={insight_value}, skip.") return insight_node diff --git a/memory_scope/memory/worker/summary/update_profile_prompt.yaml b/memory_scope/memory/worker/summary/update_profile_prompt.yaml index 0c3f56ce..16f28c2e 100644 --- a/memory_scope/memory/worker/summary/update_profile_prompt.yaml +++ b/memory_scope/memory/worker/summary/update_profile_prompt.yaml @@ -118,6 +118,3 @@ update_unique_profile_user_query_prompt: user_query: cn: "句子:{content}" en: - -update_profile_key: - cn: ["无", "重复"] \ No newline at end of file diff --git a/memory_scope/memory/worker/summary/update_profile_worker.py b/memory_scope/memory/worker/summary/update_profile_worker.py index de5428ff..3bf7b3c3 100644 --- a/memory_scope/memory/worker/summary/update_profile_worker.py +++ b/memory_scope/memory/worker/summary/update_profile_worker.py @@ -7,7 +7,7 @@ from memory_scope.scheme.memory_node import MemoryNode from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker from memory_scope.utils.global_context import GlobalContext from memory_scope.utils.tool_functions import prompt_to_msg -from memory_scope.constants.language_constants import COMMA_WORD, COLON_WORD +from memory_scope.constants.language_constants import COMMA_WORD, COLON_WORD, NONE_WORD, REPEATED_WORD class UpdateProfileWorker(MemoryBaseWorker): @@ -118,7 +118,7 @@ class UpdateProfileWorker(MemoryBaseWorker): return user_attr profile = profile_list[0] - if not profile or profile in self.prompt_handler.update_profile_key: + if not profile or profile in self.get_language_value([NONE_WORD, REPEATED_WORD]): self.logger.info(f"profile={profile}, skip.") return user_attr