Ogc apis fix

.generation/post-process/python.py

@@ -122,22 +122,6 @@ def layers_api_py(file_contents: List[str]) -> Generator[str, None, None]:
 
         yield line
 
-def ogc_xyz_api_py(ogc_api: Literal['wfs', 'wms']) -> Callable[[List[str]], Generator[str, None, None]]:
-    '''Modify the ogc_xyz_api.py file.'''
-    def _ogc_xyz_api_py(file_contents: List[str]) -> Generator[str, None, None]:
-        '''Modify the ogc_wfs_api.py file.'''
-        for line in file_contents:
-            dedented_line = dedent(line)
-            if dedented_line.startswith(f"resource_path='/{ogc_api}/{{workflow}}?request="):
-                line = indent(dedent(f'''\
-                # Note: remove query string in path part for ogc endpoints
-                resource_path='/{ogc_api}/{{workflow}}',
-                '''), 3 * INDENT)
-
-            yield line
-    return _ogc_xyz_api_py
-
-
 def raster_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, None]:
     '''
     Modify the raster_result_descriptor.py file.
@@ -272,8 +256,6 @@ def time_step_py(file_contents: List[str]) -> Generator[str, None, None]:
     'api_client.py': api_client_py,
     'exceptions.py': exceptions_py,
     'layers_api.py': layers_api_py,
-    'ogcwfs_api.py': ogc_xyz_api_py('wfs'),
-    'ogcwms_api.py': ogc_xyz_api_py('wms'),
     'plot_result_descriptor.py': plot_result_descriptor_py,
     'raster_result_descriptor.py': raster_result_descriptor_py,
     'task_status_with_id.py': task_status_with_id_py,

python/.openapi-generator/FILES

@@ -45,7 +45,6 @@ docs/DatasetResource.md
 docs/DatasetsApi.md
 docs/DerivedColor.md
 docs/DerivedNumber.md
-docs/DescribeCoverageRequest.md
 docs/EbvPortalDataProviderDefinition.md
 docs/EdrDataProviderDefinition.md
 docs/EdrVectorSpec.md
@@ -69,15 +68,8 @@ docs/GdalSourceTimePlaceholder.md
 docs/GeneralApi.md
 docs/GeoJson.md
 docs/GeoTransform.md
-docs/GetCapabilitiesFormat.md
-docs/GetCapabilitiesRequest.md
 docs/GetCoverageFormat.md
-docs/GetCoverageRequest.md
-docs/GetFeatureRequest.md
-docs/GetLegendGraphicRequest.md
 docs/GetMapExceptionFormat.md
-docs/GetMapFormat.md
-docs/GetMapRequest.md
 docs/GfbioAbcdDataProviderDefinition.md
 docs/GfbioCollectionsDataProviderDefinition.md
 docs/GridBoundingBox2D.md
@@ -260,11 +252,15 @@ docs/VectorResultDescriptor.md
 docs/Volume.md
 docs/VolumeFileLayersResponse.md
 docs/WcsBoundingbox.md
+docs/WcsRequest.md
 docs/WcsService.md
 docs/WcsVersion.md
+docs/WfsRequest.md
 docs/WfsService.md
 docs/WfsVersion.md
 docs/WildliveDataConnectorDefinition.md
+docs/WmsRequest.md
+docs/WmsResponseFormat.md
 docs/WmsService.md
 docs/WmsVersion.md
 docs/Workflow.md
@@ -334,7 +330,6 @@ geoengine_openapi_client/models/dataset_name_response.py
 geoengine_openapi_client/models/dataset_resource.py
 geoengine_openapi_client/models/derived_color.py
 geoengine_openapi_client/models/derived_number.py
-geoengine_openapi_client/models/describe_coverage_request.py
 geoengine_openapi_client/models/ebv_portal_data_provider_definition.py
 geoengine_openapi_client/models/edr_data_provider_definition.py
 geoengine_openapi_client/models/edr_vector_spec.py
@@ -357,15 +352,8 @@ geoengine_openapi_client/models/gdal_multi_band.py
 geoengine_openapi_client/models/gdal_source_time_placeholder.py
 geoengine_openapi_client/models/geo_json.py
 geoengine_openapi_client/models/geo_transform.py
-geoengine_openapi_client/models/get_capabilities_format.py
-geoengine_openapi_client/models/get_capabilities_request.py
 geoengine_openapi_client/models/get_coverage_format.py
-geoengine_openapi_client/models/get_coverage_request.py
-geoengine_openapi_client/models/get_feature_request.py
-geoengine_openapi_client/models/get_legend_graphic_request.py
 geoengine_openapi_client/models/get_map_exception_format.py
-geoengine_openapi_client/models/get_map_format.py
-geoengine_openapi_client/models/get_map_request.py
 geoengine_openapi_client/models/gfbio_abcd_data_provider_definition.py
 geoengine_openapi_client/models/gfbio_collections_data_provider_definition.py
 geoengine_openapi_client/models/grid_bounding_box2_d.py
@@ -535,11 +523,15 @@ geoengine_openapi_client/models/vector_result_descriptor.py
 geoengine_openapi_client/models/volume.py
 geoengine_openapi_client/models/volume_file_layers_response.py
 geoengine_openapi_client/models/wcs_boundingbox.py
+geoengine_openapi_client/models/wcs_request.py
 geoengine_openapi_client/models/wcs_service.py
 geoengine_openapi_client/models/wcs_version.py
+geoengine_openapi_client/models/wfs_request.py
 geoengine_openapi_client/models/wfs_service.py
 geoengine_openapi_client/models/wfs_version.py
 geoengine_openapi_client/models/wildlive_data_connector_definition.py
+geoengine_openapi_client/models/wms_request.py
+geoengine_openapi_client/models/wms_response_format.py
 geoengine_openapi_client/models/wms_service.py
 geoengine_openapi_client/models/wms_version.py
 geoengine_openapi_client/models/workflow.py
@@ -595,7 +587,6 @@ test/test_dataset_resource.py
 test/test_datasets_api.py
 test/test_derived_color.py
 test/test_derived_number.py
-test/test_describe_coverage_request.py
 test/test_ebv_portal_data_provider_definition.py
 test/test_edr_data_provider_definition.py
 test/test_edr_vector_spec.py
@@ -619,15 +610,8 @@ test/test_gdal_source_time_placeholder.py
 test/test_general_api.py
 test/test_geo_json.py
 test/test_geo_transform.py
-test/test_get_capabilities_format.py
-test/test_get_capabilities_request.py
 test/test_get_coverage_format.py
-test/test_get_coverage_request.py
-test/test_get_feature_request.py
-test/test_get_legend_graphic_request.py
 test/test_get_map_exception_format.py
-test/test_get_map_format.py
-test/test_get_map_request.py
 test/test_gfbio_abcd_data_provider_definition.py
 test/test_gfbio_collections_data_provider_definition.py
 test/test_grid_bounding_box2_d.py
@@ -810,11 +794,15 @@ test/test_vector_result_descriptor.py
 test/test_volume.py
 test/test_volume_file_layers_response.py
 test/test_wcs_boundingbox.py
+test/test_wcs_request.py
 test/test_wcs_service.py
 test/test_wcs_version.py
+test/test_wfs_request.py
 test/test_wfs_service.py
 test/test_wfs_version.py
 test/test_wildlive_data_connector_definition.py
+test/test_wms_request.py
+test/test_wms_response_format.py
 test/test_wms_service.py
 test/test_wms_version.py
 test/test_workflow.py

python/README.md

@@ -135,14 +135,9 @@ Class | Method | HTTP request | Description
 *MLApi* | [**add_ml_model**](docs/MLApi.md#add_ml_model) | **POST** /ml/models | Create a new ml model.
 *MLApi* | [**get_ml_model**](docs/MLApi.md#get_ml_model) | **GET** /ml/models/{model_name} | Get ml model by name.
 *MLApi* | [**list_ml_models**](docs/MLApi.md#list_ml_models) | **GET** /ml/models | List ml models.
-*OGCWCSApi* | [**wcs_capabilities_handler**](docs/OGCWCSApi.md#wcs_capabilities_handler) | **GET** /wcs/{workflow}?request=GetCapabilities | Get WCS Capabilities
-*OGCWCSApi* | [**wcs_describe_coverage_handler**](docs/OGCWCSApi.md#wcs_describe_coverage_handler) | **GET** /wcs/{workflow}?request=DescribeCoverage | Get WCS Coverage Description
-*OGCWCSApi* | [**wcs_get_coverage_handler**](docs/OGCWCSApi.md#wcs_get_coverage_handler) | **GET** /wcs/{workflow}?request=GetCoverage | Get WCS Coverage
-*OGCWFSApi* | [**wfs_capabilities_handler**](docs/OGCWFSApi.md#wfs_capabilities_handler) | **GET** /wfs/{workflow}?request=GetCapabilities | Get WFS Capabilities
-*OGCWFSApi* | [**wfs_feature_handler**](docs/OGCWFSApi.md#wfs_feature_handler) | **GET** /wfs/{workflow}?request=GetFeature | Get WCS Features
-*OGCWMSApi* | [**wms_capabilities_handler**](docs/OGCWMSApi.md#wms_capabilities_handler) | **GET** /wms/{workflow}?request=GetCapabilities | Get WMS Capabilities
-*OGCWMSApi* | [**wms_legend_graphic_handler**](docs/OGCWMSApi.md#wms_legend_graphic_handler) | **GET** /wms/{workflow}?request=GetLegendGraphic | Get WMS Legend Graphic
-*OGCWMSApi* | [**wms_map_handler**](docs/OGCWMSApi.md#wms_map_handler) | **GET** /wms/{workflow}?request=GetMap | Get WMS Map
+*OGCWCSApi* | [**wcs_handler**](docs/OGCWCSApi.md#wcs_handler) | **GET** /wcs/{workflow} | OGC WCS endpoint
+*OGCWFSApi* | [**wfs_handler**](docs/OGCWFSApi.md#wfs_handler) | **GET** /wfs/{workflow} | OGC WFS endpoint
+*OGCWMSApi* | [**wms_handler**](docs/OGCWMSApi.md#wms_handler) | **GET** /wms/{workflow} | OGC WMS endpoint
 *PermissionsApi* | [**add_permission_handler**](docs/PermissionsApi.md#add_permission_handler) | **PUT** /permissions | Adds a new permission.
 *PermissionsApi* | [**get_resource_permissions_handler**](docs/PermissionsApi.md#get_resource_permissions_handler) | **GET** /permissions/resources/{resource_type}/{resource_id} | Lists permission for a given resource.
 *PermissionsApi* | [**remove_permission_handler**](docs/PermissionsApi.md#remove_permission_handler) | **DELETE** /permissions | Removes an existing permission.
@@ -235,7 +230,6 @@ Class | Method | HTTP request | Description
  - [DatasetResource](docs/DatasetResource.md)
  - [DerivedColor](docs/DerivedColor.md)
  - [DerivedNumber](docs/DerivedNumber.md)
- - [DescribeCoverageRequest](docs/DescribeCoverageRequest.md)
  - [EbvPortalDataProviderDefinition](docs/EbvPortalDataProviderDefinition.md)
  - [EdrDataProviderDefinition](docs/EdrDataProviderDefinition.md)
  - [EdrVectorSpec](docs/EdrVectorSpec.md)
@@ -258,15 +252,8 @@ Class | Method | HTTP request | Description
  - [GdalSourceTimePlaceholder](docs/GdalSourceTimePlaceholder.md)
  - [GeoJson](docs/GeoJson.md)
  - [GeoTransform](docs/GeoTransform.md)
- - [GetCapabilitiesFormat](docs/GetCapabilitiesFormat.md)
- - [GetCapabilitiesRequest](docs/GetCapabilitiesRequest.md)
  - [GetCoverageFormat](docs/GetCoverageFormat.md)
- - [GetCoverageRequest](docs/GetCoverageRequest.md)
- - [GetFeatureRequest](docs/GetFeatureRequest.md)
- - [GetLegendGraphicRequest](docs/GetLegendGraphicRequest.md)
  - [GetMapExceptionFormat](docs/GetMapExceptionFormat.md)
- - [GetMapFormat](docs/GetMapFormat.md)
- - [GetMapRequest](docs/GetMapRequest.md)
  - [GfbioAbcdDataProviderDefinition](docs/GfbioAbcdDataProviderDefinition.md)
  - [GfbioCollectionsDataProviderDefinition](docs/GfbioCollectionsDataProviderDefinition.md)
  - [GridBoundingBox2D](docs/GridBoundingBox2D.md)
@@ -436,11 +423,15 @@ Class | Method | HTTP request | Description
  - [Volume](docs/Volume.md)
  - [VolumeFileLayersResponse](docs/VolumeFileLayersResponse.md)
  - [WcsBoundingbox](docs/WcsBoundingbox.md)
+ - [WcsRequest](docs/WcsRequest.md)
  - [WcsService](docs/WcsService.md)
  - [WcsVersion](docs/WcsVersion.md)
+ - [WfsRequest](docs/WfsRequest.md)
  - [WfsService](docs/WfsService.md)
  - [WfsVersion](docs/WfsVersion.md)
  - [WildliveDataConnectorDefinition](docs/WildliveDataConnectorDefinition.md)
+ - [WmsRequest](docs/WmsRequest.md)
+ - [WmsResponseFormat](docs/WmsResponseFormat.md)
  - [WmsService](docs/WmsService.md)
  - [WmsVersion](docs/WmsVersion.md)
  - [Workflow](docs/Workflow.md)

python/geoengine_openapi_client/__init__.py

@@ -85,7 +85,6 @@
     "DatasetResource",
     "DerivedColor",
     "DerivedNumber",
-    "DescribeCoverageRequest",
     "EbvPortalDataProviderDefinition",
     "EdrDataProviderDefinition",
     "EdrVectorSpec",
@@ -108,15 +107,8 @@
     "GdalSourceTimePlaceholder",
     "GeoJson",
     "GeoTransform",
-    "GetCapabilitiesFormat",
-    "GetCapabilitiesRequest",
     "GetCoverageFormat",
-    "GetCoverageRequest",
-    "GetFeatureRequest",
-    "GetLegendGraphicRequest",
     "GetMapExceptionFormat",
-    "GetMapFormat",
-    "GetMapRequest",
     "GfbioAbcdDataProviderDefinition",
     "GfbioCollectionsDataProviderDefinition",
     "GridBoundingBox2D",
@@ -286,11 +278,15 @@
     "Volume",
     "VolumeFileLayersResponse",
     "WcsBoundingbox",
+    "WcsRequest",
     "WcsService",
     "WcsVersion",
+    "WfsRequest",
     "WfsService",
     "WfsVersion",
     "WildliveDataConnectorDefinition",
+    "WmsRequest",
+    "WmsResponseFormat",
     "WmsService",
     "WmsVersion",
     "Workflow",
@@ -368,7 +364,6 @@
 from geoengine_openapi_client.models.dataset_resource import DatasetResource as DatasetResource
 from geoengine_openapi_client.models.derived_color import DerivedColor as DerivedColor
 from geoengine_openapi_client.models.derived_number import DerivedNumber as DerivedNumber
-from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest as DescribeCoverageRequest
 from geoengine_openapi_client.models.ebv_portal_data_provider_definition import EbvPortalDataProviderDefinition as EbvPortalDataProviderDefinition
 from geoengine_openapi_client.models.edr_data_provider_definition import EdrDataProviderDefinition as EdrDataProviderDefinition
 from geoengine_openapi_client.models.edr_vector_spec import EdrVectorSpec as EdrVectorSpec
@@ -391,15 +386,8 @@
 from geoengine_openapi_client.models.gdal_source_time_placeholder import GdalSourceTimePlaceholder as GdalSourceTimePlaceholder
 from geoengine_openapi_client.models.geo_json import GeoJson as GeoJson
 from geoengine_openapi_client.models.geo_transform import GeoTransform as GeoTransform
-from geoengine_openapi_client.models.get_capabilities_format import GetCapabilitiesFormat as GetCapabilitiesFormat
-from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest as GetCapabilitiesRequest
 from geoengine_openapi_client.models.get_coverage_format import GetCoverageFormat as GetCoverageFormat
-from geoengine_openapi_client.models.get_coverage_request import GetCoverageRequest as GetCoverageRequest
-from geoengine_openapi_client.models.get_feature_request import GetFeatureRequest as GetFeatureRequest
-from geoengine_openapi_client.models.get_legend_graphic_request import GetLegendGraphicRequest as GetLegendGraphicRequest
 from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat as GetMapExceptionFormat
-from geoengine_openapi_client.models.get_map_format import GetMapFormat as GetMapFormat
-from geoengine_openapi_client.models.get_map_request import GetMapRequest as GetMapRequest
 from geoengine_openapi_client.models.gfbio_abcd_data_provider_definition import GfbioAbcdDataProviderDefinition as GfbioAbcdDataProviderDefinition
 from geoengine_openapi_client.models.gfbio_collections_data_provider_definition import GfbioCollectionsDataProviderDefinition as GfbioCollectionsDataProviderDefinition
 from geoengine_openapi_client.models.grid_bounding_box2_d import GridBoundingBox2D as GridBoundingBox2D
@@ -569,11 +557,15 @@
 from geoengine_openapi_client.models.volume import Volume as Volume
 from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse as VolumeFileLayersResponse
 from geoengine_openapi_client.models.wcs_boundingbox import WcsBoundingbox as WcsBoundingbox
+from geoengine_openapi_client.models.wcs_request import WcsRequest as WcsRequest
 from geoengine_openapi_client.models.wcs_service import WcsService as WcsService
 from geoengine_openapi_client.models.wcs_version import WcsVersion as WcsVersion
+from geoengine_openapi_client.models.wfs_request import WfsRequest as WfsRequest
 from geoengine_openapi_client.models.wfs_service import WfsService as WfsService
 from geoengine_openapi_client.models.wfs_version import WfsVersion as WfsVersion
 from geoengine_openapi_client.models.wildlive_data_connector_definition import WildliveDataConnectorDefinition as WildliveDataConnectorDefinition
+from geoengine_openapi_client.models.wms_request import WmsRequest as WmsRequest
+from geoengine_openapi_client.models.wms_response_format import WmsResponseFormat as WmsResponseFormat
 from geoengine_openapi_client.models.wms_service import WmsService as WmsService
 from geoengine_openapi_client.models.wms_version import WmsVersion as WmsVersion
 from geoengine_openapi_client.models.workflow import Workflow as Workflow