Merge pull request #19 from aperture-data/bbox_labels

Fixes for new API

Author: luisremis

aperturedb/BBoxLoader.py

@@ -136,7 +136,14 @@ def generate_batch(self, bbox_data):
             }
 
             if "properties" in data:
-                ai["AddBoundingBox"]["properties"] = data[CSVParser.PROPERTIES]
+                props = data[CSVParser.PROPERTIES]
+                if "_label" in props:
+                    ai["AddBoundingBox"]["label"] = props["_label"]
+                    props.pop("_label")
+
+                # Check if props is not empty after removing "_label"
+                if props:
+                    ai["AddBoundingBox"]["properties"] = props
 
             q.append(ai)
 

aperturedb/Images.py

@@ -11,6 +11,8 @@
 from matplotlib.collections import PatchCollection
 from matplotlib.patches import Polygon
 
+from aperturedb import Status
+
 class Constraints(object):
 
     def __init__(self):
@@ -88,7 +90,7 @@ def __init__(self, db, batch_size=100):
         self.display_limit = 20
 
         self.img_id_prop     = "_uniqueid"
-        self.bbox_label_prop = "label"
+        self.bbox_label_prop = "_label"
 
     def __retrieve_batch(self, index):
 
@@ -152,15 +154,19 @@ def __get_bounding_boxes_polygons(self, index):
                 "blobs": False,
             }
         }, {
-            "FindEntity": {
+            "FindBlob": {
                 "is_connected_to": {
                     "ref": 1
                 },
+                "constraints": {
+                    "type": ["==", "segmentation"]
+                },
                 "blobs": True,
             }
         }]
 
         res, polygons = self.db_connector.query(query)
+
         ret_poly.append(polygons)
 
         uniqueid_str = str(uniqueid)
@@ -225,9 +231,7 @@ def __retrieve_bounding_boxes(self, index):
                 "_ref": 2,
                 "blobs": False,
                 "coordinates": True,
-                "results": {
-                    "list": [self.bbox_label_prop],
-                }
+                "labels": True,
             }
         }]
 
@@ -458,18 +462,12 @@ def display(self, show_bboxes=False, show_segmentation=False, limit=None):
 
     def get_props_names(self):
 
-        query = [ {
-            "GetSchema": {
-                "type" : "entities"
-            }
-        }]
-
-        res, images = self.db_connector.query(query)
+        status = Status.Status(self.db_connector)
+        schema = status.get_schema()
 
         try:
-            dictio = res[0]["FindImageInfo"]["entities"]["classes"][0]["_Image"]
-            search_key = "VD:" # TODO WHAT IS THIS?
-            props_array = [key for key, val in dictio.items() if not search_key in key]
+            dictio = schema["entities"]["classes"]["_Image"]["properties"]
+            props_array = [key for key, val in dictio.items()]
         except:
             props_array = []
             print("Cannot retrieve properties")

aperturedb/Status.py

@@ -23,6 +23,27 @@ def status(self):
 
         return self.connector.get_last_response_str()
 
+    def get_schema(self, refresh=False):
+
+        query = [ {
+            "GetSchema": {
+                "type" : "entities",
+                "refresh": refresh,
+            }
+        }]
+
+        res, blobs = self.connector.query(query)
+
+        schema = {}
+
+        try:
+            schema = res[0]["GetSchema"]
+        except:
+            print("Cannot retrieve schema")
+            print(self.connector.get_last_response_str())
+
+        return schema
+
     def count_images(self, constraints={}):
 
         q = [{