Merge branch 'develop' of https://github.com/Labelbox/labelbox-python into mmw/create-model-run-with-config

Author: mmarinwilcke

README.md

@@ -20,7 +20,7 @@ The Labelbox Python API offers a simple, user-friendly way to interact with the
 
 - Use Python 3.7, 3.8 or 3.9
 - [Create an account](http://app.labelbox.com/)
-- [Generate an API key](https://labelbox.com/docs/api/getting-started#create_api_key)
+- [Generate an API key](https://docs.labelbox.com/docs/create-an-api-key)
 
 ## Installation
 
@@ -59,9 +59,9 @@ pip install labelbox[data]
 
 ## Documentation
 
-- [Visit our docs](https://labelbox.com/docs/python-api) to learn how the SDK works
+- [Visit our docs](https://docs.labelbox.com/reference) to learn how the SDK works
 - Checkout our [notebook examples](examples/) to follow along with interactive tutorials
-- view our [API reference](https://labelbox.com/docs/python-api/api-reference).
+- view our [API reference](https://labelbox-python.readthedocs.io/en/latest/index.html).
 
 ## Authentication
 

examples/annotation_import/image.ipynb

@@ -1,4 +1,4 @@
 [pytest]
-addopts = -s -vv -x --reruns 5 --reruns-delay 10
+addopts = -s -vv -x --reruns 5 --reruns-delay 10 --durations=100
 markers =
     slow: marks tests as slow (deselect with '-m "not slow"')

pytest.ini

@@ -18,7 +18,7 @@
 from labelbox.schema.invite import Invite
 from labelbox.schema.user import User
 
-IMG_URL = "https://picsum.photos/200/300"
+IMG_URL = "https://picsum.photos/200/300.jpg"
 
 
 class Environ(Enum):
@@ -147,8 +147,8 @@ def client(environ: str):
 @pytest.fixture(scope="session")
 def image_url(client):
     return client.upload_data(requests.get(IMG_URL).content,
-                              content_type="application/json",
-                              filename="json_import.json",
+                              content_type="image/jpeg",
+                              filename="image.jpeg",
                               sign=True)
 
 

tests/integration/conftest.py

@@ -19,6 +19,11 @@ def test_labels(configured_project_with_label):
 
     label.delete()
 
+    # TODO: Added sleep to account for ES from catching up to deletion.
+    # Need a better way to query labels in `project.labels()`, because currently,
+    # it intermittently takes too long to sync, causing flaky SDK tests
+    time.sleep(5)
+
     assert list(project.labels()) == []
     assert list(data_row.labels()) == []
 
@@ -36,7 +41,10 @@ def test_label_export(configured_project_with_label):
     # The new exporter doesn't work with the create_label mutation
 
 
-@pytest.mark.skipif(condition=os.environ['LABELBOX_TEST_ENVIRON'] == "onprem",
+# TODO: Skipping this test in staging due to label not updating
+@pytest.mark.skipif(condition=os.environ['LABELBOX_TEST_ENVIRON'] == "onprem" or
+                    os.environ['LABELBOX_TEST_ENVIRON'] == "staging" or
+                    os.environ['LABELBOX_TEST_ENVIRON'] == "custom",
                     reason="does not work for onprem")
 def test_label_update(configured_project_with_label):
     _, _, _, label = configured_project_with_label

tests/integration/test_label.py

@@ -238,4 +238,4 @@ def test_media_type(client, configured_project: Project, rand_gen):
         project = client.create_project(name=rand_gen(str),
                                         media_type=MediaType[media_type])
         assert project.media_type == MediaType[media_type]
-        project.delete()
+        project.delete()