[BACKEND-766] upload with content type guess (#28)

* wip

* clean up

* change log and bump version

Author: rllin

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Version 2.4.1 (2020-07-22)
+### Fixed
+* `Dataset.create_data_row` and `Dataset.create_data_rows` will now upload with content type to ensure the Labelbox editor can show videos.
+
 ## Version 2.4 (2020-01-30)
 
 ### Added

labelbox/client.py

@@ -1,6 +1,7 @@
 from datetime import datetime, timezone
 import json
 import logging
+import mimetypes
 import os
 
 import requests
@@ -171,6 +172,24 @@ def check_errors(keywords, *path):
 
         return response["data"]
 
+    def upload_file(self, path):
+        """Uploads given path to local file.
+
+        Also includes best guess at the content type of the file.
+
+        Args:
+            path (str): path to local file to be uploaded.
+        Returns:
+            str, the URL of uploaded data.
+        Raises:
+            labelbox.exceptions.LabelboxError: If upload failed.
+
+        """
+        content_type, _ = mimetypes.guess_type(path)
+        basename = os.path.basename(path)
+        with open(path, "rb") as f:
+            return self.upload_data(data=(basename, f.read(), content_type))
+
     def upload_data(self, data):
         """ Uploads the given data (bytes) to Labelbox.
 
@@ -183,8 +202,8 @@ def upload_data(self, data):
         """
         request_data = {
             "operations": json.dumps({
-            "variables": {"file": None, "contentLength": len(data), "sign": False},
-            "query": """mutation UploadFile($file: Upload!, $contentLength: Int!,
+                "variables": {"file": None, "contentLength": len(data), "sign": False},
+                "query": """mutation UploadFile($file: Upload!, $contentLength: Int!,
                                             $sign: Boolean) {
                             uploadFile(file: $file, contentLength: $contentLength,
                                        sign: $sign) {url filename} } """,}),

labelbox/schema/dataset.py

@@ -48,16 +48,15 @@ def create_data_row(self, **kwargs):
         # If row data is a local file path, upload it to server.
         row_data = kwargs[DataRow.row_data.name]
         if os.path.exists(row_data):
-            with open(row_data, "rb") as f:
-                kwargs[DataRow.row_data.name] = self.client.upload_data(f.read())
+            kwargs[DataRow.row_data.name] = self.client.upload_file(row_data)
 
         kwargs[DataRow.dataset.name] = self
 
         return self.client._create(DataRow, kwargs)
 
     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.
@@ -91,9 +90,7 @@ def create_data_rows(self, items):
 
         def upload_if_necessary(item):
             if isinstance(item, str):
-                with open(item, "rb") as f:
-                    item_data = f.read()
-                item_url = self.client.upload_data(item_data)
+                item_url = self.client.upload_file(item)
                 # Convert item from str into a dict so it gets processed
                 # like all other dicts.
                 item = {DataRow.row_data: item_url,

setup.py

@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="labelbox",
-    version="2.4",
+    version="2.4.1",
     author="Labelbox",
     author_email="engineering@labelbox.com",
     description="Labelbox Python API",