fmu-manipulation-toolbox 1.9rc0__py3-none-any.whl → 1.9rc2__py3-none-any.whl

fmu_manipulation_toolbox/__init__.py

@@ -1 +0,0 @@
-

fmu_manipulation_toolbox/__main__.py

@@ -10,7 +10,7 @@ def gui():
 
 
 def cli():
-    from .cli import fmutool
+    from .cli.fmutool import fmutool
     fmutool()
 
 

fmu_manipulation_toolbox/__version__.py

@@ -1 +1 @@
-'V1.9-pre0'
+'V1.9-rc2'

fmu_manipulation_toolbox/assembly.py

@@ -101,12 +101,13 @@ class AssemblyNode:
     def add_start_value(self, fmu_filename: str, port_name: str, value: str):
         self.start_values[Port(fmu_filename, port_name)] = value
 
-    def make_fmu(self, fmu_directory: Path, debug=False, description_pathname=None):
+    def make_fmu(self, fmu_directory: Path, debug=False, description_pathname=None, fmi_version=2):
         for node in self.children.values():
-            node.make_fmu(fmu_directory, debug=debug)
+            node.make_fmu(fmu_directory, debug=debug, fmi_version=fmi_version)
 
         identifier = str(Path(self.name).stem)
-        container = FMUContainer(identifier, fmu_directory, description_pathname=description_pathname)
+        container = FMUContainer(identifier, fmu_directory, description_pathname=description_pathname,
+                                 fmi_version=fmi_version)
 
         for fmu_name in self.fmu_names_list:
             container.get_fmu(fmu_name)
@@ -241,7 +242,7 @@ class Assembly:
 
         self.input_pathname = fmu_directory / self.filename
         self.description_pathname = self.input_pathname   # For inclusion in FMU
-        self.root = None
+        self.root: Optional[AssemblyNode] = None
         self.read()
 
     def add_transient_file(self, filename: str):
@@ -517,8 +518,9 @@ class Assembly:
             self.root = sdd.parse(self.description_pathname)
             self.root.name = str(self.filename.with_suffix(".fmu"))
 
-    def make_fmu(self, dump_json=False):
-        self.root.make_fmu(self.fmu_directory, debug=self.debug, description_pathname=self.description_pathname)
+    def make_fmu(self, dump_json=False, fmi_version=2):
+        self.root.make_fmu(self.fmu_directory, debug=self.debug, description_pathname=self.description_pathname,
+                           fmi_version=fmi_version)
         if dump_json:
             dump_file = Path(self.input_pathname.stem + "-dump").with_suffix(".json")
             logger.info(f"Dump Json '{dump_file}'")

fmu_manipulation_toolbox/checker.py

@@ -1,10 +1,13 @@
 import importlib.util
 import inspect
+import logging
 import os
 import xmlschema
 from xmlschema.validators.exceptions import XMLSchemaValidationError
 from .operations import OperationAbstract
 
+logger = logging.getLogger("fmu_manipulation_toolbox")
+
 
 class OperationGenericCheck(OperationAbstract):
     SUPPORTED_FMI_VERSIONS = ('2.0', '3.0')
@@ -17,7 +20,7 @@ class OperationGenericCheck(OperationAbstract):
 
     def fmi_attrs(self, attrs):
         if attrs['fmiVersion'] not in self.SUPPORTED_FMI_VERSIONS:
-            print(f"ERROR: Expected FMI {','.join(self.SUPPORTED_FMI_VERSIONS)} versions.")
+            logger.error(f"Expected FMI {','.join(self.SUPPORTED_FMI_VERSIONS)} versions.")
             return
 
         fmi_name = f"fmi{attrs['fmiVersion'][0]}"
@@ -27,15 +30,15 @@ class OperationGenericCheck(OperationAbstract):
         try:
             xmlschema.validate(self.fmu.descriptor_filename, schema=xsd_filename)
         except XMLSchemaValidationError as error:
-            print(error.reason, error.msg)
+            logger.error(error.reason, error.msg)
         else:
             self.compliant_with_version = attrs['fmiVersion']
 
     def closure(self):
         if self.compliant_with_version:
-            print(f"INFO: This FMU seems to be compliant with FMI-{self.compliant_with_version}.")
+            logger.info(f"This FMU seems to be compliant with FMI-{self.compliant_with_version}.")
         else:
-            print(f"ERROR: This FMU does not validate with FMI standard.")
+            logger.error(f"This FMU does not validate with FMI standard.")
 
 
 checker_list = [OperationGenericCheck]
@@ -44,20 +47,20 @@ checker_list = [OperationGenericCheck]
 def add_from_file(checker_filename: str):
     spec = importlib.util.spec_from_file_location(checker_filename, checker_filename)
     if not spec:
-        print(f"ERROR: Cannot load {checker_filename}. Is this a python file?")
+        logger.error(f"Cannot load '{checker_filename}'. Is this a python file?")
         return
     try:
         checker_module = importlib.util.module_from_spec(spec)
         try:
             spec.loader.exec_module(checker_module)
         except (ModuleNotFoundError, SyntaxError) as error:
-            print(f"ERROR: Cannot load {checker_filename}: {error})")
+            logger.error(f"Cannot load '{checker_filename}': {error})")
             return
 
         for checker_name, checker_class in inspect.getmembers(checker_module, inspect.isclass):
             if OperationAbstract in checker_class.__bases__:
                 checker_list.append(checker_class)
-                print(f"Adding checker: {checker_filename}|{checker_name}")
+                logger.info(f"Adding checker: {checker_filename}|{checker_name}")
 
     except AttributeError:
-        print(f"ERROR: {checker_filename} should implement class 'OperationCheck'")
+        logger.error(f"'{checker_filename}' should implement class 'OperationCheck'")