From 31b2f80d57271d3d780023e8ed3014f194cbdaeb Mon Sep 17 00:00:00 2001
From: "jinli.yl" <jinli.yl@alibaba-inc.com>
Date: Tue, 18 Jun 2024 18:00:15 +0800
Subject: [PATCH] [dev] move config dir

---
 config/worker.json             | 11 +++---
 memory_scope/{cli => }/cli.py  |  0
 memory_scope/cli/__init__.py   |  0
 memory_scope/cli/cli_config.py | 66 ----------------------------------
 memory_scope/config.py         | 36 +++++++++++++++++++
 5 files changed, 41 insertions(+), 72 deletions(-)
 rename memory_scope/{cli => }/cli.py (100%)
 delete mode 100644 memory_scope/cli/__init__.py
 delete mode 100644 memory_scope/cli/cli_config.py
 create mode 100644 memory_scope/config.py

diff --git a/config/worker.json b/config/worker.json
index a19d5d10..bcce1b54 100644
--- a/config/worker.json
+++ b/config/worker.json
@@ -59,12 +59,11 @@
     "ExtractTimeWorker": {
         "module_name": "ExtractTimeWorker",
         "module_path": "memory_scope/worker",
-        "kwargs": {
-            "parse_time_model": "qwen_1_8_parse_time_service",
-            "parse_time_max_token": 100,
-            "parse_time_temperature": 0.6,
-            "parse_time_top_k": 1
-        }
+        "parse_time_model": "",
+        "parse_time_model": "qwen_1_8_parse_time_service",
+        "parse_time_max_token": 100,
+        "parse_time_temperature": 0.6,
+        "parse_time_top_k": 1,
     },
     "InfoFilterWorker": {
         "module_name": "InfoFilterWorker",
diff --git a/memory_scope/cli/cli.py b/memory_scope/cli.py
similarity index 100%
rename from memory_scope/cli/cli.py
rename to memory_scope/cli.py
diff --git a/memory_scope/cli/__init__.py b/memory_scope/cli/__init__.py
deleted file mode 100644
index e69de29b..00000000
diff --git a/memory_scope/cli/cli_config.py b/memory_scope/cli/cli_config.py
deleted file mode 100644
index 8812cec3..00000000
--- a/memory_scope/cli/cli_config.py
+++ /dev/null
@@ -1,66 +0,0 @@
-
-import json
-from pydantic import BaseModel
-
-from models.dash_embedding_client import DashEmbeddingClient
-from models.dash_generate_client import DashGenerateClient
-from models.dash_rerank_client import DashReRankClient
-from models.elastic_search_client import ElasticSearchClient
-from pipeline.memory_service import MemoryService
-from enumeration.memory_type_enum import MemoryTypeEnum
-from utils.tool_functions import init_instance_by_config
-
-class Wrapper:
-    """Wrapper class for anything that needs to set up during init"""
-
-    def __init__(self):
-        self._provider = None
-
-    def register(self, provider):
-        self._provider = provider
-
-    def __getattr__(self, key):
-        if self.__dict__.get("_provider", None) is None:
-            raise AttributeError("Please run init() first using qlib")
-        return getattr(self._provider, key)
-
-class Config(BaseModel):
-    thread_pool_max_count: int = 5
-    pipeline: dict = {
-        "retrive": """
-parse_params,es.load_profile,[retrieve.extract_time|es.es_similar|es.es_keyword],retrieve.semantic_rank,retrieve.fuse_rerank
-""".strip(),
-        "summary_long": """
-parse_params,summary_short.info_filter,[es.es_today_obs|summary_short.get_observation|summary_short.get_observation_with_time],summary_short.contra_repeat,memory_store
-""".strip(),
-        "summary_short": """
-parse_params,[es.load_profile|es.es_new_obs|es.es_insight],[summary_long.update_insight|summary_long.get_reflection,summary_long.get_insight|summary_long.update_profile],summary_long.summary_collect,memory_store
-""".strip()
-    }
-    model_embedding = _default_embedding_client
-    model_generate = _default_generate_client
-    model_rerank = _default_rerank_client
-    db = _default_es_client
-
-class UserConfig(BaseModel):
-    memory_id: str = ""
-
-C = Wrapper()
-
-def init(config_path):
-    config = json.loads(config_path)
-    C.register(Config(**config))
-
-    # ## register modules
-    C.model_embedding = init_instance_by_config(C.model_embedding)
-    C.model_generate = init_instance_by_config(C.model_generate)
-    C.model_rerank = init_instance_by_config(C.model_rerank)
-    C.db = init_instance_by_config(C.db)
-
-    ## register workers
-    C.worker = json.loads(C.worker)
-
-    ## register services
-    for k,v in C.pipeline.items():
-        C.pipeline[k] = MemoryService(k)
-
diff --git a/memory_scope/config.py b/memory_scope/config.py
new file mode 100644
index 00000000..dfca733b
--- /dev/null
+++ b/memory_scope/config.py
@@ -0,0 +1,36 @@
+
+import json
+
+from pipeline.memory_service import MemoryService
+from utils.tool_functions import init_instance_by_config
+
+
+class Wrapper:
+    """Wrapper class for anything that needs to set up during init"""
+
+    def __init__(self):
+        self._provider = None
+
+    def register(self, provider):
+        self._provider = provider
+
+    def __getattr__(self, key: str):
+        if self.__dict__.get("_provider", None) is None:
+            raise AttributeError("Please run __init__ first!")
+        return getattr(self._provider, key)
+
+
+C = Wrapper()
+
+
+def init(config_path: str):
+    config = json.loads(config_path)
+    C.register(config)
+
+    ## register workers
+    C.worker = json.loads(C.worker)
+
+    ## register services
+    for k,v in C.pipeline.items():
+        C.pipeline[k] = MemoryService(k)
+