taxonomy: new CIQUAL associations for ingredients (#8537)

openfoodfacts · Jun 15, 2023 · b99f70d · b99f70d
1 parent 6a294d0
commit b99f70d
Show file tree

Hide file tree

Showing 50 changed files with 317 additions and 176 deletions.
diff --git a/taxonomies/ingredients.txt b/taxonomies/ingredients.txt
diff --git a/...ntegration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json b/...ntegration/expected_test_results/api_v2_product_write/get-product-auth-good-password.json
@@ -532,6 +532,7 @@
             "vegetarian" : "yes"
          },
          {
+            "ciqual_food_code" : "18066",
             "id" : "en:water",
             "percent_estimate" : 18.75,
             "percent_max" : 50,
@@ -541,6 +542,7 @@
             "vegetarian" : "yes"
          },
          {
+            "ciqual_food_code" : "11058",
             "id" : "en:salt",
             "percent_estimate" : 9.375,
             "percent_max" : 33.3333333333333,
@@ -615,12 +617,10 @@
       "ingredients_with_unspecified_percent_n" : 4,
       "ingredients_with_unspecified_percent_sum" : 100,
       "ingredients_without_ciqual_codes" : [
-         "en:salt",
          "en:sugar",
-         "en:water",
          "en:wheat-flour"
       ],
-      "ingredients_without_ciqual_codes_n" : 4,
+      "ingredients_without_ciqual_codes_n" : 2,
       "interface_version_created" : "20150316.jqm2",
       "interface_version_modified" : "20150316.jqm2",
       "known_ingredients_n" : 10,

diff --git a/tests/integration/expected_test_results/api_v2_product_write/get-product.json b/tests/integration/expected_test_results/api_v2_product_write/get-product.json
@@ -532,6 +532,7 @@
             "vegetarian" : "yes"
          },
          {
+            "ciqual_food_code" : "18066",
             "id" : "en:water",
             "percent_estimate" : 18.75,
             "percent_max" : 50,
@@ -541,6 +542,7 @@
             "vegetarian" : "yes"
          },
          {
+            "ciqual_food_code" : "11058",
             "id" : "en:salt",
             "percent_estimate" : 9.375,
             "percent_max" : 33.3333333333333,
@@ -615,12 +617,10 @@
       "ingredients_with_unspecified_percent_n" : 4,
       "ingredients_with_unspecified_percent_sum" : 100,
       "ingredients_without_ciqual_codes" : [
-         "en:salt",
          "en:sugar",
-         "en:water",
          "en:wheat-flour"
       ],
-      "ingredients_without_ciqual_codes_n" : 4,
+      "ingredients_without_ciqual_codes_n" : 2,
       "interface_version_created" : "20150316.jqm2",
       "interface_version_modified" : "20150316.jqm2",
       "known_ingredients_n" : 10,

diff --git a/...tion/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json b/...tion/expected_test_results/convert_and_import_excel_file/test/products/3270190128403.json
@@ -575,6 +575,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "20505",
          "id" : "en:green-lentils",
          "labels" : "en:organic",
          "percent_estimate" : 100,
@@ -624,10 +625,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 1,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:green-lentils"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "interface_version_created" : "import_csv_file - version 2019/09/17",
    "known_ingredients_n" : 3,
    "labels" : "Organic, EU Organic, FR-BIO-01, AB Agriculture Biologique, Agriculture France",
@@ -731,6 +730,53 @@
       "nova-group_100g" : 1,
       "nova-group_serving" : 1
    },
+   "nutriments_estimated" : {
+      "alcohol_100g" : 0,
+      "beta-carotene_100g" : 5e-06,
+      "calcium_100g" : 0.0262,
+      "carbohydrates_100g" : 12.2,
+      "cholesterol_100g" : 0,
+      "copper_100g" : 0.00024,
+      "energy-kcal_100g" : 104,
+      "energy-kj_100g" : 436,
+      "energy_100g" : 436,
+      "fat_100g" : 0.38,
+      "fiber_100g" : 7.9,
+      "fructose_100g" : 0.1,
+      "galactose_100g" : 0,
+      "glucose_100g" : 0.1,
+      "iodine_100g" : 3e-06,
+      "iron_100g" : 0.00144,
+      "lactose_100g" : 0.1,
+      "magnesium_100g" : 0.0356,
+      "maltose_100g" : 0.1,
+      "manganese_100g" : 0.00043,
+      "pantothenic-acid_100g" : 0.00064,
+      "phosphorus_100g" : 0.18,
+      "phylloquinone_100g" : 1.7e-06,
+      "polyols_100g" : 0.22,
+      "potassium_100g" : 0.222,
+      "proteins_100g" : 9.02,
+      "salt_100g" : 0.005,
+      "saturated-fat_100g" : 0.053,
+      "selenium_100g" : 5e-06,
+      "sodium_100g" : 0.002,
+      "starch_100g" : 10.2,
+      "sucrose_100g" : 0.39,
+      "sugars_100g" : 1.8,
+      "vitamin-a_100g" : 0,
+      "vitamin-b12_100g" : 0,
+      "vitamin-b1_100g" : 0.00017,
+      "vitamin-b2_100g" : 7.3e-05,
+      "vitamin-b6_100g" : 0.00018,
+      "vitamin-b9_100g" : 0.000181,
+      "vitamin-c_100g" : 0.0015,
+      "vitamin-d_100g" : 0,
+      "vitamin-e_100g" : 0.00011,
+      "vitamin-pp_100g" : 0.00106,
+      "water_100g" : 69.6,
+      "zinc_100g" : 0.00098
+   },
    "nutrition_data" : "on",
    "nutrition_data_per" : "100g",
    "nutrition_data_prepared_per" : "100g",

diff --git a/tests/unit/expected_test_results/attributes/en-attributes.json b/tests/unit/expected_test_results/attributes/en-attributes.json
@@ -925,6 +925,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "11058",
          "id" : "en:salt",
          "percent_estimate" : 0.17755681818182,
          "percent_max" : 11.1111111111111,
@@ -1065,11 +1066,10 @@
       "en:e120",
       "en:milk-proteins",
       "en:rapeseed-oil",
-      "en:salt",
       "en:sugar",
       "en:wheat-flour"
    ],
-   "ingredients_without_ciqual_codes_n" : 7,
+   "ingredients_without_ciqual_codes_n" : 6,
    "known_ingredients_n" : 30,
    "labels_tags" : [
       "en:organic",

diff --git a/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json b/tests/unit/expected_test_results/attributes/en-nova-groups-markers.json
@@ -803,6 +803,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "11058",
          "id" : "en:salt",
          "percent_estimate" : 21.4285714285714,
          "percent_max" : 50,
@@ -942,10 +943,9 @@
       "en:e412",
       "en:garlic-flavouring",
       "en:microbial-culture",
-      "en:salt",
       "en:sugar"
    ],
-   "ingredients_without_ciqual_codes_n" : 6,
+   "ingredients_without_ciqual_codes_n" : 5,
    "known_ingredients_n" : 18,
    "languages" : {},
    "languages_codes" : {},

diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json b/tests/unit/expected_test_results/attributes/fr-palm-oil-free.json
@@ -617,6 +617,7 @@
    "food_groups_tags" : [],
    "ingredients" : [
       {
+         "ciqual_food_code" : "18066",
          "id" : "en:water",
          "percent_estimate" : 62.5,
          "percent_max" : 100,
@@ -704,10 +705,9 @@
    "ingredients_without_ciqual_codes" : [
       "en:chocolate",
       "en:flour",
-      "en:sugar",
-      "en:water"
+      "en:sugar"
    ],
-   "ingredients_without_ciqual_codes_n" : 4,
+   "ingredients_without_ciqual_codes_n" : 3,
    "known_ingredients_n" : 6,
    "languages" : {},
    "languages_codes" : {},

diff --git a/tests/unit/expected_test_results/attributes/fr-palm-oil.json b/tests/unit/expected_test_results/attributes/fr-palm-oil.json
@@ -620,6 +620,7 @@
    "food_groups_tags" : [],
    "ingredients" : [
       {
+         "ciqual_food_code" : "4003",
          "id" : "en:potato",
          "percent_estimate" : 75,
          "percent_max" : 100,
@@ -690,10 +691,8 @@
    "ingredients_with_specified_percent_sum" : 0,
    "ingredients_with_unspecified_percent_n" : 2,
    "ingredients_with_unspecified_percent_sum" : 100,
-   "ingredients_without_ciqual_codes" : [
-      "en:potato"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 7,
    "languages" : {},
    "languages_codes" : {},

diff --git a/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json b/tests/unit/expected_test_results/attributes/fr-vegetable-oils.json
@@ -637,6 +637,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "11058",
          "id" : "en:salt",
          "percent_estimate" : 16.6666666666667,
          "percent_max" : 33.3333333333333,
@@ -700,10 +701,9 @@
    "ingredients_with_unspecified_percent_n" : 3,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:salt",
       "en:vegetable-oil"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 8,
    "languages" : {},
    "languages_codes" : {},

diff --git a/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json b/tests/unit/expected_test_results/ecoscore/category-without-ecoscore-sodas.json
@@ -13,6 +13,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "18066",
          "id" : "en:water",
          "percent_estimate" : 75,
          "percent_max" : 100,
@@ -65,10 +66,9 @@
    "ingredients_with_unspecified_percent_n" : 2,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:sugar",
-      "en:water"
+      "en:sugar"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 4,
    "lc" : "en",
    "misc_tags" : [

diff --git a/tests/unit/expected_test_results/ecoscore/energy-drink.json b/tests/unit/expected_test_results/ecoscore/energy-drink.json
@@ -13,6 +13,7 @@
    ],
    "ingredients" : [
       {
+         "ciqual_food_code" : "18066",
          "id" : "en:water",
          "percent_estimate" : 75,
          "percent_max" : 100,
@@ -61,10 +62,9 @@
    "ingredients_with_unspecified_percent_n" : 2,
    "ingredients_with_unspecified_percent_sum" : 100,
    "ingredients_without_ciqual_codes" : [
-      "en:caffeine",
-      "en:water"
+      "en:caffeine"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 2,
    "lc" : "fr",
    "misc_tags" : [

diff --git a/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json b/tests/unit/expected_test_results/ecoscore/fr-viande-porcine-francaise.json
@@ -438,6 +438,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "11058",
          "id" : "en:salt",
          "percent_estimate" : 10,
          "percent_max" : 20,
@@ -505,10 +506,9 @@
    "ingredients_with_unspecified_percent_n" : 3,
    "ingredients_with_unspecified_percent_sum" : 60,
    "ingredients_without_ciqual_codes" : [
-      "en:cooked-ham",
-      "en:salt"
+      "en:cooked-ham"
    ],
-   "ingredients_without_ciqual_codes_n" : 2,
+   "ingredients_without_ciqual_codes_n" : 1,
    "known_ingredients_n" : 11,
    "labels" : "viande porcine française, oeufs de France",
    "labels_hierarchy" : [

diff --git a/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json b/tests/unit/expected_test_results/ecoscore/grade-a-with-non-recyclable-label.json
@@ -428,6 +428,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "4003",
          "id" : "en:potato",
          "percent" : 39,
          "percent_estimate" : 39,
@@ -492,10 +493,8 @@
    "ingredients_with_specified_percent_sum" : 100,
    "ingredients_with_unspecified_percent_n" : 0,
    "ingredients_with_unspecified_percent_sum" : 0,
-   "ingredients_without_ciqual_codes" : [
-      "en:potato"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 8,
    "labels_tags" : [
       "en:eu-organic"

diff --git a/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json b/tests/unit/expected_test_results/ecoscore/grade-a-with-recyclable-label.json
@@ -428,6 +428,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "4003",
          "id" : "en:potato",
          "percent" : 39,
          "percent_estimate" : 39,
@@ -492,10 +493,8 @@
    "ingredients_with_specified_percent_sum" : 100,
    "ingredients_with_unspecified_percent_n" : 0,
    "ingredients_with_unspecified_percent_sum" : 0,
-   "ingredients_without_ciqual_codes" : [
-      "en:potato"
-   ],
-   "ingredients_without_ciqual_codes_n" : 1,
+   "ingredients_without_ciqual_codes" : [],
+   "ingredients_without_ciqual_codes_n" : 0,
    "known_ingredients_n" : 8,
    "labels_tags" : [
       "en:eu-organic"

diff --git a/...unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json b/...unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field-multiple.json
@@ -425,6 +425,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "2028",
          "id" : "en:lemon-juice",
          "percent_estimate" : 10,
          "percent_max" : 10,
@@ -478,10 +479,9 @@
    "ingredients_with_unspecified_percent_sum" : 10,
    "ingredients_without_ciqual_codes" : [
       "en:apricot",
-      "en:cane-sugar",
-      "en:lemon-juice"
+      "en:cane-sugar"
    ],
-   "ingredients_without_ciqual_codes_n" : 3,
+   "ingredients_without_ciqual_codes_n" : 2,
    "known_ingredients_n" : 8,
    "lc" : "en",
    "misc_tags" : [

diff --git a/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json b/tests/unit/expected_test_results/ecoscore/origins-of-ingredients-in-origins-field.json
@@ -421,6 +421,7 @@
          "vegetarian" : "yes"
       },
       {
+         "ciqual_food_code" : "2028",
          "id" : "en:lemon-juice",
          "percent_estimate" : 10,
          "percent_max" : 10,
@@ -474,10 +475,9 @@
    "ingredients_with_unspecified_percent_sum" : 10,
    "ingredients_without_ciqual_codes" : [
       "en:apricot",
-      "en:cane-sugar",
-      "en:lemon-juice"
+      "en:cane-sugar"
    ],
-   "ingredients_without_ciqual_codes_n" : 3,
+   "ingredients_without_ciqual_codes_n" : 2,
    "known_ingredients_n" : 8,
    "lc" : "en",
    "misc_tags" : [