mnist: optimize UI message

Author: pymumu

examples/project/mnist-mindspore/src/flowunit/mnist_infer/mnist_infer.toml

@@ -29,5 +29,5 @@ type = "float"
 
 [output]
 [output.output1] 
-name = "Default/fc3-Dense/BiasAdd-op21" 
+name = "Default/fc3-Dense/BiasAdd-op229" 
 type = "float"

examples/project/mnist-mindspore/src/flowunit/mnist_infer/train-mindspore.sh renamed to examples/project/mnist-mindspore/src/flowunit/mnist_infer/train.sh

@@ -19,7 +19,7 @@ graphconf = '''digraph mnist_sample {
 
     httpserver_sync_receive:out_request_info -> mnist_preprocess:in_data
     mnist_preprocess:out_data -> mnist_infer:x
-    mnist_infer:"Default/fc3-Dense/BiasAdd-op21" -> mnist_response:in_data
+    mnist_infer:"Default/fc3-Dense/BiasAdd-op229" -> mnist_response:in_data
     mnist_response:out_data -> httpserver_sync_reply:in_reply_info
 }
 '''

examples/project/mnist-mindspore/src/graph/mnist.toml.in renamed to examples/project/mnist-mindspore/src/graph/mnist.toml

@@ -51,15 +51,18 @@ Status ModelDecryption::Init(const std::string& model_path,
 
   fmodel_.open(model_path, std::ios::binary);
   if (fmodel_.fail() || !fmodel_.is_open()) {
-    MBLOG_ERROR << "open model '" << model_path << "' failed, "
-                << StrError(errno);
-    return STATUS_FAULT;
+    std::string errmsg = "open model '";
+    errmsg += model_path + "' failed, " + StrError(errno);
+    MBLOG_ERROR << errmsg;
+    return {STATUS_INVALID, errmsg};
   }
+
   fmodel_.seekg(0, std::ios::end);
   fsize_ = fmodel_.tellg();
   if (fsize_ <= 0) {
-    MBLOG_ERROR << "empty model file: " << model_path;
-    return STATUS_FAULT;
+    std::string errmsg = "empty model file: " + model_path;
+    MBLOG_ERROR << errmsg;
+    return {STATUS_BADCONF, errmsg};
   }
 
   auto plugin_name = config->GetString("encryption.plugin_name");
@@ -73,31 +76,36 @@ Status ModelDecryption::Init(const std::string& model_path,
       MBLOG_ERROR << "drivers_ptr is null";
       return STATUS_FAULT;
     }
+
     auto plugin_driver = drivers_ptr->GetDriver(
         DRIVER_CLASS_MODEL_DECRYPT, DRIVER_TYPE, plugin_name, plugin_version);
     if (plugin_driver == nullptr) {
-      MBLOG_ERROR << "Can not find drivers: " << plugin_name;
+      std::string errmsg = "Can not find decrytp drivers: " + plugin_name;
+      MBLOG_ERROR << errmsg;
       // fclose will call when ~ModelDecryption
-      return STATUS_FAULT;
+      return {STATUS_BADCONF, errmsg};
     }
+
     cur_factory_ = plugin_driver->CreateFactory();
     if (cur_factory_ == nullptr) {
       MBLOG_ERROR << "Plugin : " << plugin_name << " factory create failed";
-      return STATUS_FAULT;
+      return {STATUS_FAULT, "decrypt driver create failed"};
     }
+
     cur_plugin_ = std::dynamic_pointer_cast<IModelDecryptPlugin>(
         cur_factory_->GetDriver());
     if (cur_plugin_ == nullptr) {
       MBLOG_ERROR << "plugin : " << plugin_name
                   << " is not derived from IModelDecryptPlugin";
-      return STATUS_FAULT;
+      return {STATUS_FAULT, "decrypt driver create failed"};
     }
 
-    if (cur_plugin_->Init(model_path, config) == STATUS_SUCCESS) {
+    auto ret = cur_plugin_->Init(model_path, config);
+    if (ret == STATUS_SUCCESS) {
       model_state_ = MODEL_STATE_ENCRYPT;
     } else {
       MBLOG_ERROR << "drivers Init Error";
-      return STATUS_FAULT;
+      return ret;
     }
   } else {
     model_state_ = MODEL_STATE_PLAIN;
@@ -134,13 +142,15 @@ uint8_t* ModelDecryption::GetModelBuffer(int64_t& model_len) {
   model_len = 0;
   if (model_state_ == MODEL_STATE_ERROR) {
     MBLOG_ERROR << "model_state is error";
+    modelbox::StatusError = {modelbox::STATUS_INVALID, "model_state is error"};
     return nullptr;
   }
 
   // tensorflow TF_Buffer seems a c-style code, here use std::malloc
   uint8_t* model_buf = static_cast<uint8_t*>(malloc(fsize_));
   if (!model_buf) {
     MBLOG_ERROR << "memory alloc fail with size =." << fsize_;
+    modelbox::StatusError = {modelbox::STATUS_NOMEM, "Read file fail."};
     return nullptr;
   }
 
@@ -149,6 +159,7 @@ uint8_t* ModelDecryption::GetModelBuffer(int64_t& model_len) {
   if (fmodel_.gcount() != fsize_) {
     MBLOG_ERROR << "Read file fail.";
     free(model_buf);
+    modelbox::StatusError = {modelbox::STATUS_INVALID, "Read file fail."};
     return nullptr;
   }
 
@@ -163,6 +174,7 @@ uint8_t* ModelDecryption::GetModelBuffer(int64_t& model_len) {
       MBLOG_ERROR << "ModelDecrypt fail.";
       model_len = 0;
       free(plain_buf);
+      modelbox::StatusError = {ret, "ModelDecrypt fail."};
       return nullptr;
     }
     model_len = plain_len;

src/drivers/common/flowunit/inference/model_decrypt.cc

@@ -129,7 +129,7 @@ modelbox::Status MindSporeInference::CheckMindSporeIO(
   if (ret != modelbox::STATUS_OK) {
     auto err_msg = "check ms input failed " + ret.WrapErrormsgs();
     MBLOG_ERROR << err_msg;
-    return {modelbox::STATUS_BADCONF, err_msg};
+    return ret;
   }
 
   auto output_tensor = model_->GetOutputs();
@@ -138,7 +138,7 @@ modelbox::Status MindSporeInference::CheckMindSporeIO(
   if (ret != modelbox::STATUS_OK) {
     auto err_msg = "check ms output failed " + ret.WrapErrormsgs();
     MBLOG_ERROR << err_msg;
-    return {modelbox::STATUS_BADCONF, err_msg};
+    return ret;
   }
 
   return modelbox::STATUS_OK;
@@ -158,24 +158,25 @@ modelbox::Status MindSporeInference::Init(
   if (ret != modelbox::STATUS_OK) {
     auto err_msg = "get model type failed " + ret.WrapErrormsgs();
     MBLOG_ERROR << err_msg;
-    return {modelbox::STATUS_BADCONF, err_msg};
+    return ret;
   }
 
   mindspore::Graph graph(nullptr);
   mindspore::Status ms_status{mindspore::kSuccess};
   ModelDecryption model_decrypt;
-  if (modelbox::STATUS_SUCCESS !=
-      model_decrypt.Init(model_entry, drivers_ptr, config)) {
-    return {modelbox::STATUS_FAULT, "init model fail"};
+  ret = model_decrypt.Init(model_entry, drivers_ptr, config);
+  if (ret != modelbox::STATUS_SUCCESS) {
+    return {ret, "init model fail"};
   }
 
   if (model_decrypt.GetModelState() == ModelDecryption::MODEL_STATE_ENCRYPT) {
     int64_t model_len = 0;
     std::shared_ptr<uint8_t> modelBuf =
         model_decrypt.GetModelSharedBuffer(model_len);
     if (!modelBuf) {
-      return {modelbox::STATUS_FAULT, "Decrypt model fail"};
+      return {modelbox::StatusError, "Decrypt model fail"};
     }
+
     ms_status = mindspore::Serialization::Load((const void *)modelBuf.get(),
                                                (size_t)model_len,
                                                mindspore_type, &graph);

src/drivers/inference_engine/mindspore/mindspore_inference.cc

@@ -749,7 +749,7 @@ Status Graph::OpenNodes() {
 
     auto ret = fut.get();
     if (!ret) {
-      return Status(ret, msg);
+      return ret;
     }
   }
 

src/libmodelbox/engine/graph.cc

@@ -398,7 +398,6 @@ void ModelboxPlugin::HandlerPut(const httplib::Request& request,
     if (modelbox::JobStatus::JOB_STATUS_NOTEXIST !=
         jobmanager_.QueryJobStatus(jobid)) {
       error_code = "MODELBOX_005";
-      error_msg = ERROR_INFO[error_code];
       return;
     }