Merge pull request #648 from MolSSI/svc_fix

Service errors should always be compute errors

qcfractal/server.py

@@ -10,6 +10,7 @@
 import traceback
 from concurrent.futures import ThreadPoolExecutor
 from typing import Any, Dict, List, Optional, Union
+from qcelemental.models import ComputeError
 
 import tornado.ioloop
 import tornado.log
@@ -531,7 +532,7 @@ def update_services(self) -> int:
                 error_message = "FractalServer Service Build and Iterate Error:\n{}".format(traceback.format_exc())
                 self.logger.error(error_message)
                 service.status = "ERROR"
-                service.error = {"error_type": "iteration_error", "error_message": error_message}
+                service.error = ComputeError(error_type="iteration_error", error_message=error_message)
                 finished = False
 
             self.storage.update_services([service])
@@ -549,6 +550,8 @@ def update_services(self) -> int:
         if len(completed_services):
             self.logger.info(f"Completed {len(completed_services)} services.")
 
+        self.logger.debug(f"Done updating services.")
+
         # Add new procedures and services
         self.storage.services_completed(completed_services)
 

qcfractal/storage_sockets/sqlalchemy_socket.py

@@ -1958,7 +1958,7 @@ def update_services(self, records_list: List["BaseService"]) -> int:
                 stdout_id = self.add_kvstore([stdout])["data"][0]
                 procedure.__dict__["stdout"] = stdout_id
             if service.error:
-                error = KVStore(data=service.error)
+                error = KVStore(data=service.error.dict())
                 error_id = self.add_kvstore([error])["data"][0]
                 procedure.__dict__["error"] = error_id