flask app runs and js compiles

2 files changed, 32 insertions, 33 deletions

diff --git a/cli/app/server/decorators.py b/cli/app/server/decorators.py
index 62eb839..2e6f9dd 100644
--- a/cli/app/server/decorators.py
+++ b/cli/app/server/decorators.py
@@ -6,7 +6,7 @@ import os
 from time import time
 from datetime import datetime
 import numpy as np
-import cv2 as cv
+from PIL import Image
 from flask import request, jsonify
 from werkzeug.utils import secure_filename
 
@@ -85,7 +85,7 @@ def store_uploaded_image(param_name, store=False, uploaded_im_path='static/data/
       nparr = np.fromstring(file.read(), np.uint8)
 
       # decode image
-      im = cv.imdecode(nparr, cv.IMREAD_COLOR)
+      im = Image.fromarray(nparr)
       kwargs['im'] = im
 
       if store:
diff --git a/cli/app/server/helpers.py b/cli/app/server/helpers.py
index d4ba84a..e7aeaa2 100644
--- a/cli/app/server/helpers.py
+++ b/cli/app/server/helpers.py
@@ -1,6 +1,5 @@
 from sqlalchemy import and_
 from app.settings import app_cfg
-from app.sql.models.media import Media
 import datetime
 import dateutil
 
@@ -47,33 +46,33 @@ def parse_crop_arg(args):
     crop = None
   return crop
 
-def parse_media_args(args):
-  criteria = []
-  criteria_kwargs = {}
-  try:
-    import_id = int(args.get('import_id'))
-    criteria.append(Media.import_id == import_id)
-    criteria_kwargs['import_id_1'] = import_id
-  except:
-    pass
-  try:
-    start_date = str(args.get('start_date'))
-    start_date = dateutil.parser.parse(start_date)
-    start_date = start_date.replace(tzinfo=datetime.timezone.utc)
-    criteria.append(Media.created_at >= start_date)
-    criteria_kwargs['created_at_1'] = start_date
-  except:
-    pass
-  try:
-    end_date = str(args.get('end_date'))
-    end_date = dateutil.parser.parse(end_date)
-    end_date = end_date.replace(tzinfo=datetime.timezone.utc)
-    criteria.append(Media.created_at <= end_date)
-    criteria_kwargs['created_at_2'] = end_date
-  except:
-    pass
-  if len(criteria) > 1:
-    return criteria, criteria_kwargs
-  elif len(criteria) == 1:
-    return criteria, criteria_kwargs
-  return None, {}
+# def parse_media_args(args):
+#   criteria = []
+#   criteria_kwargs = {}
+#   try:
+#     import_id = int(args.get('import_id'))
+#     criteria.append(Media.import_id == import_id)
+#     criteria_kwargs['import_id_1'] = import_id
+#   except:
+#     pass
+#   try:
+#     start_date = str(args.get('start_date'))
+#     start_date = dateutil.parser.parse(start_date)
+#     start_date = start_date.replace(tzinfo=datetime.timezone.utc)
+#     criteria.append(Media.created_at >= start_date)
+#     criteria_kwargs['created_at_1'] = start_date
+#   except:
+#     pass
+#   try:
+#     end_date = str(args.get('end_date'))
+#     end_date = dateutil.parser.parse(end_date)
+#     end_date = end_date.replace(tzinfo=datetime.timezone.utc)
+#     criteria.append(Media.created_at <= end_date)
+#     criteria_kwargs['created_at_2'] = end_date
+#   except:
+#     pass
+#   if len(criteria) > 1:
+#     return criteria, criteria_kwargs
+#   elif len(criteria) == 1:
+#     return criteria, criteria_kwargs
+#   return None, {}