From c8156dec22a5a6c30f3b15a35b2d19215c1ffc66 Mon Sep 17 00:00:00 2001 From: Michael Mattig Date: Tue, 15 Oct 2024 16:43:28 +0200 Subject: [PATCH 1/3] update openapi-client --- .generation/input/openapi.json | 94 ++++++++--- python/.openapi-generator/FILES | 6 +- python/README.md | 3 +- python/geoengine_openapi_client/__init__.py | 2 +- .../api/datasets_api.py | 147 ++++++++++++++++++ .../models/__init__.py | 2 +- .../models/gdal_source_time_placeholder.py | 10 +- .../models/ogr_source_dataset_time_type.py | 4 +- .../ogr_source_dataset_time_type_none.py | 4 +- ...source_dataset_time_type_start_duration.py | 4 +- .../ogr_source_dataset_time_type_start_end.py | 4 +- .../models/ogr_source_time_format_custom.py | 8 +- .../models/volume_file_layers_response.py | 72 +++++++++ python/test/test_datasets_api.py | 7 + python/test/test_gdal_meta_data_regular.py | 10 +- .../test/test_gdal_source_time_placeholder.py | 10 +- python/test/test_meta_data_definition.py | 10 +- ...source_dataset_time_type_start_duration.py | 4 +- ..._ogr_source_dataset_time_type_start_end.py | 4 +- python/test/test_ogr_source_time_format.py | 10 +- .../test_ogr_source_time_format_custom.py | 10 +- ...py => test_volume_file_layers_response.py} | 34 ++-- typescript/dist/apis/DatasetsApi.d.ts | 14 +- typescript/dist/apis/DatasetsApi.js | 38 +++++ typescript/dist/esm/apis/DatasetsApi.d.ts | 14 +- typescript/dist/esm/apis/DatasetsApi.js | 40 ++++- .../esm/models/GdalSourceTimePlaceholder.d.ts | 5 +- .../esm/models/GdalSourceTimePlaceholder.js | 5 +- .../esm/models/OgrSourceDatasetTimeType.d.ts | 4 +- .../esm/models/OgrSourceDatasetTimeType.js | 12 +- .../models/OgrSourceDatasetTimeTypeNone.d.ts | 4 +- .../models/OgrSourceDatasetTimeTypeNone.js | 4 +- ...OgrSourceDatasetTimeTypeStartDuration.d.ts | 2 +- .../OgrSourceDatasetTimeTypeStartDuration.js | 2 +- .../OgrSourceDatasetTimeTypeStartEnd.d.ts | 2 +- .../OgrSourceDatasetTimeTypeStartEnd.js | 2 +- .../esm/models/OgrSourceTimeFormatCustom.d.ts | 5 +- .../esm/models/OgrSourceTimeFormatCustom.js | 5 +- .../esm/models/VolumeFileLayersResponse.d.ts | 31 ++++ .../esm/models/VolumeFileLayersResponse.js | 43 +++++ typescript/dist/esm/models/index.d.ts | 2 +- typescript/dist/esm/models/index.js | 2 +- .../models/GdalSourceTimePlaceholder.d.ts | 5 +- .../dist/models/GdalSourceTimePlaceholder.js | 5 +- .../dist/models/OgrSourceDatasetTimeType.d.ts | 4 +- .../dist/models/OgrSourceDatasetTimeType.js | 12 +- .../models/OgrSourceDatasetTimeTypeNone.d.ts | 4 +- .../models/OgrSourceDatasetTimeTypeNone.js | 4 +- ...OgrSourceDatasetTimeTypeStartDuration.d.ts | 2 +- .../OgrSourceDatasetTimeTypeStartDuration.js | 2 +- .../OgrSourceDatasetTimeTypeStartEnd.d.ts | 2 +- .../OgrSourceDatasetTimeTypeStartEnd.js | 2 +- .../models/OgrSourceTimeFormatCustom.d.ts | 5 +- .../dist/models/OgrSourceTimeFormatCustom.js | 5 +- .../dist/models/VolumeFileLayersResponse.d.ts | 31 ++++ .../dist/models/VolumeFileLayersResponse.js | 50 ++++++ typescript/dist/models/index.d.ts | 2 +- typescript/dist/models/index.js | 2 +- typescript/src/apis/DatasetsApi.ts | 50 ++++++ .../src/models/GdalSourceTimePlaceholder.ts | 14 +- .../src/models/OgrSourceDatasetTimeType.ts | 14 +- .../models/OgrSourceDatasetTimeTypeNone.ts | 4 +- .../OgrSourceDatasetTimeTypeStartDuration.ts | 2 +- .../OgrSourceDatasetTimeTypeStartEnd.ts | 2 +- .../src/models/OgrSourceTimeFormatCustom.ts | 15 +- .../src/models/VolumeFileLayersResponse.ts | 66 ++++++++ typescript/src/models/index.ts | 2 +- 67 files changed, 796 insertions(+), 205 deletions(-) create mode 100644 python/geoengine_openapi_client/models/volume_file_layers_response.py rename python/test/{test_date_time_parse_format.py => test_volume_file_layers_response.py} (53%) create mode 100644 typescript/dist/esm/models/VolumeFileLayersResponse.d.ts create mode 100644 typescript/dist/esm/models/VolumeFileLayersResponse.js create mode 100644 typescript/dist/models/VolumeFileLayersResponse.d.ts create mode 100644 typescript/dist/models/VolumeFileLayersResponse.js create mode 100644 typescript/src/models/VolumeFileLayersResponse.ts diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index 374028b6..e31ebd80 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -536,6 +536,58 @@ ] } }, + "/dataset/volumes/{volume_name}/files/{file_name}/layers": { + "get": { + "tags": [ + "Datasets" + ], + "summary": "List the layers of on uploaded file.", + "operationId": "list_volume_file_layers_handler", + "parameters": [ + { + "name": "volume_name", + "in": "path", + "description": "Volume id", + "required": true, + "schema": { + "$ref": "#/components/schemas/VolumeName" + } + }, + { + "name": "file_name", + "in": "path", + "description": "File name", + "required": true, + "schema": { + "type": "string" + } + } + ], + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/VolumeFileLayersResponse" + }, + "example": { + "layers": [ + "layer1", + "layer2" + ] + } + } + } + } + }, + "security": [ + { + "session_token": [] + } + ] + } + }, "/dataset/{dataset}": { "get": { "tags": [ @@ -5636,23 +5688,7 @@ } }, "DateTimeParseFormat": { - "type": "object", - "required": [ - "fmt", - "has_tz", - "has_time" - ], - "properties": { - "fmt": { - "type": "string" - }, - "has_time": { - "type": "boolean" - }, - "has_tz": { - "type": "boolean" - } - } + "type": "string" }, "DerivedColor": { "type": "object", @@ -6894,8 +6930,8 @@ "mapping": { "none": "#/components/schemas/OgrSourceDatasetTimeTypeNone", "start": "#/components/schemas/OgrSourceDatasetTimeTypeStart", - "startDuration": "#/components/schemas/OgrSourceDatasetTimeTypeStartDuration", - "startEnd": "#/components/schemas/OgrSourceDatasetTimeTypeStartEnd" + "start+duration": "#/components/schemas/OgrSourceDatasetTimeTypeStartDuration", + "start+end": "#/components/schemas/OgrSourceDatasetTimeTypeStartEnd" } } }, @@ -6941,6 +6977,7 @@ }, "OgrSourceDatasetTimeTypeStartDuration": { "type": "object", + "title": "OgrSourceDatasetTimeTypeStartDuration", "required": [ "startField", "startFormat", @@ -6960,13 +6997,14 @@ "type": { "type": "string", "enum": [ - "startDuration" + "start+duration" ] } } }, "OgrSourceDatasetTimeTypeStartEnd": { "type": "object", + "title": "OgrSourceDatasetTimeTypeStartEnd", "required": [ "startField", "startFormat", @@ -6990,7 +7028,7 @@ "type": { "type": "string", "enum": [ - "startEnd" + "start+end" ] } } @@ -9314,6 +9352,20 @@ } } }, + "VolumeFileLayersResponse": { + "type": "object", + "required": [ + "layers" + ], + "properties": { + "layers": { + "type": "array", + "items": { + "type": "string" + } + } + } + }, "VolumeName": { "type": "string" }, diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index 5c075de8..ca69c146 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -36,7 +36,6 @@ docs/DatasetListing.md docs/DatasetResource.md docs/DatasetsApi.md docs/DateTime.md -docs/DateTimeParseFormat.md docs/DerivedColor.md docs/DerivedNumber.md docs/DescribeCoverageRequest.md @@ -224,6 +223,7 @@ docs/VectorDataType.md docs/VectorQueryRectangle.md docs/VectorResultDescriptor.md docs/Volume.md +docs/VolumeFileLayersResponse.md docs/WcsBoundingbox.md docs/WcsService.md docs/WcsVersion.md @@ -289,7 +289,6 @@ geoengine_openapi_client/models/dataset_definition.py geoengine_openapi_client/models/dataset_listing.py geoengine_openapi_client/models/dataset_resource.py geoengine_openapi_client/models/date_time.py -geoengine_openapi_client/models/date_time_parse_format.py geoengine_openapi_client/models/derived_color.py geoengine_openapi_client/models/derived_number.py geoengine_openapi_client/models/describe_coverage_request.py @@ -463,6 +462,7 @@ geoengine_openapi_client/models/vector_data_type.py geoengine_openapi_client/models/vector_query_rectangle.py geoengine_openapi_client/models/vector_result_descriptor.py geoengine_openapi_client/models/volume.py +geoengine_openapi_client/models/volume_file_layers_response.py geoengine_openapi_client/models/wcs_boundingbox.py geoengine_openapi_client/models/wcs_service.py geoengine_openapi_client/models/wcs_version.py @@ -514,7 +514,6 @@ test/test_dataset_listing.py test/test_dataset_resource.py test/test_datasets_api.py test/test_date_time.py -test/test_date_time_parse_format.py test/test_derived_color.py test/test_derived_number.py test/test_describe_coverage_request.py @@ -702,6 +701,7 @@ test/test_vector_data_type.py test/test_vector_query_rectangle.py test/test_vector_result_descriptor.py test/test_volume.py +test/test_volume_file_layers_response.py test/test_wcs_boundingbox.py test/test_wcs_service.py test/test_wcs_version.py diff --git a/python/README.md b/python/README.md index 8b15bb46..6eab8a61 100644 --- a/python/README.md +++ b/python/README.md @@ -100,6 +100,7 @@ Class | Method | HTTP request | Description *DatasetsApi* | [**get_dataset_handler**](docs/DatasetsApi.md#get_dataset_handler) | **GET** /dataset/{dataset} | Retrieves details about a dataset using the internal name. *DatasetsApi* | [**get_loading_info_handler**](docs/DatasetsApi.md#get_loading_info_handler) | **GET** /dataset/{dataset}/loadingInfo | Retrieves the loading information of a dataset *DatasetsApi* | [**list_datasets_handler**](docs/DatasetsApi.md#list_datasets_handler) | **GET** /datasets | Lists available datasets. +*DatasetsApi* | [**list_volume_file_layers_handler**](docs/DatasetsApi.md#list_volume_file_layers_handler) | **GET** /dataset/volumes/{volume_name}/files/{file_name}/layers | List the layers of on uploaded file. *DatasetsApi* | [**list_volumes_handler**](docs/DatasetsApi.md#list_volumes_handler) | **GET** /dataset/volumes | Lists available volumes. *DatasetsApi* | [**suggest_meta_data_handler**](docs/DatasetsApi.md#suggest_meta_data_handler) | **POST** /dataset/suggest | Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. *DatasetsApi* | [**update_dataset_handler**](docs/DatasetsApi.md#update_dataset_handler) | **POST** /dataset/{dataset} | Update details about a dataset using the internal name. @@ -211,7 +212,6 @@ Class | Method | HTTP request | Description - [DatasetListing](docs/DatasetListing.md) - [DatasetResource](docs/DatasetResource.md) - [DateTime](docs/DateTime.md) - - [DateTimeParseFormat](docs/DateTimeParseFormat.md) - [DerivedColor](docs/DerivedColor.md) - [DerivedNumber](docs/DerivedNumber.md) - [DescribeCoverageRequest](docs/DescribeCoverageRequest.md) @@ -385,6 +385,7 @@ Class | Method | HTTP request | Description - [VectorQueryRectangle](docs/VectorQueryRectangle.md) - [VectorResultDescriptor](docs/VectorResultDescriptor.md) - [Volume](docs/Volume.md) + - [VolumeFileLayersResponse](docs/VolumeFileLayersResponse.md) - [WcsBoundingbox](docs/WcsBoundingbox.md) - [WcsService](docs/WcsService.md) - [WcsVersion](docs/WcsVersion.md) diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 14b01413..feea526c 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -79,7 +79,6 @@ from geoengine_openapi_client.models.dataset_listing import DatasetListing from geoengine_openapi_client.models.dataset_resource import DatasetResource from geoengine_openapi_client.models.date_time import DateTime -from geoengine_openapi_client.models.date_time_parse_format import DateTimeParseFormat from geoengine_openapi_client.models.derived_color import DerivedColor from geoengine_openapi_client.models.derived_number import DerivedNumber from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest @@ -253,6 +252,7 @@ from geoengine_openapi_client.models.vector_query_rectangle import VectorQueryRectangle from geoengine_openapi_client.models.vector_result_descriptor import VectorResultDescriptor from geoengine_openapi_client.models.volume import Volume +from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse from geoengine_openapi_client.models.wcs_boundingbox import WcsBoundingbox from geoengine_openapi_client.models.wcs_service import WcsService from geoengine_openapi_client.models.wcs_version import WcsVersion diff --git a/python/geoengine_openapi_client/api/datasets_api.py b/python/geoengine_openapi_client/api/datasets_api.py index 6f97f152..e49299ca 100644 --- a/python/geoengine_openapi_client/api/datasets_api.py +++ b/python/geoengine_openapi_client/api/datasets_api.py @@ -37,6 +37,7 @@ from geoengine_openapi_client.models.symbology import Symbology from geoengine_openapi_client.models.update_dataset import UpdateDataset from geoengine_openapi_client.models.volume import Volume +from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse from geoengine_openapi_client.api_client import ApiClient from geoengine_openapi_client.api_response import ApiResponse @@ -946,6 +947,152 @@ def list_datasets_handler_with_http_info(self, order : OrderBy, offset : conint( collection_formats=_collection_formats, _request_auth=_params.get('_request_auth')) + @validate_arguments + def list_volume_file_layers_handler(self, volume_name : Annotated[StrictStr, Field(..., description="Volume id")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> VolumeFileLayersResponse: # noqa: E501 + """List the layers of on uploaded file. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.list_volume_file_layers_handler(volume_name, file_name, async_req=True) + >>> result = thread.get() + + :param volume_name: Volume id (required) + :type volume_name: str + :param file_name: File name (required) + :type file_name: str + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :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 + (connection, read) timeouts. + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: VolumeFileLayersResponse + """ + kwargs['_return_http_data_only'] = True + if '_preload_content' in kwargs: + message = "Error! Please call the list_volume_file_layers_handler_with_http_info method with `_preload_content` instead and obtain raw data from ApiResponse.raw_data" # noqa: E501 + raise ValueError(message) + return self.list_volume_file_layers_handler_with_http_info(volume_name, file_name, **kwargs) # noqa: E501 + + @validate_arguments + def list_volume_file_layers_handler_with_http_info(self, volume_name : Annotated[StrictStr, Field(..., description="Volume id")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> ApiResponse: # noqa: E501 + """List the layers of on uploaded file. # noqa: E501 + + This method makes a synchronous HTTP request by default. To make an + asynchronous HTTP request, please pass async_req=True + + >>> thread = api.list_volume_file_layers_handler_with_http_info(volume_name, file_name, async_req=True) + >>> result = thread.get() + + :param volume_name: Volume id (required) + :type volume_name: str + :param file_name: File name (required) + :type file_name: str + :param async_req: Whether to execute the request asynchronously. + :type async_req: bool, optional + :param _preload_content: if False, the ApiResponse.data will + be set to none and raw_data will store the + HTTP response body without reading/decoding. + Default is True. + :type _preload_content: bool, optional + :param _return_http_data_only: response data instead of ApiResponse + object with status code, headers, etc + :type _return_http_data_only: bool, optional + :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 + (connection, read) timeouts. + :param _request_auth: set to override the auth_settings for an a single + request; this effectively ignores the authentication + in the spec for a single request. + :type _request_auth: dict, optional + :type _content_type: string, optional: force content-type for the request + :return: Returns the result object. + If the method is called asynchronously, + returns the request thread. + :rtype: tuple(VolumeFileLayersResponse, status_code(int), headers(HTTPHeaderDict)) + """ + + _params = locals() + + _all_params = [ + 'volume_name', + 'file_name' + ] + _all_params.extend( + [ + 'async_req', + '_return_http_data_only', + '_preload_content', + '_request_timeout', + '_request_auth', + '_content_type', + '_headers' + ] + ) + + # validate the arguments + for _key, _val in _params['kwargs'].items(): + if _key not in _all_params: + raise ApiTypeError( + "Got an unexpected keyword argument '%s'" + " to method list_volume_file_layers_handler" % _key + ) + _params[_key] = _val + del _params['kwargs'] + + _collection_formats = {} + + # process the path parameters + _path_params = {} + if _params['volume_name']: + _path_params['volume_name'] = _params['volume_name'] + + if _params['file_name']: + _path_params['file_name'] = _params['file_name'] + + + # process the query parameters + _query_params = [] + # process the header parameters + _header_params = dict(_params.get('_headers', {})) + # process the form parameters + _form_params = [] + _files = {} + # process the body parameter + _body_params = None + # set the HTTP header `Accept` + _header_params['Accept'] = self.api_client.select_header_accept( + ['application/json']) # noqa: E501 + + # authentication setting + _auth_settings = ['session_token'] # noqa: E501 + + _response_types_map = { + '200': "VolumeFileLayersResponse", + } + + return self.api_client.call_api( + '/dataset/volumes/{volume_name}/files/{file_name}/layers', 'GET', + _path_params, + _query_params, + _header_params, + body=_body_params, + post_params=_form_params, + files=_files, + response_types_map=_response_types_map, + auth_settings=_auth_settings, + async_req=_params.get('async_req'), + _return_http_data_only=_params.get('_return_http_data_only'), # noqa: E501 + _preload_content=_params.get('_preload_content', True), + _request_timeout=_params.get('_request_timeout'), + collection_formats=_collection_formats, + _request_auth=_params.get('_request_auth')) + @validate_arguments def list_volumes_handler(self, **kwargs) -> List[Volume]: # noqa: E501 """Lists available volumes. # noqa: E501 diff --git a/python/geoengine_openapi_client/models/__init__.py b/python/geoengine_openapi_client/models/__init__.py index d69cd871..6a60233c 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -47,7 +47,6 @@ from geoengine_openapi_client.models.dataset_listing import DatasetListing from geoengine_openapi_client.models.dataset_resource import DatasetResource from geoengine_openapi_client.models.date_time import DateTime -from geoengine_openapi_client.models.date_time_parse_format import DateTimeParseFormat from geoengine_openapi_client.models.derived_color import DerivedColor from geoengine_openapi_client.models.derived_number import DerivedNumber from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest @@ -221,6 +220,7 @@ from geoengine_openapi_client.models.vector_query_rectangle import VectorQueryRectangle from geoengine_openapi_client.models.vector_result_descriptor import VectorResultDescriptor from geoengine_openapi_client.models.volume import Volume +from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse from geoengine_openapi_client.models.wcs_boundingbox import WcsBoundingbox from geoengine_openapi_client.models.wcs_service import WcsService from geoengine_openapi_client.models.wcs_version import WcsVersion diff --git a/python/geoengine_openapi_client/models/gdal_source_time_placeholder.py b/python/geoengine_openapi_client/models/gdal_source_time_placeholder.py index fa177df5..f9c95977 100644 --- a/python/geoengine_openapi_client/models/gdal_source_time_placeholder.py +++ b/python/geoengine_openapi_client/models/gdal_source_time_placeholder.py @@ -20,15 +20,14 @@ -from pydantic import BaseModel, Field -from geoengine_openapi_client.models.date_time_parse_format import DateTimeParseFormat +from pydantic import BaseModel, Field, StrictStr from geoengine_openapi_client.models.time_reference import TimeReference class GdalSourceTimePlaceholder(BaseModel): """ GdalSourceTimePlaceholder """ - format: DateTimeParseFormat = Field(...) + format: StrictStr = Field(...) reference: TimeReference = Field(...) __properties = ["format", "reference"] @@ -56,9 +55,6 @@ def to_dict(self): exclude={ }, exclude_none=True) - # override the default output from pydantic by calling `to_dict()` of format - if self.format: - _dict['format'] = self.format.to_dict() return _dict @classmethod @@ -71,7 +67,7 @@ def from_dict(cls, obj: dict) -> GdalSourceTimePlaceholder: return GdalSourceTimePlaceholder.parse_obj(obj) _obj = GdalSourceTimePlaceholder.parse_obj({ - "format": DateTimeParseFormat.from_dict(obj.get("format")) if obj.get("format") is not None else None, + "format": obj.get("format"), "reference": obj.get("reference") }) return _obj diff --git a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type.py b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type.py index 00ce31dc..8b1952d5 100644 --- a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type.py +++ b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type.py @@ -145,12 +145,12 @@ def from_json(cls, json_str: str) -> OgrSourceDatasetTimeType: return instance # check if data type is `OgrSourceDatasetTimeTypeStartDuration` - if _data_type == "startDuration": + if _data_type == "start+duration": instance.actual_instance = OgrSourceDatasetTimeTypeStartDuration.from_json(json_str) return instance # check if data type is `OgrSourceDatasetTimeTypeStartEnd` - if _data_type == "startEnd": + if _data_type == "start+end": instance.actual_instance = OgrSourceDatasetTimeTypeStartEnd.from_json(json_str) return instance diff --git a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_none.py b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_none.py index 987f0cfe..3eca15d5 100644 --- a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_none.py +++ b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_none.py @@ -32,8 +32,8 @@ class OgrSourceDatasetTimeTypeNone(BaseModel): @validator('type') def type_validate_enum(cls, value): """Validates the enum""" - if value not in ('none', 'start', 'startEnd', 'startDuration'): - raise ValueError("must be one of enum values ('none', 'start', 'startEnd', 'startDuration')") + if value not in ('none', 'start', 'start+end', 'start+duration'): + raise ValueError("must be one of enum values ('none', 'start', 'start+end', 'start+duration')") return value class Config: diff --git a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_duration.py b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_duration.py index 74d4226a..2862b72f 100644 --- a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_duration.py +++ b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_duration.py @@ -36,8 +36,8 @@ class OgrSourceDatasetTimeTypeStartDuration(BaseModel): @validator('type') def type_validate_enum(cls, value): """Validates the enum""" - if value not in ('startDuration'): - raise ValueError("must be one of enum values ('startDuration')") + if value not in ('start+duration'): + raise ValueError("must be one of enum values ('start+duration')") return value class Config: diff --git a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_end.py b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_end.py index 85910752..1eb56c96 100644 --- a/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_end.py +++ b/python/geoengine_openapi_client/models/ogr_source_dataset_time_type_start_end.py @@ -37,8 +37,8 @@ class OgrSourceDatasetTimeTypeStartEnd(BaseModel): @validator('type') def type_validate_enum(cls, value): """Validates the enum""" - if value not in ('startEnd'): - raise ValueError("must be one of enum values ('startEnd')") + if value not in ('start+end'): + raise ValueError("must be one of enum values ('start+end')") return value class Config: diff --git a/python/geoengine_openapi_client/models/ogr_source_time_format_custom.py b/python/geoengine_openapi_client/models/ogr_source_time_format_custom.py index 12ec26c5..7c532e28 100644 --- a/python/geoengine_openapi_client/models/ogr_source_time_format_custom.py +++ b/python/geoengine_openapi_client/models/ogr_source_time_format_custom.py @@ -21,13 +21,12 @@ from pydantic import BaseModel, Field, StrictStr, validator -from geoengine_openapi_client.models.date_time_parse_format import DateTimeParseFormat class OgrSourceTimeFormatCustom(BaseModel): """ OgrSourceTimeFormatCustom """ - custom_format: DateTimeParseFormat = Field(..., alias="customFormat") + custom_format: StrictStr = Field(..., alias="customFormat") format: StrictStr = Field(...) __properties = ["customFormat", "format"] @@ -62,9 +61,6 @@ def to_dict(self): exclude={ }, exclude_none=True) - # override the default output from pydantic by calling `to_dict()` of custom_format - if self.custom_format: - _dict['customFormat'] = self.custom_format.to_dict() return _dict @classmethod @@ -77,7 +73,7 @@ def from_dict(cls, obj: dict) -> OgrSourceTimeFormatCustom: return OgrSourceTimeFormatCustom.parse_obj(obj) _obj = OgrSourceTimeFormatCustom.parse_obj({ - "custom_format": DateTimeParseFormat.from_dict(obj.get("customFormat")) if obj.get("customFormat") is not None else None, + "custom_format": obj.get("customFormat"), "format": obj.get("format") }) return _obj diff --git a/python/geoengine_openapi_client/models/volume_file_layers_response.py b/python/geoengine_openapi_client/models/volume_file_layers_response.py new file mode 100644 index 00000000..e607186a --- /dev/null +++ b/python/geoengine_openapi_client/models/volume_file_layers_response.py @@ -0,0 +1,72 @@ +# coding: utf-8 + +""" + Geo Engine Pro API + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + + The version of the OpenAPI document: 0.8.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 typing import List +from pydantic import BaseModel, Field, StrictStr, conlist + +class VolumeFileLayersResponse(BaseModel): + """ + VolumeFileLayersResponse + """ + layers: conlist(StrictStr) = Field(...) + __properties = ["layers"] + + class Config: + """Pydantic configuration""" + allow_population_by_field_name = True + validate_assignment = True + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.dict(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> VolumeFileLayersResponse: + """Create an instance of VolumeFileLayersResponse from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self): + """Returns the dictionary representation of the model using alias""" + _dict = self.dict(by_alias=True, + exclude={ + }, + exclude_none=True) + return _dict + + @classmethod + def from_dict(cls, obj: dict) -> VolumeFileLayersResponse: + """Create an instance of VolumeFileLayersResponse from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return VolumeFileLayersResponse.parse_obj(obj) + + _obj = VolumeFileLayersResponse.parse_obj({ + "layers": obj.get("layers") + }) + return _obj + + diff --git a/python/test/test_datasets_api.py b/python/test/test_datasets_api.py index 9d86495d..7c829091 100644 --- a/python/test/test_datasets_api.py +++ b/python/test/test_datasets_api.py @@ -69,6 +69,13 @@ def test_list_datasets_handler(self) -> None: """ pass + def test_list_volume_file_layers_handler(self) -> None: + """Test case for list_volume_file_layers_handler + + List the layers of on uploaded file. # noqa: E501 + """ + pass + def test_list_volumes_handler(self) -> None: """Test case for list_volumes_handler diff --git a/python/test/test_gdal_meta_data_regular.py b/python/test/test_gdal_meta_data_regular.py index cbc583fc..2ed501c3 100644 --- a/python/test/test_gdal_meta_data_regular.py +++ b/python/test/test_gdal_meta_data_regular.py @@ -89,10 +89,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: step = 0, ), time_placeholders = { 'key' : geoengine_openapi_client.models.gdal_source_time_placeholder.GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start', ) }, type = 'GdalMetaDataRegular' @@ -150,10 +147,7 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: step = 0, ), time_placeholders = { 'key' : geoengine_openapi_client.models.gdal_source_time_placeholder.GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start', ) }, type = 'GdalMetaDataRegular', diff --git a/python/test/test_gdal_source_time_placeholder.py b/python/test/test_gdal_source_time_placeholder.py index 5c701f25..0d6b7596 100644 --- a/python/test/test_gdal_source_time_placeholder.py +++ b/python/test/test_gdal_source_time_placeholder.py @@ -37,18 +37,12 @@ def make_instance(self, include_optional) -> GdalSourceTimePlaceholder: model = GdalSourceTimePlaceholder() # noqa: E501 if include_optional: return GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start' ) else: return GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start', ) """ diff --git a/python/test/test_meta_data_definition.py b/python/test/test_meta_data_definition.py index 704c5e6d..aac80492 100644 --- a/python/test/test_meta_data_definition.py +++ b/python/test/test_meta_data_definition.py @@ -78,10 +78,7 @@ def make_instance(self, include_optional) -> MetaDataDefinition: step = 0, ), time_placeholders = { 'key' : geoengine_openapi_client.models.gdal_source_time_placeholder.GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start', ) }, time = geoengine_openapi_client.models.time_interval.TimeInterval( @@ -133,10 +130,7 @@ def make_instance(self, include_optional) -> MetaDataDefinition: step = 0, ), time_placeholders = { 'key' : geoengine_openapi_client.models.gdal_source_time_placeholder.GdalSourceTimePlaceholder( - format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + format = '', reference = 'start', ) }, band_offset = 0, diff --git a/python/test/test_ogr_source_dataset_time_type_start_duration.py b/python/test/test_ogr_source_dataset_time_type_start_duration.py index 58c89daf..24671422 100644 --- a/python/test/test_ogr_source_dataset_time_type_start_duration.py +++ b/python/test/test_ogr_source_dataset_time_type_start_duration.py @@ -40,14 +40,14 @@ def make_instance(self, include_optional) -> OgrSourceDatasetTimeTypeStartDurati duration_field = '', start_field = '', start_format = None, - type = 'startDuration' + type = 'start+duration' ) else: return OgrSourceDatasetTimeTypeStartDuration( duration_field = '', start_field = '', start_format = None, - type = 'startDuration', + type = 'start+duration', ) """ diff --git a/python/test/test_ogr_source_dataset_time_type_start_end.py b/python/test/test_ogr_source_dataset_time_type_start_end.py index b666bfce..7702f26d 100644 --- a/python/test/test_ogr_source_dataset_time_type_start_end.py +++ b/python/test/test_ogr_source_dataset_time_type_start_end.py @@ -41,7 +41,7 @@ def make_instance(self, include_optional) -> OgrSourceDatasetTimeTypeStartEnd: end_format = None, start_field = '', start_format = None, - type = 'startEnd' + type = 'start+end' ) else: return OgrSourceDatasetTimeTypeStartEnd( @@ -49,7 +49,7 @@ def make_instance(self, include_optional) -> OgrSourceDatasetTimeTypeStartEnd: end_format = None, start_field = '', start_format = None, - type = 'startEnd', + type = 'start+end', ) """ diff --git a/python/test/test_ogr_source_time_format.py b/python/test/test_ogr_source_time_format.py index 73d29a62..baf98f8b 100644 --- a/python/test/test_ogr_source_time_format.py +++ b/python/test/test_ogr_source_time_format.py @@ -37,19 +37,13 @@ def make_instance(self, include_optional) -> OgrSourceTimeFormat: model = OgrSourceTimeFormat() # noqa: E501 if include_optional: return OgrSourceTimeFormat( - custom_format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + custom_format = '', format = 'auto', timestamp_type = 'epochSeconds' ) else: return OgrSourceTimeFormat( - custom_format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + custom_format = '', format = 'auto', timestamp_type = 'epochSeconds', ) diff --git a/python/test/test_ogr_source_time_format_custom.py b/python/test/test_ogr_source_time_format_custom.py index 1b659868..cfc72c4d 100644 --- a/python/test/test_ogr_source_time_format_custom.py +++ b/python/test/test_ogr_source_time_format_custom.py @@ -37,18 +37,12 @@ def make_instance(self, include_optional) -> OgrSourceTimeFormatCustom: model = OgrSourceTimeFormatCustom() # noqa: E501 if include_optional: return OgrSourceTimeFormatCustom( - custom_format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + custom_format = '', format = 'custom' ) else: return OgrSourceTimeFormatCustom( - custom_format = geoengine_openapi_client.models.date_time_parse_format.DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, ), + custom_format = '', format = 'custom', ) """ diff --git a/python/test/test_date_time_parse_format.py b/python/test/test_volume_file_layers_response.py similarity index 53% rename from python/test/test_date_time_parse_format.py rename to python/test/test_volume_file_layers_response.py index f17402b3..baad8599 100644 --- a/python/test/test_date_time_parse_format.py +++ b/python/test/test_volume_file_layers_response.py @@ -16,10 +16,10 @@ import unittest import datetime -from geoengine_openapi_client.models.date_time_parse_format import DateTimeParseFormat # noqa: E501 +from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse # noqa: E501 -class TestDateTimeParseFormat(unittest.TestCase): - """DateTimeParseFormat unit test stubs""" +class TestVolumeFileLayersResponse(unittest.TestCase): + """VolumeFileLayersResponse unit test stubs""" def setUp(self): pass @@ -27,30 +27,30 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> DateTimeParseFormat: - """Test DateTimeParseFormat + def make_instance(self, include_optional) -> VolumeFileLayersResponse: + """Test VolumeFileLayersResponse include_option 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 `DateTimeParseFormat` + # uncomment below to create an instance of `VolumeFileLayersResponse` """ - model = DateTimeParseFormat() # noqa: E501 + model = VolumeFileLayersResponse() # noqa: E501 if include_optional: - return DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True + return VolumeFileLayersResponse( + layers = [ + '' + ] ) else: - return DateTimeParseFormat( - fmt = '', - has_time = True, - has_tz = True, + return VolumeFileLayersResponse( + layers = [ + '' + ], ) """ - def testDateTimeParseFormat(self): - """Test DateTimeParseFormat""" + def testVolumeFileLayersResponse(self): + """Test VolumeFileLayersResponse""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/typescript/dist/apis/DatasetsApi.d.ts b/typescript/dist/apis/DatasetsApi.d.ts index 515ee5d3..706a1371 100644 --- a/typescript/dist/apis/DatasetsApi.d.ts +++ b/typescript/dist/apis/DatasetsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume } from '../models/index'; +import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; export interface AutoCreateDatasetHandlerRequest { autoCreateDataset: AutoCreateDataset; } @@ -33,6 +33,10 @@ export interface ListDatasetsHandlerRequest { filter?: string | null; tags?: Array | null; } +export interface ListVolumeFileLayersHandlerRequest { + volumeName: string; + fileName: string; +} export interface SuggestMetaDataHandlerRequest { suggestMetaData: SuggestMetaData; } @@ -106,6 +110,14 @@ export declare class DatasetsApi extends runtime.BaseAPI { * Lists available datasets. */ listDatasetsHandler(requestParameters: ListDatasetsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Lists available volumes. */ diff --git a/typescript/dist/apis/DatasetsApi.js b/typescript/dist/apis/DatasetsApi.js index 8d796c7e..e80b58ab 100644 --- a/typescript/dist/apis/DatasetsApi.js +++ b/typescript/dist/apis/DatasetsApi.js @@ -265,6 +265,44 @@ class DatasetsApi extends runtime.BaseAPI { return yield response.value(); }); } + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandlerRaw(requestParameters, initOverrides) { + return __awaiter(this, void 0, void 0, function* () { + if (requestParameters.volumeName === null || requestParameters.volumeName === undefined) { + throw new runtime.RequiredError('volumeName', 'Required parameter requestParameters.volumeName was null or undefined when calling listVolumeFileLayersHandler.'); + } + if (requestParameters.fileName === null || requestParameters.fileName === undefined) { + throw new runtime.RequiredError('fileName', 'Required parameter requestParameters.fileName was null or undefined when calling listVolumeFileLayersHandler.'); + } + const queryParameters = {}; + const headerParameters = {}; + if (this.configuration && this.configuration.accessToken) { + const token = this.configuration.accessToken; + const tokenString = yield token("session_token", []); + if (tokenString) { + headerParameters["Authorization"] = `Bearer ${tokenString}`; + } + } + const response = yield this.request({ + path: `/dataset/volumes/{volume_name}/files/{file_name}/layers`.replace(`{${"volume_name"}}`, encodeURIComponent(String(requestParameters.volumeName))).replace(`{${"file_name"}}`, encodeURIComponent(String(requestParameters.fileName))), + method: 'GET', + headers: headerParameters, + query: queryParameters, + }, initOverrides); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.VolumeFileLayersResponseFromJSON)(jsonValue)); + }); + } + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandler(requestParameters, initOverrides) { + return __awaiter(this, void 0, void 0, function* () { + const response = yield this.listVolumeFileLayersHandlerRaw(requestParameters, initOverrides); + return yield response.value(); + }); + } /** * Lists available volumes. */ diff --git a/typescript/dist/esm/apis/DatasetsApi.d.ts b/typescript/dist/esm/apis/DatasetsApi.d.ts index 515ee5d3..706a1371 100644 --- a/typescript/dist/esm/apis/DatasetsApi.d.ts +++ b/typescript/dist/esm/apis/DatasetsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume } from '../models/index'; +import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; export interface AutoCreateDatasetHandlerRequest { autoCreateDataset: AutoCreateDataset; } @@ -33,6 +33,10 @@ export interface ListDatasetsHandlerRequest { filter?: string | null; tags?: Array | null; } +export interface ListVolumeFileLayersHandlerRequest { + volumeName: string; + fileName: string; +} export interface SuggestMetaDataHandlerRequest { suggestMetaData: SuggestMetaData; } @@ -106,6 +110,14 @@ export declare class DatasetsApi extends runtime.BaseAPI { * Lists available datasets. */ listDatasetsHandler(requestParameters: ListDatasetsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Lists available volumes. */ diff --git a/typescript/dist/esm/apis/DatasetsApi.js b/typescript/dist/esm/apis/DatasetsApi.js index 7854eec9..b23269df 100644 --- a/typescript/dist/esm/apis/DatasetsApi.js +++ b/typescript/dist/esm/apis/DatasetsApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AutoCreateDatasetToJSON, CreateDatasetToJSON, CreateDatasetHandler200ResponseFromJSON, DatasetFromJSON, DatasetListingFromJSON, MetaDataDefinitionFromJSON, MetaDataDefinitionToJSON, MetaDataSuggestionFromJSON, ProvenancesToJSON, SuggestMetaDataToJSON, SymbologyToJSON, UpdateDatasetToJSON, VolumeFromJSON, } from '../models/index'; +import { AutoCreateDatasetToJSON, CreateDatasetToJSON, CreateDatasetHandler200ResponseFromJSON, DatasetFromJSON, DatasetListingFromJSON, MetaDataDefinitionFromJSON, MetaDataDefinitionToJSON, MetaDataSuggestionFromJSON, ProvenancesToJSON, SuggestMetaDataToJSON, SymbologyToJSON, UpdateDatasetToJSON, VolumeFromJSON, VolumeFileLayersResponseFromJSON, } from '../models/index'; /** * */ @@ -262,6 +262,44 @@ export class DatasetsApi extends runtime.BaseAPI { return yield response.value(); }); } + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandlerRaw(requestParameters, initOverrides) { + return __awaiter(this, void 0, void 0, function* () { + if (requestParameters.volumeName === null || requestParameters.volumeName === undefined) { + throw new runtime.RequiredError('volumeName', 'Required parameter requestParameters.volumeName was null or undefined when calling listVolumeFileLayersHandler.'); + } + if (requestParameters.fileName === null || requestParameters.fileName === undefined) { + throw new runtime.RequiredError('fileName', 'Required parameter requestParameters.fileName was null or undefined when calling listVolumeFileLayersHandler.'); + } + const queryParameters = {}; + const headerParameters = {}; + if (this.configuration && this.configuration.accessToken) { + const token = this.configuration.accessToken; + const tokenString = yield token("session_token", []); + if (tokenString) { + headerParameters["Authorization"] = `Bearer ${tokenString}`; + } + } + const response = yield this.request({ + path: `/dataset/volumes/{volume_name}/files/{file_name}/layers`.replace(`{${"volume_name"}}`, encodeURIComponent(String(requestParameters.volumeName))).replace(`{${"file_name"}}`, encodeURIComponent(String(requestParameters.fileName))), + method: 'GET', + headers: headerParameters, + query: queryParameters, + }, initOverrides); + return new runtime.JSONApiResponse(response, (jsonValue) => VolumeFileLayersResponseFromJSON(jsonValue)); + }); + } + /** + * List the layers of on uploaded file. + */ + listVolumeFileLayersHandler(requestParameters, initOverrides) { + return __awaiter(this, void 0, void 0, function* () { + const response = yield this.listVolumeFileLayersHandlerRaw(requestParameters, initOverrides); + return yield response.value(); + }); + } /** * Lists available volumes. */ diff --git a/typescript/dist/esm/models/GdalSourceTimePlaceholder.d.ts b/typescript/dist/esm/models/GdalSourceTimePlaceholder.d.ts index b5107069..23f95bcb 100644 --- a/typescript/dist/esm/models/GdalSourceTimePlaceholder.d.ts +++ b/typescript/dist/esm/models/GdalSourceTimePlaceholder.d.ts @@ -9,7 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { DateTimeParseFormat } from './DateTimeParseFormat'; import type { TimeReference } from './TimeReference'; /** * @@ -19,10 +18,10 @@ import type { TimeReference } from './TimeReference'; export interface GdalSourceTimePlaceholder { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof GdalSourceTimePlaceholder */ - format: DateTimeParseFormat; + format: string; /** * * @type {TimeReference} diff --git a/typescript/dist/esm/models/GdalSourceTimePlaceholder.js b/typescript/dist/esm/models/GdalSourceTimePlaceholder.js index 0236e675..9e2f45cd 100644 --- a/typescript/dist/esm/models/GdalSourceTimePlaceholder.js +++ b/typescript/dist/esm/models/GdalSourceTimePlaceholder.js @@ -11,7 +11,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { DateTimeParseFormatFromJSON, DateTimeParseFormatToJSON, } from './DateTimeParseFormat'; import { TimeReferenceFromJSON, TimeReferenceToJSON, } from './TimeReference'; /** * Check if a given object implements the GdalSourceTimePlaceholder interface. @@ -30,7 +29,7 @@ export function GdalSourceTimePlaceholderFromJSONTyped(json, ignoreDiscriminator return json; } return { - 'format': DateTimeParseFormatFromJSON(json['format']), + 'format': json['format'], 'reference': TimeReferenceFromJSON(json['reference']), }; } @@ -42,7 +41,7 @@ export function GdalSourceTimePlaceholderToJSON(value) { return null; } return { - 'format': DateTimeParseFormatToJSON(value.format), + 'format': value.format, 'reference': TimeReferenceToJSON(value.reference), }; } diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeType.d.ts b/typescript/dist/esm/models/OgrSourceDatasetTimeType.d.ts index f21ce6bc..a0b2e4c9 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeType.d.ts +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeType.d.ts @@ -23,9 +23,9 @@ export type OgrSourceDatasetTimeType = { } & OgrSourceDatasetTimeTypeNone | { type: 'start'; } & OgrSourceDatasetTimeTypeStart | { - type: 'startDuration'; + type: 'start+duration'; } & OgrSourceDatasetTimeTypeStartDuration | { - type: 'startEnd'; + type: 'start+end'; } & OgrSourceDatasetTimeTypeStartEnd; export declare function OgrSourceDatasetTimeTypeFromJSON(json: any): OgrSourceDatasetTimeType; export declare function OgrSourceDatasetTimeTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): OgrSourceDatasetTimeType; diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeType.js b/typescript/dist/esm/models/OgrSourceDatasetTimeType.js index 56717e12..d058a12c 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeType.js +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeType.js @@ -27,10 +27,10 @@ export function OgrSourceDatasetTimeTypeFromJSONTyped(json, ignoreDiscriminator) return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeNoneFromJSONTyped(json, true)), { type: 'none' }); case 'start': return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeStartFromJSONTyped(json, true)), { type: 'start' }); - case 'startDuration': - return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeStartDurationFromJSONTyped(json, true)), { type: 'startDuration' }); - case 'startEnd': - return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeStartEndFromJSONTyped(json, true)), { type: 'startEnd' }); + case 'start+duration': + return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeStartDurationFromJSONTyped(json, true)), { type: 'start+duration' }); + case 'start+end': + return Object.assign(Object.assign({}, OgrSourceDatasetTimeTypeStartEndFromJSONTyped(json, true)), { type: 'start+end' }); default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${json['type']}'`); } @@ -47,9 +47,9 @@ export function OgrSourceDatasetTimeTypeToJSON(value) { return OgrSourceDatasetTimeTypeNoneToJSON(value); case 'start': return OgrSourceDatasetTimeTypeStartToJSON(value); - case 'startDuration': + case 'start+duration': return OgrSourceDatasetTimeTypeStartDurationToJSON(value); - case 'startEnd': + case 'start+end': return OgrSourceDatasetTimeTypeStartEndToJSON(value); default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${value['type']}'`); diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.d.ts b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.d.ts index 8d93a66d..f4069167 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.d.ts +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.d.ts @@ -28,8 +28,8 @@ export interface OgrSourceDatasetTimeTypeNone { export declare const OgrSourceDatasetTimeTypeNoneTypeEnum: { readonly None: "none"; readonly Start: "start"; - readonly StartEnd: "startEnd"; - readonly StartDuration: "startDuration"; + readonly Startend: "start+end"; + readonly Startduration: "start+duration"; }; export type OgrSourceDatasetTimeTypeNoneTypeEnum = typeof OgrSourceDatasetTimeTypeNoneTypeEnum[keyof typeof OgrSourceDatasetTimeTypeNoneTypeEnum]; /** diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.js b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.js index 1c46207e..7ca0ce73 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.js +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeNone.js @@ -17,8 +17,8 @@ export const OgrSourceDatasetTimeTypeNoneTypeEnum = { None: 'none', Start: 'start', - StartEnd: 'startEnd', - StartDuration: 'startDuration' + Startend: 'start+end', + Startduration: 'start+duration' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeNone interface. diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.d.ts b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.d.ts index 81a5afd5..fe04b281 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.d.ts +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.d.ts @@ -45,7 +45,7 @@ export interface OgrSourceDatasetTimeTypeStartDuration { * @export */ export declare const OgrSourceDatasetTimeTypeStartDurationTypeEnum: { - readonly StartDuration: "startDuration"; + readonly Startduration: "start+duration"; }; export type OgrSourceDatasetTimeTypeStartDurationTypeEnum = typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum]; /** diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.js b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.js index baa1ae4b..5b9b5d9e 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.js +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartDuration.js @@ -16,7 +16,7 @@ import { OgrSourceTimeFormatFromJSON, OgrSourceTimeFormatToJSON, } from './OgrSo * @export */ export const OgrSourceDatasetTimeTypeStartDurationTypeEnum = { - StartDuration: 'startDuration' + Startduration: 'start+duration' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeStartDuration interface. diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.d.ts b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.d.ts index ae300300..c3facdee 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.d.ts +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.d.ts @@ -51,7 +51,7 @@ export interface OgrSourceDatasetTimeTypeStartEnd { * @export */ export declare const OgrSourceDatasetTimeTypeStartEndTypeEnum: { - readonly StartEnd: "startEnd"; + readonly Startend: "start+end"; }; export type OgrSourceDatasetTimeTypeStartEndTypeEnum = typeof OgrSourceDatasetTimeTypeStartEndTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartEndTypeEnum]; /** diff --git a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.js b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.js index 3362acb3..292d50ad 100644 --- a/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.js +++ b/typescript/dist/esm/models/OgrSourceDatasetTimeTypeStartEnd.js @@ -16,7 +16,7 @@ import { OgrSourceTimeFormatFromJSON, OgrSourceTimeFormatToJSON, } from './OgrSo * @export */ export const OgrSourceDatasetTimeTypeStartEndTypeEnum = { - StartEnd: 'startEnd' + Startend: 'start+end' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeStartEnd interface. diff --git a/typescript/dist/esm/models/OgrSourceTimeFormatCustom.d.ts b/typescript/dist/esm/models/OgrSourceTimeFormatCustom.d.ts index b91b286f..24d78d3f 100644 --- a/typescript/dist/esm/models/OgrSourceTimeFormatCustom.d.ts +++ b/typescript/dist/esm/models/OgrSourceTimeFormatCustom.d.ts @@ -9,7 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { DateTimeParseFormat } from './DateTimeParseFormat'; /** * * @export @@ -18,10 +17,10 @@ import type { DateTimeParseFormat } from './DateTimeParseFormat'; export interface OgrSourceTimeFormatCustom { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof OgrSourceTimeFormatCustom */ - customFormat: DateTimeParseFormat; + customFormat: string; /** * * @type {string} diff --git a/typescript/dist/esm/models/OgrSourceTimeFormatCustom.js b/typescript/dist/esm/models/OgrSourceTimeFormatCustom.js index 80bf499b..d1b11cb8 100644 --- a/typescript/dist/esm/models/OgrSourceTimeFormatCustom.js +++ b/typescript/dist/esm/models/OgrSourceTimeFormatCustom.js @@ -11,7 +11,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { DateTimeParseFormatFromJSON, DateTimeParseFormatToJSON, } from './DateTimeParseFormat'; /** * @export */ @@ -35,7 +34,7 @@ export function OgrSourceTimeFormatCustomFromJSONTyped(json, ignoreDiscriminator return json; } return { - 'customFormat': DateTimeParseFormatFromJSON(json['customFormat']), + 'customFormat': json['customFormat'], 'format': json['format'], }; } @@ -47,7 +46,7 @@ export function OgrSourceTimeFormatCustomToJSON(value) { return null; } return { - 'customFormat': DateTimeParseFormatToJSON(value.customFormat), + 'customFormat': value.customFormat, 'format': value.format, }; } diff --git a/typescript/dist/esm/models/VolumeFileLayersResponse.d.ts b/typescript/dist/esm/models/VolumeFileLayersResponse.d.ts new file mode 100644 index 00000000..68c0b9eb --- /dev/null +++ b/typescript/dist/esm/models/VolumeFileLayersResponse.d.ts @@ -0,0 +1,31 @@ +/** + * Geo Engine Pro API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.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. + */ +/** + * + * @export + * @interface VolumeFileLayersResponse + */ +export interface VolumeFileLayersResponse { + /** + * + * @type {Array} + * @memberof VolumeFileLayersResponse + */ + layers: Array; +} +/** + * Check if a given object implements the VolumeFileLayersResponse interface. + */ +export declare function instanceOfVolumeFileLayersResponse(value: object): boolean; +export declare function VolumeFileLayersResponseFromJSON(json: any): VolumeFileLayersResponse; +export declare function VolumeFileLayersResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): VolumeFileLayersResponse; +export declare function VolumeFileLayersResponseToJSON(value?: VolumeFileLayersResponse | null): any; diff --git a/typescript/dist/esm/models/VolumeFileLayersResponse.js b/typescript/dist/esm/models/VolumeFileLayersResponse.js new file mode 100644 index 00000000..f6936655 --- /dev/null +++ b/typescript/dist/esm/models/VolumeFileLayersResponse.js @@ -0,0 +1,43 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine Pro API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.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. + */ +/** + * Check if a given object implements the VolumeFileLayersResponse interface. + */ +export function instanceOfVolumeFileLayersResponse(value) { + let isInstance = true; + isInstance = isInstance && "layers" in value; + return isInstance; +} +export function VolumeFileLayersResponseFromJSON(json) { + return VolumeFileLayersResponseFromJSONTyped(json, false); +} +export function VolumeFileLayersResponseFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'layers': json['layers'], + }; +} +export function VolumeFileLayersResponseToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'layers': value.layers, + }; +} diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index a443896a..e433c12e 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -30,7 +30,6 @@ export * from './DatasetDefinition'; export * from './DatasetListing'; export * from './DatasetResource'; export * from './DateTime'; -export * from './DateTimeParseFormat'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -204,6 +203,7 @@ export * from './VectorDataType'; export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; +export * from './VolumeFileLayersResponse'; export * from './WcsBoundingbox'; export * from './WcsService'; export * from './WcsVersion'; diff --git a/typescript/dist/esm/models/index.js b/typescript/dist/esm/models/index.js index a520c14a..c34b1cd0 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -32,7 +32,6 @@ export * from './DatasetDefinition'; export * from './DatasetListing'; export * from './DatasetResource'; export * from './DateTime'; -export * from './DateTimeParseFormat'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -206,6 +205,7 @@ export * from './VectorDataType'; export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; +export * from './VolumeFileLayersResponse'; export * from './WcsBoundingbox'; export * from './WcsService'; export * from './WcsVersion'; diff --git a/typescript/dist/models/GdalSourceTimePlaceholder.d.ts b/typescript/dist/models/GdalSourceTimePlaceholder.d.ts index b5107069..23f95bcb 100644 --- a/typescript/dist/models/GdalSourceTimePlaceholder.d.ts +++ b/typescript/dist/models/GdalSourceTimePlaceholder.d.ts @@ -9,7 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { DateTimeParseFormat } from './DateTimeParseFormat'; import type { TimeReference } from './TimeReference'; /** * @@ -19,10 +18,10 @@ import type { TimeReference } from './TimeReference'; export interface GdalSourceTimePlaceholder { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof GdalSourceTimePlaceholder */ - format: DateTimeParseFormat; + format: string; /** * * @type {TimeReference} diff --git a/typescript/dist/models/GdalSourceTimePlaceholder.js b/typescript/dist/models/GdalSourceTimePlaceholder.js index 7324651b..38526a0d 100644 --- a/typescript/dist/models/GdalSourceTimePlaceholder.js +++ b/typescript/dist/models/GdalSourceTimePlaceholder.js @@ -14,7 +14,6 @@ */ Object.defineProperty(exports, "__esModule", { value: true }); exports.GdalSourceTimePlaceholderToJSON = exports.GdalSourceTimePlaceholderFromJSONTyped = exports.GdalSourceTimePlaceholderFromJSON = exports.instanceOfGdalSourceTimePlaceholder = void 0; -const DateTimeParseFormat_1 = require("./DateTimeParseFormat"); const TimeReference_1 = require("./TimeReference"); /** * Check if a given object implements the GdalSourceTimePlaceholder interface. @@ -35,7 +34,7 @@ function GdalSourceTimePlaceholderFromJSONTyped(json, ignoreDiscriminator) { return json; } return { - 'format': (0, DateTimeParseFormat_1.DateTimeParseFormatFromJSON)(json['format']), + 'format': json['format'], 'reference': (0, TimeReference_1.TimeReferenceFromJSON)(json['reference']), }; } @@ -48,7 +47,7 @@ function GdalSourceTimePlaceholderToJSON(value) { return null; } return { - 'format': (0, DateTimeParseFormat_1.DateTimeParseFormatToJSON)(value.format), + 'format': value.format, 'reference': (0, TimeReference_1.TimeReferenceToJSON)(value.reference), }; } diff --git a/typescript/dist/models/OgrSourceDatasetTimeType.d.ts b/typescript/dist/models/OgrSourceDatasetTimeType.d.ts index f21ce6bc..a0b2e4c9 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeType.d.ts +++ b/typescript/dist/models/OgrSourceDatasetTimeType.d.ts @@ -23,9 +23,9 @@ export type OgrSourceDatasetTimeType = { } & OgrSourceDatasetTimeTypeNone | { type: 'start'; } & OgrSourceDatasetTimeTypeStart | { - type: 'startDuration'; + type: 'start+duration'; } & OgrSourceDatasetTimeTypeStartDuration | { - type: 'startEnd'; + type: 'start+end'; } & OgrSourceDatasetTimeTypeStartEnd; export declare function OgrSourceDatasetTimeTypeFromJSON(json: any): OgrSourceDatasetTimeType; export declare function OgrSourceDatasetTimeTypeFromJSONTyped(json: any, ignoreDiscriminator: boolean): OgrSourceDatasetTimeType; diff --git a/typescript/dist/models/OgrSourceDatasetTimeType.js b/typescript/dist/models/OgrSourceDatasetTimeType.js index 775b1831..a2f3be97 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeType.js +++ b/typescript/dist/models/OgrSourceDatasetTimeType.js @@ -31,10 +31,10 @@ function OgrSourceDatasetTimeTypeFromJSONTyped(json, ignoreDiscriminator) { return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeNone_1.OgrSourceDatasetTimeTypeNoneFromJSONTyped)(json, true)), { type: 'none' }); case 'start': return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeStart_1.OgrSourceDatasetTimeTypeStartFromJSONTyped)(json, true)), { type: 'start' }); - case 'startDuration': - return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeStartDuration_1.OgrSourceDatasetTimeTypeStartDurationFromJSONTyped)(json, true)), { type: 'startDuration' }); - case 'startEnd': - return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeStartEnd_1.OgrSourceDatasetTimeTypeStartEndFromJSONTyped)(json, true)), { type: 'startEnd' }); + case 'start+duration': + return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeStartDuration_1.OgrSourceDatasetTimeTypeStartDurationFromJSONTyped)(json, true)), { type: 'start+duration' }); + case 'start+end': + return Object.assign(Object.assign({}, (0, OgrSourceDatasetTimeTypeStartEnd_1.OgrSourceDatasetTimeTypeStartEndFromJSONTyped)(json, true)), { type: 'start+end' }); default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${json['type']}'`); } @@ -52,9 +52,9 @@ function OgrSourceDatasetTimeTypeToJSON(value) { return (0, OgrSourceDatasetTimeTypeNone_1.OgrSourceDatasetTimeTypeNoneToJSON)(value); case 'start': return (0, OgrSourceDatasetTimeTypeStart_1.OgrSourceDatasetTimeTypeStartToJSON)(value); - case 'startDuration': + case 'start+duration': return (0, OgrSourceDatasetTimeTypeStartDuration_1.OgrSourceDatasetTimeTypeStartDurationToJSON)(value); - case 'startEnd': + case 'start+end': return (0, OgrSourceDatasetTimeTypeStartEnd_1.OgrSourceDatasetTimeTypeStartEndToJSON)(value); default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${value['type']}'`); diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeNone.d.ts b/typescript/dist/models/OgrSourceDatasetTimeTypeNone.d.ts index 8d93a66d..f4069167 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeNone.d.ts +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeNone.d.ts @@ -28,8 +28,8 @@ export interface OgrSourceDatasetTimeTypeNone { export declare const OgrSourceDatasetTimeTypeNoneTypeEnum: { readonly None: "none"; readonly Start: "start"; - readonly StartEnd: "startEnd"; - readonly StartDuration: "startDuration"; + readonly Startend: "start+end"; + readonly Startduration: "start+duration"; }; export type OgrSourceDatasetTimeTypeNoneTypeEnum = typeof OgrSourceDatasetTimeTypeNoneTypeEnum[keyof typeof OgrSourceDatasetTimeTypeNoneTypeEnum]; /** diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeNone.js b/typescript/dist/models/OgrSourceDatasetTimeTypeNone.js index fcc29e1c..563023d5 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeNone.js +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeNone.js @@ -20,8 +20,8 @@ exports.OgrSourceDatasetTimeTypeNoneToJSON = exports.OgrSourceDatasetTimeTypeNon exports.OgrSourceDatasetTimeTypeNoneTypeEnum = { None: 'none', Start: 'start', - StartEnd: 'startEnd', - StartDuration: 'startDuration' + Startend: 'start+end', + Startduration: 'start+duration' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeNone interface. diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.d.ts b/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.d.ts index 81a5afd5..fe04b281 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.d.ts +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.d.ts @@ -45,7 +45,7 @@ export interface OgrSourceDatasetTimeTypeStartDuration { * @export */ export declare const OgrSourceDatasetTimeTypeStartDurationTypeEnum: { - readonly StartDuration: "startDuration"; + readonly Startduration: "start+duration"; }; export type OgrSourceDatasetTimeTypeStartDurationTypeEnum = typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum]; /** diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.js b/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.js index 6103f499..310d125b 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.js +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeStartDuration.js @@ -19,7 +19,7 @@ const OgrSourceTimeFormat_1 = require("./OgrSourceTimeFormat"); * @export */ exports.OgrSourceDatasetTimeTypeStartDurationTypeEnum = { - StartDuration: 'startDuration' + Startduration: 'start+duration' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeStartDuration interface. diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.d.ts b/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.d.ts index ae300300..c3facdee 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.d.ts +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.d.ts @@ -51,7 +51,7 @@ export interface OgrSourceDatasetTimeTypeStartEnd { * @export */ export declare const OgrSourceDatasetTimeTypeStartEndTypeEnum: { - readonly StartEnd: "startEnd"; + readonly Startend: "start+end"; }; export type OgrSourceDatasetTimeTypeStartEndTypeEnum = typeof OgrSourceDatasetTimeTypeStartEndTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartEndTypeEnum]; /** diff --git a/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.js b/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.js index f32afb20..b4b3b754 100644 --- a/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.js +++ b/typescript/dist/models/OgrSourceDatasetTimeTypeStartEnd.js @@ -19,7 +19,7 @@ const OgrSourceTimeFormat_1 = require("./OgrSourceTimeFormat"); * @export */ exports.OgrSourceDatasetTimeTypeStartEndTypeEnum = { - StartEnd: 'startEnd' + Startend: 'start+end' }; /** * Check if a given object implements the OgrSourceDatasetTimeTypeStartEnd interface. diff --git a/typescript/dist/models/OgrSourceTimeFormatCustom.d.ts b/typescript/dist/models/OgrSourceTimeFormatCustom.d.ts index b91b286f..24d78d3f 100644 --- a/typescript/dist/models/OgrSourceTimeFormatCustom.d.ts +++ b/typescript/dist/models/OgrSourceTimeFormatCustom.d.ts @@ -9,7 +9,6 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { DateTimeParseFormat } from './DateTimeParseFormat'; /** * * @export @@ -18,10 +17,10 @@ import type { DateTimeParseFormat } from './DateTimeParseFormat'; export interface OgrSourceTimeFormatCustom { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof OgrSourceTimeFormatCustom */ - customFormat: DateTimeParseFormat; + customFormat: string; /** * * @type {string} diff --git a/typescript/dist/models/OgrSourceTimeFormatCustom.js b/typescript/dist/models/OgrSourceTimeFormatCustom.js index 92232ec9..6fbea6ab 100644 --- a/typescript/dist/models/OgrSourceTimeFormatCustom.js +++ b/typescript/dist/models/OgrSourceTimeFormatCustom.js @@ -14,7 +14,6 @@ */ Object.defineProperty(exports, "__esModule", { value: true }); exports.OgrSourceTimeFormatCustomToJSON = exports.OgrSourceTimeFormatCustomFromJSONTyped = exports.OgrSourceTimeFormatCustomFromJSON = exports.instanceOfOgrSourceTimeFormatCustom = exports.OgrSourceTimeFormatCustomFormatEnum = void 0; -const DateTimeParseFormat_1 = require("./DateTimeParseFormat"); /** * @export */ @@ -40,7 +39,7 @@ function OgrSourceTimeFormatCustomFromJSONTyped(json, ignoreDiscriminator) { return json; } return { - 'customFormat': (0, DateTimeParseFormat_1.DateTimeParseFormatFromJSON)(json['customFormat']), + 'customFormat': json['customFormat'], 'format': json['format'], }; } @@ -53,7 +52,7 @@ function OgrSourceTimeFormatCustomToJSON(value) { return null; } return { - 'customFormat': (0, DateTimeParseFormat_1.DateTimeParseFormatToJSON)(value.customFormat), + 'customFormat': value.customFormat, 'format': value.format, }; } diff --git a/typescript/dist/models/VolumeFileLayersResponse.d.ts b/typescript/dist/models/VolumeFileLayersResponse.d.ts new file mode 100644 index 00000000..68c0b9eb --- /dev/null +++ b/typescript/dist/models/VolumeFileLayersResponse.d.ts @@ -0,0 +1,31 @@ +/** + * Geo Engine Pro API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.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. + */ +/** + * + * @export + * @interface VolumeFileLayersResponse + */ +export interface VolumeFileLayersResponse { + /** + * + * @type {Array} + * @memberof VolumeFileLayersResponse + */ + layers: Array; +} +/** + * Check if a given object implements the VolumeFileLayersResponse interface. + */ +export declare function instanceOfVolumeFileLayersResponse(value: object): boolean; +export declare function VolumeFileLayersResponseFromJSON(json: any): VolumeFileLayersResponse; +export declare function VolumeFileLayersResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): VolumeFileLayersResponse; +export declare function VolumeFileLayersResponseToJSON(value?: VolumeFileLayersResponse | null): any; diff --git a/typescript/dist/models/VolumeFileLayersResponse.js b/typescript/dist/models/VolumeFileLayersResponse.js new file mode 100644 index 00000000..1b20c052 --- /dev/null +++ b/typescript/dist/models/VolumeFileLayersResponse.js @@ -0,0 +1,50 @@ +"use strict"; +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine Pro API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.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.VolumeFileLayersResponseToJSON = exports.VolumeFileLayersResponseFromJSONTyped = exports.VolumeFileLayersResponseFromJSON = exports.instanceOfVolumeFileLayersResponse = void 0; +/** + * Check if a given object implements the VolumeFileLayersResponse interface. + */ +function instanceOfVolumeFileLayersResponse(value) { + let isInstance = true; + isInstance = isInstance && "layers" in value; + return isInstance; +} +exports.instanceOfVolumeFileLayersResponse = instanceOfVolumeFileLayersResponse; +function VolumeFileLayersResponseFromJSON(json) { + return VolumeFileLayersResponseFromJSONTyped(json, false); +} +exports.VolumeFileLayersResponseFromJSON = VolumeFileLayersResponseFromJSON; +function VolumeFileLayersResponseFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'layers': json['layers'], + }; +} +exports.VolumeFileLayersResponseFromJSONTyped = VolumeFileLayersResponseFromJSONTyped; +function VolumeFileLayersResponseToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'layers': value.layers, + }; +} +exports.VolumeFileLayersResponseToJSON = VolumeFileLayersResponseToJSON; diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index a443896a..e433c12e 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -30,7 +30,6 @@ export * from './DatasetDefinition'; export * from './DatasetListing'; export * from './DatasetResource'; export * from './DateTime'; -export * from './DateTimeParseFormat'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -204,6 +203,7 @@ export * from './VectorDataType'; export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; +export * from './VolumeFileLayersResponse'; export * from './WcsBoundingbox'; export * from './WcsService'; export * from './WcsVersion'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index a0b41d2b..7c486fb2 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -48,7 +48,6 @@ __exportStar(require("./DatasetDefinition"), exports); __exportStar(require("./DatasetListing"), exports); __exportStar(require("./DatasetResource"), exports); __exportStar(require("./DateTime"), exports); -__exportStar(require("./DateTimeParseFormat"), exports); __exportStar(require("./DerivedColor"), exports); __exportStar(require("./DerivedNumber"), exports); __exportStar(require("./DescribeCoverageRequest"), exports); @@ -222,6 +221,7 @@ __exportStar(require("./VectorDataType"), exports); __exportStar(require("./VectorQueryRectangle"), exports); __exportStar(require("./VectorResultDescriptor"), exports); __exportStar(require("./Volume"), exports); +__exportStar(require("./VolumeFileLayersResponse"), exports); __exportStar(require("./WcsBoundingbox"), exports); __exportStar(require("./WcsService"), exports); __exportStar(require("./WcsVersion"), exports); diff --git a/typescript/src/apis/DatasetsApi.ts b/typescript/src/apis/DatasetsApi.ts index 64ac2e7d..b501dcad 100644 --- a/typescript/src/apis/DatasetsApi.ts +++ b/typescript/src/apis/DatasetsApi.ts @@ -29,6 +29,7 @@ import type { Symbology, UpdateDataset, Volume, + VolumeFileLayersResponse, } from '../models/index'; import { AutoCreateDatasetFromJSON, @@ -59,6 +60,8 @@ import { UpdateDatasetToJSON, VolumeFromJSON, VolumeToJSON, + VolumeFileLayersResponseFromJSON, + VolumeFileLayersResponseToJSON, } from '../models/index'; export interface AutoCreateDatasetHandlerRequest { @@ -89,6 +92,11 @@ export interface ListDatasetsHandlerRequest { tags?: Array | null; } +export interface ListVolumeFileLayersHandlerRequest { + volumeName: string; + fileName: string; +} + export interface SuggestMetaDataHandlerRequest { suggestMetaData: SuggestMetaData; } @@ -381,6 +389,48 @@ export class DatasetsApi extends runtime.BaseAPI { return await response.value(); } + /** + * List the layers of on uploaded file. + */ + async listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + if (requestParameters.volumeName === null || requestParameters.volumeName === undefined) { + throw new runtime.RequiredError('volumeName','Required parameter requestParameters.volumeName was null or undefined when calling listVolumeFileLayersHandler.'); + } + + if (requestParameters.fileName === null || requestParameters.fileName === undefined) { + throw new runtime.RequiredError('fileName','Required parameter requestParameters.fileName was null or undefined when calling listVolumeFileLayersHandler.'); + } + + const queryParameters: any = {}; + + const headerParameters: runtime.HTTPHeaders = {}; + + if (this.configuration && this.configuration.accessToken) { + const token = this.configuration.accessToken; + const tokenString = await token("session_token", []); + + if (tokenString) { + headerParameters["Authorization"] = `Bearer ${tokenString}`; + } + } + const response = await this.request({ + path: `/dataset/volumes/{volume_name}/files/{file_name}/layers`.replace(`{${"volume_name"}}`, encodeURIComponent(String(requestParameters.volumeName))).replace(`{${"file_name"}}`, encodeURIComponent(String(requestParameters.fileName))), + method: 'GET', + headers: headerParameters, + query: queryParameters, + }, initOverrides); + + return new runtime.JSONApiResponse(response, (jsonValue) => VolumeFileLayersResponseFromJSON(jsonValue)); + } + + /** + * List the layers of on uploaded file. + */ + async listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + const response = await this.listVolumeFileLayersHandlerRaw(requestParameters, initOverrides); + return await response.value(); + } + /** * Lists available volumes. */ diff --git a/typescript/src/models/GdalSourceTimePlaceholder.ts b/typescript/src/models/GdalSourceTimePlaceholder.ts index 58123e5b..514db801 100644 --- a/typescript/src/models/GdalSourceTimePlaceholder.ts +++ b/typescript/src/models/GdalSourceTimePlaceholder.ts @@ -13,12 +13,6 @@ */ import { exists, mapValues } from '../runtime'; -import type { DateTimeParseFormat } from './DateTimeParseFormat'; -import { - DateTimeParseFormatFromJSON, - DateTimeParseFormatFromJSONTyped, - DateTimeParseFormatToJSON, -} from './DateTimeParseFormat'; import type { TimeReference } from './TimeReference'; import { TimeReferenceFromJSON, @@ -34,10 +28,10 @@ import { export interface GdalSourceTimePlaceholder { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof GdalSourceTimePlaceholder */ - format: DateTimeParseFormat; + format: string; /** * * @type {TimeReference} @@ -67,7 +61,7 @@ export function GdalSourceTimePlaceholderFromJSONTyped(json: any, ignoreDiscrimi } return { - 'format': DateTimeParseFormatFromJSON(json['format']), + 'format': json['format'], 'reference': TimeReferenceFromJSON(json['reference']), }; } @@ -81,7 +75,7 @@ export function GdalSourceTimePlaceholderToJSON(value?: GdalSourceTimePlaceholde } return { - 'format': DateTimeParseFormatToJSON(value.format), + 'format': value.format, 'reference': TimeReferenceToJSON(value.reference), }; } diff --git a/typescript/src/models/OgrSourceDatasetTimeType.ts b/typescript/src/models/OgrSourceDatasetTimeType.ts index 10f4a59f..d02a14e0 100644 --- a/typescript/src/models/OgrSourceDatasetTimeType.ts +++ b/typescript/src/models/OgrSourceDatasetTimeType.ts @@ -46,7 +46,7 @@ import { * * @export */ -export type OgrSourceDatasetTimeType = { type: 'none' } & OgrSourceDatasetTimeTypeNone | { type: 'start' } & OgrSourceDatasetTimeTypeStart | { type: 'startDuration' } & OgrSourceDatasetTimeTypeStartDuration | { type: 'startEnd' } & OgrSourceDatasetTimeTypeStartEnd; +export type OgrSourceDatasetTimeType = { type: 'none' } & OgrSourceDatasetTimeTypeNone | { type: 'start' } & OgrSourceDatasetTimeTypeStart | { type: 'start+duration' } & OgrSourceDatasetTimeTypeStartDuration | { type: 'start+end' } & OgrSourceDatasetTimeTypeStartEnd; export function OgrSourceDatasetTimeTypeFromJSON(json: any): OgrSourceDatasetTimeType { return OgrSourceDatasetTimeTypeFromJSONTyped(json, false); @@ -61,10 +61,10 @@ export function OgrSourceDatasetTimeTypeFromJSONTyped(json: any, ignoreDiscrimin return {...OgrSourceDatasetTimeTypeNoneFromJSONTyped(json, true), type: 'none'}; case 'start': return {...OgrSourceDatasetTimeTypeStartFromJSONTyped(json, true), type: 'start'}; - case 'startDuration': - return {...OgrSourceDatasetTimeTypeStartDurationFromJSONTyped(json, true), type: 'startDuration'}; - case 'startEnd': - return {...OgrSourceDatasetTimeTypeStartEndFromJSONTyped(json, true), type: 'startEnd'}; + case 'start+duration': + return {...OgrSourceDatasetTimeTypeStartDurationFromJSONTyped(json, true), type: 'start+duration'}; + case 'start+end': + return {...OgrSourceDatasetTimeTypeStartEndFromJSONTyped(json, true), type: 'start+end'}; default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${json['type']}'`); } @@ -82,9 +82,9 @@ export function OgrSourceDatasetTimeTypeToJSON(value?: OgrSourceDatasetTimeType return OgrSourceDatasetTimeTypeNoneToJSON(value); case 'start': return OgrSourceDatasetTimeTypeStartToJSON(value); - case 'startDuration': + case 'start+duration': return OgrSourceDatasetTimeTypeStartDurationToJSON(value); - case 'startEnd': + case 'start+end': return OgrSourceDatasetTimeTypeStartEndToJSON(value); default: throw new Error(`No variant of OgrSourceDatasetTimeType exists with 'type=${value['type']}'`); diff --git a/typescript/src/models/OgrSourceDatasetTimeTypeNone.ts b/typescript/src/models/OgrSourceDatasetTimeTypeNone.ts index 51992826..c1514fac 100644 --- a/typescript/src/models/OgrSourceDatasetTimeTypeNone.ts +++ b/typescript/src/models/OgrSourceDatasetTimeTypeNone.ts @@ -34,8 +34,8 @@ export interface OgrSourceDatasetTimeTypeNone { export const OgrSourceDatasetTimeTypeNoneTypeEnum = { None: 'none', Start: 'start', - StartEnd: 'startEnd', - StartDuration: 'startDuration' + Startend: 'start+end', + Startduration: 'start+duration' } as const; export type OgrSourceDatasetTimeTypeNoneTypeEnum = typeof OgrSourceDatasetTimeTypeNoneTypeEnum[keyof typeof OgrSourceDatasetTimeTypeNoneTypeEnum]; diff --git a/typescript/src/models/OgrSourceDatasetTimeTypeStartDuration.ts b/typescript/src/models/OgrSourceDatasetTimeTypeStartDuration.ts index 78ae0d93..e0af7fe1 100644 --- a/typescript/src/models/OgrSourceDatasetTimeTypeStartDuration.ts +++ b/typescript/src/models/OgrSourceDatasetTimeTypeStartDuration.ts @@ -57,7 +57,7 @@ export interface OgrSourceDatasetTimeTypeStartDuration { * @export */ export const OgrSourceDatasetTimeTypeStartDurationTypeEnum = { - StartDuration: 'startDuration' + Startduration: 'start+duration' } as const; export type OgrSourceDatasetTimeTypeStartDurationTypeEnum = typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartDurationTypeEnum]; diff --git a/typescript/src/models/OgrSourceDatasetTimeTypeStartEnd.ts b/typescript/src/models/OgrSourceDatasetTimeTypeStartEnd.ts index 47f1cf2f..bb68058d 100644 --- a/typescript/src/models/OgrSourceDatasetTimeTypeStartEnd.ts +++ b/typescript/src/models/OgrSourceDatasetTimeTypeStartEnd.ts @@ -63,7 +63,7 @@ export interface OgrSourceDatasetTimeTypeStartEnd { * @export */ export const OgrSourceDatasetTimeTypeStartEndTypeEnum = { - StartEnd: 'startEnd' + Startend: 'start+end' } as const; export type OgrSourceDatasetTimeTypeStartEndTypeEnum = typeof OgrSourceDatasetTimeTypeStartEndTypeEnum[keyof typeof OgrSourceDatasetTimeTypeStartEndTypeEnum]; diff --git a/typescript/src/models/OgrSourceTimeFormatCustom.ts b/typescript/src/models/OgrSourceTimeFormatCustom.ts index a5768963..77bccc8f 100644 --- a/typescript/src/models/OgrSourceTimeFormatCustom.ts +++ b/typescript/src/models/OgrSourceTimeFormatCustom.ts @@ -13,13 +13,6 @@ */ import { exists, mapValues } from '../runtime'; -import type { DateTimeParseFormat } from './DateTimeParseFormat'; -import { - DateTimeParseFormatFromJSON, - DateTimeParseFormatFromJSONTyped, - DateTimeParseFormatToJSON, -} from './DateTimeParseFormat'; - /** * * @export @@ -28,10 +21,10 @@ import { export interface OgrSourceTimeFormatCustom { /** * - * @type {DateTimeParseFormat} + * @type {string} * @memberof OgrSourceTimeFormatCustom */ - customFormat: DateTimeParseFormat; + customFormat: string; /** * * @type {string} @@ -71,7 +64,7 @@ export function OgrSourceTimeFormatCustomFromJSONTyped(json: any, ignoreDiscrimi } return { - 'customFormat': DateTimeParseFormatFromJSON(json['customFormat']), + 'customFormat': json['customFormat'], 'format': json['format'], }; } @@ -85,7 +78,7 @@ export function OgrSourceTimeFormatCustomToJSON(value?: OgrSourceTimeFormatCusto } return { - 'customFormat': DateTimeParseFormatToJSON(value.customFormat), + 'customFormat': value.customFormat, 'format': value.format, }; } diff --git a/typescript/src/models/VolumeFileLayersResponse.ts b/typescript/src/models/VolumeFileLayersResponse.ts new file mode 100644 index 00000000..782b8851 --- /dev/null +++ b/typescript/src/models/VolumeFileLayersResponse.ts @@ -0,0 +1,66 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine Pro API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.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 { exists, mapValues } from '../runtime'; +/** + * + * @export + * @interface VolumeFileLayersResponse + */ +export interface VolumeFileLayersResponse { + /** + * + * @type {Array} + * @memberof VolumeFileLayersResponse + */ + layers: Array; +} + +/** + * Check if a given object implements the VolumeFileLayersResponse interface. + */ +export function instanceOfVolumeFileLayersResponse(value: object): boolean { + let isInstance = true; + isInstance = isInstance && "layers" in value; + + return isInstance; +} + +export function VolumeFileLayersResponseFromJSON(json: any): VolumeFileLayersResponse { + return VolumeFileLayersResponseFromJSONTyped(json, false); +} + +export function VolumeFileLayersResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): VolumeFileLayersResponse { + if ((json === undefined) || (json === null)) { + return json; + } + return { + + 'layers': json['layers'], + }; +} + +export function VolumeFileLayersResponseToJSON(value?: VolumeFileLayersResponse | null): any { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + + 'layers': value.layers, + }; +} + diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index a520c14a..c34b1cd0 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -32,7 +32,6 @@ export * from './DatasetDefinition'; export * from './DatasetListing'; export * from './DatasetResource'; export * from './DateTime'; -export * from './DateTimeParseFormat'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -206,6 +205,7 @@ export * from './VectorDataType'; export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; +export * from './VolumeFileLayersResponse'; export * from './WcsBoundingbox'; export * from './WcsService'; export * from './WcsVersion'; From b0555cde2f7490737e75dd3cd686750ce9ae44b2 Mon Sep 17 00:00:00 2001 From: Michael Mattig Date: Mon, 28 Oct 2024 14:57:49 +0100 Subject: [PATCH 2/3] update openapi-client --- .generation/input/openapi.json | 4 ++-- python/README.md | 2 +- python/geoengine_openapi_client/api/datasets_api.py | 12 ++++++------ python/test/test_datasets_api.py | 2 +- typescript/dist/apis/DatasetsApi.d.ts | 4 ++-- typescript/dist/apis/DatasetsApi.js | 4 ++-- typescript/dist/esm/apis/DatasetsApi.d.ts | 4 ++-- typescript/dist/esm/apis/DatasetsApi.js | 4 ++-- typescript/src/apis/DatasetsApi.ts | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index e31ebd80..623f1141 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -541,13 +541,13 @@ "tags": [ "Datasets" ], - "summary": "List the layers of on uploaded file.", + "summary": "List the layers of a file in a volume.", "operationId": "list_volume_file_layers_handler", "parameters": [ { "name": "volume_name", "in": "path", - "description": "Volume id", + "description": "Volume name", "required": true, "schema": { "$ref": "#/components/schemas/VolumeName" diff --git a/python/README.md b/python/README.md index 6eab8a61..ab7e9de7 100644 --- a/python/README.md +++ b/python/README.md @@ -100,7 +100,7 @@ Class | Method | HTTP request | Description *DatasetsApi* | [**get_dataset_handler**](docs/DatasetsApi.md#get_dataset_handler) | **GET** /dataset/{dataset} | Retrieves details about a dataset using the internal name. *DatasetsApi* | [**get_loading_info_handler**](docs/DatasetsApi.md#get_loading_info_handler) | **GET** /dataset/{dataset}/loadingInfo | Retrieves the loading information of a dataset *DatasetsApi* | [**list_datasets_handler**](docs/DatasetsApi.md#list_datasets_handler) | **GET** /datasets | Lists available datasets. -*DatasetsApi* | [**list_volume_file_layers_handler**](docs/DatasetsApi.md#list_volume_file_layers_handler) | **GET** /dataset/volumes/{volume_name}/files/{file_name}/layers | List the layers of on uploaded file. +*DatasetsApi* | [**list_volume_file_layers_handler**](docs/DatasetsApi.md#list_volume_file_layers_handler) | **GET** /dataset/volumes/{volume_name}/files/{file_name}/layers | List the layers of a file in a volume. *DatasetsApi* | [**list_volumes_handler**](docs/DatasetsApi.md#list_volumes_handler) | **GET** /dataset/volumes | Lists available volumes. *DatasetsApi* | [**suggest_meta_data_handler**](docs/DatasetsApi.md#suggest_meta_data_handler) | **POST** /dataset/suggest | Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. *DatasetsApi* | [**update_dataset_handler**](docs/DatasetsApi.md#update_dataset_handler) | **POST** /dataset/{dataset} | Update details about a dataset using the internal name. diff --git a/python/geoengine_openapi_client/api/datasets_api.py b/python/geoengine_openapi_client/api/datasets_api.py index e49299ca..cda8caee 100644 --- a/python/geoengine_openapi_client/api/datasets_api.py +++ b/python/geoengine_openapi_client/api/datasets_api.py @@ -948,8 +948,8 @@ def list_datasets_handler_with_http_info(self, order : OrderBy, offset : conint( _request_auth=_params.get('_request_auth')) @validate_arguments - def list_volume_file_layers_handler(self, volume_name : Annotated[StrictStr, Field(..., description="Volume id")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> VolumeFileLayersResponse: # noqa: E501 - """List the layers of on uploaded file. # noqa: E501 + def list_volume_file_layers_handler(self, volume_name : Annotated[StrictStr, Field(..., description="Volume name")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> VolumeFileLayersResponse: # noqa: E501 + """List the layers of a file in a volume. # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True @@ -957,7 +957,7 @@ def list_volume_file_layers_handler(self, volume_name : Annotated[StrictStr, Fie >>> thread = api.list_volume_file_layers_handler(volume_name, file_name, async_req=True) >>> result = thread.get() - :param volume_name: Volume id (required) + :param volume_name: Volume name (required) :type volume_name: str :param file_name: File name (required) :type file_name: str @@ -979,8 +979,8 @@ def list_volume_file_layers_handler(self, volume_name : Annotated[StrictStr, Fie return self.list_volume_file_layers_handler_with_http_info(volume_name, file_name, **kwargs) # noqa: E501 @validate_arguments - def list_volume_file_layers_handler_with_http_info(self, volume_name : Annotated[StrictStr, Field(..., description="Volume id")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> ApiResponse: # noqa: E501 - """List the layers of on uploaded file. # noqa: E501 + def list_volume_file_layers_handler_with_http_info(self, volume_name : Annotated[StrictStr, Field(..., description="Volume name")], file_name : Annotated[StrictStr, Field(..., description="File name")], **kwargs) -> ApiResponse: # noqa: E501 + """List the layers of a file in a volume. # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True @@ -988,7 +988,7 @@ def list_volume_file_layers_handler_with_http_info(self, volume_name : Annotated >>> thread = api.list_volume_file_layers_handler_with_http_info(volume_name, file_name, async_req=True) >>> result = thread.get() - :param volume_name: Volume id (required) + :param volume_name: Volume name (required) :type volume_name: str :param file_name: File name (required) :type file_name: str diff --git a/python/test/test_datasets_api.py b/python/test/test_datasets_api.py index 7c829091..f3967b5f 100644 --- a/python/test/test_datasets_api.py +++ b/python/test/test_datasets_api.py @@ -72,7 +72,7 @@ def test_list_datasets_handler(self) -> None: def test_list_volume_file_layers_handler(self) -> None: """Test case for list_volume_file_layers_handler - List the layers of on uploaded file. # noqa: E501 + List the layers of a file in a volume. # noqa: E501 """ pass diff --git a/typescript/dist/apis/DatasetsApi.d.ts b/typescript/dist/apis/DatasetsApi.d.ts index 706a1371..0c6f3afc 100644 --- a/typescript/dist/apis/DatasetsApi.d.ts +++ b/typescript/dist/apis/DatasetsApi.d.ts @@ -111,11 +111,11 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ listDatasetsHandler(requestParameters: ListDatasetsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/apis/DatasetsApi.js b/typescript/dist/apis/DatasetsApi.js index e80b58ab..602d29cf 100644 --- a/typescript/dist/apis/DatasetsApi.js +++ b/typescript/dist/apis/DatasetsApi.js @@ -266,7 +266,7 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -295,7 +295,7 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/esm/apis/DatasetsApi.d.ts b/typescript/dist/esm/apis/DatasetsApi.d.ts index 706a1371..0c6f3afc 100644 --- a/typescript/dist/esm/apis/DatasetsApi.d.ts +++ b/typescript/dist/esm/apis/DatasetsApi.d.ts @@ -111,11 +111,11 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ listDatasetsHandler(requestParameters: ListDatasetsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/esm/apis/DatasetsApi.js b/typescript/dist/esm/apis/DatasetsApi.js index b23269df..31d488b3 100644 --- a/typescript/dist/esm/apis/DatasetsApi.js +++ b/typescript/dist/esm/apis/DatasetsApi.js @@ -263,7 +263,7 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -292,7 +292,7 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ listVolumeFileLayersHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/src/apis/DatasetsApi.ts b/typescript/src/apis/DatasetsApi.ts index b501dcad..aaefe80e 100644 --- a/typescript/src/apis/DatasetsApi.ts +++ b/typescript/src/apis/DatasetsApi.ts @@ -390,7 +390,7 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ async listVolumeFileLayersHandlerRaw(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters.volumeName === null || requestParameters.volumeName === undefined) { @@ -424,7 +424,7 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * List the layers of on uploaded file. + * List the layers of a file in a volume. */ async listVolumeFileLayersHandler(requestParameters: ListVolumeFileLayersHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.listVolumeFileLayersHandlerRaw(requestParameters, initOverrides); From c90dc021c3ba4ebc2020a6f01403582c805ed39a Mon Sep 17 00:00:00 2001 From: Michael Mattig Date: Mon, 28 Oct 2024 15:12:29 +0100 Subject: [PATCH 3/3] bump version --- .generation/config.ini | 6 +++--- python/README.md | 2 +- python/geoengine_openapi_client/__init__.py | 2 +- python/geoengine_openapi_client/api_client.py | 2 +- python/geoengine_openapi_client/configuration.py | 2 +- python/pyproject.toml | 2 +- python/setup.py | 2 +- typescript/README.md | 4 ++-- typescript/dist/esm/runtime.js | 2 +- typescript/dist/runtime.js | 2 +- typescript/package.json | 2 +- typescript/src/runtime.ts | 2 +- 12 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.generation/config.ini b/.generation/config.ini index 77106364..d09797b3 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,14 +1,14 @@ [input] -backendTag = pro-nightly-2024-08-31 +backendTag = pro-nightly-2024-10-29 [general] githubUrl = https://github.com/geo-engine/openapi-client [python] name = geoengine_openapi_client -version = 0.0.12 +version = 0.0.13 [typescript] name = @geoengine/openapi-client -version = 0.0.12 +version = 0.0.13 diff --git a/python/README.md b/python/README.md index ab7e9de7..6d147fe5 100644 --- a/python/README.md +++ b/python/README.md @@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 0.8.0 -- Package version: 0.0.12 +- Package version: 0.0.13 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index feea526c..cb2eb59a 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -15,7 +15,7 @@ """ # noqa: E501 -__version__ = "0.0.12" +__version__ = "0.0.13" # import apis into sdk package from geoengine_openapi_client.api.datasets_api import DatasetsApi diff --git a/python/geoengine_openapi_client/api_client.py b/python/geoengine_openapi_client/api_client.py index 540da7ab..694819ce 100644 --- a/python/geoengine_openapi_client/api_client.py +++ b/python/geoengine_openapi_client/api_client.py @@ -76,7 +76,7 @@ def __init__(self, configuration=None, header_name=None, header_value=None, self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'geoengine/openapi-client/python/0.0.12' + self.user_agent = 'geoengine/openapi-client/python/0.0.13' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/python/geoengine_openapi_client/configuration.py b/python/geoengine_openapi_client/configuration.py index ef9adca5..94bbbfbf 100644 --- a/python/geoengine_openapi_client/configuration.py +++ b/python/geoengine_openapi_client/configuration.py @@ -378,7 +378,7 @@ def to_debug_report(self): "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 0.8.0\n"\ - "SDK Package Version: 0.0.12".\ + "SDK Package Version: 0.0.13".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/python/pyproject.toml b/python/pyproject.toml index 56d2839a..a2c82244 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geoengine_openapi_client" -version = "0.0.12" +version = "0.0.13" description = "Geo Engine Pro API" authors = ["Geo Engine Developers "] license = "Apache-2.0" diff --git a/python/setup.py b/python/setup.py index 9b332c7d..65dea8c1 100644 --- a/python/setup.py +++ b/python/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools NAME = "geoengine-openapi-client" -VERSION = "0.0.12" +VERSION = "0.0.13" PYTHON_REQUIRES = ">=3.7" REQUIRES = [ "urllib3 >= 1.25.3, < 2.1.0", diff --git a/typescript/README.md b/typescript/README.md index 77c01b62..a41462bb 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,4 +1,4 @@ -## @geoengine/openapi-client@0.0.12 +## @geoengine/openapi-client@0.0.13 This generator creates TypeScript/JavaScript client that utilizes [Fetch API](https://fetch.spec.whatwg.org/). The generated Node module can be used in the following environments: @@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co _published:_ ``` -npm install @geoengine/openapi-client@0.0.12 --save +npm install @geoengine/openapi-client@0.0.13 --save ``` _unPublished (not recommended):_ diff --git a/typescript/dist/esm/runtime.js b/typescript/dist/esm/runtime.js index a4626923..66e65eb9 100644 --- a/typescript/dist/esm/runtime.js +++ b/typescript/dist/esm/runtime.js @@ -69,7 +69,7 @@ export class Configuration { } export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.12' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.13' } }); /** diff --git a/typescript/dist/runtime.js b/typescript/dist/runtime.js index eb43434a..6d71274d 100644 --- a/typescript/dist/runtime.js +++ b/typescript/dist/runtime.js @@ -73,7 +73,7 @@ class Configuration { exports.Configuration = Configuration; exports.DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.12' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.13' } }); /** diff --git a/typescript/package.json b/typescript/package.json index 811db736..874b2aa9 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.12", + "version": "0.0.13", "description": "OpenAPI client for @geoengine/openapi-client", "author": "OpenAPI-Generator", "repository": { diff --git a/typescript/src/runtime.ts b/typescript/src/runtime.ts index 1ee9fefa..698ade61 100644 --- a/typescript/src/runtime.ts +++ b/typescript/src/runtime.ts @@ -86,7 +86,7 @@ export class Configuration { export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.12' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.13' } });