BaseTag handling in IODValidator._tag_matches()

[sustrev]

I was working with a DICOM with SOP class "Multi-frame True Color Secondary Capture Image IOD" and when the code was hitting iod_validator.py:563, it was raising a ValueError.

For context, the condition dictionary being passed through is condition = {'index': 0, 'op': '=', 'tag': '(0028,0009)', 'type': 'MN', 'values': ['Frame Time (0018,1063)', 'Frame Time Vector (0018,1065)']}. type(tag_value) is parsed as <class 'pydicom.tag.BaseTag'>, but the values can't be coerced into a BaseTag.

I put together a quick little bit of regex to change the str values into an int that is correctly parsed into a BaseTag and seems to then correctly finish validation, if this is helpful!

    @staticmethod
    def _tag_matches(tag_value, operator, values):
        if type(tag_value) == BaseTag:
            values = IODValidator._value_basetag_conversion(values)
        values = [type(tag_value)(value) for value in values]
        if operator == ConditionOperator.EqualsValue:
            return tag_value in values
        if operator == ConditionOperator.NotEqualsValue:
            return tag_value not in values
        if operator == ConditionOperator.GreaterValue:
            return tag_value > values[0]
        if operator == ConditionOperator.LessValue:
            return tag_value < values[0]
        if operator == ConditionOperator.EqualsTag:
            return tag_value in values
        return False
    
    @staticmethod
    def _value_basetag_conversion(values):
        values = [
            int(f"0x{''.join(re.findall('[0-9]+', value))}", 16)
            for value in values
        ]
        return values

[mrbean-bremen]

Thanks for the report and the PR! I will have a closer look tonight.

[mrbean-bremen]

I made a new patch release with the fix - please check!

[sustrev]

Excellent, thank you!