Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions pyopenjtalk/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,15 @@ def update_global_jtalk_with_user_dict(path):
Note that this will change the global state of the openjtalk module.

Args:
path (str): path to user dictionary
path (str | None): path to user dictionary.
If None, Update global openjtalk instance without the user dictionary.
"""
if path is None:
path = ""
elif not exists(path):
raise FileNotFoundError("no such file or directory: %s" % path)
global _global_jtalk
with _global_jtalk():
if not exists(path):
raise FileNotFoundError("no such file or directory: %s" % path)
_global_jtalk = _global_instance_manager(
instance=OpenJTalk(
dn_mecab=OPEN_JTALK_DICT_DIR, userdic=path.encode("utf-8")
Expand Down
16 changes: 10 additions & 6 deletions tests/test_openjtalk.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ def test_g2p_phone():


def test_userdic():
for text, expected in [
parameter = [
("nnmn", "n a n a m i N"),
("GNU", "g u n u u"),
]:
]
for text, expected in parameter:
p = pyopenjtalk.g2p(text)
assert p != expected

Expand All @@ -106,13 +107,16 @@ def test_userdic():
pyopenjtalk.mecab_dict_index(f.name, user_dic)
pyopenjtalk.update_global_jtalk_with_user_dict(user_dic)

for text, expected in [
("nnmn", "n a n a m i N"),
("GNU", "g u n u u"),
]:
for text, expected in parameter:
p = pyopenjtalk.g2p(text)
assert p == expected

pyopenjtalk.update_global_jtalk_with_user_dict(None)

for text, expected in parameter:
p = pyopenjtalk.g2p(text)
assert p != expected


def test_multithreading():
ojt = pyopenjtalk.openjtalk.OpenJTalk(pyopenjtalk.OPEN_JTALK_DICT_DIR)
Expand Down