Merge pull request #33 from FAIRDataPipeline/dev

Dev

Author: RyanJField

.github/workflows/test_with_simple_model.yaml

@@ -44,9 +44,9 @@ jobs:
           pip3 install fair-cli
           cmake -Bbuild -DCPPDATAPIPELINEREF="heads/${GITHUB_REF/refs\/heads\//}"
           cmake --build build
-          fair init --ci
-          fair pull data/seirs_config.yaml
-          fair run data/seirs_config.yaml          
+          fair init --ci --local
+          fair pull --local data/seirs_config.yaml
+          fair run --local data/seirs_config.yaml          
         if: startsWith(github.ref, 'refs/tags/') != true
       - name: Build and run seirs example on tagged release
         run: |
@@ -56,7 +56,7 @@ jobs:
           pip3 install fair-cli
           cmake -Bbuild -DCPPDATAPIPELINEREF="tags/${GITHUB_REF/refs\/tags\//}"
           cmake --build build
-          fair init --ci
-          fair pull data/seirs_config.yaml
-          fair run data/seirs_config.yaml          
+          fair init --ci --local
+          fair pull --local data/seirs_config.yaml
+          fair run --local data/seirs_config.yaml          
         if: startsWith(github.ref, 'refs/tags/')

include/fdp/registry/api.hxx

@@ -104,6 +104,8 @@ public:
 
   Json::Value post_storage_root(Json::Value &post_data, const std::string &token);
 
+  Json::Value post_file_type(Json::Value &post_data, const std::string &token);
+
   Json::Value get_by_json_query(const std::string &addr_path,
                                   Json::Value &query_data,
                                   long expected_response = 200,

src/objects/config.cxx

@@ -267,7 +267,7 @@ void FairDataPipeline::Config::initialise(RESTAPI api_location) {
   Json::Value  config_file_type_value;
   config_file_type_value["name"] = "yaml";
   config_file_type_value["extension"] = "yaml";
-  Json::Value config_file_type_url_ = api_->post("file_type", config_file_type_value, token_)["url"];
+  Json::Value config_file_type_url_ = api_->post_file_type(config_file_type_value, token_)["url"];
 
   config_value_["file_type"] = config_file_type_url_;
 
@@ -304,7 +304,7 @@ void FairDataPipeline::Config::initialise(RESTAPI api_location) {
   Json::Value script_file_type_value_;
   script_file_type_value_["name"] = "C++ Submission Script" + script_file_path_.extension().string();
   script_file_type_value_["extension"] = script_file_path_.extension().string();
-  Json::Value script_file_type_url_ = api_->post("file_type", script_file_type_value_, token_)["url"];
+  Json::Value script_file_type_url_ = api_->post_file_type(script_file_type_value_, token_)["url"];
 
   Json::Value script_value_;
   script_value_["description"] = "Working script location in datastore";
@@ -667,7 +667,7 @@ void FairDataPipeline::Config::finalise(){
       Json::Value filetypeData;
       filetypeData["name"] = extension;
       filetypeData["extension"] = extension;
-      ApiObject::sptr filetypeObj = ApiObject::from_json(api_->post("file_type", filetypeData, token_));
+      ApiObject::sptr filetypeObj = ApiObject::from_json(api_->post_file_type(filetypeData, token_));
 
       Json::Value namespaceData;
       namespaceData["name"] = currentWrite.get_use_namespace();

src/registry/api.cxx

@@ -217,6 +217,21 @@ Json::Value API::post_storage_root(Json::Value &post_data, const std::string &to
   return API::post_patch_request("storage_root", post_data, token, 201, false);
 }
 
+Json::Value API::post_file_type(Json::Value &post_data, const std::string &token){
+  if (!post_data["name"]){
+    logger::get_logger()->error() << "Error: Post Data does not contain a file extension";
+    throw rest_apiquery_error("Failed to post file_type");
+  }
+  post_data["name"] = boost::regex_replace(post_data["name"].asString(), boost::regex("."), "");
+  Json::Value _file_type_query;
+  _file_type_query["name"] = post_data["name"];
+  Json::Value _file_type_exists = get_by_json_query("file_type", _file_type_query);
+  if (_file_type_exists) {
+    return _file_type_exists[0];
+  }
+  return post("file_type", post_data, token);
+}
+
 Json::Value API::patch(std::string addr_path, Json::Value &post_data,
                        const std::string &token, long expected_response) {
   return API::post_patch_request(addr_path, post_data, token, expected_response, true);