??? fix mypy

Author: syntron

OMPython/ModelicaSystem.py

@@ -127,7 +127,7 @@ def __init__(
         self._args: dict[str, str | None] = {}
         self._arg_override: dict[str, str] = {}
 
-    def arg_set(self, key: str, val: Optional[str | dict[str, Any]] = None) -> None:
+    def arg_set(self, key: str, val: Optional[str | dict[str, Any] | numbers.Number] = None) -> None:
         """
         Set one argument for the executable model.
 
@@ -170,13 +170,9 @@ def arg_get(self, key: str) -> Optional[str | dict]:
 
         return None
 
-    def args_set(self, args: dict[str, Optional[str | dict[str, Any]]]) -> None:
+    def args_set(self, args: dict[str, Optional[str | dict[str, Any] | numbers.Number]]) -> None:
         """
         Define arguments for the model executable.
-
-        Parameters
-        ----------
-        args : dict[str, Optional[str | dict[str, str]]]
         """
         for arg in args:
             self.arg_set(key=arg, val=args[arg])
@@ -217,7 +213,7 @@ def definition(self) -> OMCSessionRunData:
         return omc_run_data_updated
 
     @staticmethod
-    def parse_simflags(simflags: str) -> dict[str, Optional[str | dict[str, str]]]:
+    def parse_simflags(simflags: str) -> dict[str, Optional[str | dict[str, Any] | numbers.Number]]:
         """
         Parse a simflag definition; this is deprecated!
 
@@ -226,7 +222,7 @@ def parse_simflags(simflags: str) -> dict[str, Optional[str | dict[str, str]]]:
         warnings.warn("The argument 'simflags' is depreciated and will be removed in future versions; "
                       "please use 'simargs' instead", DeprecationWarning, stacklevel=2)
 
-        simargs: dict[str, Optional[str | dict[str, str]]] = {}
+        simargs: dict[str, Optional[str | dict[str, Any] | numbers.Number]] = {}
 
         args = [s for s in simflags.split(' ') if s]
         for arg in args:
@@ -915,7 +911,7 @@ def simulate_cmd(
             self,
             result_file: OMCPath,
             simflags: Optional[str] = None,
-            simargs: Optional[dict[str, Optional[str | dict[str, str]]]] = None,
+            simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
             timeout: Optional[float] = None,
     ) -> ModelicaSystemCmd:
         """
@@ -995,7 +991,7 @@ def simulate(
             self,
             resultfile: Optional[str] = None,
             simflags: Optional[str] = None,
-            simargs: Optional[dict[str, Optional[str | dict[str, str]]]] = None,
+            simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
             timeout: Optional[float] = None,
     ) -> None:
         """Simulate the model according to simulation options.
@@ -1522,9 +1518,13 @@ def optimize(self) -> dict[str, Any]:
 
         return optimizeResult
 
-    def linearize(self, lintime: Optional[float] = None, simflags: Optional[str] = None,
-                  simargs: Optional[dict[str, Optional[str | dict[str, str]]]] = None,
-                  timeout: Optional[float] = None) -> LinearizationResult:
+    def linearize(
+            self,
+            lintime: Optional[float] = None,
+            simflags: Optional[str] = None,
+            simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
+            timeout: Optional[float] = None,
+    ) -> LinearizationResult:
         """Linearize the model according to linearization options.
 
         See setLinearizationOptions.
@@ -1734,7 +1734,7 @@ def __init__(
             omhome: Optional[str] = None,
             omc_process: Optional[OMCProcessLocal] = None,
 
-            simargs: Optional[dict[str, Optional[str | dict[str, str] | numbers.Number]]] = None,
+            simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
             timeout: Optional[int] = None,
 
             resultpath: Optional[pathlib.Path] = None,
@@ -1813,7 +1813,7 @@ def prepare(self) -> int:
 
             build_dir = self._resultpath / f"DOE_{idx_pc_structure:09d}"
             build_dir.mkdir()
-            self._mod.setTempDirectory(build_dir)
+            self._mod.setWorkDirectory(customBuildDirectory=build_dir)
 
             sim_param_structure = {}
             for idx_structure, pk_structure in enumerate(param_structure.keys()):
@@ -1919,16 +1919,17 @@ def simulate(
         Returns True if all simulations were done successfully, else False.
         """
 
-        doe_cmd_total = len(self._doe_cmd)
-        doe_def_total = len(self._doe_def)
+        doe_cmd_total = len(self._doe_cmd) if self._doe_cmd is not None else 0
+        doe_def_total = len(self._doe_def) if self._doe_def is not None else 0
 
         if doe_cmd_total != doe_def_total:
             raise ModelicaSystemError(f"Mismatch between number simulation commands ({doe_cmd_total}) "
                                       f"and simulation definitions ({doe_def_total}).")
 
         doe_task_query: queue.Queue = queue.Queue()
-        for doe_cmd in self._doe_cmd.values():
-            doe_task_query.put(doe_cmd)
+        if self._doe_cmd is not None:
+            for doe_cmd in self._doe_cmd.values():
+                doe_task_query.put(doe_cmd)
 
         if not isinstance(self._doe_def, dict) or len(self._doe_def) == 0:
             raise ModelicaSystemError("Missing Doe Summary!")