kleinkram 0.39.0.dev20250224101309__py3-none-any.whl → 0.40.0__py3-none-any.whl

kleinkram/api/client.py

@@ -148,7 +148,9 @@ class AuthenticatedClient(httpx.Client):
                 raise NotAuthenticated
 
             logger.info(f"retrying request {method} {full_url}")
-            resp = super().request(method, full_url, *args, **kwargs)
+            resp = super().request(
+                method, full_url, params=httpx_params, *args, **kwargs
+            )
             logger.info(f"got response {resp}")
             return resp
         else:

kleinkram/cli/app.py

@@ -29,6 +29,7 @@ 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 MAX_TABLE_SIZE
 from kleinkram.config import Config
 from kleinkram.config import check_config_compatibility
 from kleinkram.config import get_config
@@ -179,6 +180,11 @@ def cli(
         None, "--version", "-v", callback=_version_callback
     ),
     log_level: Optional[LogLevel] = typer.Option(None, help="Set log level."),
+    max_lines: int = typer.Option(
+        MAX_TABLE_SIZE,
+        "--max-lines",
+        help="Maximum number of lines when pretty printing tables. -1 for unlimited.",
+    ),
 ):
     if not check_config_compatibility():
         typer.confirm("found incompatible config file, overwrite?", abort=True)
@@ -189,6 +195,10 @@ def cli(
     shared_state.verbose = verbose
     shared_state.debug = debug
 
+    if max_lines < 0 and max_lines != -1:
+        raise typer.BadParameter("`--max-lines` must be -1 or positive")
+    shared_state.max_table_size = max_lines
+
     if shared_state.debug and log_level is None:
         log_level = LogLevel.DEBUG
     if log_level is None:

kleinkram/config.py

@@ -24,10 +24,12 @@ from rich.text import Text
 
 from kleinkram._version import __local__
 from kleinkram._version import __version__
+from kleinkram.utils import format_traceback
 
 logger = logging.getLogger(__name__)
 
 CONFIG_PATH = Path().home() / ".kleinkram.json"
+MAX_TABLE_SIZE = 256
 
 
 class Environment(Enum):
@@ -74,8 +76,8 @@ def get_env() -> Environment:
 
 
 ACTION_API_KEY = "KLEINKRAM_API_KEY"
-ACTION_API = "KLEINKRAM_API"
-ACTION_S3 = "KLEINKRAM_S3"
+ACTION_API = "KLEINKRAM_API_ENDPOINT"
+ACTION_S3 = "KLEINKRAM_S3_ENDPOINT"
 
 
 def _get_endpoint_from_action_env_vars() -> Optional[Endpoint]:
@@ -166,13 +168,28 @@ def _config_from_dict(dct: Dict[str, Any]) -> Config:
     )
 
 
-def save_config(config: Config, path: Path = CONFIG_PATH) -> None:
-    fd, temp_path = tempfile.mkstemp()
+def _safe_config_write(
+    config: Config, path: Path, tmp_dir: Optional[Path] = None
+) -> None:
+    fd, temp_path = tempfile.mkstemp(dir=tmp_dir)
     with os.fdopen(fd, "w") as f:
         json.dump(_config_to_dict(config), f)
     os.replace(temp_path, path)
 
 
+def _unsafe_config_write(config: Config, path: Path) -> None:
+    with open(path, "w") as f:
+        json.dump(_config_to_dict(config), f)
+
+
+def save_config(config: Config, path: Path = CONFIG_PATH) -> None:
+    try:
+        _safe_config_write(config, path)
+    except Exception as e:
+        logger.warning(f"failed to safe write config {format_traceback(e)}")
+        _unsafe_config_write(config, path)
+
+
 def _load_config_if_compatible(path: Path) -> Optional[Config]:
     if not path.exists():
         return None
@@ -234,7 +251,7 @@ def endpoint_table(config: Config) -> Table:
         display_name = (
             Text(f"* {name}", style="bold yellow")
             if name == config.selected_endpoint
-            else Text(name)
+            else Text(f"  {name}")
         )
         table.add_row(display_name, endpoint.api, endpoint.s3)
     return table
@@ -245,6 +262,7 @@ class SharedState:
     log_file: Optional[Path] = None
     verbose: bool = True
     debug: bool = False
+    max_table_size: int = MAX_TABLE_SIZE
 
 
 SHARED_STATE = SharedState()

kleinkram/printing.py

@@ -17,6 +17,7 @@ from rich.console import Console
 from rich.table import Table
 from rich.text import Text
 
