From 34d06868e2d8937124947590f5726892b8d7652a Mon Sep 17 00:00:00 2001
From: "jinli.yl" <jinli.yl@alibaba-inc.com>
Date: Tue, 2 Jul 2024 19:47:15 +0800
Subject: [PATCH] [dev] del global key in config & modify workflow

---
 config/demo_config.yaml                       | 44 +++++++++----------
 .../models/llama_index_generation_model.py    |  2 -
 memory_scope/utils/tool_functions.py          |  3 --
 3 files changed, 21 insertions(+), 28 deletions(-)

diff --git a/config/demo_config.yaml b/config/demo_config.yaml
index 600cf834..1c45bce4 100644
--- a/config/demo_config.yaml
+++ b/config/demo_config.yaml
@@ -1,8 +1,6 @@
 global_config:
   language: cn
   max_workers: 5
-  dash_scope_apikey:
-  open_ai_apikey:
 memory_chat:
   cli_memory_chat:
     class: chat.cli_memory_chat
@@ -23,7 +21,7 @@ memory_service:
         description: "read session messages of the user"
       read_memory:
         class: memory.operation.read_memory
-        workflow: dummy_worker
+        workflow: set_query_worker,[extract_time_worker|retrieve_store_worker,semantic_rank_worker],fuse_rerank_worker
         description: "read related memories of the user"
       list_memory:
         class: memory.operation.read_memory
@@ -39,26 +37,6 @@ memory_service:
         workflow: dummy_worker
         description: "summary observation memories of the user"
         interval_time: 300
-models:
-  dashscope_generation:
-    class: models.llama_index_generation_model
-    module_name: dashscope_generation
-    model_name: qwen-max
-  dashscope_embedding:
-    class: models.llama_index_embedding_model
-    module_name: dashscope_embedding
-    model_name: text-embedding-v2
-  dashscope_rank:
-    class: models.llama_index_rank_model
-    module_name: dashscope_rank
-    model_name: gte-rerank
-vector_store:
-  class: storage.llama_index_elastic_search_store
-  embedding_model: dashscope_embedding
-  index_name: memory_index
-  es_url: http://localhost:9200
-monitor:
-  class: storage.dummy_monitor
 worker:
   dummy_worker:
     class: memory.worker.dummy_worker
@@ -95,3 +73,23 @@ worker:
     generation_model_top_k: 1
     today_obs_top_k: 30
     contra_repeat_max_count: 50
+models:
+  dashscope_generation:
+    class: models.llama_index_generation_model
+    module_name: dashscope_generation
+    model_name: qwen-max
+  dashscope_embedding:
+    class: models.llama_index_embedding_model
+    module_name: dashscope_embedding
+    model_name: text-embedding-v2
+  dashscope_rank:
+    class: models.llama_index_rank_model
+    module_name: dashscope_rank
+    model_name: gte-rerank
+vector_store:
+  class: storage.llama_index_elastic_search_store
+  embedding_model: dashscope_embedding
+  index_name: memory_index
+  es_url: http://localhost:9200
+monitor:
+  class: storage.dummy_monitor
\ No newline at end of file
diff --git a/memory_scope/models/llama_index_generation_model.py b/memory_scope/models/llama_index_generation_model.py
index a38c8ffd..a23bf756 100644
--- a/memory_scope/models/llama_index_generation_model.py
+++ b/memory_scope/models/llama_index_generation_model.py
@@ -78,5 +78,3 @@ class LlamaIndexGenerationModel(BaseModel):
             response = await self.model.achat(**self.data)
         results.raw = response
         return results
-
-        raise NotImplementedError
diff --git a/memory_scope/utils/tool_functions.py b/memory_scope/utils/tool_functions.py
index f4ca8b3d..11bfd727 100644
--- a/memory_scope/utils/tool_functions.py
+++ b/memory_scope/utils/tool_functions.py
@@ -3,15 +3,12 @@ import random
 import re
 import time
 from copy import deepcopy
-from datetime import datetime
 from importlib import import_module
 
 import pyfiglet
 from termcolor import colored, COLORS
 
-from memory_scope.constants.language_constants import WEEKDAYS
 from memory_scope.enumeration.message_role_enum import MessageRoleEnum
-from memory_scope.utils.global_context import G_CONTEXT
 
 
 def underscore_to_camelcase(name: str, is_first_title: bool = True):