Merge branch 'main' into rework-math

CHANGELOG.md

@@ -4,6 +4,8 @@
 
 |new| Math has been removed from `model.math`, and can now be accessed via `model.math.data` (#639).
 
+|new| (non-NaN) Default values and data types for parameters appear in math documentation (if they appear in the model definition schema) (#677).
+
 |changed| `data_sources` -> `data_tables` and `data_sources.source` -> `data_tables.data`.
 This change has occurred to avoid confusion between data "sources" and model energy "sources" (#673).
 

src/calliope/backend/backend_model.py

@@ -58,6 +58,7 @@ class BackendModelGenerator(ABC):
         "description",
         "unit",
         "default",
+        "type",
         "title",
         "math_repr",
         "original_dtype",
@@ -66,6 +67,7 @@ class BackendModelGenerator(ABC):
     _PARAM_TITLES = extract_from_schema(MODEL_SCHEMA, "title")
     _PARAM_DESCRIPTIONS = extract_from_schema(MODEL_SCHEMA, "description")
     _PARAM_UNITS = extract_from_schema(MODEL_SCHEMA, "x-unit")
+    _PARAM_TYPE = extract_from_schema(MODEL_SCHEMA, "x-type")
 
     def __init__(self, inputs: xr.Dataset, math: CalliopeMath, **kwargs):
         """Abstract base class to build a representation of the optimisation problem.

src/calliope/backend/latex_backend_model.py

@@ -9,6 +9,7 @@
 
 import jinja2
 import numpy as np
+import pandas as pd
 import xarray as xr
 
 from calliope.backend import backend_model, parsing
@@ -114,6 +115,10 @@ class LatexBackendModel(backend_model.BackendModelGenerator):
 
     **Default**: {{ equation.default }}
     {% endif %}
+    {% if equation.type is not none %}
+
+    **Type**: {{ equation.type }}
+    {% endif %}
     {% if equation.expression != "" %}
 
     .. container:: scrolling-wrapper
@@ -189,6 +194,10 @@ class LatexBackendModel(backend_model.BackendModelGenerator):
 
     \textbf{Default}: {{ equation.default }}
     {% endif %}
+    {% if equation.type is not none %}
+
+    \textbf{Type}: {{ equation.type }}
+    {% endif %}
     {% if equation.expression != "" %}
 
     \begin{equation}
@@ -261,6 +270,10 @@ class LatexBackendModel(backend_model.BackendModelGenerator):
 
     **Default**: {{ equation.default }}
     {% endif %}
+    {% if equation.type is not none %}
+
+    **Type**: {{ equation.type }}
+    {% endif %}
     {% if equation.expression != "" %}
     {% if mkdocs_features and yaml_snippet is not none%}
 
@@ -314,14 +327,17 @@ def add_parameter(  # noqa: D102, override
             "title": self._PARAM_TITLES.get(parameter_name, None),
             "description": self._PARAM_DESCRIPTIONS.get(parameter_name, None),
             "unit": self._PARAM_UNITS.get(parameter_name, None),
+            "type": self._PARAM_TYPE.get(parameter_name, None),
             "math_repr": rf"\textit{{{parameter_name}}}"
             + self._dims_to_var_string(parameter_values),
         }
+        if pd.notna(default):
+            attrs["default"] = default
 
         self._add_to_dataset(parameter_name, parameter_values, "parameters", attrs)
 
     def add_constraint(  # noqa: D102, override
-        self, name: str, constraint_dict: parsing.UnparsedConstraint | None = None
+        self, name: str, constraint_dict: parsing.UnparsedConstraint
     ) -> None:
         equation_strings: list = []
 
@@ -381,7 +397,7 @@ def _constraint_setter(where: xr.DataArray, references: set) -> xr.DataArray:
         )
 
     def add_global_expression(  # noqa: D102, override
-        self, name: str, expression_dict: parsing.UnparsedExpression | None = None
+        self, name: str, expression_dict: parsing.UnparsedExpression
     ) -> None:
         equation_strings: list = []
 
@@ -408,7 +424,7 @@ def _expression_setter(
         )
 
     def add_variable(  # noqa: D102, override
-        self, name: str, variable_dict: parsing.UnparsedVariable | None = None
+        self, name: str, variable_dict: parsing.UnparsedVariable
     ) -> None:
         domain_dict = {"real": r"\mathbb{R}\;", "integer": r"\mathbb{Z}\;"}
         bound_refs: set = set()
@@ -435,7 +451,7 @@ def _variable_setter(where: xr.DataArray, references: set) -> xr.DataArray:
         )
 
     def add_objective(  # noqa: D102, override
-        self, name: str, objective_dict: parsing.UnparsedObjective | None = None
+        self, name: str, objective_dict: parsing.UnparsedObjective
     ) -> None:
         sense_dict = {
             "minimize": r"\min{}",
@@ -513,6 +529,7 @@ def generate_math_doc(
                     ),
                     "uses": sorted(list(uses[name] - set([name]))),
                     "default": da.attrs.get("default", None),
+                    "type": da.attrs.get("type", None),
                     "unit": da.attrs.get("unit", None),
                     "yaml_snippet": da.attrs.get("yaml_snippet", None),
                 }

tests/conftest.py

@@ -300,9 +300,13 @@ def dummy_model_data(config_defaults, model_defaults):
             "all_nan": np.nan,
             "with_inf": 100,
             "only_techs": 5,
+            "no_dims": 0,
             **model_defaults,
         }
     )
+    # This value is set on the parameter directly to ensure it finds its way through to the LaTex math.
+    model_data.no_dims.attrs["default"] = 0
+
     return model_data
 
 

tests/test_backend_latex_backend.py

@@ -324,6 +324,8 @@ def test_create_obj_list(self, dummy_latex_backend_model):
                     \begin{itemize}
                         \item expr
                     \end{itemize}
+
+                    \textbf{Default}: 0
                     \end{document}"""
                 ),
             ),
@@ -362,6 +364,8 @@ def test_create_obj_list(self, dummy_latex_backend_model):
                     **Used in**:
 
                     * expr
+
+                    **Default**: 0
                     """
                 ),
             ),
@@ -395,6 +399,8 @@ def test_create_obj_list(self, dummy_latex_backend_model):
                     **Used in**:
 
                     * [expr](#expr)
+
+                    **Default**: 0
                     """
                 ),
             ),
