diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index b5541f43..110c5281 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -6547,27 +6547,6 @@ } } }, - "GdalDatasetGeoTransform": { - "type": "object", - "required": [ - "originCoordinate", - "xPixelSize", - "yPixelSize" - ], - "properties": { - "originCoordinate": { - "$ref": "#/components/schemas/Coordinate2D" - }, - "xPixelSize": { - "type": "number", - "format": "double" - }, - "yPixelSize": { - "type": "number", - "format": "double" - } - } - }, "GdalDatasetParameters": { "type": "object", "description": "Parameters for loading data using Gdal", @@ -6608,7 +6587,7 @@ } }, "geoTransform": { - "$ref": "#/components/schemas/GdalDatasetGeoTransform" + "$ref": "#/components/schemas/GeoTransform" }, "height": { "type": "integer", diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index 95e28a5a..1efe6238 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -1,7 +1,6 @@ .github/workflows/python.yml .gitignore .gitlab-ci.yml -.openapi-generator-ignore .travis.yml README.md docs/AddDataset.md @@ -56,7 +55,6 @@ docs/FileNotFoundHandling.md docs/FormatSpecifics.md docs/FormatSpecificsCsv.md docs/GbifDataProviderDefinition.md -docs/GdalDatasetGeoTransform.md docs/GdalDatasetParameters.md docs/GdalLoadingInfoTemporalSlice.md docs/GdalMetaDataList.md @@ -341,7 +339,6 @@ geoengine_openapi_client/models/file_not_found_handling.py geoengine_openapi_client/models/format_specifics.py geoengine_openapi_client/models/format_specifics_csv.py geoengine_openapi_client/models/gbif_data_provider_definition.py -geoengine_openapi_client/models/gdal_dataset_geo_transform.py geoengine_openapi_client/models/gdal_dataset_parameters.py geoengine_openapi_client/models/gdal_loading_info_temporal_slice.py geoengine_openapi_client/models/gdal_meta_data_list.py @@ -598,7 +595,6 @@ test/test_file_not_found_handling.py test/test_format_specifics.py test/test_format_specifics_csv.py test/test_gbif_data_provider_definition.py -test/test_gdal_dataset_geo_transform.py test/test_gdal_dataset_parameters.py test/test_gdal_loading_info_temporal_slice.py test/test_gdal_meta_data_list.py diff --git a/python/.openapi-generator/VERSION b/python/.openapi-generator/VERSION index 1b2d969d..6328c542 100644 --- a/python/.openapi-generator/VERSION +++ b/python/.openapi-generator/VERSION @@ -1 +1 @@ -7.18.0 +7.17.0 diff --git a/python/README.md b/python/README.md index 985df836..e684671d 100644 --- a/python/README.md +++ b/python/README.md @@ -5,7 +5,7 @@ This Python package is automatically generated by the [OpenAPI Generator](https: - API version: 0.9.0 - Package version: 0.0.30 -- Generator version: 7.18.0 +- Generator version: 7.17.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. @@ -240,7 +240,6 @@ Class | Method | HTTP request | Description - [FormatSpecifics](docs/FormatSpecifics.md) - [FormatSpecificsCsv](docs/FormatSpecificsCsv.md) - [GbifDataProviderDefinition](docs/GbifDataProviderDefinition.md) - - [GdalDatasetGeoTransform](docs/GdalDatasetGeoTransform.md) - [GdalDatasetParameters](docs/GdalDatasetParameters.md) - [GdalLoadingInfoTemporalSlice](docs/GdalLoadingInfoTemporalSlice.md) - [GdalMetaDataList](docs/GdalMetaDataList.md) diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 0e27efe5..8a216129 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -95,7 +95,6 @@ "FormatSpecifics", "FormatSpecificsCsv", "GbifDataProviderDefinition", - "GdalDatasetGeoTransform", "GdalDatasetParameters", "GdalLoadingInfoTemporalSlice", "GdalMetaDataList", @@ -374,7 +373,6 @@ from geoengine_openapi_client.models.format_specifics import FormatSpecifics as FormatSpecifics from geoengine_openapi_client.models.format_specifics_csv import FormatSpecificsCsv as FormatSpecificsCsv from geoengine_openapi_client.models.gbif_data_provider_definition import GbifDataProviderDefinition as GbifDataProviderDefinition -from geoengine_openapi_client.models.gdal_dataset_geo_transform import GdalDatasetGeoTransform as GdalDatasetGeoTransform from geoengine_openapi_client.models.gdal_dataset_parameters import GdalDatasetParameters as GdalDatasetParameters from geoengine_openapi_client.models.gdal_loading_info_temporal_slice import GdalLoadingInfoTemporalSlice as GdalLoadingInfoTemporalSlice from geoengine_openapi_client.models.gdal_meta_data_list import GdalMetaDataList as GdalMetaDataList diff --git a/python/geoengine_openapi_client/api/layers_api.py b/python/geoengine_openapi_client/api/layers_api.py index 66afba1b..ad723744 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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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: UUID + :type provider: str :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 40080131..7bf8625c 100644 --- a/python/geoengine_openapi_client/api/ogcwcs_api.py +++ b/python/geoengine_openapi_client/api/ogcwcs_api.py @@ -18,12 +18,13 @@ from typing_extensions import Annotated from pydantic import Field, StrictFloat, StrictInt, StrictStr -from typing import Any, Optional, Union +from typing import Optional, Union from typing_extensions import Annotated from uuid import UUID from geoengine_openapi_client.models.get_coverage_format import GetCoverageFormat from geoengine_openapi_client.models.wcs_request import WcsRequest from geoengine_openapi_client.models.wcs_service import WcsService +from geoengine_openapi_client.models.wcs_version import WcsVersion from geoengine_openapi_client.api_client import ApiClient, RequestSerialized from geoengine_openapi_client.api_response import ApiResponse @@ -60,7 +61,7 @@ def wcs_handler( resy: Optional[Union[StrictFloat, StrictInt]] = None, service: Optional[WcsService] = None, time: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -78,7 +79,7 @@ def wcs_handler( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WCS request (required) :type request: WcsRequest :param boundingbox: @@ -182,7 +183,7 @@ def wcs_handler_with_http_info( resy: Optional[Union[StrictFloat, StrictInt]] = None, service: Optional[WcsService] = None, time: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -200,7 +201,7 @@ def wcs_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WCS request (required) :type request: WcsRequest :param boundingbox: @@ -304,7 +305,7 @@ def wcs_handler_without_preload_content( resy: Optional[Union[StrictFloat, StrictInt]] = None, service: Optional[WcsService] = None, time: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -322,7 +323,7 @@ def wcs_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WCS request (required) :type request: WcsRequest :param boundingbox: diff --git a/python/geoengine_openapi_client/api/ogcwfs_api.py b/python/geoengine_openapi_client/api/ogcwfs_api.py index 42d06199..f0c94f45 100644 --- a/python/geoengine_openapi_client/api/ogcwfs_api.py +++ b/python/geoengine_openapi_client/api/ogcwfs_api.py @@ -18,12 +18,13 @@ from typing_extensions import Annotated from pydantic import Field, StrictStr -from typing import Any, Optional +from typing import Optional from typing_extensions import Annotated from uuid import UUID from geoengine_openapi_client.models.geo_json import GeoJson from geoengine_openapi_client.models.wfs_request import WfsRequest 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 @@ -59,7 +60,7 @@ def wfs_handler( srs_name: Optional[StrictStr] = None, time: Optional[StrictStr] = None, type_names: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -77,7 +78,7 @@ def wfs_handler( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WFS request (required) :type request: WfsRequest :param bbox: @@ -177,7 +178,7 @@ def wfs_handler_with_http_info( srs_name: Optional[StrictStr] = None, time: Optional[StrictStr] = None, type_names: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -195,7 +196,7 @@ def wfs_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WFS request (required) :type request: WfsRequest :param bbox: @@ -295,7 +296,7 @@ def wfs_handler_without_preload_content( srs_name: Optional[StrictStr] = None, time: Optional[StrictStr] = None, type_names: Optional[StrictStr] = None, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -313,7 +314,7 @@ def wfs_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WFS request (required) :type request: WfsRequest :param bbox: diff --git a/python/geoengine_openapi_client/api/ogcwms_api.py b/python/geoengine_openapi_client/api/ogcwms_api.py index 1b0a144b..773593ca 100644 --- a/python/geoengine_openapi_client/api/ogcwms_api.py +++ b/python/geoengine_openapi_client/api/ogcwms_api.py @@ -18,11 +18,14 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool, StrictBytes, StrictStr -from typing import Any, Optional, Tuple, Union +from typing import Optional, Tuple, Union from typing_extensions import Annotated from uuid import UUID +from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat from geoengine_openapi_client.models.wms_request import WmsRequest +from geoengine_openapi_client.models.wms_response_format import WmsResponseFormat from geoengine_openapi_client.models.wms_service import WmsService +from geoengine_openapi_client.models.wms_version import WmsVersion from geoengine_openapi_client.api_client import ApiClient, RequestSerialized from geoengine_openapi_client.api_response import ApiResponse @@ -51,8 +54,8 @@ def wms_handler( bgcolor: Optional[StrictStr] = None, crs: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, - format: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, + format: Optional[WmsResponseFormat] = None, height: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, info_format: Optional[StrictStr] = None, layer: Optional[StrictStr] = None, @@ -64,7 +67,7 @@ def wms_handler( styles: Optional[StrictStr] = None, time: Optional[StrictStr] = None, transparent: Optional[StrictBool] = None, - version: Optional[Any] = None, + version: Optional[WmsVersion] = None, width: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, _request_timeout: Union[ None, @@ -83,7 +86,7 @@ def wms_handler( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WMS request (required) :type request: WmsRequest :param bbox: @@ -197,8 +200,8 @@ def wms_handler_with_http_info( bgcolor: Optional[StrictStr] = None, crs: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, - format: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, + format: Optional[WmsResponseFormat] = None, height: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, info_format: Optional[StrictStr] = None, layer: Optional[StrictStr] = None, @@ -210,7 +213,7 @@ def wms_handler_with_http_info( styles: Optional[StrictStr] = None, time: Optional[StrictStr] = None, transparent: Optional[StrictBool] = None, - version: Optional[Any] = None, + version: Optional[WmsVersion] = None, width: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, _request_timeout: Union[ None, @@ -229,7 +232,7 @@ def wms_handler_with_http_info( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WMS request (required) :type request: WmsRequest :param bbox: @@ -343,8 +346,8 @@ def wms_handler_without_preload_content( bgcolor: Optional[StrictStr] = None, crs: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, - format: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, + format: Optional[WmsResponseFormat] = None, height: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, info_format: Optional[StrictStr] = None, layer: Optional[StrictStr] = None, @@ -356,7 +359,7 @@ def wms_handler_without_preload_content( styles: Optional[StrictStr] = None, time: Optional[StrictStr] = None, transparent: Optional[StrictBool] = None, - version: Optional[Any] = None, + version: Optional[WmsVersion] = None, width: Optional[Annotated[int, Field(strict=True, ge=0)]] = None, _request_timeout: Union[ None, @@ -375,7 +378,7 @@ def wms_handler_without_preload_content( :param workflow: Workflow id (required) - :type workflow: UUID + :type workflow: str :param request: type of WMS request (required) :type request: WmsRequest :param bbox: diff --git a/python/geoengine_openapi_client/api/plots_api.py b/python/geoengine_openapi_client/api/plots_api.py index 0b0b8a6e..fc34009a 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: UUID + :type id: str :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: UUID + :type id: str :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: UUID + :type id: str :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 7409d6fd..f61bd9c1 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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :param version: Version id (required) - :type version: UUID + :type version: str :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: UUID + :type project: str :param version: Version id (required) - :type version: UUID + :type version: str :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: UUID + :type project: str :param version: Version id (required) - :type version: UUID + :type version: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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 4e3d6043..0e9f1a71 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, - ) -> UUID: + ) -> str: """Registers a user. @@ -1398,7 +1398,7 @@ def register_user_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "UUID", + '200': "str", } 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[UUID]: + ) -> ApiResponse[str]: """Registers a user. @@ -1464,7 +1464,7 @@ def register_user_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "UUID", + '200': "str", } 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': "UUID", + '200': "str", } response_data = self.api_client.call_api( *_param, @@ -1879,7 +1879,7 @@ def session_project_handler( :param project: Project id (required) - :type project: UUID + :type project: str :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: UUID + :type project: str :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: UUID + :type project: str :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 1a0f6366..71f8daef 100644 --- a/python/geoengine_openapi_client/api/tasks_api.py +++ b/python/geoengine_openapi_client/api/tasks_api.py @@ -18,9 +18,10 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool -from typing import Any, List, Optional +from typing import 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 @@ -65,7 +66,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: UUID + :type id: str :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -140,7 +141,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: UUID + :type id: str :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -211,7 +212,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: UUID + :type id: str :param force: :type force: bool :param _request_timeout: timeout setting for this request. If one @@ -320,7 +321,7 @@ def _abort_handler_serialize( @validate_call def list_handler( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -394,7 +395,7 @@ def list_handler( @validate_call def list_handler_with_http_info( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -468,7 +469,7 @@ def list_handler_with_http_info( @validate_call def list_handler_without_preload_content( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -626,7 +627,7 @@ def status_handler( :param id: Task id (required) - :type id: UUID + :type id: str :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 @@ -692,7 +693,7 @@ def status_handler_with_http_info( :param id: Task id (required) - :type id: UUID + :type id: str :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 @@ -758,7 +759,7 @@ def status_handler_without_preload_content( :param id: Task id (required) - :type id: UUID + :type id: str :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 eb509d87..bb8d1866 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: UUID + :type upload_id: str :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: UUID + :type upload_id: str :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: UUID + :type upload_id: str :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: UUID + :type upload_id: str :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: UUID + :type upload_id: str :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: UUID + :type upload_id: str :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 88f7d78e..7ff940cf 100644 --- a/python/geoengine_openapi_client/api/user_api.py +++ b/python/geoengine_openapi_client/api/user_api.py @@ -343,9 +343,9 @@ def assign_role_handler( :param user: User id (required) - :type user: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type computation: str :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: UUID + :type computation: str :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: UUID + :type computation: str :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: UUID + :type user: str :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: UUID + :type user: str :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: UUID + :type user: str :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: UUID + :type role: str :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: UUID + :type role: str :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: UUID + :type role: str :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: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type user: str :param role: Role id (required) - :type role: UUID + :type role: str :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: UUID + :type user: str :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: UUID + :type user: str :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: UUID + :type user: str :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 3c1c95db..4741bbbb 100644 --- a/python/geoengine_openapi_client/api/workflows_api.py +++ b/python/geoengine_openapi_client/api/workflows_api.py @@ -70,7 +70,7 @@ def dataset_from_workflow_handler( :param id: Workflow id (required) - :type id: UUID + :type id: str :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -140,7 +140,7 @@ def dataset_from_workflow_handler_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -210,7 +210,7 @@ def dataset_from_workflow_handler_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :param raster_dataset_from_workflow: (required) :type raster_dataset_from_workflow: RasterDatasetFromWorkflow :param _request_timeout: timeout setting for this request. If one @@ -355,7 +355,7 @@ def get_workflow_all_metadata_zip_handler( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -421,7 +421,7 @@ def get_workflow_all_metadata_zip_handler_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -487,7 +487,7 @@ def get_workflow_all_metadata_zip_handler_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -613,7 +613,7 @@ def get_workflow_metadata_handler( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -679,7 +679,7 @@ def get_workflow_metadata_handler_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -745,7 +745,7 @@ def get_workflow_metadata_handler_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -871,7 +871,7 @@ def get_workflow_provenance_handler( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -937,7 +937,7 @@ def get_workflow_provenance_handler_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -1003,7 +1003,7 @@ def get_workflow_provenance_handler_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -1129,7 +1129,7 @@ def load_workflow_handler( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -1195,7 +1195,7 @@ def load_workflow_handler_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -1261,7 +1261,7 @@ def load_workflow_handler_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 @@ -1391,7 +1391,7 @@ def raster_stream_websocket( :param id: Workflow id (required) - :type id: UUID + :type id: str :param spatial_bounds: (required) :type spatial_bounds: SpatialPartition2D :param time_interval: (required) @@ -1473,7 +1473,7 @@ def raster_stream_websocket_with_http_info( :param id: Workflow id (required) - :type id: UUID + :type id: str :param spatial_bounds: (required) :type spatial_bounds: SpatialPartition2D :param time_interval: (required) @@ -1555,7 +1555,7 @@ def raster_stream_websocket_without_preload_content( :param id: Workflow id (required) - :type id: UUID + :type id: str :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 509b930e..083d27b0 100644 --- a/python/geoengine_openapi_client/api_client.py +++ b/python/geoengine_openapi_client/api_client.py @@ -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.headers.get('content-type') + content_type = response_data.getheader('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.headers, + headers = response_data.getheaders(), raw_data = response_data.data ) @@ -702,7 +702,7 @@ def __deserialize_file(self, response): os.close(fd) os.remove(path) - content_disposition = response.headers.get("Content-Disposition") + content_disposition = response.getheader("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 4803ea4c..a5f5673a 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,7 +487,6 @@ 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') @@ -571,7 +570,6 @@ 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 0096ccfb..7ce16c66 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.headers + self.headers = http_resp.getheaders() @classmethod def from_response( @@ -176,11 +176,8 @@ def __str__(self): error_message += "HTTP response headers: {0}\n".format( self.headers) - 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) + if self.data or self.body: + error_message += "HTTP response body: {0}\n".format(self.data or self.body) return error_message diff --git a/python/geoengine_openapi_client/models/__init__.py b/python/geoengine_openapi_client/models/__init__.py index 5eda45f6..0d03d5ae 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -65,7 +65,6 @@ from geoengine_openapi_client.models.format_specifics import FormatSpecifics from geoengine_openapi_client.models.format_specifics_csv import FormatSpecificsCsv from geoengine_openapi_client.models.gbif_data_provider_definition import GbifDataProviderDefinition -from geoengine_openapi_client.models.gdal_dataset_geo_transform import GdalDatasetGeoTransform from geoengine_openapi_client.models.gdal_dataset_parameters import GdalDatasetParameters from geoengine_openapi_client.models.gdal_loading_info_temporal_slice import GdalLoadingInfoTemporalSlice from geoengine_openapi_client.models.gdal_meta_data_list import GdalMetaDataList diff --git a/python/geoengine_openapi_client/models/add_dataset.py b/python/geoengine_openapi_client/models/add_dataset.py index 8f48a229..01b382aa 100644 --- a/python/geoengine_openapi_client/models/add_dataset.py +++ b/python/geoengine_openapi_client/models/add_dataset.py @@ -87,11 +87,6 @@ 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_dataset_geo_transform.py b/python/geoengine_openapi_client/models/gdal_dataset_geo_transform.py deleted file mode 100644 index d89044a1..00000000 --- a/python/geoengine_openapi_client/models/gdal_dataset_geo_transform.py +++ /dev/null @@ -1,96 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.9.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt -from typing import Any, ClassVar, Dict, List, Union -from geoengine_openapi_client.models.coordinate2_d import Coordinate2D -from typing import Optional, Set -from typing_extensions import Self - -class GdalDatasetGeoTransform(BaseModel): - """ - GdalDatasetGeoTransform - """ # noqa: E501 - origin_coordinate: Coordinate2D = Field(alias="originCoordinate") - x_pixel_size: Union[StrictFloat, StrictInt] = Field(alias="xPixelSize") - y_pixel_size: Union[StrictFloat, StrictInt] = Field(alias="yPixelSize") - __properties: ClassVar[List[str]] = ["originCoordinate", "xPixelSize", "yPixelSize"] - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of GdalDatasetGeoTransform from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - # override the default output from pydantic by calling `to_dict()` of origin_coordinate - if self.origin_coordinate: - _dict['originCoordinate'] = self.origin_coordinate.to_dict() - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of GdalDatasetGeoTransform from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "originCoordinate": Coordinate2D.from_dict(obj["originCoordinate"]) if obj.get("originCoordinate") is not None else None, - "xPixelSize": obj.get("xPixelSize"), - "yPixelSize": obj.get("yPixelSize") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/gdal_dataset_parameters.py b/python/geoengine_openapi_client/models/gdal_dataset_parameters.py index 68a19f90..45129219 100644 --- a/python/geoengine_openapi_client/models/gdal_dataset_parameters.py +++ b/python/geoengine_openapi_client/models/gdal_dataset_parameters.py @@ -22,8 +22,8 @@ from typing import Any, ClassVar, Dict, List, Optional, Union from typing_extensions import Annotated from geoengine_openapi_client.models.file_not_found_handling import FileNotFoundHandling -from geoengine_openapi_client.models.gdal_dataset_geo_transform import GdalDatasetGeoTransform from geoengine_openapi_client.models.gdal_metadata_mapping import GdalMetadataMapping +from geoengine_openapi_client.models.geo_transform import GeoTransform from typing import Optional, Set from typing_extensions import Self @@ -36,7 +36,7 @@ class GdalDatasetParameters(BaseModel): file_path: StrictStr = Field(alias="filePath") gdal_config_options: Optional[List[Annotated[List[StrictStr], Field(min_length=2, max_length=2)]]] = Field(default=None, alias="gdalConfigOptions") gdal_open_options: Optional[List[StrictStr]] = Field(default=None, alias="gdalOpenOptions") - geo_transform: GdalDatasetGeoTransform = Field(alias="geoTransform") + geo_transform: GeoTransform = Field(alias="geoTransform") height: Annotated[int, Field(strict=True, ge=0)] no_data_value: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, alias="noDataValue") properties_mapping: Optional[List[GdalMetadataMapping]] = Field(default=None, alias="propertiesMapping") @@ -130,7 +130,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "filePath": obj.get("filePath"), "gdalConfigOptions": obj.get("gdalConfigOptions"), "gdalOpenOptions": obj.get("gdalOpenOptions"), - "geoTransform": GdalDatasetGeoTransform.from_dict(obj["geoTransform"]) if obj.get("geoTransform") is not None else None, + "geoTransform": GeoTransform.from_dict(obj["geoTransform"]) if obj.get("geoTransform") is not None else None, "height": obj.get("height"), "noDataValue": obj.get("noDataValue"), "propertiesMapping": [GdalMetadataMapping.from_dict(_item) for _item in obj["propertiesMapping"]] if obj.get("propertiesMapping") is not None else None, 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 589c38a6..d577584e 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 = 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.") + end: StrictInt 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 2ac3b3da..7fa3fcd5 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, description="The color to use for no data values. If not specified, the no data values will be transparent.", alias="noDataColor") + no_data_color: Optional[Annotated[List[StrictInt], Field(min_length=4, max_length=4)]] = Field(default=None, 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 edb77fe2..33f90a0a 100644 --- a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py +++ b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py @@ -82,11 +82,6 @@ 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 062e3de5..eec91b67 100644 --- a/python/geoengine_openapi_client/models/spatial_reference_specification.py +++ b/python/geoengine_openapi_client/models/spatial_reference_specification.py @@ -80,11 +80,6 @@ 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 0d5c4d18..1594edce 100644 --- a/python/geoengine_openapi_client/models/user_session.py +++ b/python/geoengine_openapi_client/models/user_session.py @@ -85,11 +85,6 @@ 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 fa840a90..d2f7744d 100644 --- a/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py +++ b/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py @@ -95,11 +95,6 @@ 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 898afdf5..16feaa30 100644 --- a/python/geoengine_openapi_client/rest.py +++ b/python/geoengine_openapi_client/rest.py @@ -49,17 +49,12 @@ 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; use ``headers`` instead.""" + """Returns a dictionary of the response headers.""" return self.response.headers def getheader(self, name, default=None): - """Returns a given response header; use ``headers.get()`` instead.""" + """Returns a given response header.""" return self.response.headers.get(name, default) diff --git a/python/test/test_add_dataset_tile.py b/python/test/test_add_dataset_tile.py index b8d731de..12de0d53 100644 --- a/python/test/test_add_dataset_tile.py +++ b/python/test/test_add_dataset_tile.py @@ -49,7 +49,7 @@ def make_instance(self, include_optional) -> AddDatasetTile: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -96,7 +96,7 @@ def make_instance(self, include_optional) -> AddDatasetTile: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/python/test/test_create_dataset.py b/python/test/test_create_dataset.py index 687a0368..25683dd1 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 = null, + name = '', 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 = null, + name = '', 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 65524aaf..ee8e6e1e 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 = null, + name = '', 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 = null, + name = '', provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', diff --git a/python/test/test_gdal_dataset_geo_transform.py b/python/test/test_gdal_dataset_geo_transform.py deleted file mode 100644 index 0fa1eed4..00000000 --- a/python/test/test_gdal_dataset_geo_transform.py +++ /dev/null @@ -1,61 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.9.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.gdal_dataset_geo_transform import GdalDatasetGeoTransform - -class TestGdalDatasetGeoTransform(unittest.TestCase): - """GdalDatasetGeoTransform unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> GdalDatasetGeoTransform: - """Test GdalDatasetGeoTransform - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `GdalDatasetGeoTransform` - """ - model = GdalDatasetGeoTransform() - if include_optional: - return 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 - ) - else: - return 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, - ) - """ - - def testGdalDatasetGeoTransform(self): - """Test GdalDatasetGeoTransform""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_gdal_dataset_parameters.py b/python/test/test_gdal_dataset_parameters.py index 279fd403..81d4e600 100644 --- a/python/test/test_gdal_dataset_parameters.py +++ b/python/test/test_gdal_dataset_parameters.py @@ -47,7 +47,7 @@ def make_instance(self, include_optional) -> GdalDatasetParameters: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -72,7 +72,7 @@ def make_instance(self, include_optional) -> GdalDatasetParameters: return GdalDatasetParameters( file_not_found_handling = 'NoData', file_path = '', - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/python/test/test_gdal_loading_info_temporal_slice.py b/python/test/test_gdal_loading_info_temporal_slice.py index 00844c1a..1387a6c7 100644 --- a/python/test/test_gdal_loading_info_temporal_slice.py +++ b/python/test/test_gdal_loading_info_temporal_slice.py @@ -49,7 +49,7 @@ def make_instance(self, include_optional) -> GdalLoadingInfoTemporalSlice: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/python/test/test_gdal_meta_data_list.py b/python/test/test_gdal_meta_data_list.py index 2ae66a88..abf201f2 100644 --- a/python/test/test_gdal_meta_data_list.py +++ b/python/test/test_gdal_meta_data_list.py @@ -39,7 +39,38 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = null, + 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.geo_transform.GeoTransform( + 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, ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -54,7 +85,7 @@ def make_instance(self, include_optional) -> GdalMetaDataList: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -69,7 +100,9 @@ def make_instance(self, include_optional) -> GdalMetaDataList: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'GdalMetaDataList' ) @@ -78,7 +111,38 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = null, + 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.geo_transform.GeoTransform( + 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, ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -93,7 +157,7 @@ def make_instance(self, include_optional) -> GdalMetaDataList: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -108,7 +172,9 @@ def make_instance(self, include_optional) -> GdalMetaDataList: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'GdalMetaDataList', ) diff --git a/python/test/test_gdal_meta_data_regular.py b/python/test/test_gdal_meta_data_regular.py index 7f3ae233..39417960 100644 --- a/python/test/test_gdal_meta_data_regular.py +++ b/python/test/test_gdal_meta_data_regular.py @@ -52,7 +52,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -82,7 +82,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -97,7 +97,9 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', @@ -126,7 +128,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -156,7 +158,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -171,7 +173,9 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', diff --git a/python/test/test_gdal_meta_data_static.py b/python/test/test_gdal_meta_data_static.py index c49980e6..c84a4051 100644 --- a/python/test/test_gdal_meta_data_static.py +++ b/python/test/test_gdal_meta_data_static.py @@ -49,7 +49,7 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -79,7 +79,7 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -94,7 +94,9 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -115,7 +117,7 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -145,7 +147,7 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -160,7 +162,9 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = 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 75305d65..4c5bbf41 100644 --- a/python/test/test_gdal_metadata_net_cdf_cf.py +++ b/python/test/test_gdal_metadata_net_cdf_cf.py @@ -51,7 +51,7 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -81,7 +81,7 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -96,7 +96,9 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( @@ -120,7 +122,7 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: gdal_open_options = [ '' ], - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -150,7 +152,7 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -165,7 +167,9 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( diff --git a/python/test/test_gdal_multi_band.py b/python/test/test_gdal_multi_band.py index 02cd6db5..b89cea2c 100644 --- a/python/test/test_gdal_multi_band.py +++ b/python/test/test_gdal_multi_band.py @@ -46,7 +46,7 @@ def make_instance(self, include_optional) -> GdalMultiBand: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -61,7 +61,9 @@ def make_instance(self, include_optional) -> GdalMultiBand: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'GdalMultiBand' ) @@ -77,7 +79,7 @@ def make_instance(self, include_optional) -> GdalMultiBand: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -92,7 +94,9 @@ def make_instance(self, include_optional) -> GdalMultiBand: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'GdalMultiBand', ) diff --git a/python/test/test_meta_data_definition.py b/python/test/test_meta_data_definition.py index 4d7710b4..f209884a 100644 --- a/python/test/test_meta_data_definition.py +++ b/python/test/test_meta_data_definition.py @@ -39,8 +39,31 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + 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', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -59,7 +82,7 @@ def make_instance(self, include_optional) -> MetaDataDefinition: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -74,7 +97,9 @@ def make_instance(self, include_optional) -> MetaDataDefinition: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'MockMetaData', cache_ttl = 0, @@ -108,8 +133,31 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + 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', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -128,7 +176,7 @@ def make_instance(self, include_optional) -> MetaDataDefinition: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -143,7 +191,9 @@ def make_instance(self, include_optional) -> MetaDataDefinition: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ), type = 'MockMetaData', data_time = geoengine_openapi_client.models.time_interval.TimeInterval( diff --git a/python/test/test_mock_meta_data.py b/python/test/test_mock_meta_data.py index 9c02d11f..6e8955b3 100644 --- a/python/test/test_mock_meta_data.py +++ b/python/test/test_mock_meta_data.py @@ -43,7 +43,13 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + 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, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -51,7 +57,9 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData' ) else: @@ -63,7 +71,13 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + 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, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -71,7 +85,9 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData', ) """ diff --git a/python/test/test_ogr_meta_data.py b/python/test/test_ogr_meta_data.py index b44f26e2..e032d3b2 100644 --- a/python/test/test_ogr_meta_data.py +++ b/python/test/test_ogr_meta_data.py @@ -39,8 +39,31 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + 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', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -50,7 +73,13 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + 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, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -58,7 +87,9 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'OgrMetaData' ) else: @@ -66,8 +97,31 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + 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', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -77,7 +131,13 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + 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, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -85,7 +145,9 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'OgrMetaData', ) """ diff --git a/python/test/test_ogr_source_dataset.py b/python/test/test_ogr_source_dataset.py index 46d8b2ab..b620cc94 100644 --- a/python/test/test_ogr_source_dataset.py +++ b/python/test/test_ogr_source_dataset.py @@ -48,7 +48,9 @@ def make_instance(self, include_optional) -> OgrSourceDataset: float = [ '' ], - format_specifics = null, + format_specifics = geoengine_openapi_client.models.format_specifics.FormatSpecifics( + csv = geoengine_openapi_client.models.format_specifics_csv.FormatSpecifics_csv( + header = 'yes', ), ), int = [ '' ], diff --git a/python/test/test_raster_result_descriptor.py b/python/test/test_raster_result_descriptor.py index 82a0903b..55dd2336 100644 --- a/python/test/test_raster_result_descriptor.py +++ b/python/test/test_raster_result_descriptor.py @@ -45,7 +45,7 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -60,7 +60,9 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ) ) else: @@ -74,7 +76,7 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -89,7 +91,9 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_descriptor.TimeDescriptor( - bounds = null, + bounds = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), dimension = null, ), ) """ diff --git a/python/test/test_spatial_grid_definition.py b/python/test/test_spatial_grid_definition.py index 30ee2d4c..64f95ec9 100644 --- a/python/test/test_spatial_grid_definition.py +++ b/python/test/test_spatial_grid_definition.py @@ -36,7 +36,7 @@ def make_instance(self, include_optional) -> SpatialGridDefinition: model = SpatialGridDefinition() if include_optional: return SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -52,7 +52,7 @@ def make_instance(self, include_optional) -> SpatialGridDefinition: ) else: return SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/python/test/test_spatial_grid_descriptor.py b/python/test/test_spatial_grid_descriptor.py index b4a48db5..d5acf4be 100644 --- a/python/test/test_spatial_grid_descriptor.py +++ b/python/test/test_spatial_grid_descriptor.py @@ -38,7 +38,7 @@ def make_instance(self, include_optional) -> SpatialGridDescriptor: return SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -56,7 +56,7 @@ def make_instance(self, include_optional) -> SpatialGridDescriptor: return SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/python/test/test_typed_result_descriptor.py b/python/test/test_typed_result_descriptor.py index 04157087..5bfc480c 100644 --- a/python/test/test_typed_result_descriptor.py +++ b/python/test/test_typed_result_descriptor.py @@ -57,7 +57,7 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), @@ -92,7 +92,7 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( descriptor = 'source', spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( - geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + geo_transform = geoengine_openapi_client.models.geo_transform.GeoTransform( origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), diff --git a/typescript/README.md b/typescript/README.md index 12dbb2ba..54b4a3f3 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -203,7 +203,6 @@ All URIs are relative to *https://geoengine.io/api* - [FormatSpecifics](docs/FormatSpecifics.md) - [FormatSpecificsCsv](docs/FormatSpecificsCsv.md) - [GbifDataProviderDefinition](docs/GbifDataProviderDefinition.md) -- [GdalDatasetGeoTransform](docs/GdalDatasetGeoTransform.md) - [GdalDatasetParameters](docs/GdalDatasetParameters.md) - [GdalLoadingInfoTemporalSlice](docs/GdalLoadingInfoTemporalSlice.md) - [GdalMetaDataList](docs/GdalMetaDataList.md) @@ -418,7 +417,7 @@ and is automatically generated by the - API version: `0.9.0` - Package version: `0.0.30` -- Generator version: `7.18.0` +- Generator version: `7.17.0` - Build package: `org.openapitools.codegen.languages.TypeScriptFetchClientCodegen` The generated npm module supports the following: diff --git a/typescript/dist/esm/models/AddDataset.d.ts b/typescript/dist/esm/models/AddDataset.d.ts index 2b230f06..57ea8090 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 | null; + name?: string; /** * * @type {Array} diff --git a/typescript/dist/esm/models/GdalDatasetGeoTransform.d.ts b/typescript/dist/esm/models/GdalDatasetGeoTransform.d.ts deleted file mode 100644 index 097de277..00000000 --- a/typescript/dist/esm/models/GdalDatasetGeoTransform.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.9.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { Coordinate2D } from './Coordinate2D'; -/** - * - * @export - * @interface GdalDatasetGeoTransform - */ -export interface GdalDatasetGeoTransform { - /** - * - * @type {Coordinate2D} - * @memberof GdalDatasetGeoTransform - */ - originCoordinate: Coordinate2D; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - xPixelSize: number; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - yPixelSize: number; -} -/** - * Check if a given object implements the GdalDatasetGeoTransform interface. - */ -export declare function instanceOfGdalDatasetGeoTransform(value: object): value is GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformFromJSON(json: any): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformToJSON(json: any): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformToJSONTyped(value?: GdalDatasetGeoTransform | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/GdalDatasetGeoTransform.js b/typescript/dist/esm/models/GdalDatasetGeoTransform.js deleted file mode 100644 index e84477a1..00000000 --- a/typescript/dist/esm/models/GdalDatasetGeoTransform.js +++ /dev/null @@ -1,52 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.9.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import { Coordinate2DFromJSON, Coordinate2DToJSON, } from './Coordinate2D'; -/** - * Check if a given object implements the GdalDatasetGeoTransform interface. - */ -export function instanceOfGdalDatasetGeoTransform(value) { - if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) - return false; - if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) - return false; - if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) - return false; - return true; -} -export function GdalDatasetGeoTransformFromJSON(json) { - return GdalDatasetGeoTransformFromJSONTyped(json, false); -} -export function GdalDatasetGeoTransformFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'originCoordinate': Coordinate2DFromJSON(json['originCoordinate']), - 'xPixelSize': json['xPixelSize'], - 'yPixelSize': json['yPixelSize'], - }; -} -export function GdalDatasetGeoTransformToJSON(json) { - return GdalDatasetGeoTransformToJSONTyped(json, false); -} -export function GdalDatasetGeoTransformToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'originCoordinate': Coordinate2DToJSON(value['originCoordinate']), - 'xPixelSize': value['xPixelSize'], - 'yPixelSize': value['yPixelSize'], - }; -} diff --git a/typescript/dist/esm/models/GdalDatasetParameters.d.ts b/typescript/dist/esm/models/GdalDatasetParameters.d.ts index d2ffeb7f..8d96c6fa 100644 --- a/typescript/dist/esm/models/GdalDatasetParameters.d.ts +++ b/typescript/dist/esm/models/GdalDatasetParameters.d.ts @@ -9,9 +9,9 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { GdalDatasetGeoTransform } from './GdalDatasetGeoTransform'; import type { GdalMetadataMapping } from './GdalMetadataMapping'; import type { FileNotFoundHandling } from './FileNotFoundHandling'; +import type { GeoTransform } from './GeoTransform'; /** * Parameters for loading data using Gdal * @export @@ -50,10 +50,10 @@ export interface GdalDatasetParameters { gdalOpenOptions?: Array | null; /** * - * @type {GdalDatasetGeoTransform} + * @type {GeoTransform} * @memberof GdalDatasetParameters */ - geoTransform: GdalDatasetGeoTransform; + geoTransform: GeoTransform; /** * * @type {number} diff --git a/typescript/dist/esm/models/GdalDatasetParameters.js b/typescript/dist/esm/models/GdalDatasetParameters.js index 2a33d324..862fc700 100644 --- a/typescript/dist/esm/models/GdalDatasetParameters.js +++ b/typescript/dist/esm/models/GdalDatasetParameters.js @@ -11,9 +11,9 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { GdalDatasetGeoTransformFromJSON, GdalDatasetGeoTransformToJSON, } from './GdalDatasetGeoTransform'; import { GdalMetadataMappingFromJSON, GdalMetadataMappingToJSON, } from './GdalMetadataMapping'; import { FileNotFoundHandlingFromJSON, FileNotFoundHandlingToJSON, } from './FileNotFoundHandling'; +import { GeoTransformFromJSON, GeoTransformToJSON, } from './GeoTransform'; /** * Check if a given object implements the GdalDatasetParameters interface. */ @@ -45,7 +45,7 @@ export function GdalDatasetParametersFromJSONTyped(json, ignoreDiscriminator) { 'filePath': json['filePath'], 'gdalConfigOptions': json['gdalConfigOptions'] == null ? undefined : json['gdalConfigOptions'], 'gdalOpenOptions': json['gdalOpenOptions'] == null ? undefined : json['gdalOpenOptions'], - 'geoTransform': GdalDatasetGeoTransformFromJSON(json['geoTransform']), + 'geoTransform': GeoTransformFromJSON(json['geoTransform']), 'height': json['height'], 'noDataValue': json['noDataValue'] == null ? undefined : json['noDataValue'], 'propertiesMapping': json['propertiesMapping'] == null ? undefined : (json['propertiesMapping'].map(GdalMetadataMappingFromJSON)), @@ -66,7 +66,7 @@ export function GdalDatasetParametersToJSONTyped(value, ignoreDiscriminator = fa 'filePath': value['filePath'], 'gdalConfigOptions': value['gdalConfigOptions'], 'gdalOpenOptions': value['gdalOpenOptions'], - 'geoTransform': GdalDatasetGeoTransformToJSON(value['geoTransform']), + 'geoTransform': GeoTransformToJSON(value['geoTransform']), 'height': value['height'], 'noDataValue': value['noDataValue'], 'propertiesMapping': value['propertiesMapping'] == null ? undefined : (value['propertiesMapping'].map(GdalMetadataMappingToJSON)), diff --git a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts index fd7ea406..0c651af6 100644 --- a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts @@ -32,9 +32,7 @@ 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 a5cf2cec..96c226d1 100644 --- a/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts +++ b/typescript/dist/esm/models/MultiBandRasterColorizer.d.ts @@ -64,8 +64,7 @@ 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 0981bb95..a2e413f6 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 | null; + name?: string; /** * * @type {RasterToDatasetQueryRectangle} diff --git a/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts b/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts index 95e1084c..5f5f020e 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 | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/dist/esm/models/UserSession.d.ts b/typescript/dist/esm/models/UserSession.d.ts index 234a696e..3b17b3d1 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 | null; + project?: string; /** * * @type {Array} diff --git a/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts index d6bbc696..163339fb 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 | null; + refreshToken?: string; /** * * @type {string} diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index de89bf9f..c4acc3ac 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -49,7 +49,6 @@ export * from './FileNotFoundHandling'; export * from './FormatSpecifics'; export * from './FormatSpecificsCsv'; export * from './GbifDataProviderDefinition'; -export * from './GdalDatasetGeoTransform'; export * from './GdalDatasetParameters'; export * from './GdalLoadingInfoTemporalSlice'; export * from './GdalMetaDataList'; diff --git a/typescript/dist/esm/models/index.js b/typescript/dist/esm/models/index.js index 81316b39..cc760b5e 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -51,7 +51,6 @@ export * from './FileNotFoundHandling'; export * from './FormatSpecifics'; export * from './FormatSpecificsCsv'; export * from './GbifDataProviderDefinition'; -export * from './GdalDatasetGeoTransform'; export * from './GdalDatasetParameters'; export * from './GdalLoadingInfoTemporalSlice'; export * from './GdalMetaDataList'; diff --git a/typescript/dist/models/AddDataset.d.ts b/typescript/dist/models/AddDataset.d.ts index 2b230f06..57ea8090 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 | null; + name?: string; /** * * @type {Array} diff --git a/typescript/dist/models/GdalDatasetGeoTransform.d.ts b/typescript/dist/models/GdalDatasetGeoTransform.d.ts deleted file mode 100644 index 097de277..00000000 --- a/typescript/dist/models/GdalDatasetGeoTransform.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.9.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { Coordinate2D } from './Coordinate2D'; -/** - * - * @export - * @interface GdalDatasetGeoTransform - */ -export interface GdalDatasetGeoTransform { - /** - * - * @type {Coordinate2D} - * @memberof GdalDatasetGeoTransform - */ - originCoordinate: Coordinate2D; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - xPixelSize: number; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - yPixelSize: number; -} -/** - * Check if a given object implements the GdalDatasetGeoTransform interface. - */ -export declare function instanceOfGdalDatasetGeoTransform(value: object): value is GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformFromJSON(json: any): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformToJSON(json: any): GdalDatasetGeoTransform; -export declare function GdalDatasetGeoTransformToJSONTyped(value?: GdalDatasetGeoTransform | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/GdalDatasetGeoTransform.js b/typescript/dist/models/GdalDatasetGeoTransform.js deleted file mode 100644 index 4c81de9a..00000000 --- a/typescript/dist/models/GdalDatasetGeoTransform.js +++ /dev/null @@ -1,59 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.9.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfGdalDatasetGeoTransform = instanceOfGdalDatasetGeoTransform; -exports.GdalDatasetGeoTransformFromJSON = GdalDatasetGeoTransformFromJSON; -exports.GdalDatasetGeoTransformFromJSONTyped = GdalDatasetGeoTransformFromJSONTyped; -exports.GdalDatasetGeoTransformToJSON = GdalDatasetGeoTransformToJSON; -exports.GdalDatasetGeoTransformToJSONTyped = GdalDatasetGeoTransformToJSONTyped; -const Coordinate2D_1 = require("./Coordinate2D"); -/** - * Check if a given object implements the GdalDatasetGeoTransform interface. - */ -function instanceOfGdalDatasetGeoTransform(value) { - if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) - return false; - if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) - return false; - if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) - return false; - return true; -} -function GdalDatasetGeoTransformFromJSON(json) { - return GdalDatasetGeoTransformFromJSONTyped(json, false); -} -function GdalDatasetGeoTransformFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'originCoordinate': (0, Coordinate2D_1.Coordinate2DFromJSON)(json['originCoordinate']), - 'xPixelSize': json['xPixelSize'], - 'yPixelSize': json['yPixelSize'], - }; -} -function GdalDatasetGeoTransformToJSON(json) { - return GdalDatasetGeoTransformToJSONTyped(json, false); -} -function GdalDatasetGeoTransformToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'originCoordinate': (0, Coordinate2D_1.Coordinate2DToJSON)(value['originCoordinate']), - 'xPixelSize': value['xPixelSize'], - 'yPixelSize': value['yPixelSize'], - }; -} diff --git a/typescript/dist/models/GdalDatasetParameters.d.ts b/typescript/dist/models/GdalDatasetParameters.d.ts index d2ffeb7f..8d96c6fa 100644 --- a/typescript/dist/models/GdalDatasetParameters.d.ts +++ b/typescript/dist/models/GdalDatasetParameters.d.ts @@ -9,9 +9,9 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { GdalDatasetGeoTransform } from './GdalDatasetGeoTransform'; import type { GdalMetadataMapping } from './GdalMetadataMapping'; import type { FileNotFoundHandling } from './FileNotFoundHandling'; +import type { GeoTransform } from './GeoTransform'; /** * Parameters for loading data using Gdal * @export @@ -50,10 +50,10 @@ export interface GdalDatasetParameters { gdalOpenOptions?: Array | null; /** * - * @type {GdalDatasetGeoTransform} + * @type {GeoTransform} * @memberof GdalDatasetParameters */ - geoTransform: GdalDatasetGeoTransform; + geoTransform: GeoTransform; /** * * @type {number} diff --git a/typescript/dist/models/GdalDatasetParameters.js b/typescript/dist/models/GdalDatasetParameters.js index ebdd71a7..1e5ef138 100644 --- a/typescript/dist/models/GdalDatasetParameters.js +++ b/typescript/dist/models/GdalDatasetParameters.js @@ -18,9 +18,9 @@ exports.GdalDatasetParametersFromJSON = GdalDatasetParametersFromJSON; exports.GdalDatasetParametersFromJSONTyped = GdalDatasetParametersFromJSONTyped; exports.GdalDatasetParametersToJSON = GdalDatasetParametersToJSON; exports.GdalDatasetParametersToJSONTyped = GdalDatasetParametersToJSONTyped; -const GdalDatasetGeoTransform_1 = require("./GdalDatasetGeoTransform"); const GdalMetadataMapping_1 = require("./GdalMetadataMapping"); const FileNotFoundHandling_1 = require("./FileNotFoundHandling"); +const GeoTransform_1 = require("./GeoTransform"); /** * Check if a given object implements the GdalDatasetParameters interface. */ @@ -52,7 +52,7 @@ function GdalDatasetParametersFromJSONTyped(json, ignoreDiscriminator) { 'filePath': json['filePath'], 'gdalConfigOptions': json['gdalConfigOptions'] == null ? undefined : json['gdalConfigOptions'], 'gdalOpenOptions': json['gdalOpenOptions'] == null ? undefined : json['gdalOpenOptions'], - 'geoTransform': (0, GdalDatasetGeoTransform_1.GdalDatasetGeoTransformFromJSON)(json['geoTransform']), + 'geoTransform': (0, GeoTransform_1.GeoTransformFromJSON)(json['geoTransform']), 'height': json['height'], 'noDataValue': json['noDataValue'] == null ? undefined : json['noDataValue'], 'propertiesMapping': json['propertiesMapping'] == null ? undefined : (json['propertiesMapping'].map(GdalMetadataMapping_1.GdalMetadataMappingFromJSON)), @@ -73,7 +73,7 @@ function GdalDatasetParametersToJSONTyped(value, ignoreDiscriminator = false) { 'filePath': value['filePath'], 'gdalConfigOptions': value['gdalConfigOptions'], 'gdalOpenOptions': value['gdalOpenOptions'], - 'geoTransform': (0, GdalDatasetGeoTransform_1.GdalDatasetGeoTransformToJSON)(value['geoTransform']), + 'geoTransform': (0, GeoTransform_1.GeoTransformToJSON)(value['geoTransform']), 'height': value['height'], 'noDataValue': value['noDataValue'], 'propertiesMapping': value['propertiesMapping'] == null ? undefined : (value['propertiesMapping'].map(GdalMetadataMapping_1.GdalMetadataMappingToJSON)), diff --git a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts index fd7ea406..0c651af6 100644 --- a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts @@ -32,9 +32,7 @@ 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 a5cf2cec..96c226d1 100644 --- a/typescript/dist/models/MultiBandRasterColorizer.d.ts +++ b/typescript/dist/models/MultiBandRasterColorizer.d.ts @@ -64,8 +64,7 @@ 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 0981bb95..a2e413f6 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 | null; + name?: string; /** * * @type {RasterToDatasetQueryRectangle} diff --git a/typescript/dist/models/SpatialReferenceSpecification.d.ts b/typescript/dist/models/SpatialReferenceSpecification.d.ts index 95e1084c..5f5f020e 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 | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/dist/models/UserSession.d.ts b/typescript/dist/models/UserSession.d.ts index 234a696e..3b17b3d1 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 | null; + project?: string; /** * * @type {Array} diff --git a/typescript/dist/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/models/WildliveDataConnectorDefinition.d.ts index d6bbc696..163339fb 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 | null; + refreshToken?: string; /** * * @type {string} diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index de89bf9f..c4acc3ac 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -49,7 +49,6 @@ export * from './FileNotFoundHandling'; export * from './FormatSpecifics'; export * from './FormatSpecificsCsv'; export * from './GbifDataProviderDefinition'; -export * from './GdalDatasetGeoTransform'; export * from './GdalDatasetParameters'; export * from './GdalLoadingInfoTemporalSlice'; export * from './GdalMetaDataList'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index b733c323..9d65404e 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -67,7 +67,6 @@ __exportStar(require("./FileNotFoundHandling"), exports); __exportStar(require("./FormatSpecifics"), exports); __exportStar(require("./FormatSpecificsCsv"), exports); __exportStar(require("./GbifDataProviderDefinition"), exports); -__exportStar(require("./GdalDatasetGeoTransform"), exports); __exportStar(require("./GdalDatasetParameters"), exports); __exportStar(require("./GdalLoadingInfoTemporalSlice"), exports); __exportStar(require("./GdalMetaDataList"), exports); diff --git a/typescript/docs/GdalDatasetParameters.md b/typescript/docs/GdalDatasetParameters.md index 64183021..3d79f8c3 100644 --- a/typescript/docs/GdalDatasetParameters.md +++ b/typescript/docs/GdalDatasetParameters.md @@ -12,7 +12,7 @@ Name | Type `filePath` | string `gdalConfigOptions` | Array<Array<string>> `gdalOpenOptions` | Array<string> -`geoTransform` | [GdalDatasetGeoTransform](GdalDatasetGeoTransform.md) +`geoTransform` | [GeoTransform](GeoTransform.md) `height` | number `noDataValue` | number `propertiesMapping` | [Array<GdalMetadataMapping>](GdalMetadataMapping.md) diff --git a/typescript/src/models/AddDataset.ts b/typescript/src/models/AddDataset.ts index 52aabed8..5327dba3 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 | null; + name?: string; /** * * @type {Array} diff --git a/typescript/src/models/GdalDatasetGeoTransform.ts b/typescript/src/models/GdalDatasetGeoTransform.ts deleted file mode 100644 index 96aa5ce2..00000000 --- a/typescript/src/models/GdalDatasetGeoTransform.ts +++ /dev/null @@ -1,92 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.9.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -import type { Coordinate2D } from './Coordinate2D'; -import { - Coordinate2DFromJSON, - Coordinate2DFromJSONTyped, - Coordinate2DToJSON, - Coordinate2DToJSONTyped, -} from './Coordinate2D'; - -/** - * - * @export - * @interface GdalDatasetGeoTransform - */ -export interface GdalDatasetGeoTransform { - /** - * - * @type {Coordinate2D} - * @memberof GdalDatasetGeoTransform - */ - originCoordinate: Coordinate2D; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - xPixelSize: number; - /** - * - * @type {number} - * @memberof GdalDatasetGeoTransform - */ - yPixelSize: number; -} - -/** - * Check if a given object implements the GdalDatasetGeoTransform interface. - */ -export function instanceOfGdalDatasetGeoTransform(value: object): value is GdalDatasetGeoTransform { - if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) return false; - if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) return false; - if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) return false; - return true; -} - -export function GdalDatasetGeoTransformFromJSON(json: any): GdalDatasetGeoTransform { - return GdalDatasetGeoTransformFromJSONTyped(json, false); -} - -export function GdalDatasetGeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GdalDatasetGeoTransform { - if (json == null) { - return json; - } - return { - - 'originCoordinate': Coordinate2DFromJSON(json['originCoordinate']), - 'xPixelSize': json['xPixelSize'], - 'yPixelSize': json['yPixelSize'], - }; -} - -export function GdalDatasetGeoTransformToJSON(json: any): GdalDatasetGeoTransform { - return GdalDatasetGeoTransformToJSONTyped(json, false); -} - -export function GdalDatasetGeoTransformToJSONTyped(value?: GdalDatasetGeoTransform | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'originCoordinate': Coordinate2DToJSON(value['originCoordinate']), - 'xPixelSize': value['xPixelSize'], - 'yPixelSize': value['yPixelSize'], - }; -} - diff --git a/typescript/src/models/GdalDatasetParameters.ts b/typescript/src/models/GdalDatasetParameters.ts index 1c050c9a..c99e3406 100644 --- a/typescript/src/models/GdalDatasetParameters.ts +++ b/typescript/src/models/GdalDatasetParameters.ts @@ -13,13 +13,6 @@ */ import { mapValues } from '../runtime'; -import type { GdalDatasetGeoTransform } from './GdalDatasetGeoTransform'; -import { - GdalDatasetGeoTransformFromJSON, - GdalDatasetGeoTransformFromJSONTyped, - GdalDatasetGeoTransformToJSON, - GdalDatasetGeoTransformToJSONTyped, -} from './GdalDatasetGeoTransform'; import type { GdalMetadataMapping } from './GdalMetadataMapping'; import { GdalMetadataMappingFromJSON, @@ -34,6 +27,13 @@ import { FileNotFoundHandlingToJSON, FileNotFoundHandlingToJSONTyped, } from './FileNotFoundHandling'; +import type { GeoTransform } from './GeoTransform'; +import { + GeoTransformFromJSON, + GeoTransformFromJSONTyped, + GeoTransformToJSON, + GeoTransformToJSONTyped, +} from './GeoTransform'; /** * Parameters for loading data using Gdal @@ -73,10 +73,10 @@ export interface GdalDatasetParameters { gdalOpenOptions?: Array | null; /** * - * @type {GdalDatasetGeoTransform} + * @type {GeoTransform} * @memberof GdalDatasetParameters */ - geoTransform: GdalDatasetGeoTransform; + geoTransform: GeoTransform; /** * * @type {number} @@ -139,7 +139,7 @@ export function GdalDatasetParametersFromJSONTyped(json: any, ignoreDiscriminato 'filePath': json['filePath'], 'gdalConfigOptions': json['gdalConfigOptions'] == null ? undefined : json['gdalConfigOptions'], 'gdalOpenOptions': json['gdalOpenOptions'] == null ? undefined : json['gdalOpenOptions'], - 'geoTransform': GdalDatasetGeoTransformFromJSON(json['geoTransform']), + 'geoTransform': GeoTransformFromJSON(json['geoTransform']), 'height': json['height'], 'noDataValue': json['noDataValue'] == null ? undefined : json['noDataValue'], 'propertiesMapping': json['propertiesMapping'] == null ? undefined : ((json['propertiesMapping'] as Array).map(GdalMetadataMappingFromJSON)), @@ -164,7 +164,7 @@ export function GdalDatasetParametersToJSONTyped(value?: GdalDatasetParameters | 'filePath': value['filePath'], 'gdalConfigOptions': value['gdalConfigOptions'], 'gdalOpenOptions': value['gdalOpenOptions'], - 'geoTransform': GdalDatasetGeoTransformToJSON(value['geoTransform']), + 'geoTransform': GeoTransformToJSON(value['geoTransform']), 'height': value['height'], 'noDataValue': value['noDataValue'], 'propertiesMapping': value['propertiesMapping'] == null ? undefined : ((value['propertiesMapping'] as Array).map(GdalMetadataMappingToJSON)), diff --git a/typescript/src/models/GdalMetadataNetCdfCf.ts b/typescript/src/models/GdalMetadataNetCdfCf.ts index 42127c6e..33d9c033 100644 --- a/typescript/src/models/GdalMetadataNetCdfCf.ts +++ b/typescript/src/models/GdalMetadataNetCdfCf.ts @@ -55,9 +55,7 @@ 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 e14205c8..3d7e219f 100644 --- a/typescript/src/models/MultiBandRasterColorizer.ts +++ b/typescript/src/models/MultiBandRasterColorizer.ts @@ -68,8 +68,7 @@ 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 08031ff0..61a49cd1 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 | null; + name?: string; /** * * @type {RasterToDatasetQueryRectangle} diff --git a/typescript/src/models/SpatialReferenceSpecification.ts b/typescript/src/models/SpatialReferenceSpecification.ts index b86e3352..1a481f49 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 | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/src/models/UserSession.ts b/typescript/src/models/UserSession.ts index bee84658..0638ac34 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 | null; + project?: string; /** * * @type {Array} diff --git a/typescript/src/models/WildliveDataConnectorDefinition.ts b/typescript/src/models/WildliveDataConnectorDefinition.ts index 7837ce68..9c33dae5 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 | null; + refreshToken?: string; /** * * @type {string} diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index 81316b39..cc760b5e 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -51,7 +51,6 @@ export * from './FileNotFoundHandling'; export * from './FormatSpecifics'; export * from './FormatSpecificsCsv'; export * from './GbifDataProviderDefinition'; -export * from './GdalDatasetGeoTransform'; export * from './GdalDatasetParameters'; export * from './GdalLoadingInfoTemporalSlice'; export * from './GdalMetaDataList';