Update server::Error variants and conversion, rename Invalid vto NotFound and return 404, drop is_validation_error helper

Signed-off-by: declark1 <daniel.clark@ibm.com>

Author: declark1

src/clients.rs

@@ -34,8 +34,8 @@ pub enum Error {
     Grpc(#[from] tonic::Status),
     #[error("{0}")]
     Http(#[from] reqwest::Error),
-    #[error("invalid model id: {model_id}")]
-    InvalidModelId { model_id: String },
+    #[error("model not found: {model_id}")]
+    ModelNotFound { model_id: String },
 }
 
 impl Error {
@@ -61,18 +61,10 @@ impl Error {
                 Some(code) => code,
                 None => StatusCode::INTERNAL_SERVER_ERROR,
             },
-            // Return 422 for invalid model id
-            Error::InvalidModelId { .. } => StatusCode::UNPROCESSABLE_ENTITY,
+            // Return 404 for model not found
+            Error::ModelNotFound { .. } => StatusCode::NOT_FOUND,
         }
     }
-
-    /// Returns true for validation-type errors (400/422) and false for other types.
-    pub fn is_validation_error(&self) -> bool {
-        matches!(
-            self.status_code(),
-            StatusCode::BAD_REQUEST | StatusCode::UNPROCESSABLE_ENTITY
-        )
-    }
 }
 
 #[derive(Clone)]

src/clients/chunker.rs

@@ -35,7 +35,7 @@ impl ChunkerClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::InvalidModelId {
+            .ok_or_else(|| Error::ModelNotFound {
                 model_id: model_id.to_string(),
             })?
             .clone())

src/clients/detector.rs

@@ -22,7 +22,7 @@ impl DetectorClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::InvalidModelId {
+            .ok_or_else(|| Error::ModelNotFound {
                 model_id: model_id.to_string(),
             })?
             .clone())

src/clients/nlp.rs

@@ -38,7 +38,7 @@ impl NlpClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::InvalidModelId {
+            .ok_or_else(|| Error::ModelNotFound {
                 model_id: model_id.to_string(),
             })?
             .clone())

src/clients/tgis.rs

@@ -35,7 +35,7 @@ impl TgisClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::InvalidModelId {
+            .ok_or_else(|| Error::ModelNotFound {
                 model_id: model_id.to_string(),
             })?
             .clone())

src/orchestrator.rs

@@ -189,7 +189,7 @@ async fn chunk_and_detect(
             let chunker_id =
                 ctx.config
                     .get_chunker_id(detector_id)
-                    .ok_or_else(|| Error::InvalidDetectorId {
+                    .ok_or_else(|| Error::DetectorNotFound {
                         detector_id: detector_id.clone(),
                     })?;
             Ok::<String, Error>(chunker_id)
@@ -235,11 +235,12 @@ async fn detect(
             let ctx = ctx.clone();
             let detector_id = detector_id.clone();
             let detector_params = detector_params.clone();
-            let chunker_id = ctx.config.get_chunker_id(&detector_id).ok_or_else(|| {
-                Error::InvalidDetectorId {
-                    detector_id: detector_id.clone(),
-                }
-            })?;
+            let chunker_id =
+                ctx.config
+                    .get_chunker_id(&detector_id)
+                    .ok_or_else(|| Error::DetectorNotFound {
+                        detector_id: detector_id.clone(),
+                    })?;
             let chunks = chunks.get(&chunker_id).unwrap().clone();
             Ok(tokio::spawn(async move {
                 handle_detection_task(ctx, detector_id, detector_params, chunks).await

src/orchestrator/errors.rs

@@ -1,14 +1,10 @@
-use reqwest::StatusCode;
-
 use crate::clients;
 
 /// Orchestrator errors.
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
-    #[error("invalid detector: detector_id={detector_id}")]
-    InvalidDetectorId { detector_id: String },
-    #[error("invalid chunker: chunker_id={chunker_id}")]
-    InvalidChunkerId { chunker_id: String },
+    #[error("detector not found: {detector_id}")]
+    DetectorNotFound { detector_id: String },
     #[error("detector request failed for detector_id={detector_id}: {error}")]
     DetectorRequestFailed {
         detector_id: String,
@@ -35,24 +31,6 @@ pub enum Error {
     Other(String),
 }
 
-impl Error {
-    /// Returns true for validation-type errors and false for other types.
-    pub fn is_validation_error(&self) -> bool {
-        use Error::*;
-        match self {
-            InvalidDetectorId { .. } | InvalidChunkerId { .. } => true,
-            DetectorRequestFailed { error, .. }
-            | ChunkerRequestFailed { error, .. }
-            | GenerateRequestFailed { error, .. }
-            | TokenizeRequestFailed { error, .. } => matches!(
-                error.status_code(),
-                StatusCode::BAD_REQUEST | StatusCode::UNPROCESSABLE_ENTITY
-            ),
-            _ => false,
-        }
-    }
-}
-
 impl From<tokio::task::JoinError> for Error {
     fn from(error: tokio::task::JoinError) -> Self {
         if error.is_cancelled() {

src/server.rs

@@ -136,21 +136,32 @@ async fn shutdown_signal() {
 }
 
 /// High-level errors to return to clients.
-/// Validation errors are forwarded from downstream clients.
 #[derive(Debug, thiserror::Error)]
 pub enum Error {
     #[error("{0}")]
-    ValidationError(String),
+    Validation(String),
+    #[error("{0}")]
+    NotFound(String),
     #[error("unexpected error occured while processing request")]
-    UnexpectedError,
+    Unexpected,
 }
 
 impl From<orchestrator::Error> for Error {
     fn from(error: orchestrator::Error) -> Self {
-        if error.is_validation_error() {
-            Self::ValidationError(error.to_string())
-        } else {
-            Self::UnexpectedError
+        use orchestrator::Error::*;
+        match error {
+            DetectorNotFound { .. } => Self::NotFound(error.to_string()),
+            DetectorRequestFailed { error, .. }
+            | ChunkerRequestFailed { error, .. }
+            | GenerateRequestFailed { error, .. }
+            | TokenizeRequestFailed { error, .. } => match error.status_code() {
+                StatusCode::BAD_REQUEST | StatusCode::UNPROCESSABLE_ENTITY => {
+                    Self::Validation(error.to_string())
+                }
+                StatusCode::NOT_FOUND => Self::NotFound(error.to_string()),
+                _ => Self::Unexpected,
+            },
+            _ => Self::Unexpected,
         }
     }
 }
@@ -159,12 +170,13 @@ impl IntoResponse for Error {
     fn into_response(self) -> Response {
         use Error::*;
         let (code, message) = match self {
-            ValidationError(_) => (StatusCode::UNPROCESSABLE_ENTITY, self.to_string()),
-            UnexpectedError => (StatusCode::INTERNAL_SERVER_ERROR, self.to_string()),
+            Validation(_) => (StatusCode::UNPROCESSABLE_ENTITY, self.to_string()),
+            NotFound(_) => (StatusCode::NOT_FOUND, self.to_string()),
+            Unexpected => (StatusCode::INTERNAL_SERVER_ERROR, self.to_string()),
         };
         let error = serde_json::json!({
             "code": code.as_u16(),
-            "message": message,
+            "details": message,
         });
         (code, Json(error)).into_response()
     }