From 5e866e4fcae75303d284c210d89c3d14bc2bfb8d Mon Sep 17 00:00:00 2001 From: Michael Hansen Date: Mon, 2 May 2022 15:24:11 -0400 Subject: [PATCH] Refactor into a single package --- .gitignore | 2 + Dockerfile | 7 +- Dockerfile.debian | 13 +- Dockerfile.debian.dockerignore | 43 +- Dockerfile.dist | 9 +- Dockerfile.dist.dockerignore | 43 +- Dockerfile.dockerignore | 43 +- Dockerfile.gpu | 7 +- Dockerfile.gpu.dockerignore | 43 +- Dockerfile.plugin.dockerignore | 43 +- Dockerfile.sample | 9 +- Dockerfile.sample.dockerignore | 43 +- mimic3-http/MANIFEST.in => MANIFEST.in | 5 + README.md | 23 +- build-dist.sh | 12 +- check.sh | 15 +- .../img => img}/mimic3-architecture.png | Bin .../img => img}/mimic3-architecture.svg | 0 .../img => img}/server_screenshot.jpg | Bin install.sh | 7 +- mimic3-tts/download.sh => mimic3-download.sh | 8 +- mimic3-http/.gitignore | 16 - mimic3-http/.isort.cfg | 6 - mimic3-http/.projectile | 3 - mimic3-http/LICENSE | 661 ------------------ mimic3-http/check.sh | 48 -- mimic3-http/client.sh | 20 - mimic3-http/mypy.ini | 7 - mimic3-http/pylintrc | 40 -- mimic3-http/requirements.txt | 4 - mimic3-http/setup.cfg | 26 - mimic3-http/run.sh => mimic3-server.sh | 8 +- mimic3-tts/.gitignore | 16 - mimic3-tts/.isort.cfg | 6 - mimic3-tts/.projectile | 3 - mimic3-tts/LICENSE | 661 ------------------ mimic3-tts/MANIFEST.in | 5 - mimic3-tts/check.sh | 48 -- mimic3-tts/py.typed | 0 mimic3-tts/pylintrc | 40 -- mimic3-tts/setup.cfg | 26 - mimic3-tts/setup.py | 104 --- mimic3-tts/run.sh => mimic3.sh | 8 +- {mimic3-http => mimic3_http}/README.md | 0 .../mimic3_http => mimic3_http}/VERSION | 0 .../mimic3_http => mimic3_http}/__init__.py | 0 .../mimic3_http => mimic3_http}/__main__.py | 0 .../mimic3_http => mimic3_http}/_resources.py | 0 .../mimic3_http => mimic3_http}/app.py | 3 +- .../mimic3_http => mimic3_http}/args.py | 0 .../mimic3_http => mimic3_http}/const.py | 0 .../css/bootstrap.min.css | 0 .../img/Mimic_color.png | Bin .../img/Mimic_color.svg | 0 .../img/Mycroft_logo_two_typeonly.png | Bin .../img/favicon.png | Bin .../mimic3_http => mimic3_http}/py.typed | 0 .../mimic3_http => mimic3_http}/swagger.yaml | 0 .../mimic3_http => mimic3_http}/synthesis.py | 0 .../templates/index.html | 0 {mimic3-tts => mimic3_tts}/README.md | 0 {mimic3-tts/mimic3_tts => mimic3_tts}/VERSION | 0 .../mimic3_tts => mimic3_tts}/__init__.py | 0 .../mimic3_tts => mimic3_tts}/__main__.py | 0 .../mimic3_tts => mimic3_tts}/_resources.py | 0 .../mimic3_tts => mimic3_tts}/config.py | 0 .../mimic3_tts => mimic3_tts}/const.py | 0 .../mimic3_tts => mimic3_tts}/download.py | 0 {mimic3-http => mimic3_tts}/py.typed | 0 {mimic3-tts/mimic3_tts => mimic3_tts}/tts.py | 4 +- .../mimic3_tts => mimic3_tts}/utils.py | 0 .../mimic3_tts => mimic3_tts}/voice.py | 0 .../mimic3_tts => mimic3_tts}/voices.json | 0 mimic3-tts/mypy.ini => mypy.ini | 3 + opentts-abc/.gitignore | 16 - opentts-abc/.isort.cfg | 6 - opentts-abc/.projectile | 3 - opentts-abc/LICENSE | 661 ------------------ opentts-abc/MANIFEST.in | 4 - opentts-abc/README.md | 27 - opentts-abc/check.sh | 48 -- opentts-abc/mypy.ini | 4 - opentts-abc/opentts_abc/py.typed | 0 opentts-abc/py.typed | 0 opentts-abc/pylintrc | 39 -- opentts-abc/setup.cfg | 22 - opentts-abc/setup.py | 67 -- .../opentts_abc => opentts_abc}/VERSION | 0 .../opentts_abc => opentts_abc}/__init__.py | 0 .../mimic3_tts => opentts_abc}/py.typed | 0 .../opentts_abc => opentts_abc}/ssml.py | 0 .../requirements.txt => requirements.txt | 4 +- setup.cfg | 3 +- mimic3-http/setup.py => setup.py | 20 +- 94 files changed, 198 insertions(+), 2867 deletions(-) rename mimic3-http/MANIFEST.in => MANIFEST.in (52%) rename {mimic3-tts/img => img}/mimic3-architecture.png (100%) rename {mimic3-tts/img => img}/mimic3-architecture.svg (100%) rename {mimic3-http/img => img}/server_screenshot.jpg (100%) rename mimic3-tts/download.sh => mimic3-download.sh (87%) delete mode 100644 mimic3-http/.gitignore delete mode 100644 mimic3-http/.isort.cfg delete mode 100644 mimic3-http/.projectile delete mode 100644 mimic3-http/LICENSE delete mode 100755 mimic3-http/check.sh delete mode 100755 mimic3-http/client.sh delete mode 100644 mimic3-http/mypy.ini delete mode 100644 mimic3-http/pylintrc delete mode 100644 mimic3-http/requirements.txt delete mode 100644 mimic3-http/setup.cfg rename mimic3-http/run.sh => mimic3-server.sh (87%) delete mode 100644 mimic3-tts/.gitignore delete mode 100644 mimic3-tts/.isort.cfg delete mode 100644 mimic3-tts/.projectile delete mode 100644 mimic3-tts/LICENSE delete mode 100644 mimic3-tts/MANIFEST.in delete mode 100755 mimic3-tts/check.sh delete mode 100644 mimic3-tts/py.typed delete mode 100644 mimic3-tts/pylintrc delete mode 100644 mimic3-tts/setup.cfg delete mode 100644 mimic3-tts/setup.py rename mimic3-tts/run.sh => mimic3.sh (87%) rename {mimic3-http => mimic3_http}/README.md (100%) rename {mimic3-http/mimic3_http => mimic3_http}/VERSION (100%) rename {mimic3-http/mimic3_http => mimic3_http}/__init__.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/__main__.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/_resources.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/app.py (99%) rename {mimic3-http/mimic3_http => mimic3_http}/args.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/const.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/css/bootstrap.min.css (100%) rename {mimic3-http/mimic3_http => mimic3_http}/img/Mimic_color.png (100%) rename {mimic3-http/mimic3_http => mimic3_http}/img/Mimic_color.svg (100%) rename {mimic3-http/mimic3_http => mimic3_http}/img/Mycroft_logo_two_typeonly.png (100%) rename {mimic3-http/mimic3_http => mimic3_http}/img/favicon.png (100%) rename {mimic3-http/mimic3_http => mimic3_http}/py.typed (100%) rename {mimic3-http/mimic3_http => mimic3_http}/swagger.yaml (100%) rename {mimic3-http/mimic3_http => mimic3_http}/synthesis.py (100%) rename {mimic3-http/mimic3_http => mimic3_http}/templates/index.html (100%) rename {mimic3-tts => mimic3_tts}/README.md (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/VERSION (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/__init__.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/__main__.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/_resources.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/config.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/const.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/download.py (100%) rename {mimic3-http => mimic3_tts}/py.typed (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/tts.py (99%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/utils.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/voice.py (100%) rename {mimic3-tts/mimic3_tts => mimic3_tts}/voices.json (100%) rename mimic3-tts/mypy.ini => mypy.ini (88%) delete mode 100644 opentts-abc/.gitignore delete mode 100644 opentts-abc/.isort.cfg delete mode 100644 opentts-abc/.projectile delete mode 100644 opentts-abc/LICENSE delete mode 100644 opentts-abc/MANIFEST.in delete mode 100644 opentts-abc/README.md delete mode 100755 opentts-abc/check.sh delete mode 100644 opentts-abc/mypy.ini delete mode 100644 opentts-abc/opentts_abc/py.typed delete mode 100644 opentts-abc/py.typed delete mode 100644 opentts-abc/pylintrc delete mode 100644 opentts-abc/setup.cfg delete mode 100644 opentts-abc/setup.py rename {opentts-abc/opentts_abc => opentts_abc}/VERSION (100%) rename {opentts-abc/opentts_abc => opentts_abc}/__init__.py (100%) rename {mimic3-tts/mimic3_tts => opentts_abc}/py.typed (100%) rename {opentts-abc/opentts_abc => opentts_abc}/ssml.py (100%) rename mimic3-tts/requirements.txt => requirements.txt (77%) rename mimic3-http/setup.py => setup.py (86%) diff --git a/.gitignore b/.gitignore index c42b43c..9798f8a 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ dist/ .venv/ *.wav *.spec +*.egg-info/ +.ipynb_checkpoints/ /samples/ /voices/ diff --git a/Dockerfile b/Dockerfile index 5715b7d..0b7eacb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,10 @@ WORKDIR /home/mimic3/app COPY wheels/ ./wheels/ -COPY opentts-abc/ ./opentts-abc/ -COPY mimic3-http/ ./mimic3-http/ -COPY mimic3-tts/ ./mimic3-tts/ +COPY opentts_abc/ ./opentts_abc/ +COPY mimic3_http/ ./mimic3_http/ +COPY mimic3_tts/ ./mimic3_tts/ +COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./ COPY install.sh ./ # Install mimic3 diff --git a/Dockerfile.debian b/Dockerfile.debian index 1af4615..45101a7 100644 --- a/Dockerfile.debian +++ b/Dockerfile.debian @@ -45,9 +45,10 @@ WORKDIR /build/mimic3 COPY wheels/ ./wheels/ -COPY opentts-abc/ ./opentts-abc/ -COPY mimic3-http/ ./mimic3-http/ -COPY mimic3-tts/ ./mimic3-tts/ +COPY opentts_abc/ ./opentts_abc/ +COPY mimic3_http/ ./mimic3_http/ +COPY mimic3_tts/ ./mimic3_tts/ +COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./ COPY install.sh ./ # Install mimic3 @@ -119,7 +120,7 @@ COPY debian/ debian/ COPY voices/ voices/ RUN mkdir -p "${package_dir}/DEBIAN" && \ - export VERSION="$(cat mimic3-tts/mimic3_tts/VERSION)" && \ + export VERSION="$(cat mimic3_tts/VERSION)" && \ envsubst \ < "debian/control.in.${TARGETARCH}${TARGETVARIANT}" \ > "${package_dir}/DEBIAN/control" && \ @@ -149,12 +150,12 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \ mkdir -p /var/cache/apt/${TARGETARCH}${TARGETVARIANT}/archives/partial && \ apt-get update && \ apt-get install --yes --no-install-recommends \ - dpkg-dev + dpkg-dev python3 WORKDIR /test COPY --from=build /package/*.deb ./ -COPY mimic3-tts/mimic3_tts/VERSION ./ +COPY mimic3_tts/VERSION ./ # Install mimic3 for current architecture RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \ diff --git a/Dockerfile.debian.dockerignore b/Dockerfile.debian.dockerignore index 13711e2..9de55e4 100644 --- a/Dockerfile.debian.dockerignore +++ b/Dockerfile.debian.dockerignore @@ -9,36 +9,31 @@ !voices/ !wheels/ +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # Debian packaging !debian/control.in.* !debian/bin/* # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/Dockerfile.dist b/Dockerfile.dist index 3026259..a99f0b7 100644 --- a/Dockerfile.dist +++ b/Dockerfile.dist @@ -39,9 +39,10 @@ WORKDIR /build/mimic3 COPY wheels/ ./wheels/ -COPY opentts-abc/ ./opentts-abc/ -COPY mimic3-http/ ./mimic3-http/ -COPY mimic3-tts/ ./mimic3-tts/ +COPY opentts_abc/ ./opentts_abc/ +COPY mimic3_http/ ./mimic3_http/ +COPY mimic3_tts/ ./mimic3_tts/ +COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./ COPY build-dist.sh ./ # Create sdists @@ -84,7 +85,7 @@ RUN --mount=type=cache,id=pip-requirements,target=/root/.cache/pip \ -f wheels/ \ -f https://synesthesiam.github.io/prebuilt-apps/ \ -f dist/ \ - mimic3-tts + mycroft-mimic3-tts # Download default voice COPY voices/ /root/.local/share/mimic3/voices/ diff --git a/Dockerfile.dist.dockerignore b/Dockerfile.dist.dockerignore index abd58fb..b1b3d8d 100644 --- a/Dockerfile.dist.dockerignore +++ b/Dockerfile.dist.dockerignore @@ -7,32 +7,27 @@ !wheels/ !debian/control.in.* +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/Dockerfile.dockerignore b/Dockerfile.dockerignore index 9fbc733..b0b7d44 100644 --- a/Dockerfile.dockerignore +++ b/Dockerfile.dockerignore @@ -7,32 +7,27 @@ !wheels/ !debian/control.in.* +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/Dockerfile.gpu b/Dockerfile.gpu index 014a3a0..8361f2a 100644 --- a/Dockerfile.gpu +++ b/Dockerfile.gpu @@ -40,9 +40,10 @@ RUN --mount=type=cache,id=apt-run,target=/var/cache/apt \ WORKDIR /home/mimic3/app -COPY opentts-abc/ ./opentts-abc/ -COPY mimic3-http/ ./mimic3-http/ -COPY mimic3-tts/ ./mimic3-tts/ +COPY opentts_abc/ ./opentts_abc/ +COPY mimic3_http/ ./mimic3_http/ +COPY mimic3_tts/ ./mimic3_tts/ +COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./ COPY install.sh ./ # Use GPU version of onnxruntime diff --git a/Dockerfile.gpu.dockerignore b/Dockerfile.gpu.dockerignore index 6afb7f8..d9d8bdb 100644 --- a/Dockerfile.gpu.dockerignore +++ b/Dockerfile.gpu.dockerignore @@ -4,32 +4,27 @@ !tests/apope_sample_*.wav !voices/ +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/Dockerfile.plugin.dockerignore b/Dockerfile.plugin.dockerignore index dfb29e0..fac58ce 100644 --- a/Dockerfile.plugin.dockerignore +++ b/Dockerfile.plugin.dockerignore @@ -7,6 +7,12 @@ !wheels/ !debian/control.in.* +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # plugin-tts-mimic3 !plugin-tts-mimic3/setup.py !plugin-tts-mimic3/LICENSE @@ -17,31 +23,20 @@ !plugin-tts-mimic3/plugin_tts_mimic3/py.typed # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/Dockerfile.sample b/Dockerfile.sample index 2cd66db..1e5a6fc 100644 --- a/Dockerfile.sample +++ b/Dockerfile.sample @@ -38,15 +38,16 @@ RUN --mount=type=cache,id=apt-build,target=/var/cache/apt \ apt-get update && \ grep 'Depends:' "debian/control.in.${TARGETARCH}${TARGETVARIANT}" | cut -d' ' -f2- | sed -e 's/,/\n/g' | \ xargs apt-get install --yes --no-install-recommends \ - python3 python3-pip python3-venv + python3 python3-pip python3-venv build-essential WORKDIR /home/mimic3/app COPY wheels/ ./wheels/ -COPY opentts-abc/ ./opentts-abc/ -COPY mimic3-http/ ./mimic3-http/ -COPY mimic3-tts/ ./mimic3-tts/ +COPY opentts_abc/ ./opentts_abc/ +COPY mimic3_http/ ./mimic3_http/ +COPY mimic3_tts/ ./mimic3_tts/ +COPY LICENSE MANIFEST.in README.md setup.py requirements.txt ./ COPY install.sh ./ # Install mimic3 diff --git a/Dockerfile.sample.dockerignore b/Dockerfile.sample.dockerignore index bc1b6b6..cf6f91c 100644 --- a/Dockerfile.sample.dockerignore +++ b/Dockerfile.sample.dockerignore @@ -5,32 +5,27 @@ !wheels/ !debian/control.in.* +!setup.py +!LICENSE +!MANIFEST.in +!README.md +!requirements.txt + # opentts-abc -!opentts-abc/setup.py -!opentts-abc/LICENSE -!opentts-abc/MANIFEST.in -!opentts-abc/opentts_abc/*.py -!opentts-abc/opentts_abc/VERSION -!opentts-abc/opentts_abc/py.typed +!opentts_abc/*.py +!opentts_abc/VERSION +!opentts_abc/py.typed # Mimic 3 TTS -!mimic3-tts/setup.py -!mimic3-tts/LICENSE -!mimic3-tts/MANIFEST.in -!mimic3-tts/requirements.txt -!mimic3-tts/mimic3_tts/*.py -!mimic3-tts/mimic3_tts/voices.json -!mimic3-tts/mimic3_tts/VERSION -!mimic3-tts/mimic3_tts/py.typed +!mimic3_tts/*.py +!mimic3_tts/voices.json +!mimic3_tts/VERSION +!mimic3_tts/py.typed # HTTP server -!mimic3-http/setup.py -!mimic3-http/LICENSE -!mimic3-http/MANIFEST.in -!mimic3-http/requirements.txt -!mimic3-http/mimic3_http/css/ -!mimic3-http/mimic3_http/img/ -!mimic3-http/mimic3_http/templates/ -!mimic3-http/mimic3_http/*.py -!mimic3-http/mimic3_http/VERSION -!mimic3-http/mimic3_http/py.typed +!mimic3_http/css/ +!mimic3_http/img/ +!mimic3_http/templates/ +!mimic3_http/*.py +!mimic3_http/VERSION +!mimic3_http/py.typed diff --git a/mimic3-http/MANIFEST.in b/MANIFEST.in similarity index 52% rename from mimic3-http/MANIFEST.in rename to MANIFEST.in index 9c35dc9..97b2c3e 100644 --- a/mimic3-http/MANIFEST.in +++ b/MANIFEST.in @@ -2,5 +2,10 @@ include requirements.txt include requirements_dev.txt include LICENSE include README.md +include mimic3_tts/VERSION include mimic3_http/VERSION include mimic3_http/swagger.yaml +include mimic3_http/css +include mimic3_http/img +include mimic3_http/templates +include opentts_abc/VERSION diff --git a/README.md b/README.md index 5446286..08bf8f1 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ A fast and local neural text to speech system developed by [Mycroft](https://mycroft.ai/) for the [Mark II](https://mycroft.ai/product/mark-ii/). * [Available voices](https://github.com/MycroftAI/mimic3-voices) -* [How does it work?](mimic3-tts/#architecture) +* [How does it work?](mimic3_tts/#architecture) ## Use Cases @@ -17,7 +17,7 @@ A fast and local neural text to speech system developed by [Mycroft](https://myc * Drop-in [replacement for MaryTTS](#marytts-compatibility) * [Command-line tool](#command-line-tools) * `mimic3 'Hello world.' | aplay` -* [Voice for screen reader](mimic3-tts/#speech-dispatcher) +* [Voice for screen reader](mimic3_tts/#speech-dispatcher) * `spd-say 'Hello world.'` @@ -139,22 +139,13 @@ Once installed, the following commands will be available in `/usr/bin`: Install the command-line tool: ``` sh -pip install mimic3-tts[all] +pip install mycroft-mimic3-tts[all] ``` Once installed, the following commands will be available: * `mimic3` * `mimic3-download` - -Install the HTTP web server: - -``` sh -pip install mimic3-http[all] -``` - -Once installed, the following commands will be available: - * `mimic3-server` Language support can be selectively installed by replacing `all` with: @@ -225,7 +216,7 @@ mimic3 --voice 'en_UK/apope_low' 'My hovercraft is full of eels.' > hovercraft_e See [voice keys](#voice-keys) for how to reference voices and speakers. -See `mimic3 --help` or the [CLI documentation](mimic3-tts/) for more details. +See `mimic3 --help` or the [CLI documentation](mimic3_tts/) for more details. #### Downloading Voices @@ -247,7 +238,7 @@ See `mimic3-download --help` for more options. Start a web server with `mimic3-server` and visit `http://localhost:59125` to view the web UI. -![screenshot of web interface](mimic3-http/img/server_screenshot.jpg) +![screenshot of web interface](img/server_screenshot.jpg) The following endpoints are available: @@ -260,7 +251,7 @@ The following endpoints are available: An [OpenAPI](https://www.openapis.org/) test page is also available at `http://localhost:59125/openapi` -See `mimic3-server --help` for the [web server documentation](mimic3-http/) for more details. +See `mimic3-server --help` for the [web server documentation](mimic3_http/) for more details. #### Web Client @@ -312,7 +303,7 @@ and then adding the following: ## SSML -A [subset of SSML](mimic3-tts/#SSML) (Speech Synthesis Markup Language) is supported. +A [subset of SSML](mimic3_tts/#SSML) (Speech Synthesis Markup Language) is supported. For example: diff --git a/build-dist.sh b/build-dist.sh index 5806338..f59c73a 100755 --- a/build-dist.sh +++ b/build-dist.sh @@ -26,12 +26,6 @@ this_dir="$( cd "$( dirname "$0" )" && pwd )" dist_dir="${this_dir}/dist" mkdir -p "${dist_dir}" -for module_dir in opentts-abc mimic3-tts mimic3-http; do - # Kebab to snake case - module_name="$(echo "${module_dir}" | sed -e 's/-/_/g')" - - pushd "${this_dir}/${module_dir}" - python3 setup.py sdist - cp "dist/${module_name}"-*.tar.gz "${dist_dir}/" - popd -done +pushd "${this_dir}" +python3 setup.py sdist +popd diff --git a/check.sh b/check.sh index 1cb6fe3..cc82e40 100755 --- a/check.sh +++ b/check.sh @@ -33,6 +33,10 @@ fi python_files=("${this_dir}/tests"/*.py) +for module_name in 'mimic3_tts' 'mimic3_http' 'opentts_abc'; do + python_files+=("${module_name}") +done + # Format code black "${python_files[@]}" isort "${python_files[@]}" @@ -41,14 +45,3 @@ isort "${python_files[@]}" flake8 "${python_files[@]}" pylint "${python_files[@]}" mypy "${python_files[@]}" - -# Check submodules -script_name='check.sh' - -find "${this_dir}" -mindepth 2 -maxdepth 2 -name "${script_name}" -type f | \ - while read -r check_script; do - script_dir="$(dirname "${check_script}")" - pushd "${script_dir}" - "./${script_name}" "$@" - popd - done diff --git a/mimic3-tts/img/mimic3-architecture.png b/img/mimic3-architecture.png similarity index 100% rename from mimic3-tts/img/mimic3-architecture.png rename to img/mimic3-architecture.png diff --git a/mimic3-tts/img/mimic3-architecture.svg b/img/mimic3-architecture.svg similarity index 100% rename from mimic3-tts/img/mimic3-architecture.svg rename to img/mimic3-architecture.svg diff --git a/mimic3-http/img/server_screenshot.jpg b/img/server_screenshot.jpg similarity index 100% rename from mimic3-http/img/server_screenshot.jpg rename to img/server_screenshot.jpg diff --git a/install.sh b/install.sh index ab02d87..8f904c7 100755 --- a/install.sh +++ b/install.sh @@ -52,15 +52,10 @@ pip3 ${PIP_INSTALL} --upgrade pip pip3 ${PIP_INSTALL} --upgrade wheel setuptools # Install Mimic 3 -pip3 ${PIP_INSTALL} -e "${this_dir}/opentts-abc" - -# Include support for languages besides English -pushd "${this_dir}/mimic3-tts" 2>/dev/null +pushd "${this_dir}/" 2>/dev/null pip3 ${PIP_INSTALL} -e '.[all]' popd 2>/dev/null -pip3 ${PIP_INSTALL} -e "${this_dir}/mimic3-http" - if [ "$1" = 'develop' ]; then pip3 ${PIP_INSTALL} -r "${this_dir}/requirements_dev.txt" fi diff --git a/mimic3-tts/download.sh b/mimic3-download.sh similarity index 87% rename from mimic3-tts/download.sh rename to mimic3-download.sh index ee26c0b..38d2a11 100755 --- a/mimic3-tts/download.sh +++ b/mimic3-download.sh @@ -23,16 +23,16 @@ set -eo pipefail # Directory of *this* script this_dir="$( cd "$( dirname "$0" )" && pwd )" -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" +module_name='mimic3_tts' # Path to virtual environment -: "${venv:=${base_dir}/.venv}" +: "${venv:=${this_dir}/.venv}" if [ -d "${venv}" ]; then # Activate virtual environment if available source "${venv}/bin/activate" fi +PYTHONPATH="${this_dir}:${PYTHONPATH}" + python3 -m "${module_name}.download" "$@" diff --git a/mimic3-http/.gitignore b/mimic3-http/.gitignore deleted file mode 100644 index f4edcec..0000000 --- a/mimic3-http/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.DS_Store -.idea -*.log -tmp/ - -*.py[cod] -*.egg -build -htmlcov - -.venv/ -__pycache__/ -.mypy_cache/ -*.egg-info/ - -flycheck_*.py diff --git a/mimic3-http/.isort.cfg b/mimic3-http/.isort.cfg deleted file mode 100644 index ba2778d..0000000 --- a/mimic3-http/.isort.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[settings] -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 diff --git a/mimic3-http/.projectile b/mimic3-http/.projectile deleted file mode 100644 index f08b4a4..0000000 --- a/mimic3-http/.projectile +++ /dev/null @@ -1,3 +0,0 @@ -- /.venv/ -- /.mypy_cache/ -- /mimic3_http/.mypy_cache/ diff --git a/mimic3-http/LICENSE b/mimic3-http/LICENSE deleted file mode 100644 index be3f7b2..0000000 --- a/mimic3-http/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/mimic3-http/check.sh b/mimic3-http/check.sh deleted file mode 100755 index 6ed0384..0000000 --- a/mimic3-http/check.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2022 Mycroft AI Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# ----------------------------------------------------------------------------- -# -# Formats, lints, and typechecks code. -# -set -eo pipefail - -# Directory of *this* script -this_dir="$( cd "$( dirname "$0" )" && pwd )" - -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" -src_dir="${this_dir}/${module_name}" - -# Path to virtual environment -: "${venv:=${base_dir}/.venv}" - -if [ -d "${venv}" ]; then - # Activate virtual environment if available - source "${venv}/bin/activate" -fi - -# Format code -black "${src_dir}" -isort "${src_dir}" - -# Check -flake8 "${src_dir}" -pylint "${src_dir}" -mypy "${src_dir}" - -echo 'OK' diff --git a/mimic3-http/client.sh b/mimic3-http/client.sh deleted file mode 100755 index 6baeab6..0000000 --- a/mimic3-http/client.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash -set -eo pipefail - -# Directory of *this* script -this_dir="$( cd "$( dirname "$0" )" && pwd )" - -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -src_dir="${this_dir}/${module_name}" - -# Path to virtual environment -: "${venv:=${this_dir}/.venv}" - -if [ -d "${venv}" ]; then - # Activate virtual environment if available - source "${venv}/bin/activate" -fi - -export PYTHONPATH="${this_dir}" -python3 -m "${module_name}.client" "$@" diff --git a/mimic3-http/mypy.ini b/mimic3-http/mypy.ini deleted file mode 100644 index 8de4006..0000000 --- a/mimic3-http/mypy.ini +++ /dev/null @@ -1,7 +0,0 @@ -[mypy] - -[mypy-setuptools.*] -ignore_missing_imports = True - -[mypy-swagger_ui.*] -ignore_missing_imports = True diff --git a/mimic3-http/pylintrc b/mimic3-http/pylintrc deleted file mode 100644 index ea7eeab..0000000 --- a/mimic3-http/pylintrc +++ /dev/null @@ -1,40 +0,0 @@ -[MESSAGES CONTROL] -disable= - format, - abstract-class-little-used, - abstract-method, - cyclic-import, - duplicate-code, - global-statement, - import-outside-toplevel, - inconsistent-return-statements, - locally-disabled, - not-context-manager, - redefined-variable-type, - too-few-public-methods, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - too-many-statements, - too-many-boolean-expressions, - unnecessary-pass, - unused-argument, - broad-except, - too-many-nested-blocks, - invalid-name, - unused-import, - no-self-use, - fixme, - useless-super-delegation, - missing-module-docstring, - missing-class-docstring, - missing-function-docstring, - import-error, - relative-beyond-top-level - -[FORMAT] -expected-line-ending-format=LF diff --git a/mimic3-http/requirements.txt b/mimic3-http/requirements.txt deleted file mode 100644 index 1a4134e..0000000 --- a/mimic3-http/requirements.txt +++ /dev/null @@ -1,4 +0,0 @@ -mimic3-tts<1.0 -quart>=0.16,<1.0 -quart-cors -swagger-ui-py>=21,<22 diff --git a/mimic3-http/setup.cfg b/mimic3-http/setup.cfg deleted file mode 100644 index b52acb7..0000000 --- a/mimic3-http/setup.cfg +++ /dev/null @@ -1,26 +0,0 @@ -[flake8] -# To work with Black -max-line-length = 88 -# E501: line too long -# W503: Line break occurred before a binary operator -# E203: Whitespace before ':' -# D202 No blank lines allowed after function docstring -# W504 line break after binary operator -ignore = - E501, - W503, - E203, - D202, - W504 - -# F401 import unused -per-file-ignores = - mimic3_http/__init__.py:F401 - -[isort] -multi_line_output = 3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 -indent = " " diff --git a/mimic3-http/run.sh b/mimic3-server.sh similarity index 87% rename from mimic3-http/run.sh rename to mimic3-server.sh index 90ea2b7..36edf81 100755 --- a/mimic3-http/run.sh +++ b/mimic3-server.sh @@ -23,16 +23,16 @@ set -eo pipefail # Directory of *this* script this_dir="$( cd "$( dirname "$0" )" && pwd )" -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" +module_name='mimic3_http' # Path to virtual environment -: "${venv:=${base_dir}/.venv}" +: "${venv:=${this_dir}/.venv}" if [ -d "${venv}" ]; then # Activate virtual environment if available source "${venv}/bin/activate" fi +PYTHONPATH="${this_dir}:${PYTHONPATH}" + python3 -m "${module_name}" "$@" diff --git a/mimic3-tts/.gitignore b/mimic3-tts/.gitignore deleted file mode 100644 index f4edcec..0000000 --- a/mimic3-tts/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.DS_Store -.idea -*.log -tmp/ - -*.py[cod] -*.egg -build -htmlcov - -.venv/ -__pycache__/ -.mypy_cache/ -*.egg-info/ - -flycheck_*.py diff --git a/mimic3-tts/.isort.cfg b/mimic3-tts/.isort.cfg deleted file mode 100644 index ba2778d..0000000 --- a/mimic3-tts/.isort.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[settings] -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 diff --git a/mimic3-tts/.projectile b/mimic3-tts/.projectile deleted file mode 100644 index cc49f99..0000000 --- a/mimic3-tts/.projectile +++ /dev/null @@ -1,3 +0,0 @@ -- /.venv/ -- /.mypy_cache/ -- /mimic3_tts/.mypy_cache/ diff --git a/mimic3-tts/LICENSE b/mimic3-tts/LICENSE deleted file mode 100644 index be3f7b2..0000000 --- a/mimic3-tts/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/mimic3-tts/MANIFEST.in b/mimic3-tts/MANIFEST.in deleted file mode 100644 index 6fc3748..0000000 --- a/mimic3-tts/MANIFEST.in +++ /dev/null @@ -1,5 +0,0 @@ -include requirements.txt -include requirements_dev.txt -include LICENSE -include README.md -include mimic3_tts/VERSION diff --git a/mimic3-tts/check.sh b/mimic3-tts/check.sh deleted file mode 100755 index 6ed0384..0000000 --- a/mimic3-tts/check.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2022 Mycroft AI Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# ----------------------------------------------------------------------------- -# -# Formats, lints, and typechecks code. -# -set -eo pipefail - -# Directory of *this* script -this_dir="$( cd "$( dirname "$0" )" && pwd )" - -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" -src_dir="${this_dir}/${module_name}" - -# Path to virtual environment -: "${venv:=${base_dir}/.venv}" - -if [ -d "${venv}" ]; then - # Activate virtual environment if available - source "${venv}/bin/activate" -fi - -# Format code -black "${src_dir}" -isort "${src_dir}" - -# Check -flake8 "${src_dir}" -pylint "${src_dir}" -mypy "${src_dir}" - -echo 'OK' diff --git a/mimic3-tts/py.typed b/mimic3-tts/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/mimic3-tts/pylintrc b/mimic3-tts/pylintrc deleted file mode 100644 index ea7eeab..0000000 --- a/mimic3-tts/pylintrc +++ /dev/null @@ -1,40 +0,0 @@ -[MESSAGES CONTROL] -disable= - format, - abstract-class-little-used, - abstract-method, - cyclic-import, - duplicate-code, - global-statement, - import-outside-toplevel, - inconsistent-return-statements, - locally-disabled, - not-context-manager, - redefined-variable-type, - too-few-public-methods, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - too-many-statements, - too-many-boolean-expressions, - unnecessary-pass, - unused-argument, - broad-except, - too-many-nested-blocks, - invalid-name, - unused-import, - no-self-use, - fixme, - useless-super-delegation, - missing-module-docstring, - missing-class-docstring, - missing-function-docstring, - import-error, - relative-beyond-top-level - -[FORMAT] -expected-line-ending-format=LF diff --git a/mimic3-tts/setup.cfg b/mimic3-tts/setup.cfg deleted file mode 100644 index d09a842..0000000 --- a/mimic3-tts/setup.cfg +++ /dev/null @@ -1,26 +0,0 @@ -[flake8] -# To work with Black -max-line-length = 88 -# E501: line too long -# W503: Line break occurred before a binary operator -# E203: Whitespace before ':' -# D202 No blank lines allowed after function docstring -# W504 line break after binary operator -ignore = - E501, - W503, - E203, - D202, - W504 - -# F401 import unused -per-file-ignores = - mimic3_tts/__init__.py:F401 - -[isort] -multi_line_output = 3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 -indent = " " diff --git a/mimic3-tts/setup.py b/mimic3-tts/setup.py deleted file mode 100644 index 3f73d51..0000000 --- a/mimic3-tts/setup.py +++ /dev/null @@ -1,104 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2022 Mycroft AI Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -from collections import defaultdict -from pathlib import Path - -import setuptools -from setuptools import setup - -this_dir = Path(__file__).parent -module_dir = this_dir / "mimic3_tts" - -# ----------------------------------------------------------------------------- - -# Load README in as long description -long_description: str = "" -readme_path = this_dir / "README.md" -if readme_path.is_file(): - long_description = readme_path.read_text(encoding="utf-8") - -requirements = [] -requirements_path = this_dir / "requirements.txt" -if requirements_path.is_file(): - with open(requirements_path, "r", encoding="utf-8") as requirements_file: - requirements = requirements_file.read().splitlines() - -version_path = module_dir / "VERSION" -with open(version_path, "r", encoding="utf-8") as version_file: - version = version_file.read().strip() - -# ----------------------------------------------------------------------------- - -# dependency => [tags] -extras = {} - -# Create language-specific extras -for lang in [ - "de", - "es", - "fa", - "fr", - "it", - "nl", - "ru", - "sw", -]: - extras[f"gruut[{lang}]"] = [lang] - - -# Add "all" tag -for tags in extras.values(): - tags.append("all") - -# Invert for setup -extras_require = defaultdict(list) -for dep, tags in extras.items(): - for tag in tags: - extras_require[tag].append(dep) - -# ----------------------------------------------------------------------------- - -setup( - name="mimic3_tts", - version=version, - description="A fast, local, neural text to speech system for Mycroft", - url="http://github.com/MycroftAI/mimic3", - author="Michael Hansen", - author_email="michael.hansen@mycroft.ai", - license="AGPLv3+", - packages=setuptools.find_packages(), - package_data={"mimic3_tts": ["VERSION", "py.typed", "voices.json"]}, - install_requires=requirements, - extras_require={':python_version<"3.9"': ["importlib_resources"], **extras_require}, - entry_points={ - "console_scripts": [ - "mimic3 = mimic3_tts.__main__:main", - "mimic3-download = mimic3_tts.download:main", - ] - }, - classifiers=[ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", - "Topic :: Text Processing :: Linguistic", - "License :: OSI Approved :: GNU Affero General Public License v3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ], - keywords="mycroft tts speech mimic", -) diff --git a/mimic3-tts/run.sh b/mimic3.sh similarity index 87% rename from mimic3-tts/run.sh rename to mimic3.sh index 1a10fa1..c0665ca 100755 --- a/mimic3-tts/run.sh +++ b/mimic3.sh @@ -23,16 +23,16 @@ set -eo pipefail # Directory of *this* script this_dir="$( cd "$( dirname "$0" )" && pwd )" -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" +module_name='mimic3_tts' # Path to virtual environment -: "${venv:=${base_dir}/.venv}" +: "${venv:=${this_dir}/.venv}" if [ -d "${venv}" ]; then # Activate virtual environment if available source "${venv}/bin/activate" fi +PYTHONPATH="${this_dir}:${PYTHONPATH}" + python3 -m "${module_name}" "$@" diff --git a/mimic3-http/README.md b/mimic3_http/README.md similarity index 100% rename from mimic3-http/README.md rename to mimic3_http/README.md diff --git a/mimic3-http/mimic3_http/VERSION b/mimic3_http/VERSION similarity index 100% rename from mimic3-http/mimic3_http/VERSION rename to mimic3_http/VERSION diff --git a/mimic3-http/mimic3_http/__init__.py b/mimic3_http/__init__.py similarity index 100% rename from mimic3-http/mimic3_http/__init__.py rename to mimic3_http/__init__.py diff --git a/mimic3-http/mimic3_http/__main__.py b/mimic3_http/__main__.py similarity index 100% rename from mimic3-http/mimic3_http/__main__.py rename to mimic3_http/__main__.py diff --git a/mimic3-http/mimic3_http/_resources.py b/mimic3_http/_resources.py similarity index 100% rename from mimic3-http/mimic3_http/_resources.py rename to mimic3_http/_resources.py diff --git a/mimic3-http/mimic3_http/app.py b/mimic3_http/app.py similarity index 99% rename from mimic3-http/mimic3_http/app.py rename to mimic3_http/app.py index 33f175f..10b968f 100644 --- a/mimic3-http/mimic3_http/app.py +++ b/mimic3_http/app.py @@ -26,7 +26,6 @@ from urllib.parse import parse_qs from uuid import uuid4 import quart_cors -from mimic3_tts import DEFAULT_VOICE, Mimic3Settings, Mimic3TextToSpeechSystem from quart import ( Quart, Response, @@ -37,6 +36,8 @@ from quart import ( ) from swagger_ui import api_doc +from mimic3_tts import DEFAULT_VOICE, Mimic3Settings, Mimic3TextToSpeechSystem + from ._resources import _DIR, _PACKAGE from .args import _MISSING from .const import SynthesisRequest, TextToWavParams diff --git a/mimic3-http/mimic3_http/args.py b/mimic3_http/args.py similarity index 100% rename from mimic3-http/mimic3_http/args.py rename to mimic3_http/args.py diff --git a/mimic3-http/mimic3_http/const.py b/mimic3_http/const.py similarity index 100% rename from mimic3-http/mimic3_http/const.py rename to mimic3_http/const.py diff --git a/mimic3-http/mimic3_http/css/bootstrap.min.css b/mimic3_http/css/bootstrap.min.css similarity index 100% rename from mimic3-http/mimic3_http/css/bootstrap.min.css rename to mimic3_http/css/bootstrap.min.css diff --git a/mimic3-http/mimic3_http/img/Mimic_color.png b/mimic3_http/img/Mimic_color.png similarity index 100% rename from mimic3-http/mimic3_http/img/Mimic_color.png rename to mimic3_http/img/Mimic_color.png diff --git a/mimic3-http/mimic3_http/img/Mimic_color.svg b/mimic3_http/img/Mimic_color.svg similarity index 100% rename from mimic3-http/mimic3_http/img/Mimic_color.svg rename to mimic3_http/img/Mimic_color.svg diff --git a/mimic3-http/mimic3_http/img/Mycroft_logo_two_typeonly.png b/mimic3_http/img/Mycroft_logo_two_typeonly.png similarity index 100% rename from mimic3-http/mimic3_http/img/Mycroft_logo_two_typeonly.png rename to mimic3_http/img/Mycroft_logo_two_typeonly.png diff --git a/mimic3-http/mimic3_http/img/favicon.png b/mimic3_http/img/favicon.png similarity index 100% rename from mimic3-http/mimic3_http/img/favicon.png rename to mimic3_http/img/favicon.png diff --git a/mimic3-http/mimic3_http/py.typed b/mimic3_http/py.typed similarity index 100% rename from mimic3-http/mimic3_http/py.typed rename to mimic3_http/py.typed diff --git a/mimic3-http/mimic3_http/swagger.yaml b/mimic3_http/swagger.yaml similarity index 100% rename from mimic3-http/mimic3_http/swagger.yaml rename to mimic3_http/swagger.yaml diff --git a/mimic3-http/mimic3_http/synthesis.py b/mimic3_http/synthesis.py similarity index 100% rename from mimic3-http/mimic3_http/synthesis.py rename to mimic3_http/synthesis.py diff --git a/mimic3-http/mimic3_http/templates/index.html b/mimic3_http/templates/index.html similarity index 100% rename from mimic3-http/mimic3_http/templates/index.html rename to mimic3_http/templates/index.html diff --git a/mimic3-tts/README.md b/mimic3_tts/README.md similarity index 100% rename from mimic3-tts/README.md rename to mimic3_tts/README.md diff --git a/mimic3-tts/mimic3_tts/VERSION b/mimic3_tts/VERSION similarity index 100% rename from mimic3-tts/mimic3_tts/VERSION rename to mimic3_tts/VERSION diff --git a/mimic3-tts/mimic3_tts/__init__.py b/mimic3_tts/__init__.py similarity index 100% rename from mimic3-tts/mimic3_tts/__init__.py rename to mimic3_tts/__init__.py diff --git a/mimic3-tts/mimic3_tts/__main__.py b/mimic3_tts/__main__.py similarity index 100% rename from mimic3-tts/mimic3_tts/__main__.py rename to mimic3_tts/__main__.py diff --git a/mimic3-tts/mimic3_tts/_resources.py b/mimic3_tts/_resources.py similarity index 100% rename from mimic3-tts/mimic3_tts/_resources.py rename to mimic3_tts/_resources.py diff --git a/mimic3-tts/mimic3_tts/config.py b/mimic3_tts/config.py similarity index 100% rename from mimic3-tts/mimic3_tts/config.py rename to mimic3_tts/config.py diff --git a/mimic3-tts/mimic3_tts/const.py b/mimic3_tts/const.py similarity index 100% rename from mimic3-tts/mimic3_tts/const.py rename to mimic3_tts/const.py diff --git a/mimic3-tts/mimic3_tts/download.py b/mimic3_tts/download.py similarity index 100% rename from mimic3-tts/mimic3_tts/download.py rename to mimic3_tts/download.py diff --git a/mimic3-http/py.typed b/mimic3_tts/py.typed similarity index 100% rename from mimic3-http/py.typed rename to mimic3_tts/py.typed diff --git a/mimic3-tts/mimic3_tts/tts.py b/mimic3_tts/tts.py similarity index 99% rename from mimic3-tts/mimic3_tts/tts.py rename to mimic3_tts/tts.py index ed6170b..2f50c2a 100644 --- a/mimic3-tts/mimic3_tts/tts.py +++ b/mimic3_tts/tts.py @@ -23,6 +23,8 @@ from dataclasses import dataclass, field from pathlib import Path from gruut_ipa import IPA +from xdgenvpy import XDG + from opentts_abc import ( AudioResult, BaseResult, @@ -34,7 +36,6 @@ from opentts_abc import ( Voice, Word, ) -from xdgenvpy import XDG from ._resources import _VOICES from .config import TrainingConfig @@ -572,6 +573,7 @@ class Mimic3TextToSpeechSystem(TextToSpeechSystem): voice_key=voice_key, url_base=voice_url, voice_files=[VoiceFile(file_key) for file_key in voice_files.keys()], + voice_version=voice_info["version"], voices_dir=self.settings.voices_download_dir, ) diff --git a/mimic3-tts/mimic3_tts/utils.py b/mimic3_tts/utils.py similarity index 100% rename from mimic3-tts/mimic3_tts/utils.py rename to mimic3_tts/utils.py diff --git a/mimic3-tts/mimic3_tts/voice.py b/mimic3_tts/voice.py similarity index 100% rename from mimic3-tts/mimic3_tts/voice.py rename to mimic3_tts/voice.py diff --git a/mimic3-tts/mimic3_tts/voices.json b/mimic3_tts/voices.json similarity index 100% rename from mimic3-tts/mimic3_tts/voices.json rename to mimic3_tts/voices.json diff --git a/mimic3-tts/mypy.ini b/mypy.ini similarity index 88% rename from mimic3-tts/mypy.ini rename to mypy.ini index afcf136..91406e6 100644 --- a/mimic3-tts/mypy.ini +++ b/mypy.ini @@ -18,6 +18,9 @@ ignore_missing_imports = True [mypy-requests.*] ignore_missing_imports = True +[mypy-swagger_ui.*] +ignore_missing_imports = True + [mypy-tqdm.*] ignore_missing_imports = True diff --git a/opentts-abc/.gitignore b/opentts-abc/.gitignore deleted file mode 100644 index f4edcec..0000000 --- a/opentts-abc/.gitignore +++ /dev/null @@ -1,16 +0,0 @@ -.DS_Store -.idea -*.log -tmp/ - -*.py[cod] -*.egg -build -htmlcov - -.venv/ -__pycache__/ -.mypy_cache/ -*.egg-info/ - -flycheck_*.py diff --git a/opentts-abc/.isort.cfg b/opentts-abc/.isort.cfg deleted file mode 100644 index ba2778d..0000000 --- a/opentts-abc/.isort.cfg +++ /dev/null @@ -1,6 +0,0 @@ -[settings] -multi_line_output=3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 diff --git a/opentts-abc/.projectile b/opentts-abc/.projectile deleted file mode 100644 index ce80829..0000000 --- a/opentts-abc/.projectile +++ /dev/null @@ -1,3 +0,0 @@ -- /.venv/ -- /.mypy_cache/ -- /opentts_abc/.mypy_cache/ diff --git a/opentts-abc/LICENSE b/opentts-abc/LICENSE deleted file mode 100644 index be3f7b2..0000000 --- a/opentts-abc/LICENSE +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero General Public License from time to time. Such new versions -will be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU Affero General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU Affero General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU Affero General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU AGPL, see -. diff --git a/opentts-abc/MANIFEST.in b/opentts-abc/MANIFEST.in deleted file mode 100644 index 6ddd9aa..0000000 --- a/opentts-abc/MANIFEST.in +++ /dev/null @@ -1,4 +0,0 @@ -include requirements_dev.txt -include LICENSE -include README.md -include opentts_abc/VERSION diff --git a/opentts-abc/README.md b/opentts-abc/README.md deleted file mode 100644 index d15fcd9..0000000 --- a/opentts-abc/README.md +++ /dev/null @@ -1,27 +0,0 @@ -# Open Text to Speech (TTS) Abstract Base Classes (ABC) - -Base classes for open text to speech systems. - - -## SSML - -A subset of [SSML](https://www.w3.org/TR/speech-synthesis11/) is supported in `SSMLSpeaker`: - -* `` - wrap around SSML text - * `lang` - set language for document -* `` - sentence (disables automatic sentence breaking) - * `lang` - set language for sentence -* `` / `` - word (disables automatic tokenization) -* `` - set voice of inner text - * `voice` - name of voice -* `` - force interpretation of inner text - * `interpret-as` - way to interpret text (implementation dependent) - * `format` - way to format text (implementation dependent) -* `` - Pause for given amount of time - * time - seconds ("123s") or milliseconds ("123ms") -* `` - User-defined mark (written to `--mark-file` or part of `TextToSpeechResult`) - * name - name of mark -* `` - substitute `alias` for inner text -* `` - supply phonemes for inner text - * `ph` - phonemes for each word of inner text - * `alphabet` - name of phoneme alphabet (usually "ipa") diff --git a/opentts-abc/check.sh b/opentts-abc/check.sh deleted file mode 100755 index 6ed0384..0000000 --- a/opentts-abc/check.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2022 Mycroft AI Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -# ----------------------------------------------------------------------------- -# -# Formats, lints, and typechecks code. -# -set -eo pipefail - -# Directory of *this* script -this_dir="$( cd "$( dirname "$0" )" && pwd )" - -# Kebab to snake case -module_name="$(basename "${this_dir}" | sed -e 's/-/_/g')" -base_dir="$(realpath "${this_dir}/..")" -src_dir="${this_dir}/${module_name}" - -# Path to virtual environment -: "${venv:=${base_dir}/.venv}" - -if [ -d "${venv}" ]; then - # Activate virtual environment if available - source "${venv}/bin/activate" -fi - -# Format code -black "${src_dir}" -isort "${src_dir}" - -# Check -flake8 "${src_dir}" -pylint "${src_dir}" -mypy "${src_dir}" - -echo 'OK' diff --git a/opentts-abc/mypy.ini b/opentts-abc/mypy.ini deleted file mode 100644 index 7d81e3f..0000000 --- a/opentts-abc/mypy.ini +++ /dev/null @@ -1,4 +0,0 @@ -[mypy] - -[mypy-setuptools.*] -ignore_missing_imports = True diff --git a/opentts-abc/opentts_abc/py.typed b/opentts-abc/opentts_abc/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/opentts-abc/py.typed b/opentts-abc/py.typed deleted file mode 100644 index e69de29..0000000 diff --git a/opentts-abc/pylintrc b/opentts-abc/pylintrc deleted file mode 100644 index 9a76583..0000000 --- a/opentts-abc/pylintrc +++ /dev/null @@ -1,39 +0,0 @@ -[MESSAGES CONTROL] -disable= - format, - abstract-class-little-used, - abstract-method, - cyclic-import, - duplicate-code, - global-statement, - import-outside-toplevel, - inconsistent-return-statements, - locally-disabled, - not-context-manager, - redefined-variable-type, - too-few-public-methods, - too-many-arguments, - too-many-branches, - too-many-instance-attributes, - too-many-lines, - too-many-locals, - too-many-public-methods, - too-many-return-statements, - too-many-statements, - too-many-boolean-expressions, - unnecessary-pass, - unused-argument, - broad-except, - too-many-nested-blocks, - invalid-name, - unused-import, - no-self-use, - fixme, - useless-super-delegation, - missing-module-docstring, - missing-class-docstring, - missing-function-docstring, - import-error - -[FORMAT] -expected-line-ending-format=LF diff --git a/opentts-abc/setup.cfg b/opentts-abc/setup.cfg deleted file mode 100644 index 0076bbf..0000000 --- a/opentts-abc/setup.cfg +++ /dev/null @@ -1,22 +0,0 @@ -[flake8] -# To work with Black -max-line-length = 88 -# E501: line too long -# W503: Line break occurred before a binary operator -# E203: Whitespace before ':' -# D202 No blank lines allowed after function docstring -# W504 line break after binary operator -ignore = - E501, - W503, - E203, - D202, - W504 - -[isort] -multi_line_output = 3 -include_trailing_comma=True -force_grid_wrap=0 -use_parentheses=True -line_length=88 -indent = " " diff --git a/opentts-abc/setup.py b/opentts-abc/setup.py deleted file mode 100644 index 374b70c..0000000 --- a/opentts-abc/setup.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python3 -# Copyright 2022 Mycroft AI Inc. -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -# -from pathlib import Path - -import setuptools -from setuptools import setup - -this_dir = Path(__file__).parent -module_dir = this_dir / "opentts_abc" - -# ----------------------------------------------------------------------------- - -# Load README in as long description -long_description: str = "" -readme_path = this_dir / "README.md" -if readme_path.is_file(): - long_description = readme_path.read_text(encoding="utf-8") - -requirements = [] -requirements_path = this_dir / "requirements.txt" -if requirements_path.is_file(): - with open(requirements_path, "r", encoding="utf-8") as requirements_file: - requirements = requirements_file.read().splitlines() - -version_path = module_dir / "VERSION" -with open(version_path, "r", encoding="utf-8") as version_file: - version = version_file.read().strip() - -# ----------------------------------------------------------------------------- - -setup( - name="opentts_abc", - version=version, - description="Abstract base classes for Open Text to Speech system", - url="http://github.com/MycroftAI//mimic3", - author="Michael Hansen", - author_email="michael.hansen@mycroft.ai", - license="AGPLv3+", - packages=setuptools.find_packages(), - package_data={"opentts_abc": ["VERSION", "py.typed"]}, - install_requires=requirements, - extras_require={':python_version<"3.9"': ["importlib_resources"]}, - classifiers=[ - "Development Status :: 3 - Alpha", - "Intended Audience :: Developers", - "Topic :: Text Processing :: Linguistic", - "License :: OSI Approved :: GNU Affero General Public License v3", - "Programming Language :: Python :: 3.7", - "Programming Language :: Python :: 3.8", - "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", - ], -) diff --git a/opentts-abc/opentts_abc/VERSION b/opentts_abc/VERSION similarity index 100% rename from opentts-abc/opentts_abc/VERSION rename to opentts_abc/VERSION diff --git a/opentts-abc/opentts_abc/__init__.py b/opentts_abc/__init__.py similarity index 100% rename from opentts-abc/opentts_abc/__init__.py rename to opentts_abc/__init__.py diff --git a/mimic3-tts/mimic3_tts/py.typed b/opentts_abc/py.typed similarity index 100% rename from mimic3-tts/mimic3_tts/py.typed rename to opentts_abc/py.typed diff --git a/opentts-abc/opentts_abc/ssml.py b/opentts_abc/ssml.py similarity index 100% rename from opentts-abc/opentts_abc/ssml.py rename to opentts_abc/ssml.py diff --git a/mimic3-tts/requirements.txt b/requirements.txt similarity index 77% rename from mimic3-tts/requirements.txt rename to requirements.txt index d32e60a..f4ec346 100644 --- a/mimic3-tts/requirements.txt +++ b/requirements.txt @@ -4,8 +4,10 @@ espeak-phonemizer>=1.0,<2.0 gruut>=2.3.0,<3.0 numpy<2.0 onnxruntime>=1.6,<2.0 -opentts_abc<1.0 phonemes2ids<2.0 +quart>=0.16,<1.0 +quart-cors requests>=2,<3 +swagger-ui-py>=21,<22 tqdm>=4,<5 xdgenvpy>2.0,<3 diff --git a/setup.cfg b/setup.cfg index d09a842..4bf52e8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -15,7 +15,8 @@ ignore = # F401 import unused per-file-ignores = - mimic3_tts/__init__.py:F401 + mimic3_tts/__init__.py:F401, + mimic3_http/__init__.py:F401 [isort] multi_line_output = 3 diff --git a/mimic3-http/setup.py b/setup.py similarity index 86% rename from mimic3-http/setup.py rename to setup.py index 83e95b3..8fca5c2 100644 --- a/mimic3-http/setup.py +++ b/setup.py @@ -21,7 +21,7 @@ import setuptools from setuptools import setup this_dir = Path(__file__).parent -module_dir = this_dir / "mimic3_http" +module_dir = this_dir / "mimic3_tts" # ----------------------------------------------------------------------------- @@ -50,13 +50,15 @@ extras = {} for lang in [ "de", "es", + "fa", "fr", "it", "nl", "ru", "sw", ]: - extras[f"mimic3-tts[{lang}]"] = [lang] + extras[f"gruut[{lang}]"] = [lang] + # Add "all" tag for tags in extras.values(): @@ -68,19 +70,19 @@ for dep, tags in extras.items(): for tag in tags: extras_require[tag].append(dep) - # ----------------------------------------------------------------------------- setup( - name="mimic3_http", + name="mycroft_mimic3_tts", version=version, - description="A simple web server for Mycroft's Mimic 3 text to speech system", + description="A fast and local neural text to speech system for Mycroft", url="http://github.com/MycroftAI/mimic3", author="Michael Hansen", author_email="michael.hansen@mycroft.ai", license="AGPLv3+", packages=setuptools.find_packages(), package_data={ + "mimic3_tts": ["VERSION", "py.typed", "voices.json"], "mimic3_http": [ "VERSION", "py.typed", @@ -88,12 +90,15 @@ setup( "css", "img", "swagger.yaml", - ] + ], + "opentts_abc": ["VERSION", "py.typed"], }, install_requires=requirements, extras_require={':python_version<"3.9"': ["importlib_resources"], **extras_require}, entry_points={ "console_scripts": [ + "mimic3 = mimic3_tts.__main__:main", + "mimic3-download = mimic3_tts.download:main", "mimic3-server = mimic3_http.__main__:main", ] }, @@ -105,7 +110,6 @@ setup( "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", - "Programming Language :: Python :: 3.10", ], - keywords="mycroft mimic web server", + keywords="mycroft tts speech mimic", )