From e02e00753d897e723da5bb70d3b738f70bd78575 Mon Sep 17 00:00:00 2001
From: Ftps <ftpsflandre@gmail.com>
Date: Sun, 2 Jun 2024 02:34:38 +0900
Subject: [PATCH] Revert "func -> call"

This reverts commit 043fa4d750dd2da5e009f96391227e7b002f7766.
---
 .env                                   | 14 ----------
 rvc/modules/uvr5/modules.py            |  2 +-
 rvc/wrapper/api/endpoints/inference.py |  6 +----
 rvc/wrapper/api/endpoints/uvr.py       | 36 ++++++++------------------
 rvc/wrapper/cli/handler/infer.py       |  5 +---
 rvc/wrapper/cli/handler/uvr5.py        |  5 +++-
 6 files changed, 18 insertions(+), 50 deletions(-)
 delete mode 100644 .env

diff --git a/.env b/.env
deleted file mode 100644
index fb32909..0000000
--- a/.env
+++ /dev/null
@@ -1,14 +0,0 @@
-OPENBLAS_NUM_THREADS = 1
-no_proxy = localhost, 127.0.0.1, ::1
-
-# You can change the location of the model, etc. by changing here
-weight_root = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/assets/weights
-weight_uvr5_root = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/assets/uvr5_weights
-index_root = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/logs
-rmvpe_root = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/assets/rmvpe
-hubert_path = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/assets/hubert/hubert_base.pt
-hubert_path_ = /Users/ftps/Downloads/Hubert Base.pt
-save_uvr_path = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/opt
-TEMP = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/TEMP
-pretrained = /Users/ftps/Retrieval-based-Voice-Conversion-WebUI/assets/pretrained
-exp_dir =
diff --git a/rvc/modules/uvr5/modules.py b/rvc/modules/uvr5/modules.py
index 44e675a..abebfb5 100644
--- a/rvc/modules/uvr5/modules.py
+++ b/rvc/modules/uvr5/modules.py
@@ -20,7 +20,7 @@ def __init__(self):
         self.need_reformat: bool = True
         self.config: Config = Config()
 
-    def __call__(
+    def uvr_wrapper(
         self,
         audio_path: Path,
         agg: int = 10,
diff --git a/rvc/wrapper/api/endpoints/inference.py b/rvc/wrapper/api/endpoints/inference.py
index 1f4c8ee..8ae0135 100644
--- a/rvc/wrapper/api/endpoints/inference.py
+++ b/rvc/wrapper/api/endpoints/inference.py
@@ -11,7 +11,6 @@
 from rvc.modules.vc.modules import VC
 import glob
 import os
-import torch
 
 router = APIRouter()
 from dotenv import load_dotenv
@@ -44,6 +43,7 @@ def inference(
     rms_mix_rate: float = 0.25,
     protect: float = 0.33,
 ):
+    print(res_type)
     vc = VC()
     vc.get_vc(modelpath)
     tgt_sr, audio_opt, times, _ = vc.vc_inference(
@@ -61,10 +61,6 @@ def inference(
     )
     wavfile.write(wv := BytesIO(), tgt_sr, audio_opt)
     print(times)
-
-    if torch.cuda.is_available():
-        torch.cuda.empty_cache()
-
     if res_type == "blob":
         return responses.StreamingResponse(
             wv,
diff --git a/rvc/wrapper/api/endpoints/uvr.py b/rvc/wrapper/api/endpoints/uvr.py
index a871eaf..58faddd 100644
--- a/rvc/wrapper/api/endpoints/uvr.py
+++ b/rvc/wrapper/api/endpoints/uvr.py
@@ -1,32 +1,18 @@
-from io import BytesIO
+from fastapi import APIRouter, Response, UploadFile, responses
 
-from fastapi import APIRouter, UploadFile, responses, Query
-from fastapi.responses import JSONResponse
 from rvc.modules.uvr5.modules import UVR
-from base64 import b64encode
-from scipy.io import wavfile
 
 router = APIRouter()
 
 
 @router.post("/inference")
-def uvr(
-    inputpath,
-    outputpath,
-    modelname,
-    res_type: str = Query("blob", enum=["blob", "json"]),
-):
-    arries = [i for i in UVR()(inputpath, outputpath, model_name=modelname)]
-    wavfile.write(wv := BytesIO(), tgt_sr, audio_opt)
-    if res_type == "blob":
-        return responses.StreamingResponse(
-            wv,
-            media_type="audio/wav",
-            headers={"Content-Disposition": "attachment; filename=inference.wav"},
-        )
-    else:
-        return JSONResponse(
-            {
-                "audio": b64encode(wv.read()).decode("utf-8"),
-            }
-        )
+def uvr(inputpath, outputpath, modelname, format):
+    uvr_module = UVR()
+    uvr_module.uvr_wrapper(
+        inputpath, outputpath, model_name=modelname, export_format=format
+    )
+    return responses.StreamingResponse(
+        audio,
+        media_type="audio/wav",
+        headers={"Content-Disposition": "attachment; filename=inference.wav"},
+    )
diff --git a/rvc/wrapper/cli/handler/infer.py b/rvc/wrapper/cli/handler/infer.py
index 5eebdd7..872cdc9 100644
--- a/rvc/wrapper/cli/handler/infer.py
+++ b/rvc/wrapper/cli/handler/infer.py
@@ -4,7 +4,6 @@
 import click
 from dotenv import load_dotenv
 from scipy.io import wavfile
-import torch
 
 logging.getLogger("numba").setLevel(logging.WARNING)
 
@@ -130,6 +129,4 @@ def infer(
         wavfile.write(outputpath, tgt_sr, audio_opt)
         click.echo(times)
         click.echo(f"Finish inference. Check {outputpath}")
-
-    if torch.cuda.is_available():
-        torch.cuda.empty_cache()
+    return tgt_sr, audio_opt, times
diff --git a/rvc/wrapper/cli/handler/uvr5.py b/rvc/wrapper/cli/handler/uvr5.py
index 54cbdac..06efb5b 100644
--- a/rvc/wrapper/cli/handler/uvr5.py
+++ b/rvc/wrapper/cli/handler/uvr5.py
@@ -38,5 +38,8 @@
     help="output Format",
 )
 def uvr(modelname, inputpath, outputpath, format):
-    UVR()(inputpath, outputpath, model_name=modelname, export_format=format)
+    uvr_module = UVR()
+    uvr_module.uvr_wrapper(
+        inputpath, outputpath, model_name=modelname, export_format=format
+    )
     click.echo(f"Finish uvr5. Check {outputpath}")