Boverhof.user plugins backend.2023.03.09 (#1137)

* Replace time.process_time() with time.time()

* Exception handling

* Backend updates for user plugins

* If setttings bad throw runtime error

* code improvements

* foqus-user-plugin app support

* user plugin support

* catch foqusException from run_foqus

* Ran Black

* Lower base the application names for comparison

(cherry picked from commit a022cd9)

cloud/aws/node/put-simulation-input/index.js

@@ -121,6 +121,7 @@ exports.handler = function(event, context, callback) {
         return;
       }
       if (obj.filetype == "sinterconfig" && obj.aspenfile != undefined) {
+        log(`configuration - sinterconfig v0.1:  model=${obj.aspenfile}`);
         if (obj.aspenfile.endsWith('.acmf'))
           params.Key = user_name + "/" + name + "/acm_sinter.json";
         else if (obj.aspenfile.endsWith('.bkp'))
@@ -132,6 +133,7 @@ exports.handler = function(event, context, callback) {
         }
       }
       else if (obj.filetype == "sinterconfig" && obj["config-version"] == "0.2") {
+        log(`configuration - sinterconfig v0.2:  model=${obj.model.file} application=${app_name}`);
         if (obj.model.file.endsWith('.acmf'))
           params.Key = user_name + "/" + name + "/acm_sinter.json";
         else if (obj.model.file.endsWith('.bkp'))
@@ -143,7 +145,12 @@ exports.handler = function(event, context, callback) {
         }
       }
       else if (obj.filetype == "sinterconfig" && obj["filetype-version"] == "0.3") {
-        if (obj.model.file.endsWith('.acmf') && obj.application.name == "Aspen Custom Modeler")
+        var app_name = obj.application.name;
+        app_name = app_name.toLowerCase();
+        log(`configuration - sinterconfig v0.3:  model=${obj.model.file} application=${app_name}`);
+        if (obj.model.file.endsWith('.py') && app_name == "foqus-user-plugin")
+          params.Key = user_name + "/" + name + "/" + app_name + ".json";
+        else if (obj.model.file.endsWith('.acmf') && app_name == "aspen custom modeler")
           params.Key = user_name + "/" + name + "/acm_sinter.json";
         else if (obj.model.file.endsWith('.bkp'))
           params.Key = user_name + "/" + name + "/aspenplus_sinter.json";
@@ -154,6 +161,7 @@ exports.handler = function(event, context, callback) {
         }
       }
       else if (obj.filetype == "FOQUS_Session" || obj.Type == "FOQUS_Session") {
+        log(`configuration - foqus session:  filetype=${obj.filetype} application=${obj.Type}`);
         params.Key = user_name + "/" + name + "/session.foqus";
       }
       else {

cloud/aws/node/put-simulation-name/index.js

@@ -66,7 +66,9 @@ exports.handler = function(event, context, callback) {
       config_filename = "aspenplus_sinter.json";
     } else if (app == "fake-job") {
       config_filename = "fake-job.json";
-    }else {
+    } else if (app == "foqus-user-plugin") {
+      config_filename = "foqus-user-plugin.json";
+    } else {
         done(new Error(`Unsupported application "${event.body}"`));
         return;
     }

foqus_lib/service/flowsheet.py

@@ -946,6 +946,16 @@ def _run(self):
             self._delete_sqs_job()
             try:
                 self.run_foqus(db, job_desc)
+            except foqusException as ex:
+                _log.exception("run_foqus foqusException")
+                self.increment_metric_job_finished(event="error.job.run")
+                msg = traceback.format_exc()
+                db.job_change_status(job_desc, "error", message=msg)
+                db.add_message(
+                    "job failed in setup: %r" % (ex), job_desc["Id"], exception=msg
+                )
+                self.close()
+                raise
             except Exception as ex:
                 _log.exception("run_foqus Exception")
                 self.increment_metric_job_finished(event="error.job.run")