整理: manifest モジュールのネストを削除 (#1306)

VOICEVOX · May 25, 2024 · d04f702 · d04f702
1 parent b11ff35
commit d04f702
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 8 deletions.
diff --git a/build_util/make_docs.py b/build_util/make_docs.py
@@ -6,7 +6,7 @@
 from voicevox_engine.core.core_initializer import CoreManager
 from voicevox_engine.dev.core.mock import MockCoreWrapper
 from voicevox_engine.dev.tts_engine.mock import MockTTSEngine
-from voicevox_engine.engine_manifest.EngineManifest import load_manifest
+from voicevox_engine.engine_manifest import load_manifest
 from voicevox_engine.preset.PresetManager import PresetManager
 from voicevox_engine.setting.Setting import USER_SETTING_PATH, SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import TTSEngineManager

diff --git a/run.py b/run.py
@@ -14,7 +14,7 @@
 from voicevox_engine.app.application import generate_app
 from voicevox_engine.cancellable_engine import CancellableEngine
 from voicevox_engine.core.core_initializer import initialize_cores
-from voicevox_engine.engine_manifest.EngineManifest import load_manifest
+from voicevox_engine.engine_manifest import load_manifest
 from voicevox_engine.preset.PresetManager import PresetManager
 from voicevox_engine.setting.Setting import (
     USER_SETTING_PATH,

diff --git a/test/e2e/conftest.py b/test/e2e/conftest.py
@@ -8,7 +8,7 @@
 
 from voicevox_engine.app.application import generate_app
 from voicevox_engine.core.core_initializer import initialize_cores
-from voicevox_engine.engine_manifest.EngineManifest import load_manifest
+from voicevox_engine.engine_manifest import load_manifest
 from voicevox_engine.preset.PresetManager import PresetManager
 from voicevox_engine.setting.Setting import SettingHandler
 from voicevox_engine.tts_pipeline.tts_engine import make_tts_engines_from_cores

diff --git a/voicevox_engine/app/application.py b/voicevox_engine/app/application.py
@@ -17,7 +17,7 @@
 from voicevox_engine.app.routers.user_dict import generate_user_dict_router
 from voicevox_engine.cancellable_engine import CancellableEngine
 from voicevox_engine.core.core_initializer import CoreManager
-from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
+from voicevox_engine.engine_manifest import EngineManifest
 from voicevox_engine.library_manager import LibraryManager
 from voicevox_engine.metas.MetasStore import MetasStore
 from voicevox_engine.preset.PresetManager import PresetManager

diff --git a/voicevox_engine/app/routers/engine_info.py b/voicevox_engine/app/routers/engine_info.py
@@ -9,7 +9,7 @@
 from voicevox_engine import __version__
 from voicevox_engine.core.core_adapter import DeviceSupport
 from voicevox_engine.core.core_initializer import CoreManager
-from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
+from voicevox_engine.engine_manifest import EngineManifest
 
 
 class SupportedDevicesInfo(BaseModel):

diff --git a/voicevox_engine/app/routers/library.py b/voicevox_engine/app/routers/library.py
@@ -6,7 +6,7 @@
 
 from fastapi import APIRouter, Depends, HTTPException, Path, Request
 
-from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
+from voicevox_engine.engine_manifest import EngineManifest
 from voicevox_engine.library_manager import LibraryManager
 from voicevox_engine.model import DownloadableLibraryInfo, InstalledLibraryInfo
 

diff --git a/voicevox_engine/app/routers/portal_page.py b/voicevox_engine/app/routers/portal_page.py
@@ -3,7 +3,7 @@
 from fastapi import APIRouter
 from fastapi.responses import HTMLResponse
 
-from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
+from voicevox_engine.engine_manifest import EngineManifest
 
 
 def generate_portal_page_router(engine_manifest_data: EngineManifest) -> APIRouter:

diff --git a/voicevox_engine/app/routers/setting.py b/voicevox_engine/app/routers/setting.py
@@ -5,7 +5,7 @@
 from fastapi import APIRouter, Depends, Form, Request, Response
 from fastapi.templating import Jinja2Templates
 
-from voicevox_engine.engine_manifest.EngineManifest import EngineManifest
+from voicevox_engine.engine_manifest import EngineManifest
 from voicevox_engine.setting.Setting import CorsPolicyMode, Setting, SettingHandler
 from voicevox_engine.utility.path_utility import engine_root
 

diff --git a/..._engine/engine_manifest/EngineManifest.py → voicevox_engine/engine_manifest.py b/..._engine/engine_manifest/EngineManifest.py → voicevox_engine/engine_manifest.py
diff --git a/voicevox_engine/engine_manifest/__init__.py b/voicevox_engine/engine_manifest/__init__.py