Fix tests and mypy errors

Author: Jorgelmh

src/component_model/model.py

@@ -7,6 +7,7 @@
 from abc import abstractmethod
 from enum import Enum
 from math import log
+from numbers import Real
 from pathlib import Path
 from typing import Generator, Sequence, TypeAlias
 
@@ -139,7 +140,7 @@ def __init__(
         if guid is not None:
             self.guid = guid
         # use a common UnitRegistry for all variables:
-        self.ureg = UnitRegistry(system=unit_system)
+        self.ureg: UnitRegistry = UnitRegistry(system=unit_system)
         self.copyright, self.license = self.make_copyright_license(copyright, license)
         self.guid = guid if guid is not None else uuid.uuid4().hex
         #        print("FLAGS", flags)
@@ -538,8 +539,14 @@ def xml_unit_definitions(self):
                     "substance": "mol",
                     "luminosity": "cd",
                 }.items():
-                    if "[" + key + "]" in dim:
-                        exponents.update({value: str(int(dim["[" + key + "]"]))})
+                    dim_key = f"[{key}]"
+                    if dim_key not in dim:
+                        continue
+                    dim_value = dim[dim_key]
+                    if not isinstance(dim_value, Real):
+                        logger.debug("Skipping non-real dimensionality entry for %s", dim_key)
+                        continue
+                    exponents.update({value: str(int(float(dim_value)))})
                 if (
                     "radian" in str(ubase.units)
                 ):  # radians are formally a dimensionless quantity. To include 'rad' as specified in FMI standard this dirty trick is used

tests/test_pint.py

@@ -7,11 +7,11 @@
 
 logger = logging.getLogger(__name__)
 
-_reg = UnitRegistry(system="SI", autoconvert_offset_to_baseunit=True)  # , auto_reduce_dimensions=True)
+_reg: UnitRegistry = UnitRegistry(system="SI", autoconvert_offset_to_baseunit=True)  # , auto_reduce_dimensions=True)
 
 
 def test_needed_functions():
-    _reg = UnitRegistry(system="SI", autoconvert_offset_to_baseunit=True)  # , auto_reduce_dimensions=True)
+    _reg: UnitRegistry = UnitRegistry(system="SI", autoconvert_offset_to_baseunit=True)  # , auto_reduce_dimensions=True)
     print("AVAILABLE UNITS", dir(_reg.sys.SI))
     print(
         "degrees_Celsius defined?",

tests/test_utils.py

@@ -28,12 +28,24 @@ def dicts_equal(d1: dict, d2: dict):
     assert isinstance(d2, dict), f"Dict expected. Found {d2}"
     for key in d1:
         assert key in d2, f"Key {key} not found in {d2}"
-        if key != "copyright":  # copyright changes with the year!
-            assert d1[key] == d2[key], f"Value of key {key} {d1[key]} != {d2[key]}"
+        if key == "copyright":
+            continue  # copyright changes with the year!
+        if key == "license":
+            assert " ".join(str(d1[key]).split()) == " ".join(str(d2[key]).split()), (
+                f"Value of key {key} differs after whitespace normalization\n{d1[key]!r}\n!=\n{d2[key]!r}"
+            )
+            continue
+        assert d1[key] == d2[key], f"Value of key {key} {d1[key]} != {d2[key]}"
     for key in d2:
         assert key in d1, f"Key {key} not found in {d1}"
-        if key != "copyright":  # copyright changes with the year!
-            assert d1[key] == d2[key], f"Value of key {key} {d1[key]} != {d2[key]}"
+        if key == "copyright":
+            continue  # copyright changes with the year!
+        if key == "license":
+            assert " ".join(str(d1[key]).split()) == " ".join(str(d2[key]).split()), (
+                f"Value of key {key} differs after whitespace normalization\n{d1[key]!r}\n!=\n{d2[key]!r}"
+            )
+            continue
+        assert d1[key] == d2[key], f"Value of key {key} {d1[key]} != {d2[key]}"
 
 
 def test_xml_to_python_val():