From 84c147740eb5da8deaf5557dced6d45c465d5923 Mon Sep 17 00:00:00 2001 From: "jinli.yl" Date: Wed, 24 Jul 2024 19:28:40 +0800 Subject: [PATCH] [features] rename package name & fix es bug --- {memory_scope => memoryscope}/__init__.py | 0 .../chat/__init__.py | 0 .../chat/base_memory_chat.py | 2 +- .../chat/cli_memory_chat.py | 22 +++++++++---------- .../chat/cli_memory_chat.yaml | 0 {memory_scope => memoryscope}/cli.py | 12 +++++----- .../constants/__init__.py | 0 .../constants/common_constants.py | 0 .../constants/language_constants.py | 2 +- .../enumeration/__init__.py | 0 .../enumeration/action_status_enum.py | 0 .../enumeration/language_enum.py | 0 .../enumeration/memory_type_enum.py | 0 .../enumeration/message_role_enum.py | 0 .../enumeration/model_enum.py | 0 .../enumeration/store_status_enum.py | 0 .../memory/__init__.py | 0 .../memory/operation/__init__.py | 0 .../memory/operation/backend_operation.py | 12 +++++----- .../memory/operation/base_operation.py | 0 .../memory/operation/base_workflow.py | 12 +++++----- .../memory/operation/frontend_operation.py | 8 +++---- .../operation/summary_observation_op.py | 6 ++--- .../memory/service/__init__.py | 0 .../memory/service/base_memory_service.py | 6 ++--- .../memory/service/memory_scope_service.py | 8 +++---- .../memory/worker/__init__.py | 0 .../memory/worker/base_worker.py | 4 ++-- .../memory/worker/dummy_worker.py | 4 ++-- .../memory/worker/frontend/__init__.py | 0 .../worker/frontend/extract_time_worker.py | 10 ++++----- .../worker/frontend/extract_time_worker.yaml | 0 .../worker/frontend/fuse_rerank_worker.py | 8 +++---- .../worker/frontend/print_memory_worker.py | 12 +++++----- .../worker/frontend/print_memory_worker.yaml | 0 .../worker/frontend/read_message_worker.py | 6 ++--- .../worker/frontend/retrieve_memory_worker.py | 14 ++++++------ .../worker/frontend/semantic_rank_worker.py | 6 ++--- .../worker/frontend/set_query_worker.py | 6 ++--- .../memory/worker/memory_base_worker.py | 18 +++++++-------- .../memory/worker/summary/__init__.py | 0 .../summary/get_reflection_subject_worker.py | 18 +++++++-------- .../get_reflection_subject_worker.yaml | 0 .../summary/long_contra_repeat_worker.py | 18 +++++++-------- .../summary/long_contra_repeat_worker.yaml | 0 .../worker/summary/update_insight_worker.py | 16 +++++++------- .../worker/summary/update_insight_worker.yaml | 0 .../memory/worker/write/__init__.py | 0 .../worker/write/contra_repeat_worker.py | 14 ++++++------ .../worker/write/contra_repeat_worker.yaml | 0 .../write/get_observation_with_time_worker.py | 12 +++++----- .../get_observation_with_time_worker.yaml | 0 .../worker/write/get_observation_worker.py | 20 ++++++++--------- .../worker/write/get_observation_worker.yaml | 0 .../memory/worker/write/info_filter_worker.py | 12 +++++----- .../worker/write/info_filter_worker.yaml | 0 .../memory/worker/write/load_memory_worker.py | 14 ++++++------ .../worker/write/update_memory_worker.py | 10 ++++----- .../models/__init__.py | 0 .../models/base_model.py | 10 ++++----- .../models/dummy_generation_model.py | 10 ++++----- .../models/llama_index_embedding_model.py | 6 ++--- .../models/llama_index_generation_model.py | 10 ++++----- .../models/llama_index_rank_model.py | 6 ++--- .../scheme/__init__.py | 0 .../scheme/memory_node.py | 0 .../scheme/message.py | 0 .../scheme/model_response.py | 4 ++-- .../storage/__init__.py | 0 .../storage/base_memory_store.py | 2 +- .../storage/base_monitor.py | 0 .../storage/dummy_memory_store.py | 6 ++--- .../storage/dummy_monitor.py | 2 +- .../storage/llama_index_es_memory_store.py | 10 ++++----- .../storage/llama_index_sync_elasticsearch.py | 0 .../utils/__init__.py | 0 .../utils/datetime_handler.py | 6 ++--- .../utils/global_context.py | 12 +++++----- {memory_scope => memoryscope}/utils/logger.py | 0 .../utils/memory_handler.py | 12 +++++----- .../utils/prompt_handler.py | 2 +- .../utils/registry.py | 0 .../utils/response_text_parser.py | 6 ++--- {memory_scope => memoryscope}/utils/timer.py | 2 +- .../utils/tool_functions.py | 6 ++--- tests/models/test_models_lli_embedding.py | 4 ++-- tests/models/test_models_lli_generation.py | 6 ++--- tests/models/test_models_lli_rank.py | 2 +- tests/operations/test_interface.py | 4 ++-- tests/storages/test_storages_lli_es.py | 6 ++--- tests/storages/test_storages_lli_synces.py | 6 ++--- tests/worker/test_workers_cn.py | 18 +++++++-------- tests/worker/test_workers_en.py | 18 +++++++-------- 93 files changed, 244 insertions(+), 244 deletions(-) rename {memory_scope => memoryscope}/__init__.py (100%) rename {memory_scope => memoryscope}/chat/__init__.py (100%) rename {memory_scope => memoryscope}/chat/base_memory_chat.py (94%) rename {memory_scope => memoryscope}/chat/cli_memory_chat.py (95%) rename {memory_scope => memoryscope}/chat/cli_memory_chat.yaml (100%) rename {memory_scope => memoryscope}/cli.py (89%) rename {memory_scope => memoryscope}/constants/__init__.py (100%) rename {memory_scope => memoryscope}/constants/common_constants.py (100%) rename {memory_scope => memoryscope}/constants/language_constants.py (98%) rename {memory_scope => memoryscope}/enumeration/__init__.py (100%) rename {memory_scope => memoryscope}/enumeration/action_status_enum.py (100%) rename {memory_scope => memoryscope}/enumeration/language_enum.py (100%) rename {memory_scope => memoryscope}/enumeration/memory_type_enum.py (100%) rename {memory_scope => memoryscope}/enumeration/message_role_enum.py (100%) rename {memory_scope => memoryscope}/enumeration/model_enum.py (100%) rename {memory_scope => memoryscope}/enumeration/store_status_enum.py (100%) rename {memory_scope => memoryscope}/memory/__init__.py (100%) rename {memory_scope => memoryscope}/memory/operation/__init__.py (100%) rename {memory_scope => memoryscope}/memory/operation/backend_operation.py (91%) rename {memory_scope => memoryscope}/memory/operation/base_operation.py (100%) rename {memory_scope => memoryscope}/memory/operation/base_workflow.py (95%) rename {memory_scope => memoryscope}/memory/operation/frontend_operation.py (84%) rename {memory_scope => memoryscope}/memory/operation/summary_observation_op.py (90%) rename {memory_scope => memoryscope}/memory/service/__init__.py (100%) rename {memory_scope => memoryscope}/memory/service/base_memory_service.py (96%) rename {memory_scope => memoryscope}/memory/service/memory_scope_service.py (94%) rename {memory_scope => memoryscope}/memory/worker/__init__.py (100%) rename {memory_scope => memoryscope}/memory/worker/base_worker.py (98%) rename {memory_scope => memoryscope}/memory/worker/dummy_worker.py (84%) rename {memory_scope => memoryscope}/memory/worker/frontend/__init__.py (100%) rename {memory_scope => memoryscope}/memory/worker/frontend/extract_time_worker.py (89%) rename {memory_scope => memoryscope}/memory/worker/frontend/extract_time_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/frontend/fuse_rerank_worker.py (94%) rename {memory_scope => memoryscope}/memory/worker/frontend/print_memory_worker.py (84%) rename {memory_scope => memoryscope}/memory/worker/frontend/print_memory_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/frontend/read_message_worker.py (75%) rename {memory_scope => memoryscope}/memory/worker/frontend/retrieve_memory_worker.py (92%) rename {memory_scope => memoryscope}/memory/worker/frontend/semantic_rank_worker.py (90%) rename {memory_scope => memoryscope}/memory/worker/frontend/set_query_worker.py (88%) rename {memory_scope => memoryscope}/memory/worker/memory_base_worker.py (92%) rename {memory_scope => memoryscope}/memory/worker/summary/__init__.py (100%) rename {memory_scope => memoryscope}/memory/worker/summary/get_reflection_subject_worker.py (88%) rename {memory_scope => memoryscope}/memory/worker/summary/get_reflection_subject_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/summary/long_contra_repeat_worker.py (91%) rename {memory_scope => memoryscope}/memory/worker/summary/long_contra_repeat_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/summary/update_insight_worker.py (94%) rename {memory_scope => memoryscope}/memory/worker/summary/update_insight_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/write/__init__.py (100%) rename {memory_scope => memoryscope}/memory/worker/write/contra_repeat_worker.py (90%) rename {memory_scope => memoryscope}/memory/worker/write/contra_repeat_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/write/get_observation_with_time_worker.py (89%) rename {memory_scope => memoryscope}/memory/worker/write/get_observation_with_time_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/write/get_observation_worker.py (92%) rename {memory_scope => memoryscope}/memory/worker/write/get_observation_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/write/info_filter_worker.py (92%) rename {memory_scope => memoryscope}/memory/worker/write/info_filter_worker.yaml (100%) rename {memory_scope => memoryscope}/memory/worker/write/load_memory_worker.py (91%) rename {memory_scope => memoryscope}/memory/worker/write/update_memory_worker.py (91%) rename {memory_scope => memoryscope}/models/__init__.py (100%) rename {memory_scope => memoryscope}/models/base_model.py (94%) rename {memory_scope => memoryscope}/models/dummy_generation_model.py (93%) rename {memory_scope => memoryscope}/models/llama_index_embedding_model.py (94%) rename {memory_scope => memoryscope}/models/llama_index_generation_model.py (93%) rename {memory_scope => memoryscope}/models/llama_index_rank_model.py (94%) rename {memory_scope => memoryscope}/scheme/__init__.py (100%) rename {memory_scope => memoryscope}/scheme/memory_node.py (100%) rename {memory_scope => memoryscope}/scheme/message.py (100%) rename {memory_scope => memoryscope}/scheme/model_response.py (94%) rename {memory_scope => memoryscope}/storage/__init__.py (100%) rename {memory_scope => memoryscope}/storage/base_memory_store.py (98%) rename {memory_scope => memoryscope}/storage/base_monitor.py (100%) rename {memory_scope => memoryscope}/storage/dummy_memory_store.py (88%) rename {memory_scope => memoryscope}/storage/dummy_monitor.py (93%) rename {memory_scope => memoryscope}/storage/llama_index_es_memory_store.py (94%) rename {memory_scope => memoryscope}/storage/llama_index_sync_elasticsearch.py (100%) rename {memory_scope => memoryscope}/utils/__init__.py (100%) rename {memory_scope => memoryscope}/utils/datetime_handler.py (98%) rename {memory_scope => memoryscope}/utils/global_context.py (68%) rename {memory_scope => memoryscope}/utils/logger.py (100%) rename {memory_scope => memoryscope}/utils/memory_handler.py (95%) rename {memory_scope => memoryscope}/utils/prompt_handler.py (98%) rename {memory_scope => memoryscope}/utils/registry.py (100%) rename {memory_scope => memoryscope}/utils/response_text_parser.py (93%) rename {memory_scope => memoryscope}/utils/timer.py (98%) rename {memory_scope => memoryscope}/utils/tool_functions.py (97%) diff --git a/memory_scope/__init__.py b/memoryscope/__init__.py similarity index 100% rename from memory_scope/__init__.py rename to memoryscope/__init__.py diff --git a/memory_scope/chat/__init__.py b/memoryscope/chat/__init__.py similarity index 100% rename from memory_scope/chat/__init__.py rename to memoryscope/chat/__init__.py diff --git a/memory_scope/chat/base_memory_chat.py b/memoryscope/chat/base_memory_chat.py similarity index 94% rename from memory_scope/chat/base_memory_chat.py rename to memoryscope/chat/base_memory_chat.py index 2e44e316..2be6ad6b 100644 --- a/memory_scope/chat/base_memory_chat.py +++ b/memoryscope/chat/base_memory_chat.py @@ -1,6 +1,6 @@ from abc import ABCMeta, abstractmethod -from memory_scope.memory.service.base_memory_service import BaseMemoryService +from memoryscope.memory.service.base_memory_service import BaseMemoryService class BaseMemoryChat(metaclass=ABCMeta): diff --git a/memory_scope/chat/cli_memory_chat.py b/memoryscope/chat/cli_memory_chat.py similarity index 95% rename from memory_scope/chat/cli_memory_chat.py rename to memoryscope/chat/cli_memory_chat.py index 7a95c6c3..e06fa0fc 100644 --- a/memory_scope/chat/cli_memory_chat.py +++ b/memoryscope/chat/cli_memory_chat.py @@ -4,17 +4,17 @@ from typing import List import questionary -from memory_scope.chat.base_memory_chat import BaseMemoryChat -from memory_scope.constants.language_constants import DEFAULT_HUMAN_NAME -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.service.base_memory_service import BaseMemoryService -from memory_scope.models.base_model import BaseModel -from memory_scope.scheme.message import Message -from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger -from memory_scope.utils.prompt_handler import PromptHandler -from memory_scope.utils.tool_functions import char_logo +from memoryscope.chat.base_memory_chat import BaseMemoryChat +from memoryscope.constants.language_constants import DEFAULT_HUMAN_NAME +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.service.base_memory_service import BaseMemoryService +from memoryscope.models.base_model import BaseModel +from memoryscope.scheme.message import Message +from memoryscope.scheme.model_response import ModelResponse, ModelResponseGen +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger +from memoryscope.utils.prompt_handler import PromptHandler +from memoryscope.utils.tool_functions import char_logo class CliMemoryChat(BaseMemoryChat): diff --git a/memory_scope/chat/cli_memory_chat.yaml b/memoryscope/chat/cli_memory_chat.yaml similarity index 100% rename from memory_scope/chat/cli_memory_chat.yaml rename to memoryscope/chat/cli_memory_chat.yaml diff --git a/memory_scope/cli.py b/memoryscope/cli.py similarity index 89% rename from memory_scope/cli.py rename to memoryscope/cli.py index 02fb5736..14b82099 100644 --- a/memory_scope/cli.py +++ b/memoryscope/cli.py @@ -13,12 +13,12 @@ import fire import yaml import atexit -from memory_scope.enumeration.language_enum import LanguageEnum -from memory_scope.enumeration.model_enum import ModelEnum -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger -from memory_scope.utils.timer import timer -from memory_scope.utils.tool_functions import init_instance_by_config, camelcase_to_underscore +from memoryscope.enumeration.language_enum import LanguageEnum +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger +from memoryscope.utils.timer import timer +from memoryscope.utils.tool_functions import init_instance_by_config, camelcase_to_underscore class MemoryScope(object): diff --git a/memory_scope/constants/__init__.py b/memoryscope/constants/__init__.py similarity index 100% rename from memory_scope/constants/__init__.py rename to memoryscope/constants/__init__.py diff --git a/memory_scope/constants/common_constants.py b/memoryscope/constants/common_constants.py similarity index 100% rename from memory_scope/constants/common_constants.py rename to memoryscope/constants/common_constants.py diff --git a/memory_scope/constants/language_constants.py b/memoryscope/constants/language_constants.py similarity index 98% rename from memory_scope/constants/language_constants.py rename to memoryscope/constants/language_constants.py index 14d92113..94fbcd47 100644 --- a/memory_scope/constants/language_constants.py +++ b/memoryscope/constants/language_constants.py @@ -1,4 +1,4 @@ -from memory_scope.enumeration.language_enum import LanguageEnum +from memoryscope.enumeration.language_enum import LanguageEnum # This dictionary maps languages to lists of words related to datetime expressions. # It aids in recognizing and processing datetime mentions in text, enhancing the system's ability to understand diff --git a/memory_scope/enumeration/__init__.py b/memoryscope/enumeration/__init__.py similarity index 100% rename from memory_scope/enumeration/__init__.py rename to memoryscope/enumeration/__init__.py diff --git a/memory_scope/enumeration/action_status_enum.py b/memoryscope/enumeration/action_status_enum.py similarity index 100% rename from memory_scope/enumeration/action_status_enum.py rename to memoryscope/enumeration/action_status_enum.py diff --git a/memory_scope/enumeration/language_enum.py b/memoryscope/enumeration/language_enum.py similarity index 100% rename from memory_scope/enumeration/language_enum.py rename to memoryscope/enumeration/language_enum.py diff --git a/memory_scope/enumeration/memory_type_enum.py b/memoryscope/enumeration/memory_type_enum.py similarity index 100% rename from memory_scope/enumeration/memory_type_enum.py rename to memoryscope/enumeration/memory_type_enum.py diff --git a/memory_scope/enumeration/message_role_enum.py b/memoryscope/enumeration/message_role_enum.py similarity index 100% rename from memory_scope/enumeration/message_role_enum.py rename to memoryscope/enumeration/message_role_enum.py diff --git a/memory_scope/enumeration/model_enum.py b/memoryscope/enumeration/model_enum.py similarity index 100% rename from memory_scope/enumeration/model_enum.py rename to memoryscope/enumeration/model_enum.py diff --git a/memory_scope/enumeration/store_status_enum.py b/memoryscope/enumeration/store_status_enum.py similarity index 100% rename from memory_scope/enumeration/store_status_enum.py rename to memoryscope/enumeration/store_status_enum.py diff --git a/memory_scope/memory/__init__.py b/memoryscope/memory/__init__.py similarity index 100% rename from memory_scope/memory/__init__.py rename to memoryscope/memory/__init__.py diff --git a/memory_scope/memory/operation/__init__.py b/memoryscope/memory/operation/__init__.py similarity index 100% rename from memory_scope/memory/operation/__init__.py rename to memoryscope/memory/operation/__init__.py diff --git a/memory_scope/memory/operation/backend_operation.py b/memoryscope/memory/operation/backend_operation.py similarity index 91% rename from memory_scope/memory/operation/backend_operation.py rename to memoryscope/memory/operation/backend_operation.py index f406c929..2fcbe398 100644 --- a/memory_scope/memory/operation/backend_operation.py +++ b/memoryscope/memory/operation/backend_operation.py @@ -1,12 +1,12 @@ import time from typing import List -from memory_scope.constants.common_constants import CHAT_KWARGS, RESULT, CHAT_MESSAGES -from memory_scope.memory.operation.base_operation import BaseOperation, OPERATION_TYPE -from memory_scope.memory.operation.base_workflow import BaseWorkflow -from memory_scope.scheme.message import Message -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger +from memoryscope.constants.common_constants import CHAT_KWARGS, RESULT, CHAT_MESSAGES +from memoryscope.memory.operation.base_operation import BaseOperation, OPERATION_TYPE +from memoryscope.memory.operation.base_workflow import BaseWorkflow +from memoryscope.scheme.message import Message +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger class BackendOperation(BaseWorkflow, BaseOperation): diff --git a/memory_scope/memory/operation/base_operation.py b/memoryscope/memory/operation/base_operation.py similarity index 100% rename from memory_scope/memory/operation/base_operation.py rename to memoryscope/memory/operation/base_operation.py diff --git a/memory_scope/memory/operation/base_workflow.py b/memoryscope/memory/operation/base_workflow.py similarity index 95% rename from memory_scope/memory/operation/base_workflow.py rename to memoryscope/memory/operation/base_workflow.py index 1b5d7119..926b59a1 100644 --- a/memory_scope/memory/operation/base_workflow.py +++ b/memoryscope/memory/operation/base_workflow.py @@ -4,12 +4,12 @@ from concurrent.futures import ThreadPoolExecutor, as_completed from itertools import zip_longest from typing import Dict, Any, List -from memory_scope.constants.common_constants import WORKFLOW_NAME -from memory_scope.memory.worker.base_worker import BaseWorker -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger -from memory_scope.utils.timer import Timer -from memory_scope.utils.tool_functions import init_instance_by_config +from memoryscope.constants.common_constants import WORKFLOW_NAME +from memoryscope.memory.worker.base_worker import BaseWorker +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger +from memoryscope.utils.timer import Timer +from memoryscope.utils.tool_functions import init_instance_by_config class BaseWorkflow(object): diff --git a/memory_scope/memory/operation/frontend_operation.py b/memoryscope/memory/operation/frontend_operation.py similarity index 84% rename from memory_scope/memory/operation/frontend_operation.py rename to memoryscope/memory/operation/frontend_operation.py index 14471f75..8cde7977 100644 --- a/memory_scope/memory/operation/frontend_operation.py +++ b/memoryscope/memory/operation/frontend_operation.py @@ -1,9 +1,9 @@ from typing import List -from memory_scope.constants.common_constants import RESULT, CHAT_MESSAGES, CHAT_KWARGS -from memory_scope.memory.operation.base_operation import BaseOperation, OPERATION_TYPE -from memory_scope.memory.operation.base_workflow import BaseWorkflow -from memory_scope.scheme.message import Message +from memoryscope.constants.common_constants import RESULT, CHAT_MESSAGES, CHAT_KWARGS +from memoryscope.memory.operation.base_operation import BaseOperation, OPERATION_TYPE +from memoryscope.memory.operation.base_workflow import BaseWorkflow +from memoryscope.scheme.message import Message class FrontendOperation(BaseWorkflow, BaseOperation): diff --git a/memory_scope/memory/operation/summary_observation_op.py b/memoryscope/memory/operation/summary_observation_op.py similarity index 90% rename from memory_scope/memory/operation/summary_observation_op.py rename to memoryscope/memory/operation/summary_observation_op.py index 47100423..1da2e65c 100644 --- a/memory_scope/memory/operation/summary_observation_op.py +++ b/memoryscope/memory/operation/summary_observation_op.py @@ -1,6 +1,6 @@ -from memory_scope.constants.common_constants import CHAT_KWARGS, CHAT_MESSAGES, RESULT -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.operation.backend_operation import BackendOperation +from memoryscope.constants.common_constants import CHAT_KWARGS, CHAT_MESSAGES, RESULT +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.operation.backend_operation import BackendOperation class SummaryObservationOp(BackendOperation): diff --git a/memory_scope/memory/service/__init__.py b/memoryscope/memory/service/__init__.py similarity index 100% rename from memory_scope/memory/service/__init__.py rename to memoryscope/memory/service/__init__.py diff --git a/memory_scope/memory/service/base_memory_service.py b/memoryscope/memory/service/base_memory_service.py similarity index 96% rename from memory_scope/memory/service/base_memory_service.py rename to memoryscope/memory/service/base_memory_service.py index e4a7310e..31b2df5e 100644 --- a/memory_scope/memory/service/base_memory_service.py +++ b/memoryscope/memory/service/base_memory_service.py @@ -2,9 +2,9 @@ import threading from abc import ABCMeta, abstractmethod from typing import List, Dict -from memory_scope.memory.operation.base_operation import BaseOperation -from memory_scope.scheme.message import Message -from memory_scope.utils.logger import Logger +from memoryscope.memory.operation.base_operation import BaseOperation +from memoryscope.scheme.message import Message +from memoryscope.utils.logger import Logger class BaseMemoryService(metaclass=ABCMeta): diff --git a/memory_scope/memory/service/memory_scope_service.py b/memoryscope/memory/service/memory_scope_service.py similarity index 94% rename from memory_scope/memory/service/memory_scope_service.py rename to memoryscope/memory/service/memory_scope_service.py index 754fa7f6..da4f4b76 100644 --- a/memory_scope/memory/service/memory_scope_service.py +++ b/memoryscope/memory/service/memory_scope_service.py @@ -1,9 +1,9 @@ from typing import List -from memory_scope.memory.operation.base_operation import BaseOperation -from memory_scope.memory.service.base_memory_service import BaseMemoryService -from memory_scope.scheme.message import Message -from memory_scope.utils.tool_functions import init_instance_by_config +from memoryscope.memory.operation.base_operation import BaseOperation +from memoryscope.memory.service.base_memory_service import BaseMemoryService +from memoryscope.scheme.message import Message +from memoryscope.utils.tool_functions import init_instance_by_config class MemoryScopeService(BaseMemoryService): diff --git a/memory_scope/memory/worker/__init__.py b/memoryscope/memory/worker/__init__.py similarity index 100% rename from memory_scope/memory/worker/__init__.py rename to memoryscope/memory/worker/__init__.py diff --git a/memory_scope/memory/worker/base_worker.py b/memoryscope/memory/worker/base_worker.py similarity index 98% rename from memory_scope/memory/worker/base_worker.py rename to memoryscope/memory/worker/base_worker.py index 07eeb7d7..e5bf691c 100644 --- a/memory_scope/memory/worker/base_worker.py +++ b/memoryscope/memory/worker/base_worker.py @@ -3,8 +3,8 @@ from abc import ABCMeta, abstractmethod from concurrent.futures import ThreadPoolExecutor, as_completed from typing import Any, Dict -from memory_scope.utils.logger import Logger -from memory_scope.utils.timer import Timer +from memoryscope.utils.logger import Logger +from memoryscope.utils.timer import Timer class BaseWorker(metaclass=ABCMeta): diff --git a/memory_scope/memory/worker/dummy_worker.py b/memoryscope/memory/worker/dummy_worker.py similarity index 84% rename from memory_scope/memory/worker/dummy_worker.py rename to memoryscope/memory/worker/dummy_worker.py index e4a4b1c8..b8eecb7b 100644 --- a/memory_scope/memory/worker/dummy_worker.py +++ b/memoryscope/memory/worker/dummy_worker.py @@ -1,7 +1,7 @@ import datetime -from memory_scope.constants.common_constants import RESULT, WORKFLOW_NAME, CHAT_KWARGS -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.constants.common_constants import RESULT, WORKFLOW_NAME, CHAT_KWARGS +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker class DummyWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/__init__.py b/memoryscope/memory/worker/frontend/__init__.py similarity index 100% rename from memory_scope/memory/worker/frontend/__init__.py rename to memoryscope/memory/worker/frontend/__init__.py diff --git a/memory_scope/memory/worker/frontend/extract_time_worker.py b/memoryscope/memory/worker/frontend/extract_time_worker.py similarity index 89% rename from memory_scope/memory/worker/frontend/extract_time_worker.py rename to memoryscope/memory/worker/frontend/extract_time_worker.py index 44eba917..087431c5 100644 --- a/memory_scope/memory/worker/frontend/extract_time_worker.py +++ b/memoryscope/memory/worker/frontend/extract_time_worker.py @@ -1,11 +1,11 @@ import re from typing import Dict -from memory_scope.constants.common_constants import QUERY_WITH_TS, EXTRACT_TIME_DICT -from memory_scope.constants.language_constants import DATATIME_KEY_MAP -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import QUERY_WITH_TS, EXTRACT_TIME_DICT +from memoryscope.constants.language_constants import DATATIME_KEY_MAP +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.utils.datetime_handler import DatetimeHandler +from memoryscope.utils.tool_functions import prompt_to_msg class ExtractTimeWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/extract_time_worker.yaml b/memoryscope/memory/worker/frontend/extract_time_worker.yaml similarity index 100% rename from memory_scope/memory/worker/frontend/extract_time_worker.yaml rename to memoryscope/memory/worker/frontend/extract_time_worker.yaml diff --git a/memory_scope/memory/worker/frontend/fuse_rerank_worker.py b/memoryscope/memory/worker/frontend/fuse_rerank_worker.py similarity index 94% rename from memory_scope/memory/worker/frontend/fuse_rerank_worker.py rename to memoryscope/memory/worker/frontend/fuse_rerank_worker.py index dc46b4ba..373d82b0 100644 --- a/memory_scope/memory/worker/frontend/fuse_rerank_worker.py +++ b/memoryscope/memory/worker/frontend/fuse_rerank_worker.py @@ -1,9 +1,9 @@ from typing import Dict, List -from memory_scope.constants.common_constants import EXTRACT_TIME_DICT, RANKED_MEMORY_NODES, RESULT -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler +from memoryscope.constants.common_constants import EXTRACT_TIME_DICT, RANKED_MEMORY_NODES, RESULT +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler class FuseRerankWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/print_memory_worker.py b/memoryscope/memory/worker/frontend/print_memory_worker.py similarity index 84% rename from memory_scope/memory/worker/frontend/print_memory_worker.py rename to memoryscope/memory/worker/frontend/print_memory_worker.py index c1f034b1..6617c49c 100644 --- a/memory_scope/memory/worker/frontend/print_memory_worker.py +++ b/memoryscope/memory/worker/frontend/print_memory_worker.py @@ -1,11 +1,11 @@ from typing import List -from memory_scope.constants.common_constants import RETRIEVE_MEMORY_NODES, RESULT -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler +from memoryscope.constants.common_constants import RETRIEVE_MEMORY_NODES, RESULT +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler class PrintMemoryWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/print_memory_worker.yaml b/memoryscope/memory/worker/frontend/print_memory_worker.yaml similarity index 100% rename from memory_scope/memory/worker/frontend/print_memory_worker.yaml rename to memoryscope/memory/worker/frontend/print_memory_worker.yaml diff --git a/memory_scope/memory/worker/frontend/read_message_worker.py b/memoryscope/memory/worker/frontend/read_message_worker.py similarity index 75% rename from memory_scope/memory/worker/frontend/read_message_worker.py rename to memoryscope/memory/worker/frontend/read_message_worker.py index 2841ccde..798f1697 100644 --- a/memory_scope/memory/worker/frontend/read_message_worker.py +++ b/memoryscope/memory/worker/frontend/read_message_worker.py @@ -1,6 +1,6 @@ -from memory_scope.constants.common_constants import RESULT -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.constants.common_constants import RESULT +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker class ReadMessageWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/retrieve_memory_worker.py b/memoryscope/memory/worker/frontend/retrieve_memory_worker.py similarity index 92% rename from memory_scope/memory/worker/frontend/retrieve_memory_worker.py rename to memoryscope/memory/worker/frontend/retrieve_memory_worker.py index 67a45b2e..178e870c 100644 --- a/memory_scope/memory/worker/frontend/retrieve_memory_worker.py +++ b/memoryscope/memory/worker/frontend/retrieve_memory_worker.py @@ -1,12 +1,12 @@ from typing import List -from memory_scope.constants.common_constants import QUERY_WITH_TS, RETRIEVE_MEMORY_NODES -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.timer import timer +from memoryscope.constants.common_constants import QUERY_WITH_TS, RETRIEVE_MEMORY_NODES +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.timer import timer class RetrieveMemoryWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/semantic_rank_worker.py b/memoryscope/memory/worker/frontend/semantic_rank_worker.py similarity index 90% rename from memory_scope/memory/worker/frontend/semantic_rank_worker.py rename to memoryscope/memory/worker/frontend/semantic_rank_worker.py index f2521f46..3ea4801a 100644 --- a/memory_scope/memory/worker/frontend/semantic_rank_worker.py +++ b/memoryscope/memory/worker/frontend/semantic_rank_worker.py @@ -1,8 +1,8 @@ from typing import List, Dict -from memory_scope.constants.common_constants import RETRIEVE_MEMORY_NODES, QUERY_WITH_TS, RANKED_MEMORY_NODES -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode +from memoryscope.constants.common_constants import RETRIEVE_MEMORY_NODES, QUERY_WITH_TS, RANKED_MEMORY_NODES +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode class SemanticRankWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/frontend/set_query_worker.py b/memoryscope/memory/worker/frontend/set_query_worker.py similarity index 88% rename from memory_scope/memory/worker/frontend/set_query_worker.py rename to memoryscope/memory/worker/frontend/set_query_worker.py index 80d10937..a94c5675 100644 --- a/memory_scope/memory/worker/frontend/set_query_worker.py +++ b/memoryscope/memory/worker/frontend/set_query_worker.py @@ -1,8 +1,8 @@ import datetime -from memory_scope.constants.common_constants import QUERY_WITH_TS -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.constants.common_constants import QUERY_WITH_TS +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker class SetQueryWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/memory_base_worker.py b/memoryscope/memory/worker/memory_base_worker.py similarity index 92% rename from memory_scope/memory/worker/memory_base_worker.py rename to memoryscope/memory/worker/memory_base_worker.py index aee86d52..8ef58c79 100644 --- a/memory_scope/memory/worker/memory_base_worker.py +++ b/memoryscope/memory/worker/memory_base_worker.py @@ -1,15 +1,15 @@ from abc import ABCMeta from typing import List, Dict, Any -from memory_scope.constants.common_constants import CHAT_MESSAGES, CHAT_KWARGS, MEMORY_HANDLER -from memory_scope.memory.worker.base_worker import BaseWorker -from memory_scope.models.base_model import BaseModel -from memory_scope.scheme.message import Message -from memory_scope.storage.base_memory_store import BaseMemoryStore -from memory_scope.storage.base_monitor import BaseMonitor -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.memory_handler import MemoryHandler -from memory_scope.utils.prompt_handler import PromptHandler +from memoryscope.constants.common_constants import CHAT_MESSAGES, CHAT_KWARGS, MEMORY_HANDLER +from memoryscope.memory.worker.base_worker import BaseWorker +from memoryscope.models.base_model import BaseModel +from memoryscope.scheme.message import Message +from memoryscope.storage.base_memory_store import BaseMemoryStore +from memoryscope.storage.base_monitor import BaseMonitor +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.memory_handler import MemoryHandler +from memoryscope.utils.prompt_handler import PromptHandler class MemoryBaseWorker(BaseWorker, metaclass=ABCMeta): diff --git a/memory_scope/memory/worker/summary/__init__.py b/memoryscope/memory/worker/summary/__init__.py similarity index 100% rename from memory_scope/memory/worker/summary/__init__.py rename to memoryscope/memory/worker/summary/__init__.py diff --git a/memory_scope/memory/worker/summary/get_reflection_subject_worker.py b/memoryscope/memory/worker/summary/get_reflection_subject_worker.py similarity index 88% rename from memory_scope/memory/worker/summary/get_reflection_subject_worker.py rename to memoryscope/memory/worker/summary/get_reflection_subject_worker.py index ee0da56a..1dbb9d6f 100644 --- a/memory_scope/memory/worker/summary/get_reflection_subject_worker.py +++ b/memoryscope/memory/worker/summary/get_reflection_subject_worker.py @@ -1,14 +1,14 @@ from typing import List -from memory_scope.constants.common_constants import NOT_REFLECTED_NODES, INSIGHT_NODES -from memory_scope.constants.language_constants import COMMA_WORD -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import NOT_REFLECTED_NODES, INSIGHT_NODES +from memoryscope.constants.language_constants import COMMA_WORD +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class GetReflectionSubjectWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/summary/get_reflection_subject_worker.yaml b/memoryscope/memory/worker/summary/get_reflection_subject_worker.yaml similarity index 100% rename from memory_scope/memory/worker/summary/get_reflection_subject_worker.yaml rename to memoryscope/memory/worker/summary/get_reflection_subject_worker.yaml diff --git a/memory_scope/memory/worker/summary/long_contra_repeat_worker.py b/memoryscope/memory/worker/summary/long_contra_repeat_worker.py similarity index 91% rename from memory_scope/memory/worker/summary/long_contra_repeat_worker.py rename to memoryscope/memory/worker/summary/long_contra_repeat_worker.py index ca46bf5c..34ce6853 100644 --- a/memory_scope/memory/worker/summary/long_contra_repeat_worker.py +++ b/memoryscope/memory/worker/summary/long_contra_repeat_worker.py @@ -1,14 +1,14 @@ from typing import List, Dict -from memory_scope.constants.common_constants import NOT_UPDATED_NODES, MERGE_OBS_NODES -from memory_scope.constants.language_constants import NONE_WORD, CONTAINED_WORD, CONTRADICTORY_WORD -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import NOT_UPDATED_NODES, MERGE_OBS_NODES +from memoryscope.constants.language_constants import NONE_WORD, CONTAINED_WORD, CONTRADICTORY_WORD +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class LongContraRepeatWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/summary/long_contra_repeat_worker.yaml b/memoryscope/memory/worker/summary/long_contra_repeat_worker.yaml similarity index 100% rename from memory_scope/memory/worker/summary/long_contra_repeat_worker.yaml rename to memoryscope/memory/worker/summary/long_contra_repeat_worker.yaml diff --git a/memory_scope/memory/worker/summary/update_insight_worker.py b/memoryscope/memory/worker/summary/update_insight_worker.py similarity index 94% rename from memory_scope/memory/worker/summary/update_insight_worker.py rename to memoryscope/memory/worker/summary/update_insight_worker.py index 995a4020..498c62e1 100644 --- a/memory_scope/memory/worker/summary/update_insight_worker.py +++ b/memoryscope/memory/worker/summary/update_insight_worker.py @@ -1,14 +1,14 @@ import time from typing import List -from memory_scope.constants.common_constants import INSIGHT_NODES, NOT_UPDATED_NODES, NOT_REFLECTED_NODES -from memory_scope.constants.language_constants import COLON_WORD, NONE_WORD, REPEATED_WORD -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import INSIGHT_NODES, NOT_UPDATED_NODES, NOT_REFLECTED_NODES +from memoryscope.constants.language_constants import COLON_WORD, NONE_WORD, REPEATED_WORD +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class UpdateInsightWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/summary/update_insight_worker.yaml b/memoryscope/memory/worker/summary/update_insight_worker.yaml similarity index 100% rename from memory_scope/memory/worker/summary/update_insight_worker.yaml rename to memoryscope/memory/worker/summary/update_insight_worker.yaml diff --git a/memory_scope/memory/worker/write/__init__.py b/memoryscope/memory/worker/write/__init__.py similarity index 100% rename from memory_scope/memory/worker/write/__init__.py rename to memoryscope/memory/worker/write/__init__.py diff --git a/memory_scope/memory/worker/write/contra_repeat_worker.py b/memoryscope/memory/worker/write/contra_repeat_worker.py similarity index 90% rename from memory_scope/memory/worker/write/contra_repeat_worker.py rename to memoryscope/memory/worker/write/contra_repeat_worker.py index e9ca2094..05008c9c 100644 --- a/memory_scope/memory/worker/write/contra_repeat_worker.py +++ b/memoryscope/memory/worker/write/contra_repeat_worker.py @@ -1,12 +1,12 @@ from typing import List -from memory_scope.constants.common_constants import NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, MERGE_OBS_NODES, TODAY_NODES -from memory_scope.constants.language_constants import NONE_WORD, CONTRADICTORY_WORD, CONTAINED_WORD -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, MERGE_OBS_NODES, TODAY_NODES +from memoryscope.constants.language_constants import NONE_WORD, CONTRADICTORY_WORD, CONTAINED_WORD +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class ContraRepeatWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/write/contra_repeat_worker.yaml b/memoryscope/memory/worker/write/contra_repeat_worker.yaml similarity index 100% rename from memory_scope/memory/worker/write/contra_repeat_worker.yaml rename to memoryscope/memory/worker/write/contra_repeat_worker.yaml diff --git a/memory_scope/memory/worker/write/get_observation_with_time_worker.py b/memoryscope/memory/worker/write/get_observation_with_time_worker.py similarity index 89% rename from memory_scope/memory/worker/write/get_observation_with_time_worker.py rename to memoryscope/memory/worker/write/get_observation_with_time_worker.py index 83e45eff..18a77380 100644 --- a/memory_scope/memory/worker/write/get_observation_with_time_worker.py +++ b/memoryscope/memory/worker/write/get_observation_with_time_worker.py @@ -1,11 +1,11 @@ from typing import List -from memory_scope.constants.common_constants import NEW_OBS_WITH_TIME_NODES -from memory_scope.constants.language_constants import COLON_WORD -from memory_scope.memory.worker.write.get_observation_worker import GetObservationWorker -from memory_scope.scheme.message import Message -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import NEW_OBS_WITH_TIME_NODES +from memoryscope.constants.language_constants import COLON_WORD +from memoryscope.memory.worker.write.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 class GetObservationWithTimeWorker(GetObservationWorker): diff --git a/memory_scope/memory/worker/write/get_observation_with_time_worker.yaml b/memoryscope/memory/worker/write/get_observation_with_time_worker.yaml similarity index 100% rename from memory_scope/memory/worker/write/get_observation_with_time_worker.yaml rename to memoryscope/memory/worker/write/get_observation_with_time_worker.yaml diff --git a/memory_scope/memory/worker/write/get_observation_worker.py b/memoryscope/memory/worker/write/get_observation_worker.py similarity index 92% rename from memory_scope/memory/worker/write/get_observation_worker.py rename to memoryscope/memory/worker/write/get_observation_worker.py index 6ff801ae..9fe97e34 100644 --- a/memory_scope/memory/worker/write/get_observation_worker.py +++ b/memoryscope/memory/worker/write/get_observation_worker.py @@ -1,15 +1,15 @@ from typing import List -from memory_scope.constants.common_constants import NEW_OBS_NODES, TIME_INFER -from memory_scope.constants.language_constants import REPEATED_WORD, NONE_WORD, COLON_WORD, TIME_INFER_WORD -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.scheme.message import Message -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.common_constants import NEW_OBS_NODES, TIME_INFER +from memoryscope.constants.language_constants import REPEATED_WORD, NONE_WORD, COLON_WORD, TIME_INFER_WORD +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.scheme.message import Message +from memoryscope.utils.datetime_handler import DatetimeHandler +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class GetObservationWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/write/get_observation_worker.yaml b/memoryscope/memory/worker/write/get_observation_worker.yaml similarity index 100% rename from memory_scope/memory/worker/write/get_observation_worker.yaml rename to memoryscope/memory/worker/write/get_observation_worker.yaml diff --git a/memory_scope/memory/worker/write/info_filter_worker.py b/memoryscope/memory/worker/write/info_filter_worker.py similarity index 92% rename from memory_scope/memory/worker/write/info_filter_worker.py rename to memoryscope/memory/worker/write/info_filter_worker.py index d3ebcc34..29a84a86 100644 --- a/memory_scope/memory/worker/write/info_filter_worker.py +++ b/memoryscope/memory/worker/write/info_filter_worker.py @@ -1,11 +1,11 @@ from typing import List -from memory_scope.constants.language_constants import COLON_WORD -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.message import Message -from memory_scope.utils.response_text_parser import ResponseTextParser -from memory_scope.utils.tool_functions import prompt_to_msg +from memoryscope.constants.language_constants import COLON_WORD +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.message import Message +from memoryscope.utils.response_text_parser import ResponseTextParser +from memoryscope.utils.tool_functions import prompt_to_msg class InfoFilterWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/write/info_filter_worker.yaml b/memoryscope/memory/worker/write/info_filter_worker.yaml similarity index 100% rename from memory_scope/memory/worker/write/info_filter_worker.yaml rename to memoryscope/memory/worker/write/info_filter_worker.yaml diff --git a/memory_scope/memory/worker/write/load_memory_worker.py b/memoryscope/memory/worker/write/load_memory_worker.py similarity index 91% rename from memory_scope/memory/worker/write/load_memory_worker.py rename to memoryscope/memory/worker/write/load_memory_worker.py index 7d39943e..4a7e60c0 100644 --- a/memory_scope/memory/worker/write/load_memory_worker.py +++ b/memoryscope/memory/worker/write/load_memory_worker.py @@ -1,12 +1,12 @@ from typing import List -from memory_scope.constants.common_constants import NOT_REFLECTED_NODES, NOT_UPDATED_NODES, INSIGHT_NODES, TODAY_NODES -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler -from memory_scope.utils.timer import timer +from memoryscope.constants.common_constants import NOT_REFLECTED_NODES, NOT_UPDATED_NODES, INSIGHT_NODES, TODAY_NODES +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler +from memoryscope.utils.timer import timer class LoadMemoryWorker(MemoryBaseWorker): diff --git a/memory_scope/memory/worker/write/update_memory_worker.py b/memoryscope/memory/worker/write/update_memory_worker.py similarity index 91% rename from memory_scope/memory/worker/write/update_memory_worker.py rename to memoryscope/memory/worker/write/update_memory_worker.py index 4c8a8fba..87b182a7 100644 --- a/memory_scope/memory/worker/write/update_memory_worker.py +++ b/memoryscope/memory/worker/write/update_memory_worker.py @@ -1,10 +1,10 @@ from typing import List -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.memory_type_enum import MemoryTypeEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.utils.datetime_handler import DatetimeHandler +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.memory_type_enum import MemoryTypeEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.utils.datetime_handler import DatetimeHandler class UpdateMemoryWorker(MemoryBaseWorker): diff --git a/memory_scope/models/__init__.py b/memoryscope/models/__init__.py similarity index 100% rename from memory_scope/models/__init__.py rename to memoryscope/models/__init__.py diff --git a/memory_scope/models/base_model.py b/memoryscope/models/base_model.py similarity index 94% rename from memory_scope/models/base_model.py rename to memoryscope/models/base_model.py index 8e0197d1..83b5aa50 100644 --- a/memory_scope/models/base_model.py +++ b/memoryscope/models/base_model.py @@ -3,11 +3,11 @@ import time from abc import abstractmethod, ABCMeta from typing import Any -from memory_scope.enumeration.model_enum import ModelEnum -from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen -from memory_scope.utils.logger import Logger -from memory_scope.utils.registry import Registry -from memory_scope.utils.timer import Timer +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.scheme.model_response import ModelResponse, ModelResponseGen +from memoryscope.utils.logger import Logger +from memoryscope.utils.registry import Registry +from memoryscope.utils.timer import Timer MODEL_REGISTRY = Registry("models") diff --git a/memory_scope/models/dummy_generation_model.py b/memoryscope/models/dummy_generation_model.py similarity index 93% rename from memory_scope/models/dummy_generation_model.py rename to memoryscope/models/dummy_generation_model.py index c56c5549..5949bf8e 100644 --- a/memory_scope/models/dummy_generation_model.py +++ b/memoryscope/models/dummy_generation_model.py @@ -3,11 +3,11 @@ from typing import List from llama_index.core.base.llms.types import ChatMessage -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.message import Message -from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.models.base_model import BaseModel, MODEL_REGISTRY +from memoryscope.scheme.message import Message +from memoryscope.scheme.model_response import ModelResponse, ModelResponseGen class DummyGenerationModel(BaseModel): diff --git a/memory_scope/models/llama_index_embedding_model.py b/memoryscope/models/llama_index_embedding_model.py similarity index 94% rename from memory_scope/models/llama_index_embedding_model.py rename to memoryscope/models/llama_index_embedding_model.py index 6ed455bd..822f619d 100644 --- a/memory_scope/models/llama_index_embedding_model.py +++ b/memoryscope/models/llama_index_embedding_model.py @@ -2,9 +2,9 @@ from typing import List from llama_index.embeddings.dashscope import DashScopeEmbedding -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 +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.models.base_model import BaseModel, MODEL_REGISTRY +from memoryscope.scheme.model_response import ModelResponse class LlamaIndexEmbeddingModel(BaseModel): diff --git a/memory_scope/models/llama_index_generation_model.py b/memoryscope/models/llama_index_generation_model.py similarity index 93% rename from memory_scope/models/llama_index_generation_model.py rename to memoryscope/models/llama_index_generation_model.py index cc0d15b4..63a249d9 100644 --- a/memory_scope/models/llama_index_generation_model.py +++ b/memoryscope/models/llama_index_generation_model.py @@ -3,11 +3,11 @@ from typing import List from llama_index.core.base.llms.types import ChatMessage, ChatResponse, CompletionResponse 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.message import Message -from memory_scope.scheme.model_response import ModelResponse, ModelResponseGen +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.models.base_model import BaseModel, MODEL_REGISTRY +from memoryscope.scheme.message import Message +from memoryscope.scheme.model_response import ModelResponse, ModelResponseGen class LlamaIndexGenerationModel(BaseModel): diff --git a/memory_scope/models/llama_index_rank_model.py b/memoryscope/models/llama_index_rank_model.py similarity index 94% rename from memory_scope/models/llama_index_rank_model.py rename to memoryscope/models/llama_index_rank_model.py index 62210183..9e74cdbd 100644 --- a/memory_scope/models/llama_index_rank_model.py +++ b/memoryscope/models/llama_index_rank_model.py @@ -4,9 +4,9 @@ from llama_index.core.data_structs import Node from llama_index.core.schema import NodeWithScore from llama_index.postprocessor.dashscope_rerank import DashScopeRerank -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 +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.models.base_model import BaseModel, MODEL_REGISTRY +from memoryscope.scheme.model_response import ModelResponse class LlamaIndexRankModel(BaseModel): diff --git a/memory_scope/scheme/__init__.py b/memoryscope/scheme/__init__.py similarity index 100% rename from memory_scope/scheme/__init__.py rename to memoryscope/scheme/__init__.py diff --git a/memory_scope/scheme/memory_node.py b/memoryscope/scheme/memory_node.py similarity index 100% rename from memory_scope/scheme/memory_node.py rename to memoryscope/scheme/memory_node.py diff --git a/memory_scope/scheme/message.py b/memoryscope/scheme/message.py similarity index 100% rename from memory_scope/scheme/message.py rename to memoryscope/scheme/message.py diff --git a/memory_scope/scheme/model_response.py b/memoryscope/scheme/model_response.py similarity index 94% rename from memory_scope/scheme/model_response.py rename to memoryscope/scheme/model_response.py index 294b6a8a..b5a1d84f 100644 --- a/memory_scope/scheme/model_response.py +++ b/memoryscope/scheme/model_response.py @@ -3,8 +3,8 @@ from typing import Generator, List, Dict, Any from pydantic import BaseModel, Field -from memory_scope.enumeration.model_enum import ModelEnum -from memory_scope.scheme.message import Message +from memoryscope.enumeration.model_enum import ModelEnum +from memoryscope.scheme.message import Message class ModelResponse(BaseModel): diff --git a/memory_scope/storage/__init__.py b/memoryscope/storage/__init__.py similarity index 100% rename from memory_scope/storage/__init__.py rename to memoryscope/storage/__init__.py diff --git a/memory_scope/storage/base_memory_store.py b/memoryscope/storage/base_memory_store.py similarity index 98% rename from memory_scope/storage/base_memory_store.py rename to memoryscope/storage/base_memory_store.py index f1335e53..f39305fb 100644 --- a/memory_scope/storage/base_memory_store.py +++ b/memoryscope/storage/base_memory_store.py @@ -1,7 +1,7 @@ from abc import ABCMeta, abstractmethod from typing import Dict, List -from memory_scope.scheme.memory_node import MemoryNode +from memoryscope.scheme.memory_node import MemoryNode class BaseMemoryStore(metaclass=ABCMeta): diff --git a/memory_scope/storage/base_monitor.py b/memoryscope/storage/base_monitor.py similarity index 100% rename from memory_scope/storage/base_monitor.py rename to memoryscope/storage/base_monitor.py diff --git a/memory_scope/storage/dummy_memory_store.py b/memoryscope/storage/dummy_memory_store.py similarity index 88% rename from memory_scope/storage/dummy_memory_store.py rename to memoryscope/storage/dummy_memory_store.py index d7b1c42a..fa6ab1fd 100644 --- a/memory_scope/storage/dummy_memory_store.py +++ b/memoryscope/storage/dummy_memory_store.py @@ -1,8 +1,8 @@ from typing import Dict, List -from memory_scope.models.base_model import BaseModel -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.storage.base_memory_store import BaseMemoryStore +from memoryscope.models.base_model import BaseModel +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.storage.base_memory_store import BaseMemoryStore class DummyMemoryStore(BaseMemoryStore): diff --git a/memory_scope/storage/dummy_monitor.py b/memoryscope/storage/dummy_monitor.py similarity index 93% rename from memory_scope/storage/dummy_monitor.py rename to memoryscope/storage/dummy_monitor.py index 735f643e..4818e0fb 100644 --- a/memory_scope/storage/dummy_monitor.py +++ b/memoryscope/storage/dummy_monitor.py @@ -1,4 +1,4 @@ -from memory_scope.storage.base_monitor import BaseMonitor +from memoryscope.storage.base_monitor import BaseMonitor class DummyMonitor(BaseMonitor): diff --git a/memory_scope/storage/llama_index_es_memory_store.py b/memoryscope/storage/llama_index_es_memory_store.py similarity index 94% rename from memory_scope/storage/llama_index_es_memory_store.py rename to memoryscope/storage/llama_index_es_memory_store.py index 6fb6e510..b8e87fd3 100644 --- a/memory_scope/storage/llama_index_es_memory_store.py +++ b/memoryscope/storage/llama_index_es_memory_store.py @@ -5,11 +5,11 @@ from typing import Dict, List, Any, Optional, cast from llama_index.core import VectorStoreIndex from llama_index.core.schema import TextNode, NodeWithScore, QueryBundle -from memory_scope.models.base_model import BaseModel -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.storage.base_memory_store import BaseMemoryStore -from memory_scope.storage.llama_index_sync_elasticsearch import SyncElasticsearchStore, _AsyncDenseVectorStrategy, _to_elasticsearch_filter -from memory_scope.utils.logger import Logger +from memoryscope.models.base_model import BaseModel +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.storage.base_memory_store import BaseMemoryStore +from memoryscope.storage.llama_index_sync_elasticsearch import SyncElasticsearchStore, _AsyncDenseVectorStrategy, _to_elasticsearch_filter +from memoryscope.utils.logger import Logger class LlamaIndexEsMemoryStore(BaseMemoryStore): diff --git a/memory_scope/storage/llama_index_sync_elasticsearch.py b/memoryscope/storage/llama_index_sync_elasticsearch.py similarity index 100% rename from memory_scope/storage/llama_index_sync_elasticsearch.py rename to memoryscope/storage/llama_index_sync_elasticsearch.py diff --git a/memory_scope/utils/__init__.py b/memoryscope/utils/__init__.py similarity index 100% rename from memory_scope/utils/__init__.py rename to memoryscope/utils/__init__.py diff --git a/memory_scope/utils/datetime_handler.py b/memoryscope/utils/datetime_handler.py similarity index 98% rename from memory_scope/utils/datetime_handler.py rename to memoryscope/utils/datetime_handler.py index 81ea671c..6f2d6d2f 100644 --- a/memory_scope/utils/datetime_handler.py +++ b/memoryscope/utils/datetime_handler.py @@ -1,9 +1,9 @@ import datetime import re -from memory_scope.constants.language_constants import WEEKDAYS, DATATIME_WORD_LIST, MONTH_DICT -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger +from memoryscope.constants.language_constants import WEEKDAYS, DATATIME_WORD_LIST, MONTH_DICT +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger class DatetimeHandler(object): diff --git a/memory_scope/utils/global_context.py b/memoryscope/utils/global_context.py similarity index 68% rename from memory_scope/utils/global_context.py rename to memoryscope/utils/global_context.py index 5bab0afb..81ac9e07 100644 --- a/memory_scope/utils/global_context.py +++ b/memoryscope/utils/global_context.py @@ -1,12 +1,12 @@ from concurrent.futures import ThreadPoolExecutor from typing import Dict, Any -from memory_scope.chat.base_memory_chat import BaseMemoryChat -from memory_scope.enumeration.language_enum import LanguageEnum -from memory_scope.memory.service.base_memory_service import BaseMemoryService -from memory_scope.models.base_model import BaseModel -from memory_scope.storage.base_memory_store import BaseMemoryStore -from memory_scope.storage.base_monitor import BaseMonitor +from memoryscope.chat.base_memory_chat import BaseMemoryChat +from memoryscope.enumeration.language_enum import LanguageEnum +from memoryscope.memory.service.base_memory_service import BaseMemoryService +from memoryscope.models.base_model import BaseModel +from memoryscope.storage.base_memory_store import BaseMemoryStore +from memoryscope.storage.base_monitor import BaseMonitor class GlobalContext(object): diff --git a/memory_scope/utils/logger.py b/memoryscope/utils/logger.py similarity index 100% rename from memory_scope/utils/logger.py rename to memoryscope/utils/logger.py diff --git a/memory_scope/utils/memory_handler.py b/memoryscope/utils/memory_handler.py similarity index 95% rename from memory_scope/utils/memory_handler.py rename to memoryscope/utils/memory_handler.py index 80c41adf..b554401c 100644 --- a/memory_scope/utils/memory_handler.py +++ b/memoryscope/utils/memory_handler.py @@ -1,11 +1,11 @@ from typing import Dict, List -from memory_scope.enumeration.action_status_enum import ActionStatusEnum -from memory_scope.enumeration.store_status_enum import StoreStatusEnum -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.storage.base_memory_store import BaseMemoryStore -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger +from memoryscope.enumeration.action_status_enum import ActionStatusEnum +from memoryscope.enumeration.store_status_enum import StoreStatusEnum +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.storage.base_memory_store import BaseMemoryStore +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger class MemoryHandler(object): diff --git a/memory_scope/utils/prompt_handler.py b/memoryscope/utils/prompt_handler.py similarity index 98% rename from memory_scope/utils/prompt_handler.py rename to memoryscope/utils/prompt_handler.py index 8fdecdeb..f2e9b380 100644 --- a/memory_scope/utils/prompt_handler.py +++ b/memoryscope/utils/prompt_handler.py @@ -4,7 +4,7 @@ from typing import Dict import yaml -from memory_scope.utils.global_context import G_CONTEXT +from memoryscope.utils.global_context import G_CONTEXT class PromptHandler(object): diff --git a/memory_scope/utils/registry.py b/memoryscope/utils/registry.py similarity index 100% rename from memory_scope/utils/registry.py rename to memoryscope/utils/registry.py diff --git a/memory_scope/utils/response_text_parser.py b/memoryscope/utils/response_text_parser.py similarity index 93% rename from memory_scope/utils/response_text_parser.py rename to memoryscope/utils/response_text_parser.py index 52d5b931..aa064528 100644 --- a/memory_scope/utils/response_text_parser.py +++ b/memoryscope/utils/response_text_parser.py @@ -1,9 +1,9 @@ from typing import List import re -from memory_scope.constants.language_constants import NONE_WORD -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger +from memoryscope.constants.language_constants import NONE_WORD +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger class ResponseTextParser(object): diff --git a/memory_scope/utils/timer.py b/memoryscope/utils/timer.py similarity index 98% rename from memory_scope/utils/timer.py rename to memoryscope/utils/timer.py index 1a7cefa3..f63ff880 100644 --- a/memory_scope/utils/timer.py +++ b/memoryscope/utils/timer.py @@ -1,7 +1,7 @@ import time from typing import Literal -from memory_scope.utils.logger import Logger +from memoryscope.utils.logger import Logger TIME_LOG_TYPE = Literal["end", "wrap", "none"] diff --git a/memory_scope/utils/tool_functions.py b/memoryscope/utils/tool_functions.py similarity index 97% rename from memory_scope/utils/tool_functions.py rename to memoryscope/utils/tool_functions.py index b3f5cd28..2fd432c1 100644 --- a/memory_scope/utils/tool_functions.py +++ b/memoryscope/utils/tool_functions.py @@ -9,8 +9,8 @@ from typing import List import pyfiglet from termcolor import colored -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.scheme.message import Message +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.scheme.message import Message ALL_COLORS = ["red", "green", "yellow", "blue", "magenta", "cyan", "light_grey", "light_red", "light_green", "light_yellow", "light_blue", "light_magenta", "light_cyan", "white"] @@ -48,7 +48,7 @@ def camelcase_to_underscore(name: str) -> str: def init_instance_by_config(config: dict, - default_class_path: str = "memory_scope", + default_class_path: str = "memoryscope", suffix_name: str = "", **kwargs): """ diff --git a/tests/models/test_models_lli_embedding.py b/tests/models/test_models_lli_embedding.py index c71236f5..f21d0bc7 100644 --- a/tests/models/test_models_lli_embedding.py +++ b/tests/models/test_models_lli_embedding.py @@ -5,8 +5,8 @@ sys.path.append(".") # noqa: E402 import asyncio import unittest -from memory_scope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel -from memory_scope.utils.logger import Logger +from memoryscope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel +from memoryscope.utils.logger import Logger class TestLLIEmbedding(unittest.TestCase): diff --git a/tests/models/test_models_lli_generation.py b/tests/models/test_models_lli_generation.py index 8757e13f..474851b4 100644 --- a/tests/models/test_models_lli_generation.py +++ b/tests/models/test_models_lli_generation.py @@ -5,9 +5,9 @@ sys.path.append(".") # noqa: E402 import unittest import time import asyncio -from memory_scope.scheme.message import Message -from memory_scope.models.llama_index_generation_model import LlamaIndexGenerationModel -from memory_scope.utils.logger import Logger +from memoryscope.scheme.message import Message +from memoryscope.models.llama_index_generation_model import LlamaIndexGenerationModel +from memoryscope.utils.logger import Logger class TestLLILLM(unittest.TestCase): diff --git a/tests/models/test_models_lli_rank.py b/tests/models/test_models_lli_rank.py index 7c5efa7e..25c59fde 100644 --- a/tests/models/test_models_lli_rank.py +++ b/tests/models/test_models_lli_rank.py @@ -1,7 +1,7 @@ import asyncio import unittest -from memory_scope.models.llama_index_rank_model import LlamaIndexRankModel +from memoryscope.models.llama_index_rank_model import LlamaIndexRankModel class TestLLIReRank(unittest.TestCase): diff --git a/tests/operations/test_interface.py b/tests/operations/test_interface.py index 5a92f587..d89efb93 100644 --- a/tests/operations/test_interface.py +++ b/tests/operations/test_interface.py @@ -1,5 +1,5 @@ -from memory_scope.cli import MemoryScope -from memory_scope.scheme.message import Message +from memoryscope.cli import MemoryScope +from memoryscope.scheme.message import Message ms = MemoryScope().load_config("config/demo_config_no_stream.yaml") memory_service = ms.default_service diff --git a/tests/storages/test_storages_lli_es.py b/tests/storages/test_storages_lli_es.py index 2033f54c..791286aa 100644 --- a/tests/storages/test_storages_lli_es.py +++ b/tests/storages/test_storages_lli_es.py @@ -1,8 +1,8 @@ import unittest -from memory_scope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.storage.llama_index_es_memory_store import LlamaIndexEsMemoryStore +from memoryscope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.storage.llama_index_es_memory_store import LlamaIndexEsMemoryStore class TestLlamaIndexElasticSearchStore(unittest.TestCase): diff --git a/tests/storages/test_storages_lli_synces.py b/tests/storages/test_storages_lli_synces.py index 89d7f15d..8186179a 100644 --- a/tests/storages/test_storages_lli_synces.py +++ b/tests/storages/test_storages_lli_synces.py @@ -1,8 +1,8 @@ import unittest -from memory_scope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.storage.llama_index_es_memory_store import LlamaIndexEsMemoryStore +from memoryscope.models.llama_index_embedding_model import LlamaIndexEmbeddingModel +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.storage.llama_index_es_memory_store import LlamaIndexEsMemoryStore class TestLlamaIndexElasticSearchStore(unittest.TestCase): diff --git a/tests/worker/test_workers_cn.py b/tests/worker/test_workers_cn.py index 28843299..a8114b35 100644 --- a/tests/worker/test_workers_cn.py +++ b/tests/worker/test_workers_cn.py @@ -1,16 +1,16 @@ import datetime import unittest -from memory_scope.cli import MemoryScope -from memory_scope.constants.common_constants import CHAT_MESSAGES, NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, \ +from memoryscope.cli import MemoryScope +from memoryscope.constants.common_constants import CHAT_MESSAGES, NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, \ MERGE_OBS_NODES, QUERY_WITH_TS, EXTRACT_TIME_DICT, NOT_REFLECTED_NODES, INSIGHT_NODES, NOT_UPDATED_NODES -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.scheme.message import Message -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger -from memory_scope.utils.tool_functions import init_instance_by_config +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.scheme.message import Message +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger +from memoryscope.utils.tool_functions import init_instance_by_config class TestWorkersCn(unittest.TestCase): diff --git a/tests/worker/test_workers_en.py b/tests/worker/test_workers_en.py index 7d7fd14b..6b1c012a 100644 --- a/tests/worker/test_workers_en.py +++ b/tests/worker/test_workers_en.py @@ -1,16 +1,16 @@ import datetime import unittest -from memory_scope.cli import MemoryScope -from memory_scope.constants.common_constants import CHAT_MESSAGES, NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, \ +from memoryscope.cli import MemoryScope +from memoryscope.constants.common_constants import CHAT_MESSAGES, NEW_OBS_NODES, NEW_OBS_WITH_TIME_NODES, \ MERGE_OBS_NODES, QUERY_WITH_TS, EXTRACT_TIME_DICT, NOT_REFLECTED_NODES, INSIGHT_NODES, NOT_UPDATED_NODES -from memory_scope.enumeration.message_role_enum import MessageRoleEnum -from memory_scope.memory.worker.memory_base_worker import MemoryBaseWorker -from memory_scope.scheme.memory_node import MemoryNode -from memory_scope.scheme.message import Message -from memory_scope.utils.global_context import G_CONTEXT -from memory_scope.utils.logger import Logger -from memory_scope.utils.tool_functions import init_instance_by_config +from memoryscope.enumeration.message_role_enum import MessageRoleEnum +from memoryscope.memory.worker.memory_base_worker import MemoryBaseWorker +from memoryscope.scheme.memory_node import MemoryNode +from memoryscope.scheme.message import Message +from memoryscope.utils.global_context import G_CONTEXT +from memoryscope.utils.logger import Logger +from memoryscope.utils.tool_functions import init_instance_by_config class TestWorkersEn(unittest.TestCase):