Skip to content

Commit

Permalink
update NL goldens (#4677)
Browse files Browse the repository at this point in the history 
updating NL goldens after mixer push to staging
  • Loading branch information
@chejennifer
chejennifer authored Oct 18, 2024
1 parent 6fe2cc3 commit 53a72e0
Show file tree
Hide file tree
Showing 19 changed files with 477 additions and 425 deletions.
6 changes: 5 additions & 1 deletion nl_requirements.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,8 @@ pandas==2.1.1
scikit-learn==1.3.1
sentence-transformers==2.2.2
spacy==3.7.4
torchvision==0.17.2
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
30 changes: 15 additions & 15 deletions server/integration_tests/test_data/demo2_cities_feb2023/query_6/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -109,35 +109,35 @@
{
"tiles": [
{
"placeDcidOverride": "country/MWI",
"placeDcidOverride": "country/SEN",
"statVarKey": [
"LifeExpectancy_Person_growth_abs"
],
"title": "Malawi",
"title": "Senegal",
"type": "LINE"
}
]
},
{
"tiles": [
{
"placeDcidOverride": "country/SEN",
"placeDcidOverride": "country/GMB",
"statVarKey": [
"LifeExpectancy_Person_growth_abs"
],
"title": "Senegal",
"title": "Gambia",
"type": "LINE"
}
]
},
{
"tiles": [
{
"placeDcidOverride": "country/GMB",
"placeDcidOverride": "country/MWI",
"statVarKey": [
"LifeExpectancy_Person_growth_abs"
],
"title": "Gambia",
"title": "Malawi",
"type": "LINE"
}
]
Expand Down Expand Up @@ -198,11 +198,11 @@
{
"tiles": [
{
"placeDcidOverride": "country/MWI",
"placeDcidOverride": "country/GMB",
"statVarKey": [
"LifeExpectancy_Person_growth_pct"
],
"title": "Malawi",
"title": "Gambia",
"type": "LINE"
}
]
Expand All @@ -222,23 +222,23 @@
{
"tiles": [
{
"placeDcidOverride": "country/ERI",
"placeDcidOverride": "country/MWI",
"statVarKey": [
"LifeExpectancy_Person_growth_pct"
],
"title": "Eritrea",
"title": "Malawi",
"type": "LINE"
}
]
},
{
"tiles": [
{
"placeDcidOverride": "country/GMB",
"placeDcidOverride": "country/MAR",
"statVarKey": [
"LifeExpectancy_Person_growth_pct"
],
"title": "Gambia",
"title": "Morocco",
"type": "LINE"
}
]
Expand All @@ -258,11 +258,11 @@
{
"tiles": [
{
"placeDcidOverride": "country/MAR",
"placeDcidOverride": "country/ERI",
"statVarKey": [
"LifeExpectancy_Person_growth_pct"
],
"title": "Morocco",
"title": "Eritrea",
"type": "LINE"
}
]
Expand Down
24 changes: 12 additions & 12 deletions server/integration_tests/test_data/demo2_cities_feb2023/query_7/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -54,9 +54,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -88,9 +88,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -122,9 +122,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -155,9 +155,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -189,9 +189,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -222,9 +222,9 @@
"country/TUN",
"country/MLI",
"country/ERI",
"country/MWI",
"country/SEN",
"country/GMB",
"country/MWI",
"country/SSD"
],
"statVarKey": [
Expand Down Expand Up @@ -323,11 +323,6 @@
"name": "Eritrea",
"place_type": "Country"
},
{
"dcid": "country/MWI",
"name": "Malawi",
"place_type": "Country"
},
{
"dcid": "country/SEN",
"name": "Senegal",
Expand All @@ -338,6 +333,11 @@
"name": "Gambia",
"place_type": "Country"
},
{
"dcid": "country/MWI",
"name": "Malawi",
"place_type": "Country"
},
{
"dcid": "country/SSD",
"name": "South Sudan",
Expand Down
32 changes: 0 additions & 32 deletions server/integration_tests/test_data/demo_fallback/query_5/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,34 +342,6 @@
],
"title": "Unemployment Rate"
},
{
"columns": [
{
"tiles": [
{
"statVarKey": [
"UnemploymentRate_Person_Female"
],
"title": "Unemployment Rate of Females in United States",
"type": "LINE"
}
]
},
{
"tiles": [
{
"description": "Unemployment Rate of Females in United States",
"statVarKey": [
"UnemploymentRate_Person_Female"
],
"title": "Unemployment Rate of Females in United States",
"type": "HIGHLIGHT"
}
]
}
],
"title": "Unemployment Rate of Females"
},
{
"columns": [
{
Expand Down Expand Up @@ -1014,10 +986,6 @@
"name": "Unemployment Rate",
"statVar": "UnemploymentRate_Person"
},
"UnemploymentRate_Person_Female": {
"name": "Unemployment Rate of Females",
"statVar": "UnemploymentRate_Person_Female"
},
"dc/1j7jmy39fwhw5_multiple_place_bar_block": {
"name": "Establishments in Agriculture, Forestry, Fishing And Hunting",
"statVar": "dc/1j7jmy39fwhw5"
Expand Down
30 changes: 24 additions & 6 deletions server/integration_tests/test_data/demo_feb2023/query_6/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -387,13 +387,21 @@
{
"tiles": [
{
"barTileSpec": {
"maxPlaces": 15,
"maxVariables": 15,
"sort": "DESCENDING"
},
"comparisonPlaces": [
"geoId/06061"
],
"statVarKey": [
"Percent_Person_21To65Years_Female_ReceivedCervicalCancerScreening",
"Percent_Person_50To74Years_Female_ReceivedMammography",
"Percent_Person_50To75Years_ReceivedColorectalCancerScreening"
"Percent_Person_21To65Years_Female_ReceivedCervicalCancerScreening_multiple_place_bar_block",
"Percent_Person_50To74Years_Female_ReceivedMammography_multiple_place_bar_block",
"Percent_Person_50To75Years_ReceivedColorectalCancerScreening_multiple_place_bar_block"
],
"title": "Cancer Preventive Health in Placer County",
"type": "LINE"
"title": "Cancer Preventive Health in Placer County (${date})",
"type": "BAR"
}
]
}
Expand Down Expand Up @@ -1443,12 +1451,22 @@
"statVar": "Percent_Person_21To65Years_Female_ReceivedCervicalCancerScreening",
"unit": "%"
},
"Percent_Person_21To65Years_Female_ReceivedCervicalCancerScreening_multiple_place_bar_block": {
"name": "Women 21 - 65 Years Who Received Cervical Cancer Screening",
"statVar": "Percent_Person_21To65Years_Female_ReceivedCervicalCancerScreening",
"unit": "%"
},
"Percent_Person_50To74Years_Female_ReceivedMammography": {
"name": "Women 50 - 74 Years, Who Received Mammography",
"statVar": "Percent_Person_50To74Years_Female_ReceivedMammography",
"unit": "%"
},
"Percent_Person_50To75Years_ReceivedColorectalCancerScreening": {
"Percent_Person_50To74Years_Female_ReceivedMammography_multiple_place_bar_block": {
"name": "Women 50 - 74 Years, Who Received Mammography",
"statVar": "Percent_Person_50To74Years_Female_ReceivedMammography",
"unit": "%"
},
"Percent_Person_50To75Years_ReceivedColorectalCancerScreening_multiple_place_bar_block": {
"name": "Patients 50 - 75 Years Who Received Colorectal Cancer Screening",
"statVar": "Percent_Person_50To75Years_ReceivedColorectalCancerScreening",
"unit": "%"
Expand Down
10 changes: 5 additions & 5 deletions ...est_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
"Parts": [
{
"CosineScore": [
0.925786018371582
0.9257859587669373
],
"QueryPart": "male population",
"SV": [
Expand All @@ -80,7 +80,7 @@
"Parts": [
{
"CosineScore": [
0.9117770791053772
0.911777138710022
],
"QueryPart": "male population female",
"SV": [
Expand All @@ -90,7 +90,7 @@
{
"CosineScore": [
0.8982378244400024,
0.8723468780517578
0.8723466396331787
],
"QueryPart": "population",
"SV": [
Expand All @@ -106,10 +106,10 @@
"Parts": [
{
"CosineScore": [
0.808887243270874,
0.8088873028755188,
0.8034241199493408,
0.8017654418945312,
0.775155782699585
0.7751557230949402
],
"QueryPart": "male",
"SV": [
Expand Down
2 changes: 1 addition & 1 deletion ...ar/howarefactorslikeobesity,bloodpressureandasthmaimpactedbyclimatechange/debug_info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"Parts": [
{
"CosineScore": [
0.7997788190841675
0.7997788786888123
],
"QueryPart": "factors like obesity blood pressure asthma impacted",
"SV": [
Expand Down
4 changes: 2 additions & 2 deletions .../test_data/detection_api_multivar/showmetheimpactofclimatechangeondrought/debug_info.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
},
{
"CosineScore": [
1.0
0.9999998807907104
],
"QueryPart": "drought",
"SV": [
Expand All @@ -76,7 +76,7 @@
},
{
"CosineScore": [
0.866512656211853
0.8665127158164978
],
"QueryPart": "change drought",
"SV": [
Expand Down
5 changes: 0 additions & 5 deletions .../integration_tests/test_data/e2e_edge_cases/debtinchina,germanyandindia/chart_config.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,6 @@
"name": "China",
"place_type": "Country"
},
{
"dcid": "country/DEU",
"name": "Germany",
"place_type": "Country"
},
{
"dcid": "country/IND",
"name": "India",
Expand Down
Loading

0 comments on commit 53a72e0

Please sign in to comment.