Merge pull request #24 from codefuse-ai/modelcache_dev_fh

Fix remove truncate issue

Author: peng3307165

.gitignore

@@ -137,3 +137,4 @@ dmypy.json
 *.bin
 *ini
 *.ini
+**/modelcache_serving.py

README.md

@@ -25,7 +25,7 @@ Codefuse-ModelCache
 - [Acknowledgements](#Acknowledgements)
 - [Contributing](#Contributing)
 ## news
-- 🔥🔥[2024.04.09] Added the ability of Redis Search to store and retrieve embeddings in multi-tenant scene, this can reduce the interaction time between Cache and vector databases to 10ms.
+- 🔥🔥[2024.04.09] Add Redis Search to store and retrieve embeddings in multi-tenant scene, this can reduce the interaction time between Cache and vector databases to 10ms.
 - 🔥🔥[2023.12.10] we integrate LLM embedding frameworks such as 'llmEmb', 'ONNX', 'PaddleNLP', 'FastText', alone with the image embedding framework 'timm', to bolster embedding functionality.
 - 🔥🔥[2023.11.20] codefuse-ModelCache has integrated local storage, such as sqlite and faiss, providing users with the convenience of quickly initiating tests.
 - [2023.08.26] codefuse-ModelCache...

flask4modelcache.py

@@ -57,7 +57,6 @@ def response_hitquery(cache_resp):
     insert_pre_embedding_func=insert_multi_splicing,
 )
 
-# cache.set_openai_key()
 global executor
 executor = ThreadPoolExecutor(max_workers=6)
 

modelcache/config/milvus_config.ini

@@ -260,22 +260,21 @@ def create_index(self, model, **kwargs):
         return self.v.create(model)
 
     def truncate(self, model_name):
-        # model = kwargs.pop("model", None)
-        # drop milvus data
+        # drop vector base data
         try:
-            resp = self.v.rebuild_col(model_name)
+            vector_resp = self.v.rebuild_col(model_name)
         except Exception as e:
-            return {'status': 'failed', 'milvus': 'truncate milvus data failed, please check! e: {}'.format(e),
-                    'mysql': 'unexecuted'}
-        if resp:
-            return {'status': 'failed', 'milvus': resp, 'mysql': 'unexecuted'}
+            return {'status': 'failed', 'VectorDB': 'truncate VectorDB data failed, please check! e: {}'.format(e),
+                    'ScalarDB': 'unexecuted'}
+        if vector_resp:
+            return {'status': 'failed', 'VectorDB': vector_resp, 'ScalarDB': 'unexecuted'}
+        # drop scalar base data
         try:
             delete_count = self.s.model_deleted(model_name)
         except Exception as e:
-            # return 'truncate milvus data failed, please check!'
-            return {'status': 'failed', 'milvus': 'rebuild',
-                    'mysql': 'truncate mysql data failed, please check! e: {}'.format(e)}
-        return {'status': 'success', 'milvus': 'rebuild', 'mysql': 'delete_count: ' + str(delete_count)}
+            return {'status': 'failed', 'VectorDB': 'rebuild',
+                    'ScalarDB': 'truncate scalar data failed, please check! e: {}'.format(e)}
+        return {'status': 'success', 'VectorDB': 'rebuild', 'ScalarDB': 'delete_count: ' + str(delete_count)}
 
     def flush(self):
         self.s.flush()

modelcache/config/mysql_config.ini

@@ -124,7 +124,7 @@ def rebuild_col(self, model):
             self.create_index(index_name_model, index_prefix)
         except Exception as e:
             raise ValueError(str(e))
-        return 'rebuild success'
+        # return 'rebuild success'
 
     def delete(self, ids) -> None:
         pipe = self._client.pipeline()