Address PR review: fix morphy pos, bahttext None rejection, tltk error message, add tests

Co-authored-by: bact <128572+bact@users.noreply.github.com>
Agent-Logs-Url: https://github.com/PyThaiNLP/pythainlp/sessions/4404ee59-fa2b-4a99-9de3-e477cf5b2668

Author: Copilot

pythainlp/corpus/wordnet.py

@@ -428,7 +428,7 @@ def morphy(form: str, pos: Optional[str] = None) -> str:
         >>> morphy("calculated")
         'calculate'
     """
-    return cast(str, wordnet.morphy(form, pos=None))
+    return cast(str, wordnet.morphy(form, pos=pos))
 
 
 def custom_lemmas(tab_file: Union[str, IO[str]], lang: str) -> None:

pythainlp/tag/tltk.py

@@ -19,7 +19,7 @@
 
 def pos_tag(words: list[str], corpus: str = "tnc") -> list[tuple[str, str]]:
     if corpus != "tnc":
-        raise ValueError(f"tltk not support {0} corpus.")
+        raise ValueError(f"tltk not support {corpus!r} corpus.")
     return cast(list[tuple[str, str]], nlp.pos_tag_wordlist(words))
 
 

pythainlp/util/numtoword.py

@@ -30,18 +30,19 @@
 _EXCEPTIONS: dict[str, str] = {"หนึ่งสิบ": "สิบ", "สองสิบ": "ยี่สิบ", "สิบหนึ่ง": "สิบเอ็ด"}
 
 
-def bahttext(number: Optional[float]) -> str:
+def bahttext(number: float) -> str:
     """Converts a number to Thai text and adds
     a suffix "บาท" (Baht).
     The precision will be fixed at two decimal places (0.00)
     to fit "สตางค์" (Satang) unit.
-    This function works similarly to the `BAHTTEXT` function in Microsoft Excel.
+    This function works similarly to the ``BAHTTEXT`` function in Microsoft Excel.
 
-    :param Optional[float] number: number to be converted into Thai Baht
-        currency format
+    :param float number: number to be converted into Thai Baht currency format
     :return: text representing the amount of money in the format
              of Thai currency
     :rtype: str
+    :raises TypeError: if *number* is not a numeric type
+
     :Example:
     ::
 
@@ -56,11 +57,14 @@ def bahttext(number: Optional[float]) -> str:
         bahttext(200)
         # output: สองร้อยบาทถ้วน
     """
+    if not isinstance(number, (int, float)):
+        raise TypeError(
+            f"number must be a numeric type, not {type(number).__name__!r}"
+        )
+
     ret = ""
 
-    if number is None:
-        pass
-    elif number == 0:
+    if number == 0:
         ret = "ศูนย์บาทถ้วน"
     else:
         num_int_str, num_dec_str = f"{number:.2f}".split(".")

tests/core/test_util.py

@@ -123,7 +123,8 @@ def test_number(self):
         )
         self.assertEqual(bahttext(116), "หนึ่งร้อยสิบหกบาทถ้วน")
         self.assertEqual(bahttext(0), "ศูนย์บาทถ้วน")
-        self.assertEqual(bahttext(None), "")
+        with self.assertRaises(TypeError):
+            bahttext(None)  # type: ignore[arg-type]
         # Edge cases: negative number
         self.assertEqual(bahttext(-100), "ลบหนึ่งร้อยบาทถ้วน")
         self.assertEqual(bahttext(-50.50), "ลบห้าสิบบาทห้าสิบสตางค์")

tests/extra/testx_corpus.py

@@ -27,6 +27,9 @@ def test_wordnet(self):
         self.assertIsNotNone(wordnet.lemma("cat.n.01.cat"))
 
         self.assertEqual(wordnet.morphy("dogs"), "dog")
+        # morphy with pos=None (default) and with explicit pos
+        self.assertEqual(wordnet.morphy("dogs", pos=None), "dog")
+        self.assertEqual(wordnet.morphy("dogs", pos="n"), "dog")
 
         bird = wordnet.synset("bird.n.01")
         mouse = wordnet.synset("mouse.n.01")