openenergyid 0.1.14__py2.py3-none-any.whl → 0.1.15__py2.py3-none-any.whl

openenergyid/__init__.py

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

openenergyid/models.py

@@ -6,7 +6,7 @@ from typing import overload
 from typing import Self
 
 import pandas as pd
-from pydantic import BaseModel
+from pydantic import BaseModel, field_validator
 
 
 class TimeSeriesBase(BaseModel):
@@ -47,7 +47,7 @@ class TimeSeriesBase(BaseModel):
 
     @overload
     @classmethod
-    def from_json(cls, path: str, **kwargs) -> Self:
+    def from_json(cls, *, path: str, **kwargs) -> Self:
         """Load from a JSON file."""
 
     @classmethod
@@ -66,12 +66,18 @@ class TimeSeries(TimeSeriesBase):
     """Time series data with a single column."""
 
     name: str | None = None
-    data: list[float]
+    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]
 
     @classmethod
     def from_pandas(cls, data: pd.Series) -> Self:
         """Create from a Pandas Series."""
-        return cls.model_construct(name=data.name, data=data.tolist(), index=data.index.tolist())
+        return cls(name=str(data.name), data=data.tolist(), index=data.index.tolist())
 
     def to_pandas(self, timezone: str = "UTC") -> pd.Series:
         """Convert to a Pandas Series."""
@@ -84,12 +90,18 @@ class TimeDataFrame(TimeSeriesBase):
     """Time series data with multiple columns."""
 
     columns: list[str]
-    data: list[list[float]]
+    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]
 
     @classmethod
     def from_pandas(cls, data: pd.DataFrame) -> Self:
         """Create from a Pandas DataFrame."""
-        return cls.model_construct(
+        return cls(
             columns=data.columns.tolist(), data=data.values.tolist(), index=data.index.tolist()
         )
 

{openenergyid-0.1.14.dist-info → openenergyid-0.1.15.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: openenergyid
-Version: 0.1.14
+Version: 0.1.15
 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.14.dist-info → openenergyid-0.1.15.dist-info}/RECORD

@@ -1,7 +1,7 @@
-openenergyid/__init__.py,sha256=HRG7FGexmhpqDgPipT6vEZrgrPFzuYyrfGWeliceX58,193
+openenergyid/__init__.py,sha256=I9GYYWvktnGpJGRAg-NQAnKsFGnNytEgHJNBlaMO3bo,193
 openenergyid/const.py,sha256=D-xUnUyVuLmphClkePgxpFP6z0RDhw_6m7rX0BHBgrw,823
 openenergyid/enums.py,sha256=jdw4CB1gkisx0re_SesrTEyh_T-UxYp6uieE7iYlHdA,357
-openenergyid/models.py,sha256=ghH-pAqbEgT13GfnDFC_W7dVr4NjvLz4QqTajqyeUJM,3855
+openenergyid/models.py,sha256=oAX5JI_aytpJTc63Pd7c1BbhhKoOC8T3zx9ChOOC_X4,4365
 openenergyid/capacity/PowerAnalysis.py,sha256=V3-CupATVMQ95U-GWVumAbhj4IccHW-aAc4-Gsq7kWk,1136
 openenergyid/capacity/__init__.py,sha256=1En96HlPV8kd1hOJO9RjRbXNInp5ZSkmjsjp0jfZlcQ,221
 openenergyid/capacity/main.py,sha256=RLTPOopVW11vSAp-FxsalnzrinwQRnc2LzhJt1RpLMk,3335
@@ -20,7 +20,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.14.dist-info/METADATA,sha256=OEFjFlga0hHK7snhPa8OnGAzdzcAtqfECmXzLJwY_7k,2477
-openenergyid-0.1.14.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
-openenergyid-0.1.14.dist-info/licenses/LICENSE,sha256=NgRdcNHwyXVCXZ8sJwoTp0DCowThJ9LWWl4xhbV1IUY,1074
-openenergyid-0.1.14.dist-info/RECORD,,
+openenergyid-0.1.15.dist-info/METADATA,sha256=-ks_6DkMBz6YlvlF4_iZywL5Cc3b73gH9xjP7xXxy5I,2477
+openenergyid-0.1.15.dist-info/WHEEL,sha256=fl6v0VwpzfGBVsGtkAkhILUlJxROXbA3HvRL6Fe3140,105
+openenergyid-0.1.15.dist-info/licenses/LICENSE,sha256=NgRdcNHwyXVCXZ8sJwoTp0DCowThJ9LWWl4xhbV1IUY,1074
+openenergyid-0.1.15.dist-info/RECORD,,