Error::InferenceFailedにsourceとしてOrtErrorを持たせる (VOICEVOX#668)

sevenc-nanashi · Oct 30, 2023 · c1bd227 · c1bd227
1 parent 322e011
commit c1bd227
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/crates/voicevox_core/src/error.rs b/crates/voicevox_core/src/error.rs
@@ -41,7 +41,7 @@ impl Error {
             ErrorRepr::GetSupportedDevices(_) => ErrorKind::GetSupportedDevices,
             ErrorRepr::StyleNotFound { .. } => ErrorKind::StyleNotFound,
             ErrorRepr::ModelNotFound { .. } => ErrorKind::ModelNotFound,
-            ErrorRepr::InferenceFailed => ErrorKind::InferenceFailed,
+            ErrorRepr::InferenceFailed { .. } => ErrorKind::InferenceFailed,
             ErrorRepr::ExtractFullContextLabel(_) => ErrorKind::ExtractFullContextLabel,
             ErrorRepr::ParseKana(_) => ErrorKind::ParseKana,
             ErrorRepr::LoadUserDict(_) => ErrorKind::LoadUserDict,
@@ -80,7 +80,7 @@ pub(crate) enum ErrorRepr {
     ModelNotFound { model_id: VoiceModelId },
 
     #[error("推論に失敗しました")]
-    InferenceFailed,
+    InferenceFailed(#[source] anyhow::Error),
 
     #[error(transparent)]
     ExtractFullContextLabel(#[from] FullContextLabelError),

diff --git a/crates/voicevox_core/src/status.rs b/crates/voicevox_core/src/status.rs
@@ -185,7 +185,7 @@ impl Status {
 
             let output_tensors = predict_duration
                 .run(vec![&mut phoneme_vector_array, &mut speaker_id_array])
-                .map_err(|_| ErrorRepr::InferenceFailed)?;
+                .map_err(|e| ErrorRepr::InferenceFailed(e.into()))?;
             Ok(output_tensors[0].as_slice().unwrap().to_owned())
         })
         .await
@@ -229,7 +229,7 @@ impl Status {
                     &mut end_accent_phrase_vector_array,
                     &mut speaker_id_array,
                 ])
-                .map_err(|_| ErrorRepr::InferenceFailed)?;
+                .map_err(|e| ErrorRepr::InferenceFailed(e.into()))?;
             Ok(output_tensors[0].as_slice().unwrap().to_owned())
         })
         .await
@@ -261,7 +261,7 @@ impl Status {
                     &mut phoneme_array,
                     &mut speaker_id_array,
                 ])
-                .map_err(|_| ErrorRepr::InferenceFailed)?;
+                .map_err(|e| ErrorRepr::InferenceFailed(e.into()))?;
             Ok(output_tensors[0].as_slice().unwrap().to_owned())
         })
         .await