Implement error handling

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

Author: declark1

Cargo.toml

@@ -25,7 +25,6 @@ rustls-webpki = "0.102.2"
 serde = { version = "1.0.200", features = ["derive"] }
 serde_json = "1.0.116"
 serde_yml = "0.0.5"
-thiserror = "1.0.59"
 tokio = { version = "1.37.0", features = ["rt", "rt-multi-thread", "parking_lot", "signal", "sync", "fs"] }
 tokio-stream = "0.1.14"
 tonic = { version = "0.11.0", features = ["tls"] }
@@ -34,6 +33,7 @@ tracing-subscriber = { version = "0.3.18", features = ["json", "env-filter"] }
 url = "2.5.0"
 validator = { version = "0.18.1", features = ["derive"] } # For API validation
 uuid = { version = "1.8.0", features = ["v4", "fast-rng"] }
+anyhow = "1.0.83"
 
 [build-dependencies]
 tonic-build = "0.11.0"

src/clients.rs

@@ -1,6 +1,7 @@
 #![allow(dead_code)]
 use std::{collections::HashMap, time::Duration};
 
+use anyhow::{Context, Error};
 use futures::future::try_join_all;
 use ginepro::LoadBalancedChannel;
 use url::Url;
@@ -26,18 +27,6 @@ pub const DEFAULT_DETECTOR_PORT: u16 = 8080;
 const DEFAULT_CONNECT_TIMEOUT: Duration = Duration::from_secs(5);
 const DEFAULT_REQUEST_TIMEOUT: Duration = Duration::from_secs(10);
 
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error("model not found: {0}")]
-    ModelNotFound(String),
-    #[error(transparent)]
-    ReqwestError(#[from] reqwest::Error),
-    #[error(transparent)]
-    TonicError(#[from] tonic::Status),
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
-}
-
 #[derive(Clone)]
 pub enum GenerationClient {
     Tgis(TgisClient),
@@ -89,7 +78,11 @@ pub async fn create_http_clients(
                 let identity = reqwest::Identity::from_pem(&cert_pem)?;
                 builder = builder.use_rustls_tls().identity(identity);
             }
-            let client = builder.build()?;
+            let client = builder.build().with_context(|| {
+                format!(
+                    "error creating http client, name={name}, service_config={service_config:?}"
+                )
+            })?;
             let client = HttpClient::new(base_url, client);
             Ok((name.clone(), client)) as Result<(String, HttpClient), Error>
         })
@@ -140,7 +133,7 @@ async fn create_grpc_clients<C>(
             if let Some(client_tls_config) = client_tls_config {
                 builder = builder.with_tls(client_tls_config);
             }
-            let channel = builder.channel().await.unwrap(); // TODO: handle error
+            let channel = builder.channel().await.with_context(|| format!("error creating grpc client, name={name}, service_config={service_config:?}"))?;
             Ok((name.clone(), new(channel))) as Result<(String, C), Error>
         })
         .collect::<Vec<_>>();

src/clients/chunker.rs

@@ -1,12 +1,13 @@
 use std::{collections::HashMap, pin::Pin};
 
+use anyhow::{Context, Error};
 use futures::{Stream, StreamExt};
 use ginepro::LoadBalancedChannel;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::Request;
 
-use super::{create_grpc_clients, Error};
+use super::create_grpc_clients;
 use crate::{
     config::ServiceConfig,
     pb::{
@@ -35,7 +36,7 @@ impl ChunkerClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::ModelNotFound(model_id.into()))?
+            .context(format!("model not found, model_id={model_id}"))?
             .clone())
     }
 

src/clients/detector.rs

@@ -1,8 +1,9 @@
 use std::collections::HashMap;
 
+use anyhow::{Context, Error};
 use serde::{Deserialize, Serialize};
 
-use super::{create_http_clients, Error, HttpClient};
+use super::{create_http_clients, HttpClient};
 use crate::config::ServiceConfig;
 
 const DETECTOR_ID_HEADER_NAME: &str = "detector-id";
