From d68e82a82a2c4b1421263a4f537ca81c6f8611fa Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:16:42 -0600 Subject: [PATCH 1/8] Prep 6.7.0 --- docs/conf.py | 4 ++-- libs/labelbox/CHANGELOG.md | 7 +++++++ libs/labelbox/pyproject.toml | 2 +- libs/labelbox/src/labelbox/__init__.py | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 00dd9f84c..dc26dda07 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,9 +14,9 @@ # -- Project information ----------------------------------------------------- project = 'Python SDK reference' -copyright = '2024, Labelbox' +copyright = '2025, Labelbox' author = 'Labelbox' -release = '6.6.0' +release = '6.7.0' # -- General configuration --------------------------------------------------- diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 4d606365c..897672ecc 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +# Version 6.7.0 (2025-02-04) +## Added +* MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) + +## Fixed +* GraphQL upload SSL configuration([#1937](https://github.com/Labelbox/labelbox-python/pull/1937)) + # Version 6.6.0 (2025-01-14) ## Added * Support for python 3.13([#1940](https://github.com/Labelbox/labelbox-python/pull/1940)) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index 4a8de76db..52796fb3e 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "labelbox" -version = "6.6.0" +version = "6.7.0" description = "Labelbox Python API" authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }] dependencies = [ diff --git a/libs/labelbox/src/labelbox/__init__.py b/libs/labelbox/src/labelbox/__init__.py index 59d9dc8ad..68605ad0c 100644 --- a/libs/labelbox/src/labelbox/__init__.py +++ b/libs/labelbox/src/labelbox/__init__.py @@ -1,6 +1,6 @@ name = "labelbox" -__version__ = "6.6.0" +__version__ = "6.7.0" from labelbox.client import Client from labelbox.schema.annotation_import import ( From 7f5d24f02b02d43eb24e458911b9b951912d6de6 Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:22:54 -0600 Subject: [PATCH 2/8] removed fixed --- libs/labelbox/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 897672ecc..2c54d02ff 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -3,9 +3,6 @@ ## Added * MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) -## Fixed -* GraphQL upload SSL configuration([#1937](https://github.com/Labelbox/labelbox-python/pull/1937)) - # Version 6.6.0 (2025-01-14) ## Added * Support for python 3.13([#1940](https://github.com/Labelbox/labelbox-python/pull/1940)) From 0a38dcedafddd17af3ba4009ade1a4a3391f97fe Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:06:33 -0600 Subject: [PATCH 3/8] improve --- libs/labelbox/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 2c54d02ff..5d0551e41 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -# Version 6.7.0 (2025-02-04) +# Version 6.7.0 (2025-02-05) ## Added -* MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) +* MAL support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) # Version 6.6.0 (2025-01-14) ## Added From 9505fefc693022da020c9677f58d5909da3d15cc Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:16:42 -0600 Subject: [PATCH 4/8] Prep 6.7.0 --- docs/conf.py | 4 ++-- libs/labelbox/CHANGELOG.md | 7 +++++++ libs/labelbox/pyproject.toml | 2 +- libs/labelbox/src/labelbox/__init__.py | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index 00dd9f84c..dc26dda07 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -14,9 +14,9 @@ # -- Project information ----------------------------------------------------- project = 'Python SDK reference' -copyright = '2024, Labelbox' +copyright = '2025, Labelbox' author = 'Labelbox' -release = '6.6.0' +release = '6.7.0' # -- General configuration --------------------------------------------------- diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 4d606365c..897672ecc 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -1,4 +1,11 @@ # Changelog +# Version 6.7.0 (2025-02-04) +## Added +* MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) + +## Fixed +* GraphQL upload SSL configuration([#1937](https://github.com/Labelbox/labelbox-python/pull/1937)) + # Version 6.6.0 (2025-01-14) ## Added * Support for python 3.13([#1940](https://github.com/Labelbox/labelbox-python/pull/1940)) diff --git a/libs/labelbox/pyproject.toml b/libs/labelbox/pyproject.toml index 4a8de76db..52796fb3e 100644 --- a/libs/labelbox/pyproject.toml +++ b/libs/labelbox/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "labelbox" -version = "6.6.0" +version = "6.7.0" description = "Labelbox Python API" authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }] dependencies = [ diff --git a/libs/labelbox/src/labelbox/__init__.py b/libs/labelbox/src/labelbox/__init__.py index 59d9dc8ad..68605ad0c 100644 --- a/libs/labelbox/src/labelbox/__init__.py +++ b/libs/labelbox/src/labelbox/__init__.py @@ -1,6 +1,6 @@ name = "labelbox" -__version__ = "6.6.0" +__version__ = "6.7.0" from labelbox.client import Client from labelbox.schema.annotation_import import ( From 3f6efcc0f51d44e222327f78fa28f857277aa9ff Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Tue, 4 Feb 2025 10:22:54 -0600 Subject: [PATCH 5/8] removed fixed --- libs/labelbox/CHANGELOG.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 897672ecc..2c54d02ff 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -3,9 +3,6 @@ ## Added * MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) -## Fixed -* GraphQL upload SSL configuration([#1937](https://github.com/Labelbox/labelbox-python/pull/1937)) - # Version 6.6.0 (2025-01-14) ## Added * Support for python 3.13([#1940](https://github.com/Labelbox/labelbox-python/pull/1940)) From 23558088d0b7b71105ade0270189e191eee3c941 Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Wed, 5 Feb 2025 13:06:33 -0600 Subject: [PATCH 6/8] improve --- libs/labelbox/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 2c54d02ff..5d0551e41 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -1,7 +1,7 @@ # Changelog -# Version 6.7.0 (2025-02-04) +# Version 6.7.0 (2025-02-05) ## Added -* MAL and GT support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) +* MAL support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) # Version 6.6.0 (2025-01-14) ## Added From 5ffb22908578c5c22bef714207f893eda57d1892 Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:49:41 -0600 Subject: [PATCH 7/8] Fix changelog --- libs/labelbox/CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libs/labelbox/CHANGELOG.md b/libs/labelbox/CHANGELOG.md index 5d0551e41..e2679e3a6 100644 --- a/libs/labelbox/CHANGELOG.md +++ b/libs/labelbox/CHANGELOG.md @@ -1,7 +1,8 @@ # Changelog -# Version 6.7.0 (2025-02-05) +# Version 6.7.0 (2025-02-06) ## Added -* MAL support for pdf relationships([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) +* MAL support for pdf relationships (beta)([#1932](https://github.com/Labelbox/labelbox-python/pull/1932)) +* Allow setting read_only for relationships (beta)([#1950](https://github.com/Labelbox/labelbox-python/pull/1950)) # Version 6.6.0 (2025-01-14) ## Added From fd6c7daf7a14ec577f55c0c9cafa38ccd204f23a Mon Sep 17 00:00:00 2001 From: Gabefire <33893811+Gabefire@users.noreply.github.com> Date: Thu, 6 Feb 2025 10:52:53 -0600 Subject: [PATCH 8/8] format --- .../data/annotation_types/relationship.py | 2 +- .../data/serialization/ndjson/relationship.py | 1 + .../annotation_import/test_relationships.py | 5 +++- .../serialization/ndjson/test_relationship.py | 24 +++++++++++++++---- 4 files changed, 25 insertions(+), 7 deletions(-) diff --git a/libs/labelbox/src/labelbox/data/annotation_types/relationship.py b/libs/labelbox/src/labelbox/data/annotation_types/relationship.py index 760c6a529..a5b84b3ba 100644 --- a/libs/labelbox/src/labelbox/data/annotation_types/relationship.py +++ b/libs/labelbox/src/labelbox/data/annotation_types/relationship.py @@ -19,7 +19,7 @@ class Type(Enum): type: Type = Type.UNIDIRECTIONAL readonly: Optional[bool] = None - @model_validator(mode='after') + @model_validator(mode="after") def check_readonly(self): if self.readonly is True: warnings.warn( diff --git a/libs/labelbox/src/labelbox/data/serialization/ndjson/relationship.py b/libs/labelbox/src/labelbox/data/serialization/ndjson/relationship.py index 6ed4d4ac6..8495fdc04 100644 --- a/libs/labelbox/src/labelbox/data/serialization/ndjson/relationship.py +++ b/libs/labelbox/src/labelbox/data/serialization/ndjson/relationship.py @@ -16,6 +16,7 @@ class _Relationship(BaseModel): type: str readonly: Optional[bool] = None + class NDRelationship(NDAnnotation): relationship: _Relationship diff --git a/libs/labelbox/tests/data/annotation_import/test_relationships.py b/libs/labelbox/tests/data/annotation_import/test_relationships.py index 36d59db72..695bac9b2 100644 --- a/libs/labelbox/tests/data/annotation_import/test_relationships.py +++ b/libs/labelbox/tests/data/annotation_import/test_relationships.py @@ -395,7 +395,10 @@ def test_relationship_readonly_explicit_true(): value=TextEntity(start=30, end=35), ) - with pytest.warns(UserWarning, match="Creating a relationship with readonly=True is in beta.*"): + with pytest.warns( + UserWarning, + match="Creating a relationship with readonly=True is in beta.*", + ): relationship = RelationshipAnnotation( name="rel", value=Relationship( diff --git a/libs/labelbox/tests/data/serialization/ndjson/test_relationship.py b/libs/labelbox/tests/data/serialization/ndjson/test_relationship.py index bdd3816e7..7aea28d95 100644 --- a/libs/labelbox/tests/data/serialization/ndjson/test_relationship.py +++ b/libs/labelbox/tests/data/serialization/ndjson/test_relationship.py @@ -261,13 +261,27 @@ def test_readonly_relationships(): ) # Verify readonly relationship - assert readonly_rel_serialized["relationship"]["source"] == ner_source_serialized["uuid"] - assert readonly_rel_serialized["relationship"]["target"] == ner_target_serialized["uuid"] + assert ( + readonly_rel_serialized["relationship"]["source"] + == ner_source_serialized["uuid"] + ) + assert ( + readonly_rel_serialized["relationship"]["target"] + == ner_target_serialized["uuid"] + ) assert readonly_rel_serialized["relationship"]["type"] == "unidirectional" assert readonly_rel_serialized["relationship"]["readonly"] is True # Verify non-readonly relationship - assert non_readonly_rel_serialized["relationship"]["source"] == ner_source_serialized["uuid"] - assert non_readonly_rel_serialized["relationship"]["target"] == ner_target_serialized["uuid"] - assert non_readonly_rel_serialized["relationship"]["type"] == "bidirectional" + assert ( + non_readonly_rel_serialized["relationship"]["source"] + == ner_source_serialized["uuid"] + ) + assert ( + non_readonly_rel_serialized["relationship"]["target"] + == ner_target_serialized["uuid"] + ) + assert ( + non_readonly_rel_serialized["relationship"]["type"] == "bidirectional" + ) assert non_readonly_rel_serialized["relationship"]["readonly"] is False