chore: エンジンのOpenAPI関数簡略化に追従 (#2582)

Author: Hiroshiba

openapi.json

@@ -340,7 +340,7 @@ watch(
       if (engineVersions.value[id]) continue;
       const version = await store.actions
         .INSTANTIATE_ENGINE_CONNECTOR({ engineId: id })
-        .then((instance) => instance.invoke("versionVersionGet")({}))
+        .then((instance) => instance.invoke("version")({}))
         .then((version) => {
           // OpenAPIのバグで"latest"のようにダブルクォーテーションで囲まれていることがあるので外す
           if (version.startsWith('"') && version.endsWith('"')) {

src/components/Dialog/EngineManageDialog.vue

@@ -5,20 +5,18 @@
 
 import { uuid4 } from "@/helpers/random";
 import {
-  AddUserDictWordUserDictWordPostRequest,
+  AddUserDictWordRequest,
   DefaultApiInterface,
-  DeleteUserDictWordUserDictWordWordUuidDeleteRequest,
-  RewriteUserDictWordUserDictWordWordUuidPutRequest,
+  DeleteUserDictWordRequest,
+  RewriteUserDictWordRequest,
   UserDictWord,
 } from "@/openapi";
 import { Brand } from "@/type/utility";
 
 type UserDictWordId = Brand<string, "UserDictWordId">;
 
 /** 単語追加リクエストで送られる断片的な単語情報からUserDictWordを作成する */
-function createWord(
-  wordProperty: AddUserDictWordUserDictWordPostRequest,
-): UserDictWord {
+function createWord(wordProperty: AddUserDictWordRequest): UserDictWord {
   return {
     surface: wordProperty.surface,
     pronunciation: wordProperty.pronunciation,
@@ -60,37 +58,31 @@ export class DictMock {
   /** 辞書系のOpenAPIの関数を返す */
   createDictMockApi(): Pick<
     DefaultApiInterface,
-    | "getUserDictWordsUserDictGet"
-    | "addUserDictWordUserDictWordPost"
-    | "rewriteUserDictWordUserDictWordWordUuidPut"
-    | "deleteUserDictWordUserDictWordWordUuidDelete"
+    | "getUserDictWords"
+    | "addUserDictWord"
+    | "rewriteUserDictWord"
+    | "deleteUserDictWord"
   > {
     return {
-      getUserDictWordsUserDictGet: async (): Promise<{
+      getUserDictWords: async (): Promise<{
         [key: UserDictWordId]: UserDictWord;
       }> => {
         return Object.fromEntries(this.userDictWords.entries());
       },
 
-      addUserDictWordUserDictWordPost: async (
-        payload: AddUserDictWordUserDictWordPostRequest,
-      ) => {
+      addUserDictWord: async (payload: AddUserDictWordRequest) => {
         const id = uuid4() as UserDictWordId;
         const word = createWord(payload);
         this.userDictWords.set(id, word);
         return id;
       },
 
-      rewriteUserDictWordUserDictWordWordUuidPut: async (
-        payload: RewriteUserDictWordUserDictWordWordUuidPutRequest,
-      ) => {
+      rewriteUserDictWord: async (payload: RewriteUserDictWordRequest) => {
         const word = createWord(payload);
         this.userDictWords.set(payload.wordUuid as UserDictWordId, word);
       },
 
-      deleteUserDictWordUserDictWordWordUuidDelete: async (
-        payload: DeleteUserDictWordUserDictWordWordUuidDeleteRequest,
-      ) => {
+      deleteUserDictWord: async (payload: DeleteUserDictWordRequest) => {
         this.userDictWords.delete(payload.wordUuid as UserDictWordId);
       },
     };

src/mock/engineMock/dictMock.ts

@@ -22,22 +22,22 @@ import { DictMock } from "./dictMock";
 import { cloneWithUnwrapProxy } from "@/helpers/cloneWithUnwrapProxy";
 import {
   AccentPhrase,
-  AccentPhrasesAccentPhrasesPostRequest,
+  AccentPhrasesRequest,
   AudioQuery,
-  AudioQueryAudioQueryPostRequest,
+  AudioQueryRequest,
   DefaultApiInterface,
   EngineManifest,
   FrameAudioQuery,
-  FrameSynthesisFrameSynthesisPostRequest,
-  MoraDataMoraDataPostRequest,
-  SingerInfoSingerInfoGetRequest,
-  SingFrameAudioQuerySingFrameAudioQueryPostRequest,
-  SingFrameVolumeSingFrameVolumePostRequest,
+  FrameSynthesisRequest,
+  MoraDataRequest,
+  SingerInfoRequest,
+  SingFrameAudioQueryRequest,
+  SingFrameVolumeRequest,
   Speaker,
   SpeakerInfo,
-  SpeakerInfoSpeakerInfoGetRequest,
+  SpeakerInfoRequest,
   SupportedDevicesInfo,
-  SynthesisSynthesisPostRequest,
+  SynthesisRequest,
 } from "@/openapi";
 
 /**
@@ -48,52 +48,46 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
   const dictMock = new DictMock();
 
   const mockApi: Partial<DefaultApiInterface> = {
-    async versionVersionGet(): Promise<string> {
+    async version(): Promise<string> {
       return "mock";
     },
 
     // メタ情報
-    async engineManifestEngineManifestGet(): Promise<EngineManifest> {
+    async engineManifest(): Promise<EngineManifest> {
       return getEngineManifestMock();
     },
 
-    async supportedDevicesSupportedDevicesGet(): Promise<SupportedDevicesInfo> {
+    async supportedDevices(): Promise<SupportedDevicesInfo> {
       return { cpu: true, cuda: false, dml: false };
     },
 
     // キャラクター情報
-    async isInitializedSpeakerIsInitializedSpeakerGet(): Promise<boolean> {
+    async isInitializedSpeaker(): Promise<boolean> {
       return true;
     },
 
-    async initializeSpeakerInitializeSpeakerPost(): Promise<void> {
+    async initializeSpeaker(): Promise<void> {
       return;
     },
 
-    async speakersSpeakersGet(): Promise<Speaker[]> {
+    async speakers(): Promise<Speaker[]> {
       return getSpeakersMock();
     },
 
-    async speakerInfoSpeakerInfoGet(
-      payload: SpeakerInfoSpeakerInfoGetRequest,
-    ): Promise<SpeakerInfo> {
+    async speakerInfo(payload: SpeakerInfoRequest): Promise<SpeakerInfo> {
       return getSpeakerInfoMock(payload.speakerUuid);
     },
 
-    async singersSingersGet(): Promise<Speaker[]> {
+    async singers(): Promise<Speaker[]> {
       return getSingersMock();
     },
 
-    async singerInfoSingerInfoGet(
-      paload: SingerInfoSingerInfoGetRequest,
-    ): Promise<SpeakerInfo> {
-      return getSpeakerInfoMock(paload.speakerUuid);
+    async singerInfo(payload: SingerInfoRequest): Promise<SpeakerInfo> {
+      return getSpeakerInfoMock(payload.speakerUuid);
     },
 
     // トーク系
-    async audioQueryAudioQueryPost(
-      payload: AudioQueryAudioQueryPostRequest,
-    ): Promise<AudioQuery> {
+    async audioQuery(payload: AudioQueryRequest): Promise<AudioQuery> {
       const accentPhrases = await textToActtentPhrasesMock(
         dictMock.applyDict(payload.text),
         payload.speaker,
@@ -112,8 +106,8 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
       };
     },
 
-    async accentPhrasesAccentPhrasesPost(
-      payload: AccentPhrasesAccentPhrasesPostRequest,
+    async accentPhrases(
+      payload: AccentPhrasesRequest,
     ): Promise<AccentPhrase[]> {
       let accentPhrases: AccentPhrase[];
       if (payload.isKana) {
@@ -130,18 +124,14 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
       return accentPhrases;
     },
 
-    async moraDataMoraDataPost(
-      payload: MoraDataMoraDataPostRequest,
-    ): Promise<AccentPhrase[]> {
+    async moraData(payload: MoraDataRequest): Promise<AccentPhrase[]> {
       const accentPhrase = cloneWithUnwrapProxy(payload.accentPhrase);
       replaceLengthMock(accentPhrase, payload.speaker);
       replacePitchMock(accentPhrase, payload.speaker);
       return accentPhrase;
     },
 
-    async synthesisSynthesisPost(
-      payload: SynthesisSynthesisPostRequest,
-    ): Promise<Blob> {
+    async synthesis(payload: SynthesisRequest): Promise<Blob> {
       const frameAudioQuery = audioQueryToFrameAudioQueryMock(
         payload.audioQuery,
         {
@@ -157,8 +147,8 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
     },
 
     // ソング系
-    async singFrameAudioQuerySingFrameAudioQueryPost(
-      payload: SingFrameAudioQuerySingFrameAudioQueryPostRequest,
+    async singFrameAudioQuery(
+      payload: SingFrameAudioQueryRequest,
     ): Promise<FrameAudioQuery> {
       const { score, speaker: styleId } = cloneWithUnwrapProxy(payload);
 
@@ -185,8 +175,8 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
       };
     },
 
-    async singFrameVolumeSingFrameVolumePost(
-      payload: SingFrameVolumeSingFrameVolumePostRequest,
+    async singFrameVolume(
+      payload: SingFrameVolumeRequest,
     ): Promise<Array<number>> {
       const {
         speaker: styleId,
@@ -202,9 +192,7 @@ export function createOpenAPIEngineMock(): DefaultApiInterface {
       return volume;
     },
 
-    async frameSynthesisFrameSynthesisPost(
-      payload: FrameSynthesisFrameSynthesisPostRequest,
-    ): Promise<Blob> {
+    async frameSynthesis(payload: FrameSynthesisRequest): Promise<Blob> {
       const { speaker: styleId, frameAudioQuery } =
         cloneWithUnwrapProxy(payload);
       const buffer = synthesisFrameAudioQueryMock(frameAudioQuery, styleId);