Address PR feedback see HEA-809

Author: girumb

pipelines/assets/livelihood_activity.py

@@ -241,15 +241,15 @@ def get_livelihood_activity_regexes() -> list:
     age_gender_pattern = r"(?P<household_labor_provider>" + "|".join(age_gender_labels_escaped) + ")"
 
     placeholder_patterns = {
-        "label_pattern": r"[a-zà-ÿ][a-zà-ÿ',/ \.\>\-\(\)]+?",
+        "label_pattern": r"[a-zà-ÿ][a-zà-ÿ1-9',/ \.\>\-\(\)]+?",
         "product_pattern": r"(?P<product_id>[a-zà-ÿ][a-zà-ÿ1-9',/ \.\>\-\(\)]+?)",
         "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)\)?",
         "age_gender_pattern": age_gender_pattern,
         "unit_of_measure_pattern": r"(?P<unit_of_measure_id>[a-z]+)",
         "nbr_pattern": r"(?:n[bo]?r?e?|no)\.?",
         "vendu_pattern": r"(?:quantité )?vendu(?:e|s|ss|es|ses)?",
-        "separator_pattern": r" ?[:-]?",
+        "separator_pattern": r" *[:-]? *",
         "name_of_local_measure_pattern": r"(?:name of (?:meas(?:ure)?\.?)|nom(?: (?:de la mesure(?: locale?)?|de mesure locale?|du mesure|d'unité|mesure(?: locale?)?|unité de mesure))?)",
     }
     # Compile the regexes

pipelines/assets/livelihood_activity_regexes.json

@@ -92,7 +92,7 @@
         "people_per_household"
     ],
     [
-        "(?P<product_id>[a-zà-ÿ ][a-zà-ÿ1-9',/ \\.\\>\\-\\(\\)]+? *: *[a-zà-ÿ ][a-zà-ÿ1-9',/ \\.\\>\\-\\(\\)]+?) {age_gender_pattern} *\\({unit_of_measure_pattern}(?: collectés?|gathered)?\\)",
+        "(?P<product_id>{label_pattern}{separator_pattern}{label_pattern}) {age_gender_pattern}{separator_pattern}\\({unit_of_measure_pattern}(?: collectés?|gathered)?\\)",
         null,
         true,
         "quantity_produced"