Merge pull request #11 from storytold/bt-fix-svc-docker

We can't run `svc` from another k8s container

voice_conversion/so-vits-svc-paul/Dockerfile

@@ -20,10 +20,25 @@ RUN apt-get update && apt-get install -y \
     && apt-get clean autoclean && apt-get autoremove -y && rm -rf /var/lib/{apt,dpkg,cache,log}/
 
 
+RUN mkdir /install
+WORKDIR /install
 
+#RUN curl -sSL https://install.python-poetry.org | python3 -
+
+#COPY pyproject.toml . 
+#COPY poetry.lock . 
+#COPY requirements.txt . 
+COPY requirements-without-poetry.txt . 
+
+#RUN pip install -r requirements-without-poetry.txt 
+
+RUN python3 -m venv python \
+  && . python/bin/activate \
+  && pip install -r requirements-without-poetry.txt
+
+WORKDIR /
 
 COPY . /models/voice_conversion/so-vits-svc
-
-WORKDIR /models/voice_conversion/so-vits-svc
-RUN pip install -e .
-WORKDIR /
+#WORKDIR /models/voice_conversion/so-vits-svc
+#RUN pip install -e .
+#WORKDIR /

voice_conversion/so-vits-svc-paul/requirements-without-poetry.txt

@@ -0,0 +1,89 @@
+# This was obtained by building the original docker image, 
+# exec'ing in, then dumping pip requirements.
+
+absl-py==1.4.0
+antlr4-python3-runtime==4.8
+attrs==22.2.0
+audioread==3.0.0
+bitarray==2.7.3
+cachetools==5.3.0
+certifi==2022.12.7
+cffi==1.15.1
+charset-normalizer==3.1.0
+click==8.1.3
+cm-time==0.1.2
+colorama==0.4.6
+contourpy==1.0.7
+cycler==0.11.0
+Cython==0.29.34
+decorator==5.1.1
+fairseq==0.12.2
+fonttools==4.39.3
+google-auth==2.17.3
+google-auth-oauthlib==0.4.6
+grpcio==1.54.0
+hydra-core==1.0.7
+idna==3.4
+joblib==1.2.0
+kiwisolver==1.4.4
+librosa==0.8.1
+llvmlite==0.39.1
+lxml==4.9.2
+Markdown==3.4.3
+markdown-it-py==2.2.0
+MarkupSafe==2.1.2
+matplotlib==3.7.1
+mdurl==0.1.2
+numba==0.56.4
+numpy==1.23.5
+nvidia-cublas-cu11==11.10.3.66
+nvidia-cuda-nvrtc-cu11==11.7.99
+nvidia-cuda-runtime-cu11==11.7.99
+nvidia-cudnn-cu11==8.5.0.96
+oauthlib==3.2.2
+omegaconf==2.0.6
+onnx==1.13.1
+onnxoptimizer==0.3.10
+onnxsim==0.4.19
+packaging==23.1
+Pillow==9.5.0
+platformdirs==3.3.0
+pooch==1.7.0
+portalocker==2.7.0
+protobuf==3.20.3
+pyasn1==0.5.0
+pyasn1-modules==0.3.0
+pycparser==2.21
+Pygments==2.15.1
+PyInputPlus==0.2.12
+pyparsing==3.0.9
+PySimpleValidate==0.2.12
+python-dateutil==2.8.2
+pyworld==0.2.12
+PyYAML==6.0
+regex==2023.3.23
+requests==2.28.2
+requests-oauthlib==1.3.1
+resampy==0.4.2
+rich==13.3.4
+rsa==4.9
+sacrebleu==2.3.1
+scikit-learn==1.2.2
+scipy==1.8.0
+six==1.16.0
+# Editable install with no version control (so-vits-svc-fork==1.2.3)
+# NB(bt): Commented out following line - 
+# -e /models/voice_conversion/so-vits-svc
+soundfile==0.12.1
+stdiomask==0.0.6
+tabulate==0.9.0
+tensorboard==2.12.0
+tensorboard-data-server==0.7.0
+tensorboard-plugin-wit==1.8.1
+threadpoolctl==3.1.0
+torch==1.13.1
+torchaudio==0.13.1
+tqdm==4.65.0
+typing_extensions==4.5.0
+urllib3==1.26.15
+Werkzeug==2.3.0

voice_conversion/so-vits-svc-paul/src/so_vits_svc_fork/fakeyou_infer.py

@@ -1,5 +1,9 @@
 from __future__ import annotations
 
+import sys
+#sys.path.append(".")
+#sys.path.append("/models/voice_conversion/so-vits-svc/src/so_vits_svc_fork")
+
 import os
 from logging import (
     DEBUG,
@@ -18,6 +22,8 @@ import pyinputplus as pyip
 import torch
 from rich.logging import RichHandler
 
+print("Env vars:")
+print(os.environ)
 
 def init_logger() -> None:
     IN_COLAB = os.getenv("COLAB_RELEASE_TAG")
@@ -194,6 +200,7 @@ def infer(
 ):
     """Inference"""
     from .inference_main import infer
+    #from inference_main import infer
 
     if not auto_predict_f0:
         LOG.warning(