Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-27 10:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

rule_executor.py don't log RecursionError as error

Browse Source
This commit is contained in:
Thomas Krijnen
2026-02-26 12:35:40 +01:00
parent 0be348707c
commit 18527a78e1
1 changed files with 46 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcopenshell-python/ifcopenshell/express/rule_executor.py
+46 -34
View File
@@ -9,24 +9,28 @@ from codegen import indent
def reverse_compile(s): def reverse_compile(s):
return re.sub(r'\bself\b', 'SELF', re.sub( return re.sub(
r"\s*\-\s*EXPRESS_ONE_BASED_INDEXING", r"\bself\b",
"", "SELF",
re.sub( re.sub(
", )?+.(, INDETERMINATE)\\"[::-1], r"\s*\-\s*EXPRESS_ONE_BASED_INDEXING",
"]\\1[", "",
re.sub( re.sub(
r", '(\w+)', INDETERMINATE\)", ", )?+.(, INDETERMINATE)\\"[::-1],
".\\1", "]\\1[",
s.strip() re.sub(
.replace("len(", "SIZEOF(") r", '(\w+)', INDETERMINATE\)",
.replace("assert ", "") ".\\1",
.replace(" is not False", "") s.strip()
.replace("express_getattr(", "") .replace("len(", "SIZEOF(")
.replace("express_getitem(", ""), .replace("assert ", "")
.replace(" is not False", "")
.replace("express_getattr(", "")
.replace("express_getitem(", ""),
)[::-1],
)[::-1], )[::-1],
)[::-1], ),
)) )
@dataclass @dataclass
@@ -68,9 +72,13 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
if hasattr(logger, "set_instance"): if hasattr(logger, "set_instance"):
# when using the json logger, we notify it of the relevant instance # when using the json logger, we notify it of the relevant instance
pre_annotate_instance = lambda instance: logger.set_state('instance', instance) if hasattr(logger, 'set_state') else None pre_annotate_instance = lambda instance: (
logger.set_state("instance", instance) if hasattr(logger, "set_state") else None
)
post_annotate_instance = lambda instance: instance post_annotate_instance = lambda instance: instance
pre_annotate_attribute = lambda attribute: logger.set_state('attribute', attribute) if hasattr(logger, 'set_state') else None pre_annotate_attribute = lambda attribute: (
logger.set_state("attribute", attribute) if hasattr(logger, "set_state") else None
)
post_annotate_attribute = lambda attribute: None post_annotate_attribute = lambda attribute: None
else: else:
# when using the normal text logger the instance is appended to the method # when using the normal text logger the instance is appended to the method
@@ -90,13 +98,13 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
import time import time
import subprocess import subprocess
current_dir_files = {fn.lower(): fn for fn in os.listdir('.')} current_dir_files = {fn.lower(): fn for fn in os.listdir(".")}
schema_name = str(f.schema_identifier).split(' ')[-1].lower() schema_name = str(f.schema_identifier).split(" ")[-1].lower()
schema_path = current_dir_files.get(schema_name + '.exp') schema_path = current_dir_files.get(schema_name + ".exp")
fn = schema_path[:-4] + '.py' fn = schema_path[:-4] + ".py"
if not os.path.exists(fn): if not os.path.exists(fn):
subprocess.run([sys.executable, "-m", "ifcopenshell.express.rule_compiler", schema_path, fn], check=True) subprocess.run([sys.executable, "-m", "ifcopenshell.express.rule_compiler", schema_path, fn], check=True)
time.sleep(1.) time.sleep(1.0)
source = open(fn, "r").read() source = open(fn, "r").read()
a = ast.parse(source) a = ast.parse(source)
@@ -108,12 +116,14 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
rules = list(filter(lambda x: hasattr(x, "SCOPE"), scope.values())) rules = list(filter(lambda x: hasattr(x, "SCOPE"), scope.values()))
if hasattr(logger, 'set_state'): if hasattr(logger, "set_state"):
logger.set_state('type', 'global_rule') logger.set_state("type", "global_rule")
for R in [r for r in rules if r.SCOPE == "file"]: for R in [r for r in rules if r.SCOPE == "file"]:
try: try:
R()(f) R()(f)
except RecursionError as e:
logger.info(str(e))
except Exception as e: except Exception as e:
ln = e.__traceback__.tb_next.tb_lineno ln = e.__traceback__.tb_next.tb_lineno
pre_annotate_attribute(R.__name__) pre_annotate_attribute(R.__name__)
@@ -127,17 +137,15 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
) )
) )
if hasattr(logger, 'set_state'): if hasattr(logger, "set_state"):
logger.set_state('type', 'simpletype_rule') logger.set_state("type", "simpletype_rule")
types = {} types = {}
subtypes = collections.defaultdict(list) subtypes = collections.defaultdict(list)
for d in S.declarations(): for d in S.declarations():
if isinstance(d, ifcopenshell.ifcopenshell_wrapper.type_declaration): if isinstance(d, ifcopenshell.ifcopenshell_wrapper.type_declaration):
types[d.name()] = d types[d.name()] = d
if isinstance( if isinstance(d.declared_type(), ifcopenshell.ifcopenshell_wrapper.named_type):
d.declared_type(), ifcopenshell.ifcopenshell_wrapper.named_type
):
subtypes[d.declared_type().declared_type().name()].append(d.name()) subtypes[d.declared_type().declared_type().name()].append(d.name())
D = collections.defaultdict(list) D = collections.defaultdict(list)
@@ -170,6 +178,8 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
for R in D[type_name(type)]: for R in D[type_name(type)]:
try: try:
R()(fix_type(value)) R()(fix_type(value))
except RecursionError as e:
logger.info(str(e))
except Exception as e: except Exception as e:
ln = e.__traceback__.tb_next.tb_lineno ln = e.__traceback__.tb_next.tb_lineno
pre_annotate_instance(instance) pre_annotate_instance(instance)
@@ -220,6 +230,8 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
for inst in f: for inst in f:
try: try:
values = list(inst) values = list(inst)
except RecursionError as e:
logger.info(str(e))
except Exception as e: except Exception as e:
if hasattr(logger, "set_state"): if hasattr(logger, "set_state"):
logger.error(str(e)) logger.error(str(e))
@@ -228,22 +240,22 @@ def run(f: ifcopenshell.file, logger: Logger) -> None:
continue continue
entity = S.declaration_by_name(inst.is_a()) entity = S.declaration_by_name(inst.is_a())
attrs = entity.all_attributes() attrs = entity.all_attributes()
for i, (attr, val, is_derived) in enumerate( for i, (attr, val, is_derived) in enumerate(zip(attrs, values, entity.derived())):
zip(attrs, values, entity.derived())
):
if is_derived: if is_derived:
# @todo # @todo
pass pass
else: else:
check(val, attr.type_of_attribute(), instance=inst) check(val, attr.type_of_attribute(), instance=inst)
if hasattr(logger, 'set_state'): if hasattr(logger, "set_state"):
logger.set_state('type', 'entity_rule') logger.set_state("type", "entity_rule")
for R in [r for r in rules if r.SCOPE == "entity"]: for R in [r for r in rules if r.SCOPE == "entity"]:
for inst in f.by_type(R.TYPE_NAME): for inst in f.by_type(R.TYPE_NAME):
try: try:
R()(inst) R()(inst)
except RecursionError as e:
logger.info(str(e))
except Exception as e: except Exception as e:
ln = e.__traceback__.tb_next.tb_lineno ln = e.__traceback__.tb_next.tb_lineno
pre_annotate_instance(inst) pre_annotate_instance(inst)