@@ -546,6 +552,8 @@ def test_generate_math_doc_mkdocs_features_admonition(
                     ??? info "Used in"
 
                         * [expr](#expr)
+
+                    **Default**: 0
                     """
         )
 
@@ -670,3 +678,56 @@ def test_get_variable_bounds_string(self, dummy_latex_backend_model):
             "expression": r"\textbf{multi_dim_var}_\text{node,tech} \leq 2\mathord{\times}10^{+06}"
         }
         assert refs == {"multi_dim_var"}
+
+    def test_param_type(self, dummy_model_data, dummy_model_math):
+        backend_model = latex_backend_model.LatexBackendModel(
+            dummy_model_data, dummy_model_math
+        )
+        backend_model._add_all_inputs_as_parameters()
+        backend_model.add_global_expression(
+            "expr",
+            {
+                "equations": [{"expression": "1 + flow_cap_max"}],
+                "description": "foobar",
+                "default": 0,
+            },
+        )
+        doc = backend_model.generate_math_doc(format="md")
+        assert doc == textwrap.dedent(
+            r"""
+
+            ## Where
+
+            ### expr
+
+            foobar
+
+            **Uses**:
+
+            * [flow_cap_max](#flow_cap_max)
+
+            **Default**: 0
+
+            $$
+            \begin{array}{l}
+                \quad 1 + \textit{flow\_cap\_max}\\
+            \end{array}
+            $$
+
+            ## Parameters
+
+            ### flow_cap_max
+
+            Limits `flow_cap` to a maximum.
+
+            **Used in**:
+
+            * [expr](#expr)
+
+            **Unit**: power.
+
+            **Default**: inf
+
+            **Type**: float
+            """
+        )