resolving conflicts

Author: jtsodapop

.github/workflows/python-package.yml

@@ -67,7 +67,7 @@ jobs:
       env:
         # make sure to tell tox to use these environs in tox.ini
         #
-        # randall@labelbox.com
+        # msokoloff+prod-python@labelbox.com
         LABELBOX_TEST_API_KEY_PROD: ${{ secrets.LABELBOX_API_KEY }}
 
         # randall+staging-python@labelbox.com

CHANGELOG.md

@@ -6,7 +6,12 @@
 * Comparing a Labelbox object (e.g. Project) to None doesn't raise an exception
 * Adding `order_by` to `Project.labels` doesn't raise an exception
 
-## Version 2.4.10 (2021-01-05)
+## Version 2.4.11 (2021-03-07)
+### Fix
+* Increase query timeout
+* Retry 502s
+
+## Version 2.4.10 (2021-02-05)
 ### Added 
 * SDK version added to request headers
 

Dockerfile

@@ -1,7 +1,11 @@
 FROM python:3.7
 
-COPY . /usr/src/labelbox
+RUN pip install pytest pytest-cases
+
 WORKDIR /usr/src/labelbox
+COPY requirements.txt /usr/src/labelbox
+RUN pip install -r requirements.txt
+COPY . /usr/src/labelbox
+
 
-RUN pip install pytest
 RUN python setup.py install

Makefile

@@ -5,11 +5,11 @@ build:
 test-staging: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="staging" \
-		-e LABELBOX_TEST_API_KEY_STAGING="<REPLACE>" \
+		-e LABELBOX_TEST_API_KEY_STAGING=${LABELBOX_TEST_API_KEY_STAGING} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) -svvx
 
 test-prod: build
 	docker run -it -v ${PWD}:/usr/src -w /usr/src \
 		-e LABELBOX_TEST_ENVIRON="prod" \
-		-e LABELBOX_TEST_API_KEY_PROD=${apikey} \
+		-e LABELBOX_TEST_API_KEY_PROD=${LABELBOX_TEST_API_KEY_PROD} \
 		local/labelbox-python:test pytest $(PATH_TO_TEST) -svvx

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "2.4.10"
+__version__ = "2.4.11"
 
 from labelbox.client import Client
 from labelbox.schema.bulk_import_request import BulkImportRequest
@@ -15,4 +15,4 @@
 from labelbox.schema.asset_metadata import AssetMetadata
 from labelbox.schema.webhook import Webhook
 from labelbox.schema.prediction import Prediction, PredictionModel
-from labelbox.schema.ontology import Ontology
+from labelbox.schema.ontology import Ontology

labelbox/client.py

@@ -71,9 +71,10 @@ def __init__(self,
             'X-User-Agent': f'python-sdk {SDK_VERSION}'
         }
 
+    #TODO: Add exponential backoff so we don'tt overwhelm the api
     @retry.Retry(predicate=retry.if_exception_type(
         labelbox.exceptions.InternalServerError))
-    def execute(self, query, params=None, timeout=10.0):
+    def execute(self, query, params=None, timeout=30.0):
         """ Sends a request to the server for the execution of the
         given query.
 
@@ -126,25 +127,23 @@ def convert_value(value):
             logger.debug("Response: %s", response.text)
         except requests.exceptions.Timeout as e:
             raise labelbox.exceptions.TimeoutError(str(e))
-
         except requests.exceptions.RequestException as e:
             logger.error("Unknown error: %s", str(e))
             raise labelbox.exceptions.NetworkError(e)
-
         except Exception as e:
             raise labelbox.exceptions.LabelboxError(
                 "Unknown error during Client.query(): " + str(e), e)
-
         try:
             r_json = response.json()
         except:
-            error_502 = '502 Bad Gateway'
-            if error_502 in response.text:
-                raise labelbox.exceptions.InternalServerError(error_502)
             if "upstream connect error or disconnect/reset before headers" \
                     in response.text:
                 raise labelbox.exceptions.InternalServerError(
                     "Connection reset")
+            elif response.status_code == 502:
+                error_502 = '502 Bad Gateway'
+                raise labelbox.exceptions.InternalServerError(error_502)
+
             raise labelbox.exceptions.LabelboxError(
                 "Failed to parse response as JSON: %s" % response.text)
 
@@ -189,6 +188,7 @@ def check_errors(keywords, *path):
 
         # Check if API limit was exceeded
         response_msg = r_json.get("message", "")
+
         if response_msg.startswith("You have exceeded"):
             raise labelbox.exceptions.ApiLimitError(response_msg)
 
@@ -292,7 +292,6 @@ def upload_data(self,
                 "1": (filename, content, content_type) if
                      (filename and content_type) else content
             })
-
         try:
             file_data = response.json().get("data", None)
         except ValueError as e:  # response is not valid JSON

labelbox/exceptions.py

@@ -103,4 +103,9 @@ class UuidError(LabelboxError):
 
 
 class InconsistentOntologyException(Exception):
-    pass
+    pass
+
+
+class MALValidationError(LabelboxError):
+    """Raised when user input is invalid for MAL imports."""
+    ...

labelbox/schema/asset_metadata.py

@@ -1,3 +1,5 @@
+from enum import Enum
+
 from labelbox.orm.db_object import DbObject
 from labelbox.orm.model import Field
 
@@ -9,9 +11,16 @@ class AssetMetadata(DbObject):
         meta_type (str): IMAGE, VIDEO, TEXT, or IMAGE_OVERLAY
         meta_value (str): URL to an external file or a string of text
     """
-    VIDEO = "VIDEO"
-    IMAGE = "IMAGE"
-    TEXT = "TEXT"
+
+    class MetaType(Enum):
+        VIDEO = "VIDEO"
+        IMAGE = "IMAGE"
+        TEXT = "TEXT"
+        IMAGE_OVERLAY = "IMAGE_OVERLAY"
+
+    # For backwards compatibility
+    for topic in MetaType:
+        vars()[topic.name] = topic.value
 
     meta_type = Field.String("meta_type")
     meta_value = Field.String("meta_value")