Merge pull request #312 from elemoine/fix-stored

Fix execution of stored jobs

Author: ldesousa

pywps/app/Process.py

@@ -66,6 +66,7 @@ def __init__(self, handler, identifier, title, abstract='', keywords=[], profile
         self.workdir = None
         self._grass_mapset = None
         self.grass_location = grass_location
+        self.service = None
 
         if store_supported:
             self.store_supported = 'true'
@@ -290,12 +291,14 @@ def _run_process(self, wps_request, wps_response):
                     request_json = request_json.decode('utf-8')
                 new_wps_request = WPSRequest()
                 new_wps_request.json = json.loads(request_json)
+                process_identifier = new_wps_request.identifier
+                process = self.service.prepare_process_for_execution(process_identifier)
+                process._set_uuid(uuid)
+                process.async = True
                 response_cls = get_response("execute")
-
-                new_wps_response = response_cls(new_wps_request, process=self, uuid=uuid)
+                new_wps_response = response_cls(new_wps_request, process=process, uuid=uuid)
                 new_wps_response.status = STATUS.STORE_AND_UPDATE_STATUS
-                self._set_uuid(uuid)
-                self._run_async(new_wps_request, new_wps_response)
+                process._run_async(new_wps_request, new_wps_response)
                 dblog.remove_stored(uuid)
             except Exception as e:
                 LOGGER.error("Could not run stored process. %s", e)

pywps/app/Service.py

@@ -79,21 +79,25 @@ def execute(self, identifier, wps_request, uuid):
         :param uuid: string identifier of the request
         """
         self._set_grass()
+        process = self.prepare_process_for_execution(identifier)
+        return self._parse_and_execute(process, wps_request, uuid)
+
+    def prepare_process_for_execution(self, identifier):
+        """Prepare the process identified by ``identifier`` for execution.
+        """
         try:
             process = self.processes[identifier]
-
-            # make deep copy of the process instace
-            # so that processes are not overriding each other
-            # just for execute
-            process = copy.deepcopy(process)
-
-            workdir = os.path.abspath(config.get_config_value('server', 'workdir'))
-            tempdir = tempfile.mkdtemp(prefix='pywps_process_', dir=workdir)
-            process.set_workdir(tempdir)
         except KeyError:
             raise InvalidParameterValue("Unknown process '%r'" % identifier, 'Identifier')
-
-        return self._parse_and_execute(process, wps_request, uuid)
+        # make deep copy of the process instace
+        # so that processes are not overriding each other
+        # just for execute
+        process = copy.deepcopy(process)
+        process.service = self
+        workdir = os.path.abspath(config.get_config_value('server', 'workdir'))
+        tempdir = tempfile.mkdtemp(prefix='pywps_process_', dir=workdir)
+        process.set_workdir(tempdir)
+        return process
 
     def _parse_and_execute(self, process, wps_request, uuid):
         """Parse and execute request

pywps/app/WPSRequest.py

@@ -36,6 +36,7 @@ def __init__(self, http_request=None):
         self.operation = None
         self.version = None
         self.language = None
+        self.identifier = None
         self.identifiers = None
         self.store_execute = None
         self.status = None
@@ -316,6 +317,7 @@ def default(self, obj):
             'operation': self.operation,
             'version': self.version,
             'language': self.language,
+            'identifier': self.identifier,
             'identifiers': self.identifiers,
             'store_execute': self.store_execute,
             'status': self.status,
@@ -337,6 +339,7 @@ def json(self, value):
         self.operation = value['operation']
         self.version = value['version']
         self.language = value['language']
+        self.identifier = value['identifier']
         self.identifiers = value['identifiers']
         self.store_execute = value['store_execute']
         self.status = value['status']