Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix python cloudbuild test #4795

Merged
merged 8 commits into from
Dec 13, 2024
Merged

Fix python cloudbuild test #4795

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07f89ba
try separating out setup
chejennifer Dec 12, 2024
e31ad3d
test
chejennifer Dec 12, 2024
acdf1a2
try downloading files first
chejennifer Dec 12, 2024
0bcf25d
try exist ok
chejennifer Dec 13, 2024
d6b53bc
revert cloudbuild
chejennifer Dec 13, 2024
ed1d5a3
revert embeddings test
chejennifer Dec 13, 2024
79965d9
update goldens
chejennifer Dec 13, 2024
264e3b5
add download files step
chejennifer Dec 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions build/ci/cloudbuild.py.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,20 @@

# Run Python tests, lint, etc.
steps:
# Download the files needed for nl embeddings tests.
- id: download_nl_files
name: python:3.11.3
entrypoint: /bin/sh
args:
- -c
- |
cd tools/nl/download_nl_files
./run.sh

- id: flask_test
name: python:3.11.3
entrypoint: /bin/sh
waitFor: ["download_nl_files"]
args:
- -c
- |
Expand Down
55 changes: 35 additions & 20 deletions server/integration_tests/test_data/demo_fallback/query_5/chart_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,18 +627,40 @@
{
"tiles": [
{
"barTileSpec": {
"maxPlaces": 15,
"maxVariables": 15,
"sort": "DESCENDING"
},
"comparisonPlaces": [
"country/USA"
],
"statVarKey": [
"Amount_EconomicActivity_GrossDomesticProduction_RealValue",
"Amount_EconomicActivity_GrossValueAdded_RealValue"
"Amount_EconomicActivity_GrossDomesticProduction_NAICSConstruction_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSAccommodationFoodServices_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSAdministrativeSupportWasteManagementRemediationServices_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSAgricultureForestryFishingHunting_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSArtsEntertainmentRecreation_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSEducationalServices_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSFinanceInsurance_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSHealthCareSocialAssistance_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSInformation_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSManagementOfCompaniesEnterprises_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSMiningQuarryingOilGasExtraction_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSOtherServices_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSProfessionalScientificTechnicalServices_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSRealEstateRentalLeasing_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSRetailTrade_RealValue_multiple_place_bar_block",
"Amount_EconomicActivity_GrossDomesticProduction_NAICSTransportationWarehousing_RealValue_multiple_place_bar_block"
],
"title": "GDP (Real Value) and Amount of Economic Activity (Real Value): Gross Value Added in United States",
"type": "LINE"
"title": "GDP of the Construction Industry and More in United States (${date})",
"type": "BAR"
}
]
}
],
"denom": "Count_Person",
"title": "Related: GDP (Real Value) and Amount of Economic Activity (Real Value): Gross Value Added"
"title": "Related: GDP of the Construction Industry and More"
}
],
"statVarSpec": {
Expand Down Expand Up @@ -698,6 +720,14 @@
"name": "GDP of the Real Estate and Rental and Leasing Industry",
"statVar": "Amount_EconomicActivity_GrossDomesticProduction_NAICSRealEstateRentalLeasing_RealValue"
},
"Amount_EconomicActivity_GrossDomesticProduction_NAICSRetailTrade_RealValue_multiple_place_bar_block": {
"name": "Amount of Economic Activity (Real Value): Gross Domestic Production, Retail Trade (NAICS/44-45)",
"statVar": "Amount_EconomicActivity_GrossDomesticProduction_NAICSRetailTrade_RealValue"
},
"Amount_EconomicActivity_GrossDomesticProduction_NAICSTransportationWarehousing_RealValue_multiple_place_bar_block": {
"name": "Amount of Economic Activity (Real Value): Gross Domestic Production, Transportation And Warehousing (NAICS/48-49)",
"statVar": "Amount_EconomicActivity_GrossDomesticProduction_NAICSTransportationWarehousing_RealValue"
},
"Amount_EconomicActivity_GrossDomesticProduction_NAICSUtilities_RealValue_multiple_place_bar_block": {
"name": "GDP of the Utilities Industry",
"statVar": "Amount_EconomicActivity_GrossDomesticProduction_NAICSUtilities_RealValue"
Expand All @@ -718,10 +748,6 @@
"name": "GDP (Real Value)",
"statVar": "Amount_EconomicActivity_GrossDomesticProduction_RealValue"
},
"Amount_EconomicActivity_GrossValueAdded_RealValue": {
"name": "Amount of Economic Activity (Real Value): Gross Value Added",
"statVar": "Amount_EconomicActivity_GrossValueAdded_RealValue"
},
"Area_Farm": {
"name": "Total Farm Area",
"statVar": "Area_Farm"
Expand Down Expand Up @@ -1210,17 +1236,6 @@
"Amount_EconomicActivity_GrossDomesticProduction_NAICSWholesaleTrade_RealValue"
]
},
"Amount_EconomicActivity_GrossValueAdded_RealValue": {
"isic": [
"Amount_EconomicActivity_GrossValueAdded_ISICAgricultureHuntingForestryFishing_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICConstruction_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICManufacturing_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICMiningManufacturingUtilities_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICOtherActivities_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICTransportStorageCommunications_RealValue",
"Amount_EconomicActivity_GrossValueAdded_ISICWholesaleRetailTradeRestaurantsHotels_RealValue"
]
},
"dc/1wf1h5esex2d": {
"establishmentOwnership": [
"dc/n1mgflew2xqm8",
Expand Down
222 changes: 0 additions & 222 deletions server/integration_tests/test_data/demo_feb2023/query_2/chart_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,68 +96,6 @@
],
"title": "Count of Fire Event in Counties of California"
},
{
"columns": [
{
"tiles": [
{
"lineTileSpec": {
"startDate": "2023"
},
"statVarKey": [
"Count_WildlandFireEvent_2996752054"
],
"title": "Count of Wildland Fire Event in California",
"type": "LINE"
}
]
},
{
"tiles": [
{
"description": "Count of Wildland Fire Event in California",
"statVarKey": [
"Count_WildlandFireEvent"
],
"title": "Count of Wildland Fire Event in California",
"type": "HIGHLIGHT"
}
]
}
],
"title": "Count of Wildland Fire Event"
},
{
"columns": [
{
"tiles": [
{
"rankingTileSpec": {
"rankingCount": 10,
"showHighest": true
},
"statVarKey": [
"Count_WildlandFireEvent"
],
"title": "Count of Wildland Fire Event in Counties of California (${date})",
"type": "RANKING"
}
]
},
{
"tiles": [
{
"statVarKey": [
"Count_WildlandFireEvent"
],
"title": "Count of Wildland Fire Event in Counties of California (${date})",
"type": "MAP"
}
]
}
],
"title": "Count of Wildland Fire Event in Counties of California"
},
{
"columns": [
{
Expand Down Expand Up @@ -189,132 +127,6 @@
],
"title": "Wildfires"
},
{
"columns": [
{
"tiles": [
{
"lineTileSpec": {
"startDate": "2023"
},
"statVarKey": [
"Area_WildlandFireEvent_646776027"
],
"title": "Area of Wildland Fire Event in California",
"type": "LINE"
}
]
},
{
"tiles": [
{
"description": "Area of Wildland Fire Event in California",
"statVarKey": [
"Area_WildlandFireEvent"
],
"title": "Area of Wildland Fire Event in California",
"type": "HIGHLIGHT"
}
]
}
],
"title": "Area of Wildland Fire Event"
},
{
"columns": [
{
"tiles": [
{
"rankingTileSpec": {
"rankingCount": 10,
"showHighest": true
},
"statVarKey": [
"Area_WildlandFireEvent"
],
"title": "Area of Wildland Fire Event in Counties of California (${date})",
"type": "RANKING"
}
]
},
{
"tiles": [
{
"statVarKey": [
"Area_WildlandFireEvent"
],
"title": "Area of Wildland Fire Event in Counties of California (${date})",
"type": "MAP"
}
]
}
],
"title": "Area of Wildland Fire Event in Counties of California"
},
{
"columns": [
{
"tiles": [
{
"lineTileSpec": {
"startDate": "2023"
},
"statVarKey": [
"Count_PrescribedFireEvent_2996752054"
],
"title": "Count of Prescribed Fire Event in California",
"type": "LINE"
}
]
},
{
"tiles": [
{
"description": "Count of Prescribed Fire Event in California",
"statVarKey": [
"Count_PrescribedFireEvent"
],
"title": "Count of Prescribed Fire Event in California",
"type": "HIGHLIGHT"
}
]
}
],
"denom": "Count_Person",
"title": "Count of Prescribed Fire Event"
},
{
"columns": [
{
"tiles": [
{
"rankingTileSpec": {
"rankingCount": 10,
"showHighest": true
},
"statVarKey": [
"Count_PrescribedFireEvent"
],
"title": "Count of Prescribed Fire Event in Counties of California (${date})",
"type": "RANKING"
}
]
},
{
"tiles": [
{
"statVarKey": [
"Count_PrescribedFireEvent"
],
"title": "Count of Prescribed Fire Event in Counties of California (${date})",
"type": "MAP"
}
]
}
],
"denom": "Count_Person",
"title": "Count of Prescribed Fire Event in Counties of California"
},
{
"columns": [
{
Expand Down Expand Up @@ -353,15 +165,6 @@
"name": "Annual Expected Loss from Natural Hazard Impact: Wildfire",
"statVar": "Annual_ExpectedLoss_NaturalHazardImpact_WildfireEvent"
},
"Area_WildlandFireEvent": {
"name": "Area of Wildland Fire Event",
"statVar": "Area_WildlandFireEvent"
},
"Area_WildlandFireEvent_646776027": {
"facetId": "646776027",
"name": "Area of Wildland Fire Event",
"statVar": "Area_WildlandFireEvent"
},
"Count_FireEvent": {
"name": "Count of Fire Event",
"statVar": "Count_FireEvent"
Expand All @@ -371,15 +174,6 @@
"name": "Count of Fire Event",
"statVar": "Count_FireEvent"
},
"Count_PrescribedFireEvent": {
"name": "Count of Prescribed Fire Event",
"statVar": "Count_PrescribedFireEvent"
},
"Count_PrescribedFireEvent_2996752054": {
"facetId": "2996752054",
"name": "Count of Prescribed Fire Event",
"statVar": "Count_PrescribedFireEvent"
},
"Count_WildfireEvent": {
"name": "Wildfires",
"statVar": "Count_WildfireEvent"
Expand All @@ -388,15 +182,6 @@
"facetId": "2519150620",
"name": "Wildfires",
"statVar": "Count_WildfireEvent"
},
"Count_WildlandFireEvent": {
"name": "Count of Wildland Fire Event",
"statVar": "Count_WildlandFireEvent"
},
"Count_WildlandFireEvent_2996752054": {
"facetId": "2996752054",
"name": "Count of Wildland Fire Event",
"statVar": "Count_WildlandFireEvent"
}
}
}
Expand Down Expand Up @@ -1216,13 +1001,6 @@
"Topic"
]
},
{
"dcid": "dc/topic/Earthquake",
"name": "Earthquake",
"types": [
"Topic"
]
},
{
"dcid": "dc/topic/Avalanche",
"name": "Avalanche",
Expand Down
2 changes: 1 addition & 1 deletion ...est_data/detection_api_multivar/comparemalepopulationwithfemalepopulation/debug_info.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
},
{
"CosineScore": [
0.917033,
0.917032,
0.873019
],
"QueryPart": "population female population",
Expand Down
Loading
Loading