fix(api): re-add parameters in info call

jolibrain · Mar 3, 2023 · df318cb · df318cb
1 parent b562fee
commit df318cb
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/src/dto/info.hpp b/src/dto/info.hpp
@@ -28,6 +28,7 @@
 
 #include "common.hpp"
 #include "ddtypes.hpp"
+#include "parameters.hpp"
 
 namespace dd
 {
@@ -96,6 +97,7 @@ namespace dd
       DTO_FIELD(String, description);
       DTO_FIELD(String, mllib);
       DTO_FIELD(String, mltype);
+      DTO_FIELD(Object<Parameters>, parameters);
 
       DTO_FIELD_INFO(type)
       {

diff --git a/src/mlservice.h b/src/mlservice.h
@@ -209,10 +209,12 @@ namespace dd
         serv_dto->type = "unsupervised";
       else
         serv_dto->type = "supervised";
+      serv_dto->repository = this->_inputc._model_repo;
+      serv_dto->parameters
+          = _init_parameters.createSharedDTO<DTO::Parameters>();
 
       if (this->_has_predict)
         {
-          serv_dto->repository = this->_inputc._model_repo;
           serv_dto->width = this->_inputc.width();
           serv_dto->height = this->_inputc.height();
         }

diff --git a/src/utils/oatpp.cc b/src/utils/oatpp.cc
@@ -182,6 +182,15 @@ namespace dd
           jval = JVal(rapidjson::kObjectType);
           dto_ad->toJVal(jdoc, jval);
         }
+      else if (polymorph.getValueType() == DTO::GpuIds::Class::getType())
+        {
+          auto dto_gpuid = polymorph.cast<DTO::GpuIds>();
+          jval = JVal(rapidjson::kArrayType);
+          for (size_t i = 0; i < dto_gpuid->_ids.size(); ++i)
+            {
+              jval.PushBack(dto_gpuid->_ids[i], jdoc.GetAllocator());
+            }
+        }
       else if (polymorph.getValueType()->classId.id
                    == oatpp::data::mapping::type::__class::AbstractVector::
                           CLASS_ID.id

diff --git a/tests/ut-oatpp.cc b/tests/ut-oatpp.cc
@@ -93,6 +93,12 @@ void test_services(std::shared_ptr<DedeApiTestClient> client)
   ASSERT_TRUE(d["body"].HasMember("jobs"));
   ASSERT_TRUE(d["body"].HasMember("model_stats"));
   ASSERT_TRUE(d["body"]["model_stats"]["params"].GetInt() == 11177538);
+  ASSERT_TRUE(d["body"].HasMember("parameters"));
+  ASSERT_TRUE(d["body"]["parameters"].HasMember("input"));
+  ASSERT_TRUE(d["body"]["parameters"].HasMember("mllib"));
+  ASSERT_TRUE(d["body"]["parameters"].HasMember("output"));
+  ASSERT_EQ(d["body"]["parameters"]["input"]["connector"].GetString(),
+            std::string("image"));
 
   // info call
   response = client->get_info();