remove param for tiled imagery

Author: Matt Sokoloff

examples/model_assisted_labeling/tiled_imagery_mal.ipynb

@@ -35,7 +35,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 1,
+   "execution_count": 2,
    "id": "committed-richards",
    "metadata": {},
    "outputs": [],
@@ -62,7 +62,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 2,
+   "execution_count": 3,
    "id": "thirty-grocery",
    "metadata": {},
    "outputs": [],
@@ -84,7 +84,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "id": "conservative-marsh",
    "metadata": {},
    "outputs": [],
@@ -95,7 +95,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "id": "affecting-myanmar",
    "metadata": {},
    "outputs": [],
@@ -113,7 +113,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "id": "suburban-crowd",
    "metadata": {},
    "outputs": [],
@@ -126,7 +126,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "id": "modern-program",
    "metadata": {},
    "outputs": [],
@@ -174,7 +174,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "id": "generic-freedom",
    "metadata": {},
    "outputs": [],
@@ -187,7 +187,7 @@
     "\n",
     "# DataRows can only be created as bulk operations for tiled imagery data\n",
     "\n",
-    "dataset.create_data_rows([img_info], tiled_imagery = True)\n",
+    "dataset.create_data_rows([img_info])\n",
     "editor = next(\n",
     "    client.get_labeling_frontends(where=LabelingFrontend.name == \"Editor\"))\n",
     "project.setup(editor, ontology_builder.asdict())\n",

labelbox/schema/dataset.py

@@ -67,24 +67,25 @@ def create_data_row(self, **kwargs):
 
         return self.client._create(DataRow, kwargs)
 
-    def create_data_rows(self, items, tiled_imagery=False):
+    def create_data_rows(self, items):
         """ Creates multiple DataRow objects based on the given `items`.
 
         Each element in `items` can be either a `str` or a `dict`. If
         it is a `str`, then it is interpreted as a local file path. The file
         is uploaded to Labelbox and a DataRow referencing it is created.
-        If an item is a `dict`, then it should map `DataRow` fields (or their
-        names) to values. At the minimum an `item` passed as a `dict` must
-        contain a `DataRow.row_data` key and value.
 
+        If an item is a `dict`, then it could support one of the two following structures
+            1. For static imagery, video, and text it should map `DataRow` fields (or their names) to values. 
+               At the minimum an `item` passed as a `dict` must contain a `DataRow.row_data` key and value.
+            2. For tiled imagery the dict must match the import structure specified in the link below
+               https://docs.labelbox.com/data-model/en/index-en#tiled-imagery-import
+        
         >>> dataset.create_data_rows([
         >>>     {DataRow.row_data:"http://my_site.com/photos/img_01.jpg"},
-        >>>     "path/to/file2.jpg"
+        >>>     "path/to/file2.jpg",
+        >>>     {tileLayerUrl : "http://", ...}    
         >>>     ])
 
-        If tiled_imagery = True, See the link below for supported fields:
-            https://docs.labelbox.com/data-model/en/index-en#tiled-imagery-import
-
         For an example showing how to upload tiled data_rows see the following notebook:
             https://github.com/Labelbox/labelbox-python/blob/ms/develop/model_assisted_labeling/tiled_imagery_mal.ipynb
 
@@ -120,6 +121,9 @@ def upload_if_necessary(item):
             items = thread_pool.map(upload_if_necessary, items)
 
         def convert_item(item):
+            # Don't make any changes to tms data
+            if "tileLayerUrl" in item:
+                return item
             # Convert string names to fields.
             item = {
                 key if isinstance(key, Field) else DataRow.field(key): value
@@ -142,9 +146,7 @@ def convert_item(item):
             }
 
         # Prepare and upload the desciptor file
-        if not tiled_imagery:
-            items = [convert_item(item) for item in items]
-
+        items = [convert_item(item) for item in items]
         data = json.dumps(items)
         descriptor_url = self.client.upload_data(data)