Skip to content

Commit e977ee6

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 c117e52 commit e977ee6

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:
@@ -842,7 +842,7 @@ def _get_portfile_path(self) -> Optional[pathlib.Path]:
842842
return portfile_path
843843

844844
@abc.abstractmethod
845-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
845+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
846846
"""
847847
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
848848
@@ -863,7 +863,7 @@ def __init__(
863863
super().__init__()
864864
self._omc_port = omc_port
865865

866-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
866+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
867867
"""
868868
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
869869
"""
@@ -953,7 +953,7 @@ def _omc_port_get(self) -> str:
953953

954954
return port
955955

956-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
956+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
957957
"""
958958
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
959959
"""
@@ -1110,7 +1110,7 @@ def get_docker_container_id(self) -> str:
11101110

11111111
return self._dockerCid
11121112

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

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

11351133
return omc_run_data_copy
@@ -1457,18 +1455,16 @@ def _omc_port_get(self) -> str:
14571455

14581456
return port
14591457

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

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

1468-
cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
1466+
cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
14691467
cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
1470-
if not cmd_model_executable.is_file():
1471-
raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
14721468
omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
14731469

14741470
return omc_run_data_copy

0 commit comments

Comments
 (0)