Update text_engine.py

paddlespeech/server/engine/text/python/text_engine.py

@@ -107,11 +107,14 @@ class PaddleTextConnectionHandler:
             assert len(tokens) == len(labels)
 
             text = ''
+            is_fast_model = 'fast' in self.text_engine.config.model_type
             for t, l in zip(tokens, labels):
                 text += t
                 if l != 0:  # Non punc.
+                    if is_fast_model:
                         text += self._punc_list[l - 1]
-
+                    else:
+                        text += self._punc_list[l]
             return text
         else:
             raise NotImplementedError
@@ -131,6 +134,7 @@ class TextEngine(BaseEngine):
         """
         super(TextEngine, self).__init__()
         logger.debug("Create the TextEngine Instance")
+
     def init(self, config: dict):
         """Init the Text Engine
 
@@ -159,6 +163,7 @@ class TextEngine(BaseEngine):
             return False
 
         self.executor = TextServerExecutor()
+        if 'fast' in config.model_type:
             self.executor._init_from_path_new(
                 task=config.task,
                 model_type=config.model_type,
@@ -166,7 +171,15 @@ class TextEngine(BaseEngine):
                 cfg_path=config.cfg_path,
                 ckpt_path=config.ckpt_path,
                 vocab_file=config.vocab_file)
-
+        else:
+            self.executor._init_from_path(
+                task=config.task,
+                model_type=config.model_type,
+                lang=config.lang,
+                cfg_path=config.cfg_path,
+                ckpt_path=config.ckpt_path,
+                vocab_file=config.vocab_file)
+        logger.info("Using model: %s." % (config.model_type))
         logger.info("Initialize Text server engine successfully on device: %s."
                     % (self.device))
         return True