Reorganization and cleanup of CHILLED code

message_ix_buildings/chilled/core/climate.py

@@ -44,13 +44,13 @@
 from message_ix_buildings.chilled.preprocess.message_raster import (
     create_message_raster,  # type: ignore
 )
-from message_ix_buildings.chilled.util.config import Config  # type: ignore
-from message_ix_buildings.chilled.util.util import (
+from message_ix_buildings.chilled.util.base import (
     get_archs,
-    get_logger,
     load_all_scenarios_data,
     load_parametric_analysis_data,
 )
+from message_ix_buildings.chilled.util.common import get_logger
+from message_ix_buildings.chilled.util.config import Config  # type: ignore
 
 log = get_logger(__name__)
 

message_ix_buildings/chilled/functions/regression.py

@@ -4,7 +4,7 @@
 import pyam  # type: ignore
 import statsmodels.formula.api as smf  # type: ignore
 
-from message_ix_buildings.chilled.util.util import get_logger
+from message_ix_buildings.chilled.util.common import get_logger
 
 log = get_logger(__name__)
 

message_ix_buildings/chilled/postprocess/postprocess.py

@@ -2,8 +2,8 @@
 
 import pandas as pd
 
+from message_ix_buildings.chilled.util.common import get_logger
 from message_ix_buildings.chilled.util.config import Config
-from message_ix_buildings.chilled.util.util import get_logger
 
 log = get_logger(__name__)
 cfg = Config()

message_ix_buildings/chilled/preprocess/archetypes.py

@@ -11,13 +11,13 @@
 from functions.variable_dicts import VARS_ARCHETYPES  # type: ignore
 from preprocess.message_raster import create_message_raster  # type: ignore
 
-from message_ix_buildings.chilled.util.config import Config  # type: ignore
-from message_ix_buildings.chilled.util.util import (
+from message_ix_buildings.chilled.util.base import (
     get_archs,
-    get_logger,
     read_arch_inputs_df,
     read_arch_reg_df,
 )
+from message_ix_buildings.chilled.util.common import get_logger
+from message_ix_buildings.chilled.util.config import Config  # type: ignore
 
 log = get_logger(__name__)
 
@@ -157,3 +157,5 @@ def map_archetype_variables(args):
     func_inputs = product([config.arch_setting], vers_archs, VARS_ARCHETYPES)
 
     list(map(map_archetype_variables, func_inputs))
+
+    log.info("Completed building input maps.")

message_ix_buildings/chilled/run_agg.py

@@ -10,8 +10,8 @@
     process_floor_area_maps,
     process_iso_tables,
 )
+from message_ix_buildings.chilled.util.common import get_logger
 from message_ix_buildings.chilled.util.config import Config  # type: ignore
-from message_ix_buildings.chilled.util.util import get_logger
 
 log = get_logger(__name__)
 

message_ix_buildings/chilled/run_main.py

@@ -14,8 +14,8 @@
     process_floor_area_maps,
     process_iso_tables,
 )
+from message_ix_buildings.chilled.util.common import get_logger
 from message_ix_buildings.chilled.util.config import Config  # type: ignore
-from message_ix_buildings.chilled.util.util import get_logger
 
 log = get_logger(__name__)
 

message_ix_buildings/chilled/run_preprocess.py

@@ -5,8 +5,8 @@
     create_archetype_variables,
     create_archetypes,
 )
+from message_ix_buildings.chilled.util.common import get_logger
 from message_ix_buildings.chilled.util.config import Config
-from message_ix_buildings.chilled.util.util import get_logger
 
 log = get_logger(__name__)
 

message_ix_buildings/chilled/util/util.py → message_ix_buildings/chilled/util/base.py

@@ -1,32 +1,10 @@
-import logging
 import os
-from pathlib import Path
 
 import pandas as pd
+from util.common import get_project_root  # type: ignore
 from util.config import Config  # type: ignore
 
 
-def get_project_root() -> Path:
-    return Path(__file__).parent.parent.parent
-
-
-def get_logger(name: str):
-    log = logging.getLogger(name)
-    log.setLevel(logging.INFO)
-
-    # configure the handler and formatter as needed
-    handler = logging.FileHandler(f"{name}.log", mode="w")
-    formatter = logging.Formatter("%(name)s %(asctime)s %(levelname)s %(message)s")
-
-    # add formatter to the handler
-    handler.setFormatter(formatter)
-
-    # add handler to the logger
-    log.addHandler(handler)
-
-    return log
-
-
 def get_archs(config: "Config"):
     root_path = get_project_root()
     version_path = os.path.join(root_path, "data", "chilled", "version", config.vstr)

message_ix_buildings/chilled/util/common.py

@@ -0,0 +1,24 @@
+import logging
+import sys
+from pathlib import Path
+
+
+def get_project_root() -> Path:
+    return Path(__file__).parent.parent.parent
+
+
+def get_logger(name: str):
+    log = logging.getLogger(name)
+    log.setLevel(logging.INFO)
+
+    # configure the handler and formatter as needed
+    handler = logging.StreamHandler(sys.stdout)
+    formatter = logging.Formatter("%(name)s %(asctime)s %(levelname)s %(message)s")
+
+    # add formatter to the handler
+    handler.setFormatter(formatter)
+
+    # add handler to the logger
+    log.addHandler(handler)
+
+    return log