Skip to content

update type hints #366

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 5 commits into from
Nov 13, 2025
Merged

update type hints #366

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e7b9d6f
[ModelicaSystem] add/update type hints for get*() functions
syntron Aug 9, 2025
6eaf3ee
[ModelicaSystem] fix definition of simulate()
syntron Nov 8, 2025
7db5e97
[ModelicaSystem] more type hints fixes / cleanups
syntron Nov 8, 2025
b84a73b
indicate that OMPython includes type hints via py.typed
syntron Nov 8, 2025
7079280
Merge branch 'master' into type_hints
adeas31 Nov 13, 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] more type hints fixes / cleanups
  • Loading branch information
@syntron
syntron committed Nov 10, 2025
commit 7db5e97c3553a278f35a933c47335e2571e5ac4f
23 changes: 15 additions & 8 deletions OMPython/ModelicaSystem.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ def __init__(

self._quantities: list[dict[str, Any]] = []
self._params: dict[str, str] = {} # even numerical values are stored as str
self._inputs: dict[str, list | None] = {}
self._inputs: dict[str, list[tuple[float, float]]] = {}
# _outputs values are str before simulate(), but they can be
# np.float64 after simulate().
self._outputs: dict[str, Any] = {}
Expand All @@ -386,8 +386,15 @@ def __init__(
self._simulate_options: dict[str, str] = {}
self._override_variables: dict[str, str] = {}
self._simulate_options_override: dict[str, str] = {}
self._linearization_options = {'startTime': 0.0, 'stopTime': 1.0, 'stepSize': 0.002, 'tolerance': 1e-8}
self._optimization_options = self._linearization_options | {'numberOfIntervals': 500}
self._linearization_options: dict[str, str | float] = {
'startTime': 0.0,
'stopTime': 1.0,
'stepSize': 0.002,
'tolerance': 1e-8,
}
self._optimization_options = self._linearization_options | {
'numberOfIntervals': 500,
}
self._linearized_inputs: list[str] = [] # linearization input list
self._linearized_outputs: list[str] = [] # linearization output list
self._linearized_states: list[str] = [] # linearization states list
Expand Down Expand Up @@ -797,7 +804,7 @@ def getParameters(
def getInputs(
self,
names: Optional[str | list[str]] = None,
) -> dict[str, list[tuple[numbers.Real]]] | list[tuple[numbers.Real]]:
) -> dict[str, list[tuple[float, float]]] | list[list[tuple[float, float]]]:
"""Get values of input signals.

Args:
Expand Down Expand Up @@ -942,7 +949,7 @@ def getSimulationOptions(
def getLinearizationOptions(
self,
names: Optional[str | list[str]] = None,
) -> dict[str, str | numbers.Real] | list[str | numbers.Real]:
) -> dict[str, str | float] | list[str | float]:
"""Get simulation options used for linearization.

Args:
Expand Down Expand Up @@ -980,7 +987,7 @@ def getLinearizationOptions(
def getOptimizationOptions(
self,
names: Optional[str | list[str]] = None,
) -> dict[str, str | numbers.Real] | list[str | numbers.Real]:
) -> dict[str, str | float] | list[str | float]:
"""Get simulation options used for optimization.

Args:
Expand Down Expand Up @@ -1789,9 +1796,9 @@ def linearize(
continue

# type: ignore
value = ast.literal_eval(body_part.value)
value_ast = ast.literal_eval(body_part.value)

linear_data[target] = value
linear_data[target] = value_ast
except (AttributeError, IndexError, ValueError, SyntaxError, TypeError) as ex:
raise ModelicaSystemError(f"Error parsing linearization file {linear_file}!") from ex

Expand Down