domainiac 2.0.0__tar.gz → 3.0.0__tar.gz

{domainiac-2.0.0 → domainiac-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: domainiac
-Version: 2.0.0
+Version: 3.0.0
 Summary: Package for working with Energinet data, but with specialized functions used for Enigma.
 Author: Team Enigma
 Author-email: gridop-enigma@energinet.dk

{domainiac-2.0.0 → domainiac-3.0.0}/domainiac/managers/plant_manager.py

@@ -2,6 +2,7 @@ import datamazing.pandas as pdz
 import pandas as pd
 
 from .masterdata_manager import MasterdataManager
+from .unit_manager import UnitManager
 
 
 class PlantManager(MasterdataManager):
@@ -20,6 +21,7 @@ class PlantManager(MasterdataManager):
         self.time_interval = time_interval
         self.resolution = resolution
         self.cache_masterdata = cache_masterdata
+        self.unit_manager = UnitManager(db, time_interval, resolution, cache_masterdata)
 
     def get_plants(
         self,
@@ -39,12 +41,25 @@ class PlantManager(MasterdataManager):
             "is_tso_connected",
             "valid_from_date_utc",
             "valid_to_date_utc",
+            "net_component_id",
         ]
         if not columns:
             columns = default_columns
-        else:
-            columns = list(set(default_columns + columns))
-        return self.get_data("masterdataPlant", filters=filters, columns=columns)
+
+        # TODO: masterdata_plant table doesn't have net_component_id column
+        # Find a better way to do this in future.
+        plant_columns = [col for col in columns if col != "net_component_id"]
+        df_plant = self.get_data(
+            "masterdataPlant", filters=filters, columns=plant_columns
+        )
+        df_psrt = self._get_power_system_resource_type()
+        df = df_psrt.merge(
+            df_plant, on=["plant_id"], how="inner", validate="m:1"
+        ).drop_duplicates()
+
+        df = df[columns]
+
+        return df
 
     def get_installed_power_timeseries(self, gsrn: str) -> pd.DataFrame:
         """Gets the installed power timeseries for a plant."""
@@ -101,3 +116,24 @@ class PlantManager(MasterdataManager):
         df = df[["time_utc", "installed_power_MW"]]
 
         return df
+
+    def _get_power_system_resource_type(self) -> pd.DataFrame:
+
+        df_unit = self.unit_manager.get_units(columns=["masterdata_gsrn"])
+
+        df_power_system_resource_map = self.db.query("masterdataAggregatedUnit")[
+            ["unit_gsrn", "net_component_id"]
+        ]
+
+        df_unit = df_unit[["masterdata_gsrn", "plant_id"]]
+
+        df = pd.merge(
+            df_power_system_resource_map,
+            df_unit,
+            left_on="unit_gsrn",
+            right_on="masterdata_gsrn",
+            how="inner",
+            validate="1:m",
+        )[["net_component_id", "plant_id"]]
+
+        return df

{domainiac-2.0.0 → domainiac-3.0.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "domainiac"
-version = "2.0.0"
+version = "3.0.0"
 description = "Package for working with Energinet data, but with specialized functions used for Enigma."
 authors = ["Team Enigma <gridop-enigma@energinet.dk>"]
 packages = [