@@ -892,56 +892,66 @@ def pub_rvdss(
892892 "issues" : issues ,
893893 },
894894 # descriptive fields
895- EpidataFieldInfo ("geo_type" , EpidataFieldType .categorical , categories = list ("nation" , "region" , "province" , "lab" )),
895+ EpidataFieldInfo (
896+ "geo_type" ,
897+ EpidataFieldType .categorical ,
898+ categories = list ("nation" , "region" , "province" , "lab" )
899+ ),
896900 EpidataFieldInfo ("geo_value" ,EpidataFieldType .text ),
897901 EpidataFieldInfo ("region" , EpidataFieldType .text ),
898- EpidataFieldInfo ("time_type" , EpidataFieldType .categorical , categories = list ("week" )),
899- EpidataFieldInfo ("epiweek" , EpidataFieldType .epiweek ), # Stored as an int in YYYYWW format
900- EpidataFieldInfo ("time_value" , EpidataFieldType .epiweek ), # Stored as a date
901- EpidataFieldInfo ("issue" , EpidataFieldType .epiweek ), # Stored as a date
902- EpidataFieldInfo ("week" , EpidataFieldType .int ),
903- EpidataFieldInfo ("weekorder" , EpidataFieldType .int ),
904- EpidataFieldInfo ("year" , EpidataFieldType .int ),
905-
906- # value fields
907- EpidataFieldInfo ("adv_pct_positive" , EpidataFieldType .float ),
908- EpidataFieldInfo ("adv_positive_tests" , EpidataFieldType .float ),
909- EpidataFieldInfo ("adv_tests" , EpidataFieldType .float ),
910- EpidataFieldInfo ("evrv_pct_positive" , EpidataFieldType .float ),
911- EpidataFieldInfo ("evrv_positive_tests" , EpidataFieldType .float ),
912- EpidataFieldInfo ("evrv_tests" , EpidataFieldType .float ),
913- EpidataFieldInfo ("flu_pct_positive" , EpidataFieldType .float ),
914- EpidataFieldInfo ("flu_positive_tests" , EpidataFieldType .float ),
915- EpidataFieldInfo ("flu_tests" , EpidataFieldType .float ),
916- EpidataFieldInfo ("flua_pct_positive" , EpidataFieldType .float ),
917- EpidataFieldInfo ("flua_positive_tests" , EpidataFieldType .float ),
918- EpidataFieldInfo ("flua_tests" , EpidataFieldType .float ),
919- EpidataFieldInfo ("fluah1n1pdm09_positive_tests" , EpidataFieldType .float ),
920- EpidataFieldInfo ("fluah3_positive_tests" , EpidataFieldType .float ),
921- EpidataFieldInfo ("fluauns_positive_tests" , EpidataFieldType .float ),
922- EpidataFieldInfo ("flub_pct_positive" , EpidataFieldType .float ),
923- EpidataFieldInfo ("flub_positive_tests" , EpidataFieldType .float ),
924- EpidataFieldInfo ("flub_tests" , EpidataFieldType .float ),
925- EpidataFieldInfo ("hcov_pct_positive" , EpidataFieldType .float ),
926- EpidataFieldInfo ("hcov_positive_tests" , EpidataFieldType .float ),
927- EpidataFieldInfo ("hcov_tests" , EpidataFieldType .float ),
928- EpidataFieldInfo ("hmpv_pct_positive" , EpidataFieldType .float ),
929- EpidataFieldInfo ("hmpv_positive_tests" , EpidataFieldType .float ),
930- EpidataFieldInfo ("hmpv_tests" , EpidataFieldType .float ),
931- EpidataFieldInfo ("hpiv1_positive_tests" , EpidataFieldType .float ),
932- EpidataFieldInfo ("hpiv2_positive_tests" , EpidataFieldType .float ),
933- EpidataFieldInfo ("hpiv3_positive_tests" , EpidataFieldType .float ),
934- EpidataFieldInfo ("hpiv4_positive_tests" , EpidataFieldType .float ),
935- EpidataFieldInfo ("hpiv_pct_positive" , EpidataFieldType .float ),
936- EpidataFieldInfo ("hpiv_positive_tests" , EpidataFieldType .float ),
937- EpidataFieldInfo ("hpiv_tests" , EpidataFieldType .float ),
938- EpidataFieldInfo ("hpivother_positive_tests" , EpidataFieldType .float ),
939- EpidataFieldInfo ("rsv_pct_positive" , EpidataFieldType .float ),
940- EpidataFieldInfo ("rsv_positive_tests" , EpidataFieldType .float ),
941- EpidataFieldInfo ("rsv_tests" , EpidataFieldType .float ),
942- EpidataFieldInfo ("sarscov2_pct_positive" , EpidataFieldType .float ),
943- EpidataFieldInfo ("sarscov2_positive_tests" , EpidataFieldType .float ),
944- EpidataFieldInfo ("sarscov2_tests" , EpidataFieldType .float )
902+ EpidataFieldInfo (
903+ "time_type" ,
904+ EpidataFieldType .categorical ,
905+ categories = list ("week" )
906+ ),
907+ [
908+ EpidataFieldInfo ("epiweek" , EpidataFieldType .epiweek ), # Stored as an int in YYYYWW format
909+ EpidataFieldInfo ("time_value" , EpidataFieldType .epiweek ), # Stored as a date
910+ EpidataFieldInfo ("issue" , EpidataFieldType .epiweek ), # Stored as a date
911+ EpidataFieldInfo ("week" , EpidataFieldType .int ),
912+ EpidataFieldInfo ("weekorder" , EpidataFieldType .int ),
913+ EpidataFieldInfo ("year" , EpidataFieldType .int ),
914+
915+ # value fields
916+ EpidataFieldInfo ("adv_pct_positive" , EpidataFieldType .float ),
917+ EpidataFieldInfo ("adv_positive_tests" , EpidataFieldType .float ),
918+ EpidataFieldInfo ("adv_tests" , EpidataFieldType .float ),
919+ EpidataFieldInfo ("evrv_pct_positive" , EpidataFieldType .float ),
920+ EpidataFieldInfo ("evrv_positive_tests" , EpidataFieldType .float ),
921+ EpidataFieldInfo ("evrv_tests" , EpidataFieldType .float ),
922+ EpidataFieldInfo ("flu_pct_positive" , EpidataFieldType .float ),
923+ EpidataFieldInfo ("flu_positive_tests" , EpidataFieldType .float ),
924+ EpidataFieldInfo ("flu_tests" , EpidataFieldType .float ),
925+ EpidataFieldInfo ("flua_pct_positive" , EpidataFieldType .float ),
926+ EpidataFieldInfo ("flua_positive_tests" , EpidataFieldType .float ),
927+ EpidataFieldInfo ("flua_tests" , EpidataFieldType .float ),
928+ EpidataFieldInfo ("fluah1n1pdm09_positive_tests" , EpidataFieldType .float ),
929+ EpidataFieldInfo ("fluah3_positive_tests" , EpidataFieldType .float ),
930+ EpidataFieldInfo ("fluauns_positive_tests" , EpidataFieldType .float ),
931+ EpidataFieldInfo ("flub_pct_positive" , EpidataFieldType .float ),
932+ EpidataFieldInfo ("flub_positive_tests" , EpidataFieldType .float ),
933+ EpidataFieldInfo ("flub_tests" , EpidataFieldType .float ),
934+ EpidataFieldInfo ("hcov_pct_positive" , EpidataFieldType .float ),
935+ EpidataFieldInfo ("hcov_positive_tests" , EpidataFieldType .float ),
936+ EpidataFieldInfo ("hcov_tests" , EpidataFieldType .float ),
937+ EpidataFieldInfo ("hmpv_pct_positive" , EpidataFieldType .float ),
938+ EpidataFieldInfo ("hmpv_positive_tests" , EpidataFieldType .float ),
939+ EpidataFieldInfo ("hmpv_tests" , EpidataFieldType .float ),
940+ EpidataFieldInfo ("hpiv1_positive_tests" , EpidataFieldType .float ),
941+ EpidataFieldInfo ("hpiv2_positive_tests" , EpidataFieldType .float ),
942+ EpidataFieldInfo ("hpiv3_positive_tests" , EpidataFieldType .float ),
943+ EpidataFieldInfo ("hpiv4_positive_tests" , EpidataFieldType .float ),
944+ EpidataFieldInfo ("hpiv_pct_positive" , EpidataFieldType .float ),
945+ EpidataFieldInfo ("hpiv_positive_tests" , EpidataFieldType .float ),
946+ EpidataFieldInfo ("hpiv_tests" , EpidataFieldType .float ),
947+ EpidataFieldInfo ("hpivother_positive_tests" , EpidataFieldType .float ),
948+ EpidataFieldInfo ("rsv_pct_positive" , EpidataFieldType .float ),
949+ EpidataFieldInfo ("rsv_positive_tests" , EpidataFieldType .float ),
950+ EpidataFieldInfo ("rsv_tests" , EpidataFieldType .float ),
951+ EpidataFieldInfo ("sarscov2_pct_positive" , EpidataFieldType .float ),
952+ EpidataFieldInfo ("sarscov2_positive_tests" , EpidataFieldType .float ),
953+ EpidataFieldInfo ("sarscov2_tests" , EpidataFieldType .float ),
954+ ]
945955 )
946956
947957 def pvt_sensors (
0 commit comments