From 028090929ea418f85b2c4cf476ffd07368aefffd Mon Sep 17 00:00:00 2001
From: Paul Natsuo Kishimoto <mail@paul.kishimoto.name>
Date: Thu, 5 Sep 2024 18:33:11 +0200
Subject: [PATCH] Move quantity_from_iamc to .report.operator

---
 message_ix_models/model/transport/report.py | 31 +--------------------
 message_ix_models/report/operator.py        | 28 +++++++++++++++++++
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/message_ix_models/model/transport/report.py b/message_ix_models/model/transport/report.py
index bc9fd6df57..12c2a9edb5 100644
--- a/message_ix_models/model/transport/report.py
+++ b/message_ix_models/model/transport/report.py
@@ -19,7 +19,6 @@
 if TYPE_CHECKING:
     import ixmp
     from genno import Computer
-    from genno.types import AnyQuantity
 
     from message_ix_models import Spec
 
@@ -519,6 +518,7 @@ def multi(context: Context, targets):
     """Report outputs from multiple scenarios."""
     import plotnine as p9
 
+    from message_ix_models.report.operator import quantity_from_iamc
     from message_ix_models.tools.iamc import _drop_unique
 
     report_dir = context.get_local_path("report")
@@ -573,32 +573,3 @@ def multi(context: Context, targets):
     plot.save("debug.pdf")
 
     return data
-
-
-def quantity_from_iamc(qty: "AnyQuantity", variable: str) -> "AnyQuantity":
-    """Extract data for a single measure from `qty` with (at least) dimensions v, u.
-
-    .. todo:: Move upstream, to either :mod:`ixmp` or :mod:`genno`.
-
-    Parameters
-    ----------
-    variable : str
-        Regular expression to match the ``v`` dimension of `qty`.
-    """
-    import re
-
-    from genno.operator import relabel, select
-
-    expr = re.compile(variable)
-    variables, replacements = [], {}
-    for var in qty.coords["v"].data:
-        if match := expr.fullmatch(var):
-            variables.append(match.group(0))
-            replacements[match.group(0)] = match.group(1)
-
-    subset = qty.pipe(select, {"v": variables}).pipe(relabel, {"v": replacements})
-
-    unique_units = subset.coords["Unit"].data
-    assert 1 == len(unique_units)
-    subset.units = unique_units[0]
-    return subset.sel(Unit=unique_units[0], drop=True)
diff --git a/message_ix_models/report/operator.py b/message_ix_models/report/operator.py
index bc2a0b416f..db941b4c9e 100644
--- a/message_ix_models/report/operator.py
+++ b/message_ix_models/report/operator.py
@@ -20,6 +20,7 @@
     from pathlib import Path
 
     from genno import Computer, Key
+    from genno.types import AnyQuantity
     from sdmx.model.v21 import Code
 
 log = logging.getLogger(__name__)
@@ -233,6 +234,33 @@ def from_url(url: str, cls=ixmp.TimeSeries) -> ixmp.TimeSeries:
     return ts
 
 
+def quantity_from_iamc(qty: "AnyQuantity", variable: str) -> "AnyQuantity":
+    """Extract data for a single measure from `qty` with (at least) dimensions v, u.
+
+    .. todo:: Move upstream, to either :mod:`ixmp` or :mod:`genno`.
+
+    Parameters
+    ----------
+    variable : str
+        Regular expression to match the ``v`` dimension of `qty`.
+    """
+    from genno.operator import relabel, select
+
+    expr = re.compile(variable)
+    variables, replacements = [], {}
+    for var in qty.coords["v"].data:
+        if match := expr.fullmatch(var):
+            variables.append(match.group(0))
+            replacements[match.group(0)] = match.group(1)
+
+    subset = qty.pipe(select, {"v": variables}).pipe(relabel, {"v": replacements})
+
+    unique_units = subset.coords["Unit"].data
+    assert 1 == len(unique_units)
+    subset.units = unique_units[0]
+    return subset.sel(Unit=unique_units[0], drop=True)
+
+
 # commented: currently unused
 # def share_cogeneration(fraction, *parts):
 #     """Deducts a *fraction* from the first of *parts*."""