[pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

Signed-off-by: Mai Anh <palasek182@gmail.com>

Author: pre-commit-ci[bot]

nemo_text_processing/text_normalization/pt/graph_utils.py

@@ -49,9 +49,7 @@
 insert_space = pynutil.insert(" ")
 delete_extra_space = pynini.cross(pynini.closure(NEMO_WHITE_SPACE, 1), " ").optimize()
 
-delete_preserve_order = pynini.closure(
-    pynutil.delete(" preserve_order: true")
-)
+delete_preserve_order = pynini.closure(pynutil.delete(" preserve_order: true"))
 
 
 def generator_main(file_name: str, graphs: Dict[str, "pynini.FstLike"]) -> None:

nemo_text_processing/text_normalization/pt/taggers/date.py

@@ -42,12 +42,8 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
         month_pairs = [(r[0], r[1]) for r in month_rows if len(r) >= 2]
         month_to_word = pynini.string_map(month_pairs).optimize()
 
-        day_10_31 = (
-            (NEMO_DIGIT - "0") + NEMO_DIGIT
-        ) @ pynini.union(*[str(x) for x in range(10, 32)]) @ numbers
-        day_02_09 = pynutil.delete("0") + (
-            pynini.union(*[str(x) for x in range(2, 10)]) @ numbers
-        )
+        day_10_31 = ((NEMO_DIGIT - "0") + NEMO_DIGIT) @ pynini.union(*[str(x) for x in range(10, 32)]) @ numbers
+        day_02_09 = pynutil.delete("0") + (pynini.union(*[str(x) for x in range(2, 10)]) @ numbers)
         day_2_9 = pynini.union(*[str(x) for x in range(2, 10)]) @ numbers
         day_inner = pynini.union(
             pynini.cross("01", "primeiro"),
@@ -92,9 +88,7 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
         day_spokens = set()
         for n in range(1, 32):
             for key in (str(n), f"{n:02d}"):
-                dstr = pynini.shortestpath(
-                    pynini.compose(pynini.accep(key), day_inner.optimize())
-                ).string()
+                dstr = pynini.shortestpath(pynini.compose(pynini.accep(key), day_inner.optimize())).string()
                 day_spokens.add(dstr)
 
         _preserve_tail = " preserve_order: true"
@@ -109,9 +103,7 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
                     pynutil.insert('day: "' + day + '" month: "' + month + '" ')
                     + pynini.accep("year:")
                     + NEMO_SIGMA
-                    + pynutil.delete(
-                        ' month: "' + month + '" day: "' + day + '"' + _preserve_tail
-                    )
+                    + pynutil.delete(' month: "' + month + '" day: "' + day + '"' + _preserve_tail)
                 )
                 ymd_to_dmy_graph = ymd_curr if ymd_to_dmy_graph is None else pynini.union(ymd_to_dmy_graph, ymd_curr)
 
@@ -131,36 +123,9 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
             sep_accep = pynini.accep(pynini.escape(sep))
             del_sep = pynutil.delete(sep_accep)
 
-            dmy_core = (
-                day_part
-                + del_sep
-                + insert_space
-                + month_part
-                + del_sep
-                + insert_space
-                + year_part
-                + preserve
-            )
-            iso_core = (
-                year_part
-                + del_sep
-                + insert_space
-                + month_part
-                + del_sep
-                + insert_space
-                + day_part
-                + preserve
-            )
-            mdy_core = (
-                month_part
-                + del_sep
-                + insert_space
-                + day_part
-                + del_sep
-                + insert_space
-                + year_part
-                + preserve
-            )
+            dmy_core = day_part + del_sep + insert_space + month_part + del_sep + insert_space + year_part + preserve
+            iso_core = year_part + del_sep + insert_space + month_part + del_sep + insert_space + day_part + preserve
+            mdy_core = month_part + del_sep + insert_space + day_part + del_sep + insert_space + year_part + preserve
 
             lhs_dmy = one_or_two_digits + sep_accep + one_or_two_digits + sep_accep + year_four
             lhs_iso = year_four + sep_accep + one_or_two_digits + sep_accep + one_or_two_digits

nemo_text_processing/text_normalization/pt/taggers/time.py

@@ -15,12 +15,7 @@
 import pynini
 from pynini.lib import pynutil
 
-from nemo_text_processing.text_normalization.pt.graph_utils import (
-    NEMO_DIGIT,
-    GraphFst,
-    delete_space,
-    insert_space,
-)
+from nemo_text_processing.text_normalization.pt.graph_utils import NEMO_DIGIT, GraphFst, delete_space, insert_space
 from nemo_text_processing.text_normalization.pt.utils import get_abs_path, load_labels
 
 
@@ -50,35 +45,23 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
             pynini.closure(pynutil.delete("0"), 0, 1) + NEMO_DIGIT
         )
 
-        graph_hour = (
-            delete_leading_zero_to_double_digit
-            @ pynini.union(*labels_hour)
-            @ cardinal_graph
-        )
+        graph_hour = delete_leading_zero_to_double_digit @ pynini.union(*labels_hour) @ cardinal_graph
 
         graph_minute_single = pynini.union(*labels_minute_single) @ cardinal_graph
         graph_minute_double = pynini.union(*labels_minute_double) @ cardinal_graph
         final_graph_minute = (
             pynutil.insert('minutes: "')
-            + (
-                pynutil.delete("0") + graph_minute_single
-                | graph_minute_double
-            )
+            + (pynutil.delete("0") + graph_minute_single | graph_minute_double)
             + pynutil.insert('"')
         )
 
         final_graph_second = (
             pynutil.insert('seconds: "')
-            + (
-                pynutil.delete("0") + graph_minute_single
-                | graph_minute_double
-            )
+            + (pynutil.delete("0") + graph_minute_single | graph_minute_double)
             + pynutil.insert('"')
         )
 
-        final_graph_hour = (
-            pynutil.insert('hours: "') + graph_hour + pynutil.insert('"')
-        )
+        final_graph_hour = pynutil.insert('hours: "') + graph_hour + pynutil.insert('"')
 
         delete_h = pynini.union(
             pynutil.delete(pynini.accep(pynini.escape("h"))),
@@ -96,15 +79,8 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
             if len(row) < 2 or not row[0].strip():
                 continue
             tail, tag_val = row[0].strip(), row[1].strip()
-            period_branches.append(
-                pynutil.delete(tail) + pynutil.insert(f'suffix: "{tag_val}"')
-            )
-        suffix_tail = (
-            delete_space
-            + pynutil.delete("da")
-            + delete_space
-            + pynini.union(*period_branches)
-        )
+            period_branches.append(pynutil.delete(tail) + pynutil.insert(f'suffix: "{tag_val}"'))
+        suffix_tail = delete_space + pynutil.delete("da") + delete_space + pynini.union(*period_branches)
         optional_suffix = pynini.closure(insert_space + suffix_tail, 0, 1)
 
         graph_hm = (
@@ -123,12 +99,7 @@ def __init__(self, cardinal: GraphFst, deterministic: bool = True):
             + pynutil.insert(" preserve_order: true")
         )
 
-        graph_h_only = (
-            final_graph_hour
-            + delete_h
-            + optional_suffix
-            + pynutil.insert(" preserve_order: true")
-        )
+        graph_h_only = final_graph_hour + delete_h + optional_suffix + pynutil.insert(" preserve_order: true")
 
         graph_hms = (
             final_graph_hour

nemo_text_processing/text_normalization/pt/verbalizers/verbalize.py

@@ -42,13 +42,6 @@ def __init__(self, deterministic: bool = True):
         decimal = DecimalFst(deterministic=deterministic)
         date = DateFst(deterministic=deterministic)
         time = TimeFst(deterministic=deterministic)
-        graph = (
-            fraction.fst
-            | decimal.fst
-            | date.fst
-            | time.fst
-            | ordinal.fst
-            | cardinal.fst
-        )
+        graph = fraction.fst | decimal.fst | date.fst | time.fst | ordinal.fst | cardinal.fst
 
         self.fst = graph

tests/nemo_text_processing/pt/test_date.py

@@ -32,9 +32,10 @@ def test_denorm(self, test_input, expected):
         assert pred == expected
 
     normalizer = Normalizer(lang='pt', cache_dir=CACHE_DIR, overwrite_cache=False, input_case='cased')
+
     @parameterized.expand(parse_test_case_file('pt/data_text_normalization/test_cases_date.txt'))
     @pytest.mark.run_only_on('CPU')
     @pytest.mark.unit
     def test_norm(self, test_input, expected):
         pred = self.normalizer.normalize(test_input, verbose=False)
-        assert pred == expected
+        assert pred == expected

tests/nemo_text_processing/pt/test_time.py

@@ -31,9 +31,10 @@ def test_denorm(self, test_input, expected):
         assert pred == expected
 
     normalizer = Normalizer(lang='pt', cache_dir=CACHE_DIR, overwrite_cache=False, input_case='cased')
+
     @parameterized.expand(parse_test_case_file('pt/data_text_normalization/test_cases_time.txt'))
     @pytest.mark.run_only_on('CPU')
     @pytest.mark.unit
     def test_norm(self, test_input, expected):
         pred = self.normalizer.normalize(test_input, verbose=False)
-        assert pred == expected
+        assert pred == expected