Skip to content

Commit 12e3c4d

Browse files
committed
Finished overall checking, reviewing reworked implementations still needed.
1 parent 1119457 commit 12e3c4d

File tree

3 files changed

+25
-17
lines changed

3 files changed

+25
-17
lines changed

MISOReports/MISOReports.py

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1838,7 +1838,7 @@ def add_to_datetime(
18381838
example_datetime=datetime.datetime(year=2022, month=1, day=1),
18391839
),
18401840

1841-
"da_bc_HIST": Report(
1841+
"da_bc_HIST": Report( # Checked 2024-12-16.
18421842
url_builder=MISOMarketReportsURLBuilder(
18431843
target="da_bc_HIST",
18441844
supported_extensions=["csv"],
@@ -1851,7 +1851,7 @@ def add_to_datetime(
18511851
example_datetime=datetime.datetime(year=2022, month=1, day=1),
18521852
),
18531853

1854-
"da_ex_rg": Report(
1854+
"da_ex_rg": Report( # Checked 2024-12-16.
18551855
url_builder=MISOMarketReportsURLBuilder(
18561856
target="da_ex_rg",
18571857
supported_extensions=["xlsx"],
@@ -1864,7 +1864,7 @@ def add_to_datetime(
18641864
example_datetime=datetime.datetime(year=2024, month=9, day=1),
18651865
),
18661866

1867-
"da_ex": Report(
1867+
"da_ex": Report( # Checked 2024-12-16.
18681868
url_builder=MISOMarketReportsURLBuilder(
18691869
target="da_ex",
18701870
supported_extensions=["xls"],
@@ -1877,7 +1877,7 @@ def add_to_datetime(
18771877
example_datetime=datetime.datetime(year=2022, month=1, day=1),
18781878
),
18791879

1880-
"da_rpe": Report(
1880+
"da_rpe": Report( # Checked 2024-12-16.
18811881
url_builder=MISOMarketReportsURLBuilder(
18821882
target="da_rpe",
18831883
supported_extensions=["xls"],
@@ -1890,7 +1890,7 @@ def add_to_datetime(
18901890
example_datetime=datetime.datetime(year=2024, month=10, day=20),
18911891
),
18921892

1893-
"RT_LMPs": Report(
1893+
"RT_LMPs": Report( # Checked 2024-12-16.
18941894
url_builder=MISOMarketReportsURLBuilder(
18951895
target="RT_LMPs",
18961896
supported_extensions=["zip"],
@@ -1903,7 +1903,7 @@ def add_to_datetime(
19031903
example_datetime=datetime.datetime(year=2023, month=10, day=1),
19041904
),
19051905

1906-
"sr_gfm": Report(
1906+
"sr_gfm": Report( # Checked 2024-12-16.
19071907
url_builder=MISOMarketReportsURLBuilder(
19081908
target="sr_gfm",
19091909
supported_extensions=["xlsx"],
@@ -1916,7 +1916,7 @@ def add_to_datetime(
19161916
example_datetime=datetime.datetime(year=2024, month=9, day=1),
19171917
),
19181918

1919-
"dfal_HIST": Report(
1919+
"dfal_HIST": Report( # Checked 2024-12-16.
19201920
url_builder=MISOMarketReportsURLBuilder(
19211921
target="dfal_HIST",
19221922
supported_extensions=["xls"],
@@ -1929,7 +1929,7 @@ def add_to_datetime(
19291929
example_datetime=datetime.datetime(year=2022, month=12, day=31),
19301930
),
19311931

1932-
"historical_gen_fuel_mix": Report(
1932+
"historical_gen_fuel_mix": Report( # Checked 2024-12-16.
19331933
url_builder=MISOMarketReportsURLBuilder(
19341934
target="historical_gen_fuel_mix",
19351935
supported_extensions=["xlsx"],
@@ -1942,7 +1942,7 @@ def add_to_datetime(
19421942
example_datetime=datetime.datetime(year=2022, month=1, day=1),
19431943
),
19441944

1945-
"hwd_HIST": Report(
1945+
"hwd_HIST": Report( # Checked 2024-12-16.
19461946
url_builder=MISOMarketReportsURLBuilder(
19471947
target="hwd_HIST",
19481948
supported_extensions=["csv"],
@@ -1955,7 +1955,7 @@ def add_to_datetime(
19551955
example_datetime=datetime.datetime(year=2022, month=12, day=31),
19561956
),
19571957

1958-
"sr_hist_is": Report(
1958+
"sr_hist_is": Report( # Checked 2024-12-16.
19591959
url_builder=MISOMarketReportsURLBuilder(
19601960
target="sr_hist_is",
19611961
supported_extensions=["csv"],
@@ -1968,7 +1968,7 @@ def add_to_datetime(
19681968
example_datetime=datetime.datetime(year=2021, month=1, day=1),
19691969
),
19701970

1971-
"rfal_HIST": Report(
1971+
"rfal_HIST": Report( # Checked 2024-12-16.
19721972
url_builder=MISOMarketReportsURLBuilder(
19731973
target="rfal_HIST",
19741974
supported_extensions=["xls"],
@@ -1981,7 +1981,7 @@ def add_to_datetime(
19811981
example_datetime=datetime.datetime(year=2022, month=12, day=31),
19821982
),
19831983

1984-
"sr_lt": Report(
1984+
"sr_lt": Report( # Checked 2024-12-16.
19851985
url_builder=MISOMarketReportsURLBuilder(
19861986
target="sr_lt",
19871987
supported_extensions=["xls"],
@@ -2007,7 +2007,7 @@ def add_to_datetime(
20072007
example_datetime=datetime.datetime(year=2022, month=1, day=1),
20082008
),
20092009

2010-
"mom": Report(
2010+
"mom": Report( # Checked 2024-12-16.
20112011
url_builder=MISOMarketReportsURLBuilder(
20122012
target="mom",
20132013
supported_extensions=["xlsx"],

MISOReports/parsers.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2661,7 +2661,7 @@ def parse_da_bc_HIST(
26612661
res: requests.Response,
26622662
) -> pd.DataFrame:
26632663
text = res.text
2664-
csv_data = "\n".join(text.splitlines()[2:-3])
2664+
csv_data = "\n".join(text.splitlines()[2:-2])
26652665

26662666
df = pd.read_csv(
26672667
filepath_or_buffer=io.StringIO(csv_data),
@@ -2706,7 +2706,8 @@ def parse_da_ex_rg(
27062706
).iloc[:-1]
27072707

27082708
df.dropna(subset=['Region'], inplace=True)
2709-
2709+
df = df.reset_index(drop=True)
2710+
27102711
last_value = None
27112712
filled_column = []
27122713

@@ -2954,8 +2955,15 @@ def parse_hwd_HIST(
29542955
filepath_or_buffer=io.StringIO(csv_data),
29552956
)
29562957

2958+
df.rename(
2959+
columns={
2960+
"Market Day ": "Market Day",
2961+
},
2962+
inplace=True,
2963+
)
2964+
29572965
df[["Hour Ending"]] = df[["Hour Ending"]].astype("Int64")
2958-
df[["Market Day "]] = df[["Market Day "]].apply(pd.to_datetime, format="%m/%d/%Y")
2966+
df[["Market Day"]] = df[["Market Day"]].apply(pd.to_datetime, format="%m/%d/%Y")
29592967
df[["MWh"]] = df[["MWh"]].astype("Float64")
29602968

29612969
return df

MISOReports/test_MISOReports.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,7 @@ def test_MISOMarketReportsURLBuilder_build_url(
936936
{
937937
("MWh",): pd.api.types.is_float_dtype,
938938
("Hour Ending",): pd.api.types.is_integer_dtype,
939-
("Market Day ",): pd.api.types.is_datetime64_ns_dtype,
939+
("Market Day",): pd.api.types.is_datetime64_ns_dtype,
940940
}
941941
),
942942
(

0 commit comments

Comments
 (0)