Applied python3 pull requst

source: ragulin#11

Author: GzuPark

.gitignore

@@ -5,3 +5,6 @@ tags
 *.swn
 *.swm
 *.pyc
+
+.DS_Store
+.vscode

README.md

@@ -49,7 +49,7 @@ Download the [AT&T face database](http://www.cl.cam.ac.uk/research/dtg/attarchiv
     cd data
     wget http://www.cl.cam.ac.uk/Research/DTG/attarchive/pub/data/att_faces.tar.Z
     tar zxvf att_faces.tar.Z
-    mv att_faces images
+    mv orl_faces images
 
 Copy `haarcascade_frontalface_alt.xml` from `<path to opencv source>/data/haarcascades/` to the data folder.
 

opencv.py

@@ -39,20 +39,20 @@ def crop_faces(img, faces):
 def load_images(path):
   images, labels = [], []
   c = 0
-  print "test " + path
+  print("test " + path)
   for dirname, dirnames, filenames in os.walk(path):
-    print "test"
+    print("test")
     for subdirname in dirnames:
       subjectPath = os.path.join(dirname, subdirname)
       for filename in os.listdir(subjectPath):
         try:
           img = cv2.imread(os.path.join(subjectPath, filename), cv2.IMREAD_GRAYSCALE)
           images.append(np.asarray(img, dtype=np.uint8))
           labels.append(c)
-        except IOError, (errno, strerror):
-          print "IOError({0}): {1}".format(errno, strerror)
+        except IOError as e:
+          print("IOError({0})".format(e))
         except:
-          print "Unexpected error:" , sys.exc_info()[0]
+          print("Unexpected error:" , sys.exc_info()[0])
           raise
       c += 1
     return images, labels
@@ -61,13 +61,15 @@ def load_images_to_db(path):
   for dirname, dirnames, filenames in os.walk(path):
     for subdirname in dirnames:
       subject_path = os.path.join(dirname, subdirname)
-      label = Label.get_or_create(name=subdirname)
-      label.save()
+      label, created = Label.get_or_create(name=subdirname)
+      if created is True:
+        label.save()
       for filename in os.listdir(subject_path):
         path = os.path.abspath(os.path.join(subject_path, filename))
         logging.info('saving path %s' % path)
-        image = Image.get_or_create(path=path, label=label)
-        image.save()
+        image, created = Image.get_or_create(path=path, label=label)
+        if created is True:
+          image.save()
 
 def load_images_from_db():
   images, labels = [],[]
@@ -78,14 +80,13 @@ def load_images_from_db():
         cv_image = cv2.resize(cv_image, (100,100))
         images.append(np.asarray(cv_image, dtype=np.uint8))
         labels.append(label.id)
-      except IOError, (errno, strerror):
-       print "IOError({0}): {1}".format(errno, strerror)
+      except IOError as e:
+       print("IOError({0})".format(e))
   return images, np.asarray(labels)
 
 def train():
   images, labels = load_images_from_db()
-  model = cv2.createFisherFaceRecognizer()
-  #model = cv2.createEigenFaceRecognizer()
+  model = cv2.face.FisherFaceRecognizer_create()
   model.train(images,labels)
   model.save(MODEL_FILE)
 
@@ -96,8 +97,7 @@ def predict(cv_image):
     cropped = to_grayscale(crop_faces(cv_image, faces))
     resized = cv2.resize(cropped, (100,100))
 
-    model = cv2.createFisherFaceRecognizer()
-    #model = cv2.createEigenFaceRecognizer()
+    model = cv2.face.FisherFaceRecognizer_create()
     model.load(MODEL_FILE)
     prediction = model.predict(resized)
     result = {
@@ -162,6 +162,6 @@ def persist(self, cv_image):
   load_images_to_db("data/images")
   #train()
 
-  print 'done'
+  print('done')
   #predict()
   #train()

requirements.txt

@@ -0,0 +1,6 @@
+opencv-contrib-python
+pillow
+numpy
+sklearn
+tornado
+peewee

server.py

@@ -8,20 +8,20 @@
 import uuid
 from PIL import Image
 import time
-import StringIO
+from io import StringIO
 import uuid
 import numpy
 import json
-from tornado.options import define, options
+from tornado.options import options
 import opencv
 
-define("port", default=8888, help="run on the given poort", type=int)
+options.define("port", default=8888, help="run on the given poort", type=int)
 
 class Application(tornado.web.Application):
   def __init__(self):
     handlers = [
-        #(r"/", MainHandler),
-        #(r"/facedetector", FaceDetectHandler),
+        (r"/main", MainHandler),
+        (r"/facedetector", FaceDetectHandler),
         (r"/", SetupHarvestHandler),
         (r"/harvesting", HarvestHandler),
         (r"/predict", PredictHandler),
@@ -114,8 +114,10 @@ def main():
   opencv.train()
   logging.info("Model trained")
   app = Application()
+  options.parse_command_line()
+  print(' -- app is listen on: {}'.format(options.port))
   app.listen(options.port)
-  tornado.ioloop.IOLoop.instance().start()
+  tornado.ioloop.IOLoop.current().start()
 
 if __name__ == "__main__":
   main()