diff --git a/.generation/Dockerfile b/.generation/Dockerfile index f642d684..dd0ce305 100644 --- a/.generation/Dockerfile +++ b/.generation/Dockerfile @@ -1,5 +1,5 @@ # Patched version of openapi-generator-cli with python3 support -FROM docker.io/openapitools/openapi-generator-cli:v7.17.0 +FROM docker.io/openapitools/openapi-generator-cli:v7.18.0 RUN apt-get update && apt-get install -y python3 diff --git a/.generation/config.ini b/.generation/config.ini index c556932f..5c55aacd 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,9 +1,9 @@ [input] -backendCommit = 7ff0ace96463ee8757a7382080c52802f85885fb +backendCommit = 4a64a6ad6cf4f9301498829529a3f8a855cdcf43 [general] githubUrl = https://github.com/geo-engine/openapi-client -version = 0.0.29 +version = 0.0.30 [python] name = geoengine_openapi_client diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index 0a316505..1267e3ca 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -3461,17 +3461,7 @@ }, "responses": { "200": { - "description": "Role was added", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/RoleId" - }, - "example": { - "id": "5b4466d2-8bab-4ed8-a182-722af3c80958" - } - } - } + "$ref": "#/components/responses/IdResponse" } }, "security": [ diff --git a/python/.openapi-generator/VERSION b/python/.openapi-generator/VERSION index 6328c542..1b2d969d 100644 --- a/python/.openapi-generator/VERSION +++ b/python/.openapi-generator/VERSION @@ -1 +1 @@ -7.17.0 +7.18.0 diff --git a/python/README.md b/python/README.md index 585dc5b1..d786184c 100644 --- a/python/README.md +++ b/python/README.md @@ -4,8 +4,8 @@ No description provided (generated by Openapi Generator https://github.com/opena This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 0.8.0 -- Package version: 0.0.29 -- Generator version: 7.17.0 +- Package version: 0.0.30 +- Generator version: 7.18.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 24306601..2dec1b92 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -15,7 +15,7 @@ """ # noqa: E501 -__version__ = "0.0.29" +__version__ = "0.0.30" # Define package exports __all__ = [ diff --git a/python/geoengine_openapi_client/api/layers_api.py b/python/geoengine_openapi_client/api/layers_api.py index 7fdc97ac..f26a303a 100644 --- a/python/geoengine_openapi_client/api/layers_api.py +++ b/python/geoengine_openapi_client/api/layers_api.py @@ -1461,7 +1461,7 @@ def autocomplete_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -1547,7 +1547,7 @@ def autocomplete_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -1633,7 +1633,7 @@ def autocomplete_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -1797,7 +1797,7 @@ def delete_provider( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1863,7 +1863,7 @@ def delete_provider_with_http_info( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1929,7 +1929,7 @@ def delete_provider_without_preload_content( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2048,7 +2048,7 @@ def get_provider_definition( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2114,7 +2114,7 @@ def get_provider_definition_with_http_info( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2180,7 +2180,7 @@ def get_provider_definition_without_preload_content( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2307,7 +2307,7 @@ def layer_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2377,7 +2377,7 @@ def layer_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2447,7 +2447,7 @@ def layer_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2580,7 +2580,7 @@ def layer_to_dataset( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2650,7 +2650,7 @@ def layer_to_dataset_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2720,7 +2720,7 @@ def layer_to_dataset_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2853,7 +2853,7 @@ def layer_to_workflow_id_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2923,7 +2923,7 @@ def layer_to_workflow_id_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -2993,7 +2993,7 @@ def layer_to_workflow_id_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param layer: Layer id (required) :type layer: str :param _request_timeout: timeout setting for this request. If one @@ -3128,7 +3128,7 @@ def list_collection_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param offset: (required) @@ -3206,7 +3206,7 @@ def list_collection_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param offset: (required) @@ -3284,7 +3284,7 @@ def list_collection_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param offset: (required) @@ -3986,7 +3986,7 @@ def provider_capabilities_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -4052,7 +4052,7 @@ def provider_capabilities_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -4118,7 +4118,7 @@ def provider_capabilities_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -5295,7 +5295,7 @@ def search_handler( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -5381,7 +5381,7 @@ def search_handler_with_http_info( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -5467,7 +5467,7 @@ def search_handler_without_preload_content( :param provider: Data provider id (required) - :type provider: str + :type provider: UUID :param collection: Layer collection id (required) :type collection: str :param search_type: (required) @@ -6190,7 +6190,7 @@ def update_provider_definition( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param typed_data_provider_definition: (required) :type typed_data_provider_definition: TypedDataProviderDefinition :param _request_timeout: timeout setting for this request. If one @@ -6260,7 +6260,7 @@ def update_provider_definition_with_http_info( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param typed_data_provider_definition: (required) :type typed_data_provider_definition: TypedDataProviderDefinition :param _request_timeout: timeout setting for this request. If one @@ -6330,7 +6330,7 @@ def update_provider_definition_without_preload_content( :param provider: Layer provider id (required) - :type provider: str + :type provider: UUID :param typed_data_provider_definition: (required) :type typed_data_provider_definition: TypedDataProviderDefinition :param _request_timeout: timeout setting for this request. If one diff --git a/python/geoengine_openapi_client/api/ogcwcs_api.py b/python/geoengine_openapi_client/api/ogcwcs_api.py index 3bfb7ac6..60a8555e 100644 --- a/python/geoengine_openapi_client/api/ogcwcs_api.py +++ b/python/geoengine_openapi_client/api/ogcwcs_api.py @@ -18,7 +18,7 @@ from typing_extensions import Annotated from pydantic import Field, StrictBytes, StrictFloat, StrictInt, StrictStr -from typing import Optional, Tuple, Union +from typing import Any, Optional, Tuple, Union from typing_extensions import Annotated from uuid import UUID from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest @@ -52,7 +52,7 @@ def wcs_capabilities_handler( workflow: Annotated[UUID, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[WcsVersion] = None, + version: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -70,7 +70,7 @@ def wcs_capabilities_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WcsService :param request: (required) @@ -130,7 +130,7 @@ def wcs_capabilities_handler_with_http_info( workflow: Annotated[UUID, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[WcsVersion] = None, + version: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -148,7 +148,7 @@ def wcs_capabilities_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WcsService :param request: (required) @@ -208,7 +208,7 @@ def wcs_capabilities_handler_without_preload_content( workflow: Annotated[UUID, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[WcsVersion] = None, + version: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -226,7 +226,7 @@ def wcs_capabilities_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WcsService :param request: (required) @@ -380,7 +380,7 @@ def wcs_describe_coverage_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) @@ -462,7 +462,7 @@ def wcs_describe_coverage_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) @@ -544,7 +544,7 @@ def wcs_describe_coverage_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) @@ -715,7 +715,7 @@ def wcs_get_coverage_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) @@ -833,7 +833,7 @@ def wcs_get_coverage_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) @@ -951,7 +951,7 @@ def wcs_get_coverage_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WcsVersion :param service: (required) diff --git a/python/geoengine_openapi_client/api/ogcwfs_api.py b/python/geoengine_openapi_client/api/ogcwfs_api.py index 6113e67b..a930319d 100644 --- a/python/geoengine_openapi_client/api/ogcwfs_api.py +++ b/python/geoengine_openapi_client/api/ogcwfs_api.py @@ -18,14 +18,13 @@ from typing_extensions import Annotated from pydantic import Field, StrictStr -from typing import Optional +from typing import Any, Optional from typing_extensions import Annotated from uuid import UUID from geoengine_openapi_client.models.geo_json import GeoJson from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest from geoengine_openapi_client.models.get_feature_request import GetFeatureRequest from geoengine_openapi_client.models.wfs_service import WfsService -from geoengine_openapi_client.models.wfs_version import WfsVersion from geoengine_openapi_client.api_client import ApiClient, RequestSerialized from geoengine_openapi_client.api_response import ApiResponse @@ -49,7 +48,7 @@ def __init__(self, api_client=None) -> None: def wfs_capabilities_handler( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WfsVersion], + version: Optional[Any], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -69,7 +68,7 @@ def wfs_capabilities_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WfsVersion :param service: (required) @@ -127,7 +126,7 @@ def wfs_capabilities_handler( def wfs_capabilities_handler_with_http_info( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WfsVersion], + version: Optional[Any], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -147,7 +146,7 @@ def wfs_capabilities_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WfsVersion :param service: (required) @@ -205,7 +204,7 @@ def wfs_capabilities_handler_with_http_info( def wfs_capabilities_handler_without_preload_content( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WfsVersion], + version: Optional[Any], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -225,7 +224,7 @@ def wfs_capabilities_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WfsVersion :param service: (required) @@ -357,7 +356,7 @@ def wfs_feature_handler( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[WfsVersion] = None, + version: Optional[Any] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -366,7 +365,7 @@ def wfs_feature_handler( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -384,7 +383,7 @@ def wfs_feature_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WfsService :param request: (required) @@ -479,7 +478,7 @@ def wfs_feature_handler_with_http_info( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[WfsVersion] = None, + version: Optional[Any] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -488,7 +487,7 @@ def wfs_feature_handler_with_http_info( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -506,7 +505,7 @@ def wfs_feature_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WfsService :param request: (required) @@ -601,7 +600,7 @@ def wfs_feature_handler_without_preload_content( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[WfsVersion] = None, + version: Optional[Any] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -610,7 +609,7 @@ def wfs_feature_handler_without_preload_content( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -628,7 +627,7 @@ def wfs_feature_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param service: (required) :type service: WfsService :param request: (required) diff --git a/python/geoengine_openapi_client/api/ogcwms_api.py b/python/geoengine_openapi_client/api/ogcwms_api.py index 2d08df7c..7c8df99c 100644 --- a/python/geoengine_openapi_client/api/ogcwms_api.py +++ b/python/geoengine_openapi_client/api/ogcwms_api.py @@ -18,13 +18,11 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool, StrictBytes, StrictStr -from typing import Optional, Tuple, Union +from typing import Any, Optional, Tuple, Union from typing_extensions import Annotated from uuid import UUID -from geoengine_openapi_client.models.get_capabilities_format import GetCapabilitiesFormat from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest from geoengine_openapi_client.models.get_legend_graphic_request import GetLegendGraphicRequest -from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat from geoengine_openapi_client.models.get_map_format import GetMapFormat from geoengine_openapi_client.models.get_map_request import GetMapRequest from geoengine_openapi_client.models.wms_service import WmsService @@ -52,10 +50,10 @@ def __init__(self, api_client=None) -> None: def wms_capabilities_handler( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WmsVersion], + version: Optional[Any], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[GetCapabilitiesFormat], + format: Optional[Any], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -73,7 +71,7 @@ def wms_capabilities_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -134,10 +132,10 @@ def wms_capabilities_handler( def wms_capabilities_handler_with_http_info( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WmsVersion], + version: Optional[Any], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[GetCapabilitiesFormat], + format: Optional[Any], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -155,7 +153,7 @@ def wms_capabilities_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -216,10 +214,10 @@ def wms_capabilities_handler_with_http_info( def wms_capabilities_handler_without_preload_content( self, workflow: Annotated[UUID, Field(description="Workflow id")], - version: Optional[WmsVersion], + version: Optional[Any], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[GetCapabilitiesFormat], + format: Optional[Any], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -237,7 +235,7 @@ def wms_capabilities_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -392,7 +390,7 @@ def wms_legend_graphic_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -474,7 +472,7 @@ def wms_legend_graphic_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -556,7 +554,7 @@ def wms_legend_graphic_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -699,7 +697,7 @@ def wms_map_handler( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[GetMapExceptionFormat] = None, + exceptions: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -717,7 +715,7 @@ def wms_map_handler( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -833,7 +831,7 @@ def wms_map_handler_with_http_info( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[GetMapExceptionFormat] = None, + exceptions: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -851,7 +849,7 @@ def wms_map_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) @@ -967,7 +965,7 @@ def wms_map_handler_without_preload_content( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[GetMapExceptionFormat] = None, + exceptions: Optional[Any] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -985,7 +983,7 @@ def wms_map_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: str + :type workflow: UUID :param version: (required) :type version: WmsVersion :param service: (required) diff --git a/python/geoengine_openapi_client/api/plots_api.py b/python/geoengine_openapi_client/api/plots_api.py index 37ecf287..1a3fc380 100644 --- a/python/geoengine_openapi_client/api/plots_api.py +++ b/python/geoengine_openapi_client/api/plots_api.py @@ -73,7 +73,7 @@ def get_plot_handler( :param spatial_resolution: (required) :type spatial_resolution: str :param id: Workflow id (required) - :type id: str + :type id: UUID :param crs: :type crs: str :param _request_timeout: timeout setting for this request. If one @@ -156,7 +156,7 @@ def get_plot_handler_with_http_info( :param spatial_resolution: (required) :type spatial_resolution: str :param id: Workflow id (required) - :type id: str + :type id: UUID :param crs: :type crs: str :param _request_timeout: timeout setting for this request. If one @@ -239,7 +239,7 @@ def get_plot_handler_without_preload_content( :param spatial_resolution: (required) :type spatial_resolution: str :param id: Workflow id (required) - :type id: str + :type id: UUID :param crs: :type crs: str :param _request_timeout: timeout setting for this request. If one diff --git a/python/geoengine_openapi_client/api/projects_api.py b/python/geoengine_openapi_client/api/projects_api.py index 6dea756a..4377d3d3 100644 --- a/python/geoengine_openapi_client/api/projects_api.py +++ b/python/geoengine_openapi_client/api/projects_api.py @@ -339,7 +339,7 @@ def delete_project_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -405,7 +405,7 @@ def delete_project_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -471,7 +471,7 @@ def delete_project_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -878,7 +878,7 @@ def load_project_latest_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -944,7 +944,7 @@ def load_project_latest_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1010,7 +1010,7 @@ def load_project_latest_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1137,9 +1137,9 @@ def load_project_version_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param version: Version id (required) - :type version: str + :type version: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1207,9 +1207,9 @@ def load_project_version_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param version: Version id (required) - :type version: str + :type version: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1277,9 +1277,9 @@ def load_project_version_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param version: Version id (required) - :type version: str + :type version: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1409,7 +1409,7 @@ def project_versions_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1475,7 +1475,7 @@ def project_versions_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1541,7 +1541,7 @@ def project_versions_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1668,7 +1668,7 @@ def update_project_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param update_project: (required) :type update_project: UpdateProject :param _request_timeout: timeout setting for this request. If one @@ -1738,7 +1738,7 @@ def update_project_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param update_project: (required) :type update_project: UpdateProject :param _request_timeout: timeout setting for this request. If one @@ -1808,7 +1808,7 @@ def update_project_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param update_project: (required) :type update_project: UpdateProject :param _request_timeout: timeout setting for this request. If one diff --git a/python/geoengine_openapi_client/api/session_api.py b/python/geoengine_openapi_client/api/session_api.py index b5eb758a..80a883e5 100644 --- a/python/geoengine_openapi_client/api/session_api.py +++ b/python/geoengine_openapi_client/api/session_api.py @@ -1361,7 +1361,7 @@ def register_user_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: + ) -> UUID: """Registers a user. @@ -1398,7 +1398,7 @@ def register_user_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "UUID", } response_data = self.api_client.call_api( *_param, @@ -1427,7 +1427,7 @@ def register_user_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[str]: + ) -> ApiResponse[UUID]: """Registers a user. @@ -1464,7 +1464,7 @@ def register_user_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "UUID", } response_data = self.api_client.call_api( *_param, @@ -1530,7 +1530,7 @@ def register_user_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "UUID", } response_data = self.api_client.call_api( *_param, @@ -1879,7 +1879,7 @@ def session_project_handler( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1945,7 +1945,7 @@ def session_project_handler_with_http_info( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2011,7 +2011,7 @@ def session_project_handler_without_preload_content( :param project: Project id (required) - :type project: str + :type project: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of diff --git a/python/geoengine_openapi_client/api/tasks_api.py b/python/geoengine_openapi_client/api/tasks_api.py index 93b0f190..3a6afb46 100644 --- a/python/geoengine_openapi_client/api/tasks_api.py +++ b/python/geoengine_openapi_client/api/tasks_api.py @@ -18,10 +18,9 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool -from typing import List, Optional +from typing import Any, List, Optional from typing_extensions import Annotated from uuid import UUID -from geoengine_openapi_client.models.task_filter import TaskFilter from geoengine_openapi_client.models.task_status import TaskStatus from geoengine_openapi_client.models.task_status_with_id import TaskStatusWithId @@ -66,7 +65,7 @@ def abort_handler( # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) - :type id: str + :type id: UUID :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -141,7 +140,7 @@ def abort_handler_with_http_info( # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) - :type id: str + :type id: UUID :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -212,7 +211,7 @@ def abort_handler_without_preload_content( # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) - :type id: str + :type id: UUID :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -321,7 +320,7 @@ def _abort_handler_serialize( @validate_call def list_handler( self, - filter: Optional[TaskFilter], + filter: Optional[Any], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -395,7 +394,7 @@ def list_handler( @validate_call def list_handler_with_http_info( self, - filter: Optional[TaskFilter], + filter: Optional[Any], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -469,7 +468,7 @@ def list_handler_with_http_info( @validate_call def list_handler_without_preload_content( self, - filter: Optional[TaskFilter], + filter: Optional[Any], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -627,7 +626,7 @@ def status_handler( :param id: Task id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -693,7 +692,7 @@ def status_handler_with_http_info( :param id: Task id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -759,7 +758,7 @@ def status_handler_without_preload_content( :param id: Task id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of diff --git a/python/geoengine_openapi_client/api/uploads_api.py b/python/geoengine_openapi_client/api/uploads_api.py index d2541180..315273ae 100644 --- a/python/geoengine_openapi_client/api/uploads_api.py +++ b/python/geoengine_openapi_client/api/uploads_api.py @@ -65,7 +65,7 @@ def list_upload_file_layers_handler( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param file_name: File name (required) :type file_name: str :param _request_timeout: timeout setting for this request. If one @@ -135,7 +135,7 @@ def list_upload_file_layers_handler_with_http_info( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param file_name: File name (required) :type file_name: str :param _request_timeout: timeout setting for this request. If one @@ -205,7 +205,7 @@ def list_upload_file_layers_handler_without_preload_content( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param file_name: File name (required) :type file_name: str :param _request_timeout: timeout setting for this request. If one @@ -337,7 +337,7 @@ def list_upload_files_handler( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -403,7 +403,7 @@ def list_upload_files_handler_with_http_info( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -469,7 +469,7 @@ def list_upload_files_handler_without_preload_content( :param upload_id: Upload id (required) - :type upload_id: str + :type upload_id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of diff --git a/python/geoengine_openapi_client/api/user_api.py b/python/geoengine_openapi_client/api/user_api.py index 0b98009c..33c75c9e 100644 --- a/python/geoengine_openapi_client/api/user_api.py +++ b/python/geoengine_openapi_client/api/user_api.py @@ -66,7 +66,7 @@ def add_role_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> str: + ) -> IdResponse: """Add a new role. Requires admin privilige. @@ -103,7 +103,7 @@ def add_role_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -132,7 +132,7 @@ def add_role_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[str]: + ) -> ApiResponse[IdResponse]: """Add a new role. Requires admin privilige. @@ -169,7 +169,7 @@ def add_role_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -235,7 +235,7 @@ def add_role_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "str", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -343,9 +343,9 @@ def assign_role_handler( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -413,9 +413,9 @@ def assign_role_handler_with_http_info( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -483,9 +483,9 @@ def assign_role_handler_without_preload_content( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -608,7 +608,7 @@ def computation_quota_handler( :param computation: Computation id (required) - :type computation: str + :type computation: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -674,7 +674,7 @@ def computation_quota_handler_with_http_info( :param computation: Computation id (required) - :type computation: str + :type computation: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -740,7 +740,7 @@ def computation_quota_handler_without_preload_content( :param computation: Computation id (required) - :type computation: str + :type computation: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2232,7 +2232,7 @@ def get_user_quota_handler( :param user: User id (required) - :type user: str + :type user: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2298,7 +2298,7 @@ def get_user_quota_handler_with_http_info( :param user: User id (required) - :type user: str + :type user: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2364,7 +2364,7 @@ def get_user_quota_handler_without_preload_content( :param user: User id (required) - :type user: str + :type user: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2733,7 +2733,7 @@ def remove_role_handler( :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2799,7 +2799,7 @@ def remove_role_handler_with_http_info( :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2865,7 +2865,7 @@ def remove_role_handler_without_preload_content( :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -2985,9 +2985,9 @@ def revoke_role_handler( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -3055,9 +3055,9 @@ def revoke_role_handler_with_http_info( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -3125,9 +3125,9 @@ def revoke_role_handler_without_preload_content( :param user: User id (required) - :type user: str + :type user: UUID :param role: Role id (required) - :type role: str + :type role: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -3251,7 +3251,7 @@ def update_user_quota_handler( :param user: User id (required) - :type user: str + :type user: UUID :param update_quota: (required) :type update_quota: UpdateQuota :param _request_timeout: timeout setting for this request. If one @@ -3321,7 +3321,7 @@ def update_user_quota_handler_with_http_info( :param user: User id (required) - :type user: str + :type user: UUID :param update_quota: (required) :type update_quota: UpdateQuota :param _request_timeout: timeout setting for this request. If one @@ -3391,7 +3391,7 @@ def update_user_quota_handler_without_preload_content( :param user: User id (required) - :type user: str + :type user: UUID :param update_quota: (required) :type update_quota: UpdateQuota :param _request_timeout: timeout setting for this request. If one diff --git a/python/geoengine_openapi_client/api/workflows_api.py b/python/geoengine_openapi_client/api/workflows_api.py index 9f1ba8fb..7b80c32c 100644 --- a/python/geoengine_openapi_client/api/workflows_api.py +++ b/python/geoengine_openapi_client/api/workflows_api.py @@ -71,7 +71,7 @@ def dataset_from_workflow_handler( :param id: Workflow id (required) - :type id: str + :type id: UUID :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -141,7 +141,7 @@ def dataset_from_workflow_handler_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -211,7 +211,7 @@ def dataset_from_workflow_handler_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -356,7 +356,7 @@ def get_workflow_all_metadata_zip_handler( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -422,7 +422,7 @@ def get_workflow_all_metadata_zip_handler_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -488,7 +488,7 @@ def get_workflow_all_metadata_zip_handler_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -614,7 +614,7 @@ def get_workflow_metadata_handler( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -680,7 +680,7 @@ def get_workflow_metadata_handler_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -746,7 +746,7 @@ def get_workflow_metadata_handler_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -872,7 +872,7 @@ def get_workflow_provenance_handler( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -938,7 +938,7 @@ def get_workflow_provenance_handler_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1004,7 +1004,7 @@ def get_workflow_provenance_handler_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1130,7 +1130,7 @@ def load_workflow_handler( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1196,7 +1196,7 @@ def load_workflow_handler_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1262,7 +1262,7 @@ def load_workflow_handler_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param _request_timeout: timeout setting for this request. If one number provided, it will be total request timeout. It can also be a pair (tuple) of @@ -1393,7 +1393,7 @@ def raster_stream_websocket( :param id: Workflow id (required) - :type id: str + :type id: UUID :param spatial_bounds: (required) :type spatial_bounds: SpatialPartition2D :param time_interval: (required) @@ -1479,7 +1479,7 @@ def raster_stream_websocket_with_http_info( :param id: Workflow id (required) - :type id: str + :type id: UUID :param spatial_bounds: (required) :type spatial_bounds: SpatialPartition2D :param time_interval: (required) @@ -1565,7 +1565,7 @@ def raster_stream_websocket_without_preload_content( :param id: Workflow id (required) - :type id: str + :type id: UUID :param spatial_bounds: (required) :type spatial_bounds: SpatialPartition2D :param time_interval: (required) diff --git a/python/geoengine_openapi_client/api_client.py b/python/geoengine_openapi_client/api_client.py index cc95bf8f..a4019e5b 100644 --- a/python/geoengine_openapi_client/api_client.py +++ b/python/geoengine_openapi_client/api_client.py @@ -92,7 +92,7 @@ def __init__( self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'geoengine/openapi-client/python/0.0.29' + self.user_agent = 'geoengine/openapi-client/python/0.0.30' self.client_side_validation = configuration.client_side_validation def __enter__(self): @@ -313,7 +313,7 @@ def response_deserialize( return_data = self.__deserialize_file(response_data) elif response_type is not None: match = None - content_type = response_data.getheader('content-type') + content_type = response_data.headers.get('content-type') if content_type is not None: match = re.search(r"charset=([a-zA-Z\-\d]+)[\s;]?", content_type) encoding = match.group(1) if match else "utf-8" @@ -330,7 +330,7 @@ def response_deserialize( return ApiResponse( status_code = response_data.status, data = return_data, - headers = response_data.getheaders(), + headers = response_data.headers, raw_data = response_data.data ) @@ -702,7 +702,7 @@ def __deserialize_file(self, response): os.close(fd) os.remove(path) - content_disposition = response.getheader("Content-Disposition") + content_disposition = response.headers.get("Content-Disposition") if content_disposition: m = re.search( r'filename=[\'"]?([^\'"\s]+)[\'"]?', diff --git a/python/geoengine_openapi_client/configuration.py b/python/geoengine_openapi_client/configuration.py index d47f9cd0..425f2eeb 100644 --- a/python/geoengine_openapi_client/configuration.py +++ b/python/geoengine_openapi_client/configuration.py @@ -165,7 +165,7 @@ class Configuration: :param ca_cert_data: verify the peer using concatenated CA certificate data in PEM (str) or DER (bytes) format. :param cert_file: the path to a client certificate file, for mTLS. - :param key_file: the path to a client key file, for mTLS. + :param key_file: the path to a client key file, for mTLS. :Example: """ @@ -487,6 +487,7 @@ def get_basic_auth_token(self) -> Optional[str]: password = "" if self.password is not None: password = self.password + return urllib3.util.make_headers( basic_auth=username + ':' + password ).get('authorization') @@ -516,7 +517,7 @@ def to_debug_report(self) -> str: "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 0.8.0\n"\ - "SDK Package Version: 0.0.29".\ + "SDK Package Version: 0.0.30".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self) -> List[HostSetting]: @@ -570,6 +571,7 @@ def get_host_from_settings( variable_name, variable['default_value']) if 'enum_values' in variable \ + and variable['enum_values'] \ and used_value not in variable['enum_values']: raise ValueError( "The variable `{0}` in the host URL has invalid value " diff --git a/python/geoengine_openapi_client/exceptions.py b/python/geoengine_openapi_client/exceptions.py index 8d35d172..cac64187 100644 --- a/python/geoengine_openapi_client/exceptions.py +++ b/python/geoengine_openapi_client/exceptions.py @@ -129,7 +129,7 @@ def __init__( self.body = http_resp.data.decode('utf-8') except Exception: pass - self.headers = http_resp.getheaders() + self.headers = http_resp.headers @classmethod def from_response( @@ -176,8 +176,11 @@ def __str__(self): error_message += "HTTP response headers: {0}\n".format( self.headers) - if self.data or self.body: - error_message += "HTTP response body: {0}\n".format(self.data or self.body) + if self.body: + error_message += "HTTP response body: {0}\n".format(self.body) + + if self.data: + error_message += "HTTP response data: {0}\n".format(self.data) return error_message diff --git a/python/geoengine_openapi_client/models/add_dataset.py b/python/geoengine_openapi_client/models/add_dataset.py index adfb407b..822ace9f 100644 --- a/python/geoengine_openapi_client/models/add_dataset.py +++ b/python/geoengine_openapi_client/models/add_dataset.py @@ -87,6 +87,11 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of symbology if self.symbology: _dict['symbology'] = self.symbology.to_dict() + # set to None if name (nullable) is None + # and model_fields_set contains the field + if self.name is None and "name" in self.model_fields_set: + _dict['name'] = None + # set to None if provenance (nullable) is None # and model_fields_set contains the field if self.provenance is None and "provenance" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py b/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py index b9814199..a83ea137 100644 --- a/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py +++ b/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py @@ -33,7 +33,7 @@ class GdalMetadataNetCdfCf(BaseModel): """ # noqa: E501 band_offset: Annotated[int, Field(strict=True, ge=0)] = Field(description="A band offset specifies the first band index to use for the first point in time. All other time steps are added to this offset.", alias="bandOffset") cache_ttl: Optional[Annotated[int, Field(strict=True, ge=0)]] = Field(default=None, alias="cacheTtl") - end: StrictInt + end: StrictInt = Field(description="We use the end to specify the last, non-inclusive valid time point. Queries behind this point return no data. TODO: Alternatively, we could think about using the number of possible time steps in the future.") params: GdalDatasetParameters result_descriptor: RasterResultDescriptor = Field(alias="resultDescriptor") start: StrictInt diff --git a/python/geoengine_openapi_client/models/multi_band_raster_colorizer.py b/python/geoengine_openapi_client/models/multi_band_raster_colorizer.py index cc332b03..c840182f 100644 --- a/python/geoengine_openapi_client/models/multi_band_raster_colorizer.py +++ b/python/geoengine_openapi_client/models/multi_band_raster_colorizer.py @@ -36,7 +36,7 @@ class MultiBandRasterColorizer(BaseModel): green_max: Union[StrictFloat, StrictInt] = Field(description="The maximum value for the red channel.", alias="greenMax") green_min: Union[StrictFloat, StrictInt] = Field(description="The minimum value for the red channel.", alias="greenMin") green_scale: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="A scaling factor for the green channel between 0 and 1.", alias="greenScale") - no_data_color: Optional[Annotated[List[StrictInt], Field(min_length=4, max_length=4)]] = Field(default=None, alias="noDataColor") + no_data_color: Optional[Annotated[List[StrictInt], Field(min_length=4, max_length=4)]] = Field(default=None, description="The color to use for no data values. If not specified, the no data values will be transparent.", alias="noDataColor") red_band: Annotated[int, Field(strict=True, ge=0)] = Field(description="The band index of the red channel.", alias="redBand") red_max: Union[StrictFloat, StrictInt] = Field(description="The maximum value for the red channel.", alias="redMax") red_min: Union[StrictFloat, StrictInt] = Field(description="The minimum value for the red channel.", alias="redMin") diff --git a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py index 383a4807..658002c1 100644 --- a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py +++ b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py @@ -82,6 +82,11 @@ def to_dict(self) -> Dict[str, Any]: if self.description is None and "description" in self.model_fields_set: _dict['description'] = None + # set to None if name (nullable) is None + # and model_fields_set contains the field + if self.name is None and "name" in self.model_fields_set: + _dict['name'] = None + return _dict @classmethod diff --git a/python/geoengine_openapi_client/models/spatial_reference_specification.py b/python/geoengine_openapi_client/models/spatial_reference_specification.py index 62d932eb..c56f6d0f 100644 --- a/python/geoengine_openapi_client/models/spatial_reference_specification.py +++ b/python/geoengine_openapi_client/models/spatial_reference_specification.py @@ -80,6 +80,11 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of extent if self.extent: _dict['extent'] = self.extent.to_dict() + # set to None if axis_labels (nullable) is None + # and model_fields_set contains the field + if self.axis_labels is None and "axis_labels" in self.model_fields_set: + _dict['axisLabels'] = None + # set to None if axis_order (nullable) is None # and model_fields_set contains the field if self.axis_order is None and "axis_order" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/user_session.py b/python/geoengine_openapi_client/models/user_session.py index 6a9c76e2..c3f2cc3e 100644 --- a/python/geoengine_openapi_client/models/user_session.py +++ b/python/geoengine_openapi_client/models/user_session.py @@ -85,6 +85,11 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of view if self.view: _dict['view'] = self.view.to_dict() + # set to None if project (nullable) is None + # and model_fields_set contains the field + if self.project is None and "project" in self.model_fields_set: + _dict['project'] = None + # set to None if view (nullable) is None # and model_fields_set contains the field if self.view is None and "view" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py b/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py index 8d8ec31e..03fa64a2 100644 --- a/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py +++ b/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py @@ -95,6 +95,11 @@ def to_dict(self) -> Dict[str, Any]: if self.priority is None and "priority" in self.model_fields_set: _dict['priority'] = None + # set to None if refresh_token (nullable) is None + # and model_fields_set contains the field + if self.refresh_token is None and "refresh_token" in self.model_fields_set: + _dict['refreshToken'] = None + # set to None if user (nullable) is None # and model_fields_set contains the field if self.user is None and "user" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/rest.py b/python/geoengine_openapi_client/rest.py index d8024ffe..85fdebd9 100644 --- a/python/geoengine_openapi_client/rest.py +++ b/python/geoengine_openapi_client/rest.py @@ -49,12 +49,17 @@ def read(self): self.data = self.response.data return self.data + @property + def headers(self): + """Returns a dictionary of response headers.""" + return self.response.headers + def getheaders(self): - """Returns a dictionary of the response headers.""" + """Returns a dictionary of the response headers; use ``headers`` instead.""" return self.response.headers def getheader(self, name, default=None): - """Returns a given response header.""" + """Returns a given response header; use ``headers.get()`` instead.""" return self.response.headers.get(name, default) diff --git a/python/pyproject.toml b/python/pyproject.toml index 8c1a9cac..f7c92479 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [project] name = "geoengine_openapi_client" -version = "0.0.29" +version = "0.0.30" description = "Geo Engine API" authors = [ {name = "Geo Engine Developers",email = "dev@geoengine.de"}, diff --git a/python/setup.py b/python/setup.py index d46c456f..d6b1edbd 100644 --- a/python/setup.py +++ b/python/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools NAME = "geoengine-openapi-client" -VERSION = "0.0.29" +VERSION = "0.0.30" PYTHON_REQUIRES = ">= 3.9" REQUIRES = [ "urllib3 >= 2.1.0, < 3.0.0", diff --git a/python/test/test_create_dataset.py b/python/test/test_create_dataset.py index d5f98844..18fb48d1 100644 --- a/python/test/test_create_dataset.py +++ b/python/test/test_create_dataset.py @@ -42,7 +42,7 @@ def make_instance(self, include_optional) -> CreateDataset: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = '', + name = null, provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', @@ -63,7 +63,7 @@ def make_instance(self, include_optional) -> CreateDataset: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = '', + name = null, provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', diff --git a/python/test/test_dataset_definition.py b/python/test/test_dataset_definition.py index f5cb24db..38034e03 100644 --- a/python/test/test_dataset_definition.py +++ b/python/test/test_dataset_definition.py @@ -40,7 +40,7 @@ def make_instance(self, include_optional) -> DatasetDefinition: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = '', + name = null, provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', @@ -59,7 +59,7 @@ def make_instance(self, include_optional) -> DatasetDefinition: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = '', + name = null, provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', diff --git a/python/test/test_gdal_meta_data_list.py b/python/test/test_gdal_meta_data_list.py index 42d3515f..715b2690 100644 --- a/python/test/test_gdal_meta_data_list.py +++ b/python/test/test_gdal_meta_data_list.py @@ -39,38 +39,7 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = geoengine_openapi_client.models.gdal_dataset_parameters.GdalDatasetParameters( - allow_alphaband_as_mask = True, - file_not_found_handling = 'NoData', - file_path = '', - gdal_config_options = [ - [ - '' - ] - ], - gdal_open_options = [ - '' - ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( - origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - x_pixel_size = 1.337, - y_pixel_size = 1.337, ), - height = 0, - no_data_value = 1.337, - properties_mapping = [ - geoengine_openapi_client.models.gdal_metadata_mapping.GdalMetadataMapping( - source_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( - domain = '', - key = '', ), - target_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( - domain = '', - key = '', ), - target_type = 'Number', ) - ], - rasterband_channel = 0, - width = 0, ), + params = null, time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -81,21 +50,11 @@ def make_instance(self, include_optional) -> GdalMetaDataList: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'GdalMetaDataList' ) else: @@ -103,38 +62,7 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = geoengine_openapi_client.models.gdal_dataset_parameters.GdalDatasetParameters( - allow_alphaband_as_mask = True, - file_not_found_handling = 'NoData', - file_path = '', - gdal_config_options = [ - [ - '' - ] - ], - gdal_open_options = [ - '' - ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( - origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - x_pixel_size = 1.337, - y_pixel_size = 1.337, ), - height = 0, - no_data_value = 1.337, - properties_mapping = [ - geoengine_openapi_client.models.gdal_metadata_mapping.GdalMetadataMapping( - source_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( - domain = '', - key = '', ), - target_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( - domain = '', - key = '', ), - target_type = 'Number', ) - ], - rasterband_channel = 0, - width = 0, ), + params = null, time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -145,21 +73,11 @@ def make_instance(self, include_optional) -> GdalMetaDataList: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'GdalMetaDataList', ) """ diff --git a/python/test/test_gdal_meta_data_regular.py b/python/test/test_gdal_meta_data_regular.py index 1e5b317a..261bb905 100644 --- a/python/test/test_gdal_meta_data_regular.py +++ b/python/test/test_gdal_meta_data_regular.py @@ -78,21 +78,11 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), @@ -146,21 +136,11 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), diff --git a/python/test/test_gdal_meta_data_static.py b/python/test/test_gdal_meta_data_static.py index 668af720..39094698 100644 --- a/python/test/test_gdal_meta_data_static.py +++ b/python/test/test_gdal_meta_data_static.py @@ -75,21 +75,11 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), @@ -135,21 +125,11 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'GdalStatic', ) """ diff --git a/python/test/test_gdal_metadata_net_cdf_cf.py b/python/test/test_gdal_metadata_net_cdf_cf.py index 287e51ad..3d026996 100644 --- a/python/test/test_gdal_metadata_net_cdf_cf.py +++ b/python/test/test_gdal_metadata_net_cdf_cf.py @@ -77,21 +77,11 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', @@ -140,21 +130,11 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', diff --git a/python/test/test_meta_data_definition.py b/python/test/test_meta_data_definition.py index 6fec0408..45ee9538 100644 --- a/python/test/test_meta_data_definition.py +++ b/python/test/test_meta_data_definition.py @@ -39,31 +39,8 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( - bool = [ - '' - ], - datetime = [ - '' - ], - float = [ - '' - ], - format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( - csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( - header = 'yes', ), ), - int = [ - '' - ], - rename = { - 'key' : '' - }, - text = [ - '' - ], - x = '', - y = '', ), - data_type = 'Data', + columns = null, + data_type = null, default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -78,21 +55,11 @@ def make_instance(self, include_optional) -> MetaDataDefinition: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'MockMetaData', cache_ttl = 0, data_time = geoengine_openapi_client.models.time_interval.TimeInterval( @@ -125,31 +92,8 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( - bool = [ - '' - ], - datetime = [ - '' - ], - float = [ - '' - ], - format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( - csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( - header = 'yes', ), ), - int = [ - '' - ], - rename = { - 'key' : '' - }, - text = [ - '' - ], - x = '', - y = '', ), - data_type = 'Data', + columns = null, + data_type = null, default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -164,21 +108,11 @@ def make_instance(self, include_optional) -> MetaDataDefinition: measurement = null, name = '', ) ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), + resolution = null, spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'MockMetaData', data_time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_mock_meta_data.py b/python/test/test_mock_meta_data.py index 7311c637..3c761c90 100644 --- a/python/test/test_mock_meta_data.py +++ b/python/test/test_mock_meta_data.py @@ -43,13 +43,7 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -57,9 +51,7 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'MockMetaData' ) else: @@ -71,13 +63,7 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -85,9 +71,7 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'MockMetaData', ) """ diff --git a/python/test/test_ogr_meta_data.py b/python/test/test_ogr_meta_data.py index 705d942e..f35586b7 100644 --- a/python/test/test_ogr_meta_data.py +++ b/python/test/test_ogr_meta_data.py @@ -39,31 +39,8 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( - bool = [ - '' - ], - datetime = [ - '' - ], - float = [ - '' - ], - format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( - csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( - header = 'yes', ), ), - int = [ - '' - ], - rename = { - 'key' : '' - }, - text = [ - '' - ], - x = '', - y = '', ), - data_type = 'Data', + columns = null, + data_type = null, default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -73,13 +50,7 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -87,9 +58,7 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'OgrMetaData' ) else: @@ -97,31 +66,8 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( - bool = [ - '' - ], - datetime = [ - '' - ], - float = [ - '' - ], - format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( - csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( - header = 'yes', ), ), - int = [ - '' - ], - rename = { - 'key' : '' - }, - text = [ - '' - ], - x = '', - y = '', ), - data_type = 'Data', + columns = null, + data_type = null, default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -131,13 +77,7 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), + bbox = null, columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -145,9 +85,7 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), ), + time = null, ), type = 'OgrMetaData', ) """ diff --git a/python/test/test_ogr_source_dataset.py b/python/test/test_ogr_source_dataset.py index e8369f3c..4eefdcb5 100644 --- a/python/test/test_ogr_source_dataset.py +++ b/python/test/test_ogr_source_dataset.py @@ -48,9 +48,7 @@ def make_instance(self, include_optional) -> OgrSourceDataset: float = [ '' ], - format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( - csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( - header = 'yes', ), ), + format_specifics = null, int = [ '' ], diff --git a/typescript/README.md b/typescript/README.md index f7826475..4dbfe6e7 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,4 +1,4 @@ -# @geoengine/openapi-client@0.0.29 +# @geoengine/openapi-client@0.0.30 A TypeScript SDK client for the geoengine.io API. @@ -414,8 +414,8 @@ and is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: `0.8.0` -- Package version: `0.0.29` -- Generator version: `7.17.0` +- Package version: `0.0.30` +- Generator version: `7.18.0` - Build package: `org.openapitools.codegen.languages.TypeScriptFetchClientCodegen` The generated npm module supports the following: diff --git a/typescript/dist/apis/OGCWFSApi.d.ts b/typescript/dist/apis/OGCWFSApi.d.ts index 2c45aa3a..e784296b 100644 --- a/typescript/dist/apis/OGCWFSApi.d.ts +++ b/typescript/dist/apis/OGCWFSApi.d.ts @@ -32,7 +32,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string; + queryResolution?: string | null; } /** * diff --git a/typescript/dist/apis/UserApi.d.ts b/typescript/dist/apis/UserApi.d.ts index 5549a59e..ad4a61ca 100644 --- a/typescript/dist/apis/UserApi.d.ts +++ b/typescript/dist/apis/UserApi.d.ts @@ -59,11 +59,11 @@ export declare class UserApi extends runtime.BaseAPI { /** * Add a new role. Requires admin privilige. */ - addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new role. Requires admin privilige. */ - addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Assign a role to a user. Requires admin privilige. */ diff --git a/typescript/dist/apis/UserApi.js b/typescript/dist/apis/UserApi.js index 5f2d7ae7..efc8e385 100644 --- a/typescript/dist/apis/UserApi.js +++ b/typescript/dist/apis/UserApi.js @@ -55,12 +55,7 @@ class UserApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.AddRoleToJSON)(requestParameters['addRole']), }, initOverrides); - if (this.isJsonMime(response.headers.get('content-type'))) { - return new runtime.JSONApiResponse(response); - } - else { - return new runtime.TextApiResponse(response); - } + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** diff --git a/typescript/dist/esm/apis/OGCWFSApi.d.ts b/typescript/dist/esm/apis/OGCWFSApi.d.ts index 2c45aa3a..e784296b 100644 --- a/typescript/dist/esm/apis/OGCWFSApi.d.ts +++ b/typescript/dist/esm/apis/OGCWFSApi.d.ts @@ -32,7 +32,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string; + queryResolution?: string | null; } /** * diff --git a/typescript/dist/esm/apis/UserApi.d.ts b/typescript/dist/esm/apis/UserApi.d.ts index 5549a59e..ad4a61ca 100644 --- a/typescript/dist/esm/apis/UserApi.d.ts +++ b/typescript/dist/esm/apis/UserApi.d.ts @@ -59,11 +59,11 @@ export declare class UserApi extends runtime.BaseAPI { /** * Add a new role. Requires admin privilige. */ - addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new role. Requires admin privilige. */ - addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Assign a role to a user. Requires admin privilige. */ diff --git a/typescript/dist/esm/apis/UserApi.js b/typescript/dist/esm/apis/UserApi.js index c1c9d705..4893c8b0 100644 --- a/typescript/dist/esm/apis/UserApi.js +++ b/typescript/dist/esm/apis/UserApi.js @@ -52,12 +52,7 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, body: AddRoleToJSON(requestParameters['addRole']), }, initOverrides); - if (this.isJsonMime(response.headers.get('content-type'))) { - return new runtime.JSONApiResponse(response); - } - else { - return new runtime.TextApiResponse(response); - } + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** diff --git a/typescript/dist/esm/models/AddDataset.d.ts b/typescript/dist/esm/models/AddDataset.d.ts index 3a8d9b2c..56b75997 100644 --- a/typescript/dist/esm/models/AddDataset.d.ts +++ b/typescript/dist/esm/models/AddDataset.d.ts @@ -34,7 +34,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string; + name?: string | null; /** * * @type {Array} diff --git a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts index d24c38e2..1cc10c0a 100644 --- a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts @@ -32,7 +32,9 @@ export interface GdalMetadataNetCdfCf { */ cacheTtl?: number; /** - * + * We use the end to specify the last, non-inclusive valid time point. + * Queries behind this point return no data. + * TODO: Alternatively, we could think about using the number of possible time steps in the future. * @type {number} * @memberof GdalMetadataNetCdfCf */ diff --git a/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts b/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts index a937f8e1..0b468a67 100644 --- a/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts +++ b/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts @@ -64,7 +64,8 @@ export interface MultiBandRasterColorizer { */ greenScale?: number; /** - * + * The color to use for no data values. + * If not specified, the no data values will be transparent. * @type {Array} * @memberof MultiBandRasterColorizer */ diff --git a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts index 42b64948..33426d0c 100644 --- a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts @@ -39,7 +39,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string; + name?: string | null; /** * * @type {RasterQueryRectangle} diff --git a/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts b/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts index 3b20d2b4..125610a4 100644 --- a/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts +++ b/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts @@ -23,7 +23,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array; + axisLabels?: Array | null; /** * * @type {AxisOrder} diff --git a/typescript/dist/esm/models/UserSession.d.ts b/typescript/dist/esm/models/UserSession.d.ts index 38531122..17e32e54 100644 --- a/typescript/dist/esm/models/UserSession.d.ts +++ b/typescript/dist/esm/models/UserSession.d.ts @@ -34,7 +34,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string; + project?: string | null; /** * * @type {Array} diff --git a/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts index 6cd7ebe7..3e0f5767 100644 --- a/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts +++ b/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts @@ -52,7 +52,7 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - refreshToken?: string; + refreshToken?: string | null; /** * * @type {string} diff --git a/typescript/dist/esm/runtime.js b/typescript/dist/esm/runtime.js index 4e15daf1..e5a388a0 100644 --- a/typescript/dist/esm/runtime.js +++ b/typescript/dist/esm/runtime.js @@ -69,7 +69,7 @@ export class Configuration { } export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.29' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.30' } }); /** diff --git a/typescript/dist/models/AddDataset.d.ts b/typescript/dist/models/AddDataset.d.ts index 3a8d9b2c..56b75997 100644 --- a/typescript/dist/models/AddDataset.d.ts +++ b/typescript/dist/models/AddDataset.d.ts @@ -34,7 +34,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string; + name?: string | null; /** * * @type {Array} diff --git a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts index d24c38e2..1cc10c0a 100644 --- a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts @@ -32,7 +32,9 @@ export interface GdalMetadataNetCdfCf { */ cacheTtl?: number; /** - * + * We use the end to specify the last, non-inclusive valid time point. + * Queries behind this point return no data. + * TODO: Alternatively, we could think about using the number of possible time steps in the future. * @type {number} * @memberof GdalMetadataNetCdfCf */ diff --git a/typescript/dist/models/MultiBandRasterColorizer.d.ts b/typescript/dist/models/MultiBandRasterColorizer.d.ts index a937f8e1..0b468a67 100644 --- a/typescript/dist/models/MultiBandRasterColorizer.d.ts +++ b/typescript/dist/models/MultiBandRasterColorizer.d.ts @@ -64,7 +64,8 @@ export interface MultiBandRasterColorizer { */ greenScale?: number; /** - * + * The color to use for no data values. + * If not specified, the no data values will be transparent. * @type {Array} * @memberof MultiBandRasterColorizer */ diff --git a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts index 42b64948..33426d0c 100644 --- a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts @@ -39,7 +39,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string; + name?: string | null; /** * * @type {RasterQueryRectangle} diff --git a/typescript/dist/models/SpatialReferenceSpecification.d.ts b/typescript/dist/models/SpatialReferenceSpecification.d.ts index 3b20d2b4..125610a4 100644 --- a/typescript/dist/models/SpatialReferenceSpecification.d.ts +++ b/typescript/dist/models/SpatialReferenceSpecification.d.ts @@ -23,7 +23,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array; + axisLabels?: Array | null; /** * * @type {AxisOrder} diff --git a/typescript/dist/models/UserSession.d.ts b/typescript/dist/models/UserSession.d.ts index 38531122..17e32e54 100644 --- a/typescript/dist/models/UserSession.d.ts +++ b/typescript/dist/models/UserSession.d.ts @@ -34,7 +34,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string; + project?: string | null; /** * * @type {Array} diff --git a/typescript/dist/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/models/WildliveDataConnectorDefinition.d.ts index 6cd7ebe7..3e0f5767 100644 --- a/typescript/dist/models/WildliveDataConnectorDefinition.d.ts +++ b/typescript/dist/models/WildliveDataConnectorDefinition.d.ts @@ -52,7 +52,7 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - refreshToken?: string; + refreshToken?: string | null; /** * * @type {string} diff --git a/typescript/dist/runtime.js b/typescript/dist/runtime.js index e61d729d..9295cf41 100644 --- a/typescript/dist/runtime.js +++ b/typescript/dist/runtime.js @@ -77,7 +77,7 @@ class Configuration { exports.Configuration = Configuration; exports.DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.29' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.30' } }); /** diff --git a/typescript/docs/OGCWFSApi.md b/typescript/docs/OGCWFSApi.md index f60d257f..314f7524 100644 --- a/typescript/docs/OGCWFSApi.md +++ b/typescript/docs/OGCWFSApi.md @@ -140,7 +140,7 @@ async function example() { // string (optional) propertyName: propertyName_example, // string | Vendor parameter for specifying a spatial query resolution (optional) - queryResolution: queryResolution_example, + queryResolution: ..., } satisfies WfsFeatureHandlerRequest; try { diff --git a/typescript/docs/UserApi.md b/typescript/docs/UserApi.md index 52310dad..8f7c6b84 100644 --- a/typescript/docs/UserApi.md +++ b/typescript/docs/UserApi.md @@ -22,7 +22,7 @@ All URIs are relative to *https://geoengine.io/api* ## addRoleHandler -> string addRoleHandler(addRole) +> IdResponse addRoleHandler(addRole) Add a new role. Requires admin privilige. @@ -69,7 +69,7 @@ example().catch(console.error); ### Return type -**string** +[**IdResponse**](IdResponse.md) ### Authorization @@ -84,7 +84,7 @@ example().catch(console.error); ### HTTP response details | Status code | Description | Response headers | |-------------|-------------|------------------| -| **200** | Role was added | - | +| **200** | Id of generated resource | - | [[Back to top]](#) [[Back to API list]](../README.md#api-endpoints) [[Back to Model list]](../README.md#models) [[Back to README]](../README.md) diff --git a/typescript/package-lock.json b/typescript/package-lock.json index 2c3de306..5ec7c121 100644 --- a/typescript/package-lock.json +++ b/typescript/package-lock.json @@ -1,12 +1,12 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.29", + "version": "0.0.30", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@geoengine/openapi-client", - "version": "0.0.29", + "version": "0.0.30", "devDependencies": { "typescript": "^4.0 || ^5.0" } diff --git a/typescript/package.json b/typescript/package.json index cccb5b6b..e032623e 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.29", + "version": "0.0.30", "description": "OpenAPI client for @geoengine/openapi-client", "author": "OpenAPI-Generator", "repository": { diff --git a/typescript/src/apis/OGCWFSApi.ts b/typescript/src/apis/OGCWFSApi.ts index 559793df..9275f2f6 100644 --- a/typescript/src/apis/OGCWFSApi.ts +++ b/typescript/src/apis/OGCWFSApi.ts @@ -56,7 +56,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string; + queryResolution?: string | null; } /** diff --git a/typescript/src/apis/UserApi.ts b/typescript/src/apis/UserApi.ts index 6945f4e0..96c664c1 100644 --- a/typescript/src/apis/UserApi.ts +++ b/typescript/src/apis/UserApi.ts @@ -109,7 +109,7 @@ export class UserApi extends runtime.BaseAPI { /** * Add a new role. Requires admin privilige. */ - async addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async addRoleHandlerRaw(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['addRole'] == null) { throw new runtime.RequiredError( 'addRole', @@ -142,17 +142,13 @@ export class UserApi extends runtime.BaseAPI { body: AddRoleToJSON(requestParameters['addRole']), }, initOverrides); - if (this.isJsonMime(response.headers.get('content-type'))) { - return new runtime.JSONApiResponse(response); - } else { - return new runtime.TextApiResponse(response) as any; - } + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Add a new role. Requires admin privilige. */ - async addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async addRoleHandler(requestParameters: AddRoleHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.addRoleHandlerRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/typescript/src/models/AddDataset.ts b/typescript/src/models/AddDataset.ts index 1ea1c71f..ed060de1 100644 --- a/typescript/src/models/AddDataset.ts +++ b/typescript/src/models/AddDataset.ts @@ -51,7 +51,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string; + name?: string | null; /** * * @type {Array} diff --git a/typescript/src/models/GdalMetadataNetCdfCf.ts b/typescript/src/models/GdalMetadataNetCdfCf.ts index a74c10e6..c4427fa5 100644 --- a/typescript/src/models/GdalMetadataNetCdfCf.ts +++ b/typescript/src/models/GdalMetadataNetCdfCf.ts @@ -55,7 +55,9 @@ export interface GdalMetadataNetCdfCf { */ cacheTtl?: number; /** - * + * We use the end to specify the last, non-inclusive valid time point. + * Queries behind this point return no data. + * TODO: Alternatively, we could think about using the number of possible time steps in the future. * @type {number} * @memberof GdalMetadataNetCdfCf */ diff --git a/typescript/src/models/MultiBandRasterColorizer.ts b/typescript/src/models/MultiBandRasterColorizer.ts index 35013af2..5ce4ebda 100644 --- a/typescript/src/models/MultiBandRasterColorizer.ts +++ b/typescript/src/models/MultiBandRasterColorizer.ts @@ -68,7 +68,8 @@ export interface MultiBandRasterColorizer { */ greenScale?: number; /** - * + * The color to use for no data values. + * If not specified, the no data values will be transparent. * @type {Array} * @memberof MultiBandRasterColorizer */ diff --git a/typescript/src/models/RasterDatasetFromWorkflow.ts b/typescript/src/models/RasterDatasetFromWorkflow.ts index 7476e10c..5b492fb7 100644 --- a/typescript/src/models/RasterDatasetFromWorkflow.ts +++ b/typescript/src/models/RasterDatasetFromWorkflow.ts @@ -50,7 +50,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string; + name?: string | null; /** * * @type {RasterQueryRectangle} diff --git a/typescript/src/models/SpatialReferenceSpecification.ts b/typescript/src/models/SpatialReferenceSpecification.ts index f7fe9484..a3080c82 100644 --- a/typescript/src/models/SpatialReferenceSpecification.ts +++ b/typescript/src/models/SpatialReferenceSpecification.ts @@ -40,7 +40,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array; + axisLabels?: Array | null; /** * * @type {AxisOrder} diff --git a/typescript/src/models/UserSession.ts b/typescript/src/models/UserSession.ts index 05866e99..e494bb5e 100644 --- a/typescript/src/models/UserSession.ts +++ b/typescript/src/models/UserSession.ts @@ -51,7 +51,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string; + project?: string | null; /** * * @type {Array} diff --git a/typescript/src/models/WildliveDataConnectorDefinition.ts b/typescript/src/models/WildliveDataConnectorDefinition.ts index 14da96fc..bdda31a7 100644 --- a/typescript/src/models/WildliveDataConnectorDefinition.ts +++ b/typescript/src/models/WildliveDataConnectorDefinition.ts @@ -56,7 +56,7 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - refreshToken?: string; + refreshToken?: string | null; /** * * @type {string} diff --git a/typescript/src/runtime.ts b/typescript/src/runtime.ts index 8e66aed4..504a9b28 100644 --- a/typescript/src/runtime.ts +++ b/typescript/src/runtime.ts @@ -86,7 +86,7 @@ export class Configuration { export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.29' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.30' } });