lorebase-store 0.3.1__tar.gz → 0.4.0__tar.gz

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: lorebase-store
-Version: 0.3.1
+Version: 0.4.0
 Summary: Lorebase store: persistence, repositories, migrations and materializer
 Project-URL: Homepage, https://github.com/aantenore/lorebase
 Project-URL: Documentation, https://aantenore.github.io/lorebase/
@@ -22,8 +22,8 @@ Requires-Python: >=3.12
 Requires-Dist: alembic>=1.13
 Requires-Dist: asyncpg>=0.29
 Requires-Dist: cryptography>=42
-Requires-Dist: lorebase-core<0.4,>=0.3
-Requires-Dist: lorebase-platform<0.4,>=0.3
+Requires-Dist: lorebase-core<0.5,>=0.4
+Requires-Dist: lorebase-platform<0.5,>=0.4
 Requires-Dist: opentelemetry-api>=1.25
 Requires-Dist: pgvector>=0.3
 Requires-Dist: sqlalchemy[asyncio]>=2.0.30

lorebase_store-0.4.0/migrations/versions/0048_open_conflicts_by_element.py

@@ -0,0 +1,41 @@
+"""Open Conflicts by element (design 6.10).
+
+A read of a Record can ask whether a Conflict about it waits for a decision in an open
+Proposal. `conflicts` was only reachable by attempt, so that question would scan every
+Conflict of every conflicted attempt. The partial index `ix_conflicts_open_element` over
+`(domain_id, partition, element_key)` holds the unresolved Conflicts only: resolved rows, the
+bulk of a table that keeps merged attempts, are left out, and the lookup of one Record is one
+probe that finds nothing in the common case.
+
+Revision ID: 0048
+Revises: 0047
+Create Date: 2026-11-13 09:00:00.000000
+"""
+
+from __future__ import annotations
+
+from collections.abc import Sequence
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "0048"
+down_revision: str | Sequence[str] | None = "0047"
+branch_labels: str | Sequence[str] | None = None
+depends_on: str | Sequence[str] | None = None
+
+TABLE = "conflicts"
+INDEX = "ix_conflicts_open_element"
+
+
+def upgrade() -> None:
+    op.create_index(
+        INDEX,
+        TABLE,
+        ["domain_id", "partition", "element_key"],
+        postgresql_where=sa.text("resolved_by IS NULL"),
+    )
+
+
+def downgrade() -> None:
+    op.drop_index(INDEX, table_name=TABLE)

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "lorebase-store"
-version = "0.3.1"
+version = "0.4.0"
 description = "Lorebase store: persistence, repositories, migrations and materializer"
 requires-python = ">=3.12"
 readme = "README.md"
@@ -18,8 +18,8 @@ classifiers = [
   "Topic :: Database",
 ]
 dependencies = [
-  "lorebase-core>=0.3,<0.4",
-  "lorebase-platform>=0.3,<0.4",
+  "lorebase-core>=0.4,<0.5",
+  "lorebase-platform>=0.4,<0.5",
   "sqlalchemy[asyncio]>=2.0.30",
   "asyncpg>=0.29",
   "alembic>=1.13",

lorebase_store-0.4.0/src/lorebase_store/__init__.py

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

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/src/lorebase_store/merging/service.py

@@ -822,6 +822,9 @@ def _summary(computation: AttemptComputation) -> dict[str, Any]:
 def _conflict_row(state: ConflictState, stored: Mapping[str, ResolutionRow]) -> ConflictRow:
     conflict = state.conflict
     payload = conflict.model_dump(mode="json")
+    if payload.get("provenance") is None:
+        # Stored only when the merge knew who changed a side: other payloads keep their shape.
+        payload.pop("provenance", None)
     payload["members"] = list(state.members)
     if state.rejected:
         payload["details"] = {**payload.get("details", {}), "rejected": REJECTED_DETAIL}

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/src/lorebase_store/models/proposals.py

@@ -169,6 +169,14 @@ class Conflict(Base):
             ondelete="CASCADE",
         ),
         UniqueConstraint("domain_id", "attempt_id", "fingerprint"),
+        # Reads that ask whether a Record has a Conflict waiting for a decision (design 6.10).
+        Index(
+            "ix_conflicts_open_element",
+            "domain_id",
+            "partition",
+            "element_key",
+            postgresql_where=text("resolved_by IS NULL"),
+        ),
     )
 
     domain_id: Mapped[DomainKey]

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/src/lorebase_store/repositories/__init__.py

@@ -48,6 +48,7 @@ from lorebase_store.repositories.merges import (
     MergeAttemptRepository,
     MergeAttemptRow,
     PartitionFilter,
+    PendingConflictRow,
     ResolutionRepository,
     ResolutionRow,
 )
