delete file

Author: peng3307165

.gitignore

@@ -135,7 +135,8 @@ dmypy.json
 /embedding_npy
 /flask_server
 *.bin
-**/modelcache_serving.py
 **/maya_embedding_service
 
-*.ini
+*.ini
+
+multicache_serving.py

modelcache/core.py

@@ -35,10 +35,7 @@ def init(
             cache_enable_func=cache_all,
             query_pre_embedding_func=None,
             insert_pre_embedding_func=None,
-            mm_query_pre_embedding_func=None,
-            mm_insert_pre_embedding_func=None,
             embedding_func=string_embedding,
-            embedding_concurrent_func=string_embedding,
             data_manager: DataManager = get_data_manager(),
             similarity_evaluation=ExactMatchEvaluation(),
             post_process_messages_func=first,
@@ -49,10 +46,7 @@ def init(
         self.cache_enable_func = cache_enable_func
         self.query_pre_embedding_func = query_pre_embedding_func
         self.insert_pre_embedding_func = insert_pre_embedding_func
-        self.mm_query_pre_embedding_func = mm_query_pre_embedding_func
-        self.mm_insert_pre_embedding_func = mm_insert_pre_embedding_func
         self.embedding_func = embedding_func
-        self.embedding_concurrent_func = embedding_concurrent_func
         self.data_manager: DataManager = data_manager
         self.similarity_evaluation = similarity_evaluation
         self.post_process_messages_func = post_process_messages_func

modelcache/manager/scalar_data/base.py

@@ -94,10 +94,6 @@ class CacheStorage(metaclass=ABCMeta):
     def create(self):
         pass
 
-    @abstractmethod
-    def batch_iat_insert(self, all_data: List[CacheData]):
-        pass
-
     @abstractmethod
     def insert_query_resp(self, query_resp, **kwargs):
         pass

modelcache/manager/scalar_data/sql_storage.py

@@ -40,7 +40,6 @@ def _insert(self, data: List):
         embedding_data = data[2]
         model = data[3]
         answer_type = 0
-        print('embedding_data: {}'.format(embedding_data))
         embedding_data = embedding_data.tobytes()
 
         table_name = "cache_codegpt_answer"

modelcache/processor/pre.py

@@ -108,14 +108,3 @@ def multi_analysis(dialog_str):
 
     # 输出结果
     return result_list
-
-
-def mm_insert_dict(data: Dict[str, Any], **_: Dict[str, Any]) -> Any:
-    print('chat_info: {}'.format(data.get("chat_info")))
-    query_dict = data.get("chat_info")[-1]['query']
-    return query_dict
-
-
-def mm_query_dict(data: Dict[str, Any], **_: Dict[str, Any]) -> Any:
-    query_dict = data.get("query")
-    return query_dict

modelcache/utils/index_util.py

@@ -9,26 +9,26 @@ def get_index_prefix(model):
     return 'prefix' + '_' + model
 
 
-def get_mm_index_name(model, mm_type):
-    print('mm_type: {}'.format(mm_type))
-    if mm_type not in ['IMG_TEXT', 'mm', 'IMG', 'image', 'TEXT', 'text']:
-        raise ValueError('mm_type is not normal!')
-    if mm_type == 'IMG_TEXT':
-        mm_type = 'mm'
-    elif mm_type == 'IMG':
-        mm_type = 'image'
-    elif mm_type == 'TEXT':
-        mm_type = 'text'
-    return 'multicache' + '_' + model + '_' + mm_type
-
-
-def get_mm_index_prefix(model, mm_type):
-    if mm_type not in ['IMG_TEXT', 'mm', 'IMG', 'image', 'TEXT', 'text']:
-        raise ValueError('iat_type is not normal!')
-    if mm_type == 'IMG_TEXT':
-        mm_type = 'mm'
-    elif mm_type == 'IMG':
-        mm_type = 'image'
-    elif mm_type == 'TEXT':
-        mm_type = 'text'
-    return 'prefix' + '_' + model + '_' + mm_type
+# def get_mm_index_name(model, mm_type):
+#     print('mm_type: {}'.format(mm_type))
+#     if mm_type not in ['IMG_TEXT', 'mm', 'IMG', 'image', 'TEXT', 'text']:
+#         raise ValueError('mm_type is not normal!')
+#     if mm_type == 'IMG_TEXT':
+#         mm_type = 'mm'
+#     elif mm_type == 'IMG':
+#         mm_type = 'image'
+#     elif mm_type == 'TEXT':
+#         mm_type = 'text'
+#     return 'multicache' + '_' + model + '_' + mm_type
+#
+#
+# def get_mm_index_prefix(model, mm_type):
+#     if mm_type not in ['IMG_TEXT', 'mm', 'IMG', 'image', 'TEXT', 'text']:
+#         raise ValueError('iat_type is not normal!')
+#     if mm_type == 'IMG_TEXT':
+#         mm_type = 'mm'
+#     elif mm_type == 'IMG':
+#         mm_type = 'image'
+#     elif mm_type == 'TEXT':
+#         mm_type = 'text'
+#     return 'prefix' + '_' + model + '_' + mm_type

modelcache_mm/adapter/adapter_remove.py

@@ -19,7 +19,7 @@ def adapt_remove(*args, **kwargs):
         print('id_list: {}'.format(id_list))
         resp = chat_cache.data_manager.delete(id_list, model=model)
     elif remove_type == 'truncate_by_model':
-        resp = chat_cache.data_manager.truncate_iat(model)
+        resp = chat_cache.data_manager.truncate(model)
     else:
         resp = "remove_type_error"
     return resp