seren-margin 2.3.0__tar.gz → 2.5.0__tar.gz

{seren_margin-2.3.0/seren_margin.egg-info → seren_margin-2.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seren-margin
-Version: 2.3.0
+Version: 2.5.0
 Summary: Private notes-to-self for an AI assistant. Standalone, opt-in, opinionated.
 Author: Chad Roesler
 License-Expression: AGPL-3.0-or-later

{seren_margin-2.3.0 → seren_margin-2.5.0}/seren_margin/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.3.0'
-__version_tuple__ = version_tuple = (2, 3, 0)
+__version__ = version = '2.5.0'
+__version_tuple__ = version_tuple = (2, 5, 0)
 
-__commit_id__ = commit_id = 'g3339c1e00'
+__commit_id__ = commit_id = 'g41fbfe598'

{seren_margin-2.3.0 → seren_margin-2.5.0}/seren_margin/app.py

@@ -87,6 +87,15 @@ APP_VERSION = get_version("seren-margin", fallback=_fallback_version)
 
 def create_app(config: Optional[MarginConfig] = None) -> FastAPI:
     cfg = config or load_config()
+    # A restore, when the config asks for one (backup.restore_from +
+    # restore_reason): into an empty margin only, before the store opens.
+    # Refused = the service does not start. No route does this.
+    if (cfg.backup.restore_from or "").strip():
+        from seren_sinew.stores import Store as _Store, restore_at_startup
+        restore_at_startup("seren-margin", [_Store("notes", "sqlite", str(cfg.resolved_db_path()))],
+                           cfg.backup.restore_from, cfg.backup.restore_reason,
+                           cfg.resolved_backup_dir() / "seren-margin",
+                           log=lambda m: diag(f"[seren-margin] {m}"))
     store = MarginStore(cfg.resolved_db_path())
 
     @asynccontextmanager
@@ -230,11 +239,23 @@ def create_app(config: Optional[MarginConfig] = None) -> FastAPI:
             notes = None
         return {"version": APP_VERSION, "counts": {"notes": notes}}
 
+    def _margin_check(restored, manifest, snapshot_dir) -> dict:
+        """A rehearsal's look at a restored COPY: opened as a MarginStore
+        (schema and migrations run on the copy) and counted. A count and
+        nothing else - a rehearsal's report must not say what a note says."""
+        import gc
+        st = MarginStore(restored["notes"] / cfg.resolved_db_path().name)
+        try:
+            return {"counts": {"notes": len(st.list_all(limit=1_000_000))}}
+        finally:
+            del st
+            gc.collect()                                    # its connections, so the scratch copy can be removed
+
     app.state.stores = StoreKeeper(
         "seren-margin",
         lambda: [Store("notes", "sqlite", str(cfg.resolved_db_path()),
                        "the margin: private notes, letters and the dedication")],
-        cfg.resolved_backup_dir(), extra=_margin_extra,
+        cfg.resolved_backup_dir(), extra=_margin_extra, check=_margin_check,
         keep_daily=cfg.backup.keep_daily, keep_weekly=cfg.backup.keep_weekly,
         log=lambda m: diag(f"[seren-margin] {m}")) if cfg.backup.enabled else None
     add_store_routes(

{seren_margin-2.3.0 → seren_margin-2.5.0}/seren_margin/config.py

@@ -79,6 +79,13 @@ class BackupConfig(BaseModel):
     every_hours: float = 24.0     # 0 = never on its own
     keep_daily: int = 14
     keep_weekly: int = 8
+    # THE RESTORE. A snapshot folder (or its .tar.gz) to put back at startup,
+    # and why. Only into an EMPTY store: a store that holds anything is never
+    # overwritten, and the key is then passed by with a line in the log. There
+    # is no route and no tool for this, on purpose - it is these two keys and
+    # a restart. See seren_sinew.stores.restore_at_startup.
+    restore_from: str = ""
+    restore_reason: str = ""
     allow_pull: bool = False
 
 

{seren_margin-2.3.0 → seren_margin-2.5.0/seren_margin.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: seren-margin
-Version: 2.3.0
+Version: 2.5.0
 Summary: Private notes-to-self for an AI assistant. Standalone, opt-in, opinionated.
 Author: Chad Roesler
 License-Expression: AGPL-3.0-or-later

seren_margin-2.5.0/seren_margin.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "2.5.0",
+  "distance": 0,
+  "node": "g41fbfe5984625251f53f11f976b111d6d9efe545",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-04"
+}

{seren_margin-2.3.0 → seren_margin-2.5.0}/tests/test_stores_snapshot.py

@@ -81,3 +81,42 @@ def test_off_and_no_restore_or_delete(tmp_path):
         sid = c.post("/stores/snapshot").json()["snapshot"]["id"]
         for path in ("/stores/restore", f"/stores/snapshots/{sid}"):
             assert c.post(path).status_code in (404, 405) and c.delete(path).status_code in (404, 405)
+
+
+def test_a_rehearsal_counts_the_notes_and_says_nothing_of_them(tmp_path):
+    """A restore's dry run (seren_sinew.stores). It needs no allow_pull: the
+    copy never leaves the box and the report is a count."""
+    from seren_sinew.stores import pack_snapshot
+    with _client(tmp_path) as c:
+        c.post("/notes", json={"content": SECRET, "topic": "private"})
+        snap = c.post("/stores/snapshot").json()["snapshot"]
+        c.post("/notes", json={"content": "written after", "topic": "later"})
+        r = c.post(f"/stores/snapshots/{snap['id']}/rehearse")
+        assert r.status_code == 200 and SECRET not in r.text, r.text
+        rep = r.json()
+        assert rep["ok"] and rep["check"] == {"counts": {"notes": 1}} and rep["live_store_touched"] is False, rep
+        assert len(c.app.state.store.list_all()) == 2
+        r = c.post("/stores/rehearse", content=pack_snapshot(Path(snap["path"])))
+        assert r.status_code == 200 and r.json()["ok"] and SECRET not in r.text, "a stash can send it back to be checked"
+        assert not list((Path(snap["path"]).parent / ".rehearsal").iterdir())
+
+
+def test_a_new_box_restores_the_margin_at_startup_and_a_full_one_is_left_alone(tmp_path):
+    """backup.restore_from + restore_reason, into an empty margin only
+    (seren_sinew.stores.restore_at_startup). 3 Oct 2026."""
+    import pytest
+    from seren_sinew.stores import RestoreRefused
+    with _client(tmp_path) as c:
+        c.post("/notes", json={"content": SECRET, "topic": "private"})
+        snap = c.post("/stores/snapshot").json()["snapshot"]
+
+    def cfg(where, **backup):
+        return MarginConfig(db_path=str(tmp_path / where / "notes.db"),
+                            backup=BackupConfig(every_hours=0, restore_from=snap["path"], **backup))
+    with TestClient(create_app(cfg("new", restore_reason="moving to the cluster"))) as c:
+        assert [n.content for n in c.app.state.store.list_all()] == [SECRET]
+        c.post("/notes", json={"content": "written on the new box", "topic": "later"})
+    with TestClient(create_app(cfg("new", restore_reason="moving to the cluster"))) as c:
+        assert len(c.app.state.store.list_all()) == 2, "the second start passes the key by"
+    with pytest.raises(RestoreRefused, match="asked for with a reason"):
+        create_app(cfg("other"))

seren_margin-2.3.0/seren_margin.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "2.3.0",
-  "distance": 0,
-  "node": "g3339c1e00691cab41191c0b5903aa93cb1df799b",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-03"
-}