chore(data): New ingredients #814

ccomb · 2024-10-24T15:30:15Z

🔧 Problem

We're missing many ingredients.

🍰 Solution

Added ingredients and exported the impacts.

Along with the new ingredients, some other modifications that needed to be done to get a more reliable result:

The brightway search now makes sure there is only one result. This forces to use more precise search terms to find a process. If it's impossible to get only one results, setting the search field to the exact name of the process forces to select this exact process.
The full list of activities.json has also been adapted to this behaviour

Since the ingredients editor is used when adding ingredients, it also has been adapted and fixed:

It has been adapter to this search behaviour, and the local save button is disabled until the search term leads to a single result.
It also now allows to set empty ecosystemic services, which was needed while adding new ingredients
Some select fields of the ecosystemic services have been translated
A bug has been fixed regarding the new plural categories fields (process_category)

🏝️ How to test

Check that the new ingredients on the review app are what is expected (naming, impacts, identifier, etc.)

ecobalyse-private: ingredients

Also force to select a contributor

…edients

c Veuillez saisir le message de validation pour vos modifications. Les lignes

display the ecoscore and columns with percentage

save button if the search results does not return exactly one result

n1k0

I'm just reviewing updated Elm code here. I'll leave others validating the rest of the changes.

n1k0 · 2024-11-12T14:02:23Z

tests/Data/Food/RecipeTest.elm

-                                    |> Expect.within (Expect.Absolute 0.01) 478.0375489673356
+                                    |> Expect.within (Expect.Absolute 0.01) 478.03754896733557
                                    |> asTest "should properly score total impact"
                                , Unit.impactToFloat scoring.allWithoutComplements
-                                    |> Expect.within (Expect.Absolute 0.01) 476.8371815514294
+                                    |> Expect.within (Expect.Absolute 0.01) 476.83718155142935


Expect.Absolute 0.01 means we have a 0.01 tolerance for deviations. Why did you bother updating these two values which are both well within this tolerance? You were getting test failures here?

Forgot why. The probable reason is I once got a very different result which made me update the test, then got back a similar one which would not have make the test fail

public/data/food/ingredients.json

vjousse

Added some nits. I can't really tell if it works or not, I don't understand what I should test and how.
Having a detailed "How to test" section could help here.
On a side note: this PR should have been split in three or more PRs. Searching for unique results, dealing with ecosystemic services, fixing the plural bug and fixing the export are separate things to me and it would have ease the review process.

data/notebooks/ingredients.py

vjousse · 2024-11-12T16:00:35Z

data/notebooks/ingredients.py

            ):
                if x in a:
                    del activities[i][x]
-                # _ = activities[i].pop(x, None)
+        else:
+            # remove empty SE


What is an SE?

Service Ecosystemique

data/notebooks/ingredients.py

vjousse · 2024-11-12T16:01:28Z

data/notebooks/ingredients.py

    # ingredients attributes
-    "categories": "Catégories d'ingrédient",
+    "ingredient_categories": "Catégories d'ingrédient",


Suggested change

"ingredient_categories": "Catégories d'ingrédient",

"ingredient_categories": "Catégories d'ingrédients",

?

Same here, you're editing a single ingredient

data/notebooks/ingredients.py

vjousse · 2024-11-12T16:02:39Z

data/notebooks/ingredients.py

 w_scenario = ipywidgets.Dropdown(options=["reference", "organic", "import"], value=None)

 # buttons
+savebuttontooltip = "Enregistre l'ingrédient créé ou modifié"
+savebuttontooltipnonunique = "Vos termes de recherche doivent donner un seul résultat"


Suggested change

savebuttontooltipnonunique = "Vos termes de recherche doivent donner un seul résultat"

save_button_tooltip_non_unique = "Vos termes de recherche ne doivent donner qu’un seul résultat"

data/notebooks/ingredients.py

ccomb · 2024-11-12T16:41:00Z

Added some nits. I can't really tell if it works or not, I don't understand what I should test and how. Having a detailed "How to test" section could help here. On a side note: this PR should have been split in three or more PRs. Searching for unique results, dealing with ecosystemic services, fixing the plural bug and fixing the export are separate things to me and it would have ease the review process.

Thanks for your suggestions!
I've really tried to keep the PR as minimal as possible, but it was done during real usage by Julia (so actually in "production" on the ingredients branch which is a container for new ingredients), with an export leading to process selection issues (unique results) that needed to be fixed in the same PR. Same for exosystemic services which were edited during the same process in the same branch. @paulboosz told there is another needed change : replacing manual ids with uuids. But this one can really be done in another PR.

import_food.

paulboosz · 2024-11-13T14:57:41Z

public/data/food/processes.json

-    "name": "Winter pea, conventional, 15% moisture, at farm gate {FR} U",
-    "source": "Agribalyse 3.1.1",
-    "system_description": "AGRIBALYSE",
+    "name": "Lentils, dry, at farm (WFLDB)",


Winter pea is replaced by Lentils. I guess it's more adapted to the id "lentils-uncooked-fr". Is there any explanation why we had winter pea before ?

no information found about this choice

paulboosz · 2024-11-13T15:02:33Z

public/data/food/processes.json

