tabulator

2 files changed, 22 insertions, 2 deletions

diff --git a/megapixels/app/server/api.py b/megapixels/app/server/api.py
index cd2b950b..cf8241bd 100644
--- a/megapixels/app/server/api.py
+++ b/megapixels/app/server/api.py
@@ -1,9 +1,12 @@
 import os
 import re
 import time
+import dlib
 from flask import Blueprint, request, jsonify
 from PIL import Image  # todo: try to remove PIL dependency
 
+from app.processors import face_recognition
+from app.processors import face_detector
 from app.models.sql_factory import list_datasets, get_dataset, get_table
 
 sanitize_re = re.compile('[\W]+')
@@ -39,8 +42,18 @@ def upload(name):
 
   img = Image.open(file.stream).convert('RGB')
   
-  # vec = db.load_feature_vector_from_file(uploaded_img_path)
-  # vec = fe.extract(img)
+  # Face detection
+  detector = face_detector.DetectorDLIBHOG()
+
+  # get detection as BBox object
+  bboxes = detector.detect(im, largest=True)
+  bbox = bboxes[0]
+  dim = im.shape[:2][::-1]
+  bbox = bbox.to_dim(dim)  # convert back to real dimensions
+
+  # face recognition/vector
+  recognition = face_recognition.RecognitionDLIB(gpu=-1)
+
   # print(vec.shape)
   # results = db.search(vec, limit=limit)
 
diff --git a/megapixels/app/server/create.py b/megapixels/app/server/create.py
index c1f41dc4..4b1333b9 100644
--- a/megapixels/app/server/create.py
+++ b/megapixels/app/server/create.py
@@ -7,6 +7,9 @@ from app.server.api import api
 db = SQLAlchemy()
 
 def create_app(script_info=None):
+  """
+  functional pattern for creating the flask app
+  """
   app = Flask(__name__, static_folder='static', static_url_path='')
   app.config['SQLALCHEMY_DATABASE_URI'] = connection_url
   app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False
@@ -37,6 +40,10 @@ def create_app(script_info=None):
   return app
 
 def serve_page(file_relative_path_to_root):
+  """
+  trying to get this to serve /path/ with /path/index.html,
+  ...but it doesnt actually matter for production...
+  """
   if file_relative_path_to_root[-1] == '/':
     file_relative_path_to_root += 'index.html'
   return send_from_directory("static", file_relative_path_to_root)