Merge pull request #28 from codefuse-ai/modelcache_dev_mm

removed print statements and standardized formatting

Author: peng3307165

examples/flask/data_insert.py

@@ -13,7 +13,6 @@ def run():
     headers = {"Content-Type": "application/json"}
     res = requests.post(url, headers=headers, json=json.dumps(data))
     res_text = res.text
-    print('res_text: {}'.format(res_text))
 
 
 if __name__ == '__main__':

examples/flask/data_query.py

@@ -13,7 +13,6 @@ def run():
     headers = {"Content-Type": "application/json"}
     res = requests.post(url, headers=headers, json=json.dumps(data))
     res_text = res.text
-    print('res_text: {}'.format(res_text))
 
 
 if __name__ == '__main__':

examples/flask/data_query_long.py

@@ -18,7 +18,6 @@ def run():
     headers = {"Content-Type": "application/json"}
     res = requests.post(url, headers=headers, json=json.dumps(data))
     res_text = res.text
-    print('res_text: {}'.format(res_text))
 
 
 if __name__ == '__main__':

examples/flask/register.py

@@ -14,7 +14,6 @@ def run():
     headers = {"Content-Type": "application/json"}
     res = requests.post(url, headers=headers, json=json.dumps(data))
     res_text = res.text
-    print('res_text: {}'.format(res_text))
 
 
 if __name__ == '__main__':

model/clip_zh/__init__.py

@@ -1,12 +1 @@
 # -*- coding: utf-8 -*-
-"""
-   Alipay.com Inc.
-   Copyright (c) 2004-2023 All Rights Reserved.
-   ------------------------------------------------------
-   File Name : __init__.py.py
-   Author : fuhui.phe
-   Create Time : 2024/5/7 14:05
-   Description : description what the main function of this file
-   Change Activity: 
-        version0 : 2024/5/7 14:05 by fuhui.phe  init
-"""

modelcache/adapter/adapter_query.py

@@ -30,8 +30,6 @@ def adapt_query(cache_data_convert, *args, **kwargs):
             report_func=chat_cache.report.embedding,
         )(pre_embedding_data)
 
-        # print('embedding_data: {}'.format(embedding_data))
-
     if cache_enable:
         cache_data_list = time_cal(
             chat_cache.data_manager.search,
@@ -43,7 +41,6 @@ def adapt_query(cache_data_convert, *args, **kwargs):
             top_k=kwargs.pop("top_k", -1),
             model=model
         )
-        print('cache_data_list: {}'.format(cache_data_list))
         cache_answers = []
         cache_questions = []
         cache_ids = []
@@ -81,7 +78,6 @@ def adapt_query(cache_data_convert, *args, **kwargs):
             return
 
         for cache_data in cache_data_list:
-            print('cache_data: {}'.format(cache_data))
             primary_id = cache_data[1]
             ret = chat_cache.data_manager.get_scalar_data(
                 cache_data, extra_param=context.get("get_scalar_data", None)

modelcache/adapter/adapter_register.py

@@ -9,5 +9,4 @@ def adapt_register(*args, **kwargs):
         return ValueError('')
 
     register_resp = chat_cache.data_manager.create_index(model)
-    print('register_resp: {}'.format(register_resp))
     return register_resp

modelcache/manager/data_manager.py

@@ -212,8 +212,6 @@ def import_data(
             cache_datas.append([ans, question, embedding_data, model])
 
         ids = self.s.batch_insert(cache_datas)
-        print('ids: {}'.format(ids))
-        logging.info('ids: {}'.format(ids))
         self.v.mul_add(
             [
                 VectorData(id=ids[i], data=embedding_data)

modelcache/manager/scalar_data/sql_storage_sqlite.py

@@ -1,74 +1,10 @@
 # -*- coding: utf-8 -*-
-import os
-import time
-
-import pymysql
 import json
-import base64
 from typing import List
 from modelcache.manager.scalar_data.base import CacheStorage, CacheData
 import sqlite3
 
 
-# def insert_single_data(conn, sql, data_tuple):
-#     cur = conn.cursor()
-#     try:
-#         cur.execute(sql, data_tuple)
-#         conn.commit()
-#         id = cur.lastrowid
-#         # print('id: {}'.format(id))
-#         return id
-#     except Exception as e:
-#         print(e)
-#         conn.rollback()
-#     if cur:
-#         cur.close()
-#
-#
-# def excute_sql(conn, sql):
-#     cur = conn.cursor()
-#     try:
-#         cur.execute(sql)
-#         conn.commit()
-#     except Exception as e:
-#         print(e)
-#         conn.rollback()
-#     if cur:
-#         cur.close()
-#
-#
-# def excute_delete_sql(conn, sql):
-#     cur = conn.cursor()
-#     try:
-#         cur.execute(sql)
-#         row_count = cur.rowcount
-#         conn.commit()
-#     except Exception as e:
-#         print(e)
-#         conn.rollback()
-#     if cur:
-#         cur.close()
-#     return row_count
-#
-#
-# def query_fetch_one_data(conn, sql):
-#     cursor = conn.cursor()
-#     try:
-#         cursor.execute(sql)
-#     except Exception as e:
-#         print(e)
-#         conn.rollback()
-#     rows = cursor.fetchone()
-#     if cursor:
-#         cursor.close()
-#     return rows
-#
-#
-# def close(conn):
-#     if conn:
-#         conn.close()
-
-
 class SQLStorage(CacheStorage):
     def __init__(
         self,

modelcache/manager/vector_data/milvus.py

@@ -136,7 +136,6 @@ def _get_collection(self, collection_name):
 
     def mul_add(self, datas: List[VectorData], model=None):
         collection_name_model = self.collection_name + '_' + model
-        print('collection_name_model: {}'.format(collection_name_model))
         self._create_collection(collection_name_model)
 
         data_array, id_array = map(list, zip(*((data.data, data.id) for data in datas)))
@@ -148,7 +147,6 @@ def search(self, data: np.ndarray, top_k: int = -1, model=None):
         if top_k == -1:
             top_k = self.top_k
         collection_name_model = self.collection_name + '_' + model
-        print('collection_name_model: {}'.format(collection_name_model))
         self._create_collection(collection_name_model)
         search_result = self.col.search(
             data=data.reshape(1, -1).tolist(),