Addressed copilot review

Author: VisLab

hed/schema/hed_schema_io.py

@@ -174,14 +174,15 @@ def from_string(
     return hed_schema
 
 
-def from_dataframes(schema_data, schema_namespace=None, name=None) -> "HedSchema":
+def from_dataframes(schema_data, schema_namespace=None, name=None, check_prerelease=False) -> "HedSchema":
     """Create a schema from the given string.
 
     Parameters:
         schema_data (dict of str or None): A dict of DF_SUFFIXES:file_as_string_or_df
                               Should have an entry for all values of DF_SUFFIXES.
         schema_namespace (str, None):  The name_prefix all tags in this schema will accept.
         name (str or None): User supplied identifier for this schema
+        check_prerelease (bool): If True, allow the partnered standard schema (withStandard) to be a prerelease version.
 
     Returns:
         HedSchema:  The loaded schema.
@@ -199,7 +200,9 @@ def from_dataframes(schema_data, schema_namespace=None, name=None) -> "HedSchema
             HedExceptions.BAD_PARAMETERS, "Empty or non dict value passed to HedSchema.from_dataframes", filename=name
         )
 
-    hed_schema = SchemaLoaderDF.load_spreadsheet(schema_as_strings_or_df=schema_data, name=name)
+    hed_schema = SchemaLoaderDF.load_spreadsheet(
+        schema_as_strings_or_df=schema_data, name=name, check_prerelease=check_prerelease
+    )
 
     if schema_namespace:
         hed_schema.set_schema_prefix(schema_namespace=schema_namespace)

hed/scripts/check_schema_loading.py

@@ -382,13 +382,13 @@ def run_loading_check(
             and 'failures' (list of dicts with 'path' and 'error').
 
     Raises:
-        ValueError: If mutually exclusive flags are combined (e.g., prerelease_only and exclude_prereleases,
-            or library_filter and standard_only).
+        ValueError: If mutually exclusive flags are combined (e.g., --exclude-prereleases and
+            --prerelease-only, or --library and --standard-only).
     """
     if prerelease_only and exclude_prereleases:
-        raise ValueError("prerelease_only and exclude_prereleases are mutually exclusive")
+        raise ValueError("--exclude-prereleases and --prerelease-only are mutually exclusive")
     if library_filter and standard_only:
-        raise ValueError("library_filter and standard_only are mutually exclusive")
+        raise ValueError("--library and --standard-only are mutually exclusive")
 
     tester = SchemaLoadTester(hed_schemas_root, verbose=verbose)
 

hed/scripts/schema_script_util.py

@@ -1,13 +1,37 @@
 import os.path
 from collections import defaultdict
 from hed.schema import from_string, load_schema, from_dataframes
+from hed.schema import hed_cache
 from hed.errors import get_printable_issue_string, HedFileError
 from hed.errors.error_types import ErrorSeverity
 from hed.schema.schema_comparer import SchemaComparer
 
 all_extensions = [".tsv", ".mediawiki", ".xml", ".json"]
 
 
+def _is_prerelease_partner(base_schema) -> bool:
+    """Return True if base_schema's withStandard partner is only resolvable from the prerelease cache.
+
+    When a library schema serialised with ``save_merged=False`` is reloaded, the loader
+    re-fetches the standard schema named in the ``withStandard`` header attribute.  If
+    that version lives only in the prerelease subdirectory of the cache, the reload will
+    fail unless ``check_prerelease=True`` is forwarded.  This helper detects that
+    condition by asking the cache whether the version is found without the prerelease
+    flag (not found → prerelease required).
+
+    Parameters:
+        base_schema (HedSchema): The schema to inspect.
+
+    Returns:
+        bool: True if ``withStandard`` is set and the version is absent from the
+            regular (non-prerelease) cache directory.
+    """
+    with_standard = base_schema.with_standard
+    if not with_standard:
+        return False
+    return hed_cache.get_hed_version_path(with_standard, check_prerelease=False) is None
+
+
 def validate_schema_object(base_schema, schema_name):
     """Validate a schema object by checking compliance and roundtrip conversion.
 
@@ -30,10 +54,16 @@ def validate_schema_object(base_schema, schema_name):
             validation_issues.append(error_message)
             return validation_issues
 
+        # If the withStandard partner only exists in the prerelease cache, all unmerged
+        # reloads must pass check_prerelease=True or they will fail partner resolution.
+        check_prerelease = _is_prerelease_partner(base_schema)
+
         for save_merged in (True, False):
             label = "merged" if save_merged else "unmerged"
             tagged_name = f"{schema_name} ({label})"
-            validation_issues += _roundtrip_all_formats(base_schema, tagged_name, save_merged=save_merged)
+            validation_issues += _roundtrip_all_formats(
+                base_schema, tagged_name, save_merged=save_merged, check_prerelease=check_prerelease
+            )
     except HedFileError as e:
         print(f"Saving/loading error: {schema_name} {e.message}")
         error_text = e.message
@@ -291,7 +321,7 @@ def get_prerelease_path(repo_path, schema_name, schema_version):
     return os.path.join(base_path, "hedtsv", schema_filename)
 
 
-def _roundtrip_all_formats(base_schema, schema_name, save_merged=True):
+def _roundtrip_all_formats(base_schema, schema_name, save_merged=True, check_prerelease=False):
     """Roundtrip a schema through all four formats and compare to the original.
 
     Serializes the schema to mediawiki, XML, JSON, and TSV, reloads each, and
@@ -302,26 +332,32 @@ def _roundtrip_all_formats(base_schema, schema_name, save_merged=True):
         schema_name (str): Label for error reporting (should include merge context).
         save_merged (bool): If True, save the merged (with-standard) form.
             If False, save only the library-specific content.
+        check_prerelease (bool): If True, pass check_prerelease=True to all reload
+            calls.  Required when the schema's withStandard partner exists only in
+            the prerelease cache directory; otherwise unmerged reloads will fail
+            partner resolution.  Has no effect when save_merged=True because the
+            merged serialisation embeds the full standard content and no partner
+            lookup is performed on reload.
 
     Returns:
         list: A list of validation issue strings. Empty if no issues found.
     """
     issues = []
 
     mediawiki_string = base_schema.get_as_mediawiki_string(save_merged=save_merged)
-    reloaded_schema = from_string(mediawiki_string, schema_format=".mediawiki")
+    reloaded_schema = from_string(mediawiki_string, schema_format=".mediawiki", check_prerelease=check_prerelease)
     issues += _get_schema_comparison(base_schema, reloaded_schema, schema_name, "mediawiki")
 
     xml_string = base_schema.get_as_xml_string(save_merged=save_merged)
-    reloaded_schema = from_string(xml_string, schema_format=".xml")
+    reloaded_schema = from_string(xml_string, schema_format=".xml", check_prerelease=check_prerelease)
     issues += _get_schema_comparison(base_schema, reloaded_schema, schema_name, "xml")
 
     json_string = base_schema.get_as_json_string(save_merged=save_merged)
-    reloaded_schema = from_string(json_string, schema_format=".json")
+    reloaded_schema = from_string(json_string, schema_format=".json", check_prerelease=check_prerelease)
     issues += _get_schema_comparison(base_schema, reloaded_schema, schema_name, "json")
 
     tsv_dataframes = base_schema.get_as_dataframes(save_merged=save_merged)
-    reloaded_schema = from_dataframes(tsv_dataframes)
+    reloaded_schema = from_dataframes(tsv_dataframes, check_prerelease=check_prerelease)
     issues += _get_schema_comparison(base_schema, reloaded_schema, schema_name, "tsv")
 
     return issues

tests/data/schema_tests/prerelease/HED9.9.9.mediawiki

@@ -0,0 +1,27 @@
+HED version="9.9.9"
+
+'''Prologue'''
+Minimal prerelease-only standard schema for unit testing withStandard partner
+resolution via load_schema/from_string.
+
+!# start schema
+
+'''Event''' <nowiki>[Something that happens at a given time and place.]</nowiki>
+
+'''Property''' <nowiki>[A characteristic of something.]</nowiki>
+
+!# end schema
+
+'''Unit classes'''
+
+'''Unit modifiers'''
+
+'''Value classes'''
+
+'''Schema attributes'''
+
+'''Properties'''
+
+'''Epilogue'''
+
+!# end hed

tests/data/schema_tests/prerelease/HED_testpre_1.0.0.mediawiki

@@ -0,0 +1,25 @@
+HED library="testpre" version="1.0.0" withStandard="9.9.9" unmerged="True"
+
+'''Prologue'''
+Library schema whose withStandard partner (9.9.9) exists only in the prerelease
+directory. Used to test check_prerelease propagation through load_schema/from_string.
+
+!# start schema
+
+'''Prerelease-partner-only-item''' <nowiki>[A test item in the testpre library schema.]</nowiki>
+
+!# end schema
+
+'''Unit classes'''
+
+'''Unit modifiers'''
+
+'''Value classes'''
+
+'''Schema attributes'''
+
+'''Properties'''
+
+'''Epilogue'''
+
+!# end hed