Fix cli download (#1083)

* Start implementing logic for distinguish annotation and dataset download.

* Update download cli function.

* Update changelog

* Update webknossos/Changelog.md

Co-authored-by: Florian M <[email protected]>

* Raising errors when download fails instead of printing a message.

---------

Co-authored-by: Florian M <[email protected]>

Author: markbader

webknossos/Changelog.md

@@ -21,6 +21,7 @@ For upgrade instructions, please check the respective _Breaking Changes_ section
 - Moved functional parts of merge volume annotation CLI to Dataset and Annotation classes. [1055](https://github.com/scalableminds/webknossos-libs/pull/1055)
 
 ### Fixed
+- Fixed an issue with downloading annotations through the Command Line Interface. [#1083](https://github.com/scalableminds/webknossos-libs/pull/1083)
 
 
 ## [0.14.22](https://github.com/scalableminds/webknossos-libs/releases/tag/v0.14.22) - 2024-05-13

webknossos/webknossos/cli/download.py

@@ -1,13 +1,15 @@
 """This module takes care of downloading WEBKNOSSOS datasets."""
 
+import re
 from typing import Any, List, Optional
 
 import typer
 from typing_extensions import Annotated
 
-from ..annotation import Annotation
+from ..annotation.annotation import _ANNOTATION_URL_REGEX, Annotation
 from ..client import webknossos_context
-from ..dataset import Dataset
+from ..client._resolve_short_link import resolve_short_link
+from ..dataset.dataset import _DATASET_URL_REGEX, Dataset
 from ..geometry import BoundingBox, Mag
 from ._utils import parse_bbox, parse_mag, parse_path
 
@@ -72,15 +74,24 @@ def main(
 
     layers = layer if layer else None
     mags = mag if mag else None
+    url = resolve_short_link(url)
 
     with webknossos_context(token=token):
-        try:
+        if re.match(_DATASET_URL_REGEX, url):
             Dataset.download(
                 dataset_name_or_url=url,
                 path=target,
                 bbox=bbox,
                 layers=layers,
                 mags=mags,
             )
-        except AssertionError:
+        elif re.match(_ANNOTATION_URL_REGEX, url):
             Annotation.download(annotation_id_or_url=url).save(target)
+        else:
+            raise RuntimeError(
+                "The provided URL does not lead to a dataset or annotation."
+            )
+
+
+if __name__ == "__main__":
+    typer.run(main)