+from kleinkram.config import get_shared_state
 from kleinkram.core import FileVerificationStatus
 from kleinkram.models import File
 from kleinkram.models import FileState
@@ -46,6 +47,11 @@ FILE_VERIFICATION_STATUS_STYLES = {
 }
 
 
+def _add_placeholder_row(table: Table, skipped: int) -> None:
+    first_column = f"... ({skipped} more)"
+    table.add_row(first_column, *["..." for _ in range(len(table.columns) - 1)])
+
+
 def file_state_to_text(file_state: FileState) -> Text:
     return Text(file_state.value, style=FILE_STATE_COLOR[file_state])
 
@@ -114,8 +120,11 @@ def projects_to_table(projects: Sequence[Project]) -> Table:
     table.add_column("name")
     table.add_column("description")
 
-    for project in projects:
+    max_table_size = get_shared_state().max_table_size
+    for project in projects[:max_table_size]:
         table.add_row(str(project.id), project.name, project.description)
+    if len(projects) > max_table_size:
+        _add_placeholder_row(table, skipped=len(projects) - max_table_size)
     return table
 
 
@@ -136,10 +145,11 @@ def missions_to_table(missions: Sequence[Mission]) -> Table:
     if not missions_tp:
         return table
     last_project: Optional[str] = None
-    for project, _, mission in missions_tp:
+    max_table_size = get_shared_state().max_table_size
+    for project, _, mission in missions_tp[:max_table_size]:
         # add delimiter row if project changes
         if last_project is not None and last_project != project:
-            table.add_row()
+            table.add_section()
         last_project = project
 
         table.add_row(
@@ -149,6 +159,9 @@ def missions_to_table(missions: Sequence[Mission]) -> Table:
             str(mission.number_of_files),
             format_bytes(mission.size),
         )
+
+    if len(missions_tp) > max_table_size:
+        _add_placeholder_row(table, skipped=len(missions_tp) - max_table_size)
     return table
 
 
