Run black

Author: aothms

__init__.py

@@ -1,11 +1,31 @@
 try:
     from parser.parse import parse
     from parser.file import file, open
-    from parser.errors import _ValidationError, CollectedValidationErrors, DuplicateNameError, HeaderFieldError
+    from parser.errors import (
+        _ValidationError,
+        CollectedValidationErrors,
+        DuplicateNameError,
+        HeaderFieldError,
+        InvalidNameError,
+    )
 except:
-    from .parser.parse import parse 
-    from .parser.file import file, open 
-    from .parser.errors import _ValidationError, CollectedValidationErrors, DuplicateNameError, HeaderFieldError
+    from .parser.parse import parse
+    from .parser.file import file, open
+    from .parser.errors import (
+        _ValidationError,
+        CollectedValidationErrors,
+        DuplicateNameError,
+        HeaderFieldError,
+        InvalidNameError,
+    )
 
-__all__ = ["parse", "open", "file", "_ValidationError", 
-           "CollectedValidationErrors", "DuplicateNameError", "HeaderFieldError"] # for testing 
+__all__ = [
+    "parse",
+    "open",
+    "file",
+    "_ValidationError",
+    "CollectedValidationErrors",
+    "DuplicateNameError",
+    "HeaderFieldError",
+    "InvalidNameError",
+]  # for testing

__main__.py

@@ -3,20 +3,27 @@
 import argparse
 from . import parse, CollectedValidationErrors
 
+
 def main():
     parser = argparse.ArgumentParser(description="Parse and validate STEP file.")
     parser.add_argument("filename", help="The STEP file to validate.")
-    parser.add_argument("--progress", action="store_true", help="Show progress during validation.")
-    parser.add_argument("--json", action="store_true", help="Output errors in JSON format.")
-    parser.add_argument("--only-header", action="store_true", help="Validate only the header section.")
-    
+    parser.add_argument(
+        "--progress", action="store_true", help="Show progress during validation."
+    )
+    parser.add_argument(
+        "--json", action="store_true", help="Output errors in JSON format."
+    )
+    parser.add_argument(
+        "--only-header", action="store_true", help="Validate only the header section."
+    )
+
     args = parser.parse_args()
-        
+
     try:
         parse(
             filename=args.filename,
-            with_progress = args.progress,
-            with_tree = False,
+            with_progress=args.progress,
+            with_tree=False,
             only_header=args.only_header,
         )
         if not args.json:
@@ -29,5 +36,6 @@ def main():
             json.dump([e.asdict() for e in exc.errors], sys.stdout, indent=2)
         exit(1)
 
-if __name__ == '__main__':
-    main()    
+
+if __name__ == "__main__":
+    main()

parser/errors.py

@@ -1,11 +1,13 @@
 from lark.exceptions import UnexpectedToken
 
+
 class _ValidationError(Exception):
     def __init__(self, *args, **kwargs):
         if self.__class__ is _ValidationError:
             raise TypeError("Do not raise _ValidationError directly.")
         super().__init__(*args, **kwargs)
 
+
 class ErrorCollector:
     def __init__(self):
         self.errors = []
@@ -17,15 +19,19 @@ def raise_if_any(self):
         if self.errors:
             raise CollectedValidationErrors(self.errors)
 
+
 class CollectedValidationErrors(_ValidationError):
     def __init__(self, errors):
         self.errors = errors
-        
+
     def asdict(self, with_message=True):
         return [e.asdict(with_message=with_message) for e in self.errors]
 
     def __str__(self):
-        return f"{len(self.errors)} validation error(s) collected:\n" + "\n\n".join(str(e) for e in self.errors)
+        return f"{len(self.errors)} validation error(s) collected:\n" + "\n\n".join(
+            str(e) for e in self.errors
+        )
+
 
 class SyntaxError(_ValidationError):
     def __init__(self, filecontent, exception):
@@ -84,8 +90,8 @@ def build():
             yield " " * 8 + "^" * len(d["line"].rstrip())
 
         return "\n".join(build())
-    
-    
+
+
 class HeaderFieldError(_ValidationError):
     def __init__(self, field, found_len, expected_len):
         self.field = field

parser/file.py

@@ -1,5 +1,5 @@
 import types
-import re 
+import re
 import numbers
 import itertools
 
@@ -9,15 +9,16 @@
 
 try:
     from .mvd_info import MvdInfo, LARK_AVAILABLE
-except ImportError: # in case of running module locally (e.g. test_parser.py)
+except ImportError:  # in case of running module locally (e.g. test_parser.py)
     from mvd_info import MvdInfo, LARK_AVAILABLE
 
+
 class file:
     """
     A somewhat compatible interface (but very limited) to ifcopenshell.file
     """
 
-    def __init__(self, result:ParseResult):
+    def __init__(self, result: ParseResult):
         self.header_ = result.header
         self.data_ = result.entities
 
@@ -48,14 +49,13 @@ def schema_version(self) -> tuple[int, int, int, int]:
 
         E.g. IFC4X3_ADD2 is represented as (4, 3, 2, 0).
         """
-        schema = self.wrapped_data.schema
+        schema = self.schema
         version = []
         for prefix in ("IFC", "X", "_ADD", "_TC"):
             number = re.search(prefix + r"(\d)", schema)
             version.append(int(number.group(1)) if number else 0)
         return tuple(version)
 
-
     @property
     def header(self):
         header = {}
@@ -64,8 +64,7 @@ def header(self):
             header[field_name.lower()] = namedtuple_class(*field_data)
 
         return types.SimpleNamespace(**header)
-    
-    
+
     @property
     def mvd(self):
         if not LARK_AVAILABLE or MvdInfo is None:
@@ -104,5 +103,6 @@ def by_type(self, type: str) -> list[entity_instance]:
             )
         )
 
-def open(fn, only_header= False) -> file:
-    return file(parse(filename=fn, only_header=only_header))
+
+def open(fn, only_header=False) -> file:
+    return file(parse(filename=fn, only_header=only_header))

parser/grammar.py

@@ -106,7 +106,20 @@
 """
 
 HEADER_FIELDS = {
-    "file_description": namedtuple('file_description', ['description', 'implementation_level']),
-    "file_name": namedtuple('file_name', ['name', 'time_stamp', 'author', 'organization', 'preprocessor_version', 'originating_system', 'authorization']),
-    "file_schema":  namedtuple('file_schema', ['schema_identifiers']),
-}
+    "file_description": namedtuple(
+        "file_description", ["description", "implementation_level"]
+    ),
+    "file_name": namedtuple(
+        "file_name",
+        [
+            "name",
+            "time_stamp",
+            "author",
+            "organization",
+            "preprocessor_version",
+            "originating_system",
+            "authorization",
+        ],
+    ),
+    "file_schema": namedtuple("file_schema", ["schema_identifiers"]),
+}