diff --git a/config/config.json b/config/config.json new file mode 100644 index 00000000..9f4d9316 --- /dev/null +++ b/config/config.json @@ -0,0 +1,13 @@ +{ + "thread_pool_max_count": "", + "worker": "config/worker.json", + "pipeline": { + "summary_short": "", + "summary_long": "", + "retrieve": "" + }, + "model_embedding": "config/model/dash_embedding.json", + "model_rerank": "config/model/dash_rerank.json", + "model_generate": "config/model/dash_generate.json", + "db": "" +} \ No newline at end of file diff --git a/config/user.json b/config/db/__init__.py similarity index 100% rename from config/user.json rename to config/db/__init__.py diff --git a/config/db/es.json b/config/db/es.json new file mode 100644 index 00000000..7a73a41b --- /dev/null +++ b/config/db/es.json @@ -0,0 +1,2 @@ +{ +} \ No newline at end of file diff --git a/config/global_config.json b/config/global_config.json deleted file mode 100644 index 14fe392a..00000000 --- a/config/global_config.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "thread_pool_max_count": "", - "worker": "config/worker.json", - "prompt": "config/prompt.json", - "pipeline": { - "summary_short": "", - "summary_long": "", - "retrieve": "" - }, - "models": "config/model/dash.json" -} \ No newline at end of file diff --git a/config/model/dash.json b/config/model/dash.json deleted file mode 100644 index 73115431..00000000 --- a/config/model/dash.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "embedding": "", - "generate": "", - "rerank": "", - "es": "" -} \ No newline at end of file diff --git a/config/model/dash_embedding.json b/config/model/dash_embedding.json new file mode 100644 index 00000000..0e0dcd23 --- /dev/null +++ b/config/model/dash_embedding.json @@ -0,0 +1,3 @@ +{ + +} \ No newline at end of file diff --git a/config/prompt.json b/config/prompt.json deleted file mode 100644 index 1b5909d5..00000000 --- a/config/prompt.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "info_filter_system": "", - "info_filter_user_query": "", - "get_observation_system": "", - "get_observation_user_query": "", - "get_observation_with_time_system": "", - "get_observation_with_time_few_shot": "", - "get_observation_with_time_user_query": "", - "contra_repeat_system": "", - "contra_repeat_few_shot": "", - "contra_repeat_user_query": "", - "get_reflect_system": "", - "get_reflect_few_shot": "", - "get_reflect_user_query": "", - "get_insight_system": "", - "get_insight_few_shot": "", - "get_insight_user_query": "", - "update_plural_profile_system": "", - "update_plural_profile_few_shot": "", - "update_plural_profile_user_query": "", - "update_unique_profile_system": "", - "update_unique_profile_few_shot": "", - "update_unique_profile_user_query": "", - "update_insight_system": "", - "update_insight_few_shot": "", - "update_insight_user_query": "" -} \ No newline at end of file diff --git a/config/worker.json b/config/worker.json index 90796974..a19d5d10 100644 --- a/config/worker.json +++ b/config/worker.json @@ -6,12 +6,15 @@ "es_insight_top_k": 128 } }, - "EsKeywordWorker": { + "es_keyword": { + "name": "EsKeywordWorker", + "path": "memory_scope/worker", + "es_keyword_top_k": 10 + }, + "es_keyword2": { "module_name": "EsKeywordWorker", "module_path": "memory_scope/worker", - "kwargs": { - "es_keyword_top_k": 10 - } + "es_keyword_top_k": 10 }, "EsNewObsWorker": { "module_name": "EsNewObsWorker",