From c648976acdd2a44ddb4de5e7c5db25a55cd921c2 Mon Sep 17 00:00:00 2001
From: Martin Lange <martin.lange@ufz.de>
Date: Wed, 15 Jan 2025 12:58:35 +0100
Subject: [PATCH] rename modules to components
---
benchmarks/adapters/test_regrid.py | 2 +-
benchmarks/profiling/profile_huge_memory.py | 4 +-
benchmarks/profiling/profile_numpy.py | 4 +-
benchmarks/run/test_run.py | 4 +-
docs/source/blog/posts/dead-link-error.rst | 6 +-
.../blog/posts/documentation-rework.rst | 2 +-
docs/source/finam-book/about.rst | 8 +-
.../finam-book/development/adapters.rst | 8 +-
.../finam-book/development/components.rst | 14 +-
.../finam-book/development/connect_phase.rst | 8 +-
.../finam-book/development/performance.rst | 12 +-
.../development/special_components.rst | 4 +-
.../finam-book/usage/coupling_scripts.rst | 14 +-
.../source/finam-book/usage/known_modules.rst | 4 +-
src/finam/__init__.py | 6 +-
src/finam/adapters/__init__.py | 2 +-
src/finam/{modules => components}/__init__.py | 0
src/finam/{modules => components}/callback.py | 2 +-
src/finam/{modules => components}/control.py | 4 +-
src/finam/{modules => components}/debug.py | 6 +-
.../{modules => components}/generators.py | 4 +-
src/finam/{modules => components}/mergers.py | 2 +-
src/finam/{modules => components}/noise.py | 4 +-
.../{modules => components}/parametric.py | 4 +-
src/finam/{modules => components}/readers.py | 2 +-
src/finam/{modules => components}/writers.py | 2 +-
src/finam/data/__init__.py | 2 +-
src/finam/schedule.py | 230 +++++++++---------
src/finam/sdk/component.py | 2 +-
tests/adapters/test_base.py | 2 +-
tests/adapters/test_regrid.py | 2 +-
tests/adapters/test_stats.py | 4 +-
tests/adapters/test_time.py | 2 +-
tests/adapters/test_time_integration.py | 2 +-
tests/core/test_propagate_info.py | 2 +-
tests/core/test_pull_based_component.py | 2 +-
tests/core/test_schedule.py | 8 +-
tests/core/test_sdk.py | 2 +-
tests/core/test_units.py | 2 +-
tests/data/test_masked.py | 4 +-
tests/modules/test_callback.py | 2 +-
tests/modules/test_control.py | 36 +--
tests/modules/test_csv_reader.py | 2 +-
tests/modules/test_csv_writer.py | 4 +-
tests/modules/test_debug.py | 12 +-
tests/modules/test_generator.py | 2 +-
tests/modules/test_noise.py | 58 ++---
tests/modules/test_parametric.py | 46 ++--
tests/modules/test_simplex_noise.py | 8 +-
tests/modules/test_weighted_sum.py | 6 +-
tests/tools/test_inspect.py | 4 +-
51 files changed, 289 insertions(+), 289 deletions(-)
rename src/finam/{modules => components}/__init__.py (100%)
rename src/finam/{modules => components}/callback.py (98%)
rename src/finam/{modules => components}/control.py (98%)
rename src/finam/{modules => components}/debug.py (98%)
rename src/finam/{modules => components}/generators.py (98%)
rename src/finam/{modules => components}/mergers.py (98%)
rename src/finam/{modules => components}/noise.py (98%)
rename src/finam/{modules => components}/parametric.py (98%)
rename src/finam/{modules => components}/readers.py (99%)
rename src/finam/{modules => components}/writers.py (99%)
diff --git a/benchmarks/adapters/test_regrid.py b/benchmarks/adapters/test_regrid.py
index e35bb9f2..b06d7631 100644
--- a/benchmarks/adapters/test_regrid.py
+++ b/benchmarks/adapters/test_regrid.py
@@ -15,7 +15,7 @@ class TestRegrid(unittest.TestCase):
time = dt.datetime(2000, 1, 1)
self.data = fm.data.full(1.0, fm.Info(time=time, grid=grid1))
- self.source = fm.modules.CallbackGenerator(
+ self.source = fm.components.CallbackGenerator(
callbacks={"Step": (lambda t: self.data, fm.Info(None, grid=grid1))},
start=time,
step=dt.timedelta(1.0),
diff --git a/benchmarks/profiling/profile_huge_memory.py b/benchmarks/profiling/profile_huge_memory.py
index 6f136d93..e0fe0f5e 100644
--- a/benchmarks/profiling/profile_huge_memory.py
+++ b/benchmarks/profiling/profile_huge_memory.py
@@ -24,12 +24,12 @@ def run_model():
def gen_data(t):
return np.copy(data)
- source = fm.modules.CallbackGenerator(
+ source = fm.components.CallbackGenerator(
callbacks={"Out": (gen_data, info1.copy())},
start=start_time,
step=dt.timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
inputs={
"In": info1.copy(),
},
diff --git a/benchmarks/profiling/profile_numpy.py b/benchmarks/profiling/profile_numpy.py
index d91fb3cb..6a48d795 100644
--- a/benchmarks/profiling/profile_numpy.py
+++ b/benchmarks/profiling/profile_numpy.py
@@ -35,12 +35,12 @@ def run_model():
counter += 1
return d
- source = fm.modules.CallbackGenerator(
+ source = fm.components.CallbackGenerator(
callbacks={"Out": (gen_data, info1.copy())},
start=start_time,
step=dt.timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
inputs={
"In": info2.copy(),
},
diff --git a/benchmarks/run/test_run.py b/benchmarks/run/test_run.py
index 277e53dc..1448a76c 100644
--- a/benchmarks/run/test_run.py
+++ b/benchmarks/run/test_run.py
@@ -25,12 +25,12 @@ class SimpleRunBase(unittest.TestCase):
return np.copy(d)
def run_simulation(self, gen_func):
- source = fm.modules.CallbackGenerator(
+ source = fm.components.CallbackGenerator(
callbacks={"Out": (gen_func, self.info1.copy())},
start=self.start_time,
step=dt.timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
inputs={
"In": self.info2.copy(),
},
diff --git a/docs/source/blog/posts/dead-link-error.rst b/docs/source/blog/posts/dead-link-error.rst
index b11b9501..0cabf3b5 100644
--- a/docs/source/blog/posts/dead-link-error.rst
+++ b/docs/source/blog/posts/dead-link-error.rst
@@ -29,7 +29,7 @@ In problem case 1:
Output >/> RegridLinear >/> Input
Here, the problem is a push-based component on the right side.
-An example could be :class:`SimplexNoise <.modules.SimplexNoise>` as source, and a push-based plot of file writer as target.
+An example could be :class:`SimplexNoise <.components.SimplexNoise>` as source, and a push-based plot of file writer as target.
In problem case 2:
@@ -38,7 +38,7 @@ In problem case 2:
Output >/> LinearTime >> Input
Here, the problem is a time-interpolating adapter along the link.
-An example could be :class:`SimplexNoise <.modules.SimplexNoise>` as source,
+An example could be :class:`SimplexNoise <.components.SimplexNoise>` as source,
and a :class:`LinearTime <.adapters.LinearTime>` adapter as shown in the above error message.
Fixing the error
@@ -50,7 +50,7 @@ Push-based target problem
The problem here is that both linked components have no time step, and none of them will initiate the exchange of data.
The problem can be solved by putting another component with internal time step (i.e. a sub-class of :class:`.ITimeComponent`)
-between the two components. Exactly for this purpose, FINAM provides the :class:`TimeTrigger <.modules.TimeTrigger>` component.
+between the two components. Exactly for this purpose, FINAM provides the :class:`TimeTrigger <.components.TimeTrigger>` component.
Time-interpolating adapter problem
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/docs/source/blog/posts/documentation-rework.rst b/docs/source/blog/posts/documentation-rework.rst
index b01d80ca..828dcf2d 100644
--- a/docs/source/blog/posts/documentation-rework.rst
+++ b/docs/source/blog/posts/documentation-rework.rst
@@ -23,6 +23,6 @@ Further, most code examples in the documentation are now automatically tested to
On the :doc:`/api/index` side, the documentation was restructured for better accessibility.
Further, API documentation was extended and examples were added to all end user-facing classes,
-particularly in :mod:`.modules` and :mod:`.adapters`.
+particularly in :mod:`.components` and :mod:`.adapters`.
All the work was done by :ref:`author-sebastian-muller` and :ref:`author-martin-lange`.
diff --git a/docs/source/finam-book/about.rst b/docs/source/finam-book/about.rst
index fdd1ac42..219d3abb 100644
--- a/docs/source/finam-book/about.rst
+++ b/docs/source/finam-book/about.rst
@@ -6,7 +6,7 @@ This book has multiple purposes:
* :doc:`principles/index` -- Explain the basic principles of FINAM to the interested audience.
* :doc:`usage/index` -- Teach end users how to set up and run FINAM compositions.
-* :doc:`development/index` -- Teach developers how to implement FINAM modules and adapters, and how to wrap existing models for coupling.
+* :doc:`development/index` -- Teach developers how to implement FINAM components and adapters, and how to wrap existing models for coupling.
* :doc:`cookbook/index` -- Help users and developers with short recipes demonstrating how to solve specific tasks with and for FINAM.
All except the chapters on principles require some Python programming skills.
@@ -21,13 +21,13 @@ They contain only textual and visual descriptions. They contain no code and requ
Read this first!
The chapters under :doc:`usage/index` are dedicated to users
-that want to set up FINAM compositions using existing modules.
+that want to set up FINAM compositions using existing components.
Compositions are created through Python scripts.
These chapters require some basic Python knowledge for writing simple scripts.
The chapters under :doc:`development/index` are dedicated to developers
-that want to build modules for FINAM, or wrap existing models or libraries for the use in FINAM compositions.
-To write modules following these chapters, intermediate knowledge of Python is required.
+that want to build components for FINAM, or wrap existing models or libraries for the use in FINAM compositions.
+To write components following these chapters, intermediate knowledge of Python is required.
Particularly, developers need some basic understanding of object-oriented programming in Python.
The recipes of the :doc:`cookbook/index` are dedicated to users and developers
diff --git a/docs/source/finam-book/development/adapters.rst b/docs/source/finam-book/development/adapters.rst
index ebe02cc5..089c76f2 100644
--- a/docs/source/finam-book/development/adapters.rst
+++ b/docs/source/finam-book/development/adapters.rst
@@ -53,12 +53,12 @@ File ``src/scale.py``:
from datetime import datetime, timedelta
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
{"Value": (lambda _t: 1.0, fm.Info(time=None, grid=fm.NoGrid()))},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
)
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -221,12 +221,12 @@ In :meth:`.Adapter._get_data`, we can now do the interpolation whenever data is
from datetime import datetime, timedelta
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
{"Value": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid()))},
start=datetime(2000, 1, 1),
step=timedelta(days=30),
)
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
diff --git a/docs/source/finam-book/development/components.rst b/docs/source/finam-book/development/components.rst
index 980aeab6..676804e4 100644
--- a/docs/source/finam-book/development/components.rst
+++ b/docs/source/finam-book/development/components.rst
@@ -15,7 +15,7 @@ For implementing components without internal time, see chapter :doc:`./special_c
It is assumed that you have FINAM :doc:`installed <../usage/installation>`, as well as :mod:`pytest`.
For component implementation examples, see the `FINAM Examples repository <https://git.ufz.de/FINAM/finam-examples>`_,
-or browse the source code of the included components in module :mod:`.modules`.
+or browse the source code of the included components in module :mod:`.components`.
The source code of each API entry is linked in it's upper right corner under ``[source]``.
Set up a Python project
@@ -237,7 +237,7 @@ For the tests, we need to set up a real coupling from here on, as the component'
step=timedelta(days=7))
# a component to produce inputs, details not important
- generator = fm.modules.generators.CallbackGenerator(
+ generator = fm.components.generators.CallbackGenerator(
callbacks={
"A": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid())),
"B": (lambda t: t.day * 2, fm.Info(time=None, grid=fm.NoGrid()))
@@ -247,7 +247,7 @@ For the tests, we need to set up a real coupling from here on, as the component'
)
# a component to consume output, details not important
- consumer = fm.modules.debug.DebugConsumer(
+ consumer = fm.components.debug.DebugConsumer(
inputs={"Sum": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=7)
@@ -268,8 +268,8 @@ For the tests, we need to set up a real coupling from here on, as the component'
self.assertEqual(consumer.data, {"Sum": 0})
-Here, we set up a complete coupling using a :class:`.modules.CallbackGenerator` as source.
-A :class:`.modules.DebugConsumer` is used as a sink to force the data flow and to allow us to inspect the result.
+Here, we set up a complete coupling using a :class:`.components.CallbackGenerator` as source.
+A :class:`.components.DebugConsumer` is used as a sink to force the data flow and to allow us to inspect the result.
Update
-------
@@ -407,7 +407,7 @@ Here is the final code of the completed component.
class TestDummy(unittest.TestCase):
def test_dummy_model(self):
model = DummyModel(start=datetime(2000, 1, 1), step=timedelta(days=7))
- generator = fm.modules.generators.CallbackGenerator(
+ generator = fm.components.generators.CallbackGenerator(
callbacks={
"A": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid())),
"B": (lambda t: t.day * 2, fm.Info(time=None, grid=fm.NoGrid())),
@@ -415,7 +415,7 @@ Here is the final code of the completed component.
start=datetime(2000, 1, 1),
step=timedelta(days=7),
)
- consumer = fm.modules.debug.DebugConsumer(
+ consumer = fm.components.debug.DebugConsumer(
inputs={"Sum": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=7),
diff --git a/docs/source/finam-book/development/connect_phase.rst b/docs/source/finam-book/development/connect_phase.rst
index 86f4e38a..c037e5af 100644
--- a/docs/source/finam-book/development/connect_phase.rst
+++ b/docs/source/finam-book/development/connect_phase.rst
@@ -172,7 +172,7 @@ In the most simple case, all metadata is known in :meth:`.Component._initialize`
from datetime import datetime, timedelta
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
{
"Output1": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid(), units=None)),
"Output2": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid(), units=None)),
@@ -183,7 +183,7 @@ In the most simple case, all metadata is known in :meth:`.Component._initialize`
simple_conn = SimpleConnect(datetime(2000, 1, 1), timedelta(days=1))
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=fm.NoGrid(), units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -263,7 +263,7 @@ and the initial data should be generated from it.
def _generate_data(info):
return 0
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
{
"Output1": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid(), units=None)),
"Output2": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid(), units=None)),
@@ -274,7 +274,7 @@ and the initial data should be generated from it.
complex_conn = ComplexConnect(datetime(2000, 1, 1), timedelta(days=1))
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=fm.NoGrid(), units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
diff --git a/docs/source/finam-book/development/performance.rst b/docs/source/finam-book/development/performance.rst
index fd977071..1f7a05a3 100644
--- a/docs/source/finam-book/development/performance.rst
+++ b/docs/source/finam-book/development/performance.rst
@@ -109,11 +109,11 @@ The limit and file location can be set for all slots of the composition:
.. testcode:: memory-limit
- comp_a = finam.modules.SimplexNoise()
- comp_b = finam.modules.SimplexNoise()
+ comp_a = finam.components.SimplexNoise()
+ comp_b = finam.components.SimplexNoise()
comp = finam.Composition(
- modules=[comp_a, comp_b],
+ components=[comp_a, comp_b],
slot_memory_limit=256 * 2**20, # 256MB
slot_memory_location="temp_dir",
) # doctest: +ELLIPSIS
@@ -127,8 +127,8 @@ Both properties can also be set for individual :class:`.Output` and :class:`.Ada
.. testcode:: memory-limit
- comp_a = finam.modules.SimplexNoise()
- comp_b = finam.modules.SimplexNoise()
+ comp_a = finam.components.SimplexNoise()
+ comp_b = finam.components.SimplexNoise()
comp = finam.Composition([comp_a, comp_b]) # doctest: +ELLIPSIS
@@ -165,6 +165,6 @@ a component can do the aggregation internally with a daily sub-step.
Benchmarking and profiling
--------------------------
-This section gives advice on how to profile FINAM modules and compositions.
+This section gives advice on how to profile FINAM components and compositions.
[TODO]
diff --git a/docs/source/finam-book/development/special_components.rst b/docs/source/finam-book/development/special_components.rst
index f11571e6..66aa46a9 100644
--- a/docs/source/finam-book/development/special_components.rst
+++ b/docs/source/finam-book/development/special_components.rst
@@ -70,7 +70,7 @@ Push-based components can use :class:`.CallbackInput` to get informed about inco
def write_to_file(data):
pass
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
{"Value": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid()))},
start=datetime(2000, 1, 1),
step=timedelta(days=30),
@@ -145,7 +145,7 @@ Push-based components can use :class:`.CallbackOutput` to intercept data pulls.
pull_comp = PullComponent()
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
{"Input": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
diff --git a/docs/source/finam-book/usage/coupling_scripts.rst b/docs/source/finam-book/usage/coupling_scripts.rst
index d3d70802..8048823a 100644
--- a/docs/source/finam-book/usage/coupling_scripts.rst
+++ b/docs/source/finam-book/usage/coupling_scripts.rst
@@ -20,13 +20,13 @@ Here is a simple example coupling two components:
# Instantiate components, e.g. models
# Here, we use simplex noise to get a value smoothly varying over time
- generator = fm.modules.SimplexNoise(
+ generator = fm.components.SimplexNoise(
time_frequency=0.000001,
info=fm.Info(time=None, grid=fm.NoGrid()),
)
# A debug printing component
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
inputs={"Value": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -47,8 +47,8 @@ Here is a simple example coupling two components:
...
-In the above example, we couple a simplex noise generator component (:class:`.modules.SimplexNoise`)
-with a consumer component for debug printing (:class:`.modules.DebugConsumer`).
+In the above example, we couple a simplex noise generator component (:class:`.components.SimplexNoise`)
+with a consumer component for debug printing (:class:`.components.DebugConsumer`).
Note:
with package :mod:`finam` installed, simply run the above scripts with:
@@ -108,19 +108,19 @@ time steps and an adapter:
# Instantiate components, e.g. models
# Here, we use simplex noise to get a value smoothly varying over time
- generator = fm.modules.SimplexNoise(
+ generator = fm.components.SimplexNoise(
time_frequency=0.000001,
info=fm.Info(time=None, grid=fm.NoGrid()),
)
# A debug printing component
- consumer_1 = fm.modules.DebugConsumer(
+ consumer_1 = fm.components.DebugConsumer(
inputs={"Value": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
log_data="INFO",
)
# A second debug printing component with a different time step
- consumer_2 = fm.modules.DebugConsumer(
+ consumer_2 = fm.components.DebugConsumer(
inputs={"Value": fm.Info(time=None, grid=fm.NoGrid())},
start=datetime(2000, 1, 1),
step=timedelta(days=2.324732),
diff --git a/docs/source/finam-book/usage/known_modules.rst b/docs/source/finam-book/usage/known_modules.rst
index 34d8634e..c9bd80ce 100644
--- a/docs/source/finam-book/usage/known_modules.rst
+++ b/docs/source/finam-book/usage/known_modules.rst
@@ -10,9 +10,9 @@ Included in FINAM core package
Components
^^^^^^^^^^
-Several components, primarily for testing and debugging, are provided in module :mod:`finam.modules`.
+Several components, primarily for testing and debugging, are provided in module :mod:`finam.components`.
-.. currentmodule:: finam.modules
+.. currentmodule:: finam.components
.. autosummary::
CallbackComponent
diff --git a/src/finam/__init__.py b/src/finam/__init__.py
index b9ba0cef..68e4c0c4 100644
--- a/src/finam/__init__.py
+++ b/src/finam/__init__.py
@@ -131,11 +131,11 @@ Built-in components, adapters and tool functions.
adapters
data
- modules
+ components
tools
"""
-from . import adapters, data, interfaces, modules, schedule, sdk, tools
+from . import adapters, data, interfaces, components, schedule, sdk, tools
from .data.grid_spec import (
EsriGrid,
NoGrid,
@@ -192,7 +192,7 @@ tools.log_helper.add_logging_level("PROFILE", 15)
__all__ = ["__version__"]
-__all__ += ["adapters", "data", "interfaces", "modules", "schedule", "sdk", "tools"]
+__all__ += ["adapters", "data", "interfaces", "components", "schedule", "sdk", "tools"]
__all__ += [
"IComponent",
"ITimeComponent",
diff --git a/src/finam/adapters/__init__.py b/src/finam/adapters/__init__.py
index 26a1b5a4..eee9e98c 100644
--- a/src/finam/adapters/__init__.py
+++ b/src/finam/adapters/__init__.py
@@ -1,5 +1,5 @@
"""
-Adapters to transform or interpolate data when passed between modules.
+Adapters to transform or interpolate data when passed between components.
See also book chapter :doc:`/finam-book/usage/known_modules` for a list of
other adapters that are not included in the core package.
diff --git a/src/finam/modules/__init__.py b/src/finam/components/__init__.py
similarity index 100%
rename from src/finam/modules/__init__.py
rename to src/finam/components/__init__.py
diff --git a/src/finam/modules/callback.py b/src/finam/components/callback.py
similarity index 98%
rename from src/finam/modules/callback.py
rename to src/finam/components/callback.py
index 7e63e5ca..9599a9d1 100644
--- a/src/finam/modules/callback.py
+++ b/src/finam/components/callback.py
@@ -28,7 +28,7 @@ class CallbackComponent(TimeComponent):
import datetime as dt
import finam as fm
- component = fm.modules.CallbackComponent(
+ component = fm.components.CallbackComponent(
inputs={
"A": fm.Info(time=None, grid=fm.NoGrid()),
"B": fm.Info(time=None, grid=fm.NoGrid()),
diff --git a/src/finam/modules/control.py b/src/finam/components/control.py
similarity index 98%
rename from src/finam/modules/control.py
rename to src/finam/components/control.py
index f05a4099..3f32b3d2 100644
--- a/src/finam/modules/control.py
+++ b/src/finam/components/control.py
@@ -38,7 +38,7 @@ class TimeTrigger(TimeComponent):
import datetime as dt
import finam as fm
- component = fm.modules.TimeTrigger(
+ component = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=dt.datetime(2000, 1, 1),
step=dt.timedelta(days=1),
@@ -185,7 +185,7 @@ class UserControl(TimeComponent):
import datetime as dt
import finam as fm
- component = fm.modules.UserControl(
+ component = fm.components.UserControl(
start=dt.datetime(2000, 1, 1),
step=dt.timedelta(days=1),
)
diff --git a/src/finam/modules/debug.py b/src/finam/components/debug.py
similarity index 98%
rename from src/finam/modules/debug.py
rename to src/finam/components/debug.py
index 4366523d..e18ea285 100644
--- a/src/finam/modules/debug.py
+++ b/src/finam/components/debug.py
@@ -27,7 +27,7 @@ class DebugConsumer(TimeComponent):
import datetime as dt
import finam as fm
- component = fm.modules.DebugConsumer(
+ component = fm.components.DebugConsumer(
inputs={
"A": fm.Info(time=None, grid=fm.NoGrid()),
"B": fm.Info(time=None, grid=fm.NoGrid()),
@@ -181,7 +181,7 @@ class DebugPushConsumer(Component):
import datetime as dt
import finam as fm
- component = fm.modules.DebugPushConsumer(
+ component = fm.components.DebugPushConsumer(
inputs={
"A": fm.Info(time=None, grid=fm.NoGrid()),
"B": fm.Info(time=None, grid=fm.NoGrid()),
@@ -300,7 +300,7 @@ class ScheduleLogger(Component):
from datetime import timedelta
import finam as fm
- schedule = fm.modules.ScheduleLogger(
+ schedule = fm.components.ScheduleLogger(
inputs={"Grid1": True, "Grid2": True},
time_step=timedelta(days=1),
log_level="DEBUG",
diff --git a/src/finam/modules/generators.py b/src/finam/components/generators.py
similarity index 98%
rename from src/finam/modules/generators.py
rename to src/finam/components/generators.py
index 06a39c3b..20dc917e 100644
--- a/src/finam/modules/generators.py
+++ b/src/finam/components/generators.py
@@ -27,7 +27,7 @@ class CallbackGenerator(TimeComponent):
import datetime as dt
import finam as fm
- generator = fm.modules.CallbackGenerator(
+ generator = fm.components.CallbackGenerator(
callbacks={
"Out1": (lambda t: t.day, fm.Info(time=None, grid=fm.NoGrid())),
"Out2": (lambda t: t.month, fm.Info(time=None, grid=fm.NoGrid()))
@@ -145,7 +145,7 @@ class StaticCallbackGenerator(Component):
import finam as fm
- generator = fm.modules.StaticCallbackGenerator(
+ generator = fm.components.StaticCallbackGenerator(
callbacks={
"Out1": (lambda: 1.0, fm.Info(time=None, grid=fm.NoGrid())),
"Out2": (lambda: 2.0, fm.Info(time=None, grid=fm.NoGrid()))
diff --git a/src/finam/modules/mergers.py b/src/finam/components/mergers.py
similarity index 98%
rename from src/finam/modules/mergers.py
rename to src/finam/components/mergers.py
index eee2614a..ce92edaa 100644
--- a/src/finam/modules/mergers.py
+++ b/src/finam/components/mergers.py
@@ -30,7 +30,7 @@ class WeightedSum(Component):
import finam as fm
- component = fm.modules.WeightedSum(inputs=["A", "B", "C"])
+ component = fm.components.WeightedSum(inputs=["A", "B", "C"])
# ... create and initialize composition
diff --git a/src/finam/modules/noise.py b/src/finam/components/noise.py
similarity index 98%
rename from src/finam/modules/noise.py
rename to src/finam/components/noise.py
index 6817490d..1a8f3983 100644
--- a/src/finam/modules/noise.py
+++ b/src/finam/components/noise.py
@@ -33,7 +33,7 @@ class SimplexNoise(Component):
import finam as fm
- component = fm.modules.SimplexNoise(
+ component = fm.components.SimplexNoise(
info=fm.Info(time=None, grid=fm.UniformGrid((20, 15))),
frequency=0.1,
time_frequency=1 / (24 * 3600),
@@ -171,7 +171,7 @@ class StaticSimplexNoise(Component):
import finam as fm
- component = fm.modules.StaticSimplexNoise(
+ component = fm.components.StaticSimplexNoise(
info=fm.Info(time=None, grid=fm.UniformGrid((20, 15))),
frequency=0.1,
octaves=3,
diff --git a/src/finam/modules/parametric.py b/src/finam/components/parametric.py
similarity index 98%
rename from src/finam/modules/parametric.py
rename to src/finam/components/parametric.py
index 0e1d1aeb..e77481b2 100644
--- a/src/finam/modules/parametric.py
+++ b/src/finam/components/parametric.py
@@ -30,7 +30,7 @@ class ParametricGrid(Component):
import finam as fm
- component = fm.modules.ParametricGrid(
+ component = fm.components.ParametricGrid(
info=fm.Info(time=None, grid=fm.UniformGrid((20, 15))),
func=lambda t, x, y: x * y,
)
@@ -120,7 +120,7 @@ class StaticParametricGrid(Component):
import finam as fm
- component = fm.modules.StaticParametricGrid(
+ component = fm.components.StaticParametricGrid(
info=fm.Info(time=None, grid=fm.UniformGrid((20, 15))),
func=lambda x, y: x * y,
)
diff --git a/src/finam/modules/readers.py b/src/finam/components/readers.py
similarity index 99%
rename from src/finam/modules/readers.py
rename to src/finam/components/readers.py
index a33c9148..081c8a17 100644
--- a/src/finam/modules/readers.py
+++ b/src/finam/components/readers.py
@@ -29,7 +29,7 @@ class CsvReader(TimeComponent):
import finam as fm
- reader = fm.modules.CsvReader(
+ reader = fm.components.CsvReader(
path="test.csv",
time_column="T",
outputs={
diff --git a/src/finam/modules/writers.py b/src/finam/components/writers.py
similarity index 99%
rename from src/finam/modules/writers.py
rename to src/finam/components/writers.py
index a4123200..a95a4e33 100644
--- a/src/finam/modules/writers.py
+++ b/src/finam/components/writers.py
@@ -34,7 +34,7 @@ class CsvWriter(TimeComponent):
import datetime as dt
import finam as fm
- writer = fm.modules.CsvWriter(
+ writer = fm.components.CsvWriter(
path="test.csv",
inputs=["A", "B", "C"],
time_column="T",
diff --git a/src/finam/data/__init__.py b/src/finam/data/__init__.py
index 67529f57..c67f24b1 100644
--- a/src/finam/data/__init__.py
+++ b/src/finam/data/__init__.py
@@ -1,5 +1,5 @@
"""
-Specialized data types for exchanges between models/modules.
+Specialized data types for exchanges between models/components.
Grids
=====
diff --git a/src/finam/schedule.py b/src/finam/schedule.py
index ba4d79a7..f861d03b 100644
--- a/src/finam/schedule.py
+++ b/src/finam/schedule.py
@@ -62,7 +62,7 @@ class Composition(Loggable):
Parameters
----------
- modules : list of IComponent
+ components : list of IComponent
Components in the composition.
logger_name : str, optional
Name for the base logger, by default "FINAM"
@@ -83,7 +83,7 @@ class Composition(Loggable):
def __init__(
self,
- modules,
+ components,
logger_name="FINAM",
print_log=True,
log_file=None,
@@ -112,13 +112,13 @@ class Composition(Loggable):
fh.setFormatter(formatter)
self.logger.addHandler(fh)
- for module in modules:
- if not isinstance(module, IComponent):
+ for comp in components:
+ if not isinstance(comp, IComponent):
with ErrorLogger(self.logger):
raise ValueError(
- "Composition: modules need to be instances of 'IComponent'."
+ "Composition: components need to be instances of 'IComponent'."
)
- self._modules = modules
+ self._components = components
self._adapters = set()
self._dependencies = None
self._input_owners = None
@@ -133,28 +133,28 @@ class Composition(Loggable):
# initialize
self.logger.info("init composition")
- for mod in self._modules:
- self._check_status(mod, [ComponentStatus.CREATED])
+ for comp in self._components:
+ self._check_status(comp, [ComponentStatus.CREATED])
if self._slot_memory_location is not None:
os.makedirs(self._slot_memory_location, exist_ok=True)
- for mod in self._modules:
- if is_loggable(mod) and mod.uses_base_logger_name:
- mod.base_logger_name = self.logger_name
- mod.initialize()
+ for comp in self._components:
+ if is_loggable(comp) and comp.uses_base_logger_name:
+ comp.base_logger_name = self.logger_name
+ comp.initialize()
# set logger
with ErrorLogger(self.logger):
- mod.inputs.set_logger(mod)
- mod.outputs.set_logger(mod)
+ comp.inputs.set_logger(comp)
+ comp.outputs.set_logger(comp)
- for _, out in mod.outputs.items():
+ for _, out in comp.outputs.items():
if out.memory_limit is None:
out.memory_limit = self._slot_memory_limit
if out.memory_location is None:
out.memory_location = self._slot_memory_location
- self._check_status(mod, [ComponentStatus.INITIALIZED])
+ self._check_status(comp, [ComponentStatus.INITIALIZED])
def connect(self, start_time=None):
"""Performs the connect and validate phases of the composition
@@ -171,17 +171,17 @@ class Composition(Loggable):
if self._is_connected:
raise FinamStatusError("Composition was already connected.")
- time_modules = [m for m in self._modules if isinstance(m, ITimeComponent)]
+ time_components = [m for m in self._components if isinstance(m, ITimeComponent)]
with ErrorLogger(self.logger):
- if len(time_modules) == 0:
+ if len(time_components) == 0:
if start_time is not None:
raise ValueError(
"start must be None for a composition without time components"
)
else:
if start_time is None:
- start_time = _get_start_time(time_modules)
+ start_time = _get_start_time(time_components)
if not isinstance(start_time, datetime):
raise ValueError(
"start must be of type datetime for a composition with time components"
@@ -199,12 +199,12 @@ class Composition(Loggable):
self._connect_components(start_time)
self.logger.info("validate components")
- for mod in self._modules:
- mod.validate()
- self._check_status(mod, [ComponentStatus.VALIDATED])
+ for comp in self._components:
+ comp.validate()
+ self._check_status(comp, [ComponentStatus.VALIDATED])
- self._output_owners = _map_outputs(self._modules)
- self._input_owners = _map_inputs(self._modules)
+ self._output_owners = _map_outputs(self._components)
+ self._input_owners = _map_inputs(self._components)
self._is_connected = True
self._time_frame = (start_time, None)
@@ -225,10 +225,10 @@ class Composition(Loggable):
Simulation time up to which to simulate.
Should be ``None`` if no components with time are present.
"""
- time_modules = [m for m in self._modules if isinstance(m, ITimeComponent)]
+ time_components = [m for m in self._components if isinstance(m, ITimeComponent)]
with ErrorLogger(self.logger):
- if len(time_modules) == 0:
+ if len(time_components) == 0:
if end_time is not None:
raise ValueError(
"end must be None for a composition without time components"
@@ -245,18 +245,18 @@ class Composition(Loggable):
self._time_frame = (self._time_frame[0], end_time)
self.logger.info("run composition")
- while len(time_modules) > 0:
- sort_modules = list(time_modules)
- sort_modules.sort(key=lambda m: m.time)
- to_update = sort_modules[0]
+ while len(time_components) > 0:
+ sort_components = list(time_components)
+ sort_components.sort(key=lambda m: m.time)
+ to_update = sort_components[0]
updated = self._update_recursive(to_update)
self._check_status(
updated, [ComponentStatus.VALIDATED, ComponentStatus.UPDATED]
)
any_running = False
- for mod in time_modules:
- if mod.status != ComponentStatus.FINISHED and mod.time < end_time:
+ for comp in time_components:
+ if comp.status != ComponentStatus.FINISHED and comp.time < end_time:
any_running = True
break
@@ -266,9 +266,9 @@ class Composition(Loggable):
self._finalize_components()
self._finalize_composition()
- def _update_recursive(self, module, chain=None, target_time=None):
+ def _update_recursive(self, comp, chain=None, target_time=None):
chain = chain or {}
- if module in chain:
+ if comp in chain:
with ErrorLogger(self.logger):
joined = " >> ".join(
[
@@ -278,63 +278,63 @@ class Composition(Loggable):
)
raise FinamCircularCouplingError(
f"Unresolved circular coupling:\n"
- f"{module.name} >> "
+ f"{comp.name} >> "
f"{joined}\n"
f"(Deltas are time lags of upstream components, * denotes delayed links)\n"
f"You may need to insert a NoDependencyAdapter or ITimeDelayAdapter subclass somewhere, "
f"or increase the adapter's delay."
)
- chain[module] = None
+ chain[comp] = None
- if isinstance(module, ITimeComponent):
- target_time = module.next_time
+ if isinstance(comp, ITimeComponent):
+ target_time = comp.next_time
- deps = _find_dependencies(module, self._output_owners, target_time)
+ deps = _find_dependencies(comp, self._output_owners, target_time)
for dep, (local_time, delayed) in deps.items():
comp = self._output_owners[dep]
if isinstance(comp, ITimeComponent):
if dep.time < local_time:
- chain[module] = (local_time - dep.time, delayed)
+ chain[comp] = (local_time - dep.time, delayed)
return self._update_recursive(comp, chain)
else:
updated = self._update_recursive(comp, chain, local_time)
if updated is not None:
return updated
- if isinstance(module, ITimeComponent):
- if module.status != ComponentStatus.FINISHED:
- module.update()
+ if isinstance(comp, ITimeComponent):
+ if comp.status != ComponentStatus.FINISHED:
+ comp.update()
else:
raise FinamTimeError(
- f"Can't update dependency component {module.name}, as it is already finished."
+ f"Can't update dependency component {comp.name}, as it is already finished."
)
- return module
+ return comp
return None
def _collect_adapters(self):
- for mod in self._modules:
- for _, inp in mod.inputs.items():
+ for comp in self._components:
+ for _, inp in comp.inputs.items():
_collect_adapters_input(inp, self._adapters)
- for _, out in mod.outputs.items():
+ for _, out in comp.outputs.items():
_collect_adapters_output(out, self._adapters)
def _validate_composition(self):
"""Validates the coupling setup by checking for dangling inputs and disallowed branching connections."""
self.logger.info("validate composition")
- for mod in self._modules:
- with ErrorLogger(mod.logger if is_loggable(mod) else self.logger):
- for inp in mod.inputs.values():
- _check_input_connected(mod, inp)
- _check_dead_links(mod, inp)
+ for comp in self._components:
+ with ErrorLogger(comp.logger if is_loggable(comp) else self.logger):
+ for inp in comp.inputs.values():
+ _check_input_connected(comp, inp)
+ _check_dead_links(comp, inp)
- for out in mod.outputs.values():
- _check_branching(mod, out)
+ for out in comp.outputs.values():
+ _check_branching(comp, out)
with ErrorLogger(self.logger):
- _check_missing_modules(self._modules)
+ _check_missing_components(self._components)
def _connect_components(self, time):
self.logger.info("connect components")
@@ -343,21 +343,21 @@ class Composition(Loggable):
self.logger.debug("connect iteration %d", counter)
any_unconnected = False
any_new_connection = False
- for mod in self._modules:
- if mod.status != ComponentStatus.CONNECTED:
- mod.connect(time)
+ for comp in self._components:
+ if comp.status != ComponentStatus.CONNECTED:
+ comp.connect(time)
self._check_status(
- mod,
+ comp,
[
ComponentStatus.CONNECTING,
ComponentStatus.CONNECTING_IDLE,
ComponentStatus.CONNECTED,
],
)
- if mod.status == ComponentStatus.CONNECTED:
+ if comp.status == ComponentStatus.CONNECTED:
any_new_connection = True
else:
- if mod.status == ComponentStatus.CONNECTING:
+ if comp.status == ComponentStatus.CONNECTING:
any_new_connection = True
any_unconnected = True
@@ -367,7 +367,7 @@ class Composition(Loggable):
if not any_new_connection:
unconn = [
m.name
- for m in self._modules
+ for m in self._components
if m.status != ComponentStatus.CONNECTED
]
with ErrorLogger(self.logger):
@@ -380,9 +380,9 @@ class Composition(Loggable):
def _finalize_components(self):
self.logger.info("finalize components")
- for mod in self._modules:
+ for comp in self._components:
self._check_status(
- mod,
+ comp,
[
ComponentStatus.VALIDATED,
ComponentStatus.UPDATED,
@@ -390,14 +390,14 @@ class Composition(Loggable):
],
)
if (
- isinstance(mod, ITimeComponent)
- and mod.status == ComponentStatus.VALIDATED
+ isinstance(comp, ITimeComponent)
+ and comp.status == ComponentStatus.VALIDATED
):
self.logger.warning(
- "Time component %s was not updated during this run", mod.name
+ "Time component %s was not updated during this run", comp.name
)
- mod.finalize()
- self._check_status(mod, [ComponentStatus.FINALIZED])
+ comp.finalize()
+ self._check_status(comp, [ComponentStatus.FINALIZED])
for ada in self._adapters:
ada.finalize()
@@ -419,11 +419,11 @@ class Composition(Loggable):
"""Whether this class has a ``base_logger_name`` attribute. False."""
return False
- def _check_status(self, module, desired_list):
- if module.status not in desired_list:
- with ErrorLogger(module.logger if is_loggable(module) else self.logger):
+ def _check_status(self, comp, desired_list):
+ if comp.status not in desired_list:
+ with ErrorLogger(comp.logger if is_loggable(comp) else self.logger):
raise FinamStatusError(
- f"Unexpected model state {module.status} in {module.name}. "
+ f"Unexpected component state {comp.status} in {comp.name}. "
f"Expecting one of [{', '.join(map(str, desired_list))}]"
)
@@ -458,9 +458,9 @@ class Composition(Loggable):
)
comps = {}
- for mod in self._modules:
- key = f"{mod.name}@{id(mod)}"
- comps[key] = mod.metadata
+ for comp in self._components:
+ key = f"{comp.name}@{id(comp)}"
+ comps[key] = comp.metadata
adas = {}
for ada in self._adapters:
@@ -469,8 +469,8 @@ class Composition(Loggable):
links = []
- for mod in self._modules:
- for out_name, out in mod.outputs.items():
+ for comp in self._components:
+ for out_name, out in comp.outputs.items():
for target in out.targets:
if isinstance(target, IAdapter):
to = {
@@ -486,7 +486,7 @@ class Composition(Loggable):
links.append(
{
"from": {
- "component": f"{mod.name}@{id(mod)}",
+ "component": f"{comp.name}@{id(comp)}",
"output": out_name,
},
"to": to,
@@ -541,12 +541,12 @@ def _collect_adapters_output(out: IOutput, out_adapters: set):
_collect_adapters_output(trg, out_adapters)
-def _get_start_time(time_modules):
+def _get_start_time(time_components):
t_min = None
- for mod in time_modules:
- if mod.time is not None:
- if t_min is None or mod.time < t_min:
- t_min = mod.time
+ for comp in time_components:
+ if comp.time is not None:
+ if t_min is None or comp.time < t_min:
+ t_min = comp.time
if t_min is None:
raise ValueError(
"Unable to determine starting time of the composition."
@@ -555,38 +555,38 @@ def _get_start_time(time_modules):
return t_min
-def _check_missing_modules(modules):
- inputs, outputs = _collect_inputs_outputs(modules)
+def _check_missing_components(components):
+ inputs, outputs = _collect_inputs_outputs(components)
- mod_inputs = {inp for mod in modules for inp in mod.inputs.values()}
- mod_outputs = {out for mod in modules for out in mod.outputs.values()}
+ comp_inputs = {inp for comp in components for inp in comp.inputs.values()}
+ comp_outputs = {out for comp in components for out in comp.outputs.values()}
- unlinked_inputs = inputs - mod_inputs
- mod_outputs = outputs - mod_outputs
+ unlinked_inputs = inputs - comp_inputs
+ comp_outputs = outputs - comp_outputs
if len(unlinked_inputs) > 0:
raise FinamConnectError(
f"A component was coupled, but not added to this Composition. "
f"Affected inputs: {[inp.name for inp in unlinked_inputs]}"
)
- if len(mod_outputs) > 0:
+ if len(comp_outputs) > 0:
raise FinamConnectError(
f"A component was coupled, but not added to this Composition. "
- f"Affected outputs: {[out.name for out in mod_outputs]}"
+ f"Affected outputs: {[out.name for out in comp_outputs]}"
)
-def _collect_inputs_outputs(modules):
+def _collect_inputs_outputs(components):
all_inputs = set()
all_outputs = set()
- for mod in modules:
- for _, inp in mod.inputs.items():
+ for comp in components:
+ for _, inp in comp.inputs.items():
while isinstance(inp, IInput):
inp = inp.source
all_outputs.add(inp)
- for _, out in mod.outputs.items():
+ for _, out in comp.outputs.items():
targets = {out}
while len(targets) > 0:
target = targets.pop()
@@ -600,7 +600,7 @@ def _collect_inputs_outputs(modules):
return all_inputs, all_outputs
-def _check_branching(module, out):
+def _check_branching(comp, out):
targets = [(out, False)]
while len(targets) > 0:
@@ -612,7 +612,7 @@ def _check_branching(module, out):
if no_branch and len(curr_targets) > 1:
raise FinamConnectError(
f"Disallowed branching of output '{out.name}' for "
- f"module {module.name} ({target.__class__.__name__})"
+ f"component {comp.name} ({target.__class__.__name__})"
)
for target in curr_targets:
@@ -620,13 +620,13 @@ def _check_branching(module, out):
targets.append((target, no_branch))
-def _check_input_connected(module, inp):
+def _check_input_connected(comp, inp):
static = inp.is_static
while isinstance(inp, IInput):
if inp.source is None:
raise FinamConnectError(
- f"Unconnected input '{inp.name}' for target module {module.name}"
+ f"Unconnected input '{inp.name}' for target component {comp.name}"
)
inp = inp.source
@@ -634,7 +634,7 @@ def _check_input_connected(module, inp):
raise FinamConnectError("Can't connect a static input to a non-static output.")
-def _check_dead_links(module, inp):
+def _check_dead_links(comp, inp):
chain = [inp]
while isinstance(inp, IInput):
inp = inp.source
@@ -643,30 +643,30 @@ def _check_dead_links(module, inp):
first_index = -1
for i, item in enumerate(reversed(chain)):
if first_index >= 0 and item.needs_push:
- raise _dead_link_error(module, chain, first_index, i)
+ raise _dead_link_error(comp, chain, first_index, i)
if item.needs_pull:
first_index = i
-def _map_outputs(modules):
+def _map_outputs(components):
out_map = {}
- for mod in modules:
- for _, out in mod.outputs.items():
- out_map[out] = mod
+ for comp in components:
+ for _, out in comp.outputs.items():
+ out_map[out] = comp
return out_map
-def _map_inputs(modules):
+def _map_inputs(components):
in_map = {}
- for mod in modules:
- for _, inp in mod.inputs.items():
- in_map[inp] = mod
+ for comp in components:
+ for _, inp in comp.inputs.items():
+ in_map[inp] = comp
return in_map
-def _find_dependencies(module, output_owners, target_time):
+def _find_dependencies(component, output_owners, target_time):
deps = {}
- for _, inp in module.inputs.items():
+ for _, inp in component.inputs.items():
local_time = target_time
delayed = False
while isinstance(inp, IInput):
@@ -688,7 +688,7 @@ def _find_dependencies(module, output_owners, target_time):
return deps
-def _dead_link_error(module, chain, first_index, last_index):
+def _dead_link_error(component, chain, first_index, last_index):
link_message = ""
for i, item in enumerate(reversed(chain)):
link_message += item.name
@@ -699,6 +699,6 @@ def _dead_link_error(module, chain, first_index, last_index):
return FinamConnectError(
f"Dead link detected between "
- f"{chain[0].name} and {str(module)}->{chain[-1].name}:\n"
+ f"{chain[0].name} and {str(component)}->{chain[-1].name}:\n"
f"{link_message}"
)
diff --git a/src/finam/sdk/component.py b/src/finam/sdk/component.py
index b81045e1..a5c01819 100644
--- a/src/finam/sdk/component.py
+++ b/src/finam/sdk/component.py
@@ -338,7 +338,7 @@ class Component(IComponent, Loggable, ABC):
import finam as fm
import datetime as dt
- self = fm.modules.CallbackComponent(
+ self = fm.components.CallbackComponent(
inputs={},
outputs={},
callback=lambda inp, _t: {},
diff --git a/tests/adapters/test_base.py b/tests/adapters/test_base.py
index 4f081252..1064c53c 100644
--- a/tests/adapters/test_base.py
+++ b/tests/adapters/test_base.py
@@ -12,7 +12,7 @@ import finam as fm
from finam import UNITS, Info, NoGrid, UniformGrid
from finam import data as fmdata
from finam.adapters.base import Callback, GridToValue, Scale, ValueToGrid
-from finam.modules.generators import CallbackGenerator
+from finam.components.generators import CallbackGenerator
class TestCallback(unittest.TestCase):
diff --git a/tests/adapters/test_regrid.py b/tests/adapters/test_regrid.py
index eef59c9e..54d05726 100644
--- a/tests/adapters/test_regrid.py
+++ b/tests/adapters/test_regrid.py
@@ -19,7 +19,7 @@ from finam import (
)
from finam import data as fdata
from finam.adapters.regrid import RegridLinear, RegridNearest
-from finam.modules import debug, generators
+from finam.components import debug, generators
class TestRegrid(unittest.TestCase):
diff --git a/tests/adapters/test_stats.py b/tests/adapters/test_stats.py
index 6d689aea..1c9e417e 100644
--- a/tests/adapters/test_stats.py
+++ b/tests/adapters/test_stats.py
@@ -16,8 +16,8 @@ class TestHistogram(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- sink = fm.modules.DebugConsumer(
+ source = fm.components.SimplexNoise(info=in_info)
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=time,
step=timedelta(days=1),
diff --git a/tests/adapters/test_time.py b/tests/adapters/test_time.py
index 82bab928..41068b76 100644
--- a/tests/adapters/test_time.py
+++ b/tests/adapters/test_time.py
@@ -22,7 +22,7 @@ from finam.adapters.time import (
interpolate,
interpolate_step,
)
-from finam.modules import CallbackGenerator
+from finam.components import CallbackGenerator
reg = pint.UnitRegistry(force_ndarray_like=True)
diff --git a/tests/adapters/test_time_integration.py b/tests/adapters/test_time_integration.py
index 624f7da0..f708ae88 100644
--- a/tests/adapters/test_time_integration.py
+++ b/tests/adapters/test_time_integration.py
@@ -11,7 +11,7 @@ import finam as fm
from finam import FinamTimeError, Info, NoGrid, UniformGrid
from finam import data as tools
from finam.adapters.time_integration import AvgOverTime, SumOverTime
-from finam.modules import CallbackGenerator, DebugConsumer
+from finam.components import CallbackGenerator, DebugConsumer
reg = pint.UnitRegistry(force_ndarray_like=True)
diff --git a/tests/core/test_propagate_info.py b/tests/core/test_propagate_info.py
index 7ecb64db..df11848e 100644
--- a/tests/core/test_propagate_info.py
+++ b/tests/core/test_propagate_info.py
@@ -5,7 +5,7 @@ import unittest
from datetime import datetime, timedelta
from finam import Adapter, Composition, FinamMetaDataError, Info, NoGrid, TimeComponent
-from finam.modules.generators import CallbackGenerator
+from finam.components.generators import CallbackGenerator
class MockupConsumer(TimeComponent):
diff --git a/tests/core/test_pull_based_component.py b/tests/core/test_pull_based_component.py
index 0dcca3da..1c288cd0 100644
--- a/tests/core/test_pull_based_component.py
+++ b/tests/core/test_pull_based_component.py
@@ -3,7 +3,7 @@ from datetime import datetime, timedelta
from functools import partial
import finam as fm
-from finam.modules.debug import DebugConsumer
+from finam.components.debug import DebugConsumer
class PullComponent(fm.Component):
diff --git a/tests/core/test_schedule.py b/tests/core/test_schedule.py
index c8022b34..1b73879d 100644
--- a/tests/core/test_schedule.py
+++ b/tests/core/test_schedule.py
@@ -31,7 +31,7 @@ from finam import (
from finam._version import __version__
from finam.adapters.base import Scale
from finam.adapters.time import DelayFixed, NextTime
-from finam.modules import CallbackComponent, CallbackGenerator, DebugPushConsumer, debug
+from finam.components import CallbackComponent, CallbackGenerator, DebugPushConsumer, debug
from finam.schedule import _check_dead_links, _find_dependencies
@@ -556,8 +556,8 @@ class TestComposition(unittest.TestCase):
def test_static_run(self):
info = fm.Info(time=None, grid=fm.NoGrid())
- source = fm.modules.StaticSimplexNoise(info=info, seed=123)
- sink = fm.modules.DebugPushConsumer(
+ source = fm.components.StaticSimplexNoise(info=info, seed=123)
+ sink = fm.components.DebugPushConsumer(
inputs={
"In": fm.Info(time=None, grid=fm.NoGrid()),
},
@@ -578,7 +578,7 @@ class TestComposition(unittest.TestCase):
def test_static_fail(self):
info = fm.Info(time=None, grid=fm.NoGrid())
- source = fm.modules.SimplexNoise(info=info, seed=123)
+ source = fm.components.SimplexNoise(info=info, seed=123)
sink = MockupDependentComponent(step=timedelta(days=1), static=True)
composition = Composition([source, sink])
diff --git a/tests/core/test_sdk.py b/tests/core/test_sdk.py
index 4072eb11..007a0d03 100644
--- a/tests/core/test_sdk.py
+++ b/tests/core/test_sdk.py
@@ -868,7 +868,7 @@ class TestNotImplemented(unittest.TestCase):
class TestRename(unittest.TestCase):
def test_rename_component(self):
- comp = fm.modules.SimplexNoise().with_name("CompA")
+ comp = fm.components.SimplexNoise().with_name("CompA")
self.assertEqual("CompA", comp.name)
def test_rename_adapter(self):
diff --git a/tests/core/test_units.py b/tests/core/test_units.py
index 2caddd01..9c5e8813 100644
--- a/tests/core/test_units.py
+++ b/tests/core/test_units.py
@@ -16,7 +16,7 @@ from finam import (
UniformGrid,
)
from finam import data as tools
-from finam.modules.generators import CallbackGenerator
+from finam.components.generators import CallbackGenerator
class MockupConsumer(TimeComponent):
diff --git a/tests/data/test_masked.py b/tests/data/test_masked.py
index 464c2d46..90c1868e 100644
--- a/tests/data/test_masked.py
+++ b/tests/data/test_masked.py
@@ -32,7 +32,7 @@ class TestMasked(unittest.TestCase):
missing_value=np.nan,
)
- source = fm.modules.generators.CallbackGenerator(
+ source = fm.components.generators.CallbackGenerator(
callbacks={
"Output": (
lambda t: gen_masked(t.toordinal(), in_info.grid.data_shape),
@@ -43,7 +43,7 @@ class TestMasked(unittest.TestCase):
step=timedelta(days=1),
)
- sink = fm.modules.debug.DebugConsumer(
+ sink = fm.components.debug.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=time,
step=timedelta(days=1),
diff --git a/tests/modules/test_callback.py b/tests/modules/test_callback.py
index f462c574..261618bb 100644
--- a/tests/modules/test_callback.py
+++ b/tests/modules/test_callback.py
@@ -5,7 +5,7 @@ import numpy as np
import finam as fm
from finam import Composition, Info, NoGrid
-from finam.modules import CallbackComponent, CallbackGenerator, DebugConsumer
+from finam.components import CallbackComponent, CallbackGenerator, DebugConsumer
def transform(inputs, _time):
diff --git a/tests/modules/test_control.py b/tests/modules/test_control.py
index 6c064d57..d656d442 100644
--- a/tests/modules/test_control.py
+++ b/tests/modules/test_control.py
@@ -13,13 +13,13 @@ class TestTimeTrigger(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -41,7 +41,7 @@ class TestTimeTrigger(unittest.TestCase):
units="m",
)
- source = fm.modules.CallbackGenerator(
+ source = fm.components.CallbackGenerator(
callbacks={
"Out": (
lambda t: t.day,
@@ -51,14 +51,14 @@ class TestTimeTrigger(unittest.TestCase):
start=time,
step=timedelta(days=1),
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
out_info=None,
start=None,
step=timedelta(days=1),
start_from_input=True,
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": out_info},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -83,7 +83,7 @@ class TestTimeTrigger(unittest.TestCase):
units="m",
)
- source = fm.modules.CallbackGenerator(
+ source = fm.components.CallbackGenerator(
callbacks={
"Out": (
lambda t: t.day,
@@ -93,14 +93,14 @@ class TestTimeTrigger(unittest.TestCase):
start=time,
step=timedelta(days=1),
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
out_info=fm.Info(time=None, grid=None, units=None),
start=None,
step=timedelta(days=1),
start_from_input=True,
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": out_info},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -126,14 +126,14 @@ class TestTimeTrigger(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise()
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise()
+ trigger = fm.components.TimeTrigger(
out_info=fm.Info(time=None, grid=None, units=None),
start=None,
step=timedelta(days=1),
start_from_input=False,
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": out_info},
start=time,
step=timedelta(days=1),
@@ -159,15 +159,15 @@ class TestTimeTrigger(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise()
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise()
+ trigger = fm.components.TimeTrigger(
in_info=out_info.copy_with(),
out_info=fm.Info(time=None, grid=None, units=None),
start=None,
step=timedelta(days=1),
start_from_input=False,
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": out_info},
start=time,
step=timedelta(days=1),
@@ -187,11 +187,11 @@ class TestTimeTrigger(unittest.TestCase):
def test_time_trigger_fail(self):
time = datetime(2000, 1, 1)
- trigger = fm.modules.TimeTrigger(start=time, step=timedelta(days=1))
+ trigger = fm.components.TimeTrigger(start=time, step=timedelta(days=1))
with self.assertRaises(fm.FinamMetaDataError):
trigger.initialize()
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
out_info=fm.Info(time=None, grid=None, units=None),
start=None,
step=timedelta(days=1),
@@ -200,7 +200,7 @@ class TestTimeTrigger(unittest.TestCase):
with self.assertRaises(fm.FinamMetaDataError):
trigger.initialize()
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=None,
step=timedelta(days=1),
diff --git a/tests/modules/test_csv_reader.py b/tests/modules/test_csv_reader.py
index efec51be..6205e35a 100644
--- a/tests/modules/test_csv_reader.py
+++ b/tests/modules/test_csv_reader.py
@@ -4,7 +4,7 @@ from os import path
from tempfile import TemporaryDirectory
from finam import UNITS, ComponentStatus, Info, Input, NoGrid
-from finam.modules.readers import CsvReader
+from finam.components.readers import CsvReader
class TestCsvReader(unittest.TestCase):
diff --git a/tests/modules/test_csv_writer.py b/tests/modules/test_csv_writer.py
index b200f482..f41aa86c 100644
--- a/tests/modules/test_csv_writer.py
+++ b/tests/modules/test_csv_writer.py
@@ -6,8 +6,8 @@ from tempfile import TemporaryDirectory
from numpy.testing import assert_array_equal
from finam import Composition, Info, NoGrid
-from finam.modules.generators import CallbackGenerator
-from finam.modules.writers import CsvWriter
+from finam.components.generators import CallbackGenerator
+from finam.components.writers import CsvWriter
class TestCsvWriter(unittest.TestCase):
diff --git a/tests/modules/test_debug.py b/tests/modules/test_debug.py
index 7140e682..bf90ce88 100644
--- a/tests/modules/test_debug.py
+++ b/tests/modules/test_debug.py
@@ -9,12 +9,12 @@ class TestScheduleLogger(unittest.TestCase):
start = datetime(2000, 1, 1)
info = fm.Info(time=start, grid=fm.NoGrid())
- module1 = fm.modules.CallbackGenerator(
+ module1 = fm.components.CallbackGenerator(
callbacks={"Out": (lambda t: t.day, info)},
start=start,
step=timedelta(days=2),
)
- module2 = fm.modules.CallbackComponent(
+ module2 = fm.components.CallbackComponent(
inputs={
"In": fm.Info(time=None, grid=fm.NoGrid()),
},
@@ -25,7 +25,7 @@ class TestScheduleLogger(unittest.TestCase):
start=start,
step=timedelta(days=5),
)
- module3 = fm.modules.CallbackComponent(
+ module3 = fm.components.CallbackComponent(
inputs={
"In": fm.Info(time=None, grid=fm.NoGrid()),
},
@@ -37,7 +37,7 @@ class TestScheduleLogger(unittest.TestCase):
step=timedelta(days=8),
)
- schedule = fm.modules.ScheduleLogger(
+ schedule = fm.components.ScheduleLogger(
inputs={
"M1": True,
"M2": True,
@@ -65,12 +65,12 @@ class TestPushDebugConsumer(unittest.TestCase):
start = datetime(2000, 1, 1)
info = fm.Info(time=start, grid=fm.NoGrid())
- module1 = fm.modules.CallbackGenerator(
+ module1 = fm.components.CallbackGenerator(
callbacks={"Out": (lambda t: t.day, info)},
start=start,
step=timedelta(days=2),
)
- consumer = fm.modules.DebugPushConsumer(
+ consumer = fm.components.DebugPushConsumer(
inputs={
"In": fm.Info(time=None, grid=fm.NoGrid()),
},
diff --git a/tests/modules/test_generator.py b/tests/modules/test_generator.py
index cada5a39..44cdea0e 100644
--- a/tests/modules/test_generator.py
+++ b/tests/modules/test_generator.py
@@ -5,7 +5,7 @@ import numpy as np
import finam as fm
from finam import Composition, Info, NoGrid
-from finam.modules import DebugPushConsumer, StaticCallbackGenerator
+from finam.components import DebugPushConsumer, StaticCallbackGenerator
def consume(_inputs, _time):
diff --git a/tests/modules/test_noise.py b/tests/modules/test_noise.py
index 1366134f..1a6a8577 100644
--- a/tests/modules/test_noise.py
+++ b/tests/modules/test_noise.py
@@ -15,13 +15,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -46,13 +46,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -77,13 +77,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -108,13 +108,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -139,13 +139,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -170,13 +170,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -201,13 +201,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -232,13 +232,13 @@ class TestNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.SimplexNoise(info=in_info)
- trigger = fm.modules.TimeTrigger(
+ source = fm.components.SimplexNoise(info=in_info)
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -254,9 +254,9 @@ class TestNoise(unittest.TestCase):
def test_noise_fail(self):
with self.assertRaises(ValueError):
- _source = fm.modules.SimplexNoise(octaves=0)
+ _source = fm.components.SimplexNoise(octaves=0)
- source = fm.modules.SimplexNoise(octaves=1)
+ source = fm.components.SimplexNoise(octaves=1)
source._update()
@@ -268,16 +268,16 @@ class TestStaticNoise(unittest.TestCase):
units="m",
)
- source = fm.modules.StaticSimplexNoise(info=in_info, seed=123)
+ source = fm.components.StaticSimplexNoise(info=in_info, seed=123)
"""
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
)
"""
# We want to get to a point where this works
- sink = fm.modules.DebugPushConsumer(
+ sink = fm.components.DebugPushConsumer(
inputs={
"Input": fm.Info(time=None, grid=fm.NoGrid(), units="m"),
},
diff --git a/tests/modules/test_parametric.py b/tests/modules/test_parametric.py
index 10a8ac5a..ff67e409 100644
--- a/tests/modules/test_parametric.py
+++ b/tests/modules/test_parametric.py
@@ -16,16 +16,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x: x,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -51,16 +51,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x, y: x,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -88,16 +88,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x, y, z: x * y - z,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -122,16 +122,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x: x,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -157,16 +157,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x, y: x * y,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -192,16 +192,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x, y, z: x * y - z,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -229,16 +229,16 @@ class TestParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.ParametricGrid(
+ source = fm.components.ParametricGrid(
info=in_info,
func=lambda t, x: x,
)
- trigger = fm.modules.TimeTrigger(
+ trigger = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None, units=None),
start=time,
step=timedelta(days=1),
)
- sink = fm.modules.DebugConsumer(
+ sink = fm.components.DebugConsumer(
{"Input": fm.Info(None, grid=None, units=None)},
start=datetime(2000, 1, 1),
step=timedelta(days=1),
@@ -261,11 +261,11 @@ class TestStaticParametricGrid(unittest.TestCase):
units="m",
)
- source = fm.modules.StaticParametricGrid(
+ source = fm.components.StaticParametricGrid(
info=in_info,
func=lambda x, y: x,
)
- sink = fm.modules.DebugPushConsumer(
+ sink = fm.components.DebugPushConsumer(
inputs={
"Input": fm.Info(time=None, grid=in_info.grid, units=None),
},
diff --git a/tests/modules/test_simplex_noise.py b/tests/modules/test_simplex_noise.py
index ea3f2af9..d8125981 100644
--- a/tests/modules/test_simplex_noise.py
+++ b/tests/modules/test_simplex_noise.py
@@ -11,9 +11,9 @@ class TestSimplexNoise(unittest.TestCase):
time = datetime(2000, 1, 1)
grid = fm.UniformGrid((25, 15), origin=(10.0, 5.0))
- source = fm.modules.SimplexNoise(octaves=3, frequency=0.01, seed=4)
+ source = fm.components.SimplexNoise(octaves=3, frequency=0.01, seed=4)
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
inputs={"Noise": fm.Info(None, grid=grid, units="")},
start=time,
step=timedelta(days=7),
@@ -33,9 +33,9 @@ class TestSimplexNoise(unittest.TestCase):
time = datetime(2000, 1, 1)
grid = fm.UnstructuredPoints(np.random.random((100, 2)) * 100)
- source = fm.modules.SimplexNoise(octaves=3, frequency=0.01, seed=4)
+ source = fm.components.SimplexNoise(octaves=3, frequency=0.01, seed=4)
- consumer = fm.modules.DebugConsumer(
+ consumer = fm.components.DebugConsumer(
inputs={"Noise": fm.Info(None, grid=grid, units="")},
start=time,
step=timedelta(days=7),
diff --git a/tests/modules/test_weighted_sum.py b/tests/modules/test_weighted_sum.py
index d934bb2b..19158c02 100644
--- a/tests/modules/test_weighted_sum.py
+++ b/tests/modules/test_weighted_sum.py
@@ -5,9 +5,9 @@ import numpy as np
import finam as fm
import finam.errors
-from finam.modules.debug import DebugConsumer
-from finam.modules.generators import CallbackGenerator
-from finam.modules.mergers import WeightedSum
+from finam.components.debug import DebugConsumer
+from finam.components.generators import CallbackGenerator
+from finam.components.mergers import WeightedSum
def generate_grid(grid):
diff --git a/tests/tools/test_inspect.py b/tests/tools/test_inspect.py
index e0576c47..aff0f36d 100644
--- a/tests/tools/test_inspect.py
+++ b/tests/tools/test_inspect.py
@@ -16,8 +16,8 @@ class TestInspect(unittest.TestCase):
_s1 = fm.tools.inspect(ada)
def test_inspect_component(self):
- comp1 = fm.modules.WeightedSum(inputs=["A", "B", "C"])
- comp2 = fm.modules.TimeTrigger(
+ comp1 = fm.components.WeightedSum(inputs=["A", "B", "C"])
+ comp2 = fm.components.TimeTrigger(
in_info=fm.Info(time=None, grid=None),
start=dt.datetime(2000, 1, 1),
step=dt.timedelta(days=1),
--
GitLab