??? fix runner

Author: syntron

OMPython/OMCSession.py

@@ -644,7 +644,7 @@ def __init__(
         self.omc_process = omc_process
 
     def __del__(self):
-        if hasattr('omc_process', self):
+        if hasattr(self, 'omc_process'):
             del self.omc_process
 
     @staticmethod
@@ -2078,20 +2078,24 @@ def __init__(
             self,
             timeout: float = 10.00,
             version: str = "1.27.0",
-            cmd_prefix: Optional[list[str]] = None,
             ompath_runner: Type[OMPathRunnerABC] = OMPathRunnerLocal,
+            cmd_prefix: Optional[list[str]] = None,
+            model_execution_local: bool = True,
     ) -> None:
         super().__init__(timeout=timeout)
-        self.model_execution_local = True
         self._version = version
 
         if not issubclass(ompath_runner, OMPathRunnerABC):
             raise OMCSessionException(f"Invalid OMPathRunner class: {type(ompath_runner)}!")
         self._ompath_runner = ompath_runner
 
+        self.model_execution_local = model_execution_local
         if cmd_prefix is not None:
             self._cmd_prefix = cmd_prefix
 
+        # TODO: some checking?!
+        # if ompath_runner == Type[OMPathRunnerBash]:
+
     def __post_init__(self) -> None:
         """
         No connection to an OMC server is created by this class!
@@ -2101,7 +2105,7 @@ def model_execution_prefix(self, cwd: Optional[OMPathABC] = None) -> list[str]:
         """
         Helper function which returns a command prefix.
         """
-        return []
+        return self.get_cmd_prefix()
 
     def get_version(self) -> str:
         """
@@ -2112,9 +2116,10 @@ def get_version(self) -> str:
 
     def set_workdir(self, workdir: OMPathABC) -> None:
         """
-        Set the workdir for this session.
+        Set the workdir for this session. For OMSessionRunner this is a nop. The workdir must be defined within the
+        definition of cmd_prefix.
         """
-        os.chdir(workdir.as_posix())
+        pass
 
     def omcpath(self, *path) -> OMPathABC:
         """

tests/test_ModelicaSystemRunner.py

@@ -1,9 +1,17 @@
+import sys
+
 import numpy as np
 import pytest
 
 import OMPython
 
 
+skip_on_windows = pytest.mark.skipif(
+    sys.platform.startswith("win"),
+    reason="OpenModelica Docker image is Linux-only; skipping on Windows.",
+)
+
+
 @pytest.fixture
 def model_firstorder_content():
     return """
@@ -71,6 +79,50 @@ def test_ModelicaSystemRunner(model_firstorder, param):
     _check_result(mod=mod, resultfile=resultfile_modr, param=param)
 
 
+@skip_on_windows
+def test_ModelicaSystemRunner_bash_docker(model_firstorder, param):
+    omcp = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
+    om = OMPython.OMCSessionZMQ(omc_process=omcp)
+    assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0"
+
+    # create a model using ModelicaSystem
+    mod = OMPython.ModelicaSystemOMC(
+        session=omcp,
+    )
+    mod.model(
+        model_file=model_firstorder,
+        model_name="M",
+    )
+
+    resultfile_mod = mod.getWorkDirectory() / f"{mod.get_model_name()}_res_mod.mat"
+    _run_simulation(mod=mod, resultfile=resultfile_mod, param=param)
+
+    # run the model using only the runner class
+    omcs = OMPython.OMSessionRunner(
+        version=mod.get_session().get_version(),
+        cmd_prefix=omcp.model_execution_prefix(cwd=mod.getWorkDirectory()),
+        ompath_runner=OMPython.OMPathRunnerBash,
+        model_execution_local=False,
+    )
+    modr = OMPython.ModelicaSystemRunner(
+        session=omcs,
+        work_directory=mod.getWorkDirectory(),
+    )
+    modr.setup(
+        model_name="M",
+    )
+
+    resultfile_modr = mod.getWorkDirectory() / f"{mod.get_model_name()}_res_modr.mat"
+    _run_simulation(mod=modr, resultfile=resultfile_modr, param=param)
+
+    # cannot check the content as runner does not have the capability to open a result file
+    assert resultfile_mod.size() == resultfile_modr.size()
+
+    # check results
+    _check_result(mod=mod, resultfile=resultfile_mod, param=param)
+    _check_result(mod=mod, resultfile=resultfile_modr, param=param)
+
+
 def _run_simulation(mod, resultfile, param):
     simOptions = {"stopTime": param['stopTime'], "stepSize": 0.1, "tolerance": 1e-8}
     mod.setSimulationOptions(**simOptions)