@@ -23,7 +24,7 @@ impl DetectorClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::ModelNotFound(model_id.into()))?
+            .context(format!("model not found, model_id={model_id}"))?
             .clone())
     }
 

src/clients/nlp.rs

@@ -1,12 +1,13 @@
 use std::collections::HashMap;
 
+use anyhow::{Context, Error};
 use futures::StreamExt;
 use ginepro::LoadBalancedChannel;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 use tonic::Request;
 
-use super::{create_grpc_clients, Error};
+use super::create_grpc_clients;
 use crate::{
     config::ServiceConfig,
     pb::{
@@ -38,7 +39,7 @@ impl NlpClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::ModelNotFound(model_id.into()))?
+            .context(format!("model not found, model_id={model_id}"))?
             .clone())
     }
 

src/clients/tgis.rs

@@ -1,11 +1,12 @@
 use std::collections::HashMap;
 
+use anyhow::{Context, Error};
 use futures::StreamExt;
 use ginepro::LoadBalancedChannel;
 use tokio::sync::mpsc;
 use tokio_stream::wrappers::ReceiverStream;
 
-use super::{create_grpc_clients, Error};
+use super::create_grpc_clients;
 use crate::{
     config::ServiceConfig,
     pb::fmaas::{
@@ -36,7 +37,7 @@ impl TgisClient {
         Ok(self
             .clients
             .get(model_id)
-            .ok_or_else(|| Error::ModelNotFound(model_id.into()))?
+            .context(format!("model not found, model_id={model_id}"))?
             .clone())
     }
 

src/config.rs

@@ -108,8 +108,10 @@ impl OrchestratorConfig {
         todo!()
     }
 
-    pub fn get_chunker_id(&self, detector_id: &str) -> String {
-        self.detectors.get(detector_id).unwrap().chunker_id.clone()
+    pub fn get_chunker_id(&self, detector_id: &str) -> Option<String> {
+        self.detectors
+            .get(detector_id)
+            .map(|detector_config| detector_config.chunker_id.clone())
     }
 }
 
@@ -126,8 +128,9 @@ fn service_tls_name_to_config(
 
 #[cfg(test)]
 mod tests {
+    use anyhow::Error;
+
     use super::*;
-    use crate::Error;
 
     #[test]
     fn test_deserialize_config() -> Result<(), Error> {

src/lib.rs

@@ -1,43 +1,8 @@
 #![allow(clippy::iter_kv_map, clippy::enum_variant_names)]
 
-use axum::{http::StatusCode, Json};
-
 mod clients;
 mod config;
 mod models;
 mod orchestrator;
 mod pb;
 pub mod server;
-
-#[derive(Debug, thiserror::Error)]
-pub enum Error {
-    #[error(transparent)]
-    ClientError(#[from] crate::clients::Error),
-    #[error(transparent)]
-    IoError(#[from] std::io::Error),
-    #[error(transparent)]
-    YamlError(#[from] serde_yml::Error),
-}
-
-// TODO: create better errors and properly convert
-impl From<Error> for (StatusCode, Json<String>) {
-    fn from(value: Error) -> Self {
-        use Error::*;
-        match value {
-            ClientError(error) => match error {
-                clients::Error::ModelNotFound(message) => {
-                    (StatusCode::UNPROCESSABLE_ENTITY, Json(message))
-                }
-                clients::Error::ReqwestError(error) => {
-                    (StatusCode::INTERNAL_SERVER_ERROR, Json(error.to_string()))
-                }
-                clients::Error::TonicError(error) => {
-                    (StatusCode::INTERNAL_SERVER_ERROR, Json(error.to_string()))
-                }
-                clients::Error::IoError(_) => todo!(),
-            },
-            IoError(_) => todo!(),
-            YamlError(_) => todo!(),
-        }
-    }
-}