Merge branch 'develop' into lgluszek/PTDT-2854

Author: lgluszek

docs/conf.py

@@ -16,7 +16,7 @@
 project = 'Python SDK reference'
 copyright = '2024, Labelbox'
 author = 'Labelbox'
-release = '6.4.0'
+release = '6.5.0'
 
 # -- General configuration ---------------------------------------------------
 

libs/labelbox/CHANGELOG.md

@@ -1,4 +1,8 @@
 # Changelog
+# Version 6.5.0 (2025-01-03)
+## Added
+* Support include predictions in catalog exports([#1935](https://github.com/Labelbox/labelbox-python/pull/1935))
+
 # Version 6.4.0 (2024-12-19)
 * Add feature schema attributes to support auto ocr tool in ontologies([#1930](https://github.com/Labelbox/labelbox-python/pull/1930))
 * Move to task queue task id to be optional with default as None for better type support ([#1929](https://github.com/Labelbox/labelbox-python/pull/1929))

libs/labelbox/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "labelbox"
-version = "6.4.0"
+version = "6.5.0"
 description = "Labelbox Python API"
 authors = [{ name = "Labelbox", email = "engineering@labelbox.com" }]
 dependencies = [

libs/labelbox/src/labelbox/__init__.py

@@ -1,6 +1,6 @@
 name = "labelbox"
 
-__version__ = "6.4.0"
+__version__ = "6.5.0"
 
 from labelbox.client import Client
 from labelbox.schema.annotation_import import (

libs/labelbox/src/labelbox/schema/catalog.py

@@ -104,6 +104,7 @@ def _export(
                 "interpolated_frames": False,
                 "all_projects": False,
                 "all_model_runs": False,
+                "predictions": False,
             }
         )
         validate_catalog_export_params(_params)

libs/labelbox/src/labelbox/schema/data_row.py

@@ -315,6 +315,7 @@ def _export(
                 "interpolated_frames": False,
                 "all_projects": False,
                 "all_model_runs": False,
+                "predictions": False,
             }
         )
 

libs/labelbox/src/labelbox/schema/dataset.py

@@ -392,6 +392,7 @@ def _export(
                 "interpolated_frames": False,
                 "all_projects": False,
                 "all_model_runs": False,
+                "predictions": False,
             }
         )
         validate_catalog_export_params(_params)

libs/labelbox/src/labelbox/schema/export_params.py

@@ -29,6 +29,7 @@ class CatalogExportParams(DataRowParams):
     interpolated_frames: Optional[bool]
     all_projects: Optional[bool]
     all_model_runs: Optional[bool]
+    predictions: Optional[bool]
 
 
 class ModelRunExportParams(DataRowParams):

libs/labelbox/src/labelbox/schema/slice.py

@@ -160,6 +160,7 @@ def _export(
                 "interpolated_frames": False,
                 "all_projects": False,
                 "all_model_runs": False,
+                "predictions": False,
             }
         )
         validate_catalog_export_params(_params)

libs/labelbox/tests/integration/test_mmc_data_rows.py

@@ -23,10 +23,11 @@ def mmc_data_row(dataset):
 
 
 @pytest.fixture
-def mmc_data_row_all(dataset, make_metadata_fields, embedding):
+def mmc_data_row_all(dataset, make_metadata_fields, embedding, rand_gen):
     data = ModelEvaluationTemplate()
     data.row_data.rootMessageIds = ["root1"]
-    data.global_key = "global_key"
+    global_key = f"global_key_{rand_gen(str)}"
+    data.global_key = global_key
     vector = [random.uniform(1.0, 2.0) for _ in range(embedding.dims)]
     data.embeddings = [{"embedding_id": embedding.id, "vector": vector}]
     data.metadata_fields = make_metadata_fields
@@ -39,7 +40,7 @@ def mmc_data_row_all(dataset, make_metadata_fields, embedding):
 
     data_row = list(dataset.data_rows())[0]
 
-    yield data_row
+    yield data_row, global_key
 
     data_row.delete()
 
@@ -57,7 +58,7 @@ def test_mmc(mmc_data_row):
 
 
 def test_mmc_all(mmc_data_row_all, embedding, constants):
-    data_row = mmc_data_row_all
+    data_row, global_key = mmc_data_row_all
     assert json.loads(data_row.row_data) == {
         "type": "application/vnd.labelbox.conversational.model-chat-evaluation",
         "draft": True,
@@ -66,7 +67,7 @@ def test_mmc_all(mmc_data_row_all, embedding, constants):
         "messages": {},
         "version": 2,
     }
-    assert data_row.global_key == "global_key"
+    assert data_row.global_key == global_key
     metadata_fields = data_row.metadata_fields
     metadata = data_row.metadata
     assert len(metadata_fields) == 3