Update djcm_module.py

djcm_module.py

@@ -1,23 +1,19 @@
 import torch
-import os
 import numpy as np
 
-class DJCM:
-    def __init__(self, model_path="/content/HRVC/models/rvc/predictors/djcm.pt", device="cuda"):
+class DJCMExtractor:
+    def __init__(self, model_path, device="cuda"):
         self.device = device
-        self.model_path = model_path
-        if not os.path.exists(model_path):
-            raise FileNotFoundError(f"DJCM model not found at {model_path}")
-        self.model = torch.load(model_path, map_location=device)
+        self.model = torch.jit.load(model_path, map_location=device)
         self.model.eval()
 
-    def infer_from_audio(self, audio_np):
+    def __call__(self, audio, sr=16000):
         """
-        audio_np: np.ndarray, shape [T]
-        return: f0 np.ndarray
+        audio: numpy array (1D, float32)
+        sr: sample rate (default 16k atau sesuaikan dengan DJCM)
+        return: f0 contour (numpy array 1D)
         """
-        audio_tensor = torch.from_numpy(audio_np).float().unsqueeze(0).to(self.device)
+        x = torch.tensor(audio, dtype=torch.float32, device=self.device).unsqueeze(0)
         with torch.no_grad():
-            f0 = self.model(audio_tensor)
+            f0 = self.model(x, sr)  # Sesuaikan kalau model DJCM butuh input lain
         return f0.squeeze().cpu().numpy()
-