declarative-data-backup 0.4.0__tar.gz → 0.4.1__tar.gz

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: declarative-data-backup
-Version: 0.4.0
+Version: 0.4.1
 Summary: Declarative Borg-based data backups
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -246,10 +246,12 @@ The stable source series is derived from the canonical source path and includes
 a SHA-256 suffix. Borg receives the canonical absolute path as the source, so
 the original directory hierarchy is retained inside the archive.
 
-The application creates all configured archives before pruning any source.
-If a create fails or Borg reports warnings, the run stops and no pruning is
-performed. Retries use a new run UUID and may create another archive for that
-day; archives are never overwritten to handle a collision.
+The application attempts every configured backup group before pruning any
+source. If a group has a create failure or Borg reports warnings, pruning is
+skipped for that group, but other groups that completed successfully are still
+pruned. Failures are reported and make the overall run fail. Retries use a new
+run UUID and may create another archive for that day; archives are never
+overwritten to handle a collision.
 
 `--keep-daily N` retains the latest archive in up to `N` daily buckets. It does
 not guarantee `N` successful calendar days of recovery if scheduled runs fail

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/README.md

@@ -238,10 +238,12 @@ The stable source series is derived from the canonical source path and includes
 a SHA-256 suffix. Borg receives the canonical absolute path as the source, so
 the original directory hierarchy is retained inside the archive.
 
-The application creates all configured archives before pruning any source.
-If a create fails or Borg reports warnings, the run stops and no pruning is
-performed. Retries use a new run UUID and may create another archive for that
-day; archives are never overwritten to handle a collision.
+The application attempts every configured backup group before pruning any
+source. If a group has a create failure or Borg reports warnings, pruning is
+skipped for that group, but other groups that completed successfully are still
+pruned. Failures are reported and make the overall run fail. Retries use a new
+run UUID and may create another archive for that day; archives are never
+overwritten to handle a collision.
 
 `--keep-daily N` retains the latest archive in up to `N` daily buckets. It does
 not guarantee `N` successful calendar days of recovery if scheduled runs fail

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "declarative-data-backup"
-version = "0.4.0"
+version = "0.4.1"
 description = "Declarative Borg-based data backups"
 readme = "README.md"
 requires-python = ">=3.11"

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/src/declarative_data_backup/backup.py

@@ -56,38 +56,73 @@ def run_backup(
     run_id = uuid.uuid4().hex
     with repository_lock(settings.borg_base_dir / "backup.lock"):
         created_at = datetime.now(UTC)
+        successful_definitions = []
+        failures: list[BackupError] = []
         for definition in definitions:
             logger.info(
                 "Starting backup group '%s' (%d sources).",
                 definition.name,
                 len(definition.sources),
             )
-            for folder in definition.sources:
-                backup_folder(
-                    folder,
-                    definition.compression,
+            try:
+                for folder in definition.sources:
+                    backup_folder(
+                        folder,
+                        definition.compression,
+                        definition.name,
+                        settings,
+                        created_at,
+                        run_id,
+                        definition.excludes,
+                    )
+            except BackupError as exc:
+                logger.error(
+                    "Backup group '%s' failed; retention pruning will be skipped "
+                    "for this group: %s",
                     definition.name,
-                    settings,
-                    created_at,
-                    run_id,
-                    definition.excludes,
+                    exc,
                 )
+                failures.append(exc)
+                continue
+
             logger.info("Backup group '%s' completed.", definition.name)
+            successful_definitions.append(definition)
 
-        for definition in definitions:
+        for definition in successful_definitions:
             logger.info(
                 "Starting retention pruning for group '%s' (%d sources).",
                 definition.name,
                 len(definition.sources),
             )
+            pruning_succeeded = True
             for folder in definition.sources:
-                prune(
-                    folder,
-                    definition.retention_days,
-                    definition.name,
-                    settings,
+                try:
+                    prune(
+                        folder,
+                        definition.retention_days,
+                        definition.name,
+                        settings,
+                    )
+                except BackupError as exc:
+                    logger.error(
+                        "Retention pruning failed for group '%s' source '%s': %s",
+                        definition.name,
+                        folder,
+                        exc,
+                    )
+                    failures.append(exc)
+                    pruning_succeeded = False
+
+            if pruning_succeeded:
+                logger.info(
+                    "Retention pruning for group '%s' completed.", definition.name
                 )
-            logger.info("Retention pruning for group '%s' completed.", definition.name)
+
+        if failures:
+            message = "; ".join(str(failure) for failure in failures)
+            if any(isinstance(failure, BorgWarningError) for failure in failures):
+                raise BorgWarningError(message)
+            raise BackupError(message)
 
 
 def main(environ: Mapping[str, str] | None = None) -> int:
@@ -111,8 +146,8 @@ def main(environ: Mapping[str, str] | None = None) -> int:
 
     except BorgWarningError as exc:
         logger.error(
-            "Backup stopped because Borg reported warnings; "
-            "pruning was not completed: %s",
+            "Backup failed because Borg reported warnings; "
+            "retention pruning may have completed for other groups: %s",
             exc,
         )
         return 1

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/src/declarative_data_backup.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: declarative-data-backup
-Version: 0.4.0
+Version: 0.4.1
 Summary: Declarative Borg-based data backups
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown
@@ -246,10 +246,12 @@ The stable source series is derived from the canonical source path and includes
 a SHA-256 suffix. Borg receives the canonical absolute path as the source, so
 the original directory hierarchy is retained inside the archive.
 
-The application creates all configured archives before pruning any source.
-If a create fails or Borg reports warnings, the run stops and no pruning is
-performed. Retries use a new run UUID and may create another archive for that
-day; archives are never overwritten to handle a collision.
+The application attempts every configured backup group before pruning any
+source. If a group has a create failure or Borg reports warnings, pruning is
+skipped for that group, but other groups that completed successfully are still
+pruned. Failures are reported and make the overall run fail. Retries use a new
+run UUID and may create another archive for that day; archives are never
+overwritten to handle a collision.
 
 `--keep-daily N` retains the latest archive in up to `N` daily buckets. It does
 not guarantee `N` successful calendar days of recovery if scheduled runs fail

{declarative_data_backup-0.4.0 → declarative_data_backup-0.4.1}/tests/test_backup.py

@@ -79,7 +79,7 @@ def test_main_runs_all_creates_before_any_prune(
     assert "Retention pruning for group 'media_backup' completed." in caplog.text
 
 
-def test_main_warning_aborts_remaining_creates_and_all_pruning(
+def test_main_warning_skips_failed_group_but_prunes_successful_groups(
     settings_factory,
     monkeypatch,
     caplog,
@@ -91,14 +91,15 @@ def test_main_warning_aborts_remaining_creates_and_all_pruning(
     second.mkdir()
     _write_config(
         settings,
-        f"media:\n  folders: [{first}, {second}]\n",
+        f"failed:\n  folders: [{first}]\nsucceeded:\n  folders: [{second}]\n",
     )
     _configure_preflight(monkeypatch)
     calls = []
 
     def warning(folder, *args):
         calls.append(("create", folder))
-        raise BorgWarningError(f"warning for {folder}")
+        if folder == first:
+            raise BorgWarningError(f"warning for {folder}")
 
     monkeypatch.setattr(backup, "backup_folder", warning)
     monkeypatch.setattr(
@@ -109,7 +110,11 @@ def test_main_warning_aborts_remaining_creates_and_all_pruning(
     caplog.set_level(logging.ERROR)
 
     assert backup.main(_settings_environment(settings)) == 1
-    assert calls == [("create", first)]
+    assert calls == [
+        ("create", first),
+        ("create", second),
+        ("prune", second),
+    ]
     assert "warnings" in caplog.text
     assert str(first) in caplog.text
 
@@ -269,6 +274,7 @@ def test_main_prune_failure_is_nonzero_and_scoped(
         ("create", first),
         ("create", second),
         ("prune", first),
+        ("prune", second),
     ]