@@ -174,9 +187,10 @@ def files_to_table(
         return table
 
     last_mission: Optional[str] = None
-    for _, mission, _, file in files_tp:
+    max_table_size = get_shared_state().max_table_size
+    for _, mission, _, file in files_tp[:max_table_size]:
         if last_mission is not None and last_mission != mission and delimiters:
-            table.add_row()
+            table.add_section()
         last_mission = mission
 
         table.add_row(
@@ -188,6 +202,10 @@ def files_to_table(
             format_bytes(file.size),
             ", ".join(file.categories),
         )
+
+    if len(files_tp) > max_table_size:
+        _add_placeholder_row(table, skipped=len(files_tp) - max_table_size)
+
     return table
 
 
@@ -273,7 +291,8 @@ def print_file_verification_status(
     either using pprint or as a list for piping
     """
     if pprint:
-        Console().print(file_verification_status_table(file_status))
+        table = file_verification_status_table(file_status)
+        Console().print(table)
     else:
         for path, status in file_status.items():
             stream = (
@@ -288,7 +307,8 @@ def print_files(files: Sequence[File], *, pprint: bool) -> None:
     either using pprint or as a list for piping
     """
     if pprint:
-        Console().print(files_to_table(files))
+        table = files_to_table(files)
+        Console().print(table)
     else:
         for file in files:
             stream = sys.stdout if file.state == FileState.OK else sys.stderr
@@ -301,7 +321,8 @@ def print_missions(missions: Sequence[Mission], *, pprint: bool) -> None:
     either using pprint or as a list for piping
     """
     if pprint:
-        Console().print(missions_to_table(missions))
+        table = missions_to_table(missions)
+        Console().print(table)
     else:
         for mission in missions:
             print(mission.id)
@@ -313,7 +334,8 @@ def print_projects(projects: Sequence[Project], *, pprint: bool) -> None:
     either using pprint or as a list for piping
     """
     if pprint:
-        Console().print(projects_to_table(projects))
+        table = projects_to_table(projects)
+        Console().print(table)
     else:
         for project in projects:
             print(project.id)
@@ -325,7 +347,8 @@ def print_file_info(file: File, *, pprint: bool) -> None:
     either using pprint or as a list for piping
     """
     if pprint:
-        Console().print(file_info_table(file))
+        table = file_info_table(file)
+        Console().print(table)
     else:
         file_dct = asdict(file)
         for key in file_dct:

kleinkram/utils.py

@@ -40,10 +40,7 @@ def file_paths_from_files(
     determines the destinations for a sequence of `File` objects,
     possibly nested by project and mission
     """
-    if (
-        len(set([(file.project_id, file.mission_id) for file in files])) > 1
-        and not allow_nested
-    ):
+    if len(set([file.mission_id for file in files])) > 1 and not allow_nested:
         raise ValueError("files from multiple missions were selected")
     elif not allow_nested:
         return {dest / file.name: file for file in files}

{kleinkram-0.39.0.dev20250224101309.dist-info → kleinkram-0.40.0.dist-info}/METADATA

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

{kleinkram-0.39.0.dev20250224101309.dist-info → kleinkram-0.40.0.dist-info}/RECORD

@@ -2,18 +2,18 @@ kleinkram/__init__.py,sha256=xIJqTJw2kbCGryGlCeAdpmtR1FTxmrW1MklUNQEaj74,1061
 kleinkram/__main__.py,sha256=B9RiZxfO4jpCmWPUHyKJ7_EoZlEG4sPpH-nz7T_YhhQ,125
 kleinkram/_version.py,sha256=QYJyRTcqFcJj4qWYpqs7WcoOP6jxDMqyvxLY-cD6KcE,129
 kleinkram/auth.py,sha256=XD_rHOyJmYYfO7QJf3TLYH5qXA22gXGWi7PT3jujlVs,2968
-kleinkram/config.py,sha256=mHpyOfJHhstHXq1FtTLAL4FOmGmkF45oCtAIFDLpWjI,6832
+kleinkram/config.py,sha256=_ZfOSfEZaK8ZbgoNRZL2h3ozZfxHnKqmLJ9mUIYOxBU,7413
 kleinkram/core.py,sha256=Q7OYIKPN9K6kxf9Eq7r5XRHPJ3RtT7SBZp_3_CS8yuY,8429
 kleinkram/errors.py,sha256=4mygNxkf6IBgaiRWY95qu0v6z4TAXA3G6CUcXC9FU3s,772
 kleinkram/main.py,sha256=BTE0mZN__xd46wBhFi6iBlK9eGGQvJ1LdUMsbnysLi0,172
 kleinkram/models.py,sha256=8nJlPrKVLSmehspeuQSFV6nUo76JzehUn6KIZYH1xy4,1832
-kleinkram/printing.py,sha256=OLApOtXytGZGzdpQ9Kd-swMrPAjdnvCo5jCpLoa2lIE,11238
+kleinkram/printing.py,sha256=fpkJFeVp5pzZ_cZY6nzYDV_qDFWHKHxiW-DaH2PPNeY,12160
 kleinkram/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 kleinkram/types.py,sha256=nfDjj8TB1Jn5vqO0Xg6qhLOuKom9DDhe62BrngqnVGM,185
-kleinkram/utils.py,sha256=2lUk0y0KE6kkM6gKAfwcdxJsx0lF66ztHbkhm_CSxvI,6264
+kleinkram/utils.py,sha256=fFQsq5isLjDC2Z-XUTiJzz30Wt9rFUi4391WXstusG0,6221
 kleinkram/wrappers.py,sha256=4xXU43eNnvMG2sssU330MmTLSSRdurOpnZ-zNGOGmt0,11342
 kleinkram/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-kleinkram/api/client.py,sha256=yFanAc8VkpcyO5rVXIPyGaYHmF8_tBeC0ZMRUx0StWU,5061
+kleinkram/api/client.py,sha256=1mQuguyYM3ghrADTlivQi9ybWjJzlb9emto5rPtJRkM,5112
 kleinkram/api/deser.py,sha256=xRpYUFKZ0Luoo7XyAtYblJvprmpjNSZOiFVnFKmOzcM,4819
 kleinkram/api/file_transfer.py,sha256=3wNlVQdjnRtxOzih5HhCTF18xPbYClFIDxCqbwkLl6c,12985
 kleinkram/api/pagination.py,sha256=P_zPsBKlMWkmAv-YfUNHaGW-XLB_4U8BDMrKyiDFIXk,1370
@@ -28,23 +28,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=pQwyX6Bilg3-GJwkfs5K49KtwnTnl8pzsa7urbR3TMg,6657
+kleinkram/cli/app.py,sha256=m2qq4z95QllvXnxh3koPp0kq06I5R9etsJV8qSV8TMk,7037
 kleinkram/cli/error_handling.py,sha256=wK3tzeKVSrZm-xmiyzGLnGT2E4TRpyxhaak6GWGP7P8,1921
 testing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 testing/backend_fixtures.py,sha256=t5QWwyezHUhxxAlbUuE_eFmpyRaGbnWNNcGPwrO17JM,1571
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/conftest.py,sha256=5MLYQOtQoXWl0TRkYntYKNdqpd4hl9m0XTRi5OXanYI,104
-tests/test_config.py,sha256=2hyk-CY4D_Q1bLDwcpdEs2tpYeR8zdWxW7VvrckoEVk,5225
+tests/test_config.py,sha256=BGIXTX0XRF634_NMG-ya8v0zruw4PZCZtFGhYVK4DCM,5867
 tests/test_core.py,sha256=JbzB05LWmaaP77uXeTOQtCJD2AJT0zO9zhDfcZ3GNH8,5139
 tests/test_end_to_end.py,sha256=0W5pUES5hek-pXq4NZtpPZqKTORkGCRsDv5_D3rDMjY,3372
 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_printing.py,sha256=Jz1AjqmqBRjp1JLm6H1oVJyvGaMPlahVXdKnd7UDQFc,2231
 tests/test_query.py,sha256=fExmCKXLA7-9j2S2sF_sbvRX_2s6Cp3a7OTcqE25q9g,3864
 tests/test_utils.py,sha256=eUBYrn3xrcgcaxm1X4fqZaX4tRvkbI6rh6BUbNbu9T0,4784
 tests/test_wrappers.py,sha256=TbcTyO2L7fslbzgfDdcVZkencxNQ8cGPZm_iB6c9d6Q,2673
-kleinkram-0.39.0.dev20250224101309.dist-info/METADATA,sha256=dh-IaWxaHE700tnb-H1tHAPxiajICnJWosVvuAFjsos,2760
-kleinkram-0.39.0.dev20250224101309.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-kleinkram-0.39.0.dev20250224101309.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.39.0.dev20250224101309.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.39.0.dev20250224101309.dist-info/RECORD,,
+kleinkram-0.40.0.dist-info/METADATA,sha256=7Ju-psj6tQUURUoDiWIhRtsRw-DqAK7_cFD9lTuSy4g,2742
+kleinkram-0.40.0.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+kleinkram-0.40.0.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.40.0.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.40.0.dist-info/RECORD,,

{kleinkram-0.39.0.dev20250224101309.dist-info → kleinkram-0.40.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tests/test_config.py

@@ -7,6 +7,7 @@ from unittest import mock
 
 import pytest
 
+import kleinkram.config
 from kleinkram.config import ACTION_API
 from kleinkram.config import ACTION_API_KEY
 from kleinkram.config import ACTION_S3
@@ -102,9 +103,26 @@ def test_save_and_load_config(config_path):
     config = Config(version="foo")
 
     assert not config_path.exists()
-    save_config(config, path=config_path)
+    with mock.patch.object(kleinkram.config.logger, "warning") as mock_warning:
+        save_config(config, path=config_path)
+        mock_warning.assert_not_called()
+
     assert config_path.exists()
+    loaded_config = _load_config(path=config_path)
+    assert loaded_config == config
+
 
+def test_save_and_load_config_when_tmpfile_fails(config_path):
+    config = Config(version="foo")
+
+    assert not config_path.exists()
+    with mock.patch("tempfile.mkstemp", side_effect=Exception), mock.patch.object(
+        kleinkram.config.logger, "warning"
+    ) as mock_warning:
+        save_config(config, path=config_path)
+        mock_warning.assert_called_once()
+
+    assert config_path.exists()
     loaded_config = _load_config(path=config_path)
     assert loaded_config == config
 

tests/test_printing.py

@@ -3,9 +3,11 @@ from __future__ import annotations
 import datetime
 
 import pytest
+from rich.table import Table
 
 from kleinkram.models import MetadataValue
 from kleinkram.models import MetadataValueType
+from kleinkram.printing import _add_placeholder_row
 from kleinkram.printing import format_bytes
 from kleinkram.printing import parse_metadata_value
 
@@ -23,6 +25,15 @@ def test_format_bytes():
     assert format_bytes(2**50) == "1.00 PB"
 
 
+def test_add_placeholder_row():
+    table = Table("foo", "bar")
+    _add_placeholder_row(table, skipped=1)
+
+    assert table.row_count == 1
+    assert table.columns[0]._cells[-1] == "... (1 more)"
+    assert table.columns[1]._cells[-1] == "..."
+
+
 def test_parse_metadata_value():
     mv = MetadataValue(type_=MetadataValueType.STRING, value="foo")
     assert parse_metadata_value(mv) == "foo"