refactor: add decode_msg method to BaseFunASRClient

Author: atomiechen

src/funasr_client/async_client.py

@@ -15,7 +15,7 @@
 
 from .base_client import BaseFunASRClient
 from .types import FunASRMessageLike
-from .utils import sync_to_async, decode_msg, is_final_msg
+from .utils import sync_to_async, is_final_msg
 
 
 module_logger = logging.getLogger(__name__)
@@ -148,7 +148,7 @@ async def _recv(self, timeout: Optional[float] = None):
             raise TimeoutError() from e.__cause__
         response = json.loads(message)
         if self.decode:
-            response = decode_msg(response, self.start_time)
+            response = self.decode_msg(response)
         response = cast(MessageType, response)
         if is_final_msg(response):
             self._received_final = True

src/funasr_client/base_client.py

@@ -8,8 +8,8 @@
 from websockets.sync.client import connect as ws_connect
 from websockets.sync.connection import Connection
 
-from .types import FunASRMessageLike, InitMessageMode
-from .utils import typed_params
+from .types import FunASRMessage, FunASRMessageLike, InitMessageMode
+from .utils import typed_params, decode_msg
 
 
 MessageType = TypeVar("MessageType", bound=FunASRMessageLike)
@@ -167,3 +167,6 @@ def _get_connect_params(self):
                 ssl=ssl_context,
                 subprotocols=["binary"],  # type: ignore
             )
+
+    def decode_msg(self, msg: FunASRMessage):
+        return decode_msg(msg, start_time=self.start_time)

src/funasr_client/client.py

@@ -15,7 +15,7 @@
 
 from .base_client import BaseFunASRClient
 from .types import FunASRMessageLike
-from .utils import decode_msg, is_final_msg
+from .utils import is_final_msg
 
 
 module_logger = logging.getLogger(__name__)
@@ -130,7 +130,7 @@ def _recv(self, timeout: Optional[float] = None):
         message = self._ws.recv(timeout=timeout)
         response = json.loads(message)
         if self.decode:
-            response = decode_msg(response, self.start_time)
+            response = self.decode_msg(response)
         response = cast(MessageType, response)
         if is_final_msg(response):
             self._received_final = True