Skip to content

Commit d7b7354

Browse files
committed
[OMCProcess] remove session argument for OMCProcess.omc_run_data_update()
* no dependency loop OMCsessionZMQ => OMCProcess* => OMCSessionZMQ * check if model executable exists will be handled via ModelicaSystemCmd
1 parent ff99edb commit d7b7354

File tree

1 file changed

+8
-12
lines changed

1 file changed

+8
-12
lines changed

OMPython/OMCSession.py

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -606,7 +606,7 @@ def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunD
606606
607607
Needs to be implemented in the subclasses.
608608
"""
609-
return self.omc_process.omc_run_data_update(omc_run_data=omc_run_data, session=self)
609+
return self.omc_process.omc_run_data_update(omc_run_data=omc_run_data)
610610

611611
@staticmethod
612612
def run_model_executable(cmd_run_data: OMCSessionRunData) -> int:
@@ -843,7 +843,7 @@ def _get_portfile_path(self) -> Optional[pathlib.Path]:
843843
return portfile_path
844844

845845
@abc.abstractmethod
846-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
846+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
847847
"""
848848
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
849849
@@ -864,7 +864,7 @@ def __init__(
864864
super().__init__()
865865
self._omc_port = omc_port
866866

867-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
867+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
868868
"""
869869
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
870870
"""
@@ -954,7 +954,7 @@ def _omc_port_get(self) -> str:
954954

955955
return port
956956

957-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
957+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
958958
"""
959959
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
960960
"""
@@ -1111,7 +1111,7 @@ def get_docker_container_id(self) -> str:
11111111

11121112
return self._dockerCid
11131113

1114-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
1114+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
11151115
"""
11161116
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
11171117
"""
@@ -1127,10 +1127,8 @@ def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessi
11271127
+ [self._dockerCid]
11281128
)
11291129

1130-
cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
1130+
cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
11311131
cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
1132-
if not cmd_model_executable.is_file():
1133-
raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
11341132
omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
11351133

11361134
return omc_run_data_copy
@@ -1458,18 +1456,16 @@ def _omc_port_get(self) -> str:
14581456

14591457
return port
14601458

1461-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
1459+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
14621460
"""
14631461
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
14641462
"""
14651463
omc_run_data_copy = dataclasses.replace(omc_run_data)
14661464

14671465
omc_run_data_copy.cmd_prefix = self._wsl_cmd(wsl_cwd=omc_run_data.cmd_path)
14681466

1469-
cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
1467+
cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
14701468
cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
1471-
if not cmd_model_executable.is_file():
1472-
raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
14731469
omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
14741470

14751471
return omc_run_data_copy

0 commit comments

Comments
 (0)