openenergyid 0.1.17__py2.py3-none-any.whl → 0.1.19__py2.py3-none-any.whl

openenergyid/__init__.py

@@ -1,6 +1,6 @@
 """Open Energy ID Python SDK."""
 
-__version__ = "0.1.17"
+__version__ = "0.1.19"
 
 from .enums import Granularity
 from .models import TimeDataFrame, TimeSeries

openenergyid/dyntar/const.py

@@ -16,3 +16,7 @@ SPP_WEIGHTED_PRICE_EXPORTED = "spp_weighted_price_exported"
 HEATMAP_DELIVERED = "heatmap_delivered"
 HEATMAP_EXPORTED = "heatmap_exported"
 HEATMAP_TOTAL = "heatmap_total"
+
+HEATMAP_DELIVERED_DESCRIPTION = "heatmap_delivered_description"
+HEATMAP_EXPORTED_DESCRIPTION = "heatmap_exported_description"
+HEATMAP_TOTAL_DESCRIPTION = "heatmap_total_description"

openenergyid/dyntar/main.py

@@ -26,18 +26,18 @@ from .const import (
     HEATMAP_DELIVERED,
     HEATMAP_EXPORTED,
     HEATMAP_TOTAL,
+    HEATMAP_DELIVERED_DESCRIPTION,
+    HEATMAP_EXPORTED_DESCRIPTION,
+    HEATMAP_TOTAL_DESCRIPTION,
 )
 
 
-def weigh_by_monthly_profile(series: pd.Series, profile: pd.Series) -> pd.Series:
+def weigh_by_monthly_profile(df: pd.DataFrame, series_name, profile_name) -> pd.Series:
     """Weigh a time series by a monthly profile."""
-    df = pd.DataFrame({"series": series, "profile": profile})
-    results = []
-    for _, frame in df.groupby(pd.Grouper(freq="MS")):
-        frame = frame.copy()
-        frame["weighted"] = frame["series"].sum() * (frame["profile"] / frame["profile"].sum())
-        results.append(frame)
-    return pd.concat(results)["weighted"]
+    grouped = df.groupby(pd.Grouper(freq="MS"))
+    return grouped[series_name].transform("sum") * grouped[profile_name].transform(
+        lambda x: x / x.sum()
+    )
 
 
 def extend_dataframe_with_smr2(df: pd.DataFrame, inplace: bool = False) -> pd.DataFrame | None:
@@ -47,12 +47,8 @@ def extend_dataframe_with_smr2(df: pd.DataFrame, inplace: bool = False) -> pd.Da
     else:
         result_df = df
 
-    result_df[ELECTRICITY_DELIVERED_SMR2] = weigh_by_monthly_profile(
-        df[ELECTRICITY_DELIVERED], df[RLP]
-    )
-    result_df[ELECTRICITY_EXPORTED_SMR2] = weigh_by_monthly_profile(
-        df[ELECTRICITY_EXPORTED], df[SPP]
-    )
+    result_df[ELECTRICITY_DELIVERED_SMR2] = weigh_by_monthly_profile(df, ELECTRICITY_DELIVERED, RLP)
+    result_df[ELECTRICITY_EXPORTED_SMR2] = weigh_by_monthly_profile(df, ELECTRICITY_EXPORTED, SPP)
 
     result_df.rename(
         columns={
@@ -78,14 +74,14 @@ def extend_dataframe_with_costs(df: pd.DataFrame, inplace: bool = False) -> pd.D
         df[ELECTRICITY_DELIVERED_SMR2] * df[PRICE_ELECTRICITY_DELIVERED]
     )
     result_df[COST_ELECTRICITY_EXPORTED_SMR2] = (
-        df[ELECTRICITY_EXPORTED_SMR2] * df[PRICE_ELECTRICITY_EXPORTED]
+        df[ELECTRICITY_EXPORTED_SMR2] * df[PRICE_ELECTRICITY_EXPORTED] * -1
     )
 
     result_df[COST_ELECTRICITY_DELIVERED_SMR3] = (
         df[ELECTRICITY_DELIVERED_SMR3] * df[PRICE_ELECTRICITY_DELIVERED]
     )
     result_df[COST_ELECTRICITY_EXPORTED_SMR3] = (
-        df[ELECTRICITY_EXPORTED_SMR3] * df[PRICE_ELECTRICITY_EXPORTED]
+        df[ELECTRICITY_EXPORTED_SMR3] * df[PRICE_ELECTRICITY_EXPORTED] * -1
     )
 
     if not inplace:
@@ -147,8 +143,7 @@ def extend_dataframe_with_heatmap(df: pd.DataFrame, inplace: bool = False) -> pd
 
     # Invert scores so that positive values indicate a positive impact
     heatmap_score_delivered = -heatmap_score_delivered
-    heatmap_score_exported = -heatmap_score_exported
-    heatmap_score_combined = heatmap_score_delivered - heatmap_score_exported
+    heatmap_score_combined = heatmap_score_delivered + heatmap_score_exported
 
     df[HEATMAP_DELIVERED] = heatmap_score_delivered
     df[HEATMAP_EXPORTED] = heatmap_score_exported
@@ -159,6 +154,85 @@ def extend_dataframe_with_heatmap(df: pd.DataFrame, inplace: bool = False) -> pd
     return None
 
 
+def map_delivery_description(
+    price_delivered, price_rlp, electricity_delivered_smr3, electricity_delivered_smr2
+):
+    """Map the delivery description."""
+    if price_delivered > price_rlp and electricity_delivered_smr3 > electricity_delivered_smr2:
+        return 1
+    if price_delivered > price_rlp and electricity_delivered_smr3 < electricity_delivered_smr2:
+        return 2
+    if price_delivered < price_rlp and electricity_delivered_smr3 > electricity_delivered_smr2:
+        return 3
+    if price_delivered < price_rlp and electricity_delivered_smr3 < electricity_delivered_smr2:
+        return 4
+    return 0
+
+
+def map_export_description(
+    price_exported, price_spp, electricity_exported_smr3, electricity_exported_smr2
+):
+    """Map the export description."""
+    if price_exported > price_spp and electricity_exported_smr3 > electricity_exported_smr2:
+        return 5
+    if price_exported > price_spp and electricity_exported_smr3 < electricity_exported_smr2:
+        return 6
+    if price_exported < price_spp and electricity_exported_smr3 > electricity_exported_smr2:
+        return 7
+    if price_exported < price_spp and electricity_exported_smr3 < electricity_exported_smr2:
+        return 8
+    return 0
+
+
+def map_total_description(
+    abs_heatmap_delivered, abs_heatmap_exported, delivered_description, exported_description
+):
+    """Map the total description."""
+    if abs_heatmap_delivered > abs_heatmap_exported:
+        return delivered_description
+    return exported_description
+
+
+def extend_dataframe_with_heatmap_description(
+    df: pd.DataFrame, inplace: bool = False
+) -> pd.DataFrame | None:
+    """Extend a DataFrame with the heatmap description columns."""
+    if not inplace:
+        df = df.copy()
+
+    df[HEATMAP_DELIVERED_DESCRIPTION] = list(
+        map(
+            map_delivery_description,
+            df[PRICE_ELECTRICITY_DELIVERED],
+            df[RLP_WEIGHTED_PRICE_DELIVERED],
+            df[ELECTRICITY_DELIVERED_SMR3],
+            df[ELECTRICITY_DELIVERED_SMR2],
+        )
+    )
+    df[HEATMAP_EXPORTED_DESCRIPTION] = list(
+        map(
+            map_export_description,
+            df[PRICE_ELECTRICITY_EXPORTED],
+            df[SPP_WEIGHTED_PRICE_EXPORTED],
+            df[ELECTRICITY_EXPORTED_SMR3],
+            df[ELECTRICITY_EXPORTED_SMR2],
+        )
+    )
+
+    df[HEATMAP_TOTAL_DESCRIPTION] = list(
+        map(
+            map_total_description,
+            df[HEATMAP_DELIVERED].abs(),
+            df[HEATMAP_EXPORTED].abs(),
+            df[HEATMAP_DELIVERED_DESCRIPTION],
+            df[HEATMAP_EXPORTED_DESCRIPTION],
+        )
+    )
+
+    if not inplace:
+        return df
+
+
 def calculate_dyntar_columns(df: pd.DataFrame, inplace: bool = False) -> pd.DataFrame | None:
     """Calculate all columns required for the dynamic tariff analysis."""
     if not inplace:
@@ -168,6 +242,7 @@ def calculate_dyntar_columns(df: pd.DataFrame, inplace: bool = False) -> pd.Data
     extend_dataframe_with_costs(df, inplace=True)
     extend_dataframe_with_weighted_prices(df, inplace=True)
     extend_dataframe_with_heatmap(df, inplace=True)
+    extend_dataframe_with_heatmap_description(df, inplace=True)
 
     if not inplace:
         return df

openenergyid/dyntar/models.py

@@ -1,7 +1,7 @@
 """Models for dynamic tariff analysis."""
 
 from typing import Literal
-from pydantic import Field, conlist
+from pydantic import Field, conlist, confloat
 
 from openenergyid.models import TimeDataFrame
 
@@ -33,6 +33,9 @@ OutputColumns = Literal[
     "heatmap_delivered",
     "heatmap_exported",
     "heatmap_total",
+    "heatmap_delivered_description",
+    "heatmap_exported_description",
+    "heatmap_total_description",
 ]
 
 
@@ -46,11 +49,11 @@ class DynamicTariffAnalysisInput(TimeDataFrame):
     )
     data: list[
         conlist(
-            item_type=float,
+            item_type=confloat(allow_inf_nan=True),
             min_length=len(RequiredColumns.__args__),
             max_length=len(RequiredColumns.__args__),
         )  # type: ignore
-    ] = Field(examples=[[0.0, 0.0, 0.0, 0.0, 0.0, 0.0]])
+    ] = Field(examples=[[0.0] * len(RequiredColumns.__args__)])
 
 
 class DynamicTariffAnalysisOutput(TimeDataFrame):
