Apply black formatter

This commit is contained in:
litagin02
2024-03-11 09:47:47 +09:00
parent 42ee7d7608
commit c776c08235
31 changed files with 463 additions and 298 deletions

View File

@@ -25,6 +25,7 @@ def run_frontend(text: str) -> list[dict[str, Any]]:
else:
# without worker
import pyopenjtalk
return pyopenjtalk.run_frontend(text)
@@ -36,6 +37,7 @@ def make_label(njd_features: Any) -> list[str]:
else:
# without worker
import pyopenjtalk
return pyopenjtalk.make_label(njd_features)
@@ -45,6 +47,7 @@ def mecab_dict_index(path: str, out_path: str, dn_mecab: Optional[str] = None) -
else:
# without worker
import pyopenjtalk
pyopenjtalk.mecab_dict_index(path, out_path, dn_mecab)
@@ -54,6 +57,7 @@ def update_global_jtalk_with_user_dict(path: str) -> None:
else:
# without worker
import pyopenjtalk
pyopenjtalk.update_global_jtalk_with_user_dict(path)
@@ -63,6 +67,7 @@ def unset_user_dict() -> None:
else:
# without worker
import pyopenjtalk
pyopenjtalk.unset_user_dict()
@@ -102,7 +107,12 @@ def initialize_worker(port: int = WORKER_PORT) -> None:
else:
# align with Windows behavior
# start_new_session is same as specifying setsid in preexec_fn
subprocess.Popen(args, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, start_new_session=True)
subprocess.Popen(
args,
stdout=subprocess.DEVNULL,
stderr=subprocess.DEVNULL,
start_new_session=True,
)
# wait until server listening
count = 0

View File

@@ -2,12 +2,15 @@ import socket
from typing import Any, cast
from style_bert_vits2.logging import logger
from style_bert_vits2.nlp.japanese.pyopenjtalk_worker.worker_common import RequestType, receive_data, send_data
from style_bert_vits2.nlp.japanese.pyopenjtalk_worker.worker_common import (
RequestType,
receive_data,
send_data,
)
class WorkerClient:
""" pyopenjtalk worker client """
"""pyopenjtalk worker client"""
def __init__(self, port: int) -> None:
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
@@ -16,19 +19,15 @@ class WorkerClient:
sock.connect((socket.gethostname(), port))
self.sock = sock
def __enter__(self) -> "WorkerClient":
return self
def __exit__(self, exc_type: Any, exc_value: Any, traceback: Any) -> None:
self.close()
def close(self) -> None:
self.sock.close()
def dispatch_pyopenjtalk(self, func: str, *args: Any, **kwargs: Any) -> Any:
data = {
"request-type": RequestType.PYOPENJTALK,
@@ -43,7 +42,6 @@ class WorkerClient:
logger.trace(f"client received response: {response}")
return response.get("return")
def status(self) -> int:
data = {"request-type": RequestType.STATUS}
logger.trace(f"client sends request: {data}")
@@ -53,7 +51,6 @@ class WorkerClient:
logger.trace(f"client received response: {response}")
return cast(int, response.get("client-count"))
def quit_server(self) -> None:
data = {"request-type": RequestType.QUIT_SERVER}
logger.trace(f"client sends request: {data}")

View File

@@ -26,14 +26,12 @@ PYOPENJTALK_FUNC_DICT = {
class WorkerServer:
""" pyopenjtalk worker server """
"""pyopenjtalk worker server"""
def __init__(self) -> None:
self.client_count: int = 0
self.quit: bool = False
def handle_request(self, request: dict[str, Any]) -> dict[str, Any]:
request_type = None
try:
@@ -70,7 +68,6 @@ class WorkerServer:
return response
def start_server(self, port: int, no_client_timeout: int = 30) -> None:
logger.info("start pyopenjtalk worker server")
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as server_socket: