[ModelicaSystemCmd] use OMCPath for file system interactions

Author: syntron

OMPython/OMCSession.py

@@ -458,18 +458,18 @@ class OMCPathCompatibilityWindows(pathlib.WindowsPath, OMCPathCompatibility):
 
 @dataclasses.dataclass
 class OMCSessionRunData:
-    # TODO: rename OMCExcecutableModelData
     """
     Data class to store the command line data for running a model executable in the OMC environment.
 
     All data should be defined for the environment, where OMC is running (local, docker or WSL)
     """
-    # cmd_path is the expected working directory
+    # cmd_path is based on the selected OMCProcess definition
     cmd_path: str
     cmd_model_name: str
     # command line arguments for the model executable
     cmd_args: list[str]
     # result file with the simulation output
+    # cmd_result_path is based on the selected OMCProcess definition
     cmd_result_path: str
 
     # command prefix data (as list of strings); needed for docker or WSL
@@ -598,13 +598,13 @@ def omcpath_tempdir(self, tempdir_base: Optional[OMCPath] = None) -> OMCPath:
 
         return tempdir
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Modify data based on the selected OMCProcess implementation.
 
         Needs to be implemented in the subclasses.
         """
-        return self.omc_process.omc_run_data_update(omc_run_data=omc_run_data)
+        return self.omc_process.omc_run_data_update(omc_run_data=omc_run_data, session=self)
 
     @staticmethod
     def run_model_executable(cmd_run_data: OMCSessionRunData) -> int:
@@ -652,8 +652,11 @@ def execute(self, command: str):
         return self.sendExpression(command, parsed=False)
 
     def sendExpression(self, command: str, parsed: bool = True) -> Any:
+        """
+        Send an expression to the OMC server and return the result.
+        """
         if self.omc_zmq is None:
-            raise OMCSessionException("No OMC running. Create a new instance of OMCSessionZMQ!")
+            raise OMCSessionException("No OMC running. Create a new instance of OMCProcess!")
 
         logger.debug("sendExpression(%r, parsed=%r)", command, parsed)
 
@@ -831,7 +834,7 @@ def _get_portfile_path(self) -> Optional[pathlib.Path]:
         return portfile_path
 
     @abc.abstractmethod
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
 
@@ -849,7 +852,7 @@ def __init__(
         super().__init__()
         self._omc_port = omc_port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -936,7 +939,7 @@ def _omc_port_get(self) -> str:
 
         return port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -1084,7 +1087,7 @@ def get_docker_container_id(self) -> str:
 
         return self._dockerCid
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -1396,7 +1399,7 @@ def _omc_port_get(self) -> str:
 
         return port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """