domainiac 4.0.0__tar.gz → 6.0.0__tar.gz

{domainiac-4.0.0 → domainiac-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: domainiac
-Version: 4.0.0
+Version: 6.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-4.0.0 → domainiac-6.0.0}/domainiac/managers/metering_manager.py

@@ -33,7 +33,7 @@ class MeteringManager:
             [
                 "time_utc",
                 "datahub_gsrn_e18",
-                "reading_settlement_production_e18_MW",
+                "reading_settlement_e18_MW",
             ]
         )
 

{domainiac-4.0.0 → domainiac-6.0.0}/domainiac/managers/nwp_manager.py

@@ -182,10 +182,13 @@ class NWPManager:
         df = df.drop(
             columns=[
                 "created_time_utc",
+                "valid_from_time_utc",
+                "valid_to_time_utc",
                 "altitude_m",
                 "longitude",
                 "latitude",
-            ]
+            ],
+            errors="ignore",
         )
 
         return df

{domainiac-4.0.0 → domainiac-6.0.0}/domainiac/managers/plant_manager.py

@@ -41,14 +41,14 @@ class PlantManager(MasterdataManager):
             "is_tso_connected",
             "valid_from_date_utc",
             "valid_to_date_utc",
-            "net_component_id",
+            "primary_net_component_id",
         ]
         if not columns:
             columns = default_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"]
+        plant_columns = [col for col in columns if col != "primary_net_component_id"]
         df_plant = self.get_data(
             "masterdataPlant", filters=filters, columns=plant_columns
         )
@@ -119,14 +119,14 @@ class PlantManager(MasterdataManager):
 
     def _get_power_system_resource(self) -> pd.DataFrame:
 
-        df_unit = self.unit_manager.get_units(columns=["masterdata_gsrn"])
+        df_unit = self.unit_manager.get_units(
+            columns=["masterdata_gsrn", "capacity_min_MW", "capacity_max_MW"]
+        )
 
         df_psr_mapping = self.db.query("masterdataAggregatedUnit")[
             ["unit_gsrn", "net_component_id"]
         ]
 
-        df_unit = df_unit[["masterdata_gsrn", "plant_id"]]
-
         df = pd.merge(
             df_psr_mapping,
             df_unit,
@@ -134,6 +134,27 @@ class PlantManager(MasterdataManager):
             right_on="masterdata_gsrn",
             how="left",
             validate="1:m",
-        )[["net_component_id", "plant_id"]]
+        )
+
+        # for a small number of plants, the underlying unit can
+        # be associated with different net components. Too avoid
+        # this issue, we choose for each plant, the net component,
+        # for which the underlying units amounts to the largest
+        # capacity
+        df = pdz.group(df, by=["net_component_id", "plant_id"]).agg(
+            {"capacity_min_MW": "sum", "capacity_max_MW": "sum"}
+        )
+
+        df["capacity_range_MW"] = df["capacity_max_MW"] - df["capacity_min_MW"]
+
+        df = df.sort_values(
+            ["plant_id", "capacity_range_MW"], ascending=False
+        ).drop_duplicates(subset=["plant_id"], keep="first")
+
+        df = df.rename(
+            columns={
+                "net_component_id": "primary_net_component_id",
+            }
+        )
 
         return df

{domainiac-4.0.0 → domainiac-6.0.0}/pyproject.toml

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