sdcreader 4.3.0__tar.gz → 4.3.1__tar.gz

{sdcreader-4.3.0/src/sdcreader.egg-info → sdcreader-4.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdcreader
-Version: 4.3.0
+Version: 4.3.1
 Summary: Read a published Semantic Data Charter model's package for projection into other standards (CDIF, DCAT-US, DCAT-AP, HealthDCAT-AP); MCP server included.
 Author: Axius SDC, Inc.
 License: Apache-2.0

{sdcreader-4.3.0 → sdcreader-4.3.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sdcreader"
-version = "4.3.0"
+version = "4.3.1"
 description = "Read a published Semantic Data Charter model's package for projection into other standards (CDIF, DCAT-US, DCAT-AP, HealthDCAT-AP); MCP server included."
 readme = "README.md"
 requires-python = ">=3.10"

{sdcreader-4.3.0 → sdcreader-4.3.1}/src/sdcreader/__init__.py

@@ -14,10 +14,10 @@ to the component that defines it, Exceptional Values included, for record-level
 from .model import (CLOSE, DC_DEFAULTS, EXACT, HAS_UNIT, IDENTIFIER, LEAF_TYPES, NUMERIC_TYPES, PUBLISHER, QUANTIFIED_TYPES, SEE_ALSO,
                     SOURCE, Code, Component, Leaf, Model, enumeration_iri, read_header, read_model)
 from .package import DEFAULT_HOST, ModelPackage, PackageError, fetch_package, load_package
-from .record import CONTEXT_ELEMENTS, EXCEPTIONAL_VALUES, RECORD_ATTRIBUTES, ExceptionalValue, Record, RecordError, RecordValue, read_record
+from .record import CONTEXT_ELEMENTS, EXCEPTIONAL_VALUES, RECORD_ATTRIBUTES, VALUE_ELEMENTS, ExceptionalValue, Record, RecordError, RecordValue, read_record
 
-__version__ = "4.3.0"
+__version__ = "4.3.1"
 __all__ = ["ModelPackage", "PackageError", "DEFAULT_HOST", "load_package", "fetch_package", "read_model", "read_header", "enumeration_iri",
            "Model", "Component", "Leaf", "Code", "LEAF_TYPES", "NUMERIC_TYPES", "QUANTIFIED_TYPES", "DC_DEFAULTS", "IDENTIFIER", "SOURCE",
            "PUBLISHER", "EXACT", "CLOSE", "SEE_ALSO", "HAS_UNIT", "read_record", "Record", "RecordValue", "RecordError", "ExceptionalValue",
-           "EXCEPTIONAL_VALUES", "RECORD_ATTRIBUTES", "CONTEXT_ELEMENTS", "__version__"]
+           "EXCEPTIONAL_VALUES", "RECORD_ATTRIBUTES", "CONTEXT_ELEMENTS", "VALUE_ELEMENTS", "__version__"]

{sdcreader-4.3.0 → sdcreader-4.3.1}/src/sdcreader/record.py

@@ -39,6 +39,18 @@ RECORD_ATTRIBUTES = ("dm-label", "dm-language", "dm-encoding", "creation_timesta
 #: Per-value context elements: what the record says about a value rather than the value itself.
 CONTEXT_ELEMENTS = ("act", "vtb", "vte", "tr", "modified", "latitude", "longitude")
 
+#: The elements that hold a value, by the SDC4 reference model (sdc4.xsd), for every value type. A recovery Exceptional
+#: Value stands beside one of these; one written at the source stands in place of them. Units, language, magnitude
+#: status, accuracy, reference ranges and a link's relation describe a value and are not in this set.
+VALUE_ELEMENTS = frozenset({
+    "xdstring-value", "xdtoken-value", "true-value", "false-value",
+    "xdcount-value", "xdquantity-value", "xdfloat-value", "xddouble-value",
+    "xdtemporal-date", "xdtemporal-time", "xdtemporal-datetime", "xdtemporal-duration", "xdtemporal-year",
+    "xdtemporal-year-month", "xdtemporal-month", "xdtemporal-month-day", "xdtemporal-day",
+    "ordinal", "symbol", "link", "uri", "media-content", "lower", "upper",
+    "xdstringlist-value", "xdtokenlist-value", "xddecimallist-value", "xdintegerlist-value",
+})
+
 
 class RecordError(Exception):
     pass
@@ -48,7 +60,11 @@ class RecordError(Exception):
 class ExceptionalValue:
     code: str              # "ASKR"
     name: str              # "Asked and Refused"
-    origin: str            # "source": in place of the value; "recovery": beside a value that failed its constraint
+    origin: str            # "source": in place of the value; "recovery": beside a value that failed its constraint.
+                           # Inferred from the record's shape, so a best guess: a published model may require the
+                           # value element (SDCStudio's generated schemas do, though the reference model leaves it
+                           # optional), and then a source Exceptional Value sits beside a value too. Whoever inserted
+                           # Exceptional Values (a validator's recovery) knows the origin for certain.
 
 
 @dataclass
@@ -173,7 +189,7 @@ def _value(el, comp: Component, path: list[Component], occurrence: int, position
             elements[n] = _nested(c)
     exceptional = None
     if ev_code:
-        value_present = any(k.endswith("-value") or k.startswith("xdtemporal-") for k in elements)
+        value_present = any(k in VALUE_ELEMENTS for k in elements)
         exceptional = ExceptionalValue(code=ev_code, name=EXCEPTIONAL_VALUES[ev_code],
                                        origin="recovery" if value_present else "source")
     return RecordValue(component=comp, path=path, occurrence=occurrence, position=position, elements=elements,

{sdcreader-4.3.0 → sdcreader-4.3.1/src/sdcreader.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sdcreader
-Version: 4.3.0
+Version: 4.3.1
 Summary: Read a published Semantic Data Charter model's package for projection into other standards (CDIF, DCAT-US, DCAT-AP, HealthDCAT-AP); MCP server included.
 Author: Axius SDC, Inc.
 License: Apache-2.0

{sdcreader-4.3.0 → sdcreader-4.3.1}/tests/test_record.py

@@ -128,3 +128,20 @@ def test_context_elements_are_kept_apart_from_the_value(model):
     r = read_record(etree.tostring(tree), model)
     v = next(v for v in r.values if v.context)
     assert v.context == {"vtb": "2026-01-01T00:00:00"} and "vtb" not in v.elements
+
+
+@pytest.mark.parametrize("sdc_type, value_el", [("XdOrdinal", "ordinal"), ("XdLink", "link"), ("XdFile", "uri"),
+                                                ("XdInterval", "lower"), ("XdBoolean", "true-value")])
+def test_recovery_is_recognized_for_every_value_element(model, sdc_type, value_el):
+    """4.3.1: a recovery Exceptional Value beside a value whose element does not end in -value (an ordinal, a link,
+    a file, an interval) was read as written at the source, and its rejected value was lost."""
+    from sdcreader.record import VALUE_ELEMENTS, _value
+    from sdcreader.model import Component
+    assert value_el in VALUE_ELEMENTS
+    el = etree.Element(f"{{{SDC4}}}ms-x")
+    etree.SubElement(el, "label").text = "L"
+    etree.SubElement(el, f"{{{SDC4}}}INV").append(etree.Element("ev-name"))
+    etree.SubElement(el, value_el).text = "bad"
+    comp = Component(ct_id="x", sdc_type=sdc_type, label="L", description="", data_type="", constraints={}, links={})
+    v = _value(el, comp, [], 0, 0)
+    assert v.exceptional.origin == "recovery" and v.rejected == {value_el: "bad"}