Remove .report.util.as_quantity()

- Adjust imports per genno 1.25.0.
- Provide old implementation via .util.genno for genno < 1.25 (with
  message_ix/ixmp 3.7.0).

Author: khaeru

doc/api/report/index.rst

@@ -172,7 +172,6 @@ Utilities
    .. autosummary::
 
       add_replacements
-      as_quantity
       collapse
       collapse_gwp_info
       copy_ts

message_ix_models/model/transport/config.py

@@ -9,9 +9,9 @@
 from message_ix_models.project.navigate import T35_POLICY as NAVIGATE_SCENARIO
 from message_ix_models.project.ssp import SSP_2024, ssp_field
 from message_ix_models.project.transport_futures import SCENARIO as FUTURES_SCENARIO
-from message_ix_models.report.util import as_quantity
 from message_ix_models.util import identify_nodes, package_data_path
 from message_ix_models.util.config import ConfigHelper
+from message_ix_models.util.genno import as_quantity
 from message_ix_models.util.sdmx import AnnotationsMixIn
 
 if TYPE_CHECKING:

message_ix_models/model/transport/operator.py

@@ -22,14 +22,14 @@
 from message_ix_models.model.structure import get_codelist
 from message_ix_models.project.navigate import T35_POLICY
 from message_ix_models.report.operator import compound_growth
-from message_ix_models.report.util import as_quantity
 from message_ix_models.util import (
     MappingAdapter,
     datetime_now_with_tz,
     minimum_version,
     nodes_ex_world,
     show_versions,
 )
+from message_ix_models.util.genno import as_quantity
 
 from .config import Config
 

message_ix_models/report/util.py

@@ -1,13 +1,12 @@
 import logging
 from collections.abc import Iterable
-from typing import Optional, Union
+from typing import Optional
 
 import pandas as pd
 from dask.core import quote
-from genno import Key, Quantity
+from genno import Key
 from genno.compat.pyam.util import collapse as genno_collapse
 from genno.core.key import single_key
-from iam_units import registry
 from message_ix import Reporter
 from sdmx.model.v21 import Code
 
@@ -70,25 +69,6 @@
 }
 
 
-def as_quantity(info: Union[dict, float, str]) -> Quantity:
-    """Convert values from a :class:`dict` to Quantity.
-
-    .. todo:: move upstream, to :mod:`genno`.
-    """
-    if isinstance(info, str):
-        q = registry.Quantity(info)
-        return Quantity(q.magnitude, units=q.units)
-    elif isinstance(info, float):
-        return Quantity(info)
-    elif isinstance(info, dict):
-        data = info.copy()
-        dim = data.pop("_dim")
-        unit = data.pop("_unit")
-        return Quantity(pd.Series(data).rename_axis(dim), units=unit)
-    else:
-        raise TypeError(type(info))
-
-
 def collapse(df: pd.DataFrame, var=[]) -> pd.DataFrame:
     """Callback for the `collapse` argument to :meth:`~.Reporter.convert_pyam`.
 

message_ix_models/tests/model/transport/test_util.py

@@ -6,7 +6,7 @@
 from iam_units import registry
 
 from message_ix_models.model.transport.config import Config, DataSourceConfig
-from message_ix_models.report.util import as_quantity
+from message_ix_models.util.genno import as_quantity
 
 
 @pytest.mark.xfail(reason="Refactoring")

message_ix_models/util/genno.py

@@ -2,3 +2,37 @@
 
 Most code appearing here **should** be migrated upstream, to genno itself.
 """
+
+from typing import TYPE_CHECKING, Union
+
+if TYPE_CHECKING:
+    from genno.types import AnyQuantity
+
+try:
+    from genno.operator import as_quantity
+except ImportError:
+    # genno < 1.25, e.g. with message_ix/ixmp 3.7.0
+    # TODO Remove when support for these upstream versions is dropped
+
+    def as_quantity(info: Union[dict, float, str]) -> "AnyQuantity":
+        import genno
+        import pandas as pd
+        from iam_units import registry
+
+        if isinstance(info, str):
+            q = registry.Quantity(info)
+            return genno.Quantity(q.magnitude, units=q.units)
+        elif isinstance(info, float):
+            return genno.Quantity(info)
+        elif isinstance(info, dict):
+            data = info.copy()
+            dim = data.pop("_dim")
+            unit = data.pop("_unit")
+            return genno.Quantity(pd.Series(data).rename_axis(dim), units=unit)
+        else:
+            raise TypeError(type(info))
+
+
+__all__ = [
+    "as_quantity",
+]