fix(core): drop skipped pages from StoreEntityPartialError.stored

- 'stored' now lists only the pages that were actually written
- add 'skipped' to the error, mirroring StoreEntityResult
- 'result.pages' unchanged, still lists kept pages

Author: LukasGold

src/osw/core.py

@@ -1782,7 +1782,7 @@ class StoreEntityResult(OswBaseModel):
         skipped: Dict[str, WtPage] = {}
         """Existing pages that were not written because the applicable overwrite
         setting was 'keep existing', keyed by full page title. These also appear in
-        'pages', where they are indistinguishable from pages that were written."""
+        'pages'; subtract them to get the pages that were actually written."""
         failed: Dict[str, Exception] = {}
         """Entities that could not be stored, keyed by full page title and mapped to
         the exception that caused the failure. Empty on full success."""
@@ -1794,13 +1794,20 @@ class StoreEntityPartialError(Exception):
         """Raised by store_entity() when one or more entities could not be stored.
 
         Carries the partial ``StoreEntityResult`` so callers can learn exactly which
-        entities were written (``stored`` / ``result.pages``) and which failed
-        (``failed`` / ``result.failed``) without a separate existence query.
+        entities were written (``stored``), which existed already and were left
+        untouched by 'keep existing' (``skipped``), and which failed (``failed`` /
+        ``result.failed``) without a separate existence query.
         """
 
         def __init__(self, result: OSW.StoreEntityResult):
             self.result = result
-            self.stored = list(result.pages.keys())
+            # a page kept by 'keep existing' was not written, so it does not
+            # belong in 'stored'. 'result.pages' still lists it, for callers
+            # that only care about which entities are on the wiki afterwards.
+            self.skipped = list(result.skipped.keys())
+            self.stored = [
+                title for title in result.pages if title not in result.skipped
+            ]
             self.failed = result.failed
             total = len(result.pages) + len(result.failed)
             failed_titles = ", ".join(result.failed.keys())

tests/test_store_entity_failure.py

@@ -8,7 +8,7 @@
 import pytest
 
 import osw.model.entity as model
-from osw.core import OSW
+from osw.core import OSW, AddOverwriteClassOptions
 from osw.utils.wiki import get_namespace, get_title
 from osw.wtsite import WtPage
 
@@ -86,6 +86,37 @@ def test_store_entity_all_success_returns_result(offline_osw, monkeypatch):
     assert result.failed == {}
 
 
+def test_partial_error_does_not_count_a_skipped_page_as_stored(
+    offline_osw, monkeypatch
+):
+    """'keep existing' leaves a page untouched, so it was not stored."""
+    keep, ok, boom = (
+        model.Item(label=[model.Label(text=text)]) for text in ("Keep", "Ok", "Boom")
+    )
+    keep_title, ok_title, boom_title = (_title(it) for it in (keep, ok, boom))
+    # only the kept entity is already on the wiki; the other two are created
+    monkeypatch.setattr(
+        WtPage, "init", lambda self: setattr(self, "exists", self.title == keep_title)
+    )
+    _install_edit(monkeypatch, {boom_title})
+
+    with pytest.raises(OSW.StoreEntityPartialError) as exc_info:
+        offline_osw.store_entity(
+            OSW.StoreEntityParam(
+                entities=[keep, ok, boom],
+                overwrite=AddOverwriteClassOptions.keep_existing,
+                parallel=False,
+            )
+        )
+
+    err = exc_info.value
+    assert err.stored == [ok_title]
+    assert err.skipped == [keep_title]
+    assert set(err.failed) == {boom_title}
+    # the kept page is still on the wiki, so it stays in 'pages'
+    assert keep_title in err.result.pages
+
+
 def test_store_entity_serial_all_success_returns_result(offline_osw, monkeypatch):
     items = [model.Item(label=[model.Label(text=f"Ser{i}")]) for i in range(2)]
     titles = [_title(it) for it in items]