From 2728d88abac2df895f0470507282e8b06e377105 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Wed, 24 Jul 2024 22:27:47 +0800 Subject: [PATCH] rename summary -> backend --- config/cli_chat_dash_cn.yaml | 29 ++++++++++--------- .../worker/{summary => backend}/__init__.py | 0 .../contra_repeat_worker.py | 0 .../contra_repeat_worker.yaml | 0 .../get_observation_with_time_worker.py | 2 +- .../get_observation_with_time_worker.yaml | 0 .../get_observation_worker.py | 0 .../get_observation_worker.yaml | 0 .../get_reflection_subject_worker.py | 0 .../get_reflection_subject_worker.yaml | 0 .../info_filter_worker.py | 0 .../info_filter_worker.yaml | 0 .../load_memory_worker.py | 0 .../long_contra_repeat_worker.py | 0 .../long_contra_repeat_worker.yaml | 0 .../update_insight_worker.py | 0 .../update_insight_worker.yaml | 0 .../update_memory_worker.py | 0 .../worker/frontend/semantic_rank_worker.py | 1 + 19 files changed, 17 insertions(+), 15 deletions(-) rename memoryscope/memory/worker/{summary => backend}/__init__.py (100%) rename memoryscope/memory/worker/{summary => backend}/contra_repeat_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/contra_repeat_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/get_observation_with_time_worker.py (98%) rename memoryscope/memory/worker/{summary => backend}/get_observation_with_time_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/get_observation_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/get_observation_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/get_reflection_subject_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/get_reflection_subject_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/info_filter_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/info_filter_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/load_memory_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/long_contra_repeat_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/long_contra_repeat_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/update_insight_worker.py (100%) rename memoryscope/memory/worker/{summary => backend}/update_insight_worker.yaml (100%) rename memoryscope/memory/worker/{summary => backend}/update_memory_worker.py (100%) diff --git a/config/cli_chat_dash_cn.yaml b/config/cli_chat_dash_cn.yaml index ada734da..dd04463e 100644 --- a/config/cli_chat_dash_cn.yaml +++ b/config/cli_chat_dash_cn.yaml @@ -82,7 +82,7 @@ worker: rank_model: dashscope_rank fuse_rerank: class: memory.worker.frontend.fuse_rerank_worker - fuse_score_threshold: 0.05 + fuse_score_threshold: 0.01 fuse_ratio_dict: conversation: 0.5 observation: 1 @@ -103,60 +103,60 @@ worker: retrieve_ins_top_k: 100 retrieve_expired_top_k: 100 delete_memory: - class: memory.worker.summary.update_memory_worker + class: memory.worker.backend.update_memory_worker method: delete_memory delete_all: - class: memory.worker.summary.update_memory_worker + class: memory.worker.backend.update_memory_worker method: delete_all add_memory: - class: memory.worker.summary.update_memory_worker + class: memory.worker.backend.update_memory_worker method: from_query info_filter: - class: memory.worker.summary.info_filter_worker + class: memory.worker.backend.info_filter_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 load_today_memory: - class: memory.worker.summary.load_memory_worker + class: memory.worker.backend.load_memory_worker retrieve_today_top_k: 100 get_observation: - class: memory.worker.summary.get_observation_worker + class: memory.worker.backend.get_observation_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 get_observation_with_time: - class: memory.worker.summary.get_observation_with_time_worker + class: memory.worker.backend.get_observation_with_time_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 contra_repeat: - class: memory.worker.summary.contra_repeat_worker + class: memory.worker.backend.contra_repeat_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 store_memory: - class: memory.worker.summary.update_memory_worker + class: memory.worker.backend.update_memory_worker method: from_memory_key memory_key: all load_obs_and_insight: - class: memory.worker.summary.load_memory_worker + class: memory.worker.backend.load_memory_worker retrieve_not_reflected_top_k: 100 retrieve_not_updated_top_k: 100 retrieve_insight_top_k: 100 get_reflection_subject: - class: memory.worker.summary.get_reflection_subject_worker + class: memory.worker.backend.get_reflection_subject_worker generation_model: dashscope_generation reflect_obs_cnt_threshold: 10 generation_model_kwargs: top_k: 1 update_insight: - class: memory.worker.summary.update_insight_worker + class: memory.worker.backend.update_insight_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 rank_model: dashscope_rank long_contra_repeat: - class: memory.worker.summary.long_contra_repeat_worker + class: memory.worker.backend.long_contra_repeat_worker generation_model: dashscope_generation generation_model_kwargs: top_k: 1 @@ -175,6 +175,7 @@ models: class: models.llama_index_rank_model module_name: dashscope_rank model_name: gte-rerank + top_n: 10 dummy_generation: class: models.dummy_generation_model module_name: dummy_generation diff --git a/memoryscope/memory/worker/summary/__init__.py b/memoryscope/memory/worker/backend/__init__.py similarity index 100% rename from memoryscope/memory/worker/summary/__init__.py rename to memoryscope/memory/worker/backend/__init__.py diff --git a/memoryscope/memory/worker/summary/contra_repeat_worker.py b/memoryscope/memory/worker/backend/contra_repeat_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/contra_repeat_worker.py rename to memoryscope/memory/worker/backend/contra_repeat_worker.py diff --git a/memoryscope/memory/worker/summary/contra_repeat_worker.yaml b/memoryscope/memory/worker/backend/contra_repeat_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/contra_repeat_worker.yaml rename to memoryscope/memory/worker/backend/contra_repeat_worker.yaml diff --git a/memoryscope/memory/worker/summary/get_observation_with_time_worker.py b/memoryscope/memory/worker/backend/get_observation_with_time_worker.py similarity index 98% rename from memoryscope/memory/worker/summary/get_observation_with_time_worker.py rename to memoryscope/memory/worker/backend/get_observation_with_time_worker.py index 3b451a56..9655fce0 100644 --- a/memoryscope/memory/worker/summary/get_observation_with_time_worker.py +++ b/memoryscope/memory/worker/backend/get_observation_with_time_worker.py @@ -2,7 +2,7 @@ from typing import List from memoryscope.constants.common_constants import NEW_OBS_WITH_TIME_NODES from memoryscope.constants.language_constants import COLON_WORD -from memoryscope.memory.worker.summary.get_observation_worker import GetObservationWorker +from memoryscope.memory.worker.backend.get_observation_worker import GetObservationWorker from memoryscope.scheme.message import Message from memoryscope.utils.datetime_handler import DatetimeHandler from memoryscope.utils.tool_functions import prompt_to_msg diff --git a/memoryscope/memory/worker/summary/get_observation_with_time_worker.yaml b/memoryscope/memory/worker/backend/get_observation_with_time_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/get_observation_with_time_worker.yaml rename to memoryscope/memory/worker/backend/get_observation_with_time_worker.yaml diff --git a/memoryscope/memory/worker/summary/get_observation_worker.py b/memoryscope/memory/worker/backend/get_observation_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/get_observation_worker.py rename to memoryscope/memory/worker/backend/get_observation_worker.py diff --git a/memoryscope/memory/worker/summary/get_observation_worker.yaml b/memoryscope/memory/worker/backend/get_observation_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/get_observation_worker.yaml rename to memoryscope/memory/worker/backend/get_observation_worker.yaml diff --git a/memoryscope/memory/worker/summary/get_reflection_subject_worker.py b/memoryscope/memory/worker/backend/get_reflection_subject_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/get_reflection_subject_worker.py rename to memoryscope/memory/worker/backend/get_reflection_subject_worker.py diff --git a/memoryscope/memory/worker/summary/get_reflection_subject_worker.yaml b/memoryscope/memory/worker/backend/get_reflection_subject_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/get_reflection_subject_worker.yaml rename to memoryscope/memory/worker/backend/get_reflection_subject_worker.yaml diff --git a/memoryscope/memory/worker/summary/info_filter_worker.py b/memoryscope/memory/worker/backend/info_filter_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/info_filter_worker.py rename to memoryscope/memory/worker/backend/info_filter_worker.py diff --git a/memoryscope/memory/worker/summary/info_filter_worker.yaml b/memoryscope/memory/worker/backend/info_filter_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/info_filter_worker.yaml rename to memoryscope/memory/worker/backend/info_filter_worker.yaml diff --git a/memoryscope/memory/worker/summary/load_memory_worker.py b/memoryscope/memory/worker/backend/load_memory_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/load_memory_worker.py rename to memoryscope/memory/worker/backend/load_memory_worker.py diff --git a/memoryscope/memory/worker/summary/long_contra_repeat_worker.py b/memoryscope/memory/worker/backend/long_contra_repeat_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/long_contra_repeat_worker.py rename to memoryscope/memory/worker/backend/long_contra_repeat_worker.py diff --git a/memoryscope/memory/worker/summary/long_contra_repeat_worker.yaml b/memoryscope/memory/worker/backend/long_contra_repeat_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/long_contra_repeat_worker.yaml rename to memoryscope/memory/worker/backend/long_contra_repeat_worker.yaml diff --git a/memoryscope/memory/worker/summary/update_insight_worker.py b/memoryscope/memory/worker/backend/update_insight_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/update_insight_worker.py rename to memoryscope/memory/worker/backend/update_insight_worker.py diff --git a/memoryscope/memory/worker/summary/update_insight_worker.yaml b/memoryscope/memory/worker/backend/update_insight_worker.yaml similarity index 100% rename from memoryscope/memory/worker/summary/update_insight_worker.yaml rename to memoryscope/memory/worker/backend/update_insight_worker.yaml diff --git a/memoryscope/memory/worker/summary/update_memory_worker.py b/memoryscope/memory/worker/backend/update_memory_worker.py similarity index 100% rename from memoryscope/memory/worker/summary/update_memory_worker.py rename to memoryscope/memory/worker/backend/update_memory_worker.py diff --git a/memoryscope/memory/worker/frontend/semantic_rank_worker.py b/memoryscope/memory/worker/frontend/semantic_rank_worker.py index 3ea4801a..be5d67dc 100644 --- a/memoryscope/memory/worker/frontend/semantic_rank_worker.py +++ b/memoryscope/memory/worker/frontend/semantic_rank_worker.py @@ -53,6 +53,7 @@ class SemanticRankWorker(MemoryBaseWorker): memory_node_list = sorted(memory_node_list, key=lambda n: n.score_rank, reverse=True) # log ranked nodes + self.logger.info(f"Rank stage: query={query}") for node in memory_node_list: self.logger.info(f"Rank stage: Content={node.content}, Score={node.score_rank}")