@@ -7550,7 +7516,7 @@
  {
    "categories": ["ingredient"],
    "comment": "",
-    "displayName": "Blé tendre Hors UE Conv.",
+    "displayName": "Blé tendre UE Conv.",


the id is soft-wheat-non-eu and we're changing the displayName from Hors UE to UE but the LCI stays Soft wheat GLO. Is that normal ?

(Now the displayName is incoherent with the id, we really need to go to uuid)

Thanks! Julia has found the error and will fix it

JFraichou

I reviewed data/food/activities.json and fixed the soft-wheat-eu and the onion-dried.
Every changes has been listed and will be written down on a dedicated Notion card

Ingredient editor and others added 30 commits July 25, 2024 09:20

Changed ingredients (contributed by Écobalyse)

d6c2ab6

Changed ingredients (contributed by Écobalyse)

9e47f8f

run format:json after copying the file

d533182

Changed ingredients (contributed by Écobalyse)

3fd30b3

reformat

713d063

Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

d7ed9bf

Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

c305e9a

changed the prettier version and call in the ingredient editor

7356c2e

Changed ingredients (contributed by Écobalyse)

27c463d

Created a button to compute the surface, don't recompute it each time.

93f8263

Also force to select a contributor

Merge branch 'ingredients' of github.com:MTES-MCT/ecobalyse into ingr…

01578be

…edients

use ccomb-5 which fix the comment separator for simapro csv import

5ecf1c1

Replace the newline with an HTML newline

0a9a1b8

new export

e9836e0

renamed variable and removed an old print

25fad0e

unused variable

78814ee

display the ecoscore in the bw explorer

e10b699

Merge branch 'explorer_ecoscore' into ingredients

97c026b

Renamed the Score column to Amount, added a Score column

34be9a4

multiply by 1e6 to get uPts

16243fc

Added Percent / PEF

b8ed517

c Veuillez saisir le message de validation pour vos modifications. Les lignes

changed display rounding of percent display

6cbe998

Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

ed08964

merge food and textile into the default project. Improved bw explorer to

8598d39

display the ecoscore and columns with percentage

added a make delete_database and moved sync_datapackage

fcb1e71

also remove negative ldu on greenhouse from urban on Ginko

a194586

Added migrations for Ginko, improved the bw explorer

ab9b311

Split import and export in the Makefile

0bf76fd

fix search term

ee795da

corrected search term

64b8fc5

ccomb added 3 commits November 7, 2024 19:34

fixed cull cow

4a95300

Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

0ae521c

adapt the ingredient editor to the new search behaviour : disable the

451875b

save button if the search results does not return exactly one result

ccomb requested review from paulboosz, n1k0 and vjousse November 8, 2024 07:54

n1k0 reviewed Nov 12, 2024

View reviewed changes

paulboosz reviewed Nov 12, 2024

View reviewed changes

public/data/food/ingredients.json Show resolved Hide resolved

vjousse reviewed Nov 12, 2024

View reviewed changes

ccomb added 3 commits November 12, 2024 17:19

avoid duplication

d367696

variable naming

008c968

unuseful function

4262bf5

ccomb requested review from paulboosz, vjousse and n1k0 November 12, 2024 16:41

ccomb added 9 commits November 12, 2024 18:17

looks like a merge error, the activities creation should not be in the

d323dee

import_food.

adapted to the new search behaviour

eded760

new export

8a9b45d

fixed wrong percentages

d8ec868

new export

36a9cf5

yet another wrong percentage

71b20d6

new export

268637a

format

3274dbf

Merge branch 'master' of github.com:MTES-MCT/ecobalyse into ingredients

c223f97

paulboosz reviewed Nov 13, 2024

View reviewed changes

ccomb requested a review from JFraichou November 15, 2024 09:49

Changed ingredients (contributed by Écobalyse)

a19dfe8

JFraichou reviewed Nov 18, 2024

View reviewed changes

new export

5368882

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(data): New ingredients #814

chore(data): New ingredients #814

ccomb commented Oct 24, 2024 •

edited

Loading

n1k0 left a comment

n1k0 Nov 12, 2024

ccomb Nov 12, 2024

vjousse left a comment

vjousse Nov 12, 2024

ccomb Nov 12, 2024

vjousse Nov 12, 2024

ccomb Nov 12, 2024

vjousse Nov 12, 2024

ccomb Nov 12, 2024

ccomb commented Nov 12, 2024

paulboosz Nov 13, 2024

JFraichou Nov 18, 2024

paulboosz Nov 13, 2024

ccomb Nov 15, 2024

JFraichou left a comment

	"ingredient_categories": "Catégories d'ingrédient",
	"ingredient_categories": "Catégories d'ingrédients",

	savebuttontooltipnonunique = "Vos termes de recherche doivent donner un seul résultat"
	save_button_tooltip_non_unique = "Vos termes de recherche ne doivent donner qu’un seul résultat"

chore(data): New ingredients #814

Are you sure you want to change the base?

chore(data): New ingredients #814

Conversation

ccomb commented Oct 24, 2024 • edited Loading

🔧 Problem

🍰 Solution

🏝️ How to test

n1k0 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vjousse left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ccomb commented Nov 12, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JFraichou left a comment

Choose a reason for hiding this comment

ccomb commented Oct 24, 2024 •

edited

Loading