domainiac 0.1.4__tar.gz → 0.1.6__tar.gz

{domainiac-0.1.4 → domainiac-0.1.6}/PKG-INFO

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

{domainiac-0.1.4 → domainiac-0.1.6}/domainiac/managers/resource_manager.py

@@ -2,6 +2,8 @@ import datamazing.pandas as pdz
 import pandas as pd
 from typeguard import typechecked
 
+DEFAULT_RESOLUTION = pd.Timedelta("PT5M")
+
 
 class ResourceManager:
     """
@@ -19,57 +21,61 @@ class ResourceManager:
         self,
         db: pdz.Database,
         time_interval: pdz.TimeInterval,
-        resolution: pd.Timedelta = pd.Timedelta("PT5M"),
+        resolution: pd.Timedelta = DEFAULT_RESOLUTION,
     ) -> None:
         self.db = db
         self.time_interval = time_interval
         self.resolution = resolution
 
     @typechecked
-    def get_resource_schedules(self, resource_gsrns: list) -> pd.DataFrame:
+    def get_resource_schedules(self, resource_gsrn: str | list[str]) -> pd.DataFrame:
         """Gets resource schedules for a given list of resource gsrns."""
         df_resource_schedules = self.db.query(
             table_name="scheduleResourcePowerPlan",
             time_interval=self.time_interval,
-            filters={"resource_gsrn": resource_gsrns},
+            filters={"resource_gsrn": resource_gsrn},
         )
 
-        df_resource_resampled = (
-            pdz.group(
-                df_resource_schedules,
-                by=[
-                    "market_participant",
-                    "created_time_utc",
-                    "price_area",
-                    "resource_gsrn",
-                ],
-            )
-            .resample(on="time_utc", resolution=self.resolution)
-            .agg(
-                {
-                    "schedule_power_MW": "mean",
-                    "schedule_capacity_min_MW": "max",
-                    "schedule_capacity_max_MW": "min",
-                }
+        if df_resource_schedules.empty:
+            raise ValueError(f"No resource schedules found for gsrn {resource_gsrn}.")
+
+        if self.resolution != DEFAULT_RESOLUTION:
+            df_resource_schedules = (
+                pdz.group(
+                    df_resource_schedules,
+                    by=[
+                        "market_participant",
+                        "created_time_utc",
+                        "price_area",
+                        "resource_gsrn",
+                    ],
+                )
+                .resample(on="time_utc", resolution=self.resolution)
+                .agg(
+                    {
+                        "schedule_power_MW": "mean",
+                        "schedule_capacity_min_MW": "max",
+                        "schedule_capacity_max_MW": "min",
+                    }
+                )
+                .dropna()
             )
-            .dropna()
+        return df_resource_schedules.drop(
+            columns=["masterdata_gsrn", "datahub_gsrn_e18"], errors="ignore"
         )
-        return df_resource_resampled
 
     @typechecked
-    def get_latest_resource_plan(
+    def get_latest_resource_schedules(
         self,
-        resource_gsrns: list,
+        resource_gsrn: str | list[str],
     ) -> pd.DataFrame:
         """Gets the lastest resource schedules for a given list of resource gsrns."""
 
-        df_resource_schedules = self.get_resource_schedules(
-            resource_gsrns=resource_gsrns
-        )
+        df_resource_schedules = self.get_resource_schedules(resource_gsrn=resource_gsrn)
 
         df_latest_created_time = pdz.group(
             df=df_resource_schedules, by=["resource_gsrn", "time_utc"]
-        ).agg({"created_time_utc": max})
+        ).agg({"created_time_utc": "max"})
 
         df_resource_latest = df_latest_created_time.merge(
             df_resource_schedules, on=list(df_latest_created_time.columns)

{domainiac-0.1.4 → domainiac-0.1.6}/pyproject.toml

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