lorebase-core 0.3.0__tar.gz → 0.4.0__tar.gz

lorebase_core-0.4.0/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2026 Antonio Antenore
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

lorebase_core-0.4.0/PKG-INFO

@@ -0,0 +1,40 @@
+Metadata-Version: 2.5
+Name: lorebase-core
+Version: 0.4.0
+Summary: Lorebase core: pure domain logic and versioning engine
+Project-URL: Homepage, https://github.com/aantenore/lorebase
+Project-URL: Documentation, https://aantenore.github.io/lorebase/
+Project-URL: Repository, https://github.com/aantenore/lorebase
+Project-URL: Changelog, https://github.com/aantenore/lorebase/blob/main/CHANGELOG.md
+Project-URL: Issues, https://github.com/aantenore/lorebase/issues
+Author: Antonio Antenore
+License-Expression: Apache-2.0
+License-File: LICENSE
+Keywords: knowledge-graph,mcp,ontology,postgres,versioning
+Classifier: Development Status :: 2 - Pre-Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Database
+Requires-Python: >=3.12
+Requires-Dist: cel-python>=0.5
+Requires-Dist: google-re2>=1.1
+Requires-Dist: pydantic>=2.7
+Requires-Dist: pyyaml>=6.0
+Description-Content-Type: text/markdown
+
+# lorebase-core
+
+Part of [Lorebase](https://github.com/aantenore/lorebase), an open-source ontology platform: a versioned, governed knowledge graph on Postgres with git-like branching and three-way merge.
+
+The domain logic of Lorebase: the ontology model, schema validation, the versioning engine (commits, branches and three-way merge) and the expression evaluation. It has no I/O; the other packages build on it.
+
+```sh
+pip install lorebase-core
+```
+
+It is a library of the other Lorebase packages and has no command of its own.
+
+Documentation: [Design](https://aantenore.github.io/lorebase/design/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

lorebase_core-0.4.0/README.md

@@ -0,0 +1,13 @@
+# lorebase-core
+
+Part of [Lorebase](https://github.com/aantenore/lorebase), an open-source ontology platform: a versioned, governed knowledge graph on Postgres with git-like branching and three-way merge.
+
+The domain logic of Lorebase: the ontology model, schema validation, the versioning engine (commits, branches and three-way merge) and the expression evaluation. It has no I/O; the other packages build on it.
+
+```sh
+pip install lorebase-core
+```
+
+It is a library of the other Lorebase packages and has no command of its own.
+
+Documentation: [Design](https://aantenore.github.io/lorebase/design/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

lorebase_core-0.4.0/pyproject.toml

@@ -0,0 +1,39 @@
+[project]
+name = "lorebase-core"
+version = "0.4.0"
+description = "Lorebase core: pure domain logic and versioning engine"
+requires-python = ">=3.12"
+readme = "README.md"
+license = "Apache-2.0"
+license-files = ["LICENSE"]
+authors = [{ name = "Antonio Antenore" }]
+keywords = ["ontology", "knowledge-graph", "mcp", "postgres", "versioning"]
+classifiers = [
+  "Development Status :: 2 - Pre-Alpha",
+  "Intended Audience :: Developers",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.12",
+  "Topic :: Database",
+]
+dependencies = [
+    "cel-python>=0.5",
+    "google-re2>=1.1",
+    "pydantic>=2.7",
+    "pyyaml>=6.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/aantenore/lorebase"
+Documentation = "https://aantenore.github.io/lorebase/"
+Repository = "https://github.com/aantenore/lorebase"
+Changelog = "https://github.com/aantenore/lorebase/blob/main/CHANGELOG.md"
+Issues = "https://github.com/aantenore/lorebase/issues"
+
+[build-system]
+requires = ["hatchling>=1.27"]
+build-backend = "hatchling.build"
+
+[tool.hatch.build.targets.wheel]
+packages = ["src/lorebase_core"]

lorebase_core-0.4.0/src/lorebase_core/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.4.0"

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/src/lorebase_core/merge/__init__.py

@@ -7,10 +7,12 @@ from lorebase_core.merge.conflicts import (
     AutoResolution,
     Conflict,
     ConflictKind,
+    ConflictProvenance,
     Resolution,
     ResolutionChoice,
     ResolutionError,
     Side,
+    SideProvenance,
     UnresolvedConflictsError,
     conflict_fingerprint,
 )
@@ -59,6 +61,7 @@ __all__ = [
     "ChangeStamp",
     "Conflict",
     "ConflictKind",
+    "ConflictProvenance",
     "InMemoryObjectStore",
     "IndexViewFactory",
     "LineageLoader",
@@ -77,6 +80,7 @@ __all__ = [
     "ResolutionError",
     "SchemaLoader",
     "Side",
+    "SideProvenance",
     "TextGranularity",
     "TreeIndexView",
     "UnresolvedConflictsError",

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/src/lorebase_core/merge/conflicts.py

@@ -24,10 +24,12 @@ __all__ = [
     "AutoResolution",
     "Conflict",
     "ConflictKind",
+    "ConflictProvenance",
     "Resolution",
     "ResolutionChoice",
     "ResolutionError",
     "Side",
+    "SideProvenance",
     "UnresolvedConflictsError",
     "conflict_fingerprint",
 ]
@@ -169,6 +171,32 @@ class _Frozen(BaseModel):
     model_config = ConfigDict(frozen=True, extra="forbid")
 
 
+class SideProvenance(_Frozen):
+    """Who or what last changed the Attribute of a Conflict on one side, and when.
+
+    ``provenance_id`` names the provenance entry of that change and ``at`` its time (ISO 8601,
+    timezone aware). ``actor`` wrote the entry; ``origin`` is its origin type (``source_sync``,
+    ``operation``, ``extraction``, ...); ``source`` is the Source id of a Source sync and
+    ``principal`` the principal of an Operation. ``labels`` are the origin labels an
+    ``authority`` ranking matches, sorted.
+    """
+
+    provenance_id: str
+    at: str
+    actor: str | None = None
+    origin: str | None = None
+    source: str | None = None
+    principal: str | None = None
+    labels: tuple[str, ...] = ()
+
+
+class ConflictProvenance(_Frozen):
+    """The provenance of the two competing sides; a side whose Lineage is unknown is ``None``."""
+
+    ours: SideProvenance | None = None
+    theirs: SideProvenance | None = None
+
+
 class Conflict(_Frozen):
     """One Conflict of a merge attempt.
 
@@ -177,7 +205,10 @@ class Conflict(_Frozen):
     Conflicts and a dotted property path for schema Conflicts. ``base``, ``ours`` and
     ``theirs`` hold the competing values (``None`` means absent) and the ``*_hash`` fields the
     hashes of the elements they come from. Grouped Conflicts carry ``count`` members and a
-    ``sample`` of their keys.
+    ``sample`` of their keys. ``provenance`` says who or what changed each side and when: it is
+    set on open Attribute Conflicts (``DV1``, ``DV3``) when the merge has a Lineage loader and
+    knows the Lineage of at least one side, and ``None`` otherwise. It is not part of the
+    fingerprint.
     """
 
     kind: ConflictKind
@@ -197,6 +228,7 @@ class Conflict(_Frozen):
     details: dict[str, JsonValue] = Field(default_factory=dict)
     choices: tuple[ResolutionChoice, ...] = ()
     machine_resolvable: bool = False
+    provenance: ConflictProvenance | None = None
 
     @property
     def grouped(self) -> bool:

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/src/lorebase_core/merge/engine.py

@@ -133,16 +133,22 @@ class MergeInput:
 
 class MergeResult(StrEnum):
     UP_TO_DATE = "up_to_date"
-    """Theirs is already contained in ours: the target does not change."""
+    """Theirs is already contained in ours: the target does not change. ``root`` is ours and
+    ``parents`` is ``(ours,)``."""
     FAST_FORWARD = "fast_forward"
-    """The target moves to theirs."""
+    """The target moves to theirs. ``root`` is theirs' tree. A caller that moves the ref to
+    ``theirs`` writes nothing; one that commits ``root`` as returned gets a Revision whose only
+    parent is ours, so history stays connected."""
     MERGED = "merged"
     """A merge Revision with parents ``(ours, theirs)`` is to be written."""
 
 
 @dataclass(frozen=True)
 class MergedTree:
-    """A clean merge: the new tree and its changeset against ours (the first parent)."""
+    """A clean merge: the new tree and its changeset against ours (the first parent).
+
+    ``parents`` is never empty: ``(ours, theirs)`` for a merge, ``(ours,)`` for a fast-forward
+    or an up-to-date result, so committing ``root`` with ``parents`` never writes a root."""
 
     result: MergeResult
     root: bytes
@@ -286,7 +292,7 @@ class _Engine:
             theirs=merge_input.theirs,
             base=base,
             virtual_base=False,
-            parents=(),
+            parents=(merge_input.ours,),
             changes=(),
             stats=changeset_stats(()),
         )
@@ -304,7 +310,7 @@ class _Engine:
             theirs=merge_input.theirs,
             base=base,
             virtual_base=False,
-            parents=(),
+            parents=(merge_input.ours,),
             changes=changes,
             stats=changeset_stats(changes),
         )

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/src/lorebase_core/merge/state.py

@@ -17,10 +17,12 @@ from lorebase_core.merge.conflicts import (
     AutoResolution,
     Conflict,
     ConflictKind,
+    ConflictProvenance,
     Resolution,
     ResolutionChoice,
     ResolutionError,
     Side,
+    SideProvenance,
     conflict_fingerprint,
 )
 from lorebase_core.merge.objects import ObjectStore, SchemaLoader, load_object
@@ -370,7 +372,25 @@ class Context:
 
     def report(self, conflict: Conflict) -> None:
         if not self.virtual:
-            self.conflicts.append(conflict)
+            self.conflicts.append(self.with_provenance(conflict))
+
+    def with_provenance(self, conflict: Conflict) -> Conflict:
+        """``conflict`` with who and when of each side, when a Lineage loader knows them.
+
+        Only Attribute Conflicts have a last change per side; without a loader, or when it
+        knows neither side, the Conflict is returned as it is.
+        """
+        if self.lineage is None or conflict.kind not in _ATTRIBUTE_KINDS:
+            return conflict
+        ours = self.lineage_entry(Side.OURS, conflict)
+        theirs = self.lineage_entry(Side.THEIRS, conflict)
+        if ours is None and theirs is None:
+            return conflict
+        provenance = ConflictProvenance(
+            ours=None if ours is None else _side_provenance(ours),
+            theirs=None if theirs is None else _side_provenance(theirs),
+        )
+        return conflict.model_copy(update={"provenance": provenance})
 
     def group(
         self,
@@ -431,6 +451,20 @@ class Context:
         return (values[0], values[1], values[2])
 
 
+def _side_provenance(stamp: ChangeStamp) -> SideProvenance:
+    labels = sorted(stamp.labels)
+    named = dict(label.split(":", 1) for label in labels)
+    return SideProvenance(
+        provenance_id=stamp.id,
+        at=stamp.at.isoformat(),
+        actor=named.get("actor"),
+        origin=named.get("origin"),
+        source=named.get("source"),
+        principal=named.get("principal"),
+        labels=tuple(labels),
+    )
+
+
 def other_side(side: Side) -> Side:
     return Side.THEIRS if side is Side.OURS else Side.OURS
 

lorebase_core-0.4.0/tests/merge/test_fast_forward.py

@@ -0,0 +1,35 @@
+"""A fast-forward result committed as returned keeps the history connected."""
+
+from __future__ import annotations
+
+from lorebase_core.merge import ConflictKind, MergeResult
+
+from .support import Edit, Repo, attempt, base_records, base_schema, merged, supplier
+
+
+def _fork() -> tuple[Repo, bytes, bytes, bytes]:
+    repo = Repo()
+    base = repo.commit("base", Edit(schema=base_schema(), put=list(base_records())))
+    source = repo.commit("source", Edit().upsert(supplier("S-1", vat="IT001", rating="4")), base)
+    model = repo.commit("model", Edit().upsert(supplier("S-1", vat="IT001", rating="5")), base)
+    return repo, base, source, model
+
+
+def test_fast_forward_commit_stays_connected_to_the_target() -> None:
+    repo, base, source, model = _fork()
+    forward = merged(repo.merge(base, source))
+    assert forward.result is MergeResult.FAST_FORWARD
+    assert forward.root == repo.roots[source]
+    assert forward.parents == (base,)
+
+    head = repo.add("main", forward.root, *forward.parents)
+    result = attempt(repo.merge(head, model))
+    assert result.base == base
+    assert [c.kind for c in result.conflicts] == [ConflictKind.ATTRIBUTE_VALUE]
+
+
+def test_up_to_date_result_keeps_the_target_as_parent() -> None:
+    repo, base, source, _ = _fork()
+    same = merged(repo.merge(source, base))
+    assert same.result is MergeResult.UP_TO_DATE
+    assert same.parents == (source,)

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/tests/merge/test_policies.py

@@ -197,6 +197,67 @@ def test_schema_authority_ranks_the_attribute_source_first() -> None:
     assert result.auto_resolutions[0].choice is ResolutionChoice.THEIRS
 
 
+# provenance of open Conflicts ---------------------------------------------------------------
+
+
+def test_open_conflicts_carry_who_and_when_of_each_side() -> None:
+    scenario = _conflicting()
+    loader = lineage(scenario, *_both(edit(1, "alice", T2), sync(2, ERP, T1)))
+    result = attempt(scenario.merge(lineage=loader))
+    assert {c.attribute for c in result.conflicts} == {NAME, COUNTRY}
+    for conflict in result.conflicts:
+        provenance = conflict.provenance
+        assert provenance is not None
+        ours, theirs = provenance.ours, provenance.theirs
+        assert ours is not None
+        assert theirs is not None
+        assert (ours.provenance_id, ours.at) == (ident("prv", 1), "2026-03-02T10:00:00+00:00")
+        assert (ours.actor, ours.origin, ours.principal, ours.source) == (
+            "alice",
+            "operation",
+            "alice",
+            None,
+        )
+        assert (theirs.provenance_id, theirs.at) == (ident("prv", 2), "2026-03-01T10:00:00+00:00")
+        assert (theirs.actor, theirs.origin, theirs.principal, theirs.source) == (
+            "scribe",
+            "source_sync",
+            None,
+            ERP,
+        )
+        assert theirs.labels == tuple(sorted(origin_labels(sync(2, ERP, T1))))
+
+
+def test_open_conflicts_without_a_lineage_loader_carry_no_provenance() -> None:
+    scenario = _conflicting()
+    result = attempt(scenario.merge())
+    assert [c.provenance for c in result.conflicts] == [None, None]
+    assert "provenance" not in {
+        name for c in result.conflicts for name in c.model_dump(exclude_none=True)
+    }
+
+
+def test_a_side_of_unknown_lineage_is_left_out() -> None:
+    scenario = _conflicting()
+    one_sided = lineage(scenario, {}, {NAME: sync(2, ERP, T1)})
+    result = attempt(scenario.merge(lineage=one_sided))
+    by_attribute = {c.attribute: c.provenance for c in result.conflicts}
+    assert by_attribute[COUNTRY] is None
+    named = by_attribute[NAME]
+    assert named is not None
+    assert named.ours is None
+    assert named.theirs is not None
+    assert named.theirs.source == ERP
+
+
+def test_provenance_does_not_change_the_fingerprint() -> None:
+    scenario = _conflicting()
+    loader = lineage(scenario, *_both(edit(1, "alice", T2), sync(2, ERP, T1)))
+    plain = attempt(scenario.merge())
+    stamped = attempt(scenario.merge(lineage=loader))
+    assert [c.fingerprint for c in stamped.conflicts] == [c.fingerprint for c in plain.conflicts]
+
+
 # newest_wins ------------------------------------------------------------------------------
 
 

{lorebase_core-0.3.0 → lorebase_core-0.4.0}/tests/merge/test_properties.py

@@ -140,7 +140,7 @@ def test_fast_forward_detection(world: World, allowed: bool) -> None:
     assert forward.root == repo.roots[descendant]
     if allowed:
         assert forward.result is MergeResult.FAST_FORWARD
-        assert forward.parents == ()
+        assert forward.parents == (ours,)
     else:
         assert forward.result is MergeResult.MERGED
         assert forward.parents == (ours, descendant)

lorebase_core-0.3.0/PKG-INFO

@@ -1,9 +0,0 @@
-Metadata-Version: 2.5
-Name: lorebase-core
-Version: 0.3.0
-Summary: Lorebase core: pure domain logic and versioning engine
-Requires-Python: >=3.12
-Requires-Dist: cel-python>=0.5
-Requires-Dist: google-re2>=1.1
-Requires-Dist: pydantic>=2.7
-Requires-Dist: pyyaml>=6.0

lorebase_core-0.3.0/pyproject.toml

@@ -1,18 +0,0 @@
-[project]
-name = "lorebase-core"
-version = "0.3.0"
-description = "Lorebase core: pure domain logic and versioning engine"
-requires-python = ">=3.12"
-dependencies = [
-    "cel-python>=0.5",
-    "google-re2>=1.1",
-    "pydantic>=2.7",
-    "pyyaml>=6.0",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/lorebase_core"]

lorebase_core-0.3.0/src/lorebase_core/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.3.0"