@@ -62,5 +65,9 @@ class DynamicTariffAnalysisOutput(TimeDataFrame):
         examples=[OutputColumns.__args__],
     )
     data: list[
-        conlist(item_type=float, min_length=1, max_length=len(OutputColumns.__args__))  # type: ignore
-    ] = Field(examples=[[0.0, 0.0, 0.0, 0.0, 0.0, 0.0]])
+        conlist(
+            item_type=confloat(allow_inf_nan=True),
+            min_length=1,
+            max_length=len(OutputColumns.__args__),
+        )  # type: ignore
+    ] = Field(examples=[[0.0] * len(OutputColumns.__args__)])

openenergyid/models.py

@@ -6,7 +6,7 @@ from typing import overload
 from typing import Self
 
 import pandas as pd
-from pydantic import BaseModel, field_validator
+from pydantic import BaseModel
 
 
 class TimeSeriesBase(BaseModel):
@@ -78,13 +78,7 @@ class TimeSeries(TimeSeriesBase):
     """
 
     name: str | None = None
-    data: list[float | None]
-
-    @field_validator("data")
-    @classmethod
-    def replace_nan_with_none(cls, data: list[float]) -> list[float | None]:
-        """Replace NaN values with None."""
-        return [None if pd.isna(value) else value for value in data]
+    data: list[float]
 
     @classmethod
     def from_pandas(cls, data: pd.Series) -> Self:
@@ -102,13 +96,7 @@ class TimeDataFrame(TimeSeriesBase):
     """Time series data with multiple columns."""
 
     columns: list[str]
-    data: list[list[float | None]]
-
-    @field_validator("data")
-    @classmethod
-    def replace_nan_with_none(cls, data: list[list[float]]) -> list[list[float | None]]:
-        """Replace NaN values with None."""
-        return [[None if pd.isna(value) else value for value in row] for row in data]
+    data: list[list[float]]
 
     @classmethod
     def from_pandas(cls, data: pd.DataFrame) -> Self:

{openenergyid-0.1.17.dist-info → openenergyid-0.1.19.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openenergyid
-Version: 0.1.17
+Version: 0.1.19
 Summary: Open Source Python library for energy analytics and simulations
 Project-URL: Homepage, https://energyid.eu
 Project-URL: Repository, https://github.com/EnergieID/OpenEnergyID

{openenergyid-0.1.17.dist-info → openenergyid-0.1.19.dist-info}/RECORD

@@ -1,14 +1,14 @@
-openenergyid/__init__.py,sha256=lFC4Rf6_0_VJqZZEGDBxHt7gMCsy39hvF-0pUBErI80,193
+openenergyid/__init__.py,sha256=Rw7W-OZewpvJwVPQ0xjjsiXdeT-QpbmEmBER7arAMYo,193
 openenergyid/const.py,sha256=D-xUnUyVuLmphClkePgxpFP6z0RDhw_6m7rX0BHBgrw,823
 openenergyid/enums.py,sha256=jdw4CB1gkisx0re_SesrTEyh_T-UxYp6uieE7iYlHdA,357
-openenergyid/models.py,sha256=F-7BOB-UxIcmR0Y02NHWWjoM_yWwkVOeRtIwZl72KgI,4877
+openenergyid/models.py,sha256=CO6VdthCOQ9hNXqVSan_4IOBpiQvOix-ea3U6TR7Vgc,4343
 openenergyid/capacity/__init__.py,sha256=1En96HlPV8kd1hOJO9RjRbXNInp5ZSkmjsjp0jfZlcQ,221
 openenergyid/capacity/main.py,sha256=G6_EtXs1k_W-fxS33pFrCNKajuH81skdI32zp5RX9bI,3674
 openenergyid/capacity/models.py,sha256=qi0IFyF_QOVleSzN8g0U2Fzqcc9ZDfNKt8oteFLY6Q0,832
 openenergyid/dyntar/__init__.py,sha256=iQXQXrEQOiVNeeF6LRmUf3oOhKlGjMNF7o4T04IWTGA,371
-openenergyid/dyntar/const.py,sha256=K7X6nHIl9DNyC6hU8jLtvOy3-IBGuYC449evOpImuJE,773
-openenergyid/dyntar/main.py,sha256=Q8_0vizBe__GZIcfOK5HqYTncRQHMjGJ5bk_TEBwuA8,5673
-openenergyid/dyntar/models.py,sha256=BbGdHj7eUOMepblWJNsNd21xULluv6m7TtdhSggvVbY,1873
+openenergyid/dyntar/const.py,sha256=17qL0-S0SImsqrDEDrGS2GLyJYcJRw6GmmcTiML7tR0,956
+openenergyid/dyntar/main.py,sha256=yRPamC5dHwpiDj07RM2iVKk3gZk8a81zKSjOsjewACo,8247
+openenergyid/dyntar/models.py,sha256=FZq7HI1F-3nVeHwPkuB38-8u32JzdvsZaCzrhirFD2g,2094
 openenergyid/energysharing/__init__.py,sha256=A4JfrUYf-hBCzhUm0qL1GGlNMvpO8OwXJo80dJxFIvw,274
 openenergyid/energysharing/const.py,sha256=X2zEPtTlsmZ66w6RmLS_h8NmdzObAEi5N6-0yrLN5V4,219
 openenergyid/energysharing/data_formatting.py,sha256=Kwuhyn6ao_8Brdm9frlA6VzYOqimNYZsRbYwNXnE7yc,2583
@@ -19,7 +19,7 @@ openenergyid/mvlr/helpers.py,sha256=Uzbfrj3IpH26wA206KOl0hNucKE-n9guJNC_EROBVKA,
 openenergyid/mvlr/main.py,sha256=cn7jZ98cHn2eh-0zG9q8Pad0Ft_FuI-u3a-eeHeF8jA,1304
 openenergyid/mvlr/models.py,sha256=XvkViOLlYqi0ffgF3AD4Jvk3yL05gsoKdKgBAsGJ7L4,8581
 openenergyid/mvlr/mvlr.py,sha256=F7WvWnZQtqUmK1vsguemsn9n8pDDk3tQ1weOlv-bo0c,18626
-openenergyid-0.1.17.dist-info/METADATA,sha256=MBxbfpJfYtdTtxCJy6MeysE_NAc6Q1r1ICFg5gc3j6I,2477
-openenergyid-0.1.17.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
-openenergyid-0.1.17.dist-info/licenses/LICENSE,sha256=NgRdcNHwyXVCXZ8sJwoTp0DCowThJ9LWWl4xhbV1IUY,1074
-openenergyid-0.1.17.dist-info/RECORD,,
+openenergyid-0.1.19.dist-info/METADATA,sha256=q8cD0GQr7JDOoStIRDI8r5z-9gvgt4dkuh98vBDWJBw,2477
+openenergyid-0.1.19.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+openenergyid-0.1.19.dist-info/licenses/LICENSE,sha256=NgRdcNHwyXVCXZ8sJwoTp0DCowThJ9LWWl4xhbV1IUY,1074
+openenergyid-0.1.19.dist-info/RECORD,,