@@ -142,6 +143,7 @@ __all__ = [
     "MergeOutcome",
     "OutboxRepository",
     "PartitionFilter",
+    "PendingConflictRow",
     "PgRevisionGraph",
     "PreservedRow",
     "ProposalChecks",

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/src/lorebase_store/repositories/merges.py

@@ -20,8 +20,9 @@ from sqlalchemy.ext.asyncio import AsyncSession
 
 from lorebase_store.bulk import chunks
 from lorebase_store.models import metadata
-from lorebase_store.models.enums import MergeAttemptStatus
+from lorebase_store.models.enums import MergeAttemptStatus, ProposalStatus
 
+PROPOSALS: Table = metadata.tables["proposals"]
 ATTEMPTS: Table = metadata.tables["merge_attempts"]
 CONFLICTS: Table = metadata.tables["conflicts"]
 RESOLUTIONS: Table = metadata.tables["conflict_resolutions"]
@@ -69,6 +70,20 @@ class ConflictRow:
         return self.resolved_by is not None
 
 
+@dataclass(frozen=True, slots=True)
+class PendingConflictRow:
+    """An open Conflict about one element, as a reader of the target branch is told: the
+    Proposal it blocks, its id and code, the Attribute (None for a Conflict about the whole
+    element) and the hash of the competing element on the Proposal's source side."""
+
+    proposal_id: str
+    source_ref: str
+    fingerprint: str
+    code: str
+    attribute_id: str | None
+    competing_hash: str | None
+
+
 @dataclass(frozen=True, slots=True)
 class ResolutionRow:
     fingerprint: str
@@ -348,6 +363,59 @@ class ConflictRepository:
         )
         return frozenset((await self._session.execute(query)).scalars())
 
+    async def pending(
+        self, target: str, partition: str, element_key: str
+    ) -> list[PendingConflictRow]:
+        """The open Conflicts about one element in the open Proposals into `target`.
+
+        Only the current attempt of a Proposal counts (`conflicted`: a recomputation marks the
+        earlier ones `stale`, closing the Proposal `abandoned`). The lookup starts from the
+        partial index of unresolved Conflicts (`ix_conflicts_open_element`), so a Record
+        nobody contests costs one index probe.
+        """
+        query = (
+            select(
+                ATTEMPTS.c.proposal_id,
+                PROPOSALS.c.source_ref,
+                CONFLICTS.c.id,
+                CONFLICTS.c.code,
+                CONFLICTS.c.attribute_id,
+                CONFLICTS.c.payload["theirs_hash"].astext.label("competing_hash"),
+            )
+            .join(
+                ATTEMPTS,
+                (ATTEMPTS.c.domain_id == CONFLICTS.c.domain_id)
+                & (ATTEMPTS.c.id == CONFLICTS.c.attempt_id),
+            )
+            .join(
+                PROPOSALS,
+                (PROPOSALS.c.domain_id == ATTEMPTS.c.domain_id)
+                & (PROPOSALS.c.id == ATTEMPTS.c.proposal_id),
+            )
+            .where(
+                CONFLICTS.c.domain_id == self._domain,
+                CONFLICTS.c.partition == partition,
+                CONFLICTS.c.element_key == element_key,
+                CONFLICTS.c.resolved_by.is_(None),
+                ATTEMPTS.c.status == MergeAttemptStatus.CONFLICTED,
+                PROPOSALS.c.status == ProposalStatus.OPEN,
+                PROPOSALS.c.target_ref == target,
+            )
+            .order_by(ATTEMPTS.c.proposal_id, CONFLICTS.c.id)
+        )
+        result = await self._session.execute(query)
+        return [
+            PendingConflictRow(
+                proposal_id=row.proposal_id,
+                source_ref=row.source_ref,
+                fingerprint=row.id,
+                code=row.code,
+                attribute_id=row.attribute_id,
+                competing_hash=row.competing_hash,
+            )
+            for row in result
+        ]
+
 
 class ResolutionRepository:
     """Resolutions of the Proposals of one Domain, by Conflict fingerprint."""

{lorebase_store-0.3.1 → lorebase_store-0.4.0}/tests/test_models.py

@@ -129,4 +129,4 @@ def test_comparison_filter_skips_partitions_and_runtime_indexes() -> None:
 
 
 def test_head_revision_is_the_latest_migration() -> None:
-    assert head_revisions() == ("0047",)
+    assert head_revisions() == ("0048",)

lorebase_store-0.3.1/src/lorebase_store/__init__.py

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