diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index b4645017..00000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @VOICEVOX/maintainer diff --git a/.github/ISSUE_TEMPLATE/bugreport.md b/.github/ISSUE_TEMPLATE/bugreport.md index 28337b5a..bc6e2045 100644 --- a/.github/ISSUE_TEMPLATE/bugreport.md +++ b/.github/ISSUE_TEMPLATE/bugreport.md @@ -20,7 +20,7 @@ labels: バグ -## VOICEVOXのバージョン +## AivisSpeech のバージョン 0.?.0 diff --git a/.github/ISSUE_TEMPLATE/featurerequest.md b/.github/ISSUE_TEMPLATE/featurerequest.md index 78a3af90..c5ed2c6a 100644 --- a/.github/ISSUE_TEMPLATE/featurerequest.md +++ b/.github/ISSUE_TEMPLATE/featurerequest.md @@ -21,7 +21,7 @@ labels: 機能向上 -## VOICEVOXのバージョン +## AivisSpeech のバージョン 0.?.0 diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md index 856a031e..29091e26 100644 --- a/.github/ISSUE_TEMPLATE/question.md +++ b/.github/ISSUE_TEMPLATE/question.md @@ -8,7 +8,7 @@ labels: 要議論 -## VOICEVOXのバージョン +## AivisSpeech のバージョン 0.?.0 diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 8ce46a1c..9187d964 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -13,7 +13,7 @@ on: required: true env: - IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/voicevox_engine + IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/aivisspeech-engine PYTHON_VERSION: "3.11.3" VOICEVOX_RESOURCE_VERSION: "0.16.0" VOICEVOX_CORE_VERSION: "0.15.0" @@ -152,7 +152,7 @@ jobs: BASE_IMAGE=${{ matrix.base_image }} BASE_RUNTIME_IMAGE=${{ matrix.base_runtime_image }} PYTHON_VERSION=${{ env.PYTHON_VERSION }} - VOICEVOX_ENGINE_VERSION=${{ needs.config.outputs.version_or_latest }} + AIVISSPEECH_ENGINE_VERSION=${{ needs.config.outputs.version_or_latest }} VOICEVOX_CORE_VERSION=${{ env.VOICEVOX_CORE_VERSION }} VOICEVOX_RESOURCE_VERSION=${{ env.VOICEVOX_RESOURCE_VERSION }} USE_GPU=${{ matrix.target == 'runtime-nvidia-env' }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 06501d04..e5a3c762 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: - name: declare variables id: vars run: | - echo "package_name=voicevox_engine-${{ matrix.target }}-${{ needs.config.outputs.version }}" >> "$GITHUB_OUTPUT" + echo "package_name=aivisspeech-engine-${{ matrix.target }}-${{ needs.config.outputs.version }}" >> "$GITHUB_OUTPUT" - uses: actions/checkout@v4 diff --git a/.github/workflows/release-test-docker.yml b/.github/workflows/release-test-docker.yml index d3033779..8125bca9 100644 --- a/.github/workflows/release-test-docker.yml +++ b/.github/workflows/release-test-docker.yml @@ -17,7 +17,7 @@ on: required: true env: - IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/voicevox_engine + IMAGE_NAME: ${{ vars.DOCKERHUB_USERNAME }}/aivisspeech-engine VERSION: |- # version指定時はversionを、それ以外はタグ名を使用 ${{ (github.event.inputs || inputs).version }} diff --git a/.github/workflows/release-test.yml b/.github/workflows/release-test.yml index ec680ab1..a68ea2f9 100644 --- a/.github/workflows/release-test.yml +++ b/.github/workflows/release-test.yml @@ -57,7 +57,7 @@ jobs: id: vars run: | echo "release_url=${{ env.REPO_URL }}/releases/download/${{ env.VERSION }}" >> "$GITHUB_OUTPUT" - echo "package_name=voicevox_engine-${{ matrix.target }}-${{ env.VERSION }}" >> "$GITHUB_OUTPUT" + echo "package_name=aivisspeech-engine-${{ matrix.target }}-${{ env.VERSION }}" >> "$GITHUB_OUTPUT" - uses: actions/checkout@v4 diff --git a/Dockerfile b/Dockerfile index 4613717d..7d10664d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -181,7 +181,7 @@ EOF FROM ${BASE_RUNTIME_IMAGE} AS runtime-env ARG DEBIAN_FRONTEND=noninteractive -WORKDIR /opt/voicevox_engine +WORKDIR /opt/aivisspeech-engine # ca-certificates: pyopenjtalk dictionary download # build-essential: pyopenjtalk local build @@ -225,33 +225,33 @@ COPY --from=download-core-env /opt/voicevox_core /opt/voicevox_core COPY --from=download-onnxruntime-env /opt/onnxruntime /opt/onnxruntime # Add local files -ADD ./voicevox_engine /opt/voicevox_engine/voicevox_engine -ADD ./docs /opt/voicevox_engine/docs -ADD ./run.py ./presets.yaml ./default.csv ./engine_manifest.json /opt/voicevox_engine/ -ADD ./build_util/generate_licenses.py /opt/voicevox_engine/build_util/ -ADD ./speaker_info /opt/voicevox_engine/speaker_info -ADD ./ui_template /opt/voicevox_engine/ui_template -ADD ./engine_manifest_assets /opt/voicevox_engine/engine_manifest_assets +ADD ./voicevox_engine /opt/aivisspeech-engine/voicevox_engine +ADD ./docs /opt/aivisspeech-engine/docs +ADD ./run.py ./presets.yaml ./default.csv ./engine_manifest.json /opt/aivisspeech-engine/ +ADD ./build_util/generate_licenses.py /opt/aivisspeech-engine/build_util/ +ADD ./speaker_info /opt/aivisspeech-engine/speaker_info +ADD ./ui_template /opt/aivisspeech-engine/ui_template +ADD ./engine_manifest_assets /opt/aivisspeech-engine/engine_manifest_assets # Replace version -ARG VOICEVOX_ENGINE_VERSION=latest -RUN sed -i "s/__version__ = \"latest\"/__version__ = \"${VOICEVOX_ENGINE_VERSION}\"/" /opt/voicevox_engine/voicevox_engine/__init__.py -RUN sed -i "s/\"version\": \"999\\.999\\.999\"/\"version\": \"${VOICEVOX_ENGINE_VERSION}\"/" /opt/voicevox_engine/engine_manifest.json +ARG AIVISSPEECH_ENGINE_VERSION=latest +RUN sed -i "s/__version__ = \"latest\"/__version__ = \"${AIVISSPEECH_ENGINE_VERSION}\"/" /opt/aivisspeech-engine/voicevox_engine/__init__.py +RUN sed -i "s/\"version\": \"999\\.999\\.999\"/\"version\": \"${AIVISSPEECH_ENGINE_VERSION}\"/" /opt/aivisspeech-engine/engine_manifest.json # Generate licenses.json ADD ./requirements-license.txt /tmp/ RUN < /opt/voicevox_engine/engine_manifest_assets/dependency_licenses.json - cp /opt/voicevox_engine/engine_manifest_assets/dependency_licenses.json /opt/voicevox_engine/licenses.json + gosu user /opt/python/bin/python3 build_util/generate_licenses.py > /opt/aivisspeech-engine/engine_manifest_assets/dependency_licenses.json + cp /opt/aivisspeech-engine/engine_manifest_assets/dependency_licenses.json /opt/aivisspeech-engine/licenses.json EOF # Keep this layer separated to use layer cache on download failed in local build @@ -280,7 +280,7 @@ RUN < /dev/stderr +cat /opt/aivisspeech-engine/README.md > /dev/stderr exec "\$@" EOF diff --git a/build_util/generate_licenses.py b/build_util/generate_licenses.py index 774b0193..2266106b 100644 --- a/build_util/generate_licenses.py +++ b/build_util/generate_licenses.py @@ -57,17 +57,17 @@ def generate_licenses() -> List[License]: ) # VOICEVOX CORE - with urllib.request.urlopen( - "https://raw.githubusercontent.com/VOICEVOX/voicevox_core/main/LICENSE" - ) as res: - licenses.append( - License( - name="VOICEVOX CORE", - version=None, - license="MIT license", - text=res.read().decode(), - ) - ) + # with urllib.request.urlopen( + # "https://raw.githubusercontent.com/VOICEVOX/voicevox_core/main/LICENSE" + # ) as res: + # licenses.append( + # License( + # name="VOICEVOX CORE", + # version=None, + # license="MIT license", + # text=res.read().decode(), + # ) + # ) # VOICEVOX ENGINE with urllib.request.urlopen( diff --git a/engine_manifest.json b/engine_manifest.json index 01693cb4..d4c7bbf6 100644 --- a/engine_manifest.json +++ b/engine_manifest.json @@ -3,7 +3,7 @@ "name": "AivisSpeech Engine", "brand_name": "AivisSpeech", "uuid": "1b4a5014-d9fd-11ee-b97d-83c170a68ed3", - "version": "0.1.0", + "version": "999.999.999", "url": "https://github.com/Aivis-Project/AivisSpeech-Engine", "command": "run", "port": 10101, diff --git a/pyproject.toml b/pyproject.toml index 3a230600..6a1a6100 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -37,7 +37,7 @@ multi_line_output = 3 use_parentheses = true [tool.poetry] -name = "voicevox_engine" +name = "AivisSpeech-Engine" version = "0.0.0" description = "" authors = ["Hiroshiba "] diff --git a/run.py b/run.py index 92a70d0c..849454c8 100644 --- a/run.py +++ b/run.py @@ -147,8 +147,8 @@ def generate_app( root_dir = engine_root() app = FastAPI( - title="VOICEVOX Engine", - description="VOICEVOXの音声合成エンジンです。", + title="AivisSpeech Engine", + description="AivisSpeech の音声合成エンジンです。", version=__version__, ) @@ -1428,7 +1428,7 @@ def main() -> None: if output_log_utf8: set_output_log_utf8() - parser = argparse.ArgumentParser(description="VOICEVOX のエンジンです。") + parser = argparse.ArgumentParser(description="AivisSpeech のエンジンです。") parser.add_argument( "--host", type=str, @@ -1442,10 +1442,10 @@ def main() -> None: "--use_gpu", action="store_true", help="GPUを使って音声合成するようになります。" ) parser.add_argument( - "--voicevox_dir", + "--aivisspeech_dir", type=Path, default=None, - help="VOICEVOXのディレクトリパスです。", + help="AivisSpeechのディレクトリパスです。", ) parser.add_argument( "--voicelib_dir", @@ -1540,7 +1540,7 @@ def main() -> None: default=None, help=( "プリセットファイルを指定できます。" - "指定がない場合、環境変数 VV_PRESET_FILE、--voicevox_dirのpresets.yaml、" + "指定がない場合、環境変数 VV_PRESET_FILE、--aivisspeech_dirのpresets.yaml、" "実行ファイルのディレクトリのpresets.yamlを順に探します。" ), ) @@ -1562,7 +1562,7 @@ def main() -> None: # Synthesis Engine use_gpu: bool = args.use_gpu - voicevox_dir: Path | None = args.voicevox_dir + voicevox_dir: Path | None = args.aivisspeech_dir voicelib_dirs: list[Path] | None = args.voicelib_dir runtime_dirs: list[Path] | None = args.runtime_dir enable_mock: bool = args.enable_mock diff --git "a/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" "b/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" index f766359c..5af3bdd1 100644 --- "a/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" +++ "b/test/e2e/__snapshots__/test_openapi/test_OpenAPI\343\201\256\345\275\242\343\201\214\345\244\211\343\202\217\343\201\243\343\201\246\343\201\204\343\201\252\343\201\204\343\201\223\343\201\250\343\202\222\347\242\272\350\252\215.json" @@ -1087,8 +1087,8 @@ } }, "info": { - "description": "VOICEVOXの音声合成エンジンです。", - "title": "VOICEVOX Engine", + "description": "AivisSpeech の音声合成エンジンです。", + "title": "AivisSpeech Engine", "version": "latest" }, "openapi": "3.1.0", diff --git a/test/e2e/single_api/__snapshots__/test_setting_api.ambr b/test/e2e/single_api/__snapshots__/test_setting_api.ambr index 97c02018..71092354 100644 --- a/test/e2e/single_api/__snapshots__/test_setting_api.ambr +++ b/test/e2e/single_api/__snapshots__/test_setting_api.ambr @@ -4,7 +4,7 @@ @@ -12,11 +12,7 @@ - VOICEVOX Engine 設定 - + AivisSpeech Engine 設定