Fix build timeout and Perth watermarker NoneType error

neuttsair/neutts.py

@@ -4,7 +4,6 @@ import librosa
 import numpy as np
 import torch
 import re
-import perth
 from neucodec import NeuCodec, DistillNeuCodec
 from phonemizer.backend import EspeakBackend
 from transformers import AutoTokenizer, AutoModelForCausalLM, TextIteratorStreamer
@@ -38,6 +37,31 @@ def _linear_overlap_add(frames: list[np.ndarray], stride: int) -> np.ndarray:
     return out / sum_weight
 
 
+class _NoOpWatermarker:
+    """Pass-through when Perth watermarker fails to load."""
+
+    def apply_watermark(self, wav: np.ndarray, sample_rate: int = 24_000) -> np.ndarray:
+        return wav
+
+
+def _load_watermarker():
+    """Load PerthImplicitWatermarker with fallbacks for broken package layouts."""
+    try:
+        import perth
+        cls = getattr(perth, "PerthImplicitWatermarker", None)
+        if cls is not None and callable(cls):
+            return cls()
+    except Exception:
+        pass
+    try:
+        from perth.perth_net.perth_net_implicit.perth_watermarker import PerthImplicitWatermarker
+        return PerthImplicitWatermarker()
+    except Exception:
+        pass
+    print("Warning: Perth watermarker unavailable, using pass-through.")
+    return _NoOpWatermarker()
+
+
 class NeuTTSAir:
 
     def __init__(
@@ -75,8 +99,8 @@ class NeuTTSAir:
 
         self._load_codec(codec_repo, codec_device)
 
-        # Load watermarker
-        self.watermarker = perth.PerthImplicitWatermarker()
+        # Load watermarker (PerthImplicitWatermarker can be None in some envs → NoneType not callable)
+        self.watermarker = _load_watermarker()
 
     def _load_backbone(self, backbone_repo, backbone_device):
         print(f"Loading backbone from: {backbone_repo} on {backbone_device} ...")