add streamline changes do my bimtester 5

Author: berndhahnebach

src/ifcbimtester/bimtester/features/steps/geometric_detail/en.py

@@ -217,5 +217,5 @@ def is_item_a_representation(item, representation):
         message_all_falseelems=_("All {elemcount} {ifc_class} elements are a {parameter} representation."),
         message_some_falseelems=_("The following {falsecount} of {elemcount} {ifc_class} elements are a {parameter} representation: {falseelems}"),
         message_no_elems=_("There are no {ifc_class} elements in the IFC file."),
-        parameter=representation_class
+        parameter=representation_class,
     )

src/ifcbimtester/bimtester/guiwidget.py

@@ -38,7 +38,7 @@ def run():
 
 class GuiWidgetBimTester(QtWidgets.QWidget):
     def __init__(self, args=None):
-        super(GuiWidgetBimTester, self).__init__()
+        super().__init__()
 
         if args is not None and args != {}:
             self.args = args
@@ -65,9 +65,7 @@ def __del__(self):
 
     def _setup_ui(self):
         package_path = os.path.dirname(os.path.realpath(__file__))
-        iconpath = os.path.join(
-            package_path, "resources", "icons", "bimtester.ico"
-        )
+        iconpath = os.path.join(package_path, "resources", "icons", "bimtester.ico")
 
         """
         # as svg
@@ -105,14 +103,8 @@ def _setup_ui(self):
         _ifcfile_browse_btn.clicked.connect(self.select_ifcfile)
 
         # buttons
-        self.run_button = QtWidgets.QPushButton(
-            QtGui.QIcon.fromTheme("document-new"),
-            "Run"
-        )
-        self.close_button = QtWidgets.QPushButton(
-            QtGui.QIcon.fromTheme("window-close"),
-            "Close"
-        )
+        self.run_button = QtWidgets.QPushButton(QtGui.QIcon.fromTheme("document-new"), "Run")
+        self.close_button = QtWidgets.QPushButton(QtGui.QIcon.fromTheme("window-close"), "Close")
         self.run_button.clicked.connect(self.run_bimtester)
         self.close_button.clicked.connect(self.close_widget)
         _buttons = QtWidgets.QHBoxLayout()
@@ -139,9 +131,7 @@ def _setup_ui(self):
         self.setLayout(layout)
 
     def select_ifcfile(self):
-        ifcfile = QtWidgets.QFileDialog.getOpenFileName(
-            self, dir=self.get_ifcfile()
-        )[0]
+        ifcfile = QtWidgets.QFileDialog.getOpenFileName(self, dir=self.get_ifcfile())[0]
         self.set_ifcfile(ifcfile)
 
     def set_ifcfile(self, a_file):
@@ -153,9 +143,7 @@ def get_ifcfile(self):
         return " ".join(self.ifcfile_text.text().split())
 
     def select_featurefile(self):
-        featurefile = QtWidgets.QFileDialog.getOpenFileName(
-            self, dir=self.get_ifcfile()
-        )[0]
+        featurefile = QtWidgets.QFileDialog.getOpenFileName(self, dir=self.get_ifcfile())[0]
         self.set_featurefile(featurefile)
 
     def set_featurefile(self, a_file):
@@ -194,24 +182,15 @@ def run_bimtester(self):
         if has_feature_file is True and has_ifc_file is True:
             print("Args passed from BIMtester GUI:")
             print(json.dumps(self.args, indent=4))
-            report_json = bimtester.run.TestRunner(
-                self.args["ifc"],
-                self.args["schema_file"]
-            ).run(self.args)
+            report_json = bimtester.run.TestRunner(self.args["ifc"], self.args["schema_file"]).run(self.args)
         else:
             print("Missing files, BIMTester can not run.")
             report_json = ""
 
         # create html report
         if os.path.isfile(report_json):
-            report_html = os.path.join(
-                os.path.dirname(os.path.realpath(report_json)),
-                "report.html"
-            )
-            bimtester.reports.ReportGenerator().generate(
-                report_json,
-                report_html
-            )
+            report_html = os.path.join(os.path.dirname(os.path.realpath(report_json)), "report.html")
+            bimtester.reports.ReportGenerator().generate(report_json, report_html)
             print("HTML report generated: {}".format(report_html))
         elif report_json == "":
             report_html = ""

src/ifcbimtester/bimtester/lang.py

@@ -33,15 +33,11 @@ def switch_locale(locale_dir, locale_id):
     # https://docs.python.org/3/library/gettext.html
     mo_file = gettext.find(domain, localedir=locale_dir, languages=[locale_id])
     if mo_file is not None:
-        print(
-            "Locale will be switched to language '{}'. Translation file found {}"
-            .format(locale_id, mo_file)
-        )
+        print("Locale will be switched to language '{}'. Translation file found {}".format(locale_id, mo_file))
         newlang = gettext.translation(domain, localedir=locale_dir, languages=[locale_id])
         newlang.install()
         translation = newlang.gettext
     else:
         print(
-            "Locale can not be switched to '{}'. Translation file (*.mo) not found in {}"
-            .format(locale_id, locale_dir)
+            "Locale can not be switched to '{}'. Translation file (*.mo) not found in {}".format(locale_id, locale_dir)
         )

src/ifcbimtester/bimtester/reports.py

@@ -83,8 +83,9 @@ def generate_feature_report(self, feature, output_file):
             data["pass_rate"] = 0
 
         # get language and switch locale
-        the_lang = self.get_feature_lang(feature["keyword"])
+        the_lang = self.get_feature_lang(feature.get("keyword", None))
         from bimtester.lang import switch_locale
+
         switch_locale(os.path.join(self.base_path, "locale"), the_lang)
         data["_lang"] = the_lang
 
@@ -198,6 +199,4 @@ def get_feature_lang(self, feature_key):
             return "it"
         elif feature_key == "Functionaliteit":
             return "nl"
-        else:
-            # standard English
-            return "en"
+        return "en"

src/ifcbimtester/bimtester/run.py

@@ -20,9 +20,14 @@
 import sys
 import json
 import shutil
+import logging
 import time
 import tempfile
 import ifcopenshell
+try:
+    import ifcopenshell.express
+except:
+    pass  # They are using an old version of IfcOpenShell. Gracefully degrade for now.
 import behave.formatter.pretty  # Needed for pyinstaller to package it
 from bimtester.ifc import IfcStore
 from distutils.dir_util import copy_tree

src/ifcbimtester/bimtester/util.py

@@ -117,7 +117,7 @@ def assert_elements(
     message_all_falseelems,
     message_some_falseelems,
     message_no_elems="",
-    parameter=None
+    parameter=None,
 ):
     # improve output of falselems
     out_falseelems = "\n\n"
@@ -138,42 +138,20 @@ def assert_elements(
     #     )
 
     if falsecount == 0:
-        return # test ok for elemcount == 0 and elemcount > 0
+        return  # test ok for elemcount == 0 and elemcount > 0
     elif falsecount == elemcount:
         if parameter is None:
-            assert False, (
-                message_all_falseelems.format(
-                    elemcount=elemcount,
-                    ifc_class=ifc_class
-                ) + "\n"
-            )
+            assert False, (message_all_falseelems.format(elemcount=elemcount, ifc_class=ifc_class) + "\n")
         else:
             assert False, (
-                message_all_falseelems.format(
-                    elemcount=elemcount,
-                    ifc_class=ifc_class,
-                    parameter=parameter
-                ) + "\n"
-            )
+                message_all_falseelems.format(elemcount=elemcount, ifc_class=ifc_class, parameter=parameter) + "\n")
     elif falsecount > 0 and falsecount < elemcount:
         if parameter is None:
             assert False, (
-                message_some_falseelems.format(
-                    falsecount=falsecount,
-                    elemcount=elemcount,
-                    ifc_class=ifc_class,
-                    falseelems=out_falseelems,
-                ) + "\n"
-            )
+                message_some_falseelems.format(falsecount=falsecount, elemcount=elemcount, ifc_class=ifc_class, falseelems=out_falseelems) + "\n")
         else:
             assert False, (
-                message_some_falseelems.format(
-                    falsecount=falsecount,
-                    elemcount=elemcount,
-                    ifc_class=ifc_class,
-                    falseelems=out_falseelems,
-                    parameter=parameter
-                ) + "\n"
+                message_some_falseelems.format(falsecount=falsecount, elemcount=elemcount, ifc_class=ifc_class, falseelems=out_falseelems, parameter=parameter) + "\n"
             )
     else:
         assert False, _("Error in falsecount calculation, something went wrong.") + "\n"