Mypy

Author: mzecc

src/example_fgen_basic/get_square_root.py

@@ -18,7 +18,7 @@
     ) from exc
 
 try:
-    from example_fgen_basic._lib import m_result_dp_w  # type: ignore
+    from example_fgen_basic._lib import m_result_dp_w
 except (ModuleNotFoundError, ImportError) as exc:  # pragma: no cover
     raise CompiledExtensionNotFoundError(
         "example_fgen_basic._lib.m_result_dp_w"
@@ -49,11 +49,14 @@ def get_square_root(inv: float) -> float:
     result_instance_index: int = m_get_square_root_w.get_square_root(inv)
     result = ResultDP.from_instance_index(result_instance_index)
 
-    if result.has_error:
+    if result.error_v is not None:
         # TODO: be more specific
         raise FortranError(result.error_v.message)
         # raise LessThanZeroError(result.error_v.message)
 
+    if result.data_v is None:
+        raise AssertionError
+
     res = result.data_v
 
     # TODO: think

src/example_fgen_basic/result/result_dp.py

@@ -28,14 +28,14 @@ class ResultDP:
     # TODO: add validation that one of data_v and error_v is provided but not both
 
     # data_v: np.Float64
-    data_v: float
+    data_v: float | None
     """Data"""
 
-    error_v: ErrorV
+    error_v: ErrorV | None
     """Error"""
 
     @classmethod
-    def from_instance_index(cls, instance_index: int) -> ErrorV:
+    def from_instance_index(cls, instance_index: int) -> ResultDP:
         """
         Initialise from an instance index received from Fortran
 
@@ -53,7 +53,7 @@ def from_instance_index(cls, instance_index: int) -> ErrorV:
 
         # Integer is very simple
         if m_result_dp_w.data_v_is_set(instance_index):
-            data_v: float = m_result_dp_w.get_data_v(instance_index)
+            data_v: float | None = m_result_dp_w.get_data_v(instance_index)
             # data_v: np.Float64 = m_result_dp_w.get_data_v(instance_index)
 
         else: