Skip to content

Commit cd3bba8

Browse files
committed
??? remove session argument for OMCProcess.omc_run_data_update()
1 parent 5e00610 commit cd3bba8

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

OMPython/OMCSession.py

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

608608
@staticmethod
609609
def run_model_executable(cmd_run_data: OMCSessionRunData) -> int:
@@ -833,7 +833,7 @@ def _get_portfile_path(self) -> Optional[pathlib.Path]:
833833
return portfile_path
834834

835835
@abc.abstractmethod
836-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
836+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
837837
"""
838838
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
839839
@@ -851,7 +851,7 @@ def __init__(
851851
super().__init__()
852852
self._omc_port = omc_port
853853

854-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
854+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
855855
"""
856856
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
857857
"""
@@ -938,7 +938,7 @@ def _omc_port_get(self) -> str:
938938

939939
return port
940940

941-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
941+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
942942
"""
943943
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
944944
"""
@@ -1086,7 +1086,7 @@ def get_docker_container_id(self) -> str:
10861086

10871087
return self._dockerCid
10881088

1089-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
1089+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
10901090
"""
10911091
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
10921092
"""
@@ -1102,10 +1102,8 @@ def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessi
11021102
+ [self._dockerCid]
11031103
)
11041104

1105-
cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
1105+
cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
11061106
cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
1107-
if not cmd_model_executable.is_file():
1108-
raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
11091107
omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
11101108

11111109
return omc_run_data_copy
@@ -1423,18 +1421,16 @@ def _omc_port_get(self) -> str:
14231421

14241422
return port
14251423

1426-
def omc_run_data_update(self, omc_run_data: OMCSessionRunData, session: OMCSessionZMQ) -> OMCSessionRunData:
1424+
def omc_run_data_update(self, omc_run_data: OMCSessionRunData) -> OMCSessionRunData:
14271425
"""
14281426
Update the OMCSessionRunData object based on the selected OMCProcess implementation.
14291427
"""
14301428
omc_run_data_copy = dataclasses.replace(omc_run_data)
14311429

14321430
omc_run_data_copy.cmd_prefix = self._wsl_cmd(wsl_cwd=omc_run_data.cmd_path)
14331431

1434-
cmd_path = session.omcpath(omc_run_data_copy.cmd_path)
1432+
cmd_path = pathlib.PurePosixPath(omc_run_data_copy.cmd_path)
14351433
cmd_model_executable = cmd_path / omc_run_data_copy.cmd_model_name
1436-
if not cmd_model_executable.is_file():
1437-
raise OMCSessionException(f"Application file path not found: {cmd_model_executable}")
14381434
omc_run_data_copy.cmd_model_executable = cmd_model_executable.as_posix()
14391435

14401436
return omc_run_data_copy

0 commit comments

Comments
 (0)