Skip to content
8 changes: 4 additions & 4 deletions pytest.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pytest]
filterwarnings =
ignore::FutureWarning
ignore::PendingDeprecationWarning
ignore::DeprecationWarning
; ignore:Use explicit output-to-input connections:DeprecationWarning
norecursedirs = *
doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
doctest_optionflags = NORMALIZE_WHITESPACE ELLIPSIS
markers =
slow: mark a test as slow.
1 change: 1 addition & 0 deletions src/ansys/dpf/core/examples/downloads.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ def delete_downloads(verbose=True):
Path(examples.__file__).parent / "__init__.py",
Path(examples.__file__).parent / "downloads.py",
Path(examples.__file__).parent / "examples.py",
Path(examples.__file__).parent / "python_plugins" / "custom_operator_example.py",
]
)
for root, dirs, files in os.walk(LOCAL_DOWNLOADED_EXAMPLES_PATH, topdown=False):
Expand Down
41 changes: 27 additions & 14 deletions src/ansys/dpf/core/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
from typing import TYPE_CHECKING

if TYPE_CHECKING: # pragma: nocover
from ansys.dpf.core.operators.mesh.mesh_provider import mesh_provider as mesh_provider_op
from ansys.dpf.core.scoping import Scoping
from ansys.dpf.core.server_types import AnyServerType

Expand Down Expand Up @@ -321,7 +322,7 @@ def _cache_streams_provider(self):
)
else:
self._stream_provider = Operator("stream_provider", server=self._server)
self._stream_provider.inputs.connect(self._data_sources)
self._stream_provider.inputs.data_sources.connect(self._data_sources)
try:
self._stream_provider.run()
except:
Expand Down Expand Up @@ -369,12 +370,16 @@ def time_freq_support(self):

"""
if self._time_freq_support is None:
timeProvider = Operator("TimeFreqSupportProvider", server=self._server)
time_provider: dpf.core.operators.metadata.time_freq_provider = Operator(
name="TimeFreqSupportProvider", server=self._server
)
if self._stream_provider:
timeProvider.inputs.connect(self._stream_provider.outputs)
time_provider.inputs.streams_container.connect(
self._stream_provider.outputs.streams_container
)
else:
timeProvider.inputs.connect(self.data_sources)
self._time_freq_support = timeProvider.get_output(0, types.time_freq_support)
time_provider.inputs.data_sources.connect(self.data_sources)
self._time_freq_support = time_provider.get_output(0, types.time_freq_support)
return self._time_freq_support

@property
Expand Down Expand Up @@ -443,7 +448,7 @@ def _set_data_sources(self, var_inp):
def _load_result_info(self):
"""Return a result info object."""
op = Operator("ResultInfoProvider", server=self._server)
op.inputs.connect(self._stream_provider.outputs)
op.inputs.streams_container.connect(self._stream_provider.outputs.streams_container)
try:
result_info = op.get_output(0, types.result_info)
except Exception as e:
Expand Down Expand Up @@ -491,7 +496,7 @@ def meshed_region(self):
return self._meshed_region

@property
def mesh_provider(self):
def mesh_provider(self) -> mesh_provider_op:
"""Mesh provider operator.

This operator reads a mesh from the result file. The underlying
Expand All @@ -500,15 +505,19 @@ def mesh_provider(self):

Returns
-------
mesh_provider : :class:`ansys.dpf.core.operators.mesh.mesh_provider`
mesh_provider:
Mesh provider operator.

"""
mesh_provider = Operator("MeshProvider", server=self._server)
mesh_provider: dpf.core.operators.mesh.mesh_provider = Operator(
name="MeshProvider", server=self._server
)
if self._stream_provider:
mesh_provider.inputs.connect(self._stream_provider.outputs)
mesh_provider.inputs.streams_container.connect(
self._stream_provider.outputs.streams_container
)
else:
mesh_provider.inputs.connect(self.data_sources)
mesh_provider.inputs.data_sources.connect(self.data_sources)
return mesh_provider

@property
Expand Down Expand Up @@ -577,11 +586,15 @@ def meshes_provider(self):
Underlying operator symbol is
"meshes_provider" operator
"""
meshes_provider = Operator("meshes_provider", server=self._server)
meshes_provider: dpf.core.operators.mesh.meshes_provider = Operator(
name="meshes_provider", server=self._server
)
if self._stream_provider:
meshes_provider.inputs.connect(self._stream_provider.outputs)
meshes_provider.inputs.streams_container.connect(
self._stream_provider.outputs.streams_container
)
else:
meshes_provider.inputs.connect(self.data_sources)
meshes_provider.inputs.data_sources.connect(self.data_sources)
return meshes_provider

@property
Expand Down
Loading