Address PR feedback see HEA-819

Author: girumb

pipelines/assets/livelihood_activity.py

@@ -240,7 +240,7 @@ def get_livelihood_activity_regexes() -> list:
         "season_pattern": r"(?P<season>season [12]|saison [12]|[12][a-z] season||[12][a-zà-ÿ] saison|r[eé]colte principale|principale r[eé]colte|gu|deyr+?)",  # NOQA: E501
         "additional_identifier_pattern": r"\(?(?P<additional_identifier>rainfed|irrigated|pluviale?|irriguée|submersion libre|submersion contrôlée|flottant)\)?",
         "unit_of_measure_pattern": r"(?P<unit_of_measure_id>[a-z]+)",
-        "nbr_pattern": r"(?:n[b|o]r?)\.?",
+        "nbr_pattern": r"(?:n[bo]?r?e?|no)\.?",
         "vendu_pattern": r"(?:quantité )?vendu(?:e|s|ss|es|ses)?",
         "separator_pattern": r" ?[:-]?",
     }

pipelines/assets/livelihood_activity_regexes.json

@@ -872,13 +872,7 @@
         "unit_multiple"
     ],
     [
-        "(?:petit commerce|petty trade): (?:nbr?\\.? (?:pers|de personnes|personnes|people)(?: ?/ ?| par | per )(?:ménage|mènage|hh)|nbre de personnes par (?:ménage|mènage)|no\\.? people per hh)",
-        null,
-        true,
-        "people_per_household"
-    ],
-    [
-        "{product_pattern}{separator_pattern} {nbr_pattern} (?:people per hh|personnes par ménage|personnes par mènage|pers par mènage)",
+        "{product_pattern}{separator_pattern} {nbr_pattern} (?:de )?(?:pers|personnes|people)(?: ?/ ?| par | per )(?:ménage|mènage|hh)",
         null,
         true,
         "people_per_household"

pipelines_tests/test_assets/test_livelihood_activity_regexes.json

@@ -868,38 +868,47 @@
     },
     "petit commerce: nbre de personnes par mènage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nbr. pers par mènage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nb de personnes par ménage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nb de personnes/ménage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nbr de personnes par ménage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nbr. personnes par ménage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petit commerce: nb. personnes par ménage": {
         "is_start": true,
+        "product_id": "petit commerce",
         "attribute": "people_per_household"
     },
     "petty trade: no. people per hh": {
         "is_start": true,
+        "product_id": "petty trade",
         "attribute": "people_per_household"
     },
     "petty trade: nbr. people per hh": {
         "is_start": true,
+        "product_id": "petty trade",
         "attribute": "people_per_household"
     }
 }