[Python] Update French Currency and DateTimeV2 to parity with .NET (#…

…2920) * Update French Currency Parsers in Python and a change to its Datetime extractor * Use connector regex, according to review
microsoft · May 5, 2022 · 0d21241 · 0d21241
1 parent 8dc1452
commit 0d21241
Show file tree

Hide file tree

Showing 6 changed files with 65 additions and 76 deletions.
diff --git a/...recognizers-date-time/recognizers_date_time/date_time/french/datetime_extractor_config.py b/...recognizers-date-time/recognizers_date_time/date_time/french/datetime_extractor_config.py
@@ -161,7 +161,5 @@ def is_connector_token(self, source: str) -> bool:
         return (
             source == '' or source == ',' or
             regex.search(self.preposition_regex, source) is not None or
-            source == 't' or
-            source == 'pour' or
-            source == 'vers'
+            regex.search(self.connector_regex, source) is not None
         )
diff --git a/...ognizers-number-with-unit/recognizers_number_with_unit/number_with_unit/french/parsers.py b/...ognizers-number-with-unit/recognizers_number_with_unit/number_with_unit/french/parsers.py
@@ -47,6 +47,8 @@ def __init__(self, culture_info: CultureInfo = None):
         super().__init__(culture_info)
         self.add_dict_to_unit_map(FrenchNumericWithUnit.CurrencySuffixList)
         self.add_dict_to_unit_map(FrenchNumericWithUnit.CurrencyPrefixList)
+        self.currency_name_to_iso_code_map = FrenchNumericWithUnit.CurrencyNameToIsoCodeMap
+        self.currency_fraction_code_list = FrenchNumericWithUnit.FractionalUnitNameToCodeMap
 
 
 class FrenchDimensionParserConfiguration(FrenchNumberWithUnitParserConfiguration):

diff --git a/...er-with-unit/recognizers_number_with_unit/number_with_unit/number_with_unit_recognizer.py b/...er-with-unit/recognizers_number_with_unit/number_with_unit/number_with_unit_recognizer.py
@@ -129,12 +129,10 @@ def initialize_configuration(self):
         # endregion
 
         # region French
-        self.register_model('CurrencyModel', Culture.French, lambda options: CurrencyModel([
-            ExtractorParserModel(
-                NumberWithUnitExtractor(
-                    FrenchCurrencyExtractorConfiguration()),
-                NumberWithUnitParser(FrenchCurrencyParserConfiguration()))
-        ]))
+        self.register_model('CurrencyModel', Culture.French, lambda options: CurrencyModel(
+            [ExtractorParserModel(BaseMergedUnitExtractor(FrenchCurrencyExtractorConfiguration(
+            )), BaseMergedUnitParser(FrenchCurrencyParserConfiguration()))]
+        ))
         self.register_model('TemperatureModel', Culture.French, lambda options: TemperatureModel([
             ExtractorParserModel(
                 NumberWithUnitExtractor(