??? needs cleanup; remove need of session argument

* no check of executable exists - must be handled by try .. except ..

Author: syntron

OMPython/ModelicaSystem.py

@@ -208,7 +208,7 @@ def definition(self) -> OMCSessionRunData:
             cmd_timeout=self._timeout,
         )
 
-        omc_run_data_updated = self._session.omc_run_data_update(omc_run_data, session=self._session)
+        omc_run_data_updated = self._session.omc_run_data_update(omc_run_data)
 
         return omc_run_data_updated
 

OMPython/OMCSession.py

@@ -597,7 +597,7 @@ def omcpath_tempdir(self, tempdir_base: Optional[OMCPath] = None) -> OMCPath:
 
         return tempdir
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Modify data based on the selected OMCProcess implementation.
 
@@ -833,7 +833,7 @@ def _get_portfile_path(self) -> Optional[pathlib.Path]:
         return portfile_path
 
     @abc.abstractmethod
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
 
@@ -851,7 +851,7 @@ def __init__(
         super().__init__()
         self._omc_port = omc_port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -938,7 +938,7 @@ def _omc_port_get(self) -> str:
 
         return port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -1086,7 +1086,7 @@ def get_docker_container_id(self) -> str:
 
         return self._dockerCid
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
@@ -1102,10 +1102,8 @@ def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessi
                 + [self._dockerCid]
         )
 
-        cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
+        cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
         cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
-        if not cmd_model_executable.is_file():
-            raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
         omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
 
         return omc_run_data_copy
@@ -1423,18 +1421,16 @@ def _omc_port_get(self) -> str:
 
         return port
 
-    def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
+    def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
         """
         Update the OMCSessionRunData object based on the selected OMCProcess implementation.
         """
         omc_run_data_copy = dataclasses.replace(omc_run_data)
 
         omc_run_data_copy.cmd_prefix = self._wsl_cmd(wsl_cwd=omc_run_data.cmd_path)
 
-        cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
+        cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
         cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
-        if not cmd_model_executable.is_file():
-            raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
         omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
 
         return omc_run_data_copy