kleinkram 0.40.0.dev20250225150133__tar.gz → 0.40.0.dev20250228081255__tar.gz

{kleinkram-0.40.0.dev20250225150133 → kleinkram-0.40.0.dev20250228081255}/PKG-INFO

@@ -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 → kleinkram-0.40.0.dev20250228081255}/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-0.40.0.dev20250225150133 → kleinkram-0.40.0.dev20250228081255}/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-0.40.0.dev20250225150133 → kleinkram-0.40.0.dev20250228081255}/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 → kleinkram-0.40.0.dev20250228081255}/kleinkram.egg-info/PKG-INFO

@@ -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 → kleinkram-0.40.0.dev20250228081255}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = kleinkram
-version = 0.40.0-dev20250225150133
+version = 0.40.0-dev20250228081255
 description = give me your bags
 long_description = file: README.md
 long_description_content_type = text/markdown

{kleinkram-0.40.0.dev20250225150133 → kleinkram-0.40.0.dev20250228081255}/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