Skip to content

Fix(Evaluator): Coalesce null values in arithmetic functions #81

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

Open
arnaudfnr wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Fix(Evaluator): Coalesce null values in arithmetic functions #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d840006
Fix(Evaluator): Coalesce null values in arithmetic functions
arnaudfnr Apr 29, 2026
3fe37c8
Fix coalesce values and update Readme
arnaudfnr Apr 30, 2026
337be63
Fix config.json with new evaluator rules
arnaudfnr Apr 30, 2026
a29ce2f
Remove coalesce in some arithmetic functions and update all4trees config
arnaudfnr May 6, 2026
1577c96
Remove product coalesce
arnaudfnr May 7, 2026
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,5 +111,5 @@ make catalog
Serve a config file

```
uv run coordo serve data/config.json
uv run coordo serve configs/all4trees_config.json
```
51 changes: 36 additions & 15 deletions configs/all4trees_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,23 +31,44 @@
"resource": "inventaire_id",
"columns": {
"geom": "gps.merge().centroid()",
"id": "_id",
"for": "for",
"cod": "cod",
"double_condition": "ind.list(0 if dhp3 > 0 and dhp4 > 0 else 2)",
"aerial_biomass_volume": "ind.sum(0.0673 * (dens_bois.value * (dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10)^2 * haut)^0.976 if etat = 1) / (20^2 * pi() / 10000)",
"TREE_species_counts": "ind.histogram(ess_arb)",
"EPF_tree_density": "ind.count(1 if etat = 2) / (20^2 * pi() / 10000)",
"EPF_tree_diversity": "ind.shannon(ess_arb) / 5 * 10",
"EPF_spatial_distribution": "ind.categorical_gini(zon) * 10",
"EPF_diametral_distribution": "ind.gini(dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10) * 10",
"EPF_vertical_distribution": "ind.gini(haut) * 10",
"EPF_dominant_height": "ind.avg(haut if haut > percentile(haut, 80))",
"EPF_dendro_unique": "ind.list(dmh).flatten().list_unique() / 16 * 10",
"SOIL_structure": "2 * sum(ep1*int(not1) + ep2 * int(not2) + ep3 * int(not3) + ep4 * int(not4) + ep5 * int(not5)) / sum(ep1 + ep2 + ep3 + ep4 + ep5)",
"SOIL_stability": "(int(slak1) + int(slak2) + int(slak3)) / 3",
"SOIL_infiltration_speed": "600 * 300 / ((beer1 + beer2 + beer3 + beer4 + beer5 + beer6 + beer7 + beer8 + beer9 + beer10) * pi() * 30^2) if beer1 != 0 else 0",
"SURFACE_species_counts": "list_aggregate(list_concat(list(barba_001.concat_ws('-', tax1_barbA, tax2_barbA, tax3_barbA)), list(barbb_001.concat_ws('-', tax1_barbB, tax2_barbB, tax3_barbB)), list(barbc_001.concat_ws('-', tax1_barbC, tax2_barbC, tax3_barbC))), 'histogram')",
"GROUND_species_counts": "list_aggregate(list(tsbf_001.concat_ws('-', tax1_tsbf, tax2_tsbf, tax3_tsbf)), 'histogram')"
"taille_placette": "20^2*pi()/10000",
"projet": "trim('A Kob Ale')",
"biomass_volume": "ind.sum(0.0673 * (dens_bois.value * (dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10)^2 * haut)^0.976 if etat = 1) / (20^2 * pi() / 10000) / 1000",
"tree_density": "count(1 if ind.etat = 1) / (20^2 * pi() / 10000)",
"tree_pop": "count(1 if ind.etat = 1)",
"richness": "count(unique(ind.ess_arb))",
"relative_abundance": "histogram(ind.ess_arb)",
"epf_tree_density": "count(1 if ind.etat = 1) / (20^2 * pi() / 10000) / 100",
"epf_necromass_pied": "ind.sum(0.0673 * (dens_bois_mort.dens_bois * (dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10)^2 * haut)^0.976 if etat = 2)",
"epf_necromass_sol": "ind.sum(3.1415926535 / 3 * ((dhp_b / 2)^2 + ((dhp_e / 2)^2 + dhp_b / 2 + dhp_e / 2) * longueur * dens_bois_mort.dens_bois) if etat = 3)",
"epf_deadWood": "((ind.sum(0.0673 * (dens_bois_mort.dens_bois * (dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10)^2 * haut)^0.976 if etat = 2) + ind.sum(pi() / 3 * ((dhp_b / 2)^2 + ((dhp_e / 2)^2 + dhp_b / 2 + dhp_e / 2) * longueur * dens_bois_mort.dens_bois) if etat = 3)) / ind.sum(0.0673 * (dens_bois.value * (dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10)^2 * haut)^0.976 if etat = 1)) * 10",
"epf_tree_diversity": "shannon(ind.ess_arb) / 5 * 10",
"epf_spatial_distribution": "ind.categorical_gini(zon) * 10",
"epf_diameter_distribution": "ind.gini(dhp1 + dhp2 + dhp3 + dhp4 + dhp5 + dhp6 + dhp7 + dhp8 + dhp9 + dhp10) * 10",
"epf_vertical_distribution": "gini(ind.haut) * 10",
"epf_dominant_height": "ind.avg(haut if haut > percentile(haut, 80)) * 10 / 40",
"epf_microhabitats": "ind.list(dmh).flatten().list_unique() * 10 / 16",
"soil_structure": "2 * sum(ep1*int(not1) + ep2*int(not2) + ep3*int(not3) + ep4*int(not4) + ep5*int(not5)) / sum(ep1 + ep2 + ep3 + ep4 + ep5)",
"soil_composition": "count(1)",
"ero_rainfall_and_wind": "meteo.concat_ws('-', pluv, vent)",
"ero_couv_slope_and_cover": "inventaire_external.concat_ws('-', pent, couv)",
"ero_soil_stability": "(int(slak1) + int(slak2) + int(slak3)) / 3",
"ero_water_seepage": "600 * 300 / ((beer1 + beer2 + beer3 + beer4 + beer5 + beer6 + beer7 + beer8 + beer9 + beer10) * pi() * 30^2) if beer1 != 0 else 0",
"soil_fauna_density": "sum(tsbf_001.nomb_tsbf) / (20^2 * pi() / 10000)",
"soil_fauna_diversity": "list_unique(list(tsbf_001.concat_ws('-', tax1_tsbf, tax2_tsbf, tax3_tsbf)))",
"soil_fauna_abundance_tax1": "histogram(tsbf_001.tax1_tsbf)",
"soil_fauna_abundance_tax2": "histogram(tsbf_001.tax2_tsbf)",
"soil_fauna_abundance_tax3": "histogram(tsbf_001.tax3_tsbf)",
"surface_fauna_density": "sum(barba_001.nomb_barbA + barbb_001.nomb_barbB + barbc_001.nomb_barbC + barbd_001.nomb_barbD) / (20^2 * pi() / 10000)",
"surface_fauna_diversity": "list_unique(list_concat(list(barba_001.concat_ws('-', tax1_barbA, tax2_barbA, tax3_barbA)), list(barbb_001.concat_ws('-', tax1_barbB, tax2_barbB, tax3_barbB)), list(barbc_001.concat_ws('-', tax1_barbC, tax2_barbC, tax3_barbC)), list(barbd_001.concat_ws('-', tax1_barbD, tax2_barbD, tax3_barbD))))",
"surface_fauna_abundance_tax1": "list_aggregate(list_concat(list(barba_001.tax1_barbA), list(barbb_001.tax1_barbB), list(barbc_001.tax1_barbC), list(barbd_001.tax1_barbD)), 'histogram')",
"surface_fauna_abundance_tax2": "list_aggregate(list_concat(list(barba_001.tax2_barbA), list(barbb_001.tax2_barbB), list(barbc_001.tax2_barbC), list(barbd_001.tax2_barbD)), 'histogram')",
"surface_fauna_abundance_tax3": "list_aggregate(list_concat(list(barba_001.tax3_barbA), list(barbb_001.tax3_barbB), list(barbc_001.tax3_barbC), list(barbd_001.tax3_barbD)), 'histogram')",
"surface_fauna_abundance": "list_aggregate(list_concat(list(barba_001.concat_ws('-', tax1_barbA, tax2_barbA, tax3_barbA)), list(barbb_001.concat_ws('-', tax1_barbB, tax2_barbB, tax3_barbB)), list(barbc_001.concat_ws('-', tax1_barbC, tax2_barbC, tax3_barbC)), list(barbd_001.concat_ws('-', tax1_barbD, tax2_barbD, tax3_barbD))), 'histogram')",
"soil_fauna_abundance": "list_aggregate(list(tsbf_001.concat_ws('-', tax1_tsbf, tax2_tsbf, tax3_tsbf)), 'histogram')"
},
"popup": {
"trigger": "click"
Expand Down
5 changes: 3 additions & 2 deletions coordo-py/coordo/sql/evaluator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

from pygeofilter.ast import AstType
from sqlalchemy import Integer, and_, case, cast, func, or_, select, text
from sqlalchemy.sql.functions import coalesce

from coordo.sql.helpers import AGGREGATES, SPATIAL_FUNCTIONS
from coordo.sql.mapper import FieldMapper
Expand Down Expand Up @@ -86,9 +87,9 @@ def evaluate(self, node: AstType, mapper: FieldMapper) -> Any:
def arithmetic(self, node, lhs, rhs, *, mapper: FieldMapper):
match node.op:
case "+":
expr = lhs.expr + rhs.expr
expr = coalesce(lhs.expr, 0) + coalesce(rhs.expr, 0)
case "-":
expr = lhs.expr - rhs.expr
expr = coalesce(lhs.expr, 0) - coalesce(rhs.expr, 0)
case "/":
expr = lhs.expr / rhs.expr
case "*":
Expand Down
Loading