- more test cases for bahttext, num_to_thaiword, thaiword_to_num

- handle 0 and None

Author: bact

pythainlp/number/thainum.py

@@ -92,6 +92,12 @@ def bahttext(amount_number):
 
     Similar to BAHTTEXT funcation in Excel
     """
+    if amount_number is None:
+        return ""
+
+    if amount_number == 0:
+        return "ศูนย์บาทถ้วน"
+
     amount_number = number_format(amount_number, 2).replace(" ", "")
     pt = amount_number.find(".")
     number, fraction = "", ""
@@ -106,11 +112,13 @@ def bahttext(amount_number):
 
     ret = ""
     number = ast.literal_eval(number.replace(",", ""))
+
     baht = num_to_thaiword(number)
     if baht != "":
         ret = "".join([ret, baht, "บาท"])
+
     satang = num_to_thaiword(fraction)
-    if satang != "":
+    if satang != "" and satang != "ศูนย์":
         ret = "".join([ret, satang, "สตางค์"])
     else:
         ret = "".join([ret, "ถ้วน"])
@@ -123,12 +131,16 @@ def num_to_thaiword(number):
     :param float number: a float number (with decimals) indicating a quantity
     :return: a text that indicates the full amount in word form, properly ending each digit with the right term.
     """
+    if number is None:
+        return ""
+
+    if number == 0:
+        return "ศูนย์"
+
     position_call = ["แสน", "หมื่น", "พัน", "ร้อย", "สิบ", ""]
     number_call = ["", "หนึ่ง", "สอง", "สาม", "สี่", "ห้า", "หก", "เจ็ด", "แปด", "เก้า"]
 
     ret = ""
-    if number == 0:
-        return ret
     if number > 1000000:
         ret += num_to_thaiword(int(number / 1000000)) + "ล้าน"
         number = int(math.fmod(number, 1000000))
@@ -137,6 +149,7 @@ def num_to_thaiword(number):
     pos = 0
     while number > 0:
         d = int(number / divider)
+
         if (divider == 10) and (d == 2):
             ret += "ยี่"
         elif (divider == 10) and (d == 1):
@@ -145,10 +158,12 @@ def num_to_thaiword(number):
             ret += "เอ็ด"
         else:
             ret += number_call[d]
+
         if d:
             ret += position_call[pos]
         else:
             ret += ""
+
         number = number % divider
         divider = divider / 10
         pos += 1
@@ -157,4 +172,4 @@ def num_to_thaiword(number):
 
 
 if __name__ == "__main__":
-    print(bahtext(4000.0))
+    print(bahttext(4000.0))

pythainlp/number/wordtonum.py

@@ -7,6 +7,8 @@
 """
 import re
 
+from pythainlp.tokenize import Tokenizer
+
 _THAIWORD_NUMS = set("ศูนย์ หนึ่ง เอ็ด สอง ยี่ สาม สี่ ห้า หก เจ็ด แปด เก้า".split())
 _THAIWORD_UNITS = set("สิบ ร้อย พัน หมื่น แสน ล้าน".split())
 _THAIWORD_NUMS_UNITS = _THAIWORD_NUMS | _THAIWORD_UNITS
@@ -34,12 +36,14 @@
 _NU_PAT = re.compile("(.+)?(สิบ|ร้อย|พัน|หมื่น|แสน|ล้าน)(.+)?")  # หกสิบ, ร้อยเอ็ด
 # assuming that the units are separated already
 
+_TOKENIZER = Tokenizer(custom_dict=_THAIWORD_NUMS_UNITS)
+
 
 def _thaiword_to_num(tokens):
     len_tokens = len(tokens)
 
     if len_tokens == 0:
-        return 0
+        return None
 
     if len_tokens == 1:
         return _THAI_INT_MAP[tokens[0]]
@@ -61,7 +65,17 @@ def _thaiword_to_num(tokens):
         return _THAI_INT_MAP[a] * _THAI_INT_MAP[b] + _thaiword_to_num(tokens[2:])
 
 
-def thaiword_to_num(tokens):
+def thaiword_to_num(thaiword):
+    if not thaiword:
+        return None
+
+    tokens = []
+    if type(thaiword) == str:
+        tokens = _TOKENIZER.word_tokenize(thaiword)
+    elif type(thaiword) in (list, tuple, set, frozenset):
+        for w in thaiword:
+            tokens.extend(_TOKENIZER.word_tokenize(w))
+
     res = []
     for tok in tokens:
         if tok in _THAIWORD_NUMS_UNITS:
@@ -72,4 +86,5 @@ def thaiword_to_num(tokens):
                 res.extend([t for t in m.groups() if t])  # ตัด None ทิ้ง
             else:
                 pass  # should not be here
+
     return _thaiword_to_num(res)

tests/__init__.py

@@ -152,17 +152,25 @@ def test_number(self):
             bahttext(5611116.50),
             "ห้าล้านหกแสนหนึ่งหมื่นหนึ่งพันหนึ่งร้อยสิบหกบาทห้าสิบสตางค์",
         )
-        self.assertEqual(
-            bahttext(116),
-            "หนึ่งร้อยสิบหกบาทถ้วน",
-        )
+        self.assertEqual(bahttext(116), "หนึ่งร้อยสิบหกบาทถ้วน")
+        self.assertEqual(bahttext(0), "ศูนย์บาทถ้วน")
+        self.assertEqual(bahttext(None), "")
+
         self.assertEqual(num_to_thaiword(112), "หนึ่งร้อยสิบสอง")
+        self.assertEqual(num_to_thaiword(0), "ศูนย์")
+        self.assertEqual(num_to_thaiword(None), "")
+
+        self.assertEqual(thaiword_to_num("ร้อยสิบสอง"), 112)
         self.assertEqual(
             thaiword_to_num(
-                ["หก", "ล้าน", "หกแสน", "หกหมื่น", "หกพัน", "หกร้อย", "หกสิบ", "หก"]
+                ["หก", "ล้าน", "หก", "แสน", "หกหมื่น", "หกพัน", "หกร้อย", "หกสิบ", "หก"]
             ),
             6666666,
         )
+        self.assertEqual(thaiword_to_num("ยี่สิบ"), 20)
+        self.assertEqual(thaiword_to_num("ศูนย์"), 0)
+        self.assertEqual(thaiword_to_num(""), None)
+        self.assertEqual(thaiword_to_num(None), None)
 
     # ### pythainlp.rank