Revert "[BACKEND-946] [BACKEND-947] [BACKEND-948] pass thru errors, retry, catch bad annotation types" (#54)

* Revert "update version and changelog"

This reverts commit 1cf98a3.

* Revert "ignore missing improrts"

This reverts commit 805d97f.

* Revert "retry"

This reverts commit 3300f77.

* Revert "catchall for other errors"

This reverts commit 96e1c76.

* Revert "print 400s"

This reverts commit 4956bb5.

* Revert "loosen requirements + catch actual error for reraise"

This reverts commit 8bf8e4d.

* Revert "catch actual errors"

This reverts commit a083993.

* Revert "Update client.py"

This reverts commit c656f3c.

* Revert "yapf"

This reverts commit 8daeaff.

* Revert "update labeling frontend test to work with any project even if it has more than the default editors"

This reverts commit 8d1d017.

* Revert "print response when fail"

This reverts commit d2a0909.

* Revert "catch bad inputs"

This reverts commit 621edef.

Author: rllin

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog
 
-## Version 2.4.5 (2020-08-04)
-### Added
-* retry capabilities for common flaky API failures
-* protection against improper types passed into `Project.upload_anntations`
-* pass thru API error messages when possible
-
 ## Version 2.4.3 (2020-08-04)
 
 ### Added

labelbox/client.py

@@ -5,7 +5,6 @@
 import os
 from typing import Tuple
 
-from google.api_core import retry
 import requests
 import requests.exceptions
 
@@ -61,8 +60,6 @@ def __init__(self,
             'Authorization': 'Bearer %s' % api_key
         }
 
-    @retry.Retry(predicate=retry.if_exception_type(
-        labelbox.exceptions.InternalServerError))
     def execute(self, query, params=None, timeout=10.0):
         """ Sends a request to the server for the execution of the
         given query. Checks the response for errors and wraps errors
@@ -124,15 +121,12 @@ def convert_value(value):
                 "Unknown error during Client.query(): " + str(e), e)
 
         try:
-            r_json = response.json()
+            response = response.json()
         except:
-            error_502 = '502 Bad Gateway'
-            if error_502 in response.text:
-                raise labelbox.exceptions.InternalServerError(error_502)
             raise labelbox.exceptions.LabelboxError(
                 "Failed to parse response as JSON: %s" % response.text)
 
-        errors = r_json.get("errors", [])
+        errors = response.get("errors", [])
 
         def check_errors(keywords, *path):
             """ Helper that looks for any of the given `keywords` in any of
@@ -172,32 +166,16 @@ def check_errors(keywords, *path):
                 graphql_error["message"])
 
         # Check if API limit was exceeded
-        response_msg = r_json.get("message", "")
+        response_msg = response.get("message", "")
         if response_msg.startswith("You have exceeded"):
             raise labelbox.exceptions.ApiLimitError(response_msg)
 
-        prisma_error = check_errors(["INTERNAL_SERVER_ERROR"], "extensions",
-                                    "code")
-        if prisma_error:
-            raise labelbox.exceptions.InternalServerError(
-                prisma_error["message"])
-
         if len(errors) > 0:
             logger.warning("Unparsed errors on query execution: %r", errors)
             raise labelbox.exceptions.LabelboxError("Unknown error: %s" %
                                                     str(errors))
 
-        # if we do return a proper error code, and didn't catch this above
-        # reraise
-        # this mainly catches a 401 for API access disabled for free tier
-        # TODO: need to unify API errors to handle things more uniformly
-        # in the SDK
-        if response.status_code != requests.codes.ok:
-            message = f"{response.status_code} {response.reason}"
-            cause = r_json.get('message')
-            raise labelbox.exceptions.LabelboxError(message, cause)
-
-        return r_json["data"]
+        return response["data"]
 
     def upload_file(self, path: str) -> str:
         """Uploads given path to local file.

labelbox/exceptions.py

@@ -48,16 +48,6 @@ class ValidationFailedError(LabelboxError):
     pass
 
 
-class InternalServerError(LabelboxError):
-    """Nondescript prisma or 502 related errors.
-
-    Meant to be retryable.
-
-    TODO: these errors need better messages from platform
-    """
-    pass
-
-
 class InvalidQueryError(LabelboxError):
     """ Indicates a malconstructed or unsupported query (either by GraphQL in
     general or by Labelbox specifically). This can be the result of either client

labelbox/schema/bulk_import_request.py

@@ -222,9 +222,6 @@ def create_from_objects(cls, client, project_id: str, name: str,
         """
         _validate_ndjson(predictions)
         data_str = ndjson.dumps(predictions)
-        if not data_str:
-            raise ValueError('annotations cannot be empty')
-
         data = data_str.encode('utf-8')
         file_name = _make_file_name(project_id, name)
         request_data = _make_request_data(project_id, name, len(data_str),

labelbox/schema/project.py

@@ -410,16 +410,13 @@ def _is_url_valid(url: Union[str, Path]) -> bool:
                     file=path,
                     validate_file=True,
                 )
-        elif isinstance(annotations, Iterable):
+        else:
             return BulkImportRequest.create_from_objects(
                 client=self.client,
                 project_id=self.uid,
                 name=name,
                 predictions=annotations,  # type: ignore
             )
-        else:
-            raise ValueError(
-                f'Invalid annotations given of type: {type(annotations)}')
 
 
 class LabelingParameterOverride(DbObject):

mypy.ini

@@ -3,6 +3,3 @@ ignore_missing_imports = True
 
 [mypy-ndjson.*]
 ignore_missing_imports = True
-
-[mypy-google.*]
-ignore_missing_imports = True

setup.py

@@ -5,20 +5,15 @@
 
 setuptools.setup(
     name="labelbox",
-    version="2.4.5",
+    version="2.4.4",
     author="Labelbox",
     author_email="engineering@labelbox.com",
     description="Labelbox Python API",
     long_description=long_description,
     long_description_content_type="text/markdown",
     url="https://labelbox.com",
     packages=setuptools.find_packages(),
-    install_requires=[
-        "backoff==1.10.0",
-        "ndjson==0.3.1",
-        "requests>=2.22.0",
-        "google-api-core>=1.22.1",
-    ],
+    install_requires=["backoff==1.10.0", "ndjson==0.3.1", "requests==2.22.0"],
     classifiers=[
         'Development Status :: 3 - Alpha',
         'License :: OSI Approved :: Apache Software License',

tests/integration/test_labeling_frontend.py

@@ -3,16 +3,13 @@
 
 def test_get_labeling_frontends(client):
     frontends = list(client.get_labeling_frontends())
-    assert len(frontends) >= 1, (
-        'Projects should have at least one frontend by default.')
+    assert len(frontends) == 1, frontends
 
     # Test filtering
-    target_frontend = frontends[0]
-    filtered_frontends = client.get_labeling_frontends(
-        where=LabelingFrontend.iframe_url_path ==
-        target_frontend.iframe_url_path)
-    for frontend in filtered_frontends:
-        assert target_frontend == frontend
+    single = list(
+        client.get_labeling_frontends(where=LabelingFrontend.iframe_url_path ==
+                                      frontends[0].iframe_url_path))
+    assert len(single) == 1, single
 
 
 def test_labeling_frontend_connecting_to_project(project):