merge conflict

Author: jtsodapop

CHANGELOG.md

@@ -2,16 +2,22 @@
 
 # Version 0.0.0 (YYYY-MM-DD) - In Progress
 ### Added
+* Support for document (pdf) de/serialization from exports
+    * Use the `LBV1Converter.serialize()` and `LBV1Converter.deserialize()` methods
+* Support for document (pdf) de/serialization for imports
+    * Use the `NDJsonConverter.serialize()` and `NDJsonConverter.deserialize()` methods
+
+# Version 3.26.1 (2022-08-23)
+### Changed
+* `ModelRun.get_config()`
+    * Modifies get_config to return un-nested Model Run config
+### Added
 * `ModelRun.update_config()`
     * Updates model run training metadata
 * `ModelRun.reset_config()`
     * Resets model run training metadata
 * `ModelRun.get_config()`
     * Fetches model run training metadata
-* Support for document (pdf) de/serialization from exports
-    * Use the `LBV1Converter.serialize()` and `LBV1Converter.deserialize()` methods
-* Support for document (pdf) de/serialization for imports
-    * Use the `NDJsonConverter.serialize()` and `NDJsonConverter.deserialize()` methods
 
 ### Changed
 * `Model.create_model_run()`

docs/source/conf.py

@@ -21,7 +21,7 @@
 copyright = '2021, Labelbox'
 author = 'Labelbox'
 
-release = '3.25.1'
+release = '3.26.1'
 
 # -- General configuration ---------------------------------------------------
 

labelbox/__init__.py

@@ -1,5 +1,5 @@
 name = "labelbox"
-__version__ = "3.26.0"
+__version__ = "3.26.1"
 
 from labelbox.client import Client
 from labelbox.schema.project import Project

labelbox/schema/model_run.py

@@ -310,7 +310,7 @@ def get_config(self) -> Dict[str, Any]:
             }
         """, {'modelRunId': self.uid},
                                   experimental=True)
-        return res["modelRun"]
+        return res["modelRun"]["trainingMetadata"]
 
     @experimental
     def export_labels(

labelbox/schema/project.py

@@ -93,6 +93,22 @@ class QueueMode(Enum):
         Dataset = "Dataset"
 
     def update(self, **kwargs):
+        """ Updates this project with the specified attributes
+
+        Args:
+            kwargs: a dictionary containing attributes to be upserted
+
+        Note that the quality setting cannot be changed after a project has been created. The quality mode
+            for a project is inferred through the following attributes:
+            Benchmark:
+                auto_audit_number_of_labels = 1
+                auto_audit_percentage = 1.0
+            Consensus:
+                auto_audit_number_of_labels > 1
+                auto_audit_percentage <= 1.0
+            Attempting to switch between benchmark and consensus modes is an invalid operation and will result
+            in an error.
+        """
         mode: Optional[Project.QueueMode] = kwargs.pop("queue_mode", None)
         if mode:
             self._update_queue_mode(mode)

tests/integration/annotation_import/test_model_run.py

@@ -71,7 +71,7 @@ def test_model_run_get_config(model_run_with_training_metadata):
     new_config = {"batch_size": 2000}
     model_run_with_training_metadata.update_config(new_config)
     res = model_run_with_training_metadata.get_config()
-    assert res["trainingMetadata"]["batch_size"] == new_config["batch_size"]
+    assert res["batch_size"] == new_config["batch_size"]
 
 
 def test_model_run_data_rows_delete(client, model_run_with_model_run_data_rows):