From 29e27d8b7325965666b42cda0f1329102d832490 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 18:36:52 -0700 Subject: [PATCH 1/6] Update test data --- lbx_prompt.txt | 8 ++++++-- tests/data/annotation_import/conftest.py | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/lbx_prompt.txt b/lbx_prompt.txt index dd6be260d..19873114d 100644 --- a/lbx_prompt.txt +++ b/lbx_prompt.txt @@ -11930,8 +11930,12 @@ def expected_export_v2_text(): 'annotation_kind': 'TextEntity', 'classifications': [], 'location': { - 'start': 67, - 'end': 128 + 'start': + 66, + 'end': + 128, + 'token': + "more people to express themselves online๐Ÿ˜ž๐Ÿ˜‚โ€š, research suggests" } }], 'classifications': [{ diff --git a/tests/data/annotation_import/conftest.py b/tests/data/annotation_import/conftest.py index 08e4846ed..b6510021d 100644 --- a/tests/data/annotation_import/conftest.py +++ b/tests/data/annotation_import/conftest.py @@ -1499,9 +1499,13 @@ def expected_export_v2_text(): "value": "named_entity", "annotation_kind": "TextEntity", "classifications": [], - "location": { - "start": 67, - "end": 128 + 'location': { + 'start': + 66, + 'end': + 128, + 'token': + "more people to express themselves online๐Ÿ˜ž๐Ÿ˜‚โ€š, research suggests" }, }], "classifications": [ From fa49cef9156a5f861ccd44cd8f94dd01fa0cfb75 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 19:04:00 -0700 Subject: [PATCH 2/6] Update python-package action to not run prod for a PR merge Not sure this is the right logic, but need to make my PR green for now --- .github/workflows/python-package.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index e4c4c1128..f6e5e8749 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -8,6 +8,7 @@ on: jobs: build-prod: + if: ${{ github.event_name }} != 'pull_request' strategy: fail-fast: false matrix: From 716ccf4ba648fa9c0481845dc49a4b1b77796a8c Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 19:06:52 -0700 Subject: [PATCH 3/6] Revert "Update python-package action to not run prod for a PR merge" This reverts commit fa49cef9156a5f861ccd44cd8f94dd01fa0cfb75. --- .github/workflows/python-package.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml index f6e5e8749..e4c4c1128 100644 --- a/.github/workflows/python-package.yml +++ b/.github/workflows/python-package.yml @@ -8,7 +8,6 @@ on: jobs: build-prod: - if: ${{ github.event_name }} != 'pull_request' strategy: fail-fast: false matrix: From 2328ab5c0eab094f1ef1633fe9a4e241affdc457 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 20:08:47 -0700 Subject: [PATCH 4/6] Update text file due to caching issues --- tests/data/annotation_import/conftest.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/data/annotation_import/conftest.py b/tests/data/annotation_import/conftest.py index b6510021d..2cdaaacb6 100644 --- a/tests/data/annotation_import/conftest.py +++ b/tests/data/annotation_import/conftest.py @@ -116,9 +116,9 @@ def document_data_row(rand_gen): def text_data_row(rand_gen): return { "row_data": - "https://storage.googleapis.com/lb-artifacts-testing-public/sdk_integration_test/sample-text-1.txt", + "https://storage.googleapis.com/lb-artifacts-testing-public/sdk_integration_test/sample-text-2.txt", "global_key": - f"https://storage.googleapis.com/lb-artifacts-testing-public/sdk_integration_test/sample-text-1.txt-{rand_gen(str)}", + f"https://storage.googleapis.com/lb-artifacts-testing-public/sdk_integration_test/sample-text-2.txt-{rand_gen(str)}", "media_type": "TEXT", } From d695090c68a4842baa9e97d4bd19524364b8caf5 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 20:22:05 -0700 Subject: [PATCH 5/6] Debug test --- pytest.ini | 2 +- .../data/annotation_import/test_data_types.py | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/pytest.ini b/pytest.ini index e386757c6..dc097a180 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,5 +1,5 @@ [pytest] pythonpath = . -addopts = -rP -vvv --reruns 5 --reruns-delay 10 --durations=20 -n 32 +addopts = -rP -vvv --reruns 1 --reruns-delay 10 --durations=20 -n 32 markers = slow: marks tests as slow (deselect with '-m "not slow"') diff --git a/tests/data/annotation_import/test_data_types.py b/tests/data/annotation_import/test_data_types.py index 65a57c05c..68292b8a3 100644 --- a/tests/data/annotation_import/test_data_types.py +++ b/tests/data/annotation_import/test_data_types.py @@ -308,17 +308,17 @@ def set_project_media_type_from_data_type(project, data_type_class): @pytest.mark.parametrize( "data_type_class", [ - AudioData, - HTMLData, - ImageData, + # AudioData, + # HTMLData, + # ImageData, TextData, - VideoData, - ConversationData, - DocumentData, - DicomData, - LlmPromptCreationData, - LlmPromptResponseCreationData, - LlmResponseCreationData, + # VideoData, + # ConversationData, + # DocumentData, + # DicomData, + # LlmPromptCreationData, + # LlmPromptResponseCreationData, + # LlmResponseCreationData, ], ) def test_import_data_types_v2( From 0e27cd50671d2f482e2ddf4224fb06224ca1de42 Mon Sep 17 00:00:00 2001 From: Val Brodsky Date: Wed, 27 Mar 2024 20:39:48 -0700 Subject: [PATCH 6/6] Update annotation --- pytest.ini | 2 +- tests/data/annotation_import/conftest.py | 4 ++-- .../data/annotation_import/test_data_types.py | 20 +++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/pytest.ini b/pytest.ini index dc097a180..e386757c6 100644 --- a/pytest.ini +++ b/pytest.ini @@ -1,5 +1,5 @@ [pytest] pythonpath = . -addopts = -rP -vvv --reruns 1 --reruns-delay 10 --durations=20 -n 32 +addopts = -rP -vvv --reruns 5 --reruns-delay 10 --durations=20 -n 32 markers = slow: marks tests as slow (deselect with '-m "not slow"') diff --git a/tests/data/annotation_import/conftest.py b/tests/data/annotation_import/conftest.py index 2cdaaacb6..0e6ba9604 100644 --- a/tests/data/annotation_import/conftest.py +++ b/tests/data/annotation_import/conftest.py @@ -987,7 +987,7 @@ def point_inference(prediction_id_mapping): @pytest.fixture def entity_inference(prediction_id_mapping): entity = prediction_id_mapping["named-entity"].copy() - entity.update({"location": {"start": 67, "end": 128}}) + entity.update({"location": {"start": 66, "end": 128}}) del entity["tool"] return entity @@ -1505,7 +1505,7 @@ def expected_export_v2_text(): 'end': 128, 'token': - "more people to express themselves online๐Ÿ˜ž๐Ÿ˜‚โ€š, research suggests" + "more people to express themselves online๐Ÿ˜ž๐Ÿ˜‚, research suggests" }, }], "classifications": [ diff --git a/tests/data/annotation_import/test_data_types.py b/tests/data/annotation_import/test_data_types.py index 68292b8a3..65a57c05c 100644 --- a/tests/data/annotation_import/test_data_types.py +++ b/tests/data/annotation_import/test_data_types.py @@ -308,17 +308,17 @@ def set_project_media_type_from_data_type(project, data_type_class): @pytest.mark.parametrize( "data_type_class", [ - # AudioData, - # HTMLData, - # ImageData, + AudioData, + HTMLData, + ImageData, TextData, - # VideoData, - # ConversationData, - # DocumentData, - # DicomData, - # LlmPromptCreationData, - # LlmPromptResponseCreationData, - # LlmResponseCreationData, + VideoData, + ConversationData, + DocumentData, + DicomData, + LlmPromptCreationData, + LlmPromptResponseCreationData, + LlmResponseCreationData, ], ) def test_import_data_types_v2(