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

lorebase_client-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_client-0.4.0/PKG-INFO

@@ -0,0 +1,38 @@
+Metadata-Version: 2.5
+Name: lorebase-client
+Version: 0.4.0
+Summary: Lorebase client: typed sync and async HTTP client for the Keeper API
+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: httpx>=0.27
+Requires-Dist: pydantic>=2.7
+Description-Content-Type: text/markdown
+
+# lorebase-client
+
+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.
+
+Typed sync and async Python client for the Keeper REST API.
+
+```sh
+pip install lorebase-client
+```
+
+A library: it has no command of its own.
+
+Documentation: [Agents](https://aantenore.github.io/lorebase/agents/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

lorebase_client-0.4.0/README.md

@@ -0,0 +1,13 @@
+# lorebase-client
+
+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.
+
+Typed sync and async Python client for the Keeper REST API.
+
+```sh
+pip install lorebase-client
+```
+
+A library: it has no command of its own.
+
+Documentation: [Agents](https://aantenore.github.io/lorebase/agents/) and the [documentation site](https://aantenore.github.io/lorebase/). License: Apache-2.0.

lorebase_client-0.4.0/pyproject.toml

@@ -0,0 +1,39 @@
+[project]
+name = "lorebase-client"
+version = "0.4.0"
+description = "Lorebase client: typed sync and async HTTP client for the Keeper API"
+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 = [
+  # Transport: one HTTP stack with sync and async clients and pluggable transports.
+  "httpx>=0.27",
+  # Typed request and response models.
+  "pydantic>=2.7",
+]
+
+[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_client"]

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/src/lorebase_client/__init__.py

@@ -45,7 +45,7 @@ from lorebase_client.errors import (
     error_from_response,
 )
 
-__version__ = "0.3.0"
+__version__ = "0.4.0"
 
 __all__ = [
     "ENV_API_KEY",

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/src/lorebase_client/aclient.py

@@ -710,9 +710,21 @@ class Records(_Resource):
         at: str | None = None,
         links: bool = False,
         lineage: bool = False,
+        conflicts: bool = False,
     ) -> m.RecordResponse:
+        """One Record. `conflicts` adds `conflict_in_progress`: the open Conflicts about it
+        in Proposals into the branch read (branch head only)."""
         return await self._c.send(
-            ep.get_record(domain, kind, key, branch=branch, at=at, links=links, lineage=lineage)
+            ep.get_record(
+                domain,
+                kind,
+                key,
+                branch=branch,
+                at=at,
+                links=links,
+                lineage=lineage,
+                conflicts=conflicts,
+            )
         )
 
     async def history(

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/src/lorebase_client/client.py

@@ -721,9 +721,21 @@ class Records(_Resource):
         at: str | None = None,
         links: bool = False,
         lineage: bool = False,
+        conflicts: bool = False,
     ) -> m.RecordResponse:
+        """One Record. `conflicts` adds `conflict_in_progress`: the open Conflicts about it
+        in Proposals into the branch read (branch head only)."""
         return self._c.send(
-            ep.get_record(domain, kind, key, branch=branch, at=at, links=links, lineage=lineage)
+            ep.get_record(
+                domain,
+                kind,
+                key,
+                branch=branch,
+                at=at,
+                links=links,
+                lineage=lineage,
+                conflicts=conflicts,
+            )
         )
 
     def history(

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/src/lorebase_client/endpoints.py

@@ -471,6 +471,7 @@ def get_record(
     at: str | None = None,
     links: bool = False,
     lineage: bool = False,
+    conflicts: bool = False,
 ) -> Call[m.RecordResponse]:
     return Call(
         "GET",
@@ -481,6 +482,7 @@ def get_record(
             "at": at,
             "links": links or None,
             "lineage": lineage or None,
+            "conflicts": conflicts or None,
         },
         safe=True,
         cacheable=True,

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/src/lorebase_client/models.py

@@ -547,8 +547,22 @@ class Served(Model):
     served_from: ServedFrom
 
 
+class ConflictInProgress(Model):
+    """A Conflict about a Record that waits for a decision in an open Proposal into the
+    branch read; `attribute` is None when the whole Record is contested."""
+
+    proposal_id: str
+    conflict_id: str
+    code: str
+    attribute: str | None = None
+    competing_hash: str | None = None
+
+
 class RecordResponse(Served):
+    """A Record. `conflict_in_progress` is set when the read asked for it (`conflicts`)."""
+
     record: RecordItem
+    conflict_in_progress: list[ConflictInProgress] | None = None
 
 
 class RecordPage(Served):
@@ -1155,14 +1169,35 @@ class Attempt(Model):
     auto_resolutions: list[dict[str, Any]]
 
 
+class SideProvenance(Model):
+    """Who or what last changed the Attribute of a Conflict on one side, and when."""
+
+    provenance_id: str
+    at: datetime
+    actor: str | None = None
+    origin: str | None = None
+    source: str | None = None
+    principal: str | None = None
+    labels: list[str] = Field(default_factory=list)
+
+
+class ConflictProvenance(Model):
+    """The provenance of the two competing sides; `None` for a side of unknown Lineage."""
+
+    ours: SideProvenance | None = None
+    theirs: SideProvenance | None = None
+
+
 class ConflictItem(Model):
-    """A Conflict: `id`, `status` and the members the merge engine reports."""
+    """A Conflict: `id`, `status` and the members the merge engine reports. `provenance` is
+    set on Attribute Conflicts whose merge knew who changed a side."""
 
     model_config = ConfigDict(extra="allow")
 
     id: str
     status: ConflictStatus
     resolution: dict[str, Any] | None = None
+    provenance: ConflictProvenance | None = None
 
 
 class Conflicts(Attempt):

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/tests/test_contract.py

@@ -64,6 +64,7 @@ RESPONSES: dict[type[m.Model], str] = {
     m.ExtractionEvidence: "ExtractionEvidenceOut",
     m.ValueLineage: "ValueLineageOut",
     m.RecordLineage: "RecordLineageOut",
+    m.ConflictInProgress: "ConflictInProgressOut",
     m.RecordResponse: "RecordResponse",
     m.RecordPage: "RecordPage",
     m.AggregateCount: "AggregateCount",
@@ -117,6 +118,8 @@ RESPONSES: dict[type[m.Model], str] = {
     m.Approval: "ApprovalOut",
     m.Resolution: "ResolutionOut",
     m.Attempt: "AttemptOut",
+    m.SideProvenance: "SideProvenanceOut",
+    m.ConflictProvenance: "ConflictProvenanceOut",
     m.ConflictItem: "ConflictOut",
     m.Conflicts: "ConflictsOut",
     m.Proposal: "lorebase_keeper__routes__proposals__ProposalOut",

{lorebase_client-0.3.0 → lorebase_client-0.4.0}/tests/test_requests.py

@@ -590,6 +590,35 @@ RECORD = {
 }
 
 
+def test_a_record_read_can_ask_for_pending_conflicts(
+    http: respx.MockRouter, sleeps: Sleeps
+) -> None:
+    pending = {
+        "proposal_id": "prp_1",
+        "conflict_id": "ab" * 32,
+        "code": "DV1",
+        "attribute": "risk_score",
+        "competing_hash": "cd" * 32,
+    }
+    route = http.get("/domains/supply/kinds/Part/records/P-1").mock(
+        side_effect=lambda request: httpx.Response(
+            200,
+            json={**RECORD, "conflict_in_progress": [pending]}
+            if "conflicts" in request.url.params
+            else RECORD,
+        )
+    )
+    with make(sleeps) as client:
+        plain = client.records.get("supply", "Part", "P-1")
+        asked = client.records.get("supply", "Part", "P-1", conflicts=True)
+    assert "conflicts" not in route.calls[0].request.url.params
+    assert route.calls[1].request.url.params["conflicts"] == "true"
+    assert plain.conflict_in_progress is None
+    assert asked.conflict_in_progress is not None
+    [marker] = asked.conflict_in_progress
+    assert marker.model_dump() == pending
+
+
 def test_etag_cache_revalidates_and_serves_the_cached_body(
     http: respx.MockRouter, sleeps: Sleeps
 ) -> None:

lorebase_client-0.3.0/PKG-INFO

@@ -1,7 +0,0 @@
-Metadata-Version: 2.5
-Name: lorebase-client
-Version: 0.3.0
-Summary: Lorebase client: typed sync and async HTTP client for the Keeper API
-Requires-Python: >=3.12
-Requires-Dist: httpx>=0.27
-Requires-Dist: pydantic>=2.7

lorebase_client-0.3.0/pyproject.toml

@@ -1,18 +0,0 @@
-[project]
-name = "lorebase-client"
-version = "0.3.0"
-description = "Lorebase client: typed sync and async HTTP client for the Keeper API"
-requires-python = ">=3.12"
-dependencies = [
-  # Transport: one HTTP stack with sync and async clients and pluggable transports.
-  "httpx>=0.27",
-  # Typed request and response models.
-  "pydantic>=2.7",
-]
-
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[tool.hatch.build.targets.wheel]
-packages = ["src/lorebase_client"]