Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix invalid supported UOMs description #686

Merged
merged 2 commits into from
Oct 30, 2023
Merged

fix invalid supported UOMs description #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a209784
fix process description literal UOMs reporting duplicates of the firs…
fmigneault Oct 28, 2023
73ae6d9
properly handle optional reference in UOM
fmigneault Oct 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pywps/inout/basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def __init__(self, uom='', reference=None):
self.reference = reference

if self.reference is None:
self.reference = OGCUNIT[self.uom]
self.reference = OGCUNIT.get(self.uom, '')

@property
def json(self):
Expand Down
4 changes: 2 additions & 2 deletions pywps/templates/1.0.0/describe/literal.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
{% if put.uom %}
<UOMs>
<Default>
<ows:UOM {%if put.uom %}ows:reference="{{ put.uom.reference }}"{% endif %}>{{ put.uom.uom }}</ows:UOM>
<ows:UOM {%if put.uom.reference %}ows:reference="{{ put.uom.reference }}"{% endif %}>{{ put.uom.uom }}</ows:UOM>
</Default>
<Supported>
{% for uom in put.uoms %}
<ows:UOM ows:reference="{{ put.uom.reference }}">{{ put.uom.uom }}</ows:UOM>
<ows:UOM {%if uom.reference %}ows:reference="{{ uom.reference }}"{% endif %}>{{ uom.uom }}</ows:UOM>
{% endfor %}
</Supported>
</UOMs>
Expand Down
60 changes: 55 additions & 5 deletions tests/test_describe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from pywps import LiteralOutput, ComplexOutput, BoundingBoxOutput
from pywps import get_ElementMakerForVersion, OGCTYPE, Format, NAMESPACES, OGCUNIT
from pywps.inout.literaltypes import LITERAL_DATA_TYPES
from pywps.inout.basic import UOM
from pywps.app.basic import get_xpath_ns
from pywps.app.Common import Metadata
from pywps.inout.literaltypes import AllowedValue
Expand Down Expand Up @@ -38,6 +39,25 @@ def get_default_value(el):
return default


def get_single_uom(el):
ows = el.nsmap["ows"]
unit = el.text
href = el.attrib.get(f"{{{ows}}}reference")
return {"uom": unit, "reference": href}


def get_supported_uoms(el):
uoms = xpath_ns(el, './UOMs')
if not uoms:
return None
uom_default = xpath_ns(uoms[0], './Default')[0]
uom_support = xpath_ns(uoms[0], './Supported')[0]
return {
"default": get_single_uom(xpath_ns(uom_default, './ows:UOM')[0]),
"supported": [get_single_uom(uom) for uom in xpath_ns(uom_support, './ows:UOM')]
}


xpath_ns = get_xpath_ns("1.0.0")


Expand All @@ -61,7 +81,8 @@ def get_describe_result(resp):
[data_type_el] = xpath_ns(literal_data_el, './ows:DataType')
default = get_default_value(literal_data_el)
data_type = get_data_type(data_type_el)
inputs.append((input_identifier, 'literal', data_type, default))
uoms = get_supported_uoms(literal_data_el)
inputs.append((input_identifier, 'literal', data_type, default, uoms))
elif complex_data_el_list:
[complex_data_el] = complex_data_el_list
formats = []
Expand Down Expand Up @@ -244,7 +265,7 @@ def hello(request):
Metadata('process metadata 2', 'http://example.org/2')]
)
result = self.describe_process(hello_process)
assert result.inputs == [('the_name', 'literal', 'string', None)]
assert result.inputs == [('the_name', 'literal', 'string', None, None)]
assert result.metadata == ['process metadata 1', 'process metadata 2']

def test_one_literal_integer_input(self):
Expand All @@ -256,7 +277,33 @@ def hello(request):
'Input number',
data_type='positiveInteger')])
result = self.describe_process(hello_process)
assert result.inputs == [('the_number', 'literal', 'positiveInteger', None)]
assert result.inputs == [('the_number', 'literal', 'positiveInteger', None, None)]

def test_multi_uoms_literal_float_input(self):
def hello(request):
pass
hello_process = Process(hello, 'hello',
'Process Hello',
inputs=[LiteralInput('the_number',
'Input number',
data_type='float',
uoms=[
'metre',
'feet',
'undef',
UOM('pixel', 'http://schema.com/#pixel'),
])])
result = self.describe_process(hello_process)
uoms = {
'default': {'uom': 'metre', 'reference': OGCUNIT['metre']},
'supported': [
{'uom': 'metre', 'reference': OGCUNIT['metre']},
{'uom': 'feet', 'reference': OGCUNIT['feet']},
{'uom': 'undef', 'reference': None}, # no mapping to known OGC URN
{'uom': 'pixel', 'reference': 'http://schema.com/#pixel'},
]
}
assert result.inputs == [('the_number', 'literal', 'float', None, uoms)]

def test_one_literal_integer_default_zero(self):
def hello(request):
Expand All @@ -268,7 +315,7 @@ def hello(request):
data_type='integer',
default=0)])
result = self.describe_process(hello_process)
assert result.inputs == [('the_number', 'literal', 'integer', "0")]
assert result.inputs == [('the_number', 'literal', 'integer', "0", None)]


class InputDescriptionTest(unittest.TestCase):
Expand All @@ -287,7 +334,7 @@ def test_literal_allowed_values_input(self):
'foo',
'Foo',
data_type='integer',
uoms=['metre'],
uoms=['metre', 'feet'],
allowed_values=(
1, 2, (5, 10), (12, 4, 24),
AllowedValue(
Expand All @@ -301,6 +348,9 @@ def test_literal_allowed_values_input(self):
assert len(data["allowed_values"]) == 5
assert data["allowed_values"][0]["value"] == 1
assert data["allowed_values"][0]["range_closure"] == "closed"
assert data["uom"] == {"uom": "metre", "reference": OGCUNIT["metre"]}
assert data["uoms"][0] == {"uom": "metre", "reference": OGCUNIT["metre"]}
assert data["uoms"][1] == {"uom": "feet", "reference": OGCUNIT["feet"]}

def test_complex_input_identifier(self):
complex_in = ComplexInput('foo', 'Complex foo', keywords=['kw1', 'kw2'], supported_formats=[Format('bar/baz')])
Expand Down
Loading