Merge branch 'linxj' of 192.168.1.105:jinhai/vecwise_engine into linxj

pyengine/engine/controller/tests/test_views.py

@@ -11,6 +11,7 @@ logging.basicConfig(level = logging.INFO,format = '%(asctime)s - %(name)s - %(le
 logger = logging.getLogger(__name__)
 
 class TestViews:
+    HEADERS = {'Content-Type': 'application/json'}
 
     def loads(self, resp):
         return json.loads(resp.data.decode())
@@ -18,25 +19,25 @@ class TestViews:
     def test_group(self, test_client):
         data = {"dimension": 10}
 
-        resp = test_client.get('/vector/group/6')
+        resp = test_client.get('/vector/group/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 1
 
-        resp = test_client.post('/vector/group/6', data=json.dumps(data))
+        resp = test_client.post('/vector/group/6', data=json.dumps(data), headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 
-        resp = test_client.get('/vector/group/6')
+        resp = test_client.get('/vector/group/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 
         # GroupList
-        resp = test_client.get('/vector/group')
+        resp = test_client.get('/vector/group', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
         assert self.loads(resp)['group_list'] == [{'file_number': 0, 'group_name': '6'}]
 
-        resp = test_client.delete('/vector/group/6')
+        resp = test_client.delete('/vector/group/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
     
@@ -48,31 +49,31 @@ class TestViews:
         assert self.loads(resp)['code'] == 0
         
         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))
+        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]}
-        resp = test_client.post('/vector/add/6', data=json.dumps(vector))
+        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]}
-        resp = test_client.post('/vector/add/6', data=json.dumps(vector))
+        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
 
-        resp = test_client.post('/vector/index/6')
+        resp = test_client.post('/vector/index/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 
         limit = {"vector": [1.1, 2.2, 3.3, 4.4, 5.5, 6.6, 7.7, 8.8], "limit": 1}
-        resp = test_client.post('/vector/search/6', data=json.dumps(limit))
+        resp = test_client.get('/vector/search/6', data=json.dumps(limit), headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
         assert self.loads(resp)['vector_id'] == 0
 
-        resp = test_client.delete('/vector/group/6')
+        resp = test_client.delete('/vector/group/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
         assert self.loads(resp)['code'] == 0
 

pyengine/engine/controller/views.py

@@ -28,9 +28,10 @@ class VectorSearch(Resource):
         self.__parser.add_argument('vector', type=float, action='append', location=['json'])
         self.__parser.add_argument('limit', type=int, action='append', location=['json'])
 
-    def post(self, group_id):
+    def get(self, group_id):
         args = self.__parser.parse_args()
         print('VectorSearch vector: ', args['vector'])
+        print('limit: ', args['limit'])
         # go to search every thing
         code, vector_id = VectorEngine.SearchVector(group_id, args['vector'], args['limit'])
         return jsonify({'code': code, 'vector_id': vector_id})