OAProc: fix non JSON outputs (#2311)

Author: tomkralidis

pygeoapi/api/processes.py

@@ -327,27 +327,12 @@ def get_jobs(api: API, request: APIRequest,
             job_result_url = f"{api.base_url}/jobs/{job_['identifier']}/results"  # noqa
 
             job2['links'] = [{
-                'href': f'{job_result_url}?f={F_HTML}',
+                'href': job_result_url,
                 'rel': 'http://www.opengis.net/def/rel/ogc/1.0/results',
-                'type': FORMAT_TYPES[F_HTML],
-                'title': l10n.translate(f'Results of job as HTML', request.locale),  # noqa
-            }, {
-                'href': f'{job_result_url}?f={F_JSON}',
-                'rel': 'http://www.opengis.net/def/rel/ogc/1.0/results',
-                'type': FORMAT_TYPES[F_JSON],
-                'title': l10n.translate(f'Results of job as JSON', request.locale),  # noqa
+                'type': job_['mimetype'],
+                'title': f"Results of job {job_id} as {job_['mimetype']}"
             }]
 
-            if job_['mimetype'] not in (FORMAT_TYPES[F_JSON],
-                                        FORMAT_TYPES[F_HTML]):
-
-                job2['links'].append({
-                    'href': job_result_url,
-                    'rel': 'http://www.opengis.net/def/rel/ogc/1.0/results',  # noqa
-                    'type': job_['mimetype'],
-                    'title': f"Results of job {job_id} as {job_['mimetype']}"  # noqa
-                })
-
         serialized_jobs['jobs'].append(job2)
 
     serialized_query_params = ''
@@ -528,7 +513,10 @@ def execute_process(api: API, request: APIRequest,
             pretty_print_ = False
         response2 = to_json(response, pretty_print_)
     else:
+        pretty_print_ = False
         response2 = response
+        if isinstance(response, (list, dict)):
+            response2 = to_json(response, pretty_print_)
 
     if (headers.get('Preference-Applied', '') == RequestedProcessExecutionMode.respond_async.value):  # noqa
         LOGGER.debug('Asynchronous mode detected, returning statusInfo')

pygeoapi/process/hello_world.py

@@ -94,6 +94,17 @@
             'minOccurs': 0,
             'maxOccurs': 1,
             'keywords': ['as_bytes']
+        },
+        'media_type': {
+            'title': 'Media type',
+            'description': 'Force a specific media type',
+            'schema': {
+                'type': 'string',
+                'default': 'application/json'
+            },
+            'minOccurs': 0,
+            'maxOccurs': 1,
+            'keywords': ['media_type']
         }
     },
     'outputs': {
@@ -132,7 +143,7 @@ def __init__(self, processor_def):
         self.supports_outputs = True
 
     def execute(self, data, outputs=None):
-        mimetype = 'application/json'
+        mimetype = data.get('media_type', 'application/json')
         name = data.get('name')
 
         if name is None:

tests/api/test_processes.py

@@ -95,7 +95,7 @@ def test_describe_processes(config, api_):
     assert process['title'] == 'Hello World'
     assert len(process['keywords']) == 3
     assert len(process['links']) == 6
-    assert len(process['inputs']) == 3
+    assert len(process['inputs']) == 4
     assert len(process['outputs']) == 1
     assert len(process['outputTransmission']) == 1
     assert len(process['jobControlOptions']) == 2
@@ -248,6 +248,12 @@ def test_execute_process(config, api_):
             'as_bytes': True
         }
     }
+    req_body_11 = {
+        'inputs': {
+            'name': 'Test document as text/plain media type',
+            'media_type': 'text/plain'
+        }
+    }
 
     cleanup_jobs = set()
 
@@ -422,6 +428,13 @@ def test_execute_process(config, api_):
     response2 = '{"id":"echo","value":"Hello Test document as bytes response!"}'  # noqa
     assert response == response2
 
+    req = mock_api_request(data=req_body_11)
+    rsp_headers, code, response = execute_process(api_, req, 'hello-world')
+
+    assert rsp_headers['Content-Type'] == 'text/plain'
+    response2 = '{"id":"echo","value":"Hello Test document as text/plain media type!"}'  # noqa
+    assert response == response2
+
     # Cleanup
     time.sleep(2)  # Allow time for any outstanding async jobs
     for _, job_id in cleanup_jobs: