pyarchinit-mini 2.1.62__tar.gz → 2.1.63__tar.gz

{pyarchinit_mini-2.1.62/pyarchinit_mini.egg-info → pyarchinit_mini-2.1.63}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.1.62
+Version: 2.1.63
 Summary: Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer
 Home-page: https://github.com/enzococca/pyarchinit-mini
 Author: PyArchInit Team

{pyarchinit_mini-2.1.62 → pyarchinit_mini-2.1.63}/pyarchinit_mini/__init__.py

@@ -23,7 +23,7 @@ Features:
 - Scalable and modular architecture
 """
 
-__version__ = "2.1.62"
+__version__ = "2.1.63"
 __author__ = "PyArchInit Team"
 __email__ = "enzo.ccc@gmail.com"
 

{pyarchinit_mini-2.1.62 → pyarchinit_mini-2.1.63}/pyarchinit_mini/services/backup_service.py

@@ -41,17 +41,50 @@ class BackupService:
             shutil.copy(src, path)
             fmt = "sqlite"
         elif db_url.startswith("postgresql"):
-            # Try pg_dump first via ImportExportService._create_backup
-            result = ImportExportService._create_backup(db_url, backup_dir=str(backups))
-            path = Path(result["path"])
-            fmt = result.get("format", "pg_dump")
+            # Try pg_dump first via ImportExportService._create_backup.
+            # If it succeeds, use its path. If it fails (pg_dump missing on
+            # minimal containers, JSON snapshot fallback also failing, etc.),
+            # take ownership of a fresh JSON snapshot at a known path so we
+            # never propagate None to Path() and produce the misleading
+            # "argument should be a str ... not 'NoneType'" error.
+            path = None
+            fmt = None
+            try:
+                result = ImportExportService._create_backup(db_url, backup_dir=str(backups))
+            except Exception as e:
+                logger.warning(f"_create_backup raised: {e}")
+                result = {"success": False, "path": None, "message": str(e)}
+            if result.get("success") and result.get("path"):
+                path = Path(result["path"])
+                fmt = result.get("format", "pg_dump")
+            else:
+                # Fallback: write a JSON snapshot at our timestamped path
+                fallback_msg = result.get("message") or "_create_backup returned no path"
+                logger.warning(
+                    f"pg_dump backup unavailable ({fallback_msg}); "
+                    f"falling back to inline JSON snapshot"
+                )
+                json_path = backups / f"pyarchinit_backup_{ts}.json"
+                snap = ImportExportService._python_json_snapshot(db_url, str(json_path))
+                if not snap.get("success") or not snap.get("path"):
+                    raise RuntimeError(
+                        f"Backup failed: pg_dump unavailable and JSON snapshot "
+                        f"also failed. pg_dump branch: {fallback_msg}. "
+                        f"JSON branch: {snap.get('message') or 'unknown'}."
+                    )
+                path = Path(snap["path"])
+                fmt = "json"
         else:
             # JSON snapshot fallback for any other dialect
             path = backups / f"pyarchinit_backup_{ts}.json"
-            snapshot = ImportExportService._python_json_snapshot(db_url, str(path))
+            snap = ImportExportService._python_json_snapshot(db_url, str(path))
+            if not snap.get("success") or not snap.get("path"):
+                raise RuntimeError(
+                    f"Backup failed: JSON snapshot returned no path. "
+                    f"{snap.get('message') or 'unknown error'}."
+                )
+            path = Path(snap["path"])
             fmt = "json"
-            with open(path, "w", encoding="utf-8") as fh:
-                json.dump(snapshot, fh, default=str, indent=2)
 
         return {
             "path": str(path),

{pyarchinit_mini-2.1.62 → pyarchinit_mini-2.1.63/pyarchinit_mini.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyarchinit-mini
-Version: 2.1.62
+Version: 2.1.63
 Summary: Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer
 Home-page: https://github.com/enzococca/pyarchinit-mini
 Author: PyArchInit Team

{pyarchinit_mini-2.1.62 → pyarchinit_mini-2.1.63}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pyarchinit-mini"
-version = "2.1.62"
+version = "2.1.63"
 description = "Lightweight archaeological data management system with REST API, Web UI, Desktop GUI, CLI, multi-user authentication, real-time collaboration, analytics dashboard, PyArchInit import/export, Heriverse/ATON export integration, and 3D CRUD viewer"
 readme = "README.md"
 license = {text = "GPL-2.0"}

{pyarchinit_mini-2.1.62 → pyarchinit_mini-2.1.63}/tests/unit/test_backup_service.py

@@ -82,3 +82,61 @@ def test_set_schedule_rejects_invalid_frequency(backup_svc):
 def test_set_schedule_rejects_negative_keep_last(backup_svc):
     with pytest.raises(ValueError, match="keep_last"):
         backup_svc.set_schedule(enabled=True, frequency="daily", keep_last=0)
+
+
+def test_create_backup_now_postgres_pg_dump_missing_falls_back_to_json(backup_svc, monkeypatch):
+    """When pg_dump is unavailable AND _create_backup returns None path,
+    BackupService must fall back to an inline JSON snapshot instead of
+    crashing with 'argument should be a str ... not NoneType'.
+    """
+    from unittest.mock import patch
+
+    fake_url = "postgresql://user:pwd@host:5432/dbname"
+
+    # Simulate _create_backup returning success=False, path=None (the failure
+    # mode that caused the bug in v2.1.62)
+    def _fake_create_backup(db_url, backup_dir=None):
+        return {"success": False, "path": None, "message": "pg_dump not found"}
+
+    # Simulate _python_json_snapshot writing a tiny file at the requested path
+    def _fake_json_snapshot(db_url, snapshot_path):
+        from pathlib import Path as _P
+        _P(snapshot_path).write_text('{"tables": {}}')
+        return {"success": True, "path": snapshot_path, "size_mb": 0.01, "message": "ok"}
+
+    with patch(
+        "pyarchinit_mini.services.import_export_service.ImportExportService._create_backup",
+        side_effect=_fake_create_backup,
+    ), patch(
+        "pyarchinit_mini.services.import_export_service.ImportExportService._python_json_snapshot",
+        side_effect=_fake_json_snapshot,
+    ):
+        info = backup_svc.create_backup_now(db_url=fake_url)
+
+    assert info["format"] == "json"
+    from pathlib import Path as _P
+    assert _P(info["path"]).exists()
+
+
+def test_create_backup_now_raises_when_both_pg_dump_and_json_fail(backup_svc):
+    """If both pg_dump and JSON snapshot fail, BackupService raises a
+    clear RuntimeError rather than silently returning a broken result.
+    """
+    from unittest.mock import patch
+    fake_url = "postgresql://user:pwd@host:5432/dbname"
+
+    def _fail_create_backup(db_url, backup_dir=None):
+        return {"success": False, "path": None, "message": "pg_dump not found"}
+
+    def _fail_json_snapshot(db_url, snapshot_path):
+        return {"success": False, "path": None, "message": "DB unreachable"}
+
+    with patch(
+        "pyarchinit_mini.services.import_export_service.ImportExportService._create_backup",
+        side_effect=_fail_create_backup,
+    ), patch(
+        "pyarchinit_mini.services.import_export_service.ImportExportService._python_json_snapshot",
+        side_effect=_fail_json_snapshot,
+    ):
+        with pytest.raises(RuntimeError, match="JSON snapshot"):
+            backup_svc.create_backup_now(db_url=fake_url)