Resolved issue hed-standard#1183 and worked on the scripts

Author: VisLab

hed/validator/hed_validator.py

@@ -177,7 +177,9 @@ def check_tag_formatting(self, original_tag) -> list[dict]:
 
         return validation_issues
 
-    def validate_units(self, original_tag, validate_text=None, report_as=None, error_code=None, index_offset=0) -> list[dict]:
+    def validate_units(
+        self, original_tag, validate_text=None, report_as=None, error_code=None, index_offset=0, allow_placeholders=True
+    ) -> list[dict]:
         """Validate units and value classes
 
         Parameters:
@@ -187,18 +189,19 @@ def validate_units(self, original_tag, validate_text=None, report_as=None, error
                                Mostly for definitions that expand.
             error_code (str): The code to override the error as.  Again mostly for def/def-expand tags.
             index_offset (int): Offset into the extension validate_text starts at
+            allow_placeholders (bool): Whether placeholders are allowed (affects value class validation for "#")
 
         Returns:
             list[dict]: Issues found from units
         """
         if validate_text is None:
             validate_text = original_tag.extension
         issues = []
-        if validate_text == "#":
+        if validate_text == "#" and allow_placeholders:
             return []
         if original_tag.is_unit_class_tag():
             issues += self._unit_validator.check_tag_unit_class_units_are_valid(
-                original_tag, validate_text, report_as=report_as, error_code=error_code
+                original_tag, validate_text, report_as=report_as, error_code=error_code, allow_placeholders=allow_placeholders
             )
         elif original_tag.is_value_class_tag():
             issues += self._unit_validator.check_tag_value_class_valid(original_tag, validate_text, report_as=report_as)
@@ -240,8 +243,13 @@ def _validate_individual_tags_in_hed_string(self, hed_string_obj, allow_placehol
                         hed_tag, self, allow_placeholders=allow_placeholders
                     )
                 elif (hed_tag.short_base_tag == DefTagNames.DEFINITION_KEY) and hed_tag.extension.endswith("/#"):
-                    validation_issues += self.validate_units(hed_tag, hed_tag.extension[:-2])
+                    validation_issues += self.validate_units(
+                        hed_tag, hed_tag.extension[:-2], allow_placeholders=allow_placeholders
+                    )
+                elif allow_placeholders and hed_tag.is_unit_class_tag() and hed_tag.extension.startswith("# "):
+                    # If placeholder is followed by units (e.g., "# m-per-s^2"), validate the units
+                    validation_issues += self.validate_units(hed_tag, allow_placeholders=allow_placeholders)
                 elif not (allow_placeholders and "#" in hed_tag.extension):
-                    validation_issues += self.validate_units(hed_tag)
+                    validation_issues += self.validate_units(hed_tag, allow_placeholders=allow_placeholders)
 
         return validation_issues

hed/validator/util/class_util.py

@@ -48,37 +48,48 @@ def _get_default_value_class_validators(self):
 
         return validator_dict
 
-    def check_tag_unit_class_units_are_valid(self, original_tag, validate_text, report_as=None, error_code=None) -> list[dict]:
+    def check_tag_unit_class_units_are_valid(
+        self, original_tag, validate_text, report_as=None, error_code=None, allow_placeholders=True
+    ) -> list[dict]:
         """Report incorrect unit class or units.
 
         Parameters:
             original_tag (HedTag): The original tag that is used to report the error.
             validate_text (str): The text to validate.
             report_as (HedTag): Report errors as coming from this tag, rather than original_tag.
             error_code (str): Override error codes.
+            allow_placeholders (bool): Whether placeholders are allowed (affects value class validation for "#")
 
         Returns:
             list: Validation issues. Each issue is a dictionary.
         """
+        if not original_tag.is_unit_class_tag():
+            return []
+
         validation_issues = []
-        if original_tag.is_unit_class_tag():
-
-            # Check the units first
-            stripped_value, units = original_tag.get_stripped_unit_value(validate_text)
-            if not stripped_value:
-                validation_issues += self._report_bad_units(original_tag, report_as)
-                return validation_issues
-
-            # Check the value classes
-            validation_issues += self._check_value_class(original_tag, stripped_value, report_as)
-            if validation_issues:
-                return validation_issues
-
-            # We don't want to give this overall error twice
-            if error_code and validation_issues and not any(error_code == issue["code"] for issue in validation_issues):
-                new_issue = validation_issues[0].copy()
-                new_issue["code"] = error_code
-                validation_issues += [new_issue]
+        # Check the units first
+        stripped_value, units = original_tag.get_stripped_unit_value(validate_text)
+        if not stripped_value:
+            # stripped_value is None only when invalid units are present
+            validation_issues += self._report_bad_units(original_tag, report_as)
+            return validation_issues
+
+        # If value is a placeholder (#) and placeholders are allowed, it's valid
+        # Invalid units would have been caught above (stripped_value would be None)
+        if stripped_value == "#" and allow_placeholders:
+            return validation_issues
+
+        # Check the value classes
+        # If placeholders are NOT allowed, "#" will fail value class validation (e.g., not a valid number)
+        validation_issues += self._check_value_class(original_tag, stripped_value, report_as)
+        if validation_issues:
+            return validation_issues
+
+        # We don't want to give this overall error twice
+        if error_code and validation_issues and not any(error_code == issue["code"] for issue in validation_issues):
+            new_issue = validation_issues[0].copy()
+            new_issue["code"] = error_code
+            validation_issues += [new_issue]
 
         return validation_issues