From 006356771597c8e40b8123a9e8bf16fd031f75ee Mon Sep 17 00:00:00 2001 From: Francis Charette Migneault Date: Fri, 18 Oct 2024 13:59:45 -0400 Subject: [PATCH] update conformance/requirements of DRU as per https://github.com/opengeospatial/ogcapi-processes/pull/444 --- weaver/wps_restapi/api.py | 97 ++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 46 deletions(-) diff --git a/weaver/wps_restapi/api.py b/weaver/wps_restapi/api.py index 1a24077eb..c95bf5c66 100644 --- a/weaver/wps_restapi/api.py +++ b/weaver/wps_restapi/api.py @@ -409,22 +409,22 @@ def get_conformance(category, settings): f"{ogcapi_proc_core}/req/ogc-process-description/output-mixed-type", f"{ogcapi_proc_core}/req/ogc-process-description/outputs-def", f"{ogcapi_proc_part2}/conf/cwl", - f"{ogcapi_proc_part2}/conf/cwl/deploy/body", - f"{ogcapi_proc_part2}/conf/cwl/deploy/response-body", - f"{ogcapi_proc_part2}/conf/cwl/deploy/response", - f"{ogcapi_proc_part2}/conf/cwl/replace/body", - f"{ogcapi_proc_part2}/conf/cwl/replace/response", + f"{ogcapi_proc_part2}/conf/cwl/deploy-body", + f"{ogcapi_proc_part2}/conf/cwl/deploy-response-body", + f"{ogcapi_proc_part2}/conf/cwl/deploy-response", + f"{ogcapi_proc_part2}/conf/cwl/replace-body", + f"{ogcapi_proc_part2}/conf/cwl/replace-response", # FIXME: support 'docker' direct deployment without CWL? # f"{ogcapi_proc_part2}/conf/docker", - # f"{ogcapi_proc_part2}/conf/docker/deploy/body", - # f"{ogcapi_proc_part2}/conf/docker/replace/body", + # f"{ogcapi_proc_part2}/conf/docker/deploy-body", + # f"{ogcapi_proc_part2}/conf/docker/replace-body", f"{ogcapi_proc_part2}/conf/dru", - f"{ogcapi_proc_part2}/conf/dru/deploy/content-type", - f"{ogcapi_proc_part2}/conf/dru/deploy/post-op", - f"{ogcapi_proc_part2}/conf/dru/deploy/unsupported-content-type", - f"{ogcapi_proc_part2}/conf/dru/replace/content-type", - f"{ogcapi_proc_part2}/conf/dru/replace/put-op", - f"{ogcapi_proc_part2}/conf/dru/replace/unsupported-content-type", + f"{ogcapi_proc_part2}/conf/dru/deploy-content-type", + f"{ogcapi_proc_part2}/conf/dru/deploy-post-op", + f"{ogcapi_proc_part2}/conf/dru/deploy-unsupported-content-type", + f"{ogcapi_proc_part2}/conf/dru/replace-content-type", + f"{ogcapi_proc_part2}/conf/dru/replace-put-op", + f"{ogcapi_proc_part2}/conf/dru/replace-unsupported-content-type", f"{ogcapi_proc_part2}/conf/dru/undeploy/delete-op", f"{ogcapi_proc_part2}/conf/dru/undeploy/response-immutable-success", f"{ogcapi_proc_part2}/conf/dru/undeploy/response-immutable", @@ -436,40 +436,44 @@ def get_conformance(category, settings): f"{ogcapi_proc_part2}/conf/dru/test-process", f"{ogcapi_proc_part2}/conf/deploy-replace-undeploy", f"{ogcapi_proc_part2}/conf/ogcapppkg", - f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy/body", - f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy/response", - f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy/response-duplicate", - f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy/response-success", - f"{ogcapi_proc_part2}/conf/ogcapppkg/replace/body", - f"{ogcapi_proc_part2}/conf/ogcapppkg/replace/response", + f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy-body", + f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy-response", + f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy-response-duplicate", + f"{ogcapi_proc_part2}/conf/ogcapppkg/deploy-response-success", + f"{ogcapi_proc_part2}/conf/ogcapppkg/replace-body", + f"{ogcapi_proc_part2}/conf/ogcapppkg/replace-response", f"{ogcapi_proc_part2}/req/cwl", f"{ogcapi_proc_part2}/req/cwl/execution-unit", - f"{ogcapi_proc_part2}/req/cwl/deploy/body", + f"{ogcapi_proc_part2}/req/cwl/deploy-body", # FIXME: multi-CWL $graph (class: Workflow), must allow section of 1 with 'w' query param # (https://github.com/crim-ca/weaver/issues/739) - # f"{ogcapi_proc_part2}/req/cwl/deploy/w-param", - # f"{ogcapi_proc_part2}/req/cwl/deploy/exception-workflow-not-found", - f"{ogcapi_proc_part2}/req/cwl/package/response-body", - f"{ogcapi_proc_part2}/req/cwl/replace/body", - f"{ogcapi_proc_part2}/per/deploy-replace-undeploy/replace/body", - f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/deploy/body-ogcapppkg", - f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/replace/body-ogcapppkg", + # f"{ogcapi_proc_part2}/req/cwl/deploy-w-param", + # f"{ogcapi_proc_part2}/req/cwl/deploy-exception-workflow-not-found", + f"{ogcapi_proc_part2}/req/cwl/package-response-body", + f"{ogcapi_proc_part2}/req/cwl/replace-body", + f"{ogcapi_proc_part2}/per/deploy-replace-undeploy/additional-status-codes", + f"{ogcapi_proc_part2}/per/deploy-replace-undeploy/replace-body", + f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/deploy-body-ogcapppkg", + f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/package-response-cwl", + # FIXME: support 'application/ogcapppkg+json' as alternate Accept header + # f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/package-response-ogcapppkg", + f"{ogcapi_proc_part2}/rec/deploy-replace-undeploy/replace-body-ogcapppkg", f"{ogcapi_proc_part2}/req/deploy-replace-undeploy", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/body", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/content-type", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/post-op", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/response-body", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/response-pid", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/response", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy/unsupported-content-type", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package/get-op", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package/response-body", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package/response-success", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace/body", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace/content-type", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace/put-op", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace/response", - f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace/unsupported-content-type", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-body", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-content-type", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-post-op", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-response-body", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-response-pid", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-response", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/deploy-unsupported-content-type", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package-get-op", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package-response-body", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/package-response-success", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace-body", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace-content-type", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace-put-op", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace-response", + f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/replace-unsupported-content-type", f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/static/indicator", f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/undeploy/delete-op", f"{ogcapi_proc_part2}/req/deploy-replace-undeploy/undeploy/response", @@ -477,12 +481,13 @@ def get_conformance(category, settings): f"{ogcapi_proc_part2}/req/dru/mutable-process", f"{ogcapi_proc_part2}/req/dru/test-process", f"{ogcapi_proc_part2}/req/ogcapppkg", - f"{ogcapi_proc_part2}/req/ogcapppkg/deploy/body", - f"{ogcapi_proc_part2}/req/ogcapppkg/execution-unit-docker", - f"{ogcapi_proc_part2}/req/ogcapppkg/package/response-body", + f"{ogcapi_proc_part2}/req/ogcapppkg/deploy-body", + # FIXME: support 'docker' direct deployment without CWL? + # f"{ogcapi_proc_part2}/req/ogcapppkg/execution-unit-docker", + f"{ogcapi_proc_part2}/req/ogcapppkg/package-response-body", f"{ogcapi_proc_part2}/req/ogcapppkg/process-description", f"{ogcapi_proc_part2}/req/ogcapppkg/profile-docker", - f"{ogcapi_proc_part2}/req/ogcapppkg/replace/body", + f"{ogcapi_proc_part2}/req/ogcapppkg/replace-body", f"{ogcapi_proc_part2}/req/ogcapppkg/schema", # FIXME: below partially, for full Part 3, would need $graph support # (see https://github.com/crim-ca/weaver/issues/56 and below '/conf/app-pck/cwl')