From d7df4ee5b9e24a9cdf2bf4d1bc2e73e97352afdc Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Mon, 17 Dec 2018 01:02:40 +0100
Subject: searches execute

---
 megapixels/app/models/sql_factory.py | 5 +++--
 megapixels/app/server/api.py         | 9 +++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'megapixels')

diff --git a/megapixels/app/models/sql_factory.py b/megapixels/app/models/sql_factory.py
index 0f7e73a0..9a44941b 100644
--- a/megapixels/app/models/sql_factory.py
+++ b/megapixels/app/models/sql_factory.py
@@ -83,8 +83,8 @@ class SqlDataset:
 
   def get_identity(self, id):
     table = self.get_table('identity_meta')
-    identity = table.query.filter(table.image_id >= id).order_by(table.image_id.asc()).first().toJSON()
-    print(identity)
+    # id += 1
+    identity = table.query.filter(table.image_id <= id).order_by(table.image_id.desc()).first().toJSON()
     return {
       'uuid': self.select('uuids', id),
       'identity': identity,
@@ -100,6 +100,7 @@ class SqlDataset:
     # for obj in session.query(table).filter_by(id=id):
     print(table)
     obj = session.query(table).filter(table.id == id).first()
+    session.close()
     return obj.toJSON()
 
   def get_table(self, type):
diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py
index 36563910..2f78ecd3 100644
--- a/megapixels/app/server/api.py
+++ b/megapixels/app/server/api.py
@@ -70,7 +70,7 @@ def upload(name):
   query = np.array([ vec ]).astype('float32')
   
   # query FAISS!
-  distances, indexes = faiss_dataset.search(query, 5)
+  distances, indexes = faiss_dataset.search(query, 10)
 
   if len(indexes) == 0:
     print("weird, no results!")
@@ -85,6 +85,7 @@ def upload(name):
     return []
 
   lookup = {}
+  ids = [i+1 for i in indexes]
   for _d, _i in zip(distances, indexes):
     lookup[_i+1] = _d
 
@@ -97,13 +98,13 @@ def upload(name):
   query = {
     'timing': time.time() - start,
   }
-  results = [ dataset.get_identity(index) for index in indexes ]
+  results = [ dataset.get_identity(id) for id in ids ]
 
   print(results)
   return jsonify({
     'results': results,
-    # 'distances': distances.tolist(),
-    # 'indexes': indexes.tolist(),
+    'distances': distances.tolist(),
+    'indexes': indexes.tolist(),
   })
 
 @api.route('/dataset/<name>/name', methods=['GET'])
-- 
cgit v1.2.3-70-g09d2