Allow supplying datastore_url in announce_manual_upload (#1336)

* Allow supplying datastore_url in announce_manual_upload

* format

* changelog

* rstrip slashes from passed datastore and wk uris

Author: fm3

webknossos/Changelog.md

@@ -15,6 +15,7 @@ For upgrade instructions, please check the respective _Breaking Changes_ section
 ### Breaking Changes
 
 ### Added
+- The function `Dataset.announce_manual_upload` now takes an additional optional parameter `dataset_url` to select the correct datastore in a multi-datastore setup. [#1336](https://github.com/scalableminds/webknossos-libs/pull/1336)
 
 ### Changed
 - Every file that sends logging messages has its own logger now. This can be used to selectively disable loggers. [#1335](https://github.com/scalableminds/webknossos-libs/pull/1335)

webknossos/webknossos/client/api_client/datastore_api_client.py

@@ -22,7 +22,7 @@ def __init__(
         headers: dict[str, str] | None = None,
     ):
         super().__init__(timeout_seconds, headers)
-        self.datastore_base_url = datastore_base_url
+        self.datastore_base_url = datastore_base_url.rstrip("/")
 
     @property
     def url_prefix(self) -> str:

webknossos/webknossos/client/api_client/wk_api_client.py

@@ -46,7 +46,7 @@ def __init__(
         headers: dict[str, str] | None = None,
     ):
         super().__init__(timeout_seconds, headers)
-        self.base_wk_url = base_wk_url
+        self.base_wk_url = base_wk_url.rstrip("/")
 
     @property
     def url_prefix(self) -> str:

webknossos/webknossos/dataset/dataset.py

@@ -470,6 +470,7 @@ def announce_manual_upload(
         folder_id: str | RemoteFolder | None,
         require_unique_name: bool = False,
         token: str | None = None,
+        datastore_url: str | None = None,
     ) -> tuple[str, str]:
         """Announce a manual dataset upload to WEBKNOSSOS.
 
@@ -483,6 +484,7 @@ def announce_manual_upload(
             folder_id: Optional ID of folder where dataset should be placed
             require_unique_name: Whether to make request fail in case a dataset with the name already exists
             token: Optional authentication token
+            datastore_url: If the WEBKNOSSOS instance has multiple datastores, supply a url to select one.
 
         Note:
             This is typically only used by administrators with direct file system
@@ -514,8 +516,9 @@ def announce_manual_upload(
             folder_id=folder_id,
             require_unique_name=require_unique_name,
         )
-        upload_url = _cached_get_upload_datastore(context)
-        datastore_api = context.get_datastore_api_client(upload_url)
+        if datastore_url is None:
+            datastore_url = _cached_get_upload_datastore(context)
+        datastore_api = context.get_datastore_api_client(datastore_url)
         response = datastore_api.dataset_reserve_manual_upload(
             dataset_announce, token=token
         )