kleinkram 0.38.1.dev20250113080249__py3-none-any.whl → 0.38.1.dev20250207122632__py3-none-any.whl

kleinkram/api/routes.py

@@ -75,7 +75,6 @@ FILE_ENDPOINT = "/file/many"
 MISSION_ENDPOINT = "/mission/many"
 PROJECT_ENDPOINT = "/project/many"
 
-MISSION_BY_NAME = "/mission/byName"
 TAG_TYPE_BY_NAME = "/tag/filtered"
 
 
@@ -109,7 +108,6 @@ def _project_query_to_params(
         params[Params.PROJECT_PATTERNS.value] = project_query.patterns
     if project_query.ids:
         params[Params.PROJECT_IDS.value] = list(map(str, project_query.ids))
-    params = _handle_list_params(params)
     return params
 
 
@@ -119,7 +117,6 @@ def _mission_query_to_params(mission_query: MissionQuery) -> Dict[str, List[str]
         params[Params.MISSION_PATTERNS.value] = mission_query.patterns
     if mission_query.ids:
         params[Params.MISSION_IDS.value] = list(map(str, mission_query.ids))
-    params = _handle_list_params(params)
     return params
 
 
@@ -129,7 +126,6 @@ def _file_query_to_params(file_query: FileQuery) -> Dict[str, List[str]]:
         params[Params.FILE_PATTERNS.value] = list(file_query.patterns)
     if file_query.ids:
         params[Params.FILE_IDS.value] = list(map(str, file_query.ids))
-    params = _handle_list_params(params)
     return params
 
 

kleinkram/cli/app.py

@@ -27,6 +27,7 @@ from kleinkram.cli._project import project_typer
 from kleinkram.cli._upload import upload_typer
 from kleinkram.cli._verify import verify_typer
 from kleinkram.cli.error_handling import ErrorHandledTyper
+from kleinkram.cli.error_handling import display_error
 from kleinkram.config import Config
 from kleinkram.config import check_config_compatibility
 from kleinkram.config import get_config
@@ -109,9 +110,12 @@ app.add_typer(project_typer, name="project", rich_help_panel=CommandTypes.CRUD)
 # attach error handler to app
 @app.error_handler(Exception)
 def base_handler(exc: Exception) -> int:
-    if not get_shared_state().debug:
-        Console(file=sys.stderr).print(f"{type(exc).__name__}: {exc}", style="red")
-        logger.error(format_traceback(exc))
+    shared_state = get_shared_state()
+
+    display_error(exc=exc, verbose=shared_state.verbose)
+    logger.error(format_traceback(exc))
+
+    if not shared_state.debug:
         return 1
     raise exc
 

kleinkram/cli/error_handling.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import sys
 from collections import OrderedDict
 from typing import Any
 from typing import Callable
@@ -7,6 +8,10 @@ from typing import Type
 
 import typer
 from click import ClickException
+from rich.console import Console
+from rich.panel import Panel
+
+from kleinkram.utils import upper_camel_case_to_words
 
 ExceptionHandler = Callable[[Exception], int]
 
@@ -42,3 +47,21 @@ class ErrorHandledTyper(typer.Typer):
                     exit_code = handler(e)
                     raise SystemExit(exit_code)
             raise
+
+
+def display_error(*, exc: Exception, verbose: bool) -> None:
+    split_exc_name = upper_camel_case_to_words(type(exc).__name__)
+
+    if verbose:
+        panel = Panel(
+            str(exc),  # get the error message
+            title=" ".join(split_exc_name),
+            style="red",
+            border_style="bold",
+        )
+        Console(file=sys.stderr).print(panel)
+    else:
+        text = f"{type(exc).__name__}"
+        if str(exc):
+            text += f": {exc}"
+        print(text, file=sys.stderr)

kleinkram/utils.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
 import base64
-import fnmatch
 import hashlib
+import re
 import string
 import traceback
 from hashlib import md5
@@ -14,7 +14,6 @@ from typing import Optional
 from typing import Sequence
 from typing import Tuple
 from typing import TypeVar
-from typing import Union
 from uuid import UUID
 
 import yaml
@@ -55,6 +54,11 @@ def file_paths_from_files(
         }
 
 
+def upper_camel_case_to_words(s: str) -> List[str]:
+    """split `s` given upper camel case to words"""
+    return re.sub("([a-z])([A-Z])", r"\1 \2", s).split()
+
+
 def split_args(args: Sequence[str]) -> Tuple[List[UUID], List[str]]:
     """\
     split a sequece of strings into a list of UUIDs and a list of names

{kleinkram-0.38.1.dev20250113080249.dist-info → kleinkram-0.38.1.dev20250207122632.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: kleinkram
-Version: 0.38.1.dev20250113080249
+Version: 0.38.1.dev20250207122632
 Summary: give me your bags
 Author: Cyrill Püntener, Dominique Garmier, Johann Schwabe
 Classifier: Programming Language :: Python :: 3

{kleinkram-0.38.1.dev20250113080249.dist-info → kleinkram-0.38.1.dev20250207122632.dist-info}/RECORD

@@ -10,7 +10,7 @@ kleinkram/models.py,sha256=8nJlPrKVLSmehspeuQSFV6nUo76JzehUn6KIZYH1xy4,1832
 kleinkram/printing.py,sha256=fgSlfRaGqQ7dNiIZGMvEPxMatmUL3MrCvh2ibrz9b_s,9914
 kleinkram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/types.py,sha256=nfDjj8TB1Jn5vqO0Xg6qhLOuKom9DDhe62BrngqnVGM,185
-kleinkram/utils.py,sha256=XX5RjN_-B1eQX-ddlmHypNQQkpxPwwxe6sN0dMYo1uU,6137
+kleinkram/utils.py,sha256=6HFqTw7-eqDEjNG_PsVEQNMNK-RWOqPsoiZI5SK8F7Q,6270
 kleinkram/wrappers.py,sha256=4xXU43eNnvMG2sssU330MmTLSSRdurOpnZ-zNGOGmt0,11342
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/api/client.py,sha256=t6pWY29bQi36IhfIy98Ijc-w-3LzcBTJxXprfPIdwJo,3614
@@ -18,7 +18,7 @@ kleinkram/api/deser.py,sha256=-eP0haBAFr-dRWJ1v-P5o_rxA8vOBlZMtAGXW8ItIAk,4870
 kleinkram/api/file_transfer.py,sha256=VbVQh6F7r81207OIx8zwnRGhA6SpXmzBhJQHQgR8tso,12982
 kleinkram/api/pagination.py,sha256=P_zPsBKlMWkmAv-YfUNHaGW-XLB_4U8BDMrKyiDFIXk,1370
 kleinkram/api/query.py,sha256=gn5yf-eRB_Bcw2diLjt66yQtorrZMKdj5_oNA_oOhvc,3281
-kleinkram/api/routes.py,sha256=UpaEIV4Vy9vOVCjaV_4Jk83AnB0ilFJWPeLiVpIPN94,12270
+kleinkram/api/routes.py,sha256=xtNZOwrcjcePSrrx7tY0bCB_i6m9z2Gtd8rvrMfxpnM,12111
 kleinkram/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/cli/_download.py,sha256=H4YlXJkZE4Md02nzgrO_i8Hsm4ZIejPsxBEKkcn4KHs,2371
 kleinkram/cli/_endpoint.py,sha256=oY0p4bnuHLEDJCXtTmir4AHswcKAygZ8I4IWC3RFcKc,1796
@@ -27,22 +27,23 @@ kleinkram/cli/_mission.py,sha256=zDFnOozOFckpuREFgIPt1IzG5q3b1bsNxYlWQoHoz5A,530
 kleinkram/cli/_project.py,sha256=N0C96NC_onCEwTteYp2wgkkwkdJt-1q43LFdqNXfjC8,3398
 kleinkram/cli/_upload.py,sha256=gOhbjbmqhmwW7p6bWlSvI53vLHvBFO9QqD1kdU92I2k,2813
 kleinkram/cli/_verify.py,sha256=0ABVa4U_WzaV36ClR8NsOIG7KAMRlnFmsbtnHhbWVj4,1742
-kleinkram/cli/app.py,sha256=vbIP08b_qTItZGygpzO4rKX6ISJNypGSPNn8CahaLK0,6481
-kleinkram/cli/error_handling.py,sha256=ZZ3xTych-BdVGAKMjHbtQRIFoILxYOD2yo8Zg1wdozA,1280
+kleinkram/cli/app.py,sha256=pBPv_rDVer5aCelLLfBBqEofSm0yDB3GOBT6qVkd2vw,6539
+kleinkram/cli/error_handling.py,sha256=wK3tzeKVSrZm-xmiyzGLnGT2E4TRpyxhaak6GWGP7P8,1921
 testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-testing/backend_fixtures.py,sha256=3BDHWrHz2awhItOEyb4LCSa3G2yKXP7WOqlrImshSyk,1660
+testing/backend_fixtures.py,sha256=79gB_s9cun3B1KGUA0YFcga5rN-rm_9zTRt1HajxRbI,1590
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=5MLYQOtQoXWl0TRkYntYKNdqpd4hl9m0XTRi5OXanYI,104
 tests/test_config.py,sha256=gfQUjwJb2rfvrNbi7cfkNwLr_DFn4mWMM29l3bunsBk,3269
 tests/test_core.py,sha256=JbzB05LWmaaP77uXeTOQtCJD2AJT0zO9zhDfcZ3GNH8,5139
 tests/test_end_to_end.py,sha256=kIY62viZk2_d5HGt4GVNTkDjR0f1IkAv9OJ8HSqcBG8,3172
-tests/test_fixtures.py,sha256=BiR_CRFgSZ-jh6uUcQTei2WNLhqMSPf5ORtrwn6cBZY,1002
+tests/test_error_handling.py,sha256=qPSMKF1qsAHyUME0-krxbIrk38iGKkhAyAah-KwN4NE,1300
+tests/test_fixtures.py,sha256=UlPmGbEsGvrDPsaStGMRjNvrVPGjCqOB0RMfLJq2VRA,1071
 tests/test_printing.py,sha256=qCr04OJVl5ouht9FoeWGKOi8MZXevVV1EDghzV1JaMc,1903
 tests/test_query.py,sha256=fExmCKXLA7-9j2S2sF_sbvRX_2s6Cp3a7OTcqE25q9g,3864
-tests/test_utils.py,sha256=4HpBHy9goIxUIbuoD3-GaNbDHyujPXPESzkVC3RTkf8,4148
+tests/test_utils.py,sha256=eUBYrn3xrcgcaxm1X4fqZaX4tRvkbI6rh6BUbNbu9T0,4784
 tests/test_wrappers.py,sha256=TbcTyO2L7fslbzgfDdcVZkencxNQ8cGPZm_iB6c9d6Q,2673
-kleinkram-0.38.1.dev20250113080249.dist-info/METADATA,sha256=_Jcd7lxd8ai8gqM9O2sd2jJBRVfgN00KVmjnj-IfjLo,2333
-kleinkram-0.38.1.dev20250113080249.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kleinkram-0.38.1.dev20250113080249.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.38.1.dev20250113080249.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.38.1.dev20250113080249.dist-info/RECORD,,
+kleinkram-0.38.1.dev20250207122632.dist-info/METADATA,sha256=iRYZsQuqJldM_lQrNcC3EBuUuut-8VX77uNt9Z-2rR0,2333
+kleinkram-0.38.1.dev20250207122632.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+kleinkram-0.38.1.dev20250207122632.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.38.1.dev20250207122632.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.38.1.dev20250207122632.dist-info/RECORD,,

testing/backend_fixtures.py

@@ -8,9 +8,7 @@ import pytest
 
 from kleinkram import create_mission
 from kleinkram import create_project
-from kleinkram import delete_mission
 from kleinkram import delete_project
-from kleinkram import list_files
 from kleinkram import list_missions
 from kleinkram import list_projects
 from kleinkram import upload

tests/test_error_handling.py

@@ -0,0 +1,44 @@
+from __future__ import annotations
+
+import pytest
+
+from kleinkram.cli.error_handling import display_error
+
+
+class MyException(Exception):
+    pass
+
+
+def test_display_error_not_verbose(capsys):
+    exc = MyException("hello")
+
+    display_error(exc=exc, verbose=False)
+
+    out, err = capsys.readouterr()
+
+    assert out == ""
+    assert err == "MyException: hello\n"
+
+    exc = MyException()
+
+    display_error(exc=exc, verbose=False)
+
+    out, err = capsys.readouterr()
+
+    assert out == ""
+    assert err == "MyException\n"
+
+
+def test_display_error_verbose(capsys):
+    exc = MyException("hello")
+
+    display_error(exc=exc, verbose=True)
+
+    out, err = capsys.readouterr()
+
+    assert out == ""
+    assert err == (
+        "╭──────────────────────────────── My Exception ────────────────────────────────╮\n"
+        "│ hello                                                                        │\n"
+        "╰──────────────────────────────────────────────────────────────────────────────╯\n"
+    )

tests/test_fixtures.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+import pytest
+
 from kleinkram import list_files
 from kleinkram import list_missions
 from kleinkram import list_projects
@@ -7,11 +9,13 @@ from testing.backend_fixtures import DATA_FILES
 from testing.backend_fixtures import PROJECT_DESCRIPTION
 
 
+@pytest.mark.slow
 def test_project_fixture(project):
     assert list_projects(project_ids=[project.id])[0].id == project.id
     assert project.description == PROJECT_DESCRIPTION
 
 
+@pytest.mark.slow
 def test_mission_fixture(mission, project):
     assert mission.project_id == project.id
     assert list_missions(mission_ids=[mission.id])[0].id == mission.id
@@ -23,6 +27,7 @@ def test_mission_fixture(mission, project):
     )
 
 
+@pytest.mark.slow
 def test_empty_mission_fixture(empty_mission, project):
     assert empty_mission.project_id == project.id
     assert list_missions(mission_ids=[empty_mission.id])[0].id == empty_mission.id

tests/test_utils.py

@@ -17,6 +17,7 @@ from kleinkram.utils import parse_path_like
 from kleinkram.utils import parse_uuid_like
 from kleinkram.utils import singleton_list
 from kleinkram.utils import split_args
+from kleinkram.utils import upper_camel_case_to_words
 
 
 def test_split_args():
@@ -135,3 +136,14 @@ def test_parse_uuid_like() -> None:
 def test_parse_path_like() -> None:
     assert parse_path_like("test") == Path("test")
     assert parse_path_like(Path("test")) == Path("test")
+
+
+def test_upper_camel_case_to_words() -> None:
+    assert upper_camel_case_to_words("HelloWorld") == ["Hello", "World"]
+    assert upper_camel_case_to_words("HelloWorldAgain") == ["Hello", "World", "Again"]
+    assert upper_camel_case_to_words("Hello") == ["Hello"]
+    assert upper_camel_case_to_words("hello") == ["hello"]
+    assert upper_camel_case_to_words("") == []
+    assert upper_camel_case_to_words("not_camel_case") == ["not_camel_case"]
+    assert upper_camel_case_to_words("*#?-_") == ["*#?-_"]
+    assert upper_camel_case_to_words("helloWorld") == ["hello", "World"]