From dadf9734f363a70cdaa35f020e037ad6ad919d96 Mon Sep 17 00:00:00 2001
From: jinhai <hai.jin@zilliz.com>
Date: Wed, 27 Mar 2019 10:06:47 +0800
Subject: [PATCH] Update interface, part2

---
 pyengine/engine/controller/tests/test_vector_engine.py | 2 +-
 pyengine/engine/controller/tests/test_views.py         | 2 +-
 pyengine/engine/controller/vector_engine.py            | 3 +--
 pyengine/engine/controller/views.py                    | 3 +++
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pyengine/engine/controller/tests/test_vector_engine.py b/pyengine/engine/controller/tests/test_vector_engine.py
index 247319a5..5ac57c99 100644
--- a/pyengine/engine/controller/tests/test_vector_engine.py
+++ b/pyengine/engine/controller/tests/test_vector_engine.py
@@ -71,7 +71,7 @@ class TestVectorEngine:
         # Check search vector interface
         code, vector_id = VectorEngine.SearchVector('test_group', self.__vector, self.__limit)
         assert code == VectorEngine.SUCCESS_CODE
-        assert vector_id == {0}
+        assert vector_id == [0]
 
         # Check create index interface
         code = VectorEngine.CreateIndex('test_group')
diff --git a/pyengine/engine/controller/tests/test_views.py b/pyengine/engine/controller/tests/test_views.py
index 1f28cb1b..eb6d3e85 100644
--- a/pyengine/engine/controller/tests/test_views.py
+++ b/pyengine/engine/controller/tests/test_views.py
@@ -71,7 +71,7 @@ class TestViews:
         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
+        assert self.loads(resp)['vector_id'] == [0]
 
         resp = test_client.delete('/vector/group/6', headers = TestViews.HEADERS)
         assert resp.status_code == 200
diff --git a/pyengine/engine/controller/vector_engine.py b/pyengine/engine/controller/vector_engine.py
index 8557fc52..8e4e0707 100644
--- a/pyengine/engine/controller/vector_engine.py
+++ b/pyengine/engine/controller/vector_engine.py
@@ -145,7 +145,6 @@ class VectorEngine(object):
             return VectorEngine.GROUP_NOT_EXIST, {}
 
         group = GroupTable.query.filter(GroupTable.group_name == group_id).first()
-
         # find all files
         files = FileTable.query.filter(FileTable.group_name == group_id).all()
         index_keys = [ i.filename for i in files if i.type == 'index' ]
@@ -159,7 +158,7 @@ class VectorEngine(object):
         vectors.append(vector)
         result = scheduler_instance.Search(index_map, vectors, limit)
 
-        vector_id = {0}
+        vector_id = [0]
 
         return VectorEngine.SUCCESS_CODE, vector_id
 
diff --git a/pyengine/engine/controller/views.py b/pyengine/engine/controller/views.py
index 6e1cd925..90407afb 100644
--- a/pyengine/engine/controller/views.py
+++ b/pyengine/engine/controller/views.py
@@ -3,6 +3,7 @@ from flask_restful import Resource, Api
 from engine import app, db
 from engine.model.group_table import GroupTable
 from engine.controller.vector_engine import VectorEngine
+import json
 
 # app = Flask(__name__)
 api = Api(app)
@@ -34,7 +35,9 @@ class VectorSearch(Resource):
         print('limit: ', args['limit'])
         # go to search every thing
         code, vector_id = VectorEngine.SearchVector(group_id, args['vector'], args['limit'])
+        print('vector_id: ', vector_id)
         return jsonify({'code': code, 'vector_id': vector_id})
+        #return jsonify(})
 
 
 class Index(Resource):
-- 
GitLab