Add .util._message_ix.MESSAGE

Import in modules to avoid warnings.

Author: khaeru

message_ix_models/report/sim.py

@@ -104,7 +104,8 @@ def dims_of(info: "Item") -> dict[str, str]:
 @lru_cache(1)
 def to_simulate():
     """Return items to be included in a simulated solution."""
-    from message_ix.models import MACRO, MESSAGE
+
+    from message_ix_models.util._message_ix import MACRO, MESSAGE
 
     # Items to included in a simulated solution: MESSAGE sets and parameters; some
     # variables

message_ix_models/tools/add_dac/__init__.py

@@ -9,7 +9,8 @@
 import numpy as np
 import pandas as pd
 from message_ix import make_df
-from message_ix.models import MESSAGE
+
+from message_ix_models.util._message_ix import MESSAGE
 
 
 def generate_df(scenario, tech_data):  # noqa: C901

message_ix_models/util/_message_ix.py

@@ -1,6 +1,10 @@
 try:
     from message_ix.macro import MACRO
+    from message_ix.message import MESSAGE
 except ImportError:
-    from message_ix.models import MACRO  # type: ignore [no-redef]
+    from message_ix.models import MACRO, MESSAGE  # type: ignore [no-redef]
 
-__all__ = ["MACRO"]
+__all__ = [
+    "MACRO",
+    "MESSAGE",
+]