Check for unexpected correlation_kwargs in CLI

Author: harveydevereux

janus_core/cli/utils.py

@@ -343,6 +343,22 @@ def parse_correlation_kwargs(kwargs: CorrelationKwargs) -> list[dict]:
     """
     parsed_kwargs = []
     for name, cli_kwargs in kwargs.value.items():
+        arguments = {
+            "blocks",
+            "points",
+            "averaging",
+            "update_frequency",
+            "a_kwargs",
+            "b_kwargs",
+            "a",
+            "b",
+        }
+        if not (set(cli_kwargs.keys()) <= arguments):
+            raise ValueError(
+                "correlation_kwargs got unexpected argument(s)"
+                f"{set(cli_kwargs.keys()).difference(arguments)}"
+            )
+
         if "a" not in cli_kwargs and "b" not in cli_kwargs:
             raise ValueError("At least one observable must be supplied as 'a' or 'b'")
 

tests/test_utils.py

@@ -266,12 +266,16 @@ def test_invalid_slicelikes(slc):
 @pytest.mark.parametrize(
     "kwargs, message",
     [
-        ({"vaf": {"a": "Velocity"}}, "Correlation keyword argument points"),
+        ({"vaf": {"a": "Velocity"}}, "Correlation keyword argument 'points'"),
         ({"vaf": {"points": 10}}, "At least one observable"),
         (
             {"vaf": {"points": 10, "a": "Velocity", "a_kwargs": ".", "b_kwargs": "."}},
             "cannot 'ditto' each other",
         ),
+        (
+            {"vaf": {"points": 10, "a": "Velocity", "a_kwarg": {}}},
+            "correlation_kwargs got unexpected argument",
+        ),
     ],
 )
 def test_parse_correlation_kwargs_errors(kwargs, message):