|
38 | 38 | import numbers |
39 | 39 | import numpy as np |
40 | 40 | import os |
41 | | -import platform |
42 | | -import re |
43 | | -import subprocess |
44 | 41 | import textwrap |
45 | 42 | from typing import Optional, Any |
46 | 43 | import warnings |
47 | 44 | import xml.etree.ElementTree as ET |
48 | 45 |
|
49 | | -from OMPython.OMCSession import OMCSessionException, OMCSessionRunData, OMCSessionZMQ, OMCProcessLocal, OMCPath |
| 46 | +from OMPython.OMCSession import OMCSessionException, OMCSessionRunData, OMCSessionZMQ, OMCProcess, OMCPath |
50 | 47 |
|
51 | 48 | # define logger using the current module name as ID |
52 | 49 | logger = logging.getLogger(__name__) |
@@ -115,7 +112,7 @@ class ModelicaSystemCmd: |
115 | 112 | def __init__( |
116 | 113 | self, |
117 | 114 | session: OMCSessionZMQ, |
118 | | - runpath: pathlib.Path, |
| 115 | + runpath: OMCPath, |
119 | 116 | modelname: str, |
120 | 117 | timeout: Optional[float] = None, |
121 | 118 | ) -> None: |
@@ -265,7 +262,9 @@ def definition(self) -> OMCSessionRunData: |
265 | 262 | cmd_timeout=self._timeout, |
266 | 263 | ) |
267 | 264 |
|
268 | | - omc_run_data_updated = self._session.omc_run_data_update(omc_run_data=omc_run_data) |
| 265 | + omc_run_data_updated = self._session.omc_run_data_update( |
| 266 | + omc_run_data=omc_run_data, |
| 267 | + ) |
269 | 268 |
|
270 | 269 | return omc_run_data_updated |
271 | 270 |
|
@@ -318,7 +317,7 @@ def __init__( |
318 | 317 | variableFilter: Optional[str] = None, |
319 | 318 | customBuildDirectory: Optional[str | os.PathLike] = None, |
320 | 319 | omhome: Optional[str] = None, |
321 | | - omc_process: Optional[OMCProcessLocal] = None, |
| 320 | + omc_process: Optional[OMCProcess] = None, |
322 | 321 | build: bool = True, |
323 | 322 | ) -> None: |
324 | 323 | """Initialize, load and build a model. |
@@ -383,8 +382,6 @@ def __init__( |
383 | 382 | self._linearized_states: list[str] = [] # linearization states list |
384 | 383 |
|
385 | 384 | if omc_process is not None: |
386 | | - if not isinstance(omc_process, OMCProcessLocal): |
387 | | - raise ModelicaSystemError("Invalid (local) omc process definition provided!") |
388 | 385 | self._getconn = OMCSessionZMQ(omc_process=omc_process) |
389 | 386 | else: |
390 | 387 | self._getconn = OMCSessionZMQ(omhome=omhome) |
|
0 commit comments