Skip to content

Commit

Permalink
Merge branch 'develop' into polars+pandera_POC
Browse files Browse the repository at this point in the history 
# Conflicts:
#	.pre-commit-config.yaml
#	DEVELOPERS.md
#	data/capacity/capacity_output.json
#	demo_capacity_analysis.ipynb
#	openenergyid/__init__.py
#	openenergyid/capacity/main.py
#	openenergyid/dyntar/main.py
#	openenergyid/models.py
#	poetry.lock
#	pyproject.toml
#	requirements.txt
  • Loading branch information
@Molier
Molier committed Oct 7, 2024
2 parents 1ac9494 + 464f1c2 commit 4034fd7
Show file tree
Hide file tree
Showing 10 changed files with 152 additions and 144 deletions.
Binary file removed .DS_Store
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
# Ruff version.
rev: v0.6.2
rev: v0.5.5
hooks:
# Run the linter.
- id: ruff
Expand All @@ -12,7 +12,7 @@ repos:
types_or: [python, pyi, jupyter]

- repo: https://github.com/asottile/pyupgrade
rev: v3.17.0
rev: v3.16.0
hooks:
- id: pyupgrade
args: [--py311-plus]
Expand Down
2 changes: 1 addition & 1 deletion DEVELOPERS.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,4 @@ other option is to run as root from within the `devcontainer.json` `"remoteUser"
> If you’re on an Apple Silicon machine, you’ll need to install [polars](https://pandera.readthedocs.io/en/latest/polars.html) via pip install polars-lts-cpu.
> You may have to delete polars if it’s already installed:
> `pip uninstall polars`
> `pip install polars-lts-cpu`
> `pip install polars-lts-cpu`
230 changes: 115 additions & 115 deletions data/capacity/capacity_output.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"2024-06-13T17:30:00+02:00",
"2024-07-02T11:00:00+02:00"
],
"name": "None",
"name": null,
"data": [
2.32,
3.596,
Expand All @@ -29,7 +29,7 @@
"2024-06-13T18:30:00+02:00",
"2024-06-13T18:45:00+02:00"
],
"name": "None",
"name": null,
"data": [
2.104,
0.9,
Expand All @@ -44,6 +44,37 @@
]
}
},
{
"peak_time": "2024-06-13T17:45:00+02:00",
"peak_value": 3.316,
"surrounding_data": {
"index": [
"2024-06-13T16:45:00+02:00",
"2024-06-13T17:00:00+02:00",
"2024-06-13T17:15:00+02:00",
"2024-06-13T17:30:00+02:00",
"2024-06-13T17:45:00+02:00",
"2024-06-13T18:00:00+02:00",
"2024-06-13T18:15:00+02:00",
"2024-06-13T18:30:00+02:00",
"2024-06-13T18:45:00+02:00",
"2024-06-13T19:00:00+02:00"
],
"name": null,
"data": [
0.9,
2.628,
1.352,
3.596,
3.316,
2.216,
1.412,
0.768,
0.544,
0.564
]
}
},
{
"peak_time": "2024-06-24T18:00:00+02:00",
"peak_value": 3.048,
Expand All @@ -60,7 +91,7 @@
"2024-06-24T19:00:00+02:00",
"2024-06-24T19:15:00+02:00"
],
"name": "None",
"name": null,
"data": [
0.628,
0.724,
Expand Down Expand Up @@ -91,7 +122,7 @@
"2024-06-06T01:15:00+02:00",
"2024-06-06T01:30:00+02:00"
],
"name": "None",
"name": null,
"data": [
1.324,
1.384,
Expand Down Expand Up @@ -122,7 +153,7 @@
"2024-07-02T12:00:00+02:00",
"2024-07-02T12:15:00+02:00"
],
"name": "None",
"name": null,
"data": [
0.508,
0.7,
Expand All @@ -137,6 +168,37 @@
]
}
},
{
"peak_time": "2024-06-13T17:00:00+02:00",
"peak_value": 2.628,
"surrounding_data": {
"index": [
"2024-06-13T16:00:00+02:00",
"2024-06-13T16:15:00+02:00",
"2024-06-13T16:30:00+02:00",
"2024-06-13T16:45:00+02:00",
"2024-06-13T17:00:00+02:00",
"2024-06-13T17:15:00+02:00",
"2024-06-13T17:30:00+02:00",
"2024-06-13T17:45:00+02:00",
"2024-06-13T18:00:00+02:00",
"2024-06-13T18:15:00+02:00"
],
"name": null,
"data": [
0.728,
1.468,
2.104,
0.9,
2.628,
1.352,
3.596,
3.316,
2.216,
1.412
]
}
},
{
"peak_time": "2024-06-27T23:00:00+02:00",
"peak_value": 2.612,
Expand All @@ -153,7 +215,7 @@
"2024-06-28T00:00:00+02:00",
"2024-06-28T00:15:00+02:00"
],
"name": "None",
"name": null,
"data": [
0.74,
0.724,
Expand Down Expand Up @@ -184,7 +246,7 @@
"2024-06-02T20:15:00+02:00",
"2024-06-02T20:30:00+02:00"
],
"name": "None",
"name": null,
"data": [
0.872,
0.888,
Expand All @@ -200,126 +262,64 @@
}
},
{
"peak_time": "2024-06-05T09:15:00+02:00",
"peak_value": 2.464,
"surrounding_data": {
"index": [
"2024-06-05T08:15:00+02:00",
"2024-06-05T08:30:00+02:00",
"2024-06-05T08:45:00+02:00",
"2024-06-05T09:00:00+02:00",
"2024-06-05T09:15:00+02:00",
"2024-06-05T09:30:00+02:00",
"2024-06-05T09:45:00+02:00",
"2024-06-05T10:00:00+02:00",
"2024-06-05T10:15:00+02:00",
"2024-06-05T10:30:00+02:00"
],
"name": "None",
"data": [
0.612,
0.484,
0.444,
1.528,
2.464,
1.884,
0.864,
0.628,
0.552,
0.608
]
}
},
{
"peak_time": "2024-06-07T10:30:00+02:00",
"peak_value": 2.46,
"surrounding_data": {
"index": [
"2024-06-07T09:30:00+02:00",
"2024-06-07T09:45:00+02:00",
"2024-06-07T10:00:00+02:00",
"2024-06-07T10:15:00+02:00",
"2024-06-07T10:30:00+02:00",
"2024-06-07T10:45:00+02:00",
"2024-06-07T11:00:00+02:00",
"2024-06-07T11:15:00+02:00",
"2024-06-07T11:30:00+02:00",
"2024-06-07T11:45:00+02:00"
],
"name": "None",
"data": [
0.448,
0.304,
0.396,
0.864,
2.46,
1.092,
0.648,
0.548,
1.188,
1.836
]
}
},
{
"peak_time": "2024-06-29T18:00:00+02:00",
"peak_value": 2.456,
"peak_time": "2024-07-02T11:15:00+02:00",
"peak_value": 2.56,
"surrounding_data": {
"index": [
"2024-06-29T17:00:00+02:00",
"2024-06-29T17:15:00+02:00",
"2024-06-29T17:30:00+02:00",
"2024-06-29T17:45:00+02:00",
"2024-06-29T18:00:00+02:00",
"2024-06-29T18:15:00+02:00",
"2024-06-29T18:30:00+02:00",
"2024-06-29T18:45:00+02:00",
"2024-06-29T19:00:00+02:00",
"2024-06-29T19:15:00+02:00"
"2024-07-02T10:15:00+02:00",
"2024-07-02T10:30:00+02:00",
"2024-07-02T10:45:00+02:00",
"2024-07-02T11:00:00+02:00",
"2024-07-02T11:15:00+02:00",
"2024-07-02T11:30:00+02:00",
"2024-07-02T11:45:00+02:00",
"2024-07-02T12:00:00+02:00",
"2024-07-02T12:15:00+02:00",
"2024-07-02T12:30:00+02:00"
],
"name": "None",
"name": null,
"data": [
0.64,
0.608,
0.6,
1.116,
2.456,
1.6,
1.644,
1.504,
0.832,
0.716
0.7,
0.564,
0.824,
2.852,
2.56,
2.216,
1.392,
0.604,
0.672,
0.62
]
}
},
{
"peak_time": "2024-06-27T11:15:00+02:00",
"peak_value": 2.428,
"peak_time": "2024-06-06T00:30:00+02:00",
"peak_value": 2.548,
"surrounding_data": {
"index": [
"2024-06-27T10:15:00+02:00",
"2024-06-27T10:30:00+02:00",
"2024-06-27T10:45:00+02:00",
"2024-06-27T11:00:00+02:00",
"2024-06-27T11:15:00+02:00",
"2024-06-27T11:30:00+02:00",
"2024-06-27T11:45:00+02:00",
"2024-06-27T12:00:00+02:00",
"2024-06-27T12:15:00+02:00",
"2024-06-27T12:30:00+02:00"
"2024-06-05T23:30:00+02:00",
"2024-06-05T23:45:00+02:00",
"2024-06-06T00:00:00+02:00",
"2024-06-06T00:15:00+02:00",
"2024-06-06T00:30:00+02:00",
"2024-06-06T00:45:00+02:00",
"2024-06-06T01:00:00+02:00",
"2024-06-06T01:15:00+02:00",
"2024-06-06T01:30:00+02:00",
"2024-06-06T01:45:00+02:00"
],
"name": "None",
"name": null,
"data": [
2.036,
1.04,
1.232,
0.804,
2.428,
0.796,
0.64,
0.552,
0.584,
0.584
1.384,
1.348,
1.696,
2.888,
2.548,
1.536,
0.512,
0.328,
0.32,
0.296
]
}
}
Expand Down
2 changes: 1 addition & 1 deletion openenergyid/__init__.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"""Open Energy ID Python SDK."""

__version__ = "0.1.16"
__version__ = "0.1.18"

from .enums import Granularity
from .models import TimeDataFrame, TimeSeries
Expand Down
30 changes: 19 additions & 11 deletions openenergyid/dyntar/main.py
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
"""Main module of the DynTar package."""

import numpy as np
import pandas as pd

from openenergyid.const import (
Expand Down Expand Up @@ -122,18 +123,25 @@ def extend_dataframe_with_heatmap(df: pd.DataFrame, inplace: bool = False) -> pd
if not inplace:
df = df.copy()

heatmap_score_delivered = (
(df[ELECTRICITY_DELIVERED_SMR2] - df[ELECTRICITY_DELIVERED_SMR3])
/ df[ELECTRICITY_DELIVERED_SMR2]
* (df[RLP_WEIGHTED_PRICE_DELIVERED] - df[PRICE_ELECTRICITY_DELIVERED])
/ df[RLP_WEIGHTED_PRICE_DELIVERED]
)
heatmap_score_exported = (
(df[ELECTRICITY_EXPORTED_SMR2] - df[ELECTRICITY_EXPORTED_SMR3])
/ df[ELECTRICITY_EXPORTED_SMR2]
* (df[SPP_WEIGHTED_PRICE_EXPORTED] - df[PRICE_ELECTRICITY_EXPORTED])
/ df[SPP_WEIGHTED_PRICE_EXPORTED]
normalized_energy_delta_delivered = (
df[ELECTRICITY_DELIVERED_SMR2] - df[ELECTRICITY_DELIVERED_SMR3]
) / df[ELECTRICITY_DELIVERED_SMR2]
normalized_price_delta_delivered = (
df[RLP_WEIGHTED_PRICE_DELIVERED] - df[PRICE_ELECTRICITY_DELIVERED]
) / df[RLP_WEIGHTED_PRICE_DELIVERED]
heatmap_score_delivered = normalized_energy_delta_delivered * normalized_price_delta_delivered

normalized_energy_delta_exported = (
df[ELECTRICITY_EXPORTED_SMR2] - df[ELECTRICITY_EXPORTED_SMR3]
) / df[ELECTRICITY_EXPORTED_SMR2]
normalized_energy_delta_exported = normalized_energy_delta_exported.replace(
[np.inf, -np.inf], np.nan
)
normalized_price_delta_exported = (
df[SPP_WEIGHTED_PRICE_EXPORTED] - df[PRICE_ELECTRICITY_EXPORTED]
) / df[SPP_WEIGHTED_PRICE_EXPORTED]
heatmap_score_exported = normalized_energy_delta_exported * normalized_price_delta_exported

heatmap_score_delivered.fillna(0, inplace=True)
heatmap_score_exported.fillna(0, inplace=True)

Expand Down
Loading

0 comments on commit 4034fd7

Please sign in to comment.