kleinkram 0.40.0.dev20250225150133__py3-none-any.whl → 0.40.0.dev20250228081255__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/config.py

@@ -24,6 +24,7 @@ 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__)
 
@@ -75,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]:
@@ -167,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

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.40.0.dev20250225150133.dist-info → kleinkram-0.40.0.dev20250228081255.dist-info}/METADATA

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

{kleinkram-0.40.0.dev20250225150133.dist-info → kleinkram-0.40.0.dev20250228081255.dist-info}/RECORD

@@ -2,7 +2,7 @@ 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=KADs3KHSm_WLT8DSYxsQg0wQfX_3eSWAI_lxbAM_q7Q,6901
+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
@@ -10,10 +10,10 @@ kleinkram/models.py,sha256=8nJlPrKVLSmehspeuQSFV6nUo76JzehUn6KIZYH1xy4,1832
 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
@@ -34,7 +34,7 @@ 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
@@ -43,8 +43,8 @@ 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.40.0.dev20250225150133.dist-info/METADATA,sha256=470vgCH_IPv0jre6B6YsxSaCQEBUdNyieyHVznZ_e6Y,2760
-kleinkram-0.40.0.dev20250225150133.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
-kleinkram-0.40.0.dev20250225150133.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
-kleinkram-0.40.0.dev20250225150133.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
-kleinkram-0.40.0.dev20250225150133.dist-info/RECORD,,
+kleinkram-0.40.0.dev20250228081255.dist-info/METADATA,sha256=y2qW3auu9kx4VTRvV20CKWZCisrZtWt9KYySkuGXpv0,2760
+kleinkram-0.40.0.dev20250228081255.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+kleinkram-0.40.0.dev20250228081255.dist-info/entry_points.txt,sha256=SaB2l5aqhSr8gmaMw2kvQU90a8Bnl7PedU8cWYxkfYo,46
+kleinkram-0.40.0.dev20250228081255.dist-info/top_level.txt,sha256=N3-sJagEHu1Tk1X6Dx1X1q0pLDNbDZpLzRxVftvepds,24
+kleinkram-0.40.0.dev20250228081255.dist-info/RECORD,,

{kleinkram-0.40.0.dev20250225150133.dist-info → kleinkram-0.40.0.dev20250228081255.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.1)
+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