Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-19 14:41:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed boxed enum validation

Browse Source
This commit is contained in:
Thomas Krijnen
2021-02-14 17:23:16 +01:00
parent b3f581d78d
commit 08576e28d6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/validate.py
+10 -8
View File
@@ -52,7 +52,7 @@ simple_type_python_mapping = {
} }
def assert_valid_inverse(attr, val): def assert_valid_inverse(attr, val, schema):
b1, b2 = attr.bound1(), attr.bound2() b1, b2 = attr.bound1(), attr.bound2()
invalid = len(val) < b1 or (b2 != -1 and len(val) > b2) invalid = len(val) < b1 or (b2 != -1 and len(val) > b2)
if invalid: if invalid:
@@ -60,7 +60,7 @@ def assert_valid_inverse(attr, val):
return True return True
def assert_valid(attr, val): def assert_valid(attr, val, schema):
if isinstance(attr, attribute): if isinstance(attr, attribute):
attr_type = attr.type_of_attribute() attr_type = attr.type_of_attribute()
else: else:
@@ -81,13 +81,15 @@ def assert_valid(attr, val):
elif isinstance(attr_type, (entity_type, type_declaration)): elif isinstance(attr_type, (entity_type, type_declaration)):
invalid = not isinstance(val, ifcopenshell.entity_instance) or not val.is_a(attr_type.name()) invalid = not isinstance(val, ifcopenshell.entity_instance) or not val.is_a(attr_type.name())
elif isinstance(attr_type, select_type): elif isinstance(attr_type, select_type):
invalid = not any(try_valid(x, val) for x in attr_type.select_list()) if isinstance(schema.declaration_by_name(val.is_a()), enumeration_type):
val = val.wrappedValue
invalid = not any(try_valid(x, val, schema) for x in attr_type.select_list())
elif isinstance(attr_type, enumeration_type): elif isinstance(attr_type, enumeration_type):
invalid = val not in attr_type.enumeration_items() invalid = val not in attr_type.enumeration_items()
elif isinstance(attr_type, aggregation_type): elif isinstance(attr_type, aggregation_type):
b1, b2 = attr_type.bound1(), attr_type.bound2() b1, b2 = attr_type.bound1(), attr_type.bound2()
ty = attr_type.type_of_element() ty = attr_type.type_of_element()
invalid = len(val) < b1 or (b2 != -1 and len(val) > b2) or not all(assert_valid(ty, v) for v in val) invalid = len(val) < b1 or (b2 != -1 and len(val) > b2) or not all(assert_valid(ty, v, schema) for v in val)
else: else:
raise NotImplementedError("Not impl %s %s" % (type(attr_type), attr_type)) raise NotImplementedError("Not impl %s %s" % (type(attr_type), attr_type))
@@ -97,9 +99,9 @@ def assert_valid(attr, val):
return True return True
def try_valid(attr, val): def try_valid(attr, val, schema):
try: try:
return assert_valid(attr, val) return assert_valid(attr, val, schema)
except ValidationError as e: except ValidationError as e:
return False return False
@@ -127,7 +129,7 @@ def validate(f, logger):
if val is not None: if val is not None:
attr_type = attr.type_of_attribute() attr_type = attr.type_of_attribute()
try: try:
assert_valid(attr, val) assert_valid(attr, val, schema)
except ValidationError as e: except ValidationError as e:
if hasattr(logger, "set_instance"): if hasattr(logger, "set_instance"):
logger.error(str(e)) logger.error(str(e))
@@ -137,7 +139,7 @@ def validate(f, logger):
for attr in entity.all_inverse_attributes(): for attr in entity.all_inverse_attributes():
val = getattr(inst, attr.name()) val = getattr(inst, attr.name())
try: try:
assert_valid_inverse(attr, val) assert_valid_inverse(attr, val, schema)
except ValidationError as e: except ValidationError as e:
if hasattr(logger, "set_instance"): if hasattr(logger, "set_instance"):
logger.error(str(e)) logger.error(str(e))