Merge branch 'jinhai' into 'develop'

Add batch import

See merge request jinhai/vecwise_engine!14

pyengine/engine/controller/tests/test_vector_engine.py

@@ -11,6 +11,7 @@ logger = logging.getLogger(__name__)
 
 class TestVectorEngine:
     def setup_class(self):
+        self.__vectors = [[1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]]
         self.__vector = [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]
         self.__limit = 1
 
@@ -44,29 +45,29 @@ class TestVectorEngine:
         assert group_list == [{'group_name': 'test_group', 'file_number': 0}]
 
         # Add Vector for not exist group
-        code, vector_id = VectorEngine.AddVector('not_exist_group', self.__vector)
+        code, vector_id = VectorEngine.AddVector('not_exist_group', self.__vectors)
         assert code == VectorEngine.GROUP_NOT_EXIST
         assert vector_id == 'invalid'
 
         # Add vector for exist group
-        code, vector_id = VectorEngine.AddVector('test_group', self.__vector)
+        code, vector_id = VectorEngine.AddVector('test_group', self.__vectors)
         assert code == VectorEngine.SUCCESS_CODE
-        assert vector_id == 'test_group.0'
+        assert vector_id == ['test_group.0']
 
         # Add vector for exist group
-        code, vector_id = VectorEngine.AddVector('test_group', self.__vector)
+        code, vector_id = VectorEngine.AddVector('test_group', self.__vectors)
         assert code == VectorEngine.SUCCESS_CODE
-        assert vector_id == 'test_group.1'
+        assert vector_id == ['test_group.1']
 
         # Add vector for exist group
-        code, vector_id = VectorEngine.AddVector('test_group', self.__vector)
+        code, vector_id = VectorEngine.AddVector('test_group', self.__vectors)
         assert code == VectorEngine.SUCCESS_CODE
-        assert vector_id == 'test_group.2'
+        assert vector_id == ['test_group.2']
 
         # Add vector for exist group
-        code, vector_id = VectorEngine.AddVector('test_group', self.__vector)
+        code, vector_id = VectorEngine.AddVector('test_group', self.__vectors)
         assert code == VectorEngine.SUCCESS_CODE
-        assert vector_id == 'test_group.3'
+        assert vector_id == ['test_group.3']
 
         # Check search vector interface
         code, vector_id = VectorEngine.SearchVector('test_group', self.__vector, self.__limit)

pyengine/engine/controller/tests/test_views.py

@@ -48,17 +48,17 @@ class TestViews:
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
         
-        vector = {"vector": [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]}
+        vector = {"vector": [[1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]]}
         resp = test_client.post('/vector/add/6', data=json.dumps(vector), headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 
-        vector = {"vector": [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]}
+        vector = {"vector": [[1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]]}
         resp = test_client.post('/vector/add/6', data=json.dumps(vector), headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 
-        vector = {"vector": [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]}
+        vector = {"vector": [[1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8], [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8], [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8]]}
         resp = test_client.post('/vector/add/6', data=json.dumps(vector), headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0

pyengine/engine/controller/vector_engine.py

@@ -80,14 +80,17 @@ class VectorEngine(object):
 
 
     @staticmethod
-    def AddVector(group_id, vector):
-        print(group_id, vector)
+    def AddVector(group_id, vectors):
+        print(group_id, vectors)
         code, _, _ = VectorEngine.GetGroup(group_id)
         if code == VectorEngine.FAULT_CODE:
             return VectorEngine.GROUP_NOT_EXIST, 'invalid'
 
+        vector_str_list = []
+        for vector in vectors:
             file = FileTable.query.filter(FileTable.group_name == group_id).filter(FileTable.type == 'raw').first()
             group = GroupTable.query.filter(GroupTable.group_name == group_id).first()
+
             if file:
                 print('insert into exist file')
                 # create vector id
@@ -120,7 +123,6 @@ class VectorEngine(object):
                                                                                                                     'seq_no': file.seq_no + 1})
                     db.session.commit()
                     print('Update db for raw file insertion')
-                pass
 
             else:
                 print('add a new raw file')
@@ -134,8 +136,9 @@ class VectorEngine(object):
                 db.session.add(FileTable(group_id, raw_filename, 'raw', 1))
                 db.session.commit()
 
-        vector_id_str = group_id + '.' + str(vector_id)
-        return VectorEngine.SUCCESS_CODE, vector_id_str
+            vector_str_list.append(group_id + '.' + str(vector_id))
+
+        return VectorEngine.SUCCESS_CODE, vector_str_list
 
 
     @staticmethod

pyengine/engine/controller/views.py

@@ -14,10 +14,9 @@ from flask_restful import request
 class Vector(Resource):
     def __init__(self):
         self.__parser = reqparse.RequestParser()
-        self.__parser.add_argument('vector', type=float, action='append', location=['json'])
+        self.__parser.add_argument('vector', type=list, action='append', location=['json'])
 
     def post(self, group_id):
-        print(request.json)
         args = self.__parser.parse_args()
         vector = args['vector']
         code, vector_id = VectorEngine.AddVector(group_id, vector)

pyengine/engine/run_test.sh

-pytest -v --disable-warnings
+pytest -vv --disable-warnings