Fixed copilot/claude suggestions

Author: VisLab

hed/schema/hed_schema.py

@@ -423,7 +423,7 @@ def set_schema_prefix(self, schema_namespace):
 
         if schema_namespace and not schema_namespace[:-1].isalpha():
             raise HedFileError(
-                HedExceptions.INVALID_LIBRARY_PREFIX,
+                HedExceptions.SCHEMA_LIBRARY_INVALID,
                 "Schema namespace must contain only alpha characters",
                 self.filename,
             )

hed/schema/schema_io/base2schema.py

@@ -194,15 +194,15 @@ def find_rooted_entry(tag_entry, schema, loading_merged):
         if rooted_tag is not None:
             if not schema.with_standard:
                 raise HedFileError(
-                    HedExceptions.SCHEMA_ATTRIBUTE_INVALID,
+                    HedExceptions.SCHEMA_LIBRARY_INVALID,
                     f"Rooted tag attribute found on '{tag_entry.short_tag_name}' in a standard schema.",
                     schema.name,
                 )
 
             if not isinstance(rooted_tag, str):
                 raise HedFileError(
                     HedExceptions.SCHEMA_LIBRARY_INVALID,
-                    f"Rooted tag '{tag_entry.short_tag_name}' is not a string.\"",
+                    f"Rooted tag '{tag_entry.short_tag_name}' is not a string.",
                     schema.name,
                 )
 
@@ -223,7 +223,7 @@ def find_rooted_entry(tag_entry, schema, loading_merged):
             rooted_entry = schema.tags.get(rooted_tag)
             if not rooted_entry or rooted_entry.has_attribute(constants.HedKey.InLibrary):
                 raise HedFileError(
-                    HedExceptions.LIBRARY_SCHEMA_INVALID,
+                    HedExceptions.SCHEMA_LIBRARY_INVALID,
                     f"Rooted tag '{tag_entry.short_tag_name}' not found in paired standard schema",
                     schema.name,
                 )

hed/schema/schema_io/df2schema.py

@@ -275,7 +275,7 @@ def _add_to_dict(self, row_number, row, entry, key_class):
                 row_number,
                 row,
                 "Library tag in unmerged schema has InLibrary attribute",
-                HedExceptions.IN_LIBRARY_IN_UNMERGED,
+                HedExceptions.SCHEMA_LIBRARY_INVALID,
             )
 
         return self._add_to_dict_base(entry, key_class)

hed/schema/schema_io/wiki2schema.py

@@ -609,7 +609,7 @@ def _add_to_dict(self, row_number, row, entry, key_class):
                 row_number,
                 row,
                 "Library tag in unmerged schema has InLibrary attribute",
-                HedExceptions.IN_LIBRARY_IN_UNMERGED,
+                HedExceptions.SCHEMA_LIBRARY_INVALID,
             )
 
         return self._add_to_dict_base(entry, key_class)

hed/schema/schema_io/xml2schema.py

@@ -348,7 +348,7 @@ def _get_elements_by_name(self, element_name="node", parent_element=None):
     def _add_to_dict(self, entry, key_class):
         if entry.has_attribute(HedKey.InLibrary) and not self._loading_merged and not self.appending_to_schema:
             raise HedFileError(
-                HedExceptions.IN_LIBRARY_IN_UNMERGED,
+                HedExceptions.SCHEMA_LIBRARY_INVALID,
                 "Library tag in unmerged schema has InLibrary attribute",
                 self.name,
             )

tests/schema/test_hed_schema_io.py

@@ -486,6 +486,16 @@ def test_cannot_load_schemas(self):
                 load_schema(file)
             self.assertEqual(context.exception.code, HedExceptions.SCHEMA_LIBRARY_INVALID)
 
+    def test_rooted_tag_not_in_standard_schema(self):
+        # HED_badroot_0.0.1.mediawiki has rooted=AlsoNotRealTag which does not exist in the standard schema.
+        # This should raise SCHEMA_LIBRARY_INVALID (not LIBRARY_SCHEMA_INVALID).
+        bad_root_file = os.path.join(self.full_base_folder, "issues_tests/HED_badroot_0.0.1.mediawiki")
+        with self.assertRaises(HedFileError) as context:
+            load_schema(bad_root_file)
+        self.assertEqual(context.exception.code, HedExceptions.SCHEMA_LIBRARY_INVALID)
+        issue_codes = [issue.get("code") for issue in context.exception.issues]
+        self.assertIn(HedExceptions.SCHEMA_LIBRARY_INVALID, issue_codes)
+
     def test_saving_in_library_wiki(self):
         old_score_schema = load_schema_version("score_1.0.0")
 

tests/tools/analysis/test_hed_type_factors.py

@@ -7,7 +7,7 @@
 from hed.schema.hed_schema_io import load_schema_version
 from hed.tools.analysis.event_manager import EventManager
 from hed.tools.analysis.hed_type import HedType
-from hed.errors.exceptions import HedFileError
+from hed.errors.exceptions import HedFileError, HedExceptions
 from hed.tools.analysis.hed_type_factors import HedTypeFactors
 
 
@@ -121,10 +121,10 @@ def test_constructor_multiple_values(self):
         self.assertEqual(len(fact2), len(self.event_man2.event_list))
         with self.assertRaises(HedFileError) as context:
             var_fact2.get_factors(factor_encoding="categorical")
-        self.assertEqual(context.exception.args[0], "MultipleFactorSameEvent")
-        with self.assertRaises(ValueError) as context:
+        self.assertEqual(context.exception.code, HedExceptions.BAD_PARAMETERS)
+        with self.assertRaises(HedFileError) as context:
             var_fact2.get_factors(factor_encoding="baloney")
-        self.assertEqual(context.exception.args[0], "BadFactorEncoding")
+        self.assertEqual(context.exception.code, HedExceptions.BAD_PARAMETERS)
 
     def test_constructor_unmatched(self):
         with self.assertRaises(KeyError) as context: