Fixed model import in coco_utils, closes #65

Author: jsbroks

app/__init__.py

@@ -6,7 +6,7 @@
 from .image_folder import ImageFolderHandler
 from .api import blueprint as api
 from .config import Config
-from .models import db, ImageModel, create_from_json
+from .models import *
 from .authentication import login_manager
 from .util import query_util, color_util
 

app/models.py

@@ -1,4 +1,5 @@
 import os
+import cv2
 import json
 import datetime
 import numpy as np
@@ -7,11 +8,12 @@
 from mongoengine.queryset.visitor import Q
 from flask_login import UserMixin, current_user
 
-from .util.coco_util import decode_seg
+
 from .util import color_util
 from .config import Config
 from PIL import Image
 
+
 db = MongoEngine()
 
 
@@ -366,3 +368,15 @@ def create_from_json(json_file):
                 upsert(DatasetModel, query={ "name": name}, update=dataset_json)
 
 
+def decode_seg(mask, segmentation):
+    """
+    Create binary mask from segmentation
+    """
+    pts = [
+        np.array(anno).reshape(-1, 2).round().astype(int)
+        for anno in segmentation
+    ]
+    mask = cv2.fillPoly(mask, pts, 1)
+
+    return mask
+

app/util/coco_util.py

@@ -1,6 +1,4 @@
 import pycocotools.mask as mask
-import numpy as np
-import cv2
 
 from .query_util import fix_ids
 from ..models import *
@@ -90,6 +88,7 @@ def get_image_coco(image):
     :param image: ImageModel
     :return: Coco in dictionary format
     """
+    print(DatasetModel, flush=True)
     dataset = DatasetModel.objects(id=image.dataset_id).first()
     image = fix_ids(image)
 
@@ -176,19 +175,6 @@ def get_dataset_coco(dataset):
     return coco
 
 
-def decode_seg(mask, segmentation):
-    """
-    Create binary mask from segmentation
-    """
-    pts = [
-        np.array(anno).reshape(-1, 2).round().astype(int)
-        for anno in segmentation
-    ]
-    mask = cv2.fillPoly(mask, pts, 1)
-
-    return mask
-
-
 def _fit(value, max_value, min_value):
 
     if value > max_value: