Set as_reference to False for some ComplexOutput (#71)

emu/processes/wps_inout.py

@@ -92,8 +92,8 @@ def __init__(self):
                           data_type='string'),
             ComplexOutput('text', 'Text',
                           abstract='Copy of input text file.',
-                          as_reference=True,
-                          supported_formats=[Format('text/plain')]),
+                          as_reference=False,
+                          supported_formats=[FORMATS.TEXT, ]),
             ComplexOutput('dataset', 'Dataset',
                           abstract='Copy of input netcdf file.',
                           as_reference=True,
@@ -141,7 +141,7 @@ def _handler(request, response):
         # TODO: bbox is not working
         # response.outputs['bbox'].data = request.inputs['bbox'][0].data
         # TODO: how to copy file?
-        response.outputs['text'].data_format = Format('text/plain')
+        response.outputs['text'].data_format = FORMATS.TEXT
         if 'text' in request.inputs:
             response.outputs['text'].file = request.inputs['text'][0].file
         else:

emu/processes/wps_ncmeta.py

@@ -48,8 +48,8 @@ def __init__(self):
         super(NCMeta, self).__init__(
             self._handler,
             identifier='ncmeta',
-            title='Show NetCDF Metadata',
-            abstract="Dataset can be either a NetCDF file or an OpenDAP service.",
+            title='Return NetCDF Metadata',
+            abstract="Return metadata from a netCDF dataset, either on file or an OpenDAP service.",
             version='4',
             metadata=[
                 Metadata('User Guide', 'http://emu.readthedocs.io/en/latest/'),

emu/processes/wps_output_formats.py

@@ -23,7 +23,7 @@ def __init__(self):
                           supported_formats=[FORMATS.NETCDF, ]),
             ComplexOutput('json', 'json dummy output file.',
                           abstract="A very small test json file. ",
-                          as_reference=True,
+                          as_reference=False,
                           supported_formats=[FORMATS.JSON, ]),
         ]
 

environment.yml

@@ -5,7 +5,7 @@ channels:
 - defaults
 dependencies:
 - six
-- pywps>=4.1.22
+- pywps>=4.1.26
 - jinja2
 - click
 - psutil

tests/test_wps_inout.py

@@ -1,17 +1,21 @@
 import pytest
-
+import os
 from pywps import Service
 from pywps.tests import assert_response_success
 
-from .common import client_for
+from .common import client_for, get_output, resource_file
 from emu.processes.wps_inout import InOut
 
+NC_FILE_URL = "file://{}".format(resource_file('test.nc'))
+
 
 def test_wps_inout():
     client = client_for(Service(processes=[InOut()]))
-    datainputs = "string=onetwothree;int=7;float=2.0;boolean=0"
+    datainputs = "string=onetwothree;int=7;float=2.0;boolean=0;text=some string;dataset=@xlink:href={}"
     resp = client.get(
         service='WPS', request='Execute', version='1.0.0', identifier='inout',
-        datainputs=datainputs)
-    print(resp.data)
+        datainputs=datainputs.format(NC_FILE_URL))
     assert_response_success(resp)
+    out = get_output(resp.xml)
+    assert out['text'] == 'some string'
+    assert out['dataset'].endswith('.nc')