From 3c44b43c085ec70ca6cb236d324ec14bdc47e5bf Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Mon, 22 Jul 2024 14:02:35 -0700 Subject: [PATCH 1/3] Re-enable tests using Client get_projects() --- libs/labelbox/tests/integration/test_filtering.py | 2 -- .../tests/integration/test_labeling_frontend.py | 12 +++--------- libs/labelbox/tests/integration/test_project.py | 2 -- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/libs/labelbox/tests/integration/test_filtering.py b/libs/labelbox/tests/integration/test_filtering.py index 6ea387d57..082809935 100644 --- a/libs/labelbox/tests/integration/test_filtering.py +++ b/libs/labelbox/tests/integration/test_filtering.py @@ -24,8 +24,6 @@ def project_to_test_where(client, rand_gen): # Avoid assertions using equality to prevent intermittent failures due to # other builds simultaneously adding projects to test org -@pytest.mark.skip( - reason="broken due to get_projects HF for sunset-custom-editor") def test_where(client, project_to_test_where): p_a, p_b, p_c = project_to_test_where p_a_name = p_a.name diff --git a/libs/labelbox/tests/integration/test_labeling_frontend.py b/libs/labelbox/tests/integration/test_labeling_frontend.py index 82c0e01d7..59ab0b924 100644 --- a/libs/labelbox/tests/integration/test_labeling_frontend.py +++ b/libs/labelbox/tests/integration/test_labeling_frontend.py @@ -8,21 +8,15 @@ def test_get_labeling_frontends(client): assert len(filtered_frontends) -@pytest.mark.skip( - reason="broken due to get_projects HF for sunset-custom-editor") def test_labeling_frontend_connecting_to_project(project): client = project.client default_labeling_frontend = next( client.get_labeling_frontends(where=LabelingFrontend.name == "Editor")) - assert project.labeling_frontend( - ) == default_labeling_frontend # we now have a default labeling frontend + assert project.labeling_frontend() is None - frontend = list(project.client.get_labeling_frontends())[0] - project.labeling_frontend.connect(frontend) - - project.labeling_frontend.connect(frontend) + project.labeling_frontend.connect(default_labeling_frontend) assert project.labeling_frontend() == default_labeling_frontend - project.labeling_frontend.disconnect(frontend) + project.labeling_frontend.disconnect(default_labeling_frontend) assert project.labeling_frontend() == None diff --git a/libs/labelbox/tests/integration/test_project.py b/libs/labelbox/tests/integration/test_project.py index 41ad828d9..eb083e52e 100644 --- a/libs/labelbox/tests/integration/test_project.py +++ b/libs/labelbox/tests/integration/test_project.py @@ -119,8 +119,6 @@ def delete_tag(tag_id: str): delete_tag(tagB.uid) -@pytest.mark.skip( - reason="broken due to get_projects HF for sunset-custom-editor") def test_project_filtering(client, rand_gen, data_for_project_test): name_1 = rand_gen(str) p1 = data_for_project_test(name_1) From 809a4c8759ad7ea2f7a7ba25ee0b29848c4678db Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Tue, 23 Jul 2024 14:42:23 -0700 Subject: [PATCH 2/3] Remove test_labeler_performance.py Not possible to test becaues new labeler performance api delays data collection for up to 30 mins --- .../integration/test_labeler_performance.py | 20 ------------------- 1 file changed, 20 deletions(-) delete mode 100644 libs/labelbox/tests/integration/test_labeler_performance.py diff --git a/libs/labelbox/tests/integration/test_labeler_performance.py b/libs/labelbox/tests/integration/test_labeler_performance.py deleted file mode 100644 index 34bb7c8ff..000000000 --- a/libs/labelbox/tests/integration/test_labeler_performance.py +++ /dev/null @@ -1,20 +0,0 @@ -from datetime import datetime, timezone, timedelta -import pytest -import os - - -@pytest.mark.skipif( - condition=os.environ['LABELBOX_TEST_ENVIRON'] != "prod", - reason="only works for prod") -def test_labeler_performance(configured_project_with_label): - project, _, _, _ = configured_project_with_label - - labeler_performance = list(project.labeler_performance()) - assert len(labeler_performance) == 1 - my_performance = labeler_performance[0] - assert my_performance.user == project.client.get_user() - assert my_performance.count == 1 - assert isinstance(my_performance.last_activity_time, datetime) - now_utc = datetime.now().astimezone(timezone.utc) - assert timedelta(0) < now_utc - my_performance.last_activity_time < \ - timedelta(seconds=60) From 3bab252a5fb2dc5e38eb9ab0a46dfa18a6962251 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Tue, 23 Jul 2024 15:21:36 -0700 Subject: [PATCH 3/3] Downgrade mypy 1.11.0 --> 1.10.1 due to failures with 3.8 --- libs/labelbox/pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index 866afbf25..b3d7fe2f2 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -11,6 +11,7 @@ dependencies = [ "strenum>=0.4.15", "tqdm>=4.66.2", "geojson>=3.1.0", + "mypy==1.10.1", ] readme = "README.md" requires-python = ">=3.8"