Merge branch 'ModelicaSystemCmd_arg_set' into merge_me

Author: syntron

OMPython/ModelicaSystem.py

@@ -131,28 +131,45 @@ def arg_set(self, key: str, val: Optional[str | dict[str, Any]] = None) -> None:
         """
         Set one argument for the executable model.
 
-        Parameters
-        ----------
-        key : str
-        val : str, None
-        """
+        Args:
+            key: identifier / argument name to be used for the call of the model executable.
+            val: value for the given key; None for no value and for key == 'override' a dictionary can be used which
+              indicates variables to override
+        """
+
+        def override2str(okey: str, oval: Any) -> str:
+            """
+            Convert a value for 'override' to a string taking into account differences between Modelica and Python.
+            """
+            if isinstance(oval, str):
+                oval_str = f"\"{oval.strip()}\""  # TODO: use shlex.quote()?
+            elif isinstance(oval, bool):
+                oval_str = 'true' if oval else 'false'
+            elif isinstance(oval, numbers.Number):
+                oval_str = str(oval)
+            else:
+                raise ModelicaSystemError(f"Invalid value for override key {okey}: {type(oval)}")
+
+            return f"{okey}={oval_str}"
+
         if not isinstance(key, str):
             raise ModelicaSystemError(f"Invalid argument key: {repr(key)} (type: {type(key)})")
         key = key.strip()
-        if val is None:
-            argval = None
-        elif isinstance(val, str):
-            argval = val.strip()
-        elif isinstance(val, numbers.Number):
-            argval = str(val)
-        elif key == 'override' and isinstance(val, dict):
+
+        if key == 'override' and isinstance(val, dict):
             for okey in val:
-                if not isinstance(okey, str) or not isinstance(val[okey], (str, numbers.Number)):
+                if not isinstance(okey, str) or not isinstance(val[okey], (str, bool, numbers.Number)):
                     raise ModelicaSystemError("Invalid argument for 'override': "
                                               f"{repr(okey)} = {repr(val[okey])}")
                 self._arg_override[okey] = val[okey]
 
-            argval = ','.join([f"{okey}={str(self._arg_override[okey])}" for okey in self._arg_override])
+            argval = ','.join([override2str(okey=okey, oval=oval) for okey, oval in self._arg_override.items()])
+        elif val is None:
+            argval = None
+        elif isinstance(val, str):
+            argval = val.strip()
+        elif isinstance(val, numbers.Number):
+            argval = str(val)
         else:
             raise ModelicaSystemError(f"Invalid argument value for {repr(key)}: {repr(val)} (type: {type(val)})")
 
@@ -173,10 +190,6 @@ def arg_get(self, key: str) -> Optional[str | dict]:
     def args_set(self, args: dict[str, Optional[str | dict[str, Any]]]) -> 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])