persist bbox ids when serializing NML (#836)

* persist bbox ids when serializing NML * ensure int * add changelog entry * remove id from BoundingBox, ensure that BoundingBox instances keep their attributes, such as name or color, when applying methods * add test, minor fixes * update changelog * lint fix * nother minor fix * add missing cassette * Update webknossos/webknossos/_nml/parameters.py Co-authored-by: Philipp Otto <[email protected]> * add comments Co-authored-by: Philipp Otto <[email protected]>
scalableminds · Dec 9, 2022 · 10fcfc4 · 10fcfc4
1 parent de4e945
commit 10fcfc4
Show file tree

Hide file tree

Showing 8 changed files with 860 additions and 54 deletions.
diff --git a/webknossos/Changelog.md b/webknossos/Changelog.md
@@ -13,12 +13,15 @@ For upgrade instructions, please check the respective *Breaking Changes* section
 [Commits](https://github.com/scalableminds/webknossos-libs/compare/v0.10.27...HEAD)
 
 ### Breaking Changes
+- Removed the `id` attribute of the `BoundingBox` class, also from the constructor. [#836](https://github.com/scalableminds/webknossos-libs/pull/836)
 
 ### Added
 
 ### Changed
 
 ### Fixed
+- Fixed bounding box serialization in NMLs, so that bounding boxes which are uploaded via annotations are now recognized properly by webKnossos. [#836](https://github.com/scalableminds/webknossos-libs/pull/836)
+- Bounding boxes keep their name, color and visibility when transformed via methods, such as `bbox.padded_with_margins()`. [#836](https://github.com/scalableminds/webknossos-libs/pull/836)
 
 
 ## [0.10.27](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.10.27) - 2022-12-07

diff --git a/webknossos/__generate_client.py b/webknossos/__generate_client.py
@@ -109,11 +109,6 @@ def iterate_request_ids_with_responses() -> Iterable[Tuple[str, bytes]]:
     project_name = "Test_Project"
     explorative_annotation_id = "58135c192faeb34c0081c05d"
 
-    extract_200_response(
-        httpx.post(
-            url=f"{WK_URL}/data/triggers/checkInboxBlocking?token={WK_TOKEN}",
-        )
-    )
     response = httpx.get(
         url=f"{WK_URL}/api/datasets/{organization_id}/{dataset_name}",
         headers={"X-Auth-Token": WK_TOKEN},

diff --git a/webknossos/local_wk_setup.sh b/webknossos/local_wk_setup.sh
@@ -40,6 +40,8 @@ function ensure_local_test_wk {
         exit 1
     fi
 
+    curl -s -X POST -H "X-Auth-Token: $WK_TOKEN" localhost:9000/data/triggers/checkInboxBlocking
+
     WK_ORG_VERSION="$(curl -s https://webknossos.org/api/buildinfo | tr ',"' "\n" | sed -n '/version/{n;n;p;q;}')"
     LOCAL_VERSION="$(curl -s http://localhost:9000/api/buildinfo | tr ',"' "\n" | sed -n '/version/{n;n;p;q;}')"
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,6 +40,8 @@ function ensure_local_test_wk { @@
             exit 1
         fi
+        curl -s -X POST -H "X-Auth-Token: $WK_TOKEN" localhost:9000/data/triggers/checkInboxBlocking
         WK_ORG_VERSION="$(curl -s https://webknossos.org/api/buildinfo | tr ',"' "\n" | sed -n '/version/{n;n;p;q;}')"
         LOCAL_VERSION="$(curl -s http://localhost:9000/api/buildinfo | tr ',"' "\n" | sed -n '/version/{n;n;p;q;}')"
@@ Expand Down @@