Skip to content

Use nem_datetime everywhere #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bje- wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Use nem_datetime everywhere #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions src/isp_trace_parser/get_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
from pydantic import validate_call


def nem_datetime(*args, **kwargs):
"""Wrap datetime so that we can introduce timezone-aware datatimes in future."""
return datetime.datetime(*args, **kwargs)


def _year_range_to_dt_range(
start_year: int, end_year: int, year_type: Literal["fy", "calendar"] = "fy"
):
Expand All @@ -33,14 +38,10 @@ def _year_range_to_dt_range(
"""

if year_type == "fy":
return datetime.datetime(start_year - 1, 7, 1), datetime.datetime(
end_year, 7, 1
)
return nem_datetime(start_year - 1, 7, 1), nem_datetime(end_year, 7, 1)

elif year_type == "calendar":
return datetime.datetime(start_year, 1, 1), datetime.datetime(
end_year + 1, 1, 1
)
return nem_datetime(start_year, 1, 1), nem_datetime(end_year + 1, 1, 1)


def _query_parquet_single_reference_year(
Expand Down
45 changes: 23 additions & 22 deletions tests/test_get_data.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
get_project_single_reference_year,
get_zone_multiple_reference_years,
get_zone_single_reference_year,
nem_datetime,
solar_area_single_reference_year,
solar_project_multiple_reference_years,
solar_project_single_reference_year,
Expand All @@ -29,16 +30,16 @@ def test_year_range_to_dt_range_fy():
"""Test financial year conversion."""
start_dt, end_dt = _year_range_to_dt_range(2022, 2024, year_type="fy")

assert start_dt == datetime.datetime(2021, 7, 1, 0, 0)
assert end_dt == datetime.datetime(2024, 7, 1, 0, 0)
assert start_dt == nem_datetime(2021, 7, 1, 0, 0)
assert end_dt == nem_datetime(2024, 7, 1, 0, 0)


def test_year_range_to_dt_range_calendar():
"""Test calendar year conversion."""
start_dt, end_dt = _year_range_to_dt_range(2022, 2024, year_type="calendar")

assert start_dt == datetime.datetime(2022, 1, 1, 0, 0)
assert end_dt == datetime.datetime(2025, 1, 1, 0, 0)
assert start_dt == nem_datetime(2022, 1, 1, 0, 0)
assert end_dt == nem_datetime(2025, 1, 1, 0, 0)


@pytest.mark.parametrize("year_type", ["fy", "calendar"])
Expand Down Expand Up @@ -74,8 +75,8 @@ def test_get_zone_multiple_reference_year(parsed_trace_trace_directory: Path):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand All @@ -100,8 +101,8 @@ def test_get_project_single_reference_year(parsed_trace_trace_directory: Path):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2022, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2024, 7, 1))
(pl.col("datetime") > nem_datetime(2022, 7, 1))
& (pl.col("datetime") <= nem_datetime(2024, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand All @@ -127,8 +128,8 @@ def test_get_project_multiple_reference_year(parsed_trace_trace_directory: Path)

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand Down Expand Up @@ -187,8 +188,8 @@ def test_get_demand_multiple_reference_year(parsed_trace_trace_directory: Path):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand Down Expand Up @@ -241,8 +242,8 @@ def test_wind_project_single_reference_year(parsed_trace_trace_directory):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2022, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2024, 7, 1))
(pl.col("datetime") > nem_datetime(2022, 7, 1))
& (pl.col("datetime") <= nem_datetime(2024, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand All @@ -267,8 +268,8 @@ def test_solar_project_single_reference_year(parsed_trace_trace_directory):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2022, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2024, 7, 1))
(pl.col("datetime") > nem_datetime(2022, 7, 1))
& (pl.col("datetime") <= nem_datetime(2024, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand All @@ -293,8 +294,8 @@ def test_solar_project_multiple_reference_years(parsed_trace_trace_directory: Pa

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand All @@ -318,8 +319,8 @@ def test_wind_project_multiple_reference_years(parsed_trace_trace_directory: Pat

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand Down Expand Up @@ -404,8 +405,8 @@ def test_demand_multiple_reference_years(parsed_trace_trace_directory: Path):

test_df = (
test_df_lazy.filter(
(pl.col("datetime") > datetime.datetime(2028, 7, 1))
& (pl.col("datetime") <= datetime.datetime(2030, 7, 1))
(pl.col("datetime") > nem_datetime(2028, 7, 1))
& (pl.col("datetime") <= nem_datetime(2030, 7, 1))
)
.select(["datetime", "value"])
.collect()
Expand Down
Loading