Backport PR #2007: Fix: forecasting CLI for v0.31 (#2007)

* fix: CLI options require serialized defaults

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* fix: pass already deserialized config to forecaster

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* dev: fix import issue for Python 3.10

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* feat: add test to cover CLI command execution with minimal options

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* Revert "dev: fix import issue for Python 3.10"

This reverts commit 1558573.

* Revert "fix: pass already deserialized config to forecaster"

This reverts commit 980591d.

* Revert "fix: CLI options require serialized defaults"

This reverts commit 1624d47.

* fix: prefer tested and working forecasting CLI over CLI help type annotations

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* style: itemize symbol

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* docs: changelog entry

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* docs: add release date for v0.31.1

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* docs: add API changelog entry

Signed-off-by: F.N. Claessen <claessen@seita.nl>

* docs: elaborate API changelog entry

Signed-off-by: F.N. Claessen <claessen@seita.nl>

---------

Signed-off-by: F.N. Claessen <claessen@seita.nl>

(cherry picked from commit ccfd069)
Signed-off-by: F.N. Claessen <claessen@seita.nl>

Author: Flix6x

documentation/changelog.rst

@@ -4,12 +4,13 @@ FlexMeasures Changelog
 **********************
 
 
-v0.31.1 | March XX, 2026
+v0.31.1 | March 6, 2026
 ============================
 
 Bugfixes
 -----------
-- Add missing field documentation for ``aggregate-power`` and ``state-of-charge`` fields, which can be used to reference a sensor on which to record extra scheduling results [see `PR #2003 <https://www.github.com/FlexMeasures/flexmeasures/pull/2003>`_ and `PR #2006 <https://www.github.com/FlexMeasures/flexmeasures/pull/2006>`_]
+* Fix CLI command ``flexmeasures add forecasts`` [see `PR #2007 <https://www.github.com/FlexMeasures/flexmeasures/pull/2007>`_]
+* Add missing field documentation for ``aggregate-power`` and ``state-of-charge`` fields, which can be used to reference a sensor on which to record extra scheduling results [see `PR #2003 <https://www.github.com/FlexMeasures/flexmeasures/pull/2003>`_ and `PR #2006 <https://www.github.com/FlexMeasures/flexmeasures/pull/2006>`_]
 
 
 v0.31.0 | February 28, 2026

documentation/cli/change_log.rst

@@ -4,6 +4,11 @@
 FlexMeasures CLI Changelog
 **********************
 
+since v0.31.1 | March 6, 2026
+=================================
+
+* Fix CLI command ``flexmeasures add forecasts`` in exchange for less detailed type annotations on various CLI options (visible when using the ``--help`` flag).
+
 since v0.31.0 | February 28, 2026
 =================================
 

flexmeasures/cli/data_add.py

@@ -1141,7 +1141,9 @@ def add_forecast(  # noqa: C901
     )
 
     try:
-        pipeline_returns = forecaster.compute(as_job=as_job, **parameters)
+        # Drop None values
+        parameters = {k: v for k, v in parameters.items() if v is not None}
+        pipeline_returns = forecaster.compute(as_job=as_job, parameters=parameters)
 
         # Empty result
         if not pipeline_returns:

flexmeasures/cli/tests/test_data_add_fresh_db.py

@@ -17,6 +17,17 @@
 from flexmeasures.tests.utils import get_test_sensor
 
 
+def test_add_forecast(app, setup_dummy_data):
+    from flexmeasures.cli.data_add import add_forecast
+
+    cli_input = {
+        "sensor": 1,
+    }
+    runner = app.test_cli_runner()
+    result = runner.invoke(add_forecast, to_flags(cli_input))
+    assert result.exit_code == 0, result.output
+
+
 def test_add_reporter(app, fresh_db, setup_dummy_data, caplog):
     """
     The reporter aggregates input data from two sensors (both have 200 data points)

flexmeasures/cli/utils.py

@@ -466,18 +466,18 @@ def decorator(command):
             kwargs = {
                 "help": help_text,
                 "required": field.required,
-                "default": field.load_default,
+                # "default": field.load_default,
             }
 
             if cli.get("is_flag"):
                 kwargs["is_flag"] = True
 
             # Transfer the original field type
             if isinstance(field, MarshmallowClickMixin):
-                kwargs["type"] = field
+                kwargs["type"] = str
             elif isinstance(field, fields.List):
                 kwargs["multiple"] = True
-                kwargs["type"] = field.inner
+                kwargs["type"] = str
 
             command = click.option(*options, **kwargs)(command)