Merge pull request #182 from openego/features/status2023_electrical_n…

…eighbours

Add status2023 electrical neighbours

src/egon/data/datasets/__init__.py

@@ -4,7 +4,7 @@
 
 from collections import abc
 from dataclasses import dataclass
-from functools import reduce
+from functools import partial, reduce, update_wrapper
 from typing import Callable, Iterable, Set, Tuple, Union
 import re
 
@@ -19,6 +19,18 @@
 SCHEMA = "metadata"
 
 
+def wrapped_partial(func, *args, **kwargs):
+    """Like :func:`functools.partial`, but preserves the original function's
+    name and docstring. Also allows to add a postfix to the function's name.
+    """
+    postfix = kwargs.pop("postfix", None)
+    partial_func = partial(func, *args, **kwargs)
+    update_wrapper(partial_func, func)
+    if postfix:
+        partial_func.__name__ = f"{func.__name__}{postfix}"
+    return partial_func
+
+
 def setup():
     """Create the database structure for storing dataset information."""
     # TODO: Move this into a task generating the initial database structure.

src/egon/data/datasets/electrical_neighbours.py

@@ -1,25 +1,24 @@
 """The central module containing all code dealing with electrical neighbours
 """
 
+from os import path
+import logging
 import zipfile
 
+from shapely.geometry import LineString
+from sqlalchemy.orm import sessionmaker
 import entsoe
-import requests
-import logging
-
 import geopandas as gpd
 import pandas as pd
-from shapely.geometry import LineString
-from sqlalchemy.orm import sessionmaker
+import requests
 
-import egon.data.datasets.etrago_setup as etrago
-import egon.data.datasets.scenario_parameters.parameters as scenario_parameters
 from egon.data import config, db
-from egon.data.datasets import Dataset
-from egon.data.datasets.fix_ehv_subnetworks import select_bus_id
+from egon.data.datasets import Dataset, wrapped_partial
 from egon.data.datasets.fill_etrago_gen import add_marginal_costs
+from egon.data.datasets.fix_ehv_subnetworks import select_bus_id
 from egon.data.datasets.scenario_parameters import get_sector_parameters
-from os import path
+import egon.data.datasets.etrago_setup as etrago
+import egon.data.datasets.scenario_parameters.parameters as scenario_parameters
 
 
 def get_cross_border_buses(scenario, sources):
@@ -1492,8 +1491,16 @@ def insert_generators_sq(scn_name="status2019"):
     None.
 
     """
+
+    if scn_name == "status2019":
+        year_start_end = {"year_start": "20190101", "year_end": "20200101"}
+    elif scn_name == "status2023":
+        year_start_end = {"year_start": "20230101", "year_end": "20240101"}
+    else:
+        raise ValueError("No valid scenario name!")
+
     try:
-        gen_sq = entsoe_historic_generation_capacities()
+        gen_sq = entsoe_historic_generation_capacities(**year_start_end)
     except:
         logging.warning(
             """Generation data from entsoe could not be retrieved.
@@ -1650,8 +1657,16 @@ def insert_loads_sq(scn_name="status2019"):
     """
     sources = config.datasets()["electrical_neighbours"]["sources"]
     targets = config.datasets()["electrical_neighbours"]["targets"]
+
+    if scn_name == "status2019":
+        year_start_end = {"year_start": "20190101", "year_end": "20200101"}
+    elif scn_name == "status2023":
+        year_start_end = {"year_start": "20230101", "year_end": "20240101"}
+    else:
+        raise ValueError("No valid scenario name!")
+
     try:
-        load_sq = entsoe_historic_demand()
+        load_sq = entsoe_historic_demand(**year_start_end)
     except:
         logging.warning(
             """Demand data from entsoe could not be retrieved.
@@ -1733,7 +1748,27 @@ def insert_loads_sq(scn_name="status2019"):
     insert_per_scenario.update([tyndp_generation, tyndp_demand])
 
 if "status2019" in config.settings()["egon-data"]["--scenarios"]:
-    insert_per_scenario.update([insert_generators_sq, insert_loads_sq])
+    insert_per_scenario.update(
+        [
+            wrapped_partial(
+                insert_generators_sq, scn_name="status2019", postfix="_19"
+            ),
+            wrapped_partial(
+                insert_loads_sq, scn_name="status2019", postfix="_19"
+            ),
+        ]
+    )
+if "status2023" in config.settings()["egon-data"]["--scenarios"]:
+    insert_per_scenario.update(
+        [
+            wrapped_partial(
+                insert_generators_sq, scn_name="status2023", postfix="_23"
+            ),
+            wrapped_partial(
+                insert_loads_sq, scn_name="status2023", postfix="_23"
+            ),
+        ]
+    )
 
 tasks = tasks + (insert_per_scenario,)
 
@@ -1742,7 +1777,7 @@ class ElectricalNeighbours(Dataset):
     def __init__(self, dependencies):
         super().__init__(
             name="ElectricalNeighbours",
-            version="0.0.10",
+            version="0.0.11",
             dependencies=dependencies,
             tasks=tasks,
         )