Drop dep back to released linkml-map 0.5.2; xfail reverse tests until 0.5.3

The previous commit pinned linkml-map >= 0.5.3 but 0.5.3 isn't on PyPI
yet. That broke installs and CI. Better path:

- pyproject: 'linkml-map >= 0.5.2' (the released version)
- Reverse adapter raises a clear RuntimeError on 0.5.2 instead of the
  cryptic FunctionNotDefined from linkml-map's evaluator
- Reverse tests use a conditional xfail keyed on 'is_str' presence in
  linkml-map's FUNCTIONS; passes as xfail on 0.5.2, will auto-flip to
  pass on 0.5.3 without code changes
- Forward adapter and codes utility unchanged (work on 0.5.2)
- README updated to reflect the version situation

When 0.5.3 ships:
1. Bump dep constraint to '>= 0.5.3'
2. Remove the runtime guard in adapter.py
3. Remove the xfail marker in tests
4. Tests will pass cleanly

Author: amc-corey-cox

pyproject.toml

@@ -48,10 +48,12 @@ dependencies = [
     "tomlkit >= 0.11.4",
     "inflect >= 6.0.0",
     "linkml-runtime >= 1.10.0, < 2",
-    # The reverse Frictionless adapter trans-spec relies on the
+    # NB: the *reverse* Frictionless adapter trans-spec needs the
     # is_str / is_bool / is_list type predicates, which land in
-    # linkml-map 0.5.3.
-    "linkml-map >= 0.5.3, < 1",
+    # linkml-map 0.5.3. Forward adapter and codes utility work on
+    # 0.5.2. Bump this and remove the xfail in
+    # tests/test_adapters/test_frictionless.py once 0.5.3 ships.
+    "linkml-map >= 0.5.2, < 1",
     "click >= 8.1.7, < 9",
     "deprecated >= 1.2.15, < 2",
     "sqlalchemy >= 2.0.36, < 3",

schema_automator/adapters/README.md

@@ -59,8 +59,13 @@ post-processing in `adapter.py` strips nulls. This idiom is preferred
 over reaching for `callable(x)` (which would couple to a `linkml-map`
 implementation detail) and over a Python-side fallback.
 
-The full set of `is_*` predicates is available in `linkml-map`
-versions after 0.5.2.
+The full set of `is_*` predicates is available in `linkml-map` 0.5.3
+and later. The currently released version (0.5.2) only has
+`is_numeric`. The Frictionless adapter's *forward* direction works on
+0.5.2 (it uses only `is_numeric`); the *reverse* direction needs 0.5.3
+and raises a clear `RuntimeError` on earlier versions. The
+reverse-direction tests are marked `xfail` until the dep can be bumped
+to `>= 0.5.3`.
 
 ## Import boundary
 

schema_automator/adapters/frictionless/adapter.py

@@ -9,8 +9,12 @@
 (``is_str``, ``is_bool``, ``is_list``, ``is_numeric``) to filter
 linkml-map's null-safe wrapper sentinel — each constraint slot has a
 known semantic type, so the predicates double as sentinel-filter and
-type-correctness check. This idiom requires the type predicates added
-post-linkml-map 0.5.2.
+type-correctness check.
+
+The full set of type predicates lands in linkml-map 0.5.3. The current
+released version (0.5.2) only has ``is_numeric``. The forward adapter
+and codes utility work on 0.5.2; the reverse adapter raises a clear
+error on 0.5.2 and works on 0.5.3+.
 """
 
 from __future__ import annotations
@@ -19,10 +23,27 @@
 from typing import Any
 
 from linkml_map.transformer.object_transformer import ObjectTransformer
+from linkml_map.utils.eval_utils import FUNCTIONS as _LINKML_MAP_FUNCTIONS
 from linkml_map.utils.loaders import load_specification
 from linkml_runtime.utils.schemaview import SchemaView
 
 
+_REVERSE_REQUIRED_PREDICATES = ("is_str", "is_bool", "is_list")
+
+
+def _check_reverse_supported() -> None:
+    """Raise a clear error if the installed linkml-map lacks the type
+    predicates the reverse trans-spec depends on (i.e., on 0.5.2)."""
+    missing = [p for p in _REVERSE_REQUIRED_PREDICATES if p not in _LINKML_MAP_FUNCTIONS]
+    if missing:
+        raise RuntimeError(
+            "The DD → Frictionless reverse adapter requires linkml-map "
+            f">= 0.5.3 for the {', '.join(missing)} type predicate(s). "
+            "Installed linkml-map is missing those. Upgrade with "
+            "`pip install --upgrade linkml-map` once 0.5.3 ships."
+        )
+
+
 _PKG_ROOT = Path(__file__).resolve().parents[2]
 _DD_SCHEMA = _PKG_ROOT / "metamodels" / "data_dictionary.yaml"
 _FRICTIONLESS_SCHEMA = _PKG_ROOT / "metamodels" / "frictionless.yaml"
@@ -76,6 +97,10 @@ def frictionless_to_dd(table_schema: dict) -> dict:
 def dd_to_frictionless(data_dictionary: dict) -> dict:
     """Translate a canonical DD into a Frictionless Table Schema.
 
+    Requires linkml-map >= 0.5.3 (for the is_str / is_bool / is_list type
+    predicates the reverse trans-spec uses). Raises ``RuntimeError`` on
+    earlier linkml-map releases with a message pointing at the upgrade.
+
     Lossy in several places: per-code labels and per-code metadata are
     dropped (Frictionless ``enum`` is just an array of values); DD
     ``unit`` has no Frictionless equivalent; DD type values
@@ -92,5 +117,6 @@ def dd_to_frictionless(data_dictionary: dict) -> dict:
     dict
         A Frictionless Table Schema document with ``fields``.
     """
+    _check_reverse_supported()
     tr = _make_transformer(_DD_TO_FRICTIONLESS_SPEC, _DD_SCHEMA, _FRICTIONLESS_SCHEMA)
     return _strip_nulls(tr.map_object(data_dictionary, source_type="DataDictionary"))

tests/test_adapters/test_frictionless.py

@@ -4,13 +4,29 @@
 from pathlib import Path
 
 import pytest
+from linkml_map.utils.eval_utils import FUNCTIONS as _LINKML_MAP_FUNCTIONS
 
 from schema_automator.adapters.frictionless.adapter import (
     dd_to_frictionless,
     frictionless_to_dd,
 )
 
 
+# The reverse adapter's trans-spec uses linkml-map's is_str / is_bool /
+# is_list type predicates, which land in linkml-map 0.5.3. On 0.5.2 (the
+# current PyPI release) the reverse trans-spec raises FunctionNotDefined
+# at evaluation time. xfail the reverse-direction tests until the dep
+# constraint can be bumped to >= 0.5.3.
+_HAS_TYPE_PREDICATES = "is_str" in _LINKML_MAP_FUNCTIONS
+_REVERSE_REQUIRES_LINKML_MAP_053 = pytest.mark.xfail(
+    not _HAS_TYPE_PREDICATES,
+    reason="Reverse adapter trans-spec requires linkml-map >= 0.5.3 "
+    "(is_str / is_bool / is_list type predicates)",
+    strict=True,
+    raises=Exception,
+)
+
+
 # ----------------------------------------------------------------------
 # Forward direction (Frictionless → DD) — driven by the trans-spec.
 # ----------------------------------------------------------------------
@@ -177,6 +193,7 @@ def test_real_world_finance_vix(self):
 # ----------------------------------------------------------------------
 
 
+@_REVERSE_REQUIRES_LINKML_MAP_053
 class TestDDToFrictionless:
     def test_minimal_field(self):
         source = {"entries": [{"name": "x", "type": "string", "description": "y"}]}