From 161cf9ccfd307fa33d7c7d14d414d903ae871808 Mon Sep 17 00:00:00 2001 From: Francis Charette-Migneault Date: Tue, 15 Mar 2022 15:47:52 -0400 Subject: [PATCH] adjust conformance prefer return none (relates to #414) --- .../json/opensearch_describe_process.json | 2 +- weaver/wps_restapi/api.py | 23 +++++++++++++------ 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/tests/opensearch/json/opensearch_describe_process.json b/tests/opensearch/json/opensearch_describe_process.json index 20709b6cd..aa1f4df5c 100644 --- a/tests/opensearch/json/opensearch_describe_process.json +++ b/tests/opensearch/json/opensearch_describe_process.json @@ -135,7 +135,7 @@ ], "version": "1.0.0", "jobControlOptions": [ - "async" + "async-execute" ], "outputTransmission": [ "reference" diff --git a/weaver/wps_restapi/api.py b/weaver/wps_restapi/api.py index 9c454dc01..97db3c9cd 100644 --- a/weaver/wps_restapi/api.py +++ b/weaver/wps_restapi/api.py @@ -321,23 +321,33 @@ def api_conformance(request): # noqa: F811 # ogcapi_proc_core + "/per/core/process-execute-input-inline-bbox", ogcapi_proc_core + "/per/core/process-execute-sync-job", ogcapi_proc_core + "/per/core/limit-response", + # ogcapi_proc_core + "/per/core/limit-default-minimum-maximum", ogcapi_proc_core + "/per/core/prev", ogcapi_proc_core + "/per/job-list/limit-response", ogcapi_proc_core + "/per/job-list/prev", # ogcapi_proc_core + "/rec/core/access-control-expose-headers", ogcapi_proc_core + "/rec/core/api-definition-oas", ogcapi_proc_core + "/rec/core/cross-origin", + ogcapi_proc_core + "/rec/core/content-length", # ogcapi_proc_core + "/rec/core/html", + # ogcapi_proc_core + "/rec/core/http-head", ogcapi_proc_core + "/rec/core/job-status", + ogcapi_proc_core + "/rec/core/job-results-async-many-json-prefer-none", + # FIXME: https://github.com/crim-ca/weaver/issues/414 + # ogcapi_proc_core + "/rec/core/job-results-async-many-json-prefer-minimal", + # ogcapi_proc_core + "/rec/core/job-results-async-many-json-prefer-representation", + # ogcapi_proc_core + "/per/core/job-results-async-many-other-formats", + ogcapi_proc_core + "/rec/core/process-execute-sync-many-json-prefer-none", + # ogcapi_proc_core + "/rec/core/process-execute-sync-many-json-prefer-minimal", + # ogcapi_proc_core + "/rec/core/process-execute-sync-many-json-prefer-representation", # ogcapi_proc_core + "/rec/core/link-header", ogcapi_proc_core + "/rec/core/ogc-process-description", # FIXME: error details (for all below: https://github.com/crim-ca/weaver/issues/320) # ogcapi_proc_core + "/rec/core/problem-details", - # FIXME: https://github.com/crim-ca/weaver/issues/247 (Prefer header) - # ogcapi_proc_core + "/rec/core/process-execute-handle-prefer", - # ogcapi_proc_core + "/rec/core/process-execute-honor-prefer", - # ogcapi_proc_core + "/rec/core/process-execute-mode-auto", - # ogcapi_proc_core + "/rec/core/process-execute-preference-applied", + ogcapi_proc_core + "/rec/core/process-execute-handle-prefer", + ogcapi_proc_core + "/rec/core/process-execute-honor-prefer", + ogcapi_proc_core + "/rec/core/process-execute-mode-auto", + ogcapi_proc_core + "/rec/core/process-execute-preference-applied", ogcapi_proc_core + "/rec/core/process-execute-sync-document-ref", ogcapi_proc_core + "/rec/core/next-1", ogcapi_proc_core + "/rec/core/next-2", @@ -382,8 +392,7 @@ def api_conformance(request): # noqa: F811 ogcapi_proc_core + "/req/core/process", ogcapi_proc_core + "/req/core/process-success", ogcapi_proc_core + "/req/core/process-exception/no-such-process", - # FIXME: https://github.com/crim-ca/weaver/issues/247 (Prefer header) - # ogcapi_proc_core + "/req/core/process-execute-auto-execution-mode", + ogcapi_proc_core + "/req/core/process-execute-auto-execution-mode", ogcapi_proc_core + "/req/core/process-execute-default-execution-mode", ogcapi_proc_core + "/req/core/process-execute-default-outputs", ogcapi_proc_core + "/req/core/process-execute-input-array",