@@ -1021,40 +1021,69 @@ def test_load_gen_kw_not_sorted(storage, tmpdir, snapshot):
10211021 )
10221022
10231023 sample_prior (ensemble , range (ensemble_size ), random_seed = 1234 )
1024-
1025- data = ensemble .load_all_gen_kw_data ()
1024+ data = ensemble .load_scalars ().to_pandas ().set_index ("realization" )
1025+ data .columns .name = None
1026+ data .index .name = "Realization"
1027+ data = data .sort_index (axis = 1 )
10261028 snapshot .assert_match (data .round (12 ).to_csv (), "gen_kw_unsorted" )
10271029
10281030
10291031def test_gen_kw_collector (snake_oil_default_storage , snapshot ):
1030- data = snake_oil_default_storage .load_all_gen_kw_data ()
1032+ data = snake_oil_default_storage .load_scalars ().to_pandas ().set_index ("realization" )
1033+ data .columns .name = None
1034+ data .index .name = "Realization"
1035+ data = data .sort_index (axis = 1 )
10311036 snapshot .assert_match (data .round (6 ).to_csv (), "gen_kw_collector.csv" )
10321037
10331038 with pytest .raises (KeyError ):
10341039 # realization 60:
10351040 _ = data .loc [60 ]
10361041
1037- data = snake_oil_default_storage .load_all_gen_kw_data (
1038- "SNAKE_OIL_PARAM" ,
1039- )[["SNAKE_OIL_PARAM:OP1_PERSISTENCE" , "SNAKE_OIL_PARAM:OP1_OFFSET" ]]
1042+ data = (
1043+ snake_oil_default_storage .load_scalars (
1044+ "SNAKE_OIL_PARAM" ,
1045+ )
1046+ .to_pandas ()
1047+ .set_index ("realization" )
1048+ )
1049+ data .columns .name = None
1050+ data .index .name = "Realization"
1051+ data = data .sort_index (axis = 1 )
1052+ data = data [["SNAKE_OIL_PARAM:OP1_PERSISTENCE" , "SNAKE_OIL_PARAM:OP1_OFFSET" ]]
10401053 snapshot .assert_match (data .round (6 ).to_csv (), "gen_kw_collector_2.csv" )
10411054
10421055 with pytest .raises (KeyError ):
10431056 _ = data ["SNAKE_OIL_PARAM:OP1_DIVERGENCE_SCALE" ]
10441057
10451058 realization_index = 3
1046- data = snake_oil_default_storage .load_all_gen_kw_data (
1047- "SNAKE_OIL_PARAM" ,
1048- realization_index = realization_index ,
1049- )["SNAKE_OIL_PARAM:OP1_PERSISTENCE" ]
1059+ data = (
1060+ snake_oil_default_storage .load_scalars (
1061+ "SNAKE_OIL_PARAM" ,
1062+ realization_index = realization_index ,
1063+ )
1064+ .to_pandas ()
1065+ .set_index ("realization" )
1066+ )
1067+ data .columns .name = None
1068+ data .index .name = "Realization"
1069+ data = data .sort_index (axis = 1 )
1070+ data = data ["SNAKE_OIL_PARAM:OP1_PERSISTENCE" ]
10501071 snapshot .assert_match (data .round (6 ).to_csv (), "gen_kw_collector_3.csv" )
10511072
10521073 non_existing_realization_index = 150
10531074 with pytest .raises ((IndexError , KeyError )):
1054- _ = snake_oil_default_storage .load_all_gen_kw_data (
1055- "SNAKE_OIL_PARAM" ,
1056- realization_index = non_existing_realization_index ,
1057- )["SNAKE_OIL_PARAM:OP1_PERSISTENCE" ]
1075+ data = (
1076+ snake_oil_default_storage .load_scalars (
1077+ "SNAKE_OIL_PARAM" ,
1078+ realization_index = non_existing_realization_index ,
1079+ )
1080+ .to_pandas ()
1081+ .set_index ("realization" )
1082+ )
1083+ data .columns .name = None
1084+ data .index .name = "Realization"
1085+ data = data .sort_index (axis = 1 )
1086+ data = data ["SNAKE_OIL_PARAM:OP1_PERSISTENCE" ]
10581087
10591088
10601089def test_keyword_type_checks (snake_oil_default_storage ):
@@ -1083,12 +1112,12 @@ def test_data_fetching_missing_key(snake_oil_case):
10831112 empty_case = experiment .create_ensemble (name = "new_case" , ensemble_size = 25 )
10841113
10851114 data = [
1086- empty_case .load_all_gen_kw_data ("nokey" , None ),
1115+ empty_case .load_scalars ("nokey" , None ),
10871116 ]
10881117
10891118 for dataframe in data :
1090- assert isinstance (dataframe , DataFrame )
1091- assert dataframe .empty
1119+ assert isinstance (dataframe , pl . DataFrame )
1120+ assert dataframe .is_empty ()
10921121
10931122
10941123@dataclass
0 commit comments