From 4b10d6d1d1964ba0d08033098014cf4ddcc4449e Mon Sep 17 00:00:00 2001 From: b84330808 Date: Tue, 3 Nov 2026 13:38:36 +0900 Subject: [PATCH] =?UTF-8?q?Read=20yyyy/m/d=20dates=20with=20one-digit=20mo?= =?UTF-8?q?nth=20or=20day=20(=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BD=8D=E6=95=B0?= =?UTF-8?q?=E6=9C=88=E6=97=A5=E7=9A=84=E6=97=A5=E6=9C=9F=E8=A2=AB=E8=AF=BB?= =?UTF-8?q?=E6=88=90=E5=88=86=E6=95=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit RE_DATE2 only accepted two-digit months and days, so 2024/1/1 fell through to RE_FRAC and was read as 一分之二千零二十四每一, and 2024-3-8 as 二零二四减三减八. A one-digit day must not be followed by another digit, so 2024/1/32 is still not a date. Fixes #1657 Co-Authored-By: Claude Opus 5.5 --- .../text/zh_normalization/chronology.py | 3 +- test_zh_normalization_date.py | 33 +++++++++++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 test_zh_normalization_date.py diff --git a/GPT_SoVITS/text/zh_normalization/chronology.py b/GPT_SoVITS/text/zh_normalization/chronology.py index 2a6f66c2..265039c6 100644 --- a/GPT_SoVITS/text/zh_normalization/chronology.py +++ b/GPT_SoVITS/text/zh_normalization/chronology.py @@ -116,7 +116,8 @@ def replace_date(match) -> str: # 用 / 或者 - 分隔的 YY/MM/DD 或者 YY-MM-DD 日期 -RE_DATE2 = re.compile(r"(\d{4})([- /.])(0[1-9]|1[012])\2(0[1-9]|[12][0-9]|3[01])") +# 月和日也可以是一位数,如 2024/1/1 +RE_DATE2 = re.compile(r"(\d{4})([- /.])(0[1-9]|1[012]|[1-9])\2(0[1-9]|[12][0-9]|3[01]|[1-9](?!\d))") def replace_date2(match) -> str: diff --git a/test_zh_normalization_date.py b/test_zh_normalization_date.py new file mode 100644 index 00000000..36b69033 --- /dev/null +++ b/test_zh_normalization_date.py @@ -0,0 +1,33 @@ +"""Regressions for reading dates in Chinese text normalization, without loading any model.""" + +import sys +import unittest +from pathlib import Path + +sys.path[:0] = [str(Path(__file__).resolve().parent / "GPT_SoVITS")] +from text.zh_normalization.text_normlization import TextNormalizer # noqa: E402 + + +class DateTests(unittest.TestCase): + def setUp(self): + self.normalizer = TextNormalizer() + + def test_single_digit_month_and_day(self): + self.assertEqual(self.normalizer.normalize_sentence("2024/1/1"), "二零二四年一月一日") + self.assertEqual(self.normalizer.normalize_sentence("2024-3-8"), "二零二四年三月八日") + self.assertEqual(self.normalizer.normalize_sentence("2024/1/31"), "二零二四年一月三十一日") + self.assertEqual(self.normalizer.normalize_sentence("2024/10/1"), "二零二四年十月一日") + self.assertEqual(self.normalizer.normalize_sentence("会议在2024/9/27举行"), "会议在二零二四年九月二十七日举行") + + def test_two_digit_month_and_day(self): + self.assertEqual(self.normalizer.normalize_sentence("2024/09/27"), "二零二四年九月二十七日") + self.assertEqual(self.normalizer.normalize_sentence("2024-01-01"), "二零二四年一月一日") + + def test_not_a_date(self): + self.assertEqual(self.normalizer.normalize_sentence("3/4"), "四分之三") + self.assertNotIn("年", self.normalizer.normalize_sentence("2024/13/1")) + self.assertNotIn("年", self.normalizer.normalize_sentence("2024/1/32")) + + +if __name__ == "__main__": + unittest.main()