Skip to content

[ModelicaSystem*] remove all timeouts #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adeas31 merged 3 commits into from
Nov 27, 2025
Merged

[ModelicaSystem*] remove all timeouts #383

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d37ec0b
[ModelicaSystem*] add timeout argument
syntron Nov 23, 2025
d58f583
[ModelicaSystem*] remove timeout variable(s)
syntron Nov 25, 2025
4b6391b
Merge branch 'master' into ModelicaSystem_timeout_remove
adeas31 Nov 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ModelicaSystem*] remove timeout variable(s)
  • Loading branch information
@syntron
syntron committed Nov 26, 2025
commit d58f583d5e53d8a5d7bdf1bc9ec6117ab353277f
21 changes: 1 addition & 20 deletions OMPython/ModelicaSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,15 +130,13 @@ def __init__(
session: OMCSessionZMQ,
runpath: OMCPath,
modelname: Optional[str] = None,
timeout: Optional[float] = None,
) -> None:
if modelname is None:
raise ModelicaSystemError("Missing model name!")

self._session = session
self._runpath = runpath
self._model_name = modelname
self._timeout = timeout

# dictionaries of command line arguments for the model executable
self._args: dict[str, str | None] = {}
Expand Down Expand Up @@ -278,7 +276,6 @@ def definition(self) -> OMCSessionRunData:
cmd_model_name=self._model_name,
cmd_args=self.get_cmd_args(),
cmd_result_path=result_file,
cmd_timeout=self._timeout,
)

omc_run_data_updated = self._session.omc_run_data_update(
Expand Down Expand Up @@ -337,7 +334,6 @@ def __init__(
work_directory: Optional[str | os.PathLike] = None,
omhome: Optional[str] = None,
omc_process: Optional[OMCProcess] = None,
timeout: float = 10.0,
) -> None:
"""Create a ModelicaSystem instance. To define the model use model() or convertFmu2Mo().

Expand All @@ -351,7 +347,6 @@ def __init__(
omhome: path to OMC to be used when creating the OMC session (see OMCSessionZMQ).
omc_process: definition of a (local) OMC process to be used. If
unspecified, a new local session will be created.
timeout: float value to define the timeout; if nothing is defined, a default value of 10s is used
"""

self._quantities: list[dict[str, Any]] = []
Expand Down Expand Up @@ -381,7 +376,7 @@ def __init__(
if omc_process is not None:
self._session = OMCSessionZMQ(omc_process=omc_process)
else:
self._session = OMCSessionZMQ(omhome=omhome, timeout=timeout)
self._session = OMCSessionZMQ(omhome=omhome)

# set commandLineOptions using default values or the user defined list
if command_line_options is None:
Expand Down Expand Up @@ -577,7 +572,6 @@ def buildModel(self, variableFilter: Optional[str] = None):
session=self._session,
runpath=self.getWorkDirectory(),
modelname=self._model_name,
timeout=5.0,
)
# ... by running it - output help for command help
om_cmd.arg_set(key="help", val="help")
Expand Down Expand Up @@ -1060,7 +1054,6 @@ def simulate_cmd(
result_file: OMCPath,
simflags: Optional[str] = None,
simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
timeout: Optional[float] = None,
) -> ModelicaSystemCmd:
"""
This method prepares the simulates model according to the simulation options. It returns an instance of
Expand All @@ -1077,7 +1070,6 @@ def simulate_cmd(
result_file
simflags
simargs
timeout

Returns
-------
Expand All @@ -1088,7 +1080,6 @@ def simulate_cmd(
session=self._session,
runpath=self.getWorkDirectory(),
modelname=self._model_name,
timeout=timeout,
)

# always define the result file to use
Expand Down Expand Up @@ -1138,7 +1129,6 @@ def simulate(
resultfile: Optional[str | os.PathLike] = None,
simflags: Optional[str] = None,
simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
timeout: Optional[float] = None,
) -> None:
"""Simulate the model according to simulation options.

Expand All @@ -1149,7 +1139,6 @@ def simulate(
simflags: String of extra command line flags for the model binary.
This argument is deprecated, use simargs instead.
simargs: Dict with simulation runtime flags.
timeout: Maximum execution time in seconds.

Examples:
mod.simulate()
Expand Down Expand Up @@ -1177,7 +1166,6 @@ def simulate(
result_file=self._result_file,
simflags=simflags,
simargs=simargs,
timeout=timeout,
)

# delete resultfile ...
Expand Down Expand Up @@ -1761,7 +1749,6 @@ def linearize(
lintime: Optional[float] = None,
simflags: Optional[str] = None,
simargs: Optional[dict[str, Optional[str | dict[str, Any] | numbers.Number]]] = None,
timeout: Optional[float] = None,
) -> LinearizationResult:
"""Linearize the model according to linearization options.

Expand All @@ -1772,7 +1759,6 @@ def linearize(
simflags: String of extra command line flags for the model binary.
This argument is deprecated, use simargs instead.
simargs: A dict with command line flags and possible options; example: "simargs={'csvInput': 'a.csv'}"
timeout: Maximum execution time in seconds.

Returns:
A LinearizationResult object is returned. This allows several
Expand All @@ -1794,7 +1780,6 @@ def linearize(
session=self._session,
runpath=self.getWorkDirectory(),
modelname=self._model_name,
timeout=timeout,
)

override_content = (
Expand Down Expand Up @@ -1970,7 +1955,6 @@ def __init__(
work_directory: Optional[str | os.PathLike] = None,
omhome: Optional[str] = None,
omc_process: Optional[OMCProcess] = None,
timeout: float = 10.0,
# simulation specific input
# TODO: add more settings (simulation options, input options, ...)
simargs: Optional[dict[str, Optional[str | dict[str, str] | numbers.Number]]] = None,
Expand All @@ -1991,7 +1975,6 @@ def __init__(
work_directory=work_directory,
omhome=omhome,
omc_process=omc_process,
timeout=timeout,
)
self._mod.model(
model_file=model_file,
Expand All @@ -2003,7 +1986,6 @@ def __init__(
self._model_name = model_name

self._simargs = simargs
self._timeout = timeout

if resultpath is None:
self._resultpath = self.session().omcpath_tempdir()
Expand Down Expand Up @@ -2106,7 +2088,6 @@ def prepare(self) -> int:
self._mod.setParameters(sim_param_non_structural)
mscmd = self._mod.simulate_cmd(
result_file=resultfile,
timeout=self._timeout,
)
if self._simargs is not None:
mscmd.args_set(args=self._simargs)
Expand Down
Loading