[ModelicaSystem*] do not use OMCSessionZMQ

Author: syntron

OMPython/ModelicaSystem.py

@@ -51,7 +51,6 @@
 from OMPython.OMCSession import (
     OMCProcessException,
     OMCProcessRunData,
-    OMCSessionZMQ,
     OMCProcess,
     OMCProcessLocal,
     OMCPath,
@@ -127,7 +126,7 @@ class ModelicaSystemCmd:
 
     def __init__(
             self,
-            omc_process: OMCSessionZMQ,
+            omc_process: OMCProcess,
             runpath: OMCPath,
             modelname: Optional[str] = None,
             timeout: Optional[float] = None,
@@ -337,6 +336,7 @@ def __init__(
             work_directory: Optional[str | os.PathLike] = None,
             omhome: Optional[str] = None,
             omc_process: Optional[OMCProcess] = None,
+            timeout: float = 10.0,
     ) -> None:
         """Create a ModelicaSystem instance. To define the model use model() or convertFmu2Mo().
 
@@ -350,6 +350,7 @@ def __init__(
             omhome: path to OMC to be used when creating the OMC session (see OMCSessionZMQ).
             omc_process: definition of a (local) OMC process to be used. If
               unspecified, a new local session will be created.
+            timeout: float value define the timeout; if nothing is defined, a default value of 10s is used
         """
 
         self._quantities: list[dict[str, Any]] = []
@@ -377,9 +378,9 @@ def __init__(
         self._linearized_states: list[str] = []  # linearization states list
 
         if omc_process is not None:
-            self._omc_process = OMCSessionZMQ(omc_process=omc_process)
+            self._omc_process = omc_process
         else:
-            self._omc_process = OMCSessionZMQ(omhome=omhome)
+            self._omc_process = OMCProcessLocal(omhome=omhome, timeout=timeout)
 
         # set commandLineOptions using default values or the user defined list
         if command_line_options is None:
@@ -464,13 +465,13 @@ def model(
         if model_file is not None:
             file_path = pathlib.Path(model_file)
             # special handling for OMCProcessLocal - consider a relative path
-            if isinstance(self._omc_process.omc_process, OMCProcessLocal) and not file_path.is_absolute():
+            if isinstance(self._omc_process, OMCProcessLocal) and not file_path.is_absolute():
                 file_path = pathlib.Path.cwd() / file_path
             if not file_path.is_file():
                 raise IOError(f"Model file {file_path} does not exist!")
 
             self._file_name = self.getWorkDirectory() / file_path.name
-            if (isinstance(self._omc_process.omc_process, OMCProcessLocal)
+            if (isinstance(self._omc_process, OMCProcessLocal)
                     and file_path.as_posix() == self._file_name.as_posix()):
                 pass
             elif self._file_name.is_file():
@@ -485,7 +486,7 @@ def model(
         if build:
             self.buildModel(variable_filter)
 
-    def get_omc_process(self) -> OMCSessionZMQ:
+    def get_omc_process(self) -> OMCProcess:
         """
         Return the OMC session used for this class.
         """
@@ -1207,7 +1208,7 @@ def plot(
         plot is created by OMC which needs access to the local display. This is not the case for docker and WSL.
         """
 
-        if not isinstance(self._omc_process.omc_process, OMCProcessLocal):
+        if not isinstance(self._omc_process, OMCProcessLocal):
             raise ModelicaSystemError("Plot is using the OMC plot functionality; "
                                       "thus, it is only working if OMC is running locally!")
 
@@ -2018,7 +2019,7 @@ def __init__(
         self._doe_def: Optional[dict[str, dict[str, Any]]] = None
         self._doe_cmd: Optional[dict[str, OMCProcessRunData]] = None
 
-    def get_omc_process(self) -> OMCSessionZMQ:
+    def get_omc_process(self) -> OMCProcess:
         """
         Return the OMC session used for this class.
         """