From 6bba024f51ce259c05d6962e380e9b677c6c80bf Mon Sep 17 00:00:00 2001 From: chejennifer <69875368+chejennifer@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:36:48 -0700 Subject: [PATCH 01/28] update submodule for release (#4681) --- mixer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mixer b/mixer index a5a19782d2..a5e2e7555f 160000 --- a/mixer +++ b/mixer @@ -1 +1 @@ -Subproject commit a5a19782d2c571fa3cd40efc403b06bd58ed31e2 +Subproject commit a5e2e7555f56246010e1e4e57ffa8cf2495aac2c From 52497683d42f79dd57ff6579d60fdfe28e195df2 Mon Sep 17 00:00:00 2001 From: chejennifer <69875368+chejennifer@users.noreply.github.com> Date: Mon, 21 Oct 2024 13:58:09 -0700 Subject: [PATCH 02/28] update NL goldens after mixer push (#4680) --- .../demo_fallback/query_4/chart_config.json | 29 + .../demo_feb2023/query_5/chart_config.json | 100 +- .../debug_info.json | 14 +- .../debug_info.json | 4 +- .../debug_info.json | 6 +- .../chart_config.json | 86 ++ .../chart_config.json | 153 +-- .../chart_config.json | 64 ++ .../chart_config.json | 48 + .../chart_config.json | 64 ++ .../chart_config.json | 947 +++++++++++++++++- .../chart_config.json | 88 +- .../chart_config.json | 440 ++++---- .../international/query_2/chart_config.json | 32 + .../webdriver/shared_tests/download_test.py | 12 +- server/webdriver/shared_tests/map_test.py | 6 +- .../shared_tests/place_explorer_test.py | 9 +- server/webdriver/shared_tests/scatter_test.py | 7 +- server/webdriver/shared_tests/vis_map_test.py | 20 +- .../shared_tests/vis_scatter_test.py | 20 +- 20 files changed, 1705 insertions(+), 444 deletions(-) diff --git a/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json b/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json index c26f445cd3..33f44004c0 100644 --- a/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json +++ b/server/integration_tests/test_data/demo_fallback/query_4/chart_config.json @@ -827,6 +827,35 @@ "denom": "Count_Person", "title": "People With Only Private Health Insurance in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Number of Deaths in California", + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths" + }, { "columns": [ { diff --git a/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json b/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json index 77cbfebe65..8d11116f3a 100644 --- a/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json +++ b/server/integration_tests/test_data/demo_feb2023/query_5/chart_config.json @@ -12,12 +12,12 @@ "statVarKey": [ "Count_Worker_NAICSHealthCareSocialAssistance", "dc/p69tpsldf99h7", - "Count_Worker_NAICSConstruction", "Count_Worker_NAICSAccommodationFoodServices", - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices", + "Count_Worker_NAICSConstruction", "Count_Worker_NAICSProfessionalScientificTechnicalServices", - "Count_Worker_NAICSArtsEntertainmentRecreation", "Count_Worker_NAICSEducationalServices", + "Count_Worker_NAICSArtsEntertainmentRecreation", + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices", "Count_Worker_NAICSOtherServices", "Count_Worker_NAICSFinanceInsurance", "Count_Worker_NAICSRealEstateRentalLeasing", @@ -67,9 +67,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_abs" + "Count_Worker_NAICSAccommodationFoodServices_growth_abs" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -78,9 +78,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_abs" + "Count_Worker_NAICSConstruction_growth_abs" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -89,9 +89,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_abs" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_abs" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -100,9 +100,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_abs" + "Count_Worker_NAICSEducationalServices_growth_abs" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Educational Services Industry Workers in Placer County", "type": "LINE" } ] @@ -122,9 +122,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSEducationalServices_growth_abs" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_abs" ], - "title": "Educational Services Industry Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -271,9 +271,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSArtsEntertainmentRecreation_growth_pct" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pct" ], - "title": "Arts, Entertainment, Recreation Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -293,9 +293,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pct" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pct" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -304,9 +304,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pct" + "Count_Worker_NAICSArtsEntertainmentRecreation_growth_pct" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Arts, Entertainment, Recreation Industry Workers in Placer County", "type": "LINE" } ] @@ -326,9 +326,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSMiningQuarryingOilGasExtraction_growth_pct" + "Count_Worker_NAICSWholesaleTrade_growth_pct" ], - "title": "Mining, Quarrying, Oil and Gas Extraction Industry Workers in Placer County", + "title": "Wholesale Trade Workers in Placer County", "type": "LINE" } ] @@ -337,9 +337,9 @@ "tiles": [ { "statVarKey": [ - "dc/8p97n7l96lgg8_growth_pct" + "Count_Worker_NAICSRealEstateRentalLeasing_growth_pct" ], - "title": "Transportation and Warehousing Workers in Placer County", + "title": "Real Estate and Rental and Leasing Workers in Placer County", "type": "LINE" } ] @@ -348,9 +348,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSWholesaleTrade_growth_pct" + "dc/8p97n7l96lgg8_growth_pct" ], - "title": "Wholesale Trade Workers in Placer County", + "title": "Transportation and Warehousing Workers in Placer County", "type": "LINE" } ] @@ -359,9 +359,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSRealEstateRentalLeasing_growth_pct" + "Count_Worker_NAICSConstruction_growth_pct" ], - "title": "Real Estate and Rental and Leasing Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -370,9 +370,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_pct" + "Count_Worker_NAICSAccommodationFoodServices_growth_pct" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -403,9 +403,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_pct" + "dc/p69tpsldf99h7_growth_pct" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Retail Trade Workers in Placer County", "type": "LINE" } ] @@ -425,9 +425,9 @@ "tiles": [ { "statVarKey": [ - "dc/p69tpsldf99h7_growth_pct" + "Count_Worker_NAICSPublicAdministration_growth_pct" ], - "title": "Retail Trade Workers in Placer County", + "title": "Public Administration Workers in Placer County", "type": "LINE" } ] @@ -447,9 +447,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSPublicAdministration_growth_pct" + "Count_Worker_NAICSInformation_growth_pct" ], - "title": "Public Administration Workers in Placer County", + "title": "Information Industry Workers in Placer County", "type": "LINE" } ] @@ -458,9 +458,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSInformation_growth_pct" + "Count_Worker_NAICSMiningQuarryingOilGasExtraction_growth_pct" ], - "title": "Information Industry Workers in Placer County", + "title": "Mining, Quarrying, Oil and Gas Extraction Industry Workers in Placer County", "type": "LINE" } ] @@ -497,9 +497,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSConstruction_growth_pc" + "Count_Worker_NAICSAccommodationFoodServices_growth_pc" ], - "title": "Population Working in the Construction Industry in Placer County", + "title": "Accommodation/Food Industry Workers in Placer County", "type": "LINE" } ] @@ -508,9 +508,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAccommodationFoodServices_growth_pc" + "Count_Worker_NAICSConstruction_growth_pc" ], - "title": "Accommodation/Food Industry Workers in Placer County", + "title": "Population Working in the Construction Industry in Placer County", "type": "LINE" } ] @@ -519,9 +519,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pc" + "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pc" ], - "title": "Admin / Waste Management Service Industry Workers in Placer County", + "title": "Professional, Scientific, and Technical Services Workers in Placer County", "type": "LINE" } ] @@ -530,9 +530,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSProfessionalScientificTechnicalServices_growth_pc" + "Count_Worker_NAICSEducationalServices_growth_pc" ], - "title": "Professional, Scientific, and Technical Services Workers in Placer County", + "title": "Educational Services Industry Workers in Placer County", "type": "LINE" } ] @@ -552,9 +552,9 @@ "tiles": [ { "statVarKey": [ - "Count_Worker_NAICSEducationalServices_growth_pc" + "Count_Worker_NAICSAdministrativeSupportWasteManagementRemediationServices_growth_pc" ], - "title": "Educational Services Industry Workers in Placer County", + "title": "Admin / Waste Management Service Industry Workers in Placer County", "type": "LINE" } ] @@ -1199,6 +1199,12 @@ }, "childTopics": [], "exploreMore": { + "Count_Worker_NAICSProfessionalScientificTechnicalServices": { + "establishmentOwnership": [ + "Count_Worker_FederalGovernmentOwnedEstablishment_NAICSProfessionalScientificTechnicalServices", + "Count_Worker_LocalGovernmentOwnedEstablishment_NAICSProfessionalScientificTechnicalServices" + ] + }, "dc/8p97n7l96lgg8": { "establishmentOwnership": [ "dc/wkn0fmqw6ezxc", diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index ad8b8b93ac..4611fc3e24 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257859587669373 + 0.9257857799530029 ], "QueryPart": "male population", "SV": [ @@ -63,7 +63,7 @@ }, { "CosineScore": [ - 0.9296979904174805, + 0.92969810962677, 0.884743332862854 ], "QueryPart": "female population", @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.911777138710022 + 0.9117770791053772 ], "QueryPart": "male population female", "SV": [ @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982378244400024, - 0.8723466396331787 + 0.8982378840446472, + 0.8723467588424683 ], "QueryPart": "population", "SV": [ @@ -106,10 +106,10 @@ "Parts": [ { "CosineScore": [ - 0.8088873028755188, + 0.808887243270874, 0.8034241199493408, 0.8017654418945312, - 0.7751557230949402 + 0.775155782699585 ], "QueryPart": "male", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json index cde42a4ae2..e015ba346e 100644 --- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json @@ -45,7 +45,7 @@ "Parts": [ { "CosineScore": [ - 0.7997788786888123 + 0.7997788190841675 ], "QueryPart": "factors like obesity blood pressure asthma impacted", "SV": [ @@ -86,7 +86,7 @@ }, { "CosineScore": [ - 0.9999995827674866 + 0.9999996423721313 ], "QueryPart": "blood pressure", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index 6c44d9f4bd..e0c5938a14 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -41,7 +41,7 @@ "Parts": [ { "CosineScore": [ - 0.8787485361099243 + 0.8787487149238586 ], "QueryPart": "show climate change", "SV": [ @@ -66,7 +66,7 @@ { "CosineScore": [ 0.794236958026886, - 0.7929013967514038 + 0.792901337146759 ], "QueryPart": "show climate", "SV": [ @@ -76,7 +76,7 @@ }, { "CosineScore": [ - 0.8665127158164978 + 0.8665127754211426 ], "QueryPart": "change drought", "SV": [ diff --git a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json index 4a42baee50..2af3bf0317 100644 --- a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniacountiesbefore2020/chart_config.json @@ -217,6 +217,38 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "endDate": "2019" + }, + "statVarKey": [ + "Count_Death_Female_1151455814" + ], + "title": "Count of Mortality Event: Female in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Mortality Event: Female in California", + "statVarKey": [ + "Count_Death_Female_2019" + ], + "title": "Count of Mortality Event: Female in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female" + }, { "columns": [ { @@ -889,11 +921,21 @@ } ], "statVarSpec": { + "Count_Death_Female_1151455814": { + "facetId": "1151455814", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" + }, "Count_Death_Female_2017": { "date": "2017", "name": "Count of Mortality Event: Female", "statVar": "Count_Death_Female" }, + "Count_Death_Female_2019": { + "date": "2019", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female_1118952551": { "facetId": "1118952551", "name": "Population: Bachelors Degree or Higher, Female", @@ -1421,6 +1463,50 @@ }, "childTopics": [], "exploreMore": { + "Count_Death_Female": { + "age": [ + "Count_Death_10To14Years_Female", + "Count_Death_15To19Years_Female", + "Count_Death_15To64Years_Female", + "Count_Death_20To24Years_Female", + "Count_Death_25To29Years_Female", + "Count_Death_30To34Years_Female", + "Count_Death_35To39Years_Female", + "Count_Death_40To44Years_Female", + "Count_Death_45To49Years_Female", + "Count_Death_50To54Years_Female", + "Count_Death_55To59Years_Female", + "Count_Death_5To9Years_Female", + "Count_Death_60To64Years_Female", + "Count_Death_65OrMoreYears_Female", + "Count_Death_65To69Years_Female", + "Count_Death_70To74Years_Female", + "Count_Death_75To79Years_Female", + "Count_Death_80OrMoreYears_Female", + "Count_Death_Upto14Years_Female", + "Count_Death_Upto4Years_Female" + ], + "causeOfDeath": [ + "Count_MortalityEvent_AIDS_Female", + "Count_MortalityEvent_AccidentalDischargeOfFirearms_Female", + "Count_MortalityEvent_AccidentalDrowningAndSubmersion_Female", + "Count_MortalityEvent_AccidentalExposureToSmokeFireAndFlames_Female", + "Count_MortalityEvent_AccidentalPoisoningAndExposureToNoxiousSubstances_Female", + "Count_MortalityEvent_Accidents(UnintentionalInjuries)_Female", + "Count_MortalityEvent_AcuteAndRapidlyProgressiveNephriticAndNephroticSyndrome_Female", + "Count_MortalityEvent_AcuteAndSubacuteEndocarditis_Female", + "Count_MortalityEvent_AcuteBronchitisAndBronchiolitis_Female", + "Count_MortalityEvent_AcuteMyocardialInfarction_Female", + "Count_MortalityEvent_AcuteRheumaticFeverAndChronicRheumaticHeartDiseases_Female", + "Count_MortalityEvent_AlcoholicLiverDisease_Female", + "Count_MortalityEvent_AllOtherAndUnspecifiedMalignantNeoplasms_Female", + "Count_MortalityEvent_AllOtherDiseases(Residual)_Female", + "Count_MortalityEvent_AllOtherFormsOfChronicIschemicHeartDisease_Female", + "Count_MortalityEvent_AllOtherFormsOfHeartDisease_Female", + "Count_MortalityEvent_AlzheimersDisease_Female", + "Count_MortalityEvent_AorticAneurysmAndDissection_Female" + ] + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "age": [ "Count_Person_18To24Years_EducationalAttainmentBachelorsDegreeOrHigher_Female", diff --git a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json index ad397d72ea..41211576d7 100644 --- a/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/femalepopulationincaliforniasinceapr2019/chart_config.json @@ -185,6 +185,38 @@ "denom": "Count_Person", "title": "Non-Separated Married Women in Counties of California" }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2019" + }, + "statVarKey": [ + "Count_Death_Female_1151455814" + ], + "title": "Count of Mortality Event: Female in California", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Count of Mortality Event: Female in California", + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in California", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female" + }, { "columns": [ { @@ -854,81 +886,17 @@ ], "denom": "Count_Person", "title": "Foreign Born Women" - }, - { - "columns": [ - { - "tiles": [ - { - "lineTileSpec": { - "startDate": "2019" - }, - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings_1472009826" - ], - "title": "Population: 16 Years or More, Female, With Earnings in California", - "type": "LINE" - } - ] - }, - { - "tiles": [ - { - "description": "Population: 16 Years or More, Female, With Earnings in California", - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in California", - "type": "HIGHLIGHT" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: 16 Years or More, Female, With Earnings" - }, - { - "columns": [ - { - "tiles": [ - { - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California (${date})", - "type": "MAP" - } - ] - }, - { - "tiles": [ - { - "rankingTileSpec": { - "rankingCount": 5, - "showHighestLowest": true - }, - "statVarKey": [ - "Count_Person_16OrMoreYears_Female_WithEarnings" - ], - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California (${date})", - "type": "RANKING" - } - ] - } - ], - "denom": "Count_Person", - "title": "Population: 16 Years or More, Female, With Earnings in Counties of California" } ], "statVarSpec": { - "Count_Person_16OrMoreYears_Female_WithEarnings": { - "name": "Population: 16 Years or More, Female, With Earnings", - "statVar": "Count_Person_16OrMoreYears_Female_WithEarnings" + "Count_Death_Female": { + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" }, - "Count_Person_16OrMoreYears_Female_WithEarnings_1472009826": { - "facetId": "1472009826", - "name": "Population: 16 Years or More, Female, With Earnings", - "statVar": "Count_Person_16OrMoreYears_Female_WithEarnings" + "Count_Death_Female_1151455814": { + "facetId": "1151455814", + "name": "Count of Mortality Event: Female", + "statVar": "Count_Death_Female" }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "name": "Population: Bachelors Degree or Higher, Female", @@ -1443,6 +1411,49 @@ }, "childTopics": [], "exploreMore": { + "Count_Death_Female": { + "age": [ + "Count_Death_10To14Years_Female", + "Count_Death_15To19Years_Female", + "Count_Death_15To64Years_Female", + "Count_Death_20To24Years_Female", + "Count_Death_25To29Years_Female", + "Count_Death_30To34Years_Female", + "Count_Death_35To39Years_Female", + "Count_Death_40To44Years_Female", + "Count_Death_45To49Years_Female", + "Count_Death_50To54Years_Female", + "Count_Death_55To59Years_Female", + "Count_Death_5To9Years_Female", + "Count_Death_60To64Years_Female", + "Count_Death_65OrMoreYears_Female", + "Count_Death_65To69Years_Female", + "Count_Death_70To74Years_Female", + "Count_Death_75To79Years_Female", + "Count_Death_80OrMoreYears_Female", + "Count_Death_Upto14Years_Female", + "Count_Death_Upto4Years_Female" + ], + "causeOfDeath": [ + "Count_MortalityEvent_AIDS_Female", + "Count_MortalityEvent_AccidentalDrowningAndSubmersion_Female", + "Count_MortalityEvent_AccidentalExposureToSmokeFireAndFlames_Female", + "Count_MortalityEvent_AccidentalPoisoningAndExposureToNoxiousSubstances_Female", + "Count_MortalityEvent_Accidents(UnintentionalInjuries)_Female", + "Count_MortalityEvent_AcuteAndRapidlyProgressiveNephriticAndNephroticSyndrome_Female", + "Count_MortalityEvent_AcuteAndSubacuteEndocarditis_Female", + "Count_MortalityEvent_AcuteBronchitisAndBronchiolitis_Female", + "Count_MortalityEvent_AcuteMyocardialInfarction_Female", + "Count_MortalityEvent_AcuteRheumaticFeverAndChronicRheumaticHeartDiseases_Female", + "Count_MortalityEvent_AlcoholicLiverDisease_Female", + "Count_MortalityEvent_AllOtherAndUnspecifiedMalignantNeoplasms_Female", + "Count_MortalityEvent_AllOtherDiseases(Residual)_Female", + "Count_MortalityEvent_AllOtherFormsOfChronicIschemicHeartDisease_Female", + "Count_MortalityEvent_AllOtherFormsOfHeartDisease_Female", + "Count_MortalityEvent_AlzheimersDisease_Female", + "Count_MortalityEvent_AorticAneurysmAndDissection_Female" + ] + }, "Count_Person_25OrMoreYears_EducationalAttainmentBachelorsDegreeOrHigher_Female": { "age": [ "Count_Person_18To24Years_EducationalAttainmentBachelorsDegreeOrHigher_Female", diff --git a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json index 9b8a9d4c5d..36c9afa15b 100644 --- a/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json +++ b/server/integration_tests/test_data/e2e_date_range/lifeexpectancyinusstatesinthelast5years/chart_config.json @@ -150,6 +150,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" + }, { "columns": [ { @@ -278,6 +310,38 @@ ], "title": "Causes of Death" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States" + }, { "columns": [ { diff --git a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json index 12d8754f1b..ef57c0251c 100644 --- a/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json +++ b/server/integration_tests/test_data/e2e_no_default_place_specified/chart_config.json @@ -205,6 +205,38 @@ "denom": "Count_Person", "title": "Count of Mortality Event: Female" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States of America (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female" + ], + "title": "Count of Mortality Event: Female in States of United States of America (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States of America" + }, { "columns": [ { @@ -1626,6 +1658,7 @@ "age": [ "Count_Person_0To4Years_Female_WhiteAlone", "Count_Person_0Years_Female_WhiteAlone", + "Count_Person_100Years_Female_WhiteAlone", "Count_Person_10To14Years_Female_WhiteAlone", "Count_Person_10Years_Female_WhiteAlone", "Count_Person_11Years_Female_WhiteAlone", @@ -1728,7 +1761,22 @@ "Count_Person_83Years_Female_WhiteAlone", "Count_Person_84Years_Female_WhiteAlone", "Count_Person_85OrMoreYears_Female_WhiteAlone", + "Count_Person_85Years_Female_WhiteAlone", + "Count_Person_86Years_Female_WhiteAlone", + "Count_Person_87Years_Female_WhiteAlone", + "Count_Person_88Years_Female_WhiteAlone", + "Count_Person_89Years_Female_WhiteAlone", "Count_Person_8Years_Female_WhiteAlone", + "Count_Person_90Years_Female_WhiteAlone", + "Count_Person_91Years_Female_WhiteAlone", + "Count_Person_92Years_Female_WhiteAlone", + "Count_Person_93Years_Female_WhiteAlone", + "Count_Person_94Years_Female_WhiteAlone", + "Count_Person_95Years_Female_WhiteAlone", + "Count_Person_96Years_Female_WhiteAlone", + "Count_Person_97Years_Female_WhiteAlone", + "Count_Person_98Years_Female_WhiteAlone", + "Count_Person_99Years_Female_WhiteAlone", "Count_Person_9Years_Female_WhiteAlone" ] }, diff --git a/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json b/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json index 83645c11d0..0dcbadae0c 100644 --- a/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json +++ b/server/integration_tests/test_data/e2e_single_date/lifeexpectancyinusstatesin2018/chart_config.json @@ -150,6 +150,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_2018" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_2018" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" + }, { "columns": [ { @@ -278,6 +310,38 @@ ], "title": "Causes of Death" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death_Female_2018" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death_Female_2018" + ], + "title": "Count of Mortality Event: Female in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Count of Mortality Event: Female in States of United States" + }, { "columns": [ { diff --git a/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json b/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json index 6e5905ebc3..6399b25bc3 100644 --- a/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json +++ b/server/integration_tests/test_data/e2e_single_date/populationintheusinthelastyear/chart_config.json @@ -13,7 +13,7 @@ "startDate": "2023" }, "statVarKey": [ - "Count_Person_3981252704" + "Count_Person_2176550201" ], "title": "Population in United States", "type": "LINE" @@ -35,6 +35,99 @@ ], "title": "Population" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person" + ], + "title": "Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person" + ], + "title": "Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_PerArea_1151455814" + ], + "title": "Population Density in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Population Density in United States", + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Population Density" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_PerArea" + ], + "title": "Population Density in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "title": "Population Density in States of United States" + }, { "columns": [ { @@ -44,27 +137,549 @@ "startDate": "2023" }, "statVarKey": [ - "GrowthRate_Count_Person_3981252704" + "GrowthRate_Count_Person_3981252704" + ], + "title": "Rate of Population Growth in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Rate of Population Growth in United States", + "statVarKey": [ + "GrowthRate_Count_Person" + ], + "title": "Rate of Population Growth in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "title": "Rate of Population Growth" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Female" + ], + "title": "Women Over 85 in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women Over 85 in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_85OrMoreYears_Male" + ], + "title": "Men Over 85 in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men Over 85 in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_Female_3999249536", + "Count_Person_Male_3999249536" + ], + "title": "Population by Gender in United States", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Population by Gender" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Female" + ], + "title": "Women in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Women in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_Male" + ], + "title": "Men in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Men in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_WhiteAlone_3935616881", + "Count_Person_BlackOrAfricanAmericanAlone_3935616881", + "Count_Person_HispanicOrLatino_2317674805", + "Count_Person_AsianAlone_3935616881", + "Count_Person_AmericanIndianAndAlaskaNativeAlone_3935616881" + ], + "title": "Monoracial Breakdown in United States", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Monoracial Breakdown" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_WhiteAlone" + ], + "title": "White Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "White Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_BlackOrAfricanAmericanAlone" + ], + "title": "Black Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Black Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881" + ], + "title": "Monoracial/multiracial Breakdown in United States", + "type": "LINE" + } + ] + } + ], + "denom": "Count_Person", + "title": "Monoracial/multiracial Breakdown" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "American Indian and Alaska Native Population, Monoracial/Multiracial in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + ], + "title": "Asian Population, Monoracial/Multiracial in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" ], - "title": "Rate of Population Growth in United States", - "type": "LINE" + "title": "Asian Population, Monoracial/Multiracial in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Asian Population, Monoracial/Multiracial in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "country/USA" + ], + "statVarKey": [ + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + ], + "title": "Racial Breakdown With Hispanic Consideration in United States (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Hispanic Consideration" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Hispanic American Indian Population in States of United States (${date})", + "type": "MAP" } ] }, { "tiles": [ { - "description": "Rate of Population Growth in United States", + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, "statVarKey": [ - "GrowthRate_Count_Person" + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" ], - "title": "Rate of Population Growth in United States", - "type": "HIGHLIGHT" + "title": "Hispanic American Indian Population in States of United States (${date})", + "type": "RANKING" } ] } ], - "title": "Rate of Population Growth" + "denom": "Count_Person", + "title": "Hispanic American Indian Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_HispanicOrLatino_AsianAlone" + ], + "title": "Hispanic Asian Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Hispanic Asian Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "barTileSpec": { + "maxPlaces": 15, + "maxVariables": 15, + "sort": "DESCENDING" + }, + "comparisonPlaces": [ + "country/USA" + ], + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block", + "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block" + ], + "title": "Racial Breakdown With Non Hispanic Consideration in United States (${date})", + "type": "BAR" + } + ] + } + ], + "denom": "Count_Person", + "title": "Racial Breakdown With Non Hispanic Consideration" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino" + ], + "title": "White Hispanic Monoracial Population in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_WhiteAloneNotHispanicOrLatino" + ], + "title": "White Hispanic Monoracial Population in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "White Hispanic Monoracial Population in States of United States" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + ], + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone in States of United States" }, { "columns": [ @@ -291,18 +906,141 @@ ], "denom": "Count_Person", "title": "Population: Household" + }, + { + "columns": [ + { + "tiles": [ + { + "lineTileSpec": { + "startDate": "2023" + }, + "statVarKey": [ + "Count_Death_1151455814" + ], + "title": "Number of Deaths in United States", + "type": "LINE" + } + ] + }, + { + "tiles": [ + { + "description": "Number of Deaths in United States", + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in United States", + "type": "HIGHLIGHT" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths" + }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in States of United States (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in States of United States" } ], "statVarSpec": { + "Count_Death": { + "name": "Number of Deaths", + "statVar": "Count_Death" + }, + "Count_Death_1151455814": { + "facetId": "1151455814", + "name": "Number of Deaths", + "statVar": "Count_Death" + }, "Count_Person": { "name": "Population", "statVar": "Count_Person" }, - "Count_Person_3981252704": { - "facetId": "3981252704", + "Count_Person_2176550201": { + "facetId": "2176550201", "name": "Population", "statVar": "Count_Person" }, + "Count_Person_85OrMoreYears_Female": { + "name": "Women over 85", + "statVar": "Count_Person_85OrMoreYears_Female" + }, + "Count_Person_85OrMoreYears_Male": { + "name": "Men over 85", + "statVar": "Count_Person_85OrMoreYears_Male" + }, + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces": { + "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", + "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "American Indian and Alaska Native Population, Monoracial/Multiracial", + "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AmericanIndianAndAlaskaNativeAlone_3935616881": { + "facetId": "3935616881", + "name": "Population American Indian or Alaska Native Alone", + "statVar": "Count_Person_AmericanIndianAndAlaskaNativeAlone" + }, + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces": { + "name": "Asian Population, Monoracial/Multiracial", + "statVar": "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "Asian Population, Monoracial/Multiracial", + "statVar": "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_AsianAlone_3935616881": { + "facetId": "3935616881", + "name": "Population Asian Alone", + "statVar": "Count_Person_AsianAlone" + }, + "Count_Person_BlackOrAfricanAmericanAlone": { + "name": "Black Monoracial Population", + "statVar": "Count_Person_BlackOrAfricanAmericanAlone" + }, + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "Black Population, Monoracial/Multiracial", + "statVar": "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_BlackOrAfricanAmericanAlone_3935616881": { + "facetId": "3935616881", + "name": "Black Monoracial Population", + "statVar": "Count_Person_BlackOrAfricanAmericanAlone" + }, "Count_Person_Employed": { "name": "Population With Current Employment", "statVar": "Count_Person_Employed" @@ -312,6 +1050,68 @@ "name": "Population With Current Employment", "statVar": "Count_Person_Employed" }, + "Count_Person_Female": { + "name": "Women", + "statVar": "Count_Person_Female" + }, + "Count_Person_Female_3999249536": { + "facetId": "3999249536", + "name": "Women", + "statVar": "Count_Person_Female" + }, + "Count_Person_HispanicOrLatino_2317674805": { + "facetId": "2317674805", + "name": "Hispanic Population", + "statVar": "Count_Person_HispanicOrLatino" + }, + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Hispanic American Indian Population", + "statVar": "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { + "name": "Hispanic American Indian Population", + "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { + "name": "Hispanic American Indian Population", + "statVar": "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, + "Count_Person_HispanicOrLatino_AsianAlone": { + "name": "Hispanic Asian Population", + "statVar": "Count_Person_HispanicOrLatino_AsianAlone" + }, + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Hispanic Asian Population", + "statVar": "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_AsianAlone_multiple_place_bar_block": { + "name": "Hispanic Asian Population", + "statVar": "Count_Person_HispanicOrLatino_AsianAlone" + }, + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block": { + "name": "Hispanic African American Population", + "statVar": "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone" + }, + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Hispanic Native Hawaiian/Other Pacific Islander Population. Monoracial/Multiracial", + "statVar": "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block": { + "name": "Hispanic Native Hawaiian/Other Pacific Islander Alone Population", + "statVar": "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone" + }, + "Count_Person_HispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block": { + "name": "Hispanic Multiracial Population", + "statVar": "Count_Person_HispanicOrLatino_TwoOrMoreRaces" + }, + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "White Hispanic Population, Monoracial/Multiracial", + "statVar": "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_HispanicOrLatino_WhiteAlone_multiple_place_bar_block": { + "name": "White Hispanic Monoracial Population", + "statVar": "Count_Person_HispanicOrLatino_WhiteAlone" + }, "Count_Person_InLaborForce": { "name": "Population in the Labor Force", "statVar": "Count_Person_InLaborForce" @@ -321,6 +1121,73 @@ "name": "Population in the Labor Force", "statVar": "Count_Person_InLaborForce" }, + "Count_Person_Male": { + "name": "Men", + "statVar": "Count_Person_Male" + }, + "Count_Person_Male_3999249536": { + "facetId": "3999249536", + "name": "Men", + "statVar": "Count_Person_Male" + }, + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "Native Hawaiian and Other Pacific Islander Population, Monoracial/Multiracial", + "statVar": "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as American Indian and Alaska Native, Monoracial/Multiracial", + "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone": { + "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", + "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as American Indian or Alaska Native Alone", + "statVar": "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone" + }, + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Asian", + "statVar": "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_AsianAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Asian Alone", + "statVar": "Count_Person_NotHispanicOrLatino_AsianAlone" + }, + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Black or African American", + "statVar": "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Black or African American Alone", + "statVar": "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone" + }, + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Native Hawaiian and Other Pacific Islander", + "statVar": "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone_multiple_place_bar_block": { + "name": "Non Hispanic Population Identifying as Native Hawaiian or Other Pacific Islander Alone", + "statVar": "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone" + }, + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces_multiple_place_bar_block": { + "name": "Non Hispanic Multiracial Population", + "statVar": "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces" + }, + "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_multiple_place_bar_block": { + "name": "Non Hispanic White Population, Monoracial/Multiracial", + "statVar": "Count_Person_NotHispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_PerArea": { + "name": "Population Density", + "statVar": "Count_Person_PerArea" + }, + "Count_Person_PerArea_1151455814": { + "facetId": "1151455814", + "name": "Population Density", + "statVar": "Count_Person_PerArea" + }, "Count_Person_ResidesInHousehold": { "name": "Population: Household", "statVar": "Count_Person_ResidesInHousehold" @@ -348,6 +1215,28 @@ "name": "Population Living in Urban Areas", "statVar": "Count_Person_Urban" }, + "Count_Person_WhiteAlone": { + "name": "White Monoracial Population", + "statVar": "Count_Person_WhiteAlone" + }, + "Count_Person_WhiteAloneNotHispanicOrLatino": { + "name": "White Hispanic Monoracial Population", + "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" + }, + "Count_Person_WhiteAloneNotHispanicOrLatino_multiple_place_bar_block": { + "name": "White Hispanic Monoracial Population", + "statVar": "Count_Person_WhiteAloneNotHispanicOrLatino" + }, + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces_3935616881": { + "facetId": "3935616881", + "name": "White Population, Monoracial/Multiracial", + "statVar": "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" + }, + "Count_Person_WhiteAlone_3935616881": { + "facetId": "3935616881", + "name": "White Monoracial Population", + "statVar": "Count_Person_WhiteAlone" + }, "GrowthRate_Count_Person": { "name": "Rate of Population Growth", "statVar": "GrowthRate_Count_Person" @@ -795,9 +1684,45 @@ ], "exploreMore": { "Count_Person": { + "gender": [ + "Count_Person_Female", + "Count_Person_Male" + ], "placeOfResidenceClassification": [ "Count_Person_Rural", "Count_Person_Urban" + ], + "race": [ + "Count_Person_AmericanIndianAndAlaskaNativeAlone", + "Count_Person_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_AsianAlone", + "Count_Person_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_BlackOrAfricanAmericanAlone", + "Count_Person_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino", + "Count_Person_HispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_AmericanIndianOrAlaskaNativeAlone", + "Count_Person_HispanicOrLatino_AsianAlone", + "Count_Person_HispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_BlackOrAfricanAmericanAlone", + "Count_Person_HispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_HispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone", + "Count_Person_HispanicOrLatino_TwoOrMoreRaces", + "Count_Person_HispanicOrLatino_WhiteAlone", + "Count_Person_HispanicOrLatino_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_AmericanIndianAndAlaskaNativeAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_AmericanIndianOrAlaskaNativeAlone", + "Count_Person_NotHispanicOrLatino_AsianAlone", + "Count_Person_NotHispanicOrLatino_AsianAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAlone", + "Count_Person_NotHispanicOrLatino_BlackOrAfricanAmericanAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_NativeHawaiianAndOtherPacificIslanderAloneOrInCombinationWithOneOrMoreOtherRaces", + "Count_Person_NotHispanicOrLatino_NativeHawaiianOrOtherPacificIslanderAlone", + "Count_Person_NotHispanicOrLatino_TwoOrMoreRaces", + "Count_Person_WhiteAlone", + "Count_Person_WhiteAloneNotHispanicOrLatino", + "Count_Person_WhiteAloneOrInCombinationWithOneOrMoreOtherRaces" ] } }, diff --git a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json index 605e422760..4b01d93255 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhasemploymentinhospitalitychangedovertimeinnewjerseycounties/chart_config.json @@ -13,17 +13,17 @@ "geoId/34025", "geoId/34003", "geoId/34017", - "geoId/34029", "geoId/34013", + "geoId/34029", "geoId/34027", "geoId/34023", "geoId/34015", "geoId/34035", "geoId/34005", "geoId/34031", - "geoId/34009", "geoId/34021", "geoId/34007", + "geoId/34009", "geoId/34039", "geoId/34037", "geoId/34019", @@ -85,11 +85,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34029", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Ocean County", + "title": "Essex County", "type": "LINE" } ] @@ -97,11 +97,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34029", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Essex County", + "title": "Ocean County", "type": "LINE" } ] @@ -181,11 +181,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34009", + "placeDcidOverride": "geoId/34021", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Cape May County", + "title": "Mercer County", "type": "LINE" } ] @@ -193,11 +193,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34021", + "placeDcidOverride": "geoId/34007", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Mercer County", + "title": "Camden County", "type": "LINE" } ] @@ -205,11 +205,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34007", + "placeDcidOverride": "geoId/34009", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_abs_1429745441" ], - "title": "Camden County", + "title": "Cape May County", "type": "LINE" } ] @@ -343,11 +343,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34025", + "placeDcidOverride": "geoId/34035", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Monmouth County", + "title": "Somerset County", "type": "LINE" } ] @@ -355,11 +355,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34035", + "placeDcidOverride": "geoId/34025", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Somerset County", + "title": "Monmouth County", "type": "LINE" } ] @@ -367,11 +367,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34019", + "placeDcidOverride": "geoId/34037", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Hunterdon County", + "title": "Sussex County", "type": "LINE" } ] @@ -379,11 +379,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34037", + "placeDcidOverride": "geoId/34019", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Sussex County", + "title": "Hunterdon County", "type": "LINE" } ] @@ -403,11 +403,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34031", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Passaic County", + "title": "Essex County", "type": "LINE" } ] @@ -415,11 +415,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34009", + "placeDcidOverride": "geoId/34003", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Cape May County", + "title": "Bergen County", "type": "LINE" } ] @@ -427,11 +427,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34003", + "placeDcidOverride": "geoId/34031", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Bergen County", + "title": "Passaic County", "type": "LINE" } ] @@ -439,11 +439,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34009", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Essex County", + "title": "Cape May County", "type": "LINE" } ] @@ -463,11 +463,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34011", + "placeDcidOverride": "geoId/34005", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Cumberland County", + "title": "Burlington County", "type": "LINE" } ] @@ -475,11 +475,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34005", + "placeDcidOverride": "geoId/34011", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pct_1429745441" ], - "title": "Burlington County", + "title": "Cumberland County", "type": "LINE" } ] @@ -661,11 +661,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34019", + "placeDcidOverride": "geoId/34037", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Hunterdon County", + "title": "Sussex County", "type": "LINE" } ] @@ -673,11 +673,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34037", + "placeDcidOverride": "geoId/34013", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Sussex County", + "title": "Essex County", "type": "LINE" } ] @@ -685,11 +685,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34021", + "placeDcidOverride": "geoId/34019", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Mercer County", + "title": "Hunterdon County", "type": "LINE" } ] @@ -697,11 +697,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34013", + "placeDcidOverride": "geoId/34021", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Essex County", + "title": "Mercer County", "type": "LINE" } ] @@ -745,11 +745,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34011", + "placeDcidOverride": "geoId/34007", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Cumberland County", + "title": "Camden County", "type": "LINE" } ] @@ -757,11 +757,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34007", + "placeDcidOverride": "geoId/34011", "statVarKey": [ "Count_Worker_NAICSAccommodationFoodServices_growth_pc_1429745441" ], - "title": "Camden County", + "title": "Cumberland County", "type": "LINE" } ] diff --git a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json index 398bb3b8f3..1eed7020a4 100644 --- a/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json +++ b/server/integration_tests/test_data/e2e_toolformer_rag_mode/howhaslifeexpectancychangedovertimeacrossusstates/chart_config.json @@ -11,56 +11,56 @@ { "comparisonPlaces": [ "geoId/11", + "geoId/06", + "geoId/36", "geoId/15", "geoId/53", + "geoId/51", "geoId/41", - "geoId/16", "geoId/33", - "geoId/51", - "geoId/23", "geoId/25", - "geoId/49", - "geoId/13", "geoId/50", - "geoId/44", - "geoId/42", - "geoId/37", - "geoId/30", + "geoId/32", + "geoId/34", + "geoId/24", + "geoId/13", "geoId/10", - "geoId/08", + "geoId/17", "geoId/02", - "geoId/32", - "geoId/06", - "geoId/40", + "geoId/44", "geoId/12", - "geoId/56", + "geoId/37", + "geoId/16", + "geoId/09", + "geoId/23", + "geoId/42", "geoId/48", + "geoId/08", "geoId/27", - "geoId/24", - "geoId/31", "geoId/45", "geoId/26", - "geoId/19", - "geoId/17", - "geoId/05", - "geoId/01", + "geoId/49", "geoId/55", - "geoId/20", - "geoId/09", + "geoId/31", + "geoId/30", + "geoId/19", + "geoId/04", + "geoId/56", + "geoId/22", + "geoId/39", "geoId/29", + "geoId/46", + "geoId/20", + "geoId/18", + "geoId/01", "geoId/47", - "geoId/39", - "geoId/21", + "geoId/05", "geoId/38", - "geoId/18", - "geoId/54", - "geoId/22", - "geoId/46", - "geoId/36", - "geoId/34", + "geoId/21", + "geoId/40", "geoId/28", - "geoId/04", - "geoId/35" + "geoId/35", + "geoId/54" ], "statVarKey": [ "LifeExpectancy_Person51" @@ -90,11 +90,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/15", + "placeDcidOverride": "geoId/06", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Hawaii", + "title": "California", "type": "LINE" } ] @@ -102,11 +102,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/53", + "placeDcidOverride": "geoId/36", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Washington", + "title": "New York", "type": "LINE" } ] @@ -114,11 +114,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/41", + "placeDcidOverride": "geoId/15", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Oregon", + "title": "Hawaii", "type": "LINE" } ] @@ -126,11 +126,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/16", + "placeDcidOverride": "geoId/53", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Idaho", + "title": "Washington", "type": "LINE" } ] @@ -138,11 +138,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/33", + "placeDcidOverride": "geoId/51", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Hampshire", + "title": "Virginia", "type": "LINE" } ] @@ -150,11 +150,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/51", + "placeDcidOverride": "geoId/41", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Virginia", + "title": "Oregon", "type": "LINE" } ] @@ -162,11 +162,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/23", + "placeDcidOverride": "geoId/33", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Maine", + "title": "New Hampshire", "type": "LINE" } ] @@ -186,11 +186,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/49", + "placeDcidOverride": "geoId/50", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Utah", + "title": "Vermont", "type": "LINE" } ] @@ -198,11 +198,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/13", + "placeDcidOverride": "geoId/32", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Georgia", + "title": "Nevada", "type": "LINE" } ] @@ -210,11 +210,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/50", + "placeDcidOverride": "geoId/34", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Vermont", + "title": "New Jersey", "type": "LINE" } ] @@ -222,11 +222,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/44", + "placeDcidOverride": "geoId/24", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Rhode Island", + "title": "Maryland", "type": "LINE" } ] @@ -234,11 +234,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/42", + "placeDcidOverride": "geoId/13", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Pennsylvania", + "title": "Georgia", "type": "LINE" } ] @@ -246,11 +246,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/37", + "placeDcidOverride": "geoId/10", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "North Carolina", + "title": "Delaware", "type": "LINE" } ] @@ -258,11 +258,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/30", + "placeDcidOverride": "geoId/17", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Montana", + "title": "Illinois", "type": "LINE" } ] @@ -270,11 +270,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/10", + "placeDcidOverride": "geoId/02", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Delaware", + "title": "Alaska", "type": "LINE" } ] @@ -282,11 +282,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/08", + "placeDcidOverride": "geoId/44", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Colorado", + "title": "Rhode Island", "type": "LINE" } ] @@ -294,11 +294,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/02", + "placeDcidOverride": "geoId/12", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Alaska", + "title": "Florida", "type": "LINE" } ] @@ -306,11 +306,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/32", + "placeDcidOverride": "geoId/37", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Nevada", + "title": "North Carolina", "type": "LINE" } ] @@ -318,11 +318,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/06", + "placeDcidOverride": "geoId/16", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "California", + "title": "Idaho", "type": "LINE" } ] @@ -330,11 +330,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/40", + "placeDcidOverride": "geoId/09", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Oklahoma", + "title": "Connecticut", "type": "LINE" } ] @@ -342,11 +342,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/12", + "placeDcidOverride": "geoId/23", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Florida", + "title": "Maine", "type": "LINE" } ] @@ -354,11 +354,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/56", + "placeDcidOverride": "geoId/42", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Wyoming", + "title": "Pennsylvania", "type": "LINE" } ] @@ -378,11 +378,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/27", + "placeDcidOverride": "geoId/08", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Minnesota", + "title": "Colorado", "type": "LINE" } ] @@ -390,11 +390,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/24", + "placeDcidOverride": "geoId/27", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Maryland", + "title": "Minnesota", "type": "LINE" } ] @@ -402,11 +402,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/31", + "placeDcidOverride": "geoId/45", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Nebraska", + "title": "South Carolina", "type": "LINE" } ] @@ -414,11 +414,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/45", + "placeDcidOverride": "geoId/26", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "South Carolina", + "title": "Michigan", "type": "LINE" } ] @@ -426,11 +426,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/26", + "placeDcidOverride": "geoId/49", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Michigan", + "title": "Utah", "type": "LINE" } ] @@ -438,11 +438,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/19", + "placeDcidOverride": "geoId/55", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Iowa", + "title": "Wisconsin", "type": "LINE" } ] @@ -450,11 +450,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/17", + "placeDcidOverride": "geoId/31", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Illinois", + "title": "Nebraska", "type": "LINE" } ] @@ -462,11 +462,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/05", + "placeDcidOverride": "geoId/30", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Arkansas", + "title": "Montana", "type": "LINE" } ] @@ -474,11 +474,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/01", + "placeDcidOverride": "geoId/19", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Alabama", + "title": "Iowa", "type": "LINE" } ] @@ -486,11 +486,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/55", + "placeDcidOverride": "geoId/04", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Wisconsin", + "title": "Arizona", "type": "LINE" } ] @@ -498,11 +498,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/20", + "placeDcidOverride": "geoId/56", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Kansas", + "title": "Wyoming", "type": "LINE" } ] @@ -510,11 +510,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/09", + "placeDcidOverride": "geoId/22", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Connecticut", + "title": "Louisiana", "type": "LINE" } ] @@ -522,11 +522,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/29", + "placeDcidOverride": "geoId/39", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Missouri", + "title": "Ohio", "type": "LINE" } ] @@ -534,11 +534,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/47", + "placeDcidOverride": "geoId/29", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Tennessee", + "title": "Missouri", "type": "LINE" } ] @@ -546,11 +546,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/39", + "placeDcidOverride": "geoId/46", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Ohio", + "title": "South Dakota", "type": "LINE" } ] @@ -558,11 +558,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/21", + "placeDcidOverride": "geoId/20", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Kentucky", + "title": "Kansas", "type": "LINE" } ] @@ -570,11 +570,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/38", + "placeDcidOverride": "geoId/18", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "North Dakota", + "title": "Indiana", "type": "LINE" } ] @@ -582,11 +582,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/18", + "placeDcidOverride": "geoId/01", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Indiana", + "title": "Alabama", "type": "LINE" } ] @@ -594,11 +594,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/54", + "placeDcidOverride": "geoId/47", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "West Virginia", + "title": "Tennessee", "type": "LINE" } ] @@ -606,11 +606,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/22", + "placeDcidOverride": "geoId/05", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Louisiana", + "title": "Arkansas", "type": "LINE" } ] @@ -618,11 +618,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/46", + "placeDcidOverride": "geoId/38", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "South Dakota", + "title": "North Dakota", "type": "LINE" } ] @@ -630,11 +630,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/36", + "placeDcidOverride": "geoId/21", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New York", + "title": "Kentucky", "type": "LINE" } ] @@ -642,11 +642,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34", + "placeDcidOverride": "geoId/40", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Jersey", + "title": "Oklahoma", "type": "LINE" } ] @@ -666,11 +666,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/04", + "placeDcidOverride": "geoId/35", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "Arizona", + "title": "New Mexico", "type": "LINE" } ] @@ -678,11 +678,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/35", + "placeDcidOverride": "geoId/54", "statVarKey": [ "LifeExpectancy_Person_growth_abs" ], - "title": "New Mexico", + "title": "West Virginia", "type": "LINE" } ] @@ -707,11 +707,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/15", + "placeDcidOverride": "geoId/06", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Hawaii", + "title": "California", "type": "LINE" } ] @@ -719,11 +719,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/53", + "placeDcidOverride": "geoId/36", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Washington", + "title": "New York", "type": "LINE" } ] @@ -731,11 +731,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/41", + "placeDcidOverride": "geoId/15", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Oregon", + "title": "Hawaii", "type": "LINE" } ] @@ -743,11 +743,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/16", + "placeDcidOverride": "geoId/51", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Idaho", + "title": "Virginia", "type": "LINE" } ] @@ -755,11 +755,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/33", + "placeDcidOverride": "geoId/53", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Hampshire", + "title": "Washington", "type": "LINE" } ] @@ -767,11 +767,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/23", + "placeDcidOverride": "geoId/41", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Maine", + "title": "Oregon", "type": "LINE" } ] @@ -779,11 +779,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/51", + "placeDcidOverride": "geoId/33", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Virginia", + "title": "New Hampshire", "type": "LINE" } ] @@ -803,11 +803,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/49", + "placeDcidOverride": "geoId/50", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Utah", + "title": "Vermont", "type": "LINE" } ] @@ -815,11 +815,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/13", + "placeDcidOverride": "geoId/32", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Georgia", + "title": "Nevada", "type": "LINE" } ] @@ -827,11 +827,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/50", + "placeDcidOverride": "geoId/34", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Vermont", + "title": "New Jersey", "type": "LINE" } ] @@ -839,11 +839,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/08", + "placeDcidOverride": "geoId/13", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Colorado", + "title": "Georgia", "type": "LINE" } ] @@ -851,11 +851,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/44", + "placeDcidOverride": "geoId/24", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Rhode Island", + "title": "Maryland", "type": "LINE" } ] @@ -863,11 +863,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/42", + "placeDcidOverride": "geoId/10", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Pennsylvania", + "title": "Delaware", "type": "LINE" } ] @@ -875,11 +875,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/30", + "placeDcidOverride": "geoId/17", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Montana", + "title": "Illinois", "type": "LINE" } ] @@ -887,11 +887,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/10", + "placeDcidOverride": "geoId/02", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Delaware", + "title": "Alaska", "type": "LINE" } ] @@ -899,11 +899,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/02", + "placeDcidOverride": "geoId/12", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Alaska", + "title": "Florida", "type": "LINE" } ] @@ -923,11 +923,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/06", + "placeDcidOverride": "geoId/44", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "California", + "title": "Rhode Island", "type": "LINE" } ] @@ -935,11 +935,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/32", + "placeDcidOverride": "geoId/16", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Nevada", + "title": "Idaho", "type": "LINE" } ] @@ -947,11 +947,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/40", + "placeDcidOverride": "geoId/09", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Oklahoma", + "title": "Connecticut", "type": "LINE" } ] @@ -959,11 +959,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/12", + "placeDcidOverride": "geoId/23", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Florida", + "title": "Maine", "type": "LINE" } ] @@ -971,11 +971,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/27", + "placeDcidOverride": "geoId/42", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Minnesota", + "title": "Pennsylvania", "type": "LINE" } ] @@ -983,11 +983,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/24", + "placeDcidOverride": "geoId/48", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Maryland", + "title": "Texas", "type": "LINE" } ] @@ -995,11 +995,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/48", + "placeDcidOverride": "geoId/45", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Texas", + "title": "South Carolina", "type": "LINE" } ] @@ -1007,11 +1007,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/56", + "placeDcidOverride": "geoId/08", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Wyoming", + "title": "Colorado", "type": "LINE" } ] @@ -1019,11 +1019,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/31", + "placeDcidOverride": "geoId/27", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Nebraska", + "title": "Minnesota", "type": "LINE" } ] @@ -1031,11 +1031,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/19", + "placeDcidOverride": "geoId/26", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Iowa", + "title": "Michigan", "type": "LINE" } ] @@ -1043,11 +1043,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/17", + "placeDcidOverride": "geoId/49", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Illinois", + "title": "Utah", "type": "LINE" } ] @@ -1055,11 +1055,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/26", + "placeDcidOverride": "geoId/55", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Michigan", + "title": "Wisconsin", "type": "LINE" } ] @@ -1067,11 +1067,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/45", + "placeDcidOverride": "geoId/31", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "South Carolina", + "title": "Nebraska", "type": "LINE" } ] @@ -1079,11 +1079,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/55", + "placeDcidOverride": "geoId/30", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Wisconsin", + "title": "Montana", "type": "LINE" } ] @@ -1091,11 +1091,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/05", + "placeDcidOverride": "geoId/19", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Arkansas", + "title": "Iowa", "type": "LINE" } ] @@ -1103,11 +1103,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/01", + "placeDcidOverride": "geoId/04", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Alabama", + "title": "Arizona", "type": "LINE" } ] @@ -1115,11 +1115,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/20", + "placeDcidOverride": "geoId/56", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Kansas", + "title": "Wyoming", "type": "LINE" } ] @@ -1127,11 +1127,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/09", + "placeDcidOverride": "geoId/22", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Connecticut", + "title": "Louisiana", "type": "LINE" } ] @@ -1139,11 +1139,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/29", + "placeDcidOverride": "geoId/39", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Missouri", + "title": "Ohio", "type": "LINE" } ] @@ -1151,11 +1151,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/39", + "placeDcidOverride": "geoId/29", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Ohio", + "title": "Missouri", "type": "LINE" } ] @@ -1163,11 +1163,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/38", + "placeDcidOverride": "geoId/46", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "North Dakota", + "title": "South Dakota", "type": "LINE" } ] @@ -1175,11 +1175,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/47", + "placeDcidOverride": "geoId/20", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Tennessee", + "title": "Kansas", "type": "LINE" } ] @@ -1187,11 +1187,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/21", + "placeDcidOverride": "geoId/18", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Kentucky", + "title": "Indiana", "type": "LINE" } ] @@ -1199,11 +1199,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/18", + "placeDcidOverride": "geoId/01", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Indiana", + "title": "Alabama", "type": "LINE" } ] @@ -1211,11 +1211,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/22", + "placeDcidOverride": "geoId/47", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Louisiana", + "title": "Tennessee", "type": "LINE" } ] @@ -1223,11 +1223,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/54", + "placeDcidOverride": "geoId/05", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "West Virginia", + "title": "Arkansas", "type": "LINE" } ] @@ -1235,11 +1235,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/36", + "placeDcidOverride": "geoId/38", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New York", + "title": "North Dakota", "type": "LINE" } ] @@ -1247,11 +1247,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/34", + "placeDcidOverride": "geoId/21", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Jersey", + "title": "Kentucky", "type": "LINE" } ] @@ -1259,11 +1259,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/46", + "placeDcidOverride": "geoId/40", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "South Dakota", + "title": "Oklahoma", "type": "LINE" } ] @@ -1283,11 +1283,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/04", + "placeDcidOverride": "geoId/35", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "Arizona", + "title": "New Mexico", "type": "LINE" } ] @@ -1295,11 +1295,11 @@ { "tiles": [ { - "placeDcidOverride": "geoId/35", + "placeDcidOverride": "geoId/54", "statVarKey": [ "LifeExpectancy_Person_growth_pct" ], - "title": "New Mexico", + "title": "West Virginia", "type": "LINE" } ] diff --git a/server/integration_tests/test_data/international/query_2/chart_config.json b/server/integration_tests/test_data/international/query_2/chart_config.json index 98bc57c6b6..68ae66e253 100644 --- a/server/integration_tests/test_data/international/query_2/chart_config.json +++ b/server/integration_tests/test_data/international/query_2/chart_config.json @@ -144,6 +144,38 @@ ], "title": "Life Expectancy by Gender" }, + { + "columns": [ + { + "tiles": [ + { + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in Administrative Area 1 Places of China (${date})", + "type": "MAP" + } + ] + }, + { + "tiles": [ + { + "rankingTileSpec": { + "rankingCount": 5, + "showHighestLowest": true + }, + "statVarKey": [ + "Count_Death" + ], + "title": "Number of Deaths in Administrative Area 1 Places of China (${date})", + "type": "RANKING" + } + ] + } + ], + "denom": "Count_Person", + "title": "Number of Deaths in Administrative Area 1 Places of China" + }, { "columns": [ { diff --git a/server/webdriver/shared_tests/download_test.py b/server/webdriver/shared_tests/download_test.py index df34f66a97..12950025ff 100644 --- a/server/webdriver/shared_tests/download_test.py +++ b/server/webdriver/shared_tests/download_test.py @@ -23,15 +23,18 @@ DOWNLOAD_URL = '/tools/download' PLACE_SEARCH_CA = 'California' +SKIP_CHECK = 'SKIP_CHECK' TABLE_HEADERS = [ 'placeDcid', 'placeName', 'Date:Median_Age_Person', 'Value:Median_Age_Person', 'Source:Median_Age_Person', 'Date:Count_Person', 'Value:Count_Person', 'Source:Count_Person' ] +# SKIP_CHECK for the values that change with each import. TABLE_ROW_1 = [ - 'geoId/06001', 'Alameda County', '2022', '38.4', + 'geoId/06001', 'Alameda County', SKIP_CHECK, SKIP_CHECK, 'https://www.census.gov/programs-surveys/acs/data/data-via-ftp.html', - '2022', '1628997', 'https://www2.census.gov/programs-surveys/popest/tables' + SKIP_CHECK, SKIP_CHECK, + 'https://www2.census.gov/programs-surveys/popest/tables' ] MAX_NUM_FILE_CHECK_TRIES = 3 @@ -145,7 +148,8 @@ def test_manually_enter_options(self): self.assertGreater(len(table_rows), 1) first_row_cells = table_rows[0].find_elements(By.TAG_NAME, 'td') for idx, cell in enumerate(first_row_cells): - self.assertEqual(cell.text, TABLE_ROW_1[idx]) + if SKIP_CHECK not in TABLE_ROW_1[idx]: + self.assertEqual(cell.text, TABLE_ROW_1[idx]) # Click download self.driver.find_element(By.XPATH, @@ -160,4 +164,4 @@ def test_manually_enter_options(self): if len(downloaded_files) > 0: break num_tries += 1 - self.assertEqual(downloaded_files[0], "California_County.csv") + self.assertEqual(downloaded_files[0], "California_County.csv") \ No newline at end of file diff --git a/server/webdriver/shared_tests/map_test.py b/server/webdriver/shared_tests/map_test.py index b061950f1e..d9790f89d3 100644 --- a/server/webdriver/shared_tests/map_test.py +++ b/server/webdriver/shared_tests/map_test.py @@ -61,7 +61,7 @@ def test_charts_from_url(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -95,7 +95,7 @@ def test_charts_from_url(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 52) @@ -161,7 +161,7 @@ def test_manually_enter_options(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_title = self.driver.find_element( By.XPATH, '//*[@id="map-chart"]/div/div[1]/h3') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) diff --git a/server/webdriver/shared_tests/place_explorer_test.py b/server/webdriver/shared_tests/place_explorer_test.py index 9484bff058..617e649d50 100644 --- a/server/webdriver/shared_tests/place_explorer_test.py +++ b/server/webdriver/shared_tests/place_explorer_test.py @@ -160,7 +160,7 @@ def test_place_search(self): def test_demographics_link(self): """Test the demographics link can work correctly.""" - chart_title = "Median age by gender: states near California(2022)" + title_text = "Median age by gender: states near California" # Load California page. self.driver.get(self.url_ + CA_URL) @@ -187,7 +187,7 @@ def test_demographics_link(self): By.XPATH, '//*[@id="main-pane"]/section[4]/div/div[2]/div/h4').text # Assert chart title is correct. - self.assertEqual(chart_title, chart_title) + self.assertIn(title_text, chart_title) def test_demographics_redirect_link(self): """Test a place page with demographics after a redirect.""" @@ -210,8 +210,7 @@ def test_demographics_redirect_link(self): By.XPATH, '//*[@id="main-pane"]/section[4]/div/div[2]/div/h4').text # Assert chart title is correct. - self.assertEqual("Median age by gender: states near California(2022)", - chart_title) + self.assertIn("Median age by gender: states near California", chart_title) def test_explorer_redirect_place_explorer(self): """Test the redirection from explore to place explore for single place queries""" @@ -331,4 +330,4 @@ def test_ranking_chart_redirect_link(self): # Check the title text page_title = self.driver.find_element(By.ID, 'place-name').text - self.assertEqual(page_title, place_name_text) + self.assertEqual(page_title, place_name_text) \ No newline at end of file diff --git a/server/webdriver/shared_tests/scatter_test.py b/server/webdriver/shared_tests/scatter_test.py index 47a7752466..af217182b5 100644 --- a/server/webdriver/shared_tests/scatter_test.py +++ b/server/webdriver/shared_tests/scatter_test.py @@ -65,9 +65,8 @@ def test_charts_from_url(self): By.XPATH, '//*[@id="chart"]/div[1]/div[1]/h3[1]') chart_title_x = self.driver.find_element( By.XPATH, '//*[@id="chart"]/div[1]/div[1]/h3[2]') - self.assertEqual(chart_title_y.text, - "Population Asian Alone Per Capita (2022)") - self.assertEqual(chart_title_x.text, "Median Income of a Population (2022)") + self.assertIn("Population Asian Alone Per Capita ", chart_title_y.text) + self.assertIn("Median Income of a Population ", chart_title_x.text) chart = self.driver.find_element(By.XPATH, '//*[@id="scatterplot"]') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -157,4 +156,4 @@ def test_landing_page_link(self): shared.wait_for_loading(self.driver) chart = self.driver.find_element(By.XPATH, '//*[@id="scatterplot"]') circles = chart.find_elements(By.TAG_NAME, 'circle') - self.assertGreater(len(circles), 1) + self.assertGreater(len(circles), 1) \ No newline at end of file diff --git a/server/webdriver/shared_tests/vis_map_test.py b/server/webdriver/shared_tests/vis_map_test.py index edcf740d31..cfb82fac55 100644 --- a/server/webdriver/shared_tests/vis_map_test.py +++ b/server/webdriver/shared_tests/vis_map_test.py @@ -79,7 +79,7 @@ def test_charts_from_url(self): # Assert chart is correct. chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Female Population (2022)") + self.assertIn("Female Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -93,8 +93,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Los Angeles County, CA') - self.assertEqual(ranking_items[9].text, 'Trinity County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) # Click per capita and assert results are correct. per_capita_checkbox = self.driver.find_element( @@ -110,8 +110,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Alpine County, CA') - self.assertEqual(ranking_items[9].text, 'Del Norte County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) # Edit source and assert results are correct. edit_source_button = self.driver.find_element( @@ -128,7 +128,7 @@ def test_charts_from_url(self): shared.wait_for_loading(self.driver) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Female Population (2004 to 2020)") + self.assertIn("Female Population ", chart_title.text) chart_source = self.driver.find_element( By.CSS_SELECTOR, '.map-chart .chart-headers .sources') self.assertTrue("wonder.cdc.gov" in chart_source.text) @@ -138,8 +138,8 @@ def test_charts_from_url(self): ranking_items = self.driver.find_elements(By.CSS_SELECTOR, '.ranking-list .place-name') self.assertEqual(len(ranking_items), 10) - self.assertEqual(ranking_items[0].text, 'Madera County, CA') - self.assertEqual(ranking_items[9].text, 'Tuolumne County, CA') + self.assertIn(' County, CA', ranking_items[0].text) + self.assertIn(' County, CA', ranking_items[9].text) def test_manually_enter_options(self): """Test entering place and stat var options manually will cause chart to @@ -209,7 +209,7 @@ def test_manually_enter_options(self): shared.wait_for_loading(self.driver) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.map-chart .chart-headers h4') - self.assertEqual(chart_title.text, "Median Age of Population (2022)") + self.assertIn("Median Age of Population ", chart_title.text) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') self.assertEqual(len(map_regions), 58) @@ -243,4 +243,4 @@ def test_landing_page_link(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart_map = self.driver.find_element(By.ID, 'map-items') map_regions = chart_map.find_elements(By.TAG_NAME, 'path') - self.assertGreater(len(map_regions), 1) + self.assertGreater(len(map_regions), 1) \ No newline at end of file diff --git a/server/webdriver/shared_tests/vis_scatter_test.py b/server/webdriver/shared_tests/vis_scatter_test.py index 4e91dc46b6..6f2b953cce 100644 --- a/server/webdriver/shared_tests/vis_scatter_test.py +++ b/server/webdriver/shared_tests/vis_scatter_test.py @@ -81,10 +81,8 @@ def test_charts_from_url(self): # Assert chart is correct. chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - "Population Without Health Insurance (2022) vs Female Population (2022)" - ) + self.assertIn("Population Without Health Insurance ", chart_title.text) + self.assertIn(" vs Female Population ", chart_title.text) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -138,10 +136,8 @@ def test_charts_from_url(self): # Check that results are correct chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - "Population Without Health Insurance (2022) vs Female Population (2004 to 2020)" - ) + self.assertIn("Population Without Health Insurance ", chart_title.text) + self.assertIn(" vs Female Population ", chart_title.text) chart_source = self.driver.find_element( By.CSS_SELECTOR, '.scatter-chart .chart-headers .sources') self.assertTrue("wonder.cdc.gov" in chart_source.text) @@ -234,10 +230,8 @@ def test_manually_enter_options(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(shared.charts_rendered) chart_title = self.driver.find_element(By.CSS_SELECTOR, '.scatter-chart .chart-headers h4') - self.assertEqual( - chart_title.text, - 'Median Age of Population (2022) vs Median Income of a Population (2022)' - ) + self.assertIn("Median Age of Population ", chart_title.text) + self.assertIn(" vs Median Income of a Population ", chart_title.text) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') self.assertGreater(len(circles), 20) @@ -258,4 +252,4 @@ def test_landing_page_link(self): WebDriverWait(self.driver, self.TIMEOUT_SEC).until(element_present) chart = self.driver.find_element(By.ID, 'scatterplot') circles = chart.find_elements(By.TAG_NAME, 'circle') - self.assertGreater(len(circles), 20) + self.assertGreater(len(circles), 20) \ No newline at end of file From d347f7ee041f8cd854fb70423b291e071a960817 Mon Sep 17 00:00:00 2001 From: Gabriel Mechali Date: Mon, 21 Oct 2024 17:53:00 -0400 Subject: [PATCH 03/28] Adds logging for autocomplete responses. (#4678) Logs the response count for autocompletion. Staging is not showing any responses. Would like to better understand where the breakdown is occurring. --- server/routes/shared_api/autocomplete/autocomplete.py | 6 ++++++ server/routes/shared_api/autocomplete/helpers.py | 3 +++ 2 files changed, 9 insertions(+) diff --git a/server/routes/shared_api/autocomplete/autocomplete.py b/server/routes/shared_api/autocomplete/autocomplete.py index aab2a704ba..cb29b539c3 100644 --- a/server/routes/shared_api/autocomplete/autocomplete.py +++ b/server/routes/shared_api/autocomplete/autocomplete.py @@ -13,6 +13,7 @@ # limitations under the License. import json +import logging from flask import Blueprint from flask import jsonify @@ -51,6 +52,8 @@ def autocomplete(): place_id_to_dcid = [] if place_ids: place_id_to_dcid = json.loads(findplacedcid(place_ids).data) + logging.info("[Place_Autocomplete] Found %d place ID to DCID mappings.", + len(place_id_to_dcid)) final_predictions = [] for prediction in prediction_responses: @@ -61,5 +64,8 @@ def autocomplete(): matched_query=prediction.matched_query, dcid=place_id_to_dcid[prediction.place_id]) final_predictions.append(current_prediction) + logging.info( + "[Place_Autocomplete] Returning a total of %d place predictions.", + len(final_predictions)) return jsonify(AutoCompleteApiResponse(predictions=final_predictions)) diff --git a/server/routes/shared_api/autocomplete/helpers.py b/server/routes/shared_api/autocomplete/helpers.py index dbfd556156..b4299331ed 100644 --- a/server/routes/shared_api/autocomplete/helpers.py +++ b/server/routes/shared_api/autocomplete/helpers.py @@ -13,6 +13,7 @@ # limitations under the License. import json +import logging import re from typing import Dict, List from urllib.parse import urlencode @@ -122,6 +123,8 @@ def predict(queries: List[str], lang: str) -> List[ScoredPrediction]: all_responses.append(scored_prediction) all_responses.sort(key=get_score) + logging.info("[Place_Autocomplete] Received %d total place predictions.", + len(all_responses)) responses = [] place_ids = set() From 5f6ede71a801c8b6911e6fc53a8530f5b6e58116 Mon Sep 17 00:00:00 2001 From: Hannah Pho Date: Tue, 22 Oct 2024 16:47:30 -0400 Subject: [PATCH 04/28] Exit cdc_services/run.sh when any background process exits (#4682) This makes startup errors in Mixer or NL servers more obvious. Bug: b/374820494 Reference: https://docs.docker.com/engine/containers/multi-service_container/#use-a-wrapper-script --- build/cdc_services/run.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/cdc_services/run.sh b/build/cdc_services/run.sh index b28325ac07..19c7a9cdf4 100644 --- a/build/cdc_services/run.sh +++ b/build/cdc_services/run.sh @@ -88,7 +88,7 @@ else fi # Wait for any process to exit -wait +wait -n # Exit with status of process that exited first -exit $? \ No newline at end of file +exit $? From 4ef8962c50a4f89e9c7197523a6046ef6ac114d5 Mon Sep 17 00:00:00 2001 From: chejennifer <69875368+chejennifer@users.noreply.github.com> Date: Tue, 22 Oct 2024 14:15:18 -0700 Subject: [PATCH 05/28] update nodejs goldens (#4685) goldens needed to be updated because of a bunch of recent data updates (data diffs can be seen here: https://github.com/datacommonsorg/mixer/pull/1438, https://github.com/datacommonsorg/mixer/pull/1439) --- .../goldens/autopush/bar.json | 16 +++++----- .../goldens/autopush/map_rank.json | 10 +++--- .../goldens/autopush/scatter.json | 8 ++--- .../goldens/autopush/scatter_non_bard.json | 8 ++--- .../nodejs_query_differ/goldens/bard/bar.json | 32 +++++++++---------- .../goldens/bard/map_rank.json | 10 +++--- .../goldens/bard/scatter.json | 8 ++--- .../goldens/bard/scatter_non_bard.json | 8 ++--- .../goldens/bard/timeline_all.json | 20 ++++++------ 9 files changed, 60 insertions(+), 60 deletions(-) diff --git a/tools/nl/nodejs_query_differ/goldens/autopush/bar.json b/tools/nl/nodejs_query_differ/goldens/autopush/bar.json index 8e6f9c0be4..1cddd1aa98 100644 --- a/tools/nl/nodejs_query_differ/goldens/autopush/bar.json +++ b/tools/nl/nodejs_query_differ/goldens/autopush/bar.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "label,Santa Clara County\r\nManufacturing Workers,174771\r\n\"Professional, Scientific, and Technical Services Workers\",159638\r\nHealth Care and Social Assistance Industry Workers,158680\r\nInformation Industry Workers,94952\r\nAccommodation/Food Industry Workers,82693\r\nEducational Services Industry Workers,81751\r\nRetail Trade Workers,71546\r\nAdmin / Waste Management Service Industry Workers,61064\r\nPopulation Working in the Construction Industry,53530\r\nWholesale Trade Workers,27966\r\nPublic Administration Workers,27567\r\nOther Services (except Public Admin) Workers,25048\r\nFinance and Insurance Industry Workers,21380\r\nTransportation And Warehousing Workers,20858\r\n\"Arts, Entertainment, Recreation Industry Workers\",20834\r\nReal Estate and Rental and Leasing Workers,15480\r\nPopulation Working in the Management of Companies and Enterprises Industry,14705\r\nUtilities Workers,3496\r\n\"Agriculture, Forestry, Fishing, Hunting Workers\",3042\r\nUnclassified Workers,809\r\n\"Mining, Quarrying, Oil and Gas Extraction Industry Workers\",150", + "data_csv": "label,Santa Clara County\r\nHealth Care and Social Assistance Industry Workers,164195\r\n\"Professional, Scientific, and Technical Services Workers\",161462\r\nManufacturing Workers,122912\r\nInformation Industry Workers,92743\r\nEducational Services Industry Workers,85685\r\nAccommodation/Food Industry Workers,81548\r\nRetail Trade Workers,70145\r\nPopulation Working in the Management of Companies and Enterprises Industry,61130\r\nAdmin / Waste Management Service Industry Workers,57588\r\nPopulation Working in the Construction Industry,51647\r\nPublic Administration Workers,28471\r\nWholesale Trade Workers,27691\r\nOther Services (except Public Admin) Workers,25719\r\nFinance and Insurance Industry Workers,20644\r\n\"Arts, Entertainment, Recreation Industry Workers\",20376\r\nTransportation And Warehousing Workers,19322\r\nReal Estate and Rental and Leasing Workers,15389\r\nUtilities Workers,3582\r\n\"Agriculture, Forestry, Fishing, Hunting Workers\",2998\r\nUnclassified Workers,225\r\n\"Mining, Quarrying, Oil and Gas Extraction Industry Workers\",149", "placeType": "City", "places": [ "geoId/06085" @@ -13,29 +13,29 @@ } ], "legend": [ - "Manufacturing Workers", - "Professional, Scientific, and Technical Services Workers", "Health Care and Social Assistance Industry Workers", + "Professional, Scientific, and Technical Services Workers", + "Manufacturing Workers", "Information Industry Workers", - "Accommodation/Food Industry Workers", "Educational Services Industry Workers", + "Accommodation/Food Industry Workers", "Retail Trade Workers", + "Population Working in the Management of Companies and Enterprises Industry", "Admin / Waste Management Service Industry Workers", "Population Working in the Construction Industry", - "Wholesale Trade Workers", "Public Administration Workers", + "Wholesale Trade Workers", "Other Services (except Public Admin) Workers", "Finance and Insurance Industry Workers", - "Transportation And Warehousing Workers", "Arts, Entertainment, Recreation Industry Workers", + "Transportation And Warehousing Workers", "Real Estate and Rental and Leasing Workers", - "Population Working in the Management of Companies and Enterprises Industry", "Utilities Workers", "Agriculture, Forestry, Fishing, Hunting Workers", "Unclassified Workers", "Mining, Quarrying, Oil and Gas Extraction Industry Workers" ], - "title": "Categories of Jobs in Santa Clara County (Sep, 2023)", + "title": "Categories of Jobs in Santa Clara County (Jan, 2024 to Mar, 2024)", "type": "BAR", "unit": "", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/autopush/map_rank.json b/tools/nl/nodejs_query_differ/goldens/autopush/map_rank.json index 2320c638e3..50a674014c 100644 --- a/tools/nl/nodejs_query_differ/goldens/autopush/map_rank.json +++ b/tools/nl/nodejs_query_differ/goldens/autopush/map_rank.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n6,Madera County,35.9\r\n7,Tulare County,35.5\r\n8,Kings County,35.1\r\n9,Stanislaus County,34.8\r\n10,Tehama County,34.2", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n6,San Bernardino County,35.1\r\n7,Stanislaus County,34.7\r\n8,Merced County,34.5\r\n9,Glenn County,34.1\r\n10,Riverside County,34", "placeType": "County", "places": [ "geoId/06" @@ -12,7 +12,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ @@ -22,7 +22,7 @@ "chartUrl": "" }, { - "data_csv": "label,Prevalence of Obesity\r\n2021,28.7630009388167\r\n2020,29.0011697264701\r\n2018,26.5610266256205\r\n2017,24.7490113165035\r\n2016,24.8973586521783\r\n2015,24.3597558272971\r\n2014,24.7177574137183", + "data_csv": "label,Prevalence of Obesity\r\n2022,28.3282038770148\r\n2021,28.7491989947528\r\n2020,28.9606745009575\r\n2018,26.5610266256205\r\n2017,24.7490113165035\r\n2016,24.8973586521783\r\n2015,24.3597558272971\r\n2014,24.7177574137183", "legend": [ "Prevalence of Obesity" ], @@ -42,8 +42,8 @@ "Percent_Person_Obesity" ], "highlight": { - "date": "2021", - "value": 28.7630009388167 + "date": "2022", + "value": 28.3282038770148 }, "chartUrl": "", "dcUrl": "https://datacommons.org/explore#q=counties%20in%20california%20with%20highest%20obesity" diff --git a/tools/nl/nodejs_query_differ/goldens/autopush/scatter.json b/tools/nl/nodejs_query_differ/goldens/autopush/scatter.json index b54c2c3360..45b041b648 100644 --- a/tools/nl/nodejs_query_differ/goldens/autopush/scatter.json +++ b/tools/nl/nodejs_query_differ/goldens/autopush/scatter.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2021,24.8\r\n\"Alpine County, CA\",geoId/06003,2022,208,2021,29.1\r\n\"Amador County, CA\",geoId/06005,2022,2945,2021,29.6\r\n\"Butte County, CA\",geoId/06007,2022,38015,2021,31\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2021,30.6\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2021,33.4\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2021,24.3\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2021,32.7\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2021,28.1\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2021,36.8\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2021,31.8\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2021,33.2\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2021,38\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2021,29.4\r\n\"Kern County, CA\",geoId/06029,2022,170013,2021,36.6\r\n\"Kings County, CA\",geoId/06031,2022,22634,2021,35.1\r\n\"Lake County, CA\",geoId/06033,2022,11065,2021,33.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2021,32.1\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2021,28.5\r\n\"Madera County, CA\",geoId/06039,2022,30154,2021,35.9\r\n\"Marin County, CA\",geoId/06041,2022,17809,2021,22.9\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2021,30\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2021,31.5\r\n\"Merced County, CA\",geoId/06047,2022,51272,2021,33\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2021,33.1\r\n\"Mono County, CA\",geoId/06051,2022,1478,2021,29.6\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2021,27.5\r\n\"Napa County, CA\",geoId/06055,2022,10620,2021,28\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2021,27.5\r\n\"Orange County, CA\",geoId/06059,2022,303810,2021,25.3\r\n\"Placer County, CA\",geoId/06061,2022,27446,2021,26.3\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2021,29.5\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2021,36.2\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2021,31.7\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2021,31\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2021,38.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2021,23.9\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2021,18.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2021,33.3\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2021,30.5\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2021,21\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2021,30.1\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2021,18.5\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2021,25.2\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2021,30.9\r\n\"Sierra County, CA\",geoId/06091,2022,359,2021,29.8\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2021,32.8\r\n\"Solano County, CA\",geoId/06095,2022,39705,2021,29.9\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2021,28.6\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2021,34.8\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2021,31.6\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2021,34.2\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2021,33\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2021,35.5\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2021,29.5\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2021,27\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2021,27.8\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2021,33.9", + "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2022,19.4\r\n\"Alpine County, CA\",geoId/06003,2022,208,2022,29.9\r\n\"Amador County, CA\",geoId/06005,2022,2945,2022,27.3\r\n\"Butte County, CA\",geoId/06007,2022,38015,2022,31.5\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2022,29.4\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2022,32.2\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2022,28.4\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2022,33.8\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2022,24.8\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2022,39\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2022,34.1\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2022,33.1\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2022,38.5\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2022,29.9\r\n\"Kern County, CA\",geoId/06029,2022,170013,2022,35.9\r\n\"Kings County, CA\",geoId/06031,2022,22634,2022,31.9\r\n\"Lake County, CA\",geoId/06033,2022,11065,2022,30.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2022,32.8\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2022,26.2\r\n\"Madera County, CA\",geoId/06039,2022,30154,2022,35.2\r\n\"Marin County, CA\",geoId/06041,2022,17809,2022,23.5\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2022,32.3\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2022,29.4\r\n\"Merced County, CA\",geoId/06047,2022,51272,2022,34.5\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2022,30\r\n\"Mono County, CA\",geoId/06051,2022,1478,2022,29.1\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2022,32.8\r\n\"Napa County, CA\",geoId/06055,2022,10620,2022,28.7\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2022,29.9\r\n\"Orange County, CA\",geoId/06059,2022,303810,2022,25.7\r\n\"Placer County, CA\",geoId/06061,2022,27446,2022,25.8\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2022,29.1\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2022,34\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2022,33.9\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2022,29.1\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2022,35.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2022,25.4\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2022,17.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2022,33.8\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2022,28.2\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2022,21.4\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2022,31.6\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2022,22\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2022,29.4\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2022,28.7\r\n\"Sierra County, CA\",geoId/06091,2022,359,2022,31.3\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2022,32.9\r\n\"Solano County, CA\",geoId/06095,2022,39705,2022,32.8\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2022,28.3\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2022,34.7\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2022,32\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2022,32.5\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2022,32.4\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2022,38\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2022,31\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2022,28.9\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2022,28.5\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2022,32.6", "placeType": "County", "places": [ "geoId/06" @@ -16,7 +16,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity (2021) Vs. Population Below Poverty Line (2022) in Counties of California", + "title": "Prevalence of Obesity (2022) Vs. Population Below Poverty Line (2022) in Counties of California", "type": "SCATTER", "vars": [ "Percent_Person_Obesity", @@ -26,7 +26,7 @@ "dcUrl": "https://datacommons.org/explore#q=obesity%20vs.%20poverty%20in%20counties%20of%20california" }, { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n54,San Diego County,23.9\r\n55,Marin County,22.9\r\n56,San Mateo County,21\r\n57,San Francisco County,18.7\r\n58,Santa Clara County,18.5", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n54,Marin County,23.5\r\n55,Santa Clara County,22\r\n56,San Mateo County,21.4\r\n57,Alameda County,19.4\r\n58,San Francisco County,17.7", "placeType": "County", "places": [ "geoId/06" @@ -37,7 +37,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/autopush/scatter_non_bard.json b/tools/nl/nodejs_query_differ/goldens/autopush/scatter_non_bard.json index b54c2c3360..45b041b648 100644 --- a/tools/nl/nodejs_query_differ/goldens/autopush/scatter_non_bard.json +++ b/tools/nl/nodejs_query_differ/goldens/autopush/scatter_non_bard.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2021,24.8\r\n\"Alpine County, CA\",geoId/06003,2022,208,2021,29.1\r\n\"Amador County, CA\",geoId/06005,2022,2945,2021,29.6\r\n\"Butte County, CA\",geoId/06007,2022,38015,2021,31\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2021,30.6\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2021,33.4\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2021,24.3\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2021,32.7\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2021,28.1\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2021,36.8\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2021,31.8\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2021,33.2\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2021,38\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2021,29.4\r\n\"Kern County, CA\",geoId/06029,2022,170013,2021,36.6\r\n\"Kings County, CA\",geoId/06031,2022,22634,2021,35.1\r\n\"Lake County, CA\",geoId/06033,2022,11065,2021,33.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2021,32.1\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2021,28.5\r\n\"Madera County, CA\",geoId/06039,2022,30154,2021,35.9\r\n\"Marin County, CA\",geoId/06041,2022,17809,2021,22.9\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2021,30\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2021,31.5\r\n\"Merced County, CA\",geoId/06047,2022,51272,2021,33\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2021,33.1\r\n\"Mono County, CA\",geoId/06051,2022,1478,2021,29.6\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2021,27.5\r\n\"Napa County, CA\",geoId/06055,2022,10620,2021,28\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2021,27.5\r\n\"Orange County, CA\",geoId/06059,2022,303810,2021,25.3\r\n\"Placer County, CA\",geoId/06061,2022,27446,2021,26.3\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2021,29.5\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2021,36.2\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2021,31.7\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2021,31\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2021,38.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2021,23.9\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2021,18.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2021,33.3\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2021,30.5\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2021,21\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2021,30.1\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2021,18.5\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2021,25.2\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2021,30.9\r\n\"Sierra County, CA\",geoId/06091,2022,359,2021,29.8\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2021,32.8\r\n\"Solano County, CA\",geoId/06095,2022,39705,2021,29.9\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2021,28.6\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2021,34.8\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2021,31.6\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2021,34.2\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2021,33\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2021,35.5\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2021,29.5\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2021,27\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2021,27.8\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2021,33.9", + "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2022,19.4\r\n\"Alpine County, CA\",geoId/06003,2022,208,2022,29.9\r\n\"Amador County, CA\",geoId/06005,2022,2945,2022,27.3\r\n\"Butte County, CA\",geoId/06007,2022,38015,2022,31.5\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2022,29.4\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2022,32.2\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2022,28.4\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2022,33.8\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2022,24.8\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2022,39\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2022,34.1\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2022,33.1\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2022,38.5\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2022,29.9\r\n\"Kern County, CA\",geoId/06029,2022,170013,2022,35.9\r\n\"Kings County, CA\",geoId/06031,2022,22634,2022,31.9\r\n\"Lake County, CA\",geoId/06033,2022,11065,2022,30.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2022,32.8\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2022,26.2\r\n\"Madera County, CA\",geoId/06039,2022,30154,2022,35.2\r\n\"Marin County, CA\",geoId/06041,2022,17809,2022,23.5\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2022,32.3\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2022,29.4\r\n\"Merced County, CA\",geoId/06047,2022,51272,2022,34.5\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2022,30\r\n\"Mono County, CA\",geoId/06051,2022,1478,2022,29.1\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2022,32.8\r\n\"Napa County, CA\",geoId/06055,2022,10620,2022,28.7\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2022,29.9\r\n\"Orange County, CA\",geoId/06059,2022,303810,2022,25.7\r\n\"Placer County, CA\",geoId/06061,2022,27446,2022,25.8\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2022,29.1\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2022,34\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2022,33.9\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2022,29.1\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2022,35.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2022,25.4\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2022,17.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2022,33.8\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2022,28.2\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2022,21.4\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2022,31.6\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2022,22\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2022,29.4\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2022,28.7\r\n\"Sierra County, CA\",geoId/06091,2022,359,2022,31.3\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2022,32.9\r\n\"Solano County, CA\",geoId/06095,2022,39705,2022,32.8\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2022,28.3\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2022,34.7\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2022,32\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2022,32.5\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2022,32.4\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2022,38\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2022,31\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2022,28.9\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2022,28.5\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2022,32.6", "placeType": "County", "places": [ "geoId/06" @@ -16,7 +16,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity (2021) Vs. Population Below Poverty Line (2022) in Counties of California", + "title": "Prevalence of Obesity (2022) Vs. Population Below Poverty Line (2022) in Counties of California", "type": "SCATTER", "vars": [ "Percent_Person_Obesity", @@ -26,7 +26,7 @@ "dcUrl": "https://datacommons.org/explore#q=obesity%20vs.%20poverty%20in%20counties%20of%20california" }, { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n54,San Diego County,23.9\r\n55,Marin County,22.9\r\n56,San Mateo County,21\r\n57,San Francisco County,18.7\r\n58,Santa Clara County,18.5", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n54,Marin County,23.5\r\n55,Santa Clara County,22\r\n56,San Mateo County,21.4\r\n57,Alameda County,19.4\r\n58,San Francisco County,17.7", "placeType": "County", "places": [ "geoId/06" @@ -37,7 +37,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/bard/bar.json b/tools/nl/nodejs_query_differ/goldens/bard/bar.json index 180812c5ed..1cddd1aa98 100644 --- a/tools/nl/nodejs_query_differ/goldens/bard/bar.json +++ b/tools/nl/nodejs_query_differ/goldens/bard/bar.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "label,Santa Clara County\r\nAccommodation/Food Industry Workers,82693\r\nAdmin / Waste Management Service Industry Workers,61064\r\n\"Agriculture, Forestry, Fishing, Hunting Workers\",3042\r\nPopulation Working in the Construction Industry,53530\r\nEducational Services Industry Workers,81751\r\nHealth Care and Social Assistance Industry Workers,158680\r\nManufacturing Workers,174771\r\nFinance and Insurance Industry Workers,21380\r\nInformation Industry Workers,94952\r\n\"Arts, Entertainment, Recreation Industry Workers\",20834\r\n\"Mining, Quarrying, Oil and Gas Extraction Industry Workers\",150\r\nOther Services (except Public Admin) Workers,25048\r\nTransportation And Warehousing Workers,20858\r\nUtilities Workers,3496\r\nRetail Trade Workers,71546\r\nReal Estate and Rental and Leasing Workers,15480\r\nPublic Administration Workers,27567\r\nWholesale Trade Workers,27966\r\n\"Professional, Scientific, and Technical Services Workers\",159638\r\nPopulation Working in the Management of Companies and Enterprises Industry,14705\r\nUnclassified Workers,809", + "data_csv": "label,Santa Clara County\r\nHealth Care and Social Assistance Industry Workers,164195\r\n\"Professional, Scientific, and Technical Services Workers\",161462\r\nManufacturing Workers,122912\r\nInformation Industry Workers,92743\r\nEducational Services Industry Workers,85685\r\nAccommodation/Food Industry Workers,81548\r\nRetail Trade Workers,70145\r\nPopulation Working in the Management of Companies and Enterprises Industry,61130\r\nAdmin / Waste Management Service Industry Workers,57588\r\nPopulation Working in the Construction Industry,51647\r\nPublic Administration Workers,28471\r\nWholesale Trade Workers,27691\r\nOther Services (except Public Admin) Workers,25719\r\nFinance and Insurance Industry Workers,20644\r\n\"Arts, Entertainment, Recreation Industry Workers\",20376\r\nTransportation And Warehousing Workers,19322\r\nReal Estate and Rental and Leasing Workers,15389\r\nUtilities Workers,3582\r\n\"Agriculture, Forestry, Fishing, Hunting Workers\",2998\r\nUnclassified Workers,225\r\n\"Mining, Quarrying, Oil and Gas Extraction Industry Workers\",149", "placeType": "City", "places": [ "geoId/06085" @@ -13,29 +13,29 @@ } ], "legend": [ + "Health Care and Social Assistance Industry Workers", + "Professional, Scientific, and Technical Services Workers", + "Manufacturing Workers", + "Information Industry Workers", + "Educational Services Industry Workers", "Accommodation/Food Industry Workers", + "Retail Trade Workers", + "Population Working in the Management of Companies and Enterprises Industry", "Admin / Waste Management Service Industry Workers", - "Agriculture, Forestry, Fishing, Hunting Workers", "Population Working in the Construction Industry", - "Educational Services Industry Workers", - "Health Care and Social Assistance Industry Workers", - "Manufacturing Workers", + "Public Administration Workers", + "Wholesale Trade Workers", + "Other Services (except Public Admin) Workers", "Finance and Insurance Industry Workers", - "Information Industry Workers", "Arts, Entertainment, Recreation Industry Workers", - "Mining, Quarrying, Oil and Gas Extraction Industry Workers", - "Other Services (except Public Admin) Workers", "Transportation And Warehousing Workers", - "Utilities Workers", - "Retail Trade Workers", "Real Estate and Rental and Leasing Workers", - "Public Administration Workers", - "Wholesale Trade Workers", - "Professional, Scientific, and Technical Services Workers", - "Population Working in the Management of Companies and Enterprises Industry", - "Unclassified Workers" + "Utilities Workers", + "Agriculture, Forestry, Fishing, Hunting Workers", + "Unclassified Workers", + "Mining, Quarrying, Oil and Gas Extraction Industry Workers" ], - "title": "Categories of Jobs in Santa Clara County (Sep, 2023)", + "title": "Categories of Jobs in Santa Clara County (Jan, 2024 to Mar, 2024)", "type": "BAR", "unit": "", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/bard/map_rank.json b/tools/nl/nodejs_query_differ/goldens/bard/map_rank.json index 2320c638e3..50a674014c 100644 --- a/tools/nl/nodejs_query_differ/goldens/bard/map_rank.json +++ b/tools/nl/nodejs_query_differ/goldens/bard/map_rank.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n6,Madera County,35.9\r\n7,Tulare County,35.5\r\n8,Kings County,35.1\r\n9,Stanislaus County,34.8\r\n10,Tehama County,34.2", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n6,San Bernardino County,35.1\r\n7,Stanislaus County,34.7\r\n8,Merced County,34.5\r\n9,Glenn County,34.1\r\n10,Riverside County,34", "placeType": "County", "places": [ "geoId/06" @@ -12,7 +12,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ @@ -22,7 +22,7 @@ "chartUrl": "" }, { - "data_csv": "label,Prevalence of Obesity\r\n2021,28.7630009388167\r\n2020,29.0011697264701\r\n2018,26.5610266256205\r\n2017,24.7490113165035\r\n2016,24.8973586521783\r\n2015,24.3597558272971\r\n2014,24.7177574137183", + "data_csv": "label,Prevalence of Obesity\r\n2022,28.3282038770148\r\n2021,28.7491989947528\r\n2020,28.9606745009575\r\n2018,26.5610266256205\r\n2017,24.7490113165035\r\n2016,24.8973586521783\r\n2015,24.3597558272971\r\n2014,24.7177574137183", "legend": [ "Prevalence of Obesity" ], @@ -42,8 +42,8 @@ "Percent_Person_Obesity" ], "highlight": { - "date": "2021", - "value": 28.7630009388167 + "date": "2022", + "value": 28.3282038770148 }, "chartUrl": "", "dcUrl": "https://datacommons.org/explore#q=counties%20in%20california%20with%20highest%20obesity" diff --git a/tools/nl/nodejs_query_differ/goldens/bard/scatter.json b/tools/nl/nodejs_query_differ/goldens/bard/scatter.json index b54c2c3360..45b041b648 100644 --- a/tools/nl/nodejs_query_differ/goldens/bard/scatter.json +++ b/tools/nl/nodejs_query_differ/goldens/bard/scatter.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2021,24.8\r\n\"Alpine County, CA\",geoId/06003,2022,208,2021,29.1\r\n\"Amador County, CA\",geoId/06005,2022,2945,2021,29.6\r\n\"Butte County, CA\",geoId/06007,2022,38015,2021,31\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2021,30.6\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2021,33.4\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2021,24.3\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2021,32.7\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2021,28.1\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2021,36.8\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2021,31.8\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2021,33.2\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2021,38\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2021,29.4\r\n\"Kern County, CA\",geoId/06029,2022,170013,2021,36.6\r\n\"Kings County, CA\",geoId/06031,2022,22634,2021,35.1\r\n\"Lake County, CA\",geoId/06033,2022,11065,2021,33.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2021,32.1\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2021,28.5\r\n\"Madera County, CA\",geoId/06039,2022,30154,2021,35.9\r\n\"Marin County, CA\",geoId/06041,2022,17809,2021,22.9\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2021,30\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2021,31.5\r\n\"Merced County, CA\",geoId/06047,2022,51272,2021,33\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2021,33.1\r\n\"Mono County, CA\",geoId/06051,2022,1478,2021,29.6\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2021,27.5\r\n\"Napa County, CA\",geoId/06055,2022,10620,2021,28\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2021,27.5\r\n\"Orange County, CA\",geoId/06059,2022,303810,2021,25.3\r\n\"Placer County, CA\",geoId/06061,2022,27446,2021,26.3\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2021,29.5\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2021,36.2\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2021,31.7\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2021,31\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2021,38.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2021,23.9\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2021,18.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2021,33.3\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2021,30.5\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2021,21\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2021,30.1\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2021,18.5\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2021,25.2\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2021,30.9\r\n\"Sierra County, CA\",geoId/06091,2022,359,2021,29.8\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2021,32.8\r\n\"Solano County, CA\",geoId/06095,2022,39705,2021,29.9\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2021,28.6\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2021,34.8\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2021,31.6\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2021,34.2\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2021,33\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2021,35.5\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2021,29.5\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2021,27\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2021,27.8\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2021,33.9", + "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2022,19.4\r\n\"Alpine County, CA\",geoId/06003,2022,208,2022,29.9\r\n\"Amador County, CA\",geoId/06005,2022,2945,2022,27.3\r\n\"Butte County, CA\",geoId/06007,2022,38015,2022,31.5\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2022,29.4\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2022,32.2\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2022,28.4\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2022,33.8\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2022,24.8\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2022,39\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2022,34.1\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2022,33.1\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2022,38.5\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2022,29.9\r\n\"Kern County, CA\",geoId/06029,2022,170013,2022,35.9\r\n\"Kings County, CA\",geoId/06031,2022,22634,2022,31.9\r\n\"Lake County, CA\",geoId/06033,2022,11065,2022,30.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2022,32.8\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2022,26.2\r\n\"Madera County, CA\",geoId/06039,2022,30154,2022,35.2\r\n\"Marin County, CA\",geoId/06041,2022,17809,2022,23.5\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2022,32.3\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2022,29.4\r\n\"Merced County, CA\",geoId/06047,2022,51272,2022,34.5\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2022,30\r\n\"Mono County, CA\",geoId/06051,2022,1478,2022,29.1\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2022,32.8\r\n\"Napa County, CA\",geoId/06055,2022,10620,2022,28.7\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2022,29.9\r\n\"Orange County, CA\",geoId/06059,2022,303810,2022,25.7\r\n\"Placer County, CA\",geoId/06061,2022,27446,2022,25.8\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2022,29.1\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2022,34\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2022,33.9\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2022,29.1\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2022,35.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2022,25.4\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2022,17.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2022,33.8\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2022,28.2\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2022,21.4\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2022,31.6\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2022,22\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2022,29.4\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2022,28.7\r\n\"Sierra County, CA\",geoId/06091,2022,359,2022,31.3\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2022,32.9\r\n\"Solano County, CA\",geoId/06095,2022,39705,2022,32.8\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2022,28.3\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2022,34.7\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2022,32\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2022,32.5\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2022,32.4\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2022,38\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2022,31\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2022,28.9\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2022,28.5\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2022,32.6", "placeType": "County", "places": [ "geoId/06" @@ -16,7 +16,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity (2021) Vs. Population Below Poverty Line (2022) in Counties of California", + "title": "Prevalence of Obesity (2022) Vs. Population Below Poverty Line (2022) in Counties of California", "type": "SCATTER", "vars": [ "Percent_Person_Obesity", @@ -26,7 +26,7 @@ "dcUrl": "https://datacommons.org/explore#q=obesity%20vs.%20poverty%20in%20counties%20of%20california" }, { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n54,San Diego County,23.9\r\n55,Marin County,22.9\r\n56,San Mateo County,21\r\n57,San Francisco County,18.7\r\n58,Santa Clara County,18.5", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n54,Marin County,23.5\r\n55,Santa Clara County,22\r\n56,San Mateo County,21.4\r\n57,Alameda County,19.4\r\n58,San Francisco County,17.7", "placeType": "County", "places": [ "geoId/06" @@ -37,7 +37,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/bard/scatter_non_bard.json b/tools/nl/nodejs_query_differ/goldens/bard/scatter_non_bard.json index b54c2c3360..45b041b648 100644 --- a/tools/nl/nodejs_query_differ/goldens/bard/scatter_non_bard.json +++ b/tools/nl/nodejs_query_differ/goldens/bard/scatter_non_bard.json @@ -1,7 +1,7 @@ { "charts": [ { - "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2021,24.8\r\n\"Alpine County, CA\",geoId/06003,2022,208,2021,29.1\r\n\"Amador County, CA\",geoId/06005,2022,2945,2021,29.6\r\n\"Butte County, CA\",geoId/06007,2022,38015,2021,31\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2021,30.6\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2021,33.4\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2021,24.3\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2021,32.7\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2021,28.1\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2021,36.8\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2021,31.8\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2021,33.2\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2021,38\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2021,29.4\r\n\"Kern County, CA\",geoId/06029,2022,170013,2021,36.6\r\n\"Kings County, CA\",geoId/06031,2022,22634,2021,35.1\r\n\"Lake County, CA\",geoId/06033,2022,11065,2021,33.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2021,32.1\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2021,28.5\r\n\"Madera County, CA\",geoId/06039,2022,30154,2021,35.9\r\n\"Marin County, CA\",geoId/06041,2022,17809,2021,22.9\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2021,30\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2021,31.5\r\n\"Merced County, CA\",geoId/06047,2022,51272,2021,33\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2021,33.1\r\n\"Mono County, CA\",geoId/06051,2022,1478,2021,29.6\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2021,27.5\r\n\"Napa County, CA\",geoId/06055,2022,10620,2021,28\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2021,27.5\r\n\"Orange County, CA\",geoId/06059,2022,303810,2021,25.3\r\n\"Placer County, CA\",geoId/06061,2022,27446,2021,26.3\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2021,29.5\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2021,36.2\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2021,31.7\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2021,31\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2021,38.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2021,23.9\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2021,18.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2021,33.3\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2021,30.5\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2021,21\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2021,30.1\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2021,18.5\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2021,25.2\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2021,30.9\r\n\"Sierra County, CA\",geoId/06091,2022,359,2021,29.8\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2021,32.8\r\n\"Solano County, CA\",geoId/06095,2022,39705,2021,29.9\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2021,28.6\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2021,34.8\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2021,31.6\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2021,34.2\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2021,33\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2021,35.5\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2021,29.5\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2021,27\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2021,27.8\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2021,33.9", + "data_csv": "placeName,placeDcid,xDate,xValue-Count_Person_BelowPovertyLevelInThePast12Months,yDate,yValue-Percent_Person_Obesity\r\n\"Alameda County, CA\",geoId/06001,2022,149843,2022,19.4\r\n\"Alpine County, CA\",geoId/06003,2022,208,2022,29.9\r\n\"Amador County, CA\",geoId/06005,2022,2945,2022,27.3\r\n\"Butte County, CA\",geoId/06007,2022,38015,2022,31.5\r\n\"Calaveras County, CA\",geoId/06009,2022,5915,2022,29.4\r\n\"Colusa County, CA\",geoId/06011,2022,2364,2022,32.2\r\n\"Contra Costa County, CA\",geoId/06013,2022,95255,2022,28.4\r\n\"Del Norte County, CA\",geoId/06015,2022,3585,2022,33.8\r\n\"El Dorado County, CA\",geoId/06017,2022,16364,2022,24.8\r\n\"Fresno County, CA\",geoId/06019,2022,193675,2022,39\r\n\"Glenn County, CA\",geoId/06021,2022,4335,2022,34.1\r\n\"Humboldt County, CA\",geoId/06023,2022,26394,2022,33.1\r\n\"Imperial County, CA\",geoId/06025,2022,36092,2022,38.5\r\n\"Inyo County, CA\",geoId/06027,2022,2199,2022,29.9\r\n\"Kern County, CA\",geoId/06029,2022,170013,2022,35.9\r\n\"Kings County, CA\",geoId/06031,2022,22634,2022,31.9\r\n\"Lake County, CA\",geoId/06033,2022,11065,2022,30.7\r\n\"Lassen County, CA\",geoId/06035,2022,3645,2022,32.8\r\n\"Los Angeles County, CA\",geoId/06037,2022,1343978,2022,26.2\r\n\"Madera County, CA\",geoId/06039,2022,30154,2022,35.2\r\n\"Marin County, CA\",geoId/06041,2022,17809,2022,23.5\r\n\"Mariposa County, CA\",geoId/06043,2022,2712,2022,32.3\r\n\"Mendocino County, CA\",geoId/06045,2022,14483,2022,29.4\r\n\"Merced County, CA\",geoId/06047,2022,51272,2022,34.5\r\n\"Modoc County, CA\",geoId/06049,2022,1430,2022,30\r\n\"Mono County, CA\",geoId/06051,2022,1478,2022,29.1\r\n\"Monterey County, CA\",geoId/06053,2022,51913,2022,32.8\r\n\"Napa County, CA\",geoId/06055,2022,10620,2022,28.7\r\n\"Nevada County, CA\",geoId/06057,2022,10505,2022,29.9\r\n\"Orange County, CA\",geoId/06059,2022,303810,2022,25.7\r\n\"Placer County, CA\",geoId/06061,2022,27446,2022,25.8\r\n\"Plumas County, CA\",geoId/06063,2022,2101,2022,29.1\r\n\"Riverside County, CA\",geoId/06065,2022,272432,2022,34\r\n\"Sacramento County, CA\",geoId/06067,2022,204388,2022,33.9\r\n\"San Benito County, CA\",geoId/06069,2022,4832,2022,29.1\r\n\"San Bernardino County, CA\",geoId/06071,2022,294246,2022,35.1\r\n\"San Diego County, CA\",geoId/06073,2022,338752,2022,25.4\r\n\"San Francisco County, CA\",geoId/06075,2022,87849,2022,17.7\r\n\"San Joaquin County, CA\",geoId/06077,2022,98352,2022,33.8\r\n\"San Luis Obispo County, CA\",geoId/06079,2022,33728,2022,28.2\r\n\"San Mateo County, CA\",geoId/06081,2022,48137,2022,21.4\r\n\"Santa Barbara County, CA\",geoId/06083,2022,57513,2022,31.6\r\n\"Santa Clara County, CA\",geoId/06085,2022,129834,2022,22\r\n\"Santa Cruz County, CA\",geoId/06087,2022,29302,2022,29.4\r\n\"Shasta County, CA\",geoId/06089,2022,23753,2022,28.7\r\n\"Sierra County, CA\",geoId/06091,2022,359,2022,31.3\r\n\"Siskiyou County, CA\",geoId/06093,2022,7289,2022,32.9\r\n\"Solano County, CA\",geoId/06095,2022,39705,2022,32.8\r\n\"Sonoma County, CA\",geoId/06097,2022,42925,2022,28.3\r\n\"Stanislaus County, CA\",geoId/06099,2022,75125,2022,34.7\r\n\"Sutter County, CA\",geoId/06101,2022,13065,2022,32\r\n\"Tehama County, CA\",geoId/06103,2022,10483,2022,32.5\r\n\"Trinity County, CA\",geoId/06105,2022,3457,2022,32.4\r\n\"Tulare County, CA\",geoId/06107,2022,86391,2022,38\r\n\"Tuolumne County, CA\",geoId/06109,2022,5887,2022,31\r\n\"Ventura County, CA\",geoId/06111,2022,74315,2022,28.9\r\n\"Yolo County, CA\",geoId/06113,2022,36521,2022,28.5\r\n\"Yuba County, CA\",geoId/06115,2022,12375,2022,32.6", "placeType": "County", "places": [ "geoId/06" @@ -16,7 +16,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity (2021) Vs. Population Below Poverty Line (2022) in Counties of California", + "title": "Prevalence of Obesity (2022) Vs. Population Below Poverty Line (2022) in Counties of California", "type": "SCATTER", "vars": [ "Percent_Person_Obesity", @@ -26,7 +26,7 @@ "dcUrl": "https://datacommons.org/explore#q=obesity%20vs.%20poverty%20in%20counties%20of%20california" }, { - "data_csv": "rank,place,Prevalence of Obesity\r\n1,San Bernardino County,38.1\r\n2,Imperial County,38\r\n3,Fresno County,36.8\r\n4,Kern County,36.6\r\n5,Riverside County,36.2\r\n54,San Diego County,23.9\r\n55,Marin County,22.9\r\n56,San Mateo County,21\r\n57,San Francisco County,18.7\r\n58,Santa Clara County,18.5", + "data_csv": "rank,place,Prevalence of Obesity\r\n1,Fresno County,39\r\n2,Imperial County,38.5\r\n3,Tulare County,38\r\n4,Kern County,35.9\r\n5,Madera County,35.2\r\n54,Marin County,23.5\r\n55,Santa Clara County,22\r\n56,San Mateo County,21.4\r\n57,Alameda County,19.4\r\n58,San Francisco County,17.7", "placeType": "County", "places": [ "geoId/06" @@ -37,7 +37,7 @@ "url": "https://www.cdc.gov/places/index.html" } ], - "title": "Prevalence of Obesity in Counties of California (2021)", + "title": "Prevalence of Obesity in Counties of California (2022)", "type": "TABLE", "unit": "%", "vars": [ diff --git a/tools/nl/nodejs_query_differ/goldens/bard/timeline_all.json b/tools/nl/nodejs_query_differ/goldens/bard/timeline_all.json index 22c5b793c3..be3dfd9969 100644 --- a/tools/nl/nodejs_query_differ/goldens/bard/timeline_all.json +++ b/tools/nl/nodejs_query_differ/goldens/bard/timeline_all.json @@ -289,7 +289,7 @@ "chartUrl": "" }, { - "data_csv": "label,Mean Income Deficit of Household: Family Household\r\n2021,11145\r\n2020,10436\r\n2019,10311\r\n2018,10095\r\n2017,9868\r\n2016,9703\r\n2015,9487\r\n2014,9353\r\n2013,8959\r\n2012,8746\r\n2011,8539\r\n2010,8376", + "data_csv": "label,Mean Income Deficit of Household: Family Household\r\n2022,11587\r\n2021,11145\r\n2020,10436\r\n2019,10311\r\n2018,10095\r\n2017,9868\r\n2016,9703\r\n2015,9487\r\n2014,9353\r\n2013,8959\r\n2012,8746\r\n2011,8539\r\n2010,8376", "legend": [ "Mean Income Deficit of Household: Family Household" ], @@ -309,14 +309,14 @@ "Mean_IncomeDeficit_Household_FamilyHousehold" ], "highlight": { - "date": "2021", - "value": 11145 + "date": "2022", + "value": 11587 }, "chartUrl": "", "dcUrl": "https://datacommons.org/explore#q=family%20earnings%20in%20north%20dakota" }, { - "data_csv": "rank,place,Mean Income Deficit of Household: Family Household\r\n1,Steele County,25719\r\n2,Ransom County,25146\r\n3,Sioux County,19446\r\n4,Benson County,18693\r\n5,Rolette County,16013\r\n46,Burke County,5400\r\n47,Logan County,5108\r\n48,Renville County,4256\r\n49,Slope County,4069\r\n50,Griggs County,1966", + "data_csv": "rank,place,Mean Income Deficit of Household: Family Household\r\n1,Steele County,25719\r\n2,Ransom County,25146\r\n3,Benson County,19229\r\n4,Sioux County,18880\r\n5,Rolette County,16405\r\n46,Logan County,5108\r\n47,Slope County,4293\r\n48,Renville County,4256\r\n49,Billings County,3653\r\n50,Griggs County,1966", "placeType": "County", "places": [ "geoId/38" @@ -327,7 +327,7 @@ "url": "https://data.census.gov/cedsci/table?q=S1702&tid=ACSST5Y2019.S1702" } ], - "title": "Mean Income Deficit of Household: Family Household in Counties of North Dakota (2010 to 2021)", + "title": "Mean Income Deficit of Household: Family Household in Counties of North Dakota (2013 to 2022)", "type": "TABLE", "unit": "USD", "vars": [ @@ -554,7 +554,7 @@ "dcUrl": "https://datacommons.org/explore#q=family%20earnings%20in%20north%20dakota" }, { - "data_csv": "label,Mean Income Deficit of Household: Married Couple Family Household\r\n2021,9392\r\n2020,8665\r\n2019,8812\r\n2018,8920\r\n2017,8599\r\n2016,8639\r\n2015,8711\r\n2014,8645\r\n2013,8072\r\n2012,8075\r\n2011,7641\r\n2010,7201", + "data_csv": "label,Mean Income Deficit of Household: Married Couple Family Household\r\n2022,9894\r\n2021,9392\r\n2020,8665\r\n2019,8812\r\n2018,8920\r\n2017,8599\r\n2016,8639\r\n2015,8711\r\n2014,8645\r\n2013,8072\r\n2012,8075\r\n2011,7641\r\n2010,7201", "legend": [ "Mean Income Deficit of Household: Married Couple Family Household" ], @@ -574,14 +574,14 @@ "Mean_IncomeDeficit_Household_MarriedCoupleFamilyHousehold" ], "highlight": { - "date": "2021", - "value": 9392 + "date": "2022", + "value": 9894 }, "chartUrl": "", "dcUrl": "https://datacommons.org/explore#q=family%20earnings%20in%20north%20dakota" }, { - "data_csv": "rank,place,Mean Income Deficit of Household: Married Couple Family Household\r\n1,Steele County,25719\r\n2,Ransom County,22740\r\n3,Sioux County,21443\r\n4,Williams County,17531\r\n5,Benson County,17245\r\n46,Slope County,4069\r\n47,Bottineau County,3847\r\n48,Burke County,3700\r\n49,Griggs County,2550\r\n50,Renville County,2026", + "data_csv": "rank,place,Mean Income Deficit of Household: Married Couple Family Household\r\n1,Steele County,25719\r\n2,Ransom County,22740\r\n3,Sioux County,21674\r\n4,Traill County,18967\r\n5,Williams County,17531\r\n46,Bottineau County,3847\r\n47,Burke County,3700\r\n48,Billings County,3653\r\n49,Griggs County,2550\r\n50,Renville County,2026", "placeType": "County", "places": [ "geoId/38" @@ -592,7 +592,7 @@ "url": "https://data.census.gov/cedsci/table?q=S1702&tid=ACSST5Y2019.S1702" } ], - "title": "Mean Income Deficit of Household: Married Couple Family Household in Counties of North Dakota (2010 to 2021)", + "title": "Mean Income Deficit of Household: Married Couple Family Household in Counties of North Dakota (2013 to 2022)", "type": "TABLE", "unit": "USD", "vars": [ From c073189dadb3f291e722e984dd77e2c185af7ce2 Mon Sep 17 00:00:00 2001 From: natalie <77713883+n-h-diaz@users.noreply.github.com> Date: Thu, 24 Oct 2024 12:09:08 -0700 Subject: [PATCH 06/28] Update submodules (#4688) --- mixer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mixer b/mixer index a5e2e7555f..3efcb7cf6b 160000 --- a/mixer +++ b/mixer @@ -1 +1 @@ -Subproject commit a5e2e7555f56246010e1e4e57ffa8cf2495aac2c +Subproject commit 3efcb7cf6b8398bac5132abf53d4f138df2268ba From 4fbd786c18218212f7e7dc639fbb123548b2e4d2 Mon Sep 17 00:00:00 2001 From: natalie <77713883+n-h-diaz@users.noreply.github.com> Date: Thu, 24 Oct 2024 15:42:28 -0700 Subject: [PATCH 07/28] Pin transformers to 4.45.2 (#4689) Also updates nl goldens --- nl_requirements.txt | 3 +- .../whatisthephylumofvolvox/debug_info.json | 98 +++++++------- .../debug_info.json | 84 ++++++------ .../debug_info.json | 88 ++++++------ .../compareobesityvs.poverty/debug_info.json | 64 ++++----- .../debug_info.json | 84 ++++++------ .../debug_info.json | 128 +++++++++--------- .../debug_info.json | 54 ++++---- 8 files changed, 302 insertions(+), 301 deletions(-) diff --git a/nl_requirements.txt b/nl_requirements.txt index 16957a83d6..9c56100f7d 100644 --- a/nl_requirements.txt +++ b/nl_requirements.txt @@ -12,4 +12,5 @@ torchvision==0.17.2 # TODO: this is pinned because latest huggingface_hub is not compatible with # sentence-transformers v2.2.2. Look into upgrading sentence-transformers to # v2.3.0 or newer -huggingface_hub==0.25.2 \ No newline at end of file +huggingface_hub==0.25.2 +transformers==4.45.2 \ No newline at end of file diff --git a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json index 046cbf177a..88264f8460 100644 --- a/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json +++ b/server/integration_tests/test_data/detection_api_bio/whatisthephylumofvolvox/debug_info.json @@ -10,29 +10,29 @@ "query_with_places_removed": "what is the phylum of", "sv_matching": { "CosineScore": [ - 0.35510891675949097, - 0.34608712792396545, - 0.34525778889656067, - 0.34484589099884033, - 0.3411365747451782, - 0.3384982645511627, - 0.3349902927875519, - 0.33166080713272095, - 0.32600581645965576, - 0.32424452900886536, - 0.32060614228248596, - 0.3142656087875366, - 0.31276530027389526, - 0.3126294016838074, - 0.31250450015068054, + 0.35510897636413574, + 0.3460872769355774, + 0.3452577292919159, + 0.344845712184906, + 0.34113651514053345, + 0.3384983241558075, + 0.3349902033805847, + 0.3316609561443329, + 0.3260059356689453, + 0.32424432039260864, + 0.3206062316894531, + 0.31426557898521423, + 0.3127653896808624, + 0.31262922286987305, + 0.31250447034835815, 0.31177398562431335, - 0.31033891439437866, - 0.3100748062133789, - 0.3098834156990051, - 0.30805402994155884, - 0.3074587285518646, + 0.31033921241760254, + 0.31007489562034607, + 0.30988338589668274, + 0.3080539405345917, + 0.30745869874954224, 0.30719631910324097, - 0.3039420545101166 + 0.3039420247077942 ], "MultiSV": {}, "Query": "what is the phylum of", @@ -64,34 +64,34 @@ }, "props_matching": { "CosineScore": [ - 1.0000001192092896, - 0.47528403997421265, - 0.3615415692329407, - 0.3420097827911377, - 0.32933083176612854, - 0.3184516429901123, - 0.3146698474884033, - 0.3083950877189636, - 0.30794060230255127, - 0.3046301305294037, - 0.2827085256576538, - 0.2818753123283386, - 0.28082767128944397, - 0.28045278787612915, - 0.2742983102798462, - 0.2715049386024475, - 0.27071818709373474, - 0.2695465385913849, - 0.25990062952041626, - 0.25990062952041626, - 0.24827902019023895, - 0.24662014842033386, - 0.24632105231285095, - 0.24616341292858124, - 0.24212220311164856, - 0.23135532438755035, - 0.2296244204044342, - 0.2277354896068573 + 0.9999998807907104, + 0.4752839505672455, + 0.36154165863990784, + 0.34200993180274963, + 0.3293309211730957, + 0.31845176219940186, + 0.31466981768608093, + 0.3083951473236084, + 0.3079407513141632, + 0.30463001132011414, + 0.28270864486694336, + 0.28187549114227295, + 0.2808278203010559, + 0.2804529666900635, + 0.27429836988449097, + 0.27150505781173706, + 0.2707182466983795, + 0.26954683661460876, + 0.2599008083343506, + 0.2599008083343506, + 0.24827907979488373, + 0.24662044644355774, + 0.24632112681865692, + 0.24616354703903198, + 0.24212250113487244, + 0.23135541379451752, + 0.2296244502067566, + 0.22773587703704834 ], "PROP": [ "phylum", diff --git a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json index 2e9413e755..0d288676b2 100644 --- a/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json +++ b/server/integration_tests/test_data/detection_api_bio/whattypesofgenesarefgfr1,apoe,andache/debug_info.json @@ -12,30 +12,30 @@ "query_with_places_removed": "what types of genes are and", "sv_matching": { "CosineScore": [ - 0.5237791538238525, - 0.4451894164085388, - 0.41981467604637146, - 0.41922128200531006, - 0.4136667847633362, - 0.4096526503562927, - 0.40661105513572693, - 0.4013715982437134, - 0.4010191261768341, - 0.400637686252594, - 0.39874640107154846, - 0.39836061000823975, - 0.39052367210388184, - 0.3890332579612732, - 0.38846099376678467, - 0.3883823752403259, - 0.3873301148414612, - 0.38642191886901855, - 0.3858962655067444, - 0.3856789469718933, - 0.38543426990509033, - 0.38533884286880493, - 0.3818426728248596, - 0.37970495223999023 + 0.5237788558006287, + 0.44518929719924927, + 0.4198145568370819, + 0.41922125220298767, + 0.4136667251586914, + 0.4096524715423584, + 0.4066111147403717, + 0.40137141942977905, + 0.40101921558380127, + 0.40063756704330444, + 0.3987462520599365, + 0.3983607292175293, + 0.39052334427833557, + 0.3890331983566284, + 0.38846108317375183, + 0.3883824050426483, + 0.3873300850391388, + 0.3864220678806305, + 0.38589635491371155, + 0.385678768157959, + 0.3854341208934784, + 0.38533875346183777, + 0.3818424642086029, + 0.37970471382141113 ], "MultiSV": {}, "Query": "what types of genes are and", @@ -68,29 +68,29 @@ }, "props_matching": { "CosineScore": [ - 0.908610999584198, - 0.7445293664932251, - 0.7330226898193359, - 0.7175887823104858, - 0.6834691166877747, - 0.6590197086334229, - 0.6340402960777283, - 0.5988124012947083, + 0.9086108803749084, + 0.7445291876792908, + 0.7330227494239807, + 0.7175889611244202, + 0.6834693551063538, + 0.6590196490287781, + 0.6340398192405701, + 0.5988121628761292, 0.595878541469574, - 0.5850145220756531, - 0.5810791850090027, + 0.5850147604942322, + 0.5810789465904236, 0.5432419776916504, 0.5399730205535889, 0.5320467948913574, 0.5309585928916931, - 0.5142703056335449, - 0.5125278234481812, - 0.46105992794036865, - 0.44410809874534607, - 0.3982294797897339, - 0.3944428563117981, - 0.392289936542511, - 0.38480231165885925 + 0.5142701268196106, + 0.5125278830528259, + 0.4610598683357239, + 0.4441079795360565, + 0.3982292413711548, + 0.3944430947303772, + 0.3922898471355438, + 0.38480237126350403 ], "PROP": [ "typeOfGene", diff --git a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json index 4611fc3e24..6911e00711 100644 --- a/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json @@ -8,43 +8,43 @@ "query_with_places_removed": "compare male population with female population", "sv_matching": { "CosineScore": [ - 0.9187595844268799, - 0.8590543866157532, + 0.9187589883804321, + 0.8590542674064636, 0.8354092836380005, - 0.7823134660720825, - 0.7773187756538391, + 0.7823135852813721, + 0.7773193120956421, 0.7762894630432129, 0.7663271427154541, - 0.766107439994812, - 0.7614184617996216, - 0.7606041431427002, - 0.7595797181129456, - 0.7573733329772949, - 0.7573024034500122, - 0.757297158241272, - 0.7553009390830994, - 0.7533451318740845, - 0.7532937526702881, - 0.7509560585021973, - 0.7482578754425049, - 0.7451456785202026, - 0.7443947792053223, - 0.7431552410125732, - 0.7426693439483643, - 0.7396597862243652, - 0.7371534109115601, - 0.7366002798080444, - 0.7347153425216675, - 0.733651876449585, - 0.732607901096344, - 0.7325160503387451, - 0.7302997708320618, - 0.7299268841743469, + 0.7661072611808777, + 0.7614185810089111, + 0.7606043219566345, + 0.7595799565315247, + 0.7573726773262024, + 0.757302463054657, + 0.7572974562644958, + 0.7553005814552307, + 0.753344714641571, + 0.7532935738563538, + 0.7509563565254211, + 0.7482579350471497, + 0.7451451420783997, + 0.7443950176239014, + 0.7431556582450867, + 0.7426689267158508, + 0.7396599650382996, + 0.7371536493301392, + 0.7365996241569519, + 0.7347152829170227, + 0.7336517572402954, + 0.7326081991195679, + 0.7325156927108765, + 0.7302993535995483, + 0.729926347732544, 0.7289118766784668, - 0.7289034724235535, - 0.7280722260475159, - 0.7259584665298462, - 0.7259330153465271 + 0.728903591632843, + 0.7280725836753845, + 0.7259583473205566, + 0.7259331345558167 ], "MultiSV": { "Candidates": [ @@ -54,7 +54,7 @@ "Parts": [ { "CosineScore": [ - 0.9257857799530029 + 0.9257851839065552 ], "QueryPart": "male population", "SV": [ @@ -64,7 +64,7 @@ { "CosineScore": [ 0.92969810962677, - 0.884743332862854 + 0.8847430348396301 ], "QueryPart": "female population", "SV": [ @@ -80,7 +80,7 @@ "Parts": [ { "CosineScore": [ - 0.9117770791053772 + 0.9117769002914429 ], "QueryPart": "male population female", "SV": [ @@ -89,8 +89,8 @@ }, { "CosineScore": [ - 0.8982378840446472, - 0.8723467588424683 + 0.8982371687889099, + 0.8723466992378235 ], "QueryPart": "population", "SV": [ @@ -106,10 +106,10 @@ "Parts": [ { "CosineScore": [ - 0.808887243270874, - 0.8034241199493408, - 0.8017654418945312, - 0.775155782699585 + 0.8088874816894531, + 0.8034244179725647, + 0.8017649054527283, + 0.7751561999320984 ], "QueryPart": "male", "SV": [ @@ -121,8 +121,8 @@ }, { "CosineScore": [ - 0.9170327186584473, - 0.873018741607666 + 0.9170326590538025, + 0.8730189204216003 ], "QueryPart": "population female population", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json index 83ff52431b..2717973e61 100644 --- a/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/compareobesityvs.poverty/debug_info.json @@ -8,35 +8,35 @@ "query_with_places_removed": "compare obesity vs poverty", "sv_matching": { "CosineScore": [ - 0.8778442740440369, - 0.7967699766159058, - 0.762496829032898, - 0.7499465942382812, - 0.7484047412872314, - 0.7442895174026489, - 0.7357541918754578, - 0.7350349426269531, - 0.7310354709625244, - 0.7289618253707886, - 0.7266261577606201, - 0.7264261841773987, - 0.7264261841773987, - 0.7253916263580322, + 0.8778440952301025, + 0.7967696785926819, + 0.7624966502189636, + 0.7499464750289917, + 0.7484046220779419, + 0.744289755821228, + 0.7357544302940369, + 0.7350348830223083, + 0.7310351729393005, + 0.7289621829986572, + 0.7266256213188171, + 0.7264258861541748, + 0.7264258861541748, + 0.7253912091255188, 0.7230079174041748, - 0.7139475345611572, - 0.7126950621604919, - 0.7094853520393372, - 0.7085550427436829, - 0.7085551023483276, - 0.7078822255134583, - 0.7077707052230835, - 0.7045387029647827, - 0.7024303078651428, - 0.7004534602165222, - 0.6994997262954712, - 0.6956704258918762, - 0.6947906613349915, - 0.6913242936134338 + 0.713947594165802, + 0.7126947641372681, + 0.7094854116439819, + 0.7085545659065247, + 0.7085544466972351, + 0.7078820466995239, + 0.7077706456184387, + 0.7045392394065857, + 0.7024305462837219, + 0.7004537582397461, + 0.6994994878768921, + 0.695670485496521, + 0.6947909593582153, + 0.6913240551948547 ], "MultiSV": { "Candidates": [ @@ -46,10 +46,10 @@ "Parts": [ { "CosineScore": [ - 0.8467836380004883, - 0.8316553831100464, - 0.8201552033424377, - 0.8177061080932617 + 0.8467828035354614, + 0.8316561579704285, + 0.8201544284820557, + 0.8177065253257751 ], "QueryPart": "obesity", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json index e015ba346e..fdb51b9dd8 100644 --- a/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json @@ -8,34 +8,34 @@ "query_with_places_removed": "how are factors like obesity , blood pressure and asthma impacted by climate change", "sv_matching": { "CosineScore": [ - 0.7864793539047241, - 0.7135567665100098, - 0.691805362701416, - 0.6740915179252625, - 0.6734591722488403, - 0.6704620718955994, - 0.6635113954544067, - 0.6593924760818481, - 0.6520178318023682, - 0.6484817266464233, + 0.7864788770675659, + 0.7135568261146545, + 0.691805899143219, + 0.6740916967391968, + 0.6734588742256165, + 0.670462429523468, + 0.6635114550590515, + 0.6593927145004272, + 0.6520175337791443, + 0.6484816074371338, 0.6461696624755859, - 0.6459026336669922, - 0.6435545682907104, + 0.6459028124809265, + 0.6435540914535522, 0.6410900354385376, - 0.6405231952667236, - 0.6402113437652588, - 0.6384210586547852, - 0.6380343437194824, - 0.6376464366912842, - 0.6346377730369568, - 0.6341456174850464, + 0.640523374080658, + 0.6402111649513245, + 0.6384206414222717, + 0.6380341053009033, + 0.6376466751098633, + 0.6346374154090881, + 0.6341455578804016, 0.6338476538658142, - 0.6322696805000305, - 0.6322205662727356, - 0.6304948925971985, - 0.6302965879440308, - 0.6298357844352722, - 0.6295678019523621 + 0.632270336151123, + 0.6322208046913147, + 0.6304947137832642, + 0.6302966475486755, + 0.6298351287841797, + 0.6295675039291382 ], "MultiSV": { "Candidates": [ @@ -45,7 +45,7 @@ "Parts": [ { "CosineScore": [ - 0.7997788190841675 + 0.7997785806655884 ], "QueryPart": "factors like obesity blood pressure asthma impacted", "SV": [ @@ -54,7 +54,7 @@ }, { "CosineScore": [ - 1.0 + 1.000000238418579 ], "QueryPart": "climate change", "SV": [ @@ -69,11 +69,11 @@ "Parts": [ { "CosineScore": [ - 0.7588618993759155, - 0.7463642954826355, - 0.740165650844574, - 0.7351235151290894, - 0.7130995988845825 + 0.7588625550270081, + 0.7463639974594116, + 0.740165114402771, + 0.7351229190826416, + 0.7130995392799377 ], "QueryPart": "factors like obesity", "SV": [ @@ -86,7 +86,7 @@ }, { "CosineScore": [ - 0.9999996423721313 + 1.0000003576278687 ], "QueryPart": "blood pressure", "SV": [ @@ -95,8 +95,8 @@ }, { "CosineScore": [ - 0.8255698680877686, - 0.8027870059013367 + 0.8255704641342163, + 0.802787184715271 ], "QueryPart": "asthma impacted climate change", "SV": [ @@ -112,9 +112,9 @@ "Parts": [ { "CosineScore": [ - 0.7768431901931763, - 0.7495046257972717, - 0.7342654466629028, + 0.7768431305885315, + 0.7495043873786926, + 0.7342660427093506, 0.7325114011764526 ], "QueryPart": "factors like obesity blood pressure asthma", @@ -127,7 +127,7 @@ }, { "CosineScore": [ - 0.9056921005249023 + 0.9056915044784546 ], "QueryPart": "impacted climate change", "SV": [ @@ -142,7 +142,7 @@ "Parts": [ { "CosineScore": [ - 0.8207905888557434 + 0.8207898736000061 ], "QueryPart": "factors like obesity blood pressure", "SV": [ @@ -151,8 +151,8 @@ }, { "CosineScore": [ - 0.8255698680877686, - 0.8027870059013367 + 0.8255704641342163, + 0.802787184715271 ], "QueryPart": "asthma impacted climate change", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json index 9732c39707..88431aa490 100644 --- a/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/numberofpoorhispanicwomenwithphd/debug_info.json @@ -8,46 +8,46 @@ "query_with_places_removed": "number of poor hispanic women with phd", "sv_matching": { "CosineScore": [ - 0.7985796332359314, - 0.7883262634277344, - 0.776346743106842, - 0.77406245470047, - 0.7410296201705933, - 0.7334667444229126, - 0.7228284478187561, - 0.722568929195404, - 0.6995474100112915, - 0.6995023488998413, - 0.697618305683136, - 0.6974341869354248, - 0.696003794670105, - 0.6953426003456116, - 0.6945168972015381, - 0.6939643621444702, - 0.6935360431671143, - 0.6908406019210815, - 0.6906974911689758, - 0.6896734237670898, - 0.6889521479606628, - 0.6886201500892639, - 0.6863292455673218, + 0.7985790967941284, + 0.788325846195221, + 0.7763473391532898, + 0.7740628719329834, + 0.741028904914856, + 0.7334664463996887, + 0.7228288054466248, + 0.7225687503814697, + 0.6995472311973572, + 0.6995018720626831, + 0.6976181268692017, + 0.6974342465400696, + 0.6960033774375916, + 0.6953437924385071, + 0.6945170760154724, + 0.6939643025398254, + 0.693536639213562, + 0.6908403635025024, + 0.690697431564331, + 0.6896734833717346, + 0.6889524459838867, + 0.6886194348335266, + 0.686329185962677, 0.6859177947044373, - 0.6827540397644043, - 0.6822139620780945, - 0.6815624237060547, - 0.67987459897995, - 0.676856517791748, - 0.6763089299201965, - 0.6751540303230286, - 0.6744991540908813, - 0.6725671291351318, - 0.6717973947525024, - 0.6691675186157227, - 0.6690007448196411, - 0.6682180762290955, - 0.6678104400634766, - 0.6650688052177429, - 0.6648702621459961 + 0.6827537417411804, + 0.6822136044502258, + 0.6815626621246338, + 0.6798743009567261, + 0.6768563985824585, + 0.6763087511062622, + 0.6751545071601868, + 0.6744989156723022, + 0.6725670695304871, + 0.6717979907989502, + 0.6691677570343018, + 0.6690006852149963, + 0.6682180166244507, + 0.6678112149238586, + 0.665069043636322, + 0.6648703813552856 ], "MultiSV": { "Candidates": [ @@ -57,17 +57,17 @@ "Parts": [ { "CosineScore": [ - 0.8311771750450134, - 0.8310011029243469, - 0.8255152702331543, - 0.8195514678955078, - 0.8145602345466614, - 0.8090661764144897, - 0.8086389303207397, - 0.8074402809143066, - 0.8002950549125671, - 0.7985796332359314, - 0.787818193435669 + 0.831177294254303, + 0.8310007452964783, + 0.8255155086517334, + 0.8195511698722839, + 0.8145607709884644, + 0.8090665936470032, + 0.8086387515068054, + 0.8074401021003723, + 0.8002946972846985, + 0.798579752445221, + 0.7878183722496033 ], "QueryPart": "number of poor hispanic", "SV": [ @@ -86,8 +86,8 @@ }, { "CosineScore": [ - 0.8318259119987488, - 0.8029923439025879 + 0.8318256139755249, + 0.8029921650886536 ], "QueryPart": "women phd", "SV": [ @@ -103,8 +103,8 @@ "Parts": [ { "CosineScore": [ - 0.8366719484329224, - 0.7972691059112549 + 0.836671769618988, + 0.7972695827484131 ], "QueryPart": "number of poor", "SV": [ @@ -114,10 +114,10 @@ }, { "CosineScore": [ - 0.8151505589485168, - 0.7885995507240295, - 0.7775554656982422, - 0.7752053141593933 + 0.8151502013206482, + 0.7885994911193848, + 0.7775559425354004, + 0.7752048969268799 ], "QueryPart": "hispanic women phd", "SV": [ @@ -135,8 +135,8 @@ "Parts": [ { "CosineScore": [ - 0.8495935201644897, - 0.8335005044937134 + 0.8495932221412659, + 0.8335015177726746 ], "QueryPart": "number of poor hispanic women", "SV": [ @@ -146,11 +146,11 @@ }, { "CosineScore": [ - 0.7646968960762024, + 0.7646967172622681, 0.7476688027381897, - 0.7377066612243652, - 0.7362767457962036, - 0.7305882573127747 + 0.7377063632011414, + 0.7362765669822693, + 0.7305881977081299 ], "QueryPart": "phd", "SV": [ diff --git a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json index e0c5938a14..faec85fed8 100644 --- a/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json +++ b/server/integration_tests/test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json @@ -8,30 +8,30 @@ "query_with_places_removed": "show me the impact of climate change on drought", "sv_matching": { "CosineScore": [ - 0.8393681645393372, - 0.79311203956604, - 0.7699974775314331, - 0.7208107709884644, - 0.7175306081771851, + 0.8393685817718506, + 0.7931121587753296, + 0.7699977159500122, + 0.7208102941513062, + 0.7175307869911194, 0.6995436549186707, - 0.6863456964492798, - 0.674246609210968, - 0.6730499267578125, - 0.6703540682792664, - 0.6652892827987671, - 0.6644606590270996, - 0.6353792548179626, - 0.6349931359291077, - 0.6347004771232605, - 0.630818247795105, + 0.6863453984260559, + 0.674246072769165, + 0.673050582408905, + 0.6703541874885559, + 0.6652891635894775, + 0.6644605398178101, + 0.6353793740272522, + 0.6349935531616211, + 0.6347004175186157, + 0.6308181285858154, 0.6290862560272217, - 0.6256592273712158, - 0.6180376410484314, - 0.6162123084068298, - 0.6141720414161682, - 0.6139707565307617, - 0.6138609647750854, - 0.6123877167701721 + 0.6256593465805054, + 0.6180377006530762, + 0.6162121891975403, + 0.6141721606254578, + 0.6139706969261169, + 0.6138609051704407, + 0.6123875379562378 ], "MultiSV": { "Candidates": [ @@ -41,7 +41,7 @@ "Parts": [ { "CosineScore": [ - 0.8787487149238586 + 0.8787480592727661 ], "QueryPart": "show climate change", "SV": [ @@ -50,7 +50,7 @@ }, { "CosineScore": [ - 0.9999998807907104 + 1.000000238418579 ], "QueryPart": "drought", "SV": [ @@ -65,8 +65,8 @@ "Parts": [ { "CosineScore": [ - 0.794236958026886, - 0.792901337146759 + 0.7942371964454651, + 0.7929015159606934 ], "QueryPart": "show climate", "SV": [ @@ -76,7 +76,7 @@ }, { "CosineScore": [ - 0.8665127754211426 + 0.866513192653656 ], "QueryPart": "change drought", "SV": [ From 499b981fd3f442c279f00edab03cd44b79dc90e2 Mon Sep 17 00:00:00 2001 From: Hannah Pho Date: Fri, 25 Oct 2024 15:27:51 -0400 Subject: [PATCH 08/28] Support schema update mode for data docker (#4686) Use the `DATA_RUN_MODE` environment variable to decide what mode to pass to run_stats.sh and whether to build embeddings. The mode `schemaupdate` for run_stats.sh is added by https://github.com/datacommonsorg/import/pull/344, which this PR updates the import submodule to include. A docsite page will describe how to pass in this environment variable: https://github.com/datacommonsorg/docsite/pull/527 --- build/cdc_data/run.sh | 29 ++++++++++++++++++++++------- import | 2 +- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/build/cdc_data/run.sh b/build/cdc_data/run.sh index bc71fd62fc..0019a7e124 100644 --- a/build/cdc_data/run.sh +++ b/build/cdc_data/run.sh @@ -32,6 +32,16 @@ if [[ $OUTPUT_DIR == "" ]]; then exit 1 fi +if [[ $DATA_RUN_MODE != "" ]]; then + if [[ $DATA_RUN_MODE != "schemaupdate" ]]; then + echo "DATA_RUN_MODE must be either empty or 'schemaupdate'" + exit 1 + fi + echo "DATA_RUN_MODE=$DATA_RUN_MODE" +else + DATA_RUN_MODE="customdc" +fi + echo "INPUT_DIR=$INPUT_DIR" echo "OUTPUT_DIR=$OUTPUT_DIR" @@ -51,7 +61,7 @@ ADDITIONAL_CATALOG_PATH=$DC_NL_EMBEDDINGS_DIR/custom_catalog.yaml CUSTOM_EMBEDDINGS_INDEX=user_all_minilm_mem # Set IS_CUSTOM_DC var to true. -# This is used by the embeddings builder to set up a custom dc env. +# This is used by the embeddings builder to set up a custom dc env. export IS_CUSTOM_DC=true if [[ $USE_SQLITE == "true" ]]; then @@ -67,15 +77,20 @@ cd $WORKSPACE_DIR/import/simple # Run importer. python3 -m stats.main \ --input_dir=$INPUT_DIR \ - --output_dir=$DC_OUTPUT_DIR + --output_dir=$DC_OUTPUT_DIR \ + --mode=$DATA_RUN_MODE # cd back to workspace dir to run the embeddings builder. cd $WORKSPACE_DIR -# Run embeddings builder. -python3 -m tools.nl.embeddings.build_embeddings \ - --embeddings_name=$CUSTOM_EMBEDDINGS_INDEX \ +if [[ $DATA_RUN_MODE == "schemaupdate" ]]; then + echo "Skipping embeddings builder because run mode is 'schemaupdate'." + echo "Schema update complete." +else + # Run embeddings builder. + python3 -m tools.nl.embeddings.build_embeddings \ + --embeddings_name=$CUSTOM_EMBEDDINGS_INDEX \ --output_dir=$DC_NL_EMBEDDINGS_DIR \ --additional_catalog_path=$ADDITIONAL_CATALOG_PATH - -echo "Data loading completed." + echo "Data loading complete." +fi diff --git a/import b/import index fab89e365f..02db128ecd 160000 --- a/import +++ b/import @@ -1 +1 @@ -Subproject commit fab89e365f0e38cbc87c528f2c00746c04be2d6c +Subproject commit 02db128ecdb15959aaf4e652021ae13acfea0350 From 204ee2668d6e800f1a554c60066057d638f424ad Mon Sep 17 00:00:00 2001 From: Gabriel Mechali Date: Mon, 28 Oct 2024 14:37:26 -0400 Subject: [PATCH 09/28] Improves Typo recognition for autocomplete (#4690) This PR modifies the scoring algorithm for place autocomplete to count a small score for non-exact matches, to account for one typo. With these changes, we will favor "San Diego" over "Dieppe" for the query "Sna Die". Prod: https://screenshot.googleplex.com/Bsx2BbyLZArbQuX Local with this change: https://screenshot.googleplex.com/9jHqKb2uHJLz37k Note that "Sne Die" will still go back to "Dieppe" because that's 2 typos, so San Diego is out even if it was returned by google Maps predictions: https://screenshot.googleplex.com/9LViJoVFni3Lui6 Typo check done as a bag of letters with at most off by one. We do this check on top of the Google Maps Predictions which already take into account typo correction. This part is just to choose the best prediction from google maps. Doing this as part of gaps identified in place autocomplete: https://docs.google.com/document/d/15RVckX9ck5eyyhBHW8Nb9lmxPBDPMIeLbax14HbN-GI/edit?tab=t.0 --- .../routes/shared_api/autocomplete/helpers.py | 46 ++++++++++++++++++- server/tests/routes/api/autocomplete_test.py | 22 ++++++++- 2 files changed, 65 insertions(+), 3 deletions(-) diff --git a/server/routes/shared_api/autocomplete/helpers.py b/server/routes/shared_api/autocomplete/helpers.py index b4299331ed..08e96617d7 100644 --- a/server/routes/shared_api/autocomplete/helpers.py +++ b/server/routes/shared_api/autocomplete/helpers.py @@ -73,6 +73,40 @@ def execute_maps_request(query: str, language: str) -> Dict: return json.loads(response.text) +def bag_of_letters(text: str) -> Dict: + """Creates a bag-of-letters representation of a given string. + Returns: + dict: A dictionary where keys are letters and values are their counts. + """ + bag = {} + for char in text.lower(): + if char.isalpha(): + bag[char] = bag.get(char, 0) + 1 + return bag + + +# TODO(gmechali): Look into a better typo algo e.g Levenshtein distance. +def off_by_one_letter(str1_word: str, name_word: str) -> bool: + """Function to do off by one check. + Returns whether the two strings are off by at most one letter. + """ + offby = 0 + str1_bag = bag_of_letters(str1_word) + str2_bag = bag_of_letters(name_word) + for key, value in str1_bag.items(): + if key in str2_bag: + offby += abs(str2_bag[key] - value) + else: + offby += value + + # Add to offby for letters in str2 but not str1. + for key, value in str2_bag.items(): + if key not in str1_bag: + offby += value + + return offby <= 1 + + def get_match_score(match_string: str, name: str) -> float: """Computes a 'score' based on the matching words in two strings. Lowest score is best match. @@ -86,6 +120,7 @@ def get_match_score(match_string: str, name: str) -> float: start_index = 0 for str1_word in words_in_str1: str1_word = str1_word.lower() + found_match = False for idx, name_word in enumerate(words_in_name): if idx < start_index: continue @@ -94,13 +129,20 @@ def get_match_score(match_string: str, name: str) -> float: if str1_word == name_word: start_index = idx + 1 score -= 1 + found_match = True break elif str1_word in name_word: start_index = idx + 1 score -= 0.5 + found_match = True break - else: - score += 1 + elif off_by_one_letter(str1_word, name_word): + start_index = idx + 1 + found_match = True + score -= 0.25 + + if not found_match: + score += 1 return score diff --git a/server/tests/routes/api/autocomplete_test.py b/server/tests/routes/api/autocomplete_test.py index 72c9c48a31..ee19c7f9ca 100644 --- a/server/tests/routes/api/autocomplete_test.py +++ b/server/tests/routes/api/autocomplete_test.py @@ -15,6 +15,7 @@ import unittest from unittest.mock import patch +from server.routes.shared_api.autocomplete import helpers import server.tests.routes.api.mock_data as mock_data from web_app import app @@ -64,4 +65,23 @@ def mock_predict_effect(query, lang): self.assertEqual(response.status_code, 200) response_dict = json.loads(response.data.decode("utf-8")) - self.assertEqual(len(response_dict["predictions"]), 5) \ No newline at end of file + self.assertEqual(len(response_dict["predictions"]), 5) + + # Tests for helpers within autocomplete. + def test_bag_of_words_same(self): + """Tests that bag of words passes for same letters.""" + text = "San" + reordered_text = "Sna" + self.assertTrue(helpers.off_by_one_letter(text, reordered_text)) + + def test_bag_of_words_off_by_one(self): + """Tests that bag of words passes when off by one.""" + text = "Diego" + off_by_one_text = "Digo" + self.assertTrue(helpers.off_by_one_letter(text, off_by_one_text)) + + def test_bag_of_words_off_by_two(self): + """Tests that bag of words passes when off by two.""" + text = "Diego" + off_by_one_text = "Diaga" + self.assertFalse(helpers.off_by_one_letter(text, off_by_one_text)) From 60a4f5fdb1c31e2a74f26173db2ecc553c9b9a70 Mon Sep 17 00:00:00 2001 From: Nicholas Blumberg <41446765+nick-next@users.noreply.github.com> Date: Wed, 30 Oct 2024 18:49:17 -0700 Subject: [PATCH 10/28] Miscellaneous updates and improvements (#4673) ## Description This PR contains miscellaneous updates and improvements triggered from comments in an earlier PR: [4599](https://github.com/datacommonsorg/website/pull/4599) It contains the following updates: * The TypeScript breakpoint object is standardized to defaults, and comments now reference the TypeScript and SCSS version so that they can be kept in sync with further changes. * The `Topics` component has been generalized into a `LinkChips` component, making it a more reusable content component. This update was triggered by the request to change the CSS class from "topics" (which was also done along with this larger change). We can generalize other content components in later PRs. * The directory for the SCSS files relating to content components is now renamed to make that structure more clear. * Updates to comments, copyright notices and the variable import file name. --- static/css/about.scss | 10 ++-- static/css/base.scss | 4 ++ static/css/build.scss | 18 +++---- .../build_your_own.scss | 0 .../topics.scss => content/chips.scss} | 10 ++-- .../{components => content}/columns_text.scss | 18 +++++++ .../{components => content}/hero_columns.scss | 0 .../{components => content}/hero_video.scss | 0 .../{components => content}/media_text.scss | 0 .../one_data_commons.scss | 0 .../css/{components => content}/partners.scss | 0 static/css/{components => content}/quote.scss | 0 .../sample_questions.scss | 0 .../{components => content}/simple_text.scss | 0 .../slide_carousel.scss | 0 static/css/{components => content}/tools.scss | 0 static/css/core.scss | 2 +- static/css/homepage.scss | 16 +++---- .../{new_variables.scss => variables.scss} | 0 static/js/apps/base/utilities/utilities.ts | 19 ++++++-- static/js/apps/homepage/app.tsx | 10 +++- .../content/{topics.tsx => link_chips.tsx} | 48 ++++++++++++------- 22 files changed, 103 insertions(+), 52 deletions(-) rename static/css/{components => content}/build_your_own.scss (100%) rename static/css/{components/topics.scss => content/chips.scss} (88%) rename static/css/{components => content}/columns_text.scss (55%) rename static/css/{components => content}/hero_columns.scss (100%) rename static/css/{components => content}/hero_video.scss (100%) rename static/css/{components => content}/media_text.scss (100%) rename static/css/{components => content}/one_data_commons.scss (100%) rename static/css/{components => content}/partners.scss (100%) rename static/css/{components => content}/quote.scss (100%) rename static/css/{components => content}/sample_questions.scss (100%) rename static/css/{components => content}/simple_text.scss (100%) rename static/css/{components => content}/slide_carousel.scss (100%) rename static/css/{components => content}/tools.scss (100%) rename static/css/{new_variables.scss => variables.scss} (100%) rename static/js/components/content/{topics.tsx => link_chips.tsx} (51%) diff --git a/static/css/about.scss b/static/css/about.scss index c22519b71a..6d3a19c4a5 100644 --- a/static/css/about.scss +++ b/static/css/about.scss @@ -1,5 +1,5 @@ /** - * Copyright 2023 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,11 +16,11 @@ /* Styles for the about page */ -@use "./new_variables" as var; +@use "./variables" as var; @import "base"; -@import "./components/media_text"; -@import "./components/columns_text"; -@import "./components/quote"; +@import "./content/media_text"; +@import "./content/columns_text"; +@import "./content/quote"; #about { // General Styles diff --git a/static/css/base.scss b/static/css/base.scss index faf68eafb3..3a79adf932 100644 --- a/static/css/base.scss +++ b/static/css/base.scss @@ -36,6 +36,10 @@ $h3-font-size: 1.2rem; $headings-font-weight: 600; +/* + If the grid-breakpoints change, the TypeScript equivalent should be updated: + `static/js/apps/base/utilities/utilities.ts`, `export const BREAKPOINTS` + */ $grid-breakpoints: ( xs: 0, sm: 576px, diff --git a/static/css/build.scss b/static/css/build.scss index a38b590194..6aba4247ed 100644 --- a/static/css/build.scss +++ b/static/css/build.scss @@ -1,5 +1,5 @@ /** - * Copyright 2023 Google LLC + * Copyright 2024 Google LLC * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,15 +16,15 @@ /* Styles for the build page */ -@use "./new_variables" as var; +@use "./variables" as var; @import "base"; -@import "./components/partners"; -@import "./components/hero_columns"; -@import "./components/media_text"; -@import "./components/quote"; -@import "./components/simple_text"; -@import "./components/slide_carousel"; -@import "./components/one_data_commons"; +@import "./content/partners"; +@import "./content/hero_columns"; +@import "./content/media_text"; +@import "./content/quote"; +@import "./content/simple_text"; +@import "./content/slide_carousel"; +@import "./content/one_data_commons"; #build { // General Styles diff --git a/static/css/components/build_your_own.scss b/static/css/content/build_your_own.scss similarity index 100% rename from static/css/components/build_your_own.scss rename to static/css/content/build_your_own.scss diff --git a/static/css/components/topics.scss b/static/css/content/chips.scss similarity index 88% rename from static/css/components/topics.scss rename to static/css/content/chips.scss index 696669b307..e66bb1633f 100644 --- a/static/css/components/topics.scss +++ b/static/css/content/chips.scss @@ -15,15 +15,16 @@ */ /** - * Styles for the topics component located on the home page + * Styles for the LinkChips component and any other component that will display chips in the same way */ -.topics { +.chip-section { h3 { @include var.title_xs; margin-bottom: calc(#{var.$spacing} * 3); } - .topics-container { + + .chip-container { margin: 0; padding: 0; display: flex; @@ -34,7 +35,8 @@ max-width: 100%; } } - .topic-item { + + .chip-item { display: block; list-style: none; a { diff --git a/static/css/components/columns_text.scss b/static/css/content/columns_text.scss similarity index 55% rename from static/css/components/columns_text.scss rename to static/css/content/columns_text.scss index 3ee9a71a4b..67a54086a9 100644 --- a/static/css/components/columns_text.scss +++ b/static/css/content/columns_text.scss @@ -1,3 +1,21 @@ +/** + * Copyright 2024 Google LLC + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* Styles for the text column sections */ + .text-columns { .container { display: grid; diff --git a/static/css/components/hero_columns.scss b/static/css/content/hero_columns.scss similarity index 100% rename from static/css/components/hero_columns.scss rename to static/css/content/hero_columns.scss diff --git a/static/css/components/hero_video.scss b/static/css/content/hero_video.scss similarity index 100% rename from static/css/components/hero_video.scss rename to static/css/content/hero_video.scss diff --git a/static/css/components/media_text.scss b/static/css/content/media_text.scss similarity index 100% rename from static/css/components/media_text.scss rename to static/css/content/media_text.scss diff --git a/static/css/components/one_data_commons.scss b/static/css/content/one_data_commons.scss similarity index 100% rename from static/css/components/one_data_commons.scss rename to static/css/content/one_data_commons.scss diff --git a/static/css/components/partners.scss b/static/css/content/partners.scss similarity index 100% rename from static/css/components/partners.scss rename to static/css/content/partners.scss diff --git a/static/css/components/quote.scss b/static/css/content/quote.scss similarity index 100% rename from static/css/components/quote.scss rename to static/css/content/quote.scss diff --git a/static/css/components/sample_questions.scss b/static/css/content/sample_questions.scss similarity index 100% rename from static/css/components/sample_questions.scss rename to static/css/content/sample_questions.scss diff --git a/static/css/components/simple_text.scss b/static/css/content/simple_text.scss similarity index 100% rename from static/css/components/simple_text.scss rename to static/css/content/simple_text.scss diff --git a/static/css/components/slide_carousel.scss b/static/css/content/slide_carousel.scss similarity index 100% rename from static/css/components/slide_carousel.scss rename to static/css/content/slide_carousel.scss diff --git a/static/css/components/tools.scss b/static/css/content/tools.scss similarity index 100% rename from static/css/components/tools.scss rename to static/css/content/tools.scss diff --git a/static/css/core.scss b/static/css/core.scss index 933e004f11..15b2223c9e 100644 --- a/static/css/core.scss +++ b/static/css/core.scss @@ -16,7 +16,7 @@ /* Styles for the header reflected in version 2 of the homepage */ -@use "./new_variables" as var; +@use "./variables" as var; @import "base"; $header-desktop-height: 96px; diff --git a/static/css/homepage.scss b/static/css/homepage.scss index 8d182d960c..64e4aca868 100644 --- a/static/css/homepage.scss +++ b/static/css/homepage.scss @@ -16,15 +16,15 @@ /* Styles for the homepage */ -@use "./new_variables" as var; +@use "./variables" as var; @import "base"; -@import "./components/hero_video"; -@import "./components/sample_questions"; -@import "./components/tools"; -@import "./components/partners"; -@import "./components/build_your_own"; -@import "./components/topics"; -@import "./components/slide_carousel"; +@import "./content/hero_video"; +@import "./content/sample_questions"; +@import "./content/tools"; +@import "./content/partners"; +@import "./content/build_your_own"; +@import "./content/chips"; +@import "./content/slide_carousel"; #homepage { // General Styles diff --git a/static/css/new_variables.scss b/static/css/variables.scss similarity index 100% rename from static/css/new_variables.scss rename to static/css/variables.scss diff --git a/static/js/apps/base/utilities/utilities.ts b/static/js/apps/base/utilities/utilities.ts index 4f366cb39e..c9ee36ed95 100644 --- a/static/js/apps/base/utilities/utilities.ts +++ b/static/js/apps/base/utilities/utilities.ts @@ -140,10 +140,19 @@ export const extractLabels = (elementId = "metadata-labels"): Labels => { return labels; }; -//A breakpoints constant object for responsiveness, for access on the TypeScript side. +/* + A breakpoints constant object for responsiveness, for access on the TypeScript side. + These are the default breakpoints for a page that does not have custom breakpoints and are + applied in: `static/css/base.scss` + + If a page does not use default breakpoints and those breakpoints are required on + the TypeScript side, a separate breakpoint object should be created. +*/ export const BREAKPOINTS = { - sm: 599, - md: 746, - mdExpanded: 859, - lg: 1440, + xs: 0, + sm: 576, + md: 768, + lg: 1068, + xl: 1350, + xxl: 1400, }; diff --git a/static/js/apps/homepage/app.tsx b/static/js/apps/homepage/app.tsx index db30d2d8d9..f530d30978 100644 --- a/static/js/apps/homepage/app.tsx +++ b/static/js/apps/homepage/app.tsx @@ -24,10 +24,10 @@ import React, { ReactElement } from "react"; import Build from "../../components/content/build_your_own"; import HeroVideo from "../../components/content/hero_video"; +import { LinkChip, LinkChips } from "../../components/content/link_chips"; import Partners from "../../components/content/partners"; import SampleQuestions from "../../components/content/sample_questions"; import Tools from "../../components/content/tools"; -import Topics from "../../components/content/topics"; import { GA_EVENT_HOMEPAGE_CLICK } from "../../shared/ga_events"; import { Routes } from "../../shared/types/base"; import { @@ -56,10 +56,16 @@ export function App({ sampleQuestions, routes, }: AppProps): ReactElement { + const topicLinkChips: LinkChip[] = topics.map((topic) => ({ + id: topic.id, + title: topic.title, + url: topic.browseUrl, + })); + return ( <> - + diff --git a/static/js/components/content/topics.tsx b/static/js/components/content/link_chips.tsx similarity index 51% rename from static/js/components/content/topics.tsx rename to static/js/components/content/link_chips.tsx index 4edb147b35..39de5cd42e 100644 --- a/static/js/components/content/topics.tsx +++ b/static/js/components/content/link_chips.tsx @@ -15,7 +15,7 @@ */ /** - * A component that renders the topics section of the home page. + * A component that renders a series of chips that function as links with titles */ import React, { ReactElement } from "react"; @@ -26,33 +26,47 @@ import { GA_PARAM_URL, triggerGAEvent, } from "../../shared/ga_events"; -import { Topic } from "../../shared/types/homepage"; -interface TopicsProps { - //the topics passed from the backend through to the JavaScript via the templates - topics: Topic[]; +//an individual LinkChip comprising the title and url attributes of the chip. +export interface LinkChip { + //a unique identifier for the chip (used for map keys) + id: string; + //the title of the chip - this will be the text of the link + title: string; + //the url of the chip link + url: string; } -const Topics = ({ topics }: TopicsProps): ReactElement => { +interface LinkChipsProps { + //the title of the component, displayed as a header above the chips + title?: string; + //the link + linkChips: LinkChip[]; +} + +export const LinkChips = ({ + title, + linkChips, +}: LinkChipsProps): ReactElement => { return ( -
+
); }; - -export default Topics; From ac8fdad010fe30ef6fdd53dc30c323998616072a Mon Sep 17 00:00:00 2001 From: Nicholas Blumberg <41446765+nick-next@users.noreply.github.com> Date: Wed, 30 Oct 2024 21:54:03 -0700 Subject: [PATCH 11/28] Accessibility Updates (#4683) ## Description This PR implements improvements following an accessibility sweep of the home page, and includes the following fixes and improvements: * significant reworking of the carousel's tab handling; it now handles switching between slides by tab graciously regardless of the content. * addition of aria labels and corrections to existing aria labels. * the media text component can now take an optional alt prop in lieu of (or in addition to) the title, with at least one of them being required. * The headers in the rich menus are adjusted to better match the hierarchy. * tab outlines are fixed for the main menu. * Ids that could be duplicated have been removed. In the case of the search bar, we could not remove the id at this stage (because it is tied to downstream functionality) but we are now selectively rendering the mobile and desktop menu to prevent the duplicate id. To facilitate this selective rendering, we have added a breakpoints hook that allows us to apply Bootstrap-like media queries on the TypeScript side. This breakpoints hook may proof to be a generally useful utility. --------- Co-authored-by: Jennifer Blumberg Co-authored-by: Pablo Noel --- static/css/base.scss | 4 +- static/css/core.scss | 49 +++---- .../base/components/header_bar/header_bar.tsx | 7 +- .../header_bar/header_bar_search.tsx | 10 +- .../components/header_bar/header_logo.tsx | 2 +- .../components/header_bar/menu_desktop.tsx | 123 ++++++++++-------- .../header_bar/menu_rich_section_group.tsx | 8 +- static/js/apps/base/utilities/utilities.ts | 17 --- static/js/apps/homepage/main.ts | 2 +- static/js/build/one_data_commons.tsx | 1 + static/js/components/content/media_text.tsx | 14 +- .../components/content/sample_questions.tsx | 2 +- .../js/components/elements/slide_carousel.tsx | 39 +++++- .../nl_search_bar/auto_complete_input.tsx | 1 + static/js/shared/hooks/breakpoints.tsx | 116 +++++++++++++++++ static/js/shared/hooks/escape_key_handler.tsx | 21 +++ 16 files changed, 299 insertions(+), 117 deletions(-) create mode 100644 static/js/shared/hooks/breakpoints.tsx diff --git a/static/css/base.scss b/static/css/base.scss index 3a79adf932..62a73e6ecf 100644 --- a/static/css/base.scss +++ b/static/css/base.scss @@ -38,7 +38,7 @@ $headings-font-weight: 600; /* If the grid-breakpoints change, the TypeScript equivalent should be updated: - `static/js/apps/base/utilities/utilities.ts`, `export const BREAKPOINTS` + `static/js/shared/hooks/breakpoints.tsx`, `export const BREAKPOINTS` */ $grid-breakpoints: ( xs: 0, @@ -160,7 +160,7 @@ $headings-font-family: $font-family-sans-serif; background: var(--gm-3-white); } -#main-header #main-header-logo { +#main-header .main-header-logo { display: flex; align-items: center; img { diff --git a/static/css/core.scss b/static/css/core.scss index 15b2223c9e..8e57625e9e 100644 --- a/static/css/core.scss +++ b/static/css/core.scss @@ -151,17 +151,16 @@ section { li { display: flex; - align-items: stretch; + align-items: center; margin: 0; padding: 0; .menu-main-button { border: 0; - padding: 0; + padding: 8px 0; margin: 0; display: flex; align-items: center; - height: 100%; background-color: transparent; .menu-main-label { font-size: 0.875rem; @@ -185,7 +184,7 @@ section { .menu-main-link { display: flex; align-items: center; - height: 100%; + padding: 8px 0; color: #474747; transition: color 0.3s ease-in-out; font-size: 0.875rem; @@ -244,15 +243,17 @@ section { font-size: 1.4rem; font-weight: 100; } - h4 { - font-family: $font-family-google-title; - font-size: 1rem; - text-transform: uppercase; - color: #5e5e5e; - font-weight: 300; - margin: 0 0 32px 0; + .group { + h3 { + font-family: $font-family-google-title; + font-size: 1rem; + text-transform: uppercase; + color: #5e5e5e; + font-weight: 300; + margin: 0 0 32px 0; + } } - h5 { + h4 { font-family: $font-family-google-title; font-size: 1rem; font-weight: 500; @@ -504,14 +505,16 @@ section { font-size: 1.4rem; font-weight: 100; } - h4 { - font-family: $font-family-google-title; - font-size: 1rem; - text-transform: uppercase; - color: #5e5e5e; - font-weight: 300; + .group { + h3 { + font-family: $font-family-google-title; + font-size: 1rem; + text-transform: uppercase; + color: #5e5e5e; + font-weight: 300; + } } - h5 { + h4 { font-family: $font-family-google-title; font-size: 1rem; font-weight: 500; @@ -603,8 +606,8 @@ section { .search-input-text { display: block; - padding: 0px; - margin: 0px; + padding: 0; + margin: 0; width: 150px; flex-grow: 10; height: 38px; @@ -657,7 +660,7 @@ section { .search-input-result-section { display: flex; flex-direction: column; - padding: 10px 0px; + padding: 10px 0; .search-input-result { display: flex; @@ -682,7 +685,7 @@ section { } .result-divider { - margin: 0px; + margin: 0; } } diff --git a/static/js/apps/base/components/header_bar/header_bar.tsx b/static/js/apps/base/components/header_bar/header_bar.tsx index a8d1730e0c..fcd00e0294 100644 --- a/static/js/apps/base/components/header_bar/header_bar.tsx +++ b/static/js/apps/base/components/header_bar/header_bar.tsx @@ -20,6 +20,7 @@ import React, { ReactElement } from "react"; +import { useBreakpoints } from "../../../../shared/hooks/breakpoints"; import { HeaderMenu, Labels, Routes } from "../../../../shared/types/base"; import HeaderBarSearch from "./header_bar_search"; import HeaderLogo from "./header_logo"; @@ -52,6 +53,8 @@ const HeaderBar = ({ labels, routes, }: HeaderBarProps): ReactElement => { + const { up, down } = useBreakpoints(); + return (
@@ -74,7 +77,7 @@ const HeaderBar = ({ labels={labels} routes={routes} /> - {showHeaderSearchBar && } + {showHeaderSearchBar && down("md") && }
diff --git a/static/js/apps/base/components/header_bar/header_bar_search.tsx b/static/js/apps/base/components/header_bar/header_bar_search.tsx index d1752c1349..fb0894fd1c 100644 --- a/static/js/apps/base/components/header_bar/header_bar_search.tsx +++ b/static/js/apps/base/components/header_bar/header_bar_search.tsx @@ -27,11 +27,17 @@ import { triggerGAEvent, } from "../../../../shared/ga_events"; -const HeaderBarSearch = (): ReactElement => { +interface HeaderBarSearchProps { + inputId?: string; +} + +const HeaderBarSearch = ({ + inputId = "query-search-input", +}: HeaderBarSearchProps): ReactElement => { return ( { triggerGAEvent(GA_EVENT_NL_SEARCH, { [GA_PARAM_QUERY]: q, diff --git a/static/js/apps/base/components/header_bar/header_logo.tsx b/static/js/apps/base/components/header_bar/header_logo.tsx index 36ff0eb619..ffa2e81d23 100644 --- a/static/js/apps/base/components/header_bar/header_logo.tsx +++ b/static/js/apps/base/components/header_bar/header_logo.tsx @@ -51,7 +51,7 @@ const HeaderLogo = ({ return (
{logoPath && ( -