diff --git a/.generation/config.ini b/.generation/config.ini index ad0c57f7..edba851f 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,14 +1,14 @@ [input] -backendTag = pro-nightly-2024-12-24 +backendTag = pro-nightly-2025-01-23 [general] githubUrl = https://github.com/geo-engine/openapi-client [python] name = geoengine_openapi_client -version = 0.0.18 +version = 0.0.19 [typescript] name = @geoengine/openapi-client -version = 0.0.18 +version = 0.0.19 diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index cb8b24c9..ffd9853d 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -75,106 +75,14 @@ "tags": [ "Datasets" ], - "summary": "Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume.", + "summary": "Creates a new dataset referencing files.", + "description": "Users can reference previously uploaded files.\nAdmins can reference files from a volume.", "operationId": "create_dataset_handler", "requestBody": { "content": { "application/json": { "schema": { "$ref": "#/components/schemas/CreateDataset" - }, - "examples": { - "Germany Border": { - "value": { - "dataPath": { - "upload": "420b06de-0a7e-45cb-9c1c-ea901b46ab69" - }, - "definition": { - "properties": { - "name": "germany_border", - "displayName": "Germany Border", - "description": "The Outline of Germany", - "sourceOperator": "OgrSource" - }, - "metaData": { - "type": "OgrMetaData", - "loadingInfo": { - "fileName": "germany_polygon.gpkg", - "layerName": "test_germany", - "dataType": "MultiPolygon", - "time": { - "type": "none" - }, - "columns": { - "x": "", - "y": null, - "text": [], - "float": [], - "int": [], - "bool": [], - "datetime": [] - }, - "forceOgrTimeFilter": false, - "onError": "ignore" - }, - "resultDescriptor": { - "dataType": "MultiPolygon", - "spatialReference": "EPSG:4326", - "columns": {} - } - } - } - } - }, - "Plain Data": { - "value": { - "dataPath": { - "upload": "f3bd61ef-d9ce-471c-89a1-46b5f7295886" - }, - "definition": { - "properties": { - "name": "plain_data", - "displayName": "Plain Data", - "description": "Demo Dataset", - "sourceOperator": "OgrSource" - }, - "metaData": { - "type": "OgrMetaData", - "loadingInfo": { - "fileName": "plain_data.csv", - "layerName": "plain_data", - "dataType": "Data", - "time": { - "type": "none" - }, - "columns": { - "x": "", - "y": null, - "text": [], - "float": [], - "int": [ - "a" - ] - }, - "forceOgrTimeFilter": false, - "onError": "abort" - }, - "resultDescriptor": { - "dataType": "Data", - "spatialReference": "EPSG:4326", - "columns": { - "a": { - "dataType": "int", - "measurement": { - "type": "unitless" - } - } - } - } - } - } - } - } } } }, @@ -183,93 +91,6 @@ "responses": { "200": { "$ref": "#/components/responses/DatasetNameResponse" - }, - "400": { - "description": "Bad request", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - }, - "examples": { - "Admin tried to create dataset from an upload": { - "value": { - "error": "AdminsCannotCreateDatasetFromUpload", - "message": "Admins cannot create dataset from upload" - } - }, - "Body is invalid json": { - "value": { - "error": "BodyDeserializeError", - "message": "expected `,` or `}` at line 13 column 7" - } - }, - "Failed to read body": { - "value": { - "error": "Payload", - "message": "Error that occur during reading payload: Can not decode content-encoding." - } - }, - "Filepath in metadata is invalid": { - "value": { - "error": "CannotResolveUploadFilePath", - "message": "CannotResolveUploadFilePath: PathIsNotAFile" - } - }, - "Normal user tried to create dataset from a volume": { - "value": { - "error": "OnlyAdminsCanCreateDatasetFromVolume", - "message": "Only admins can create dataset from volume" - } - }, - "Referenced an unknown upload": { - "value": { - "error": "UploadNotFound", - "message": "UploadNotFound: UnknownUploadId" - } - }, - "Referenced an unknown volume": { - "value": { - "error": "UnknownVolume", - "message": "Unknown volume" - } - } - } - } - } - }, - "401": { - "$ref": "#/components/responses/UnauthorizedUserResponse" - }, - "413": { - "$ref": "#/components/responses/PayloadTooLargeResponse" - }, - "415": { - "$ref": "#/components/responses/UnsupportedMediaTypeForJsonResponse" - }, - "500": { - "description": "Internal server error", - "content": { - "application/json": { - "schema": { - "$ref": "#/components/schemas/ErrorResponse" - }, - "examples": { - "Cannot access config": { - "value": { - "error": "CannotAccessConfig", - "message": "CannotAccessConfig: ConfigLockFailed" - } - }, - "Failed to access database": { - "value": { - "error": "DatabaseAccessError", - "message": "DatabaseAccessError: connection closed" - } - } - } - } - } } }, "security": [ @@ -2360,7 +2181,14 @@ }, "responses": { "200": { - "description": "" + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/MlModelNameResponse" + } + } + } } }, "security": [ @@ -6059,7 +5887,7 @@ ], "properties": { "id": { - "$ref": "#/components/schemas/DatasetId" + "$ref": "#/components/schemas/DatasetName" }, "type": { "type": "string", @@ -7046,6 +6874,36 @@ "MlModelName": { "type": "string" }, + "MlModelNameResponse": { + "type": "object", + "required": [ + "mlModelName" + ], + "properties": { + "mlModelName": { + "$ref": "#/components/schemas/MlModelName" + } + } + }, + "MlModelResource": { + "type": "object", + "title": "MlModelResource", + "required": [ + "type", + "id" + ], + "properties": { + "id": { + "$ref": "#/components/schemas/MlModelName" + }, + "type": { + "type": "string", + "enum": [ + "mlModel" + ] + } + } + }, "MockDatasetDataSourceLoadingInfo": { "type": "object", "required": [ @@ -7760,7 +7618,7 @@ "PermissionListing": { "type": "object", "required": [ - "resourceId", + "resource", "role", "permission" ], @@ -7768,8 +7626,8 @@ "permission": { "$ref": "#/components/schemas/Permission" }, - "resourceId": { - "$ref": "#/components/schemas/ResourceId" + "resource": { + "$ref": "#/components/schemas/Resource" }, "role": { "$ref": "#/components/schemas/Role" @@ -8496,6 +8354,9 @@ }, { "$ref": "#/components/schemas/DatasetResource" + }, + { + "$ref": "#/components/schemas/MlModelResource" } ], "discriminator": { @@ -8504,6 +8365,7 @@ "dataset": "#/components/schemas/DatasetResource", "layer": "#/components/schemas/LayerResource", "layerCollection": "#/components/schemas/LayerCollectionResource", + "mlModel": "#/components/schemas/MlModelResource", "project": "#/components/schemas/ProjectResource" } } diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index 977e676c..553a46e3 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -88,6 +88,8 @@ docs/MetaDataDefinition.md docs/MetaDataSuggestion.md docs/MlModel.md docs/MlModelMetadata.md +docs/MlModelNameResponse.md +docs/MlModelResource.md docs/MockDatasetDataSourceLoadingInfo.md docs/MockMetaData.md docs/MultiBandRasterColorizer.md @@ -345,6 +347,8 @@ geoengine_openapi_client/models/meta_data_definition.py geoengine_openapi_client/models/meta_data_suggestion.py geoengine_openapi_client/models/ml_model.py geoengine_openapi_client/models/ml_model_metadata.py +geoengine_openapi_client/models/ml_model_name_response.py +geoengine_openapi_client/models/ml_model_resource.py geoengine_openapi_client/models/mock_dataset_data_source_loading_info.py geoengine_openapi_client/models/mock_meta_data.py geoengine_openapi_client/models/multi_band_raster_colorizer.py @@ -580,6 +584,8 @@ test/test_meta_data_suggestion.py test/test_ml_api.py test/test_ml_model.py test/test_ml_model_metadata.py +test/test_ml_model_name_response.py +test/test_ml_model_resource.py test/test_mock_dataset_data_source_loading_info.py test/test_mock_meta_data.py test/test_multi_band_raster_colorizer.py diff --git a/python/README.md b/python/README.md index de779d84..ba40002a 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.18 +- Package version: 0.0.19 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. @@ -95,7 +95,7 @@ All URIs are relative to *http://127.0.0.1:3030/api* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- *DatasetsApi* | [**auto_create_dataset_handler**](docs/DatasetsApi.md#auto_create_dataset_handler) | **POST** /dataset/auto | Creates a new dataset using previously uploaded files. -*DatasetsApi* | [**create_dataset_handler**](docs/DatasetsApi.md#create_dataset_handler) | **POST** /dataset | Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. +*DatasetsApi* | [**create_dataset_handler**](docs/DatasetsApi.md#create_dataset_handler) | **POST** /dataset | Creates a new dataset referencing files. *DatasetsApi* | [**delete_dataset_handler**](docs/DatasetsApi.md#delete_dataset_handler) | **DELETE** /dataset/{dataset} | Delete a dataset *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 @@ -268,6 +268,8 @@ Class | Method | HTTP request | Description - [MetaDataSuggestion](docs/MetaDataSuggestion.md) - [MlModel](docs/MlModel.md) - [MlModelMetadata](docs/MlModelMetadata.md) + - [MlModelNameResponse](docs/MlModelNameResponse.md) + - [MlModelResource](docs/MlModelResource.md) - [MockDatasetDataSourceLoadingInfo](docs/MockDatasetDataSourceLoadingInfo.md) - [MockMetaData](docs/MockMetaData.md) - [MultiBandRasterColorizer](docs/MultiBandRasterColorizer.md) diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index b095c067..5ae8a2ec 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -15,7 +15,7 @@ """ # noqa: E501 -__version__ = "0.0.18" +__version__ = "0.0.19" # import apis into sdk package from geoengine_openapi_client.api.datasets_api import DatasetsApi @@ -128,6 +128,8 @@ from geoengine_openapi_client.models.meta_data_suggestion import MetaDataSuggestion from geoengine_openapi_client.models.ml_model import MlModel from geoengine_openapi_client.models.ml_model_metadata import MlModelMetadata +from geoengine_openapi_client.models.ml_model_name_response import MlModelNameResponse +from geoengine_openapi_client.models.ml_model_resource import MlModelResource from geoengine_openapi_client.models.mock_dataset_data_source_loading_info import MockDatasetDataSourceLoadingInfo from geoengine_openapi_client.models.mock_meta_data import MockMetaData from geoengine_openapi_client.models.multi_band_raster_colorizer import MultiBandRasterColorizer diff --git a/python/geoengine_openapi_client/api/datasets_api.py b/python/geoengine_openapi_client/api/datasets_api.py index 9d8e56bc..5c30aedd 100644 --- a/python/geoengine_openapi_client/api/datasets_api.py +++ b/python/geoengine_openapi_client/api/datasets_api.py @@ -212,8 +212,9 @@ def auto_create_dataset_handler_with_http_info(self, auto_create_dataset : AutoC @validate_arguments def create_dataset_handler(self, create_dataset : CreateDataset, **kwargs) -> CreateDatasetHandler200Response: # noqa: E501 - """Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. # noqa: E501 + """Creates a new dataset referencing files. # noqa: E501 + Users can reference previously uploaded files. Admins can reference files from a volume. # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True @@ -241,8 +242,9 @@ def create_dataset_handler(self, create_dataset : CreateDataset, **kwargs) -> Cr @validate_arguments def create_dataset_handler_with_http_info(self, create_dataset : CreateDataset, **kwargs) -> ApiResponse: # noqa: E501 - """Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. # noqa: E501 + """Creates a new dataset referencing files. # noqa: E501 + Users can reference previously uploaded files. Admins can reference files from a volume. # noqa: E501 This method makes a synchronous HTTP request by default. To make an asynchronous HTTP request, please pass async_req=True @@ -336,11 +338,6 @@ def create_dataset_handler_with_http_info(self, create_dataset : CreateDataset, _response_types_map = { '200': "CreateDatasetHandler200Response", - '400': "ErrorResponse", - '401': "ErrorResponse", - '413': "ErrorResponse", - '415': "ErrorResponse", - '500': "ErrorResponse", } return self.api_client.call_api( diff --git a/python/geoengine_openapi_client/api/ml_api.py b/python/geoengine_openapi_client/api/ml_api.py index e9aeabb8..c0ef41b6 100644 --- a/python/geoengine_openapi_client/api/ml_api.py +++ b/python/geoengine_openapi_client/api/ml_api.py @@ -25,6 +25,7 @@ from typing import List from geoengine_openapi_client.models.ml_model import MlModel +from geoengine_openapi_client.models.ml_model_name_response import MlModelNameResponse from geoengine_openapi_client.api_client import ApiClient from geoengine_openapi_client.api_response import ApiResponse @@ -47,7 +48,7 @@ def __init__(self, api_client=None) -> None: self.api_client = api_client @validate_arguments - def add_ml_model(self, ml_model : MlModel, **kwargs) -> None: # noqa: E501 + def add_ml_model(self, ml_model : MlModel, **kwargs) -> MlModelNameResponse: # noqa: E501 """Create a new ml model. # noqa: E501 This method makes a synchronous HTTP request by default. To make an @@ -67,7 +68,7 @@ def add_ml_model(self, ml_model : MlModel, **kwargs) -> None: # noqa: E501 :return: Returns the result object. If the method is called asynchronously, returns the request thread. - :rtype: None + :rtype: MlModelNameResponse """ kwargs['_return_http_data_only'] = True if '_preload_content' in kwargs: @@ -109,7 +110,7 @@ def add_ml_model_with_http_info(self, ml_model : MlModel, **kwargs) -> ApiRespon :return: Returns the result object. If the method is called asynchronously, returns the request thread. - :rtype: None + :rtype: tuple(MlModelNameResponse, status_code(int), headers(HTTPHeaderDict)) """ _params = locals() @@ -156,6 +157,10 @@ def add_ml_model_with_http_info(self, ml_model : MlModel, **kwargs) -> ApiRespon if _params['ml_model'] is not None: _body_params = _params['ml_model'] + # set the HTTP header `Accept` + _header_params['Accept'] = self.api_client.select_header_accept( + ['application/json']) # noqa: E501 + # set the HTTP header `Content-Type` _content_types_list = _params.get('_content_type', self.api_client.select_header_content_type( @@ -166,7 +171,9 @@ def add_ml_model_with_http_info(self, ml_model : MlModel, **kwargs) -> ApiRespon # authentication setting _auth_settings = ['session_token'] # noqa: E501 - _response_types_map = {} + _response_types_map = { + '200': "MlModelNameResponse", + } return self.api_client.call_api( '/ml/models', 'POST', diff --git a/python/geoengine_openapi_client/api_client.py b/python/geoengine_openapi_client/api_client.py index b28045c8..50c09422 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.18' + self.user_agent = 'geoengine/openapi-client/python/0.0.19' 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 2db21162..82619840 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.18".\ + "SDK Package Version: 0.0.19".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/python/geoengine_openapi_client/models/__init__.py b/python/geoengine_openapi_client/models/__init__.py index bb4e4e28..1fd35d8b 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -96,6 +96,8 @@ from geoengine_openapi_client.models.meta_data_suggestion import MetaDataSuggestion from geoengine_openapi_client.models.ml_model import MlModel from geoengine_openapi_client.models.ml_model_metadata import MlModelMetadata +from geoengine_openapi_client.models.ml_model_name_response import MlModelNameResponse +from geoengine_openapi_client.models.ml_model_resource import MlModelResource from geoengine_openapi_client.models.mock_dataset_data_source_loading_info import MockDatasetDataSourceLoadingInfo from geoengine_openapi_client.models.mock_meta_data import MockMetaData from geoengine_openapi_client.models.multi_band_raster_colorizer import MultiBandRasterColorizer diff --git a/python/geoengine_openapi_client/models/layer_resource.py b/python/geoengine_openapi_client/models/layer_resource.py index ebdb399b..ea4d528a 100644 --- a/python/geoengine_openapi_client/models/layer_resource.py +++ b/python/geoengine_openapi_client/models/layer_resource.py @@ -33,8 +33,8 @@ class LayerResource(BaseModel): @validator('type') def type_validate_enum(cls, value): """Validates the enum""" - if value not in ('layer', 'layerCollection', 'project', 'dataset'): - raise ValueError("must be one of enum values ('layer', 'layerCollection', 'project', 'dataset')") + if value not in ('layer', 'layerCollection', 'project', 'dataset', 'mlModel'): + raise ValueError("must be one of enum values ('layer', 'layerCollection', 'project', 'dataset', 'mlModel')") return value class Config: diff --git a/python/geoengine_openapi_client/models/ml_model_name_response.py b/python/geoengine_openapi_client/models/ml_model_name_response.py new file mode 100644 index 00000000..87b46c69 --- /dev/null +++ b/python/geoengine_openapi_client/models/ml_model_name_response.py @@ -0,0 +1,72 @@ +# coding: utf-8 + +""" + Geo Engine API + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + + The version of the OpenAPI document: 0.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 pydantic import BaseModel, Field, StrictStr + +class MlModelNameResponse(BaseModel): + """ + MlModelNameResponse + """ + ml_model_name: StrictStr = Field(..., alias="mlModelName") + __properties = ["mlModelName"] + + 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) -> MlModelNameResponse: + """Create an instance of MlModelNameResponse 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) -> MlModelNameResponse: + """Create an instance of MlModelNameResponse from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return MlModelNameResponse.parse_obj(obj) + + _obj = MlModelNameResponse.parse_obj({ + "ml_model_name": obj.get("mlModelName") + }) + return _obj + + diff --git a/python/geoengine_openapi_client/models/ml_model_resource.py b/python/geoengine_openapi_client/models/ml_model_resource.py new file mode 100644 index 00000000..e5072648 --- /dev/null +++ b/python/geoengine_openapi_client/models/ml_model_resource.py @@ -0,0 +1,81 @@ +# coding: utf-8 + +""" + Geo Engine API + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + + The version of the OpenAPI document: 0.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 pydantic import BaseModel, Field, StrictStr, validator + +class MlModelResource(BaseModel): + """ + MlModelResource + """ + id: StrictStr = Field(...) + type: StrictStr = Field(...) + __properties = ["id", "type"] + + @validator('type') + def type_validate_enum(cls, value): + """Validates the enum""" + if value not in ('mlModel'): + raise ValueError("must be one of enum values ('mlModel')") + return value + + 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) -> MlModelResource: + """Create an instance of MlModelResource 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) -> MlModelResource: + """Create an instance of MlModelResource from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return MlModelResource.parse_obj(obj) + + _obj = MlModelResource.parse_obj({ + "id": obj.get("id"), + "type": obj.get("type") + }) + return _obj + + diff --git a/python/geoengine_openapi_client/models/permission_listing.py b/python/geoengine_openapi_client/models/permission_listing.py index 3f38cfd2..45410c14 100644 --- a/python/geoengine_openapi_client/models/permission_listing.py +++ b/python/geoengine_openapi_client/models/permission_listing.py @@ -22,7 +22,7 @@ from pydantic import BaseModel, Field from geoengine_openapi_client.models.permission import Permission -from geoengine_openapi_client.models.resource_id import ResourceId +from geoengine_openapi_client.models.resource import Resource from geoengine_openapi_client.models.role import Role class PermissionListing(BaseModel): @@ -30,9 +30,9 @@ class PermissionListing(BaseModel): PermissionListing """ permission: Permission = Field(...) - resource_id: ResourceId = Field(..., alias="resourceId") + resource: Resource = Field(...) role: Role = Field(...) - __properties = ["permission", "resourceId", "role"] + __properties = ["permission", "resource", "role"] class Config: """Pydantic configuration""" @@ -58,9 +58,9 @@ def to_dict(self): exclude={ }, exclude_none=True) - # override the default output from pydantic by calling `to_dict()` of resource_id - if self.resource_id: - _dict['resourceId'] = self.resource_id.to_dict() + # override the default output from pydantic by calling `to_dict()` of resource + if self.resource: + _dict['resource'] = self.resource.to_dict() # override the default output from pydantic by calling `to_dict()` of role if self.role: _dict['role'] = self.role.to_dict() @@ -77,7 +77,7 @@ def from_dict(cls, obj: dict) -> PermissionListing: _obj = PermissionListing.parse_obj({ "permission": obj.get("permission"), - "resource_id": ResourceId.from_dict(obj.get("resourceId")) if obj.get("resourceId") is not None else None, + "resource": Resource.from_dict(obj.get("resource")) if obj.get("resource") is not None else None, "role": Role.from_dict(obj.get("role")) if obj.get("role") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/resource.py b/python/geoengine_openapi_client/models/resource.py index 83b109df..85c8a0f5 100644 --- a/python/geoengine_openapi_client/models/resource.py +++ b/python/geoengine_openapi_client/models/resource.py @@ -24,11 +24,12 @@ from geoengine_openapi_client.models.dataset_resource import DatasetResource from geoengine_openapi_client.models.layer_collection_resource import LayerCollectionResource from geoengine_openapi_client.models.layer_resource import LayerResource +from geoengine_openapi_client.models.ml_model_resource import MlModelResource from geoengine_openapi_client.models.project_resource import ProjectResource from typing import Union, Any, List, TYPE_CHECKING from pydantic import StrictStr, Field -RESOURCE_ONE_OF_SCHEMAS = ["DatasetResource", "LayerCollectionResource", "LayerResource", "ProjectResource"] +RESOURCE_ONE_OF_SCHEMAS = ["DatasetResource", "LayerCollectionResource", "LayerResource", "MlModelResource", "ProjectResource"] class Resource(BaseModel): """ @@ -42,8 +43,10 @@ class Resource(BaseModel): oneof_schema_3_validator: Optional[ProjectResource] = None # data type: DatasetResource oneof_schema_4_validator: Optional[DatasetResource] = None + # data type: MlModelResource + oneof_schema_5_validator: Optional[MlModelResource] = None if TYPE_CHECKING: - actual_instance: Union[DatasetResource, LayerCollectionResource, LayerResource, ProjectResource] + actual_instance: Union[DatasetResource, LayerCollectionResource, LayerResource, MlModelResource, ProjectResource] else: actual_instance: Any one_of_schemas: List[str] = Field(RESOURCE_ONE_OF_SCHEMAS, const=True) @@ -89,12 +92,17 @@ def actual_instance_must_validate_oneof(cls, v): error_messages.append(f"Error! Input type `{type(v)}` is not `DatasetResource`") else: match += 1 + # validate data type: MlModelResource + if not isinstance(v, MlModelResource): + error_messages.append(f"Error! Input type `{type(v)}` is not `MlModelResource`") + else: + match += 1 if match > 1: # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, ProjectResource. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when setting `actual_instance` in Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, MlModelResource, ProjectResource. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when setting `actual_instance` in Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, ProjectResource. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when setting `actual_instance` in Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, MlModelResource, ProjectResource. Details: " + ", ".join(error_messages)) else: return v @@ -129,6 +137,11 @@ def from_json(cls, json_str: str) -> Resource: instance.actual_instance = LayerResource.from_json(json_str) return instance + # check if data type is `MlModelResource` + if _data_type == "MlModelResource": + instance.actual_instance = MlModelResource.from_json(json_str) + return instance + # check if data type is `ProjectResource` if _data_type == "ProjectResource": instance.actual_instance = ProjectResource.from_json(json_str) @@ -149,6 +162,11 @@ def from_json(cls, json_str: str) -> Resource: instance.actual_instance = LayerCollectionResource.from_json(json_str) return instance + # check if data type is `MlModelResource` + if _data_type == "mlModel": + instance.actual_instance = MlModelResource.from_json(json_str) + return instance + # check if data type is `ProjectResource` if _data_type == "project": instance.actual_instance = ProjectResource.from_json(json_str) @@ -178,13 +196,19 @@ def from_json(cls, json_str: str) -> Resource: match += 1 except (ValidationError, ValueError) as e: error_messages.append(str(e)) + # deserialize data into MlModelResource + try: + instance.actual_instance = MlModelResource.from_json(json_str) + match += 1 + except (ValidationError, ValueError) as e: + error_messages.append(str(e)) if match > 1: # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, ProjectResource. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when deserializing the JSON string into Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, MlModelResource, ProjectResource. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when deserializing the JSON string into Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, ProjectResource. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when deserializing the JSON string into Resource with oneOf schemas: DatasetResource, LayerCollectionResource, LayerResource, MlModelResource, ProjectResource. Details: " + ", ".join(error_messages)) else: return instance diff --git a/python/pyproject.toml b/python/pyproject.toml index d5a5a0ae..99b2f209 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geoengine_openapi_client" -version = "0.0.18" +version = "0.0.19" description = "Geo Engine API" authors = ["Geo Engine Developers "] license = "Apache-2.0" diff --git a/python/setup.py b/python/setup.py index ae9bcec6..0d2bdb22 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.18" +VERSION = "0.0.19" PYTHON_REQUIRES = ">=3.7" REQUIRES = [ "urllib3 >= 1.25.3, < 2.1.0", diff --git a/python/test/test_datasets_api.py b/python/test/test_datasets_api.py index 58e15da9..2478a572 100644 --- a/python/test/test_datasets_api.py +++ b/python/test/test_datasets_api.py @@ -37,7 +37,7 @@ def test_auto_create_dataset_handler(self) -> None: def test_create_dataset_handler(self) -> None: """Test case for create_dataset_handler - Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. # noqa: E501 + Creates a new dataset referencing files. # noqa: E501 """ pass diff --git a/python/test/test_ml_model_name_response.py b/python/test/test_ml_model_name_response.py new file mode 100644 index 00000000..967aa611 --- /dev/null +++ b/python/test/test_ml_model_name_response.py @@ -0,0 +1,54 @@ +# coding: utf-8 + +""" + Geo Engine API + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + + The version of the OpenAPI document: 0.8.0 + Contact: dev@geoengine.de + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from geoengine_openapi_client.models.ml_model_name_response import MlModelNameResponse # noqa: E501 + +class TestMlModelNameResponse(unittest.TestCase): + """MlModelNameResponse unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> MlModelNameResponse: + """Test MlModelNameResponse + 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 `MlModelNameResponse` + """ + model = MlModelNameResponse() # noqa: E501 + if include_optional: + return MlModelNameResponse( + ml_model_name = '' + ) + else: + return MlModelNameResponse( + ml_model_name = '', + ) + """ + + def testMlModelNameResponse(self): + """Test MlModelNameResponse""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python/test/test_ml_model_resource.py b/python/test/test_ml_model_resource.py new file mode 100644 index 00000000..6ff90d5c --- /dev/null +++ b/python/test/test_ml_model_resource.py @@ -0,0 +1,56 @@ +# coding: utf-8 + +""" + Geo Engine API + + No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + + The version of the OpenAPI document: 0.8.0 + Contact: dev@geoengine.de + Generated by OpenAPI Generator (https://openapi-generator.tech) + + Do not edit the class manually. +""" # noqa: E501 + + +import unittest +import datetime + +from geoengine_openapi_client.models.ml_model_resource import MlModelResource # noqa: E501 + +class TestMlModelResource(unittest.TestCase): + """MlModelResource unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> MlModelResource: + """Test MlModelResource + 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 `MlModelResource` + """ + model = MlModelResource() # noqa: E501 + if include_optional: + return MlModelResource( + id = '', + type = 'mlModel' + ) + else: + return MlModelResource( + id = '', + type = 'mlModel', + ) + """ + + def testMlModelResource(self): + """Test MlModelResource""" + # inst_req_only = self.make_instance(include_optional=False) + # inst_req_and_optional = self.make_instance(include_optional=True) + +if __name__ == '__main__': + unittest.main() diff --git a/python/test/test_permission_listing.py b/python/test/test_permission_listing.py index bb25814f..2ee16fd0 100644 --- a/python/test/test_permission_listing.py +++ b/python/test/test_permission_listing.py @@ -38,7 +38,7 @@ def make_instance(self, include_optional) -> PermissionListing: if include_optional: return PermissionListing( permission = 'Read', - resource_id = None, + resource = None, role = geoengine_openapi_client.models.role.Role( id = '', name = '', ) @@ -46,7 +46,7 @@ def make_instance(self, include_optional) -> PermissionListing: else: return PermissionListing( permission = 'Read', - resource_id = None, + resource = None, role = geoengine_openapi_client.models.role.Role( id = '', name = '', ), diff --git a/typescript/README.md b/typescript/README.md index c17550a5..8cd9ea33 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,4 +1,4 @@ -## @geoengine/openapi-client@0.0.18 +## @geoengine/openapi-client@0.0.19 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.18 --save +npm install @geoengine/openapi-client@0.0.19 --save ``` _unPublished (not recommended):_ diff --git a/typescript/dist/apis/DatasetsApi.d.ts b/typescript/dist/apis/DatasetsApi.d.ts index e0b0422e..53a5b7f1 100644 --- a/typescript/dist/apis/DatasetsApi.d.ts +++ b/typescript/dist/apis/DatasetsApi.d.ts @@ -71,11 +71,13 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/apis/DatasetsApi.js b/typescript/dist/apis/DatasetsApi.js index 65ef7d3d..23fac7ea 100644 --- a/typescript/dist/apis/DatasetsApi.js +++ b/typescript/dist/apis/DatasetsApi.js @@ -69,7 +69,8 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -97,7 +98,8 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/apis/MLApi.d.ts b/typescript/dist/apis/MLApi.d.ts index 7ffb4ba1..e60a3914 100644 --- a/typescript/dist/apis/MLApi.d.ts +++ b/typescript/dist/apis/MLApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { MlModel } from '../models/index'; +import type { MlModel, MlModelNameResponse } from '../models/index'; export interface AddMlModelRequest { mlModel: MlModel; } @@ -24,11 +24,11 @@ export declare class MLApi extends runtime.BaseAPI { /** * Create a new ml model. */ - addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Create a new ml model. */ - addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Get ml model by name. */ diff --git a/typescript/dist/apis/MLApi.js b/typescript/dist/apis/MLApi.js index a7c97a01..8dde57d7 100644 --- a/typescript/dist/apis/MLApi.js +++ b/typescript/dist/apis/MLApi.js @@ -54,7 +54,7 @@ class MLApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.MlModelToJSON)(requestParameters.mlModel), }, initOverrides); - return new runtime.VoidApiResponse(response); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.MlModelNameResponseFromJSON)(jsonValue)); }); } /** @@ -62,7 +62,8 @@ class MLApi extends runtime.BaseAPI { */ addMlModel(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { - yield this.addMlModelRaw(requestParameters, initOverrides); + const response = yield this.addMlModelRaw(requestParameters, initOverrides); + return yield response.value(); }); } /** diff --git a/typescript/dist/esm/apis/DatasetsApi.d.ts b/typescript/dist/esm/apis/DatasetsApi.d.ts index e0b0422e..53a5b7f1 100644 --- a/typescript/dist/esm/apis/DatasetsApi.d.ts +++ b/typescript/dist/esm/apis/DatasetsApi.d.ts @@ -71,11 +71,13 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/esm/apis/DatasetsApi.js b/typescript/dist/esm/apis/DatasetsApi.js index ee45919f..bbba6b04 100644 --- a/typescript/dist/esm/apis/DatasetsApi.js +++ b/typescript/dist/esm/apis/DatasetsApi.js @@ -66,7 +66,8 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -94,7 +95,8 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ createDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/esm/apis/MLApi.d.ts b/typescript/dist/esm/apis/MLApi.d.ts index 7ffb4ba1..e60a3914 100644 --- a/typescript/dist/esm/apis/MLApi.d.ts +++ b/typescript/dist/esm/apis/MLApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { MlModel } from '../models/index'; +import type { MlModel, MlModelNameResponse } from '../models/index'; export interface AddMlModelRequest { mlModel: MlModel; } @@ -24,11 +24,11 @@ export declare class MLApi extends runtime.BaseAPI { /** * Create a new ml model. */ - addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Create a new ml model. */ - addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Get ml model by name. */ diff --git a/typescript/dist/esm/apis/MLApi.js b/typescript/dist/esm/apis/MLApi.js index 5102e9ed..23e4d460 100644 --- a/typescript/dist/esm/apis/MLApi.js +++ b/typescript/dist/esm/apis/MLApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { MlModelFromJSON, MlModelToJSON, } from '../models/index'; +import { MlModelFromJSON, MlModelToJSON, MlModelNameResponseFromJSON, } from '../models/index'; /** * */ @@ -51,7 +51,7 @@ export class MLApi extends runtime.BaseAPI { query: queryParameters, body: MlModelToJSON(requestParameters.mlModel), }, initOverrides); - return new runtime.VoidApiResponse(response); + return new runtime.JSONApiResponse(response, (jsonValue) => MlModelNameResponseFromJSON(jsonValue)); }); } /** @@ -59,7 +59,8 @@ export class MLApi extends runtime.BaseAPI { */ addMlModel(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { - yield this.addMlModelRaw(requestParameters, initOverrides); + const response = yield this.addMlModelRaw(requestParameters, initOverrides); + return yield response.value(); }); } /** diff --git a/typescript/dist/esm/models/MlModelNameResponse.d.ts b/typescript/dist/esm/models/MlModelNameResponse.d.ts new file mode 100644 index 00000000..750bd6e1 --- /dev/null +++ b/typescript/dist/esm/models/MlModelNameResponse.d.ts @@ -0,0 +1,31 @@ +/** + * Geo Engine 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 MlModelNameResponse + */ +export interface MlModelNameResponse { + /** + * + * @type {string} + * @memberof MlModelNameResponse + */ + mlModelName: string; +} +/** + * Check if a given object implements the MlModelNameResponse interface. + */ +export declare function instanceOfMlModelNameResponse(value: object): boolean; +export declare function MlModelNameResponseFromJSON(json: any): MlModelNameResponse; +export declare function MlModelNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelNameResponse; +export declare function MlModelNameResponseToJSON(value?: MlModelNameResponse | null): any; diff --git a/typescript/dist/esm/models/MlModelNameResponse.js b/typescript/dist/esm/models/MlModelNameResponse.js new file mode 100644 index 00000000..f32041ce --- /dev/null +++ b/typescript/dist/esm/models/MlModelNameResponse.js @@ -0,0 +1,43 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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 MlModelNameResponse interface. + */ +export function instanceOfMlModelNameResponse(value) { + let isInstance = true; + isInstance = isInstance && "mlModelName" in value; + return isInstance; +} +export function MlModelNameResponseFromJSON(json) { + return MlModelNameResponseFromJSONTyped(json, false); +} +export function MlModelNameResponseFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'mlModelName': json['mlModelName'], + }; +} +export function MlModelNameResponseToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'mlModelName': value.mlModelName, + }; +} diff --git a/typescript/dist/esm/models/MlModelResource.d.ts b/typescript/dist/esm/models/MlModelResource.d.ts new file mode 100644 index 00000000..a72112d5 --- /dev/null +++ b/typescript/dist/esm/models/MlModelResource.d.ts @@ -0,0 +1,44 @@ +/** + * Geo Engine 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 MlModelResource + */ +export interface MlModelResource { + /** + * + * @type {string} + * @memberof MlModelResource + */ + id: string; + /** + * + * @type {string} + * @memberof MlModelResource + */ + type: MlModelResourceTypeEnum; +} +/** + * @export + */ +export declare const MlModelResourceTypeEnum: { + readonly MlModel: "mlModel"; +}; +export type MlModelResourceTypeEnum = typeof MlModelResourceTypeEnum[keyof typeof MlModelResourceTypeEnum]; +/** + * Check if a given object implements the MlModelResource interface. + */ +export declare function instanceOfMlModelResource(value: object): boolean; +export declare function MlModelResourceFromJSON(json: any): MlModelResource; +export declare function MlModelResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelResource; +export declare function MlModelResourceToJSON(value?: MlModelResource | null): any; diff --git a/typescript/dist/esm/models/MlModelResource.js b/typescript/dist/esm/models/MlModelResource.js new file mode 100644 index 00000000..beba5016 --- /dev/null +++ b/typescript/dist/esm/models/MlModelResource.js @@ -0,0 +1,52 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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 + */ +export const MlModelResourceTypeEnum = { + MlModel: 'mlModel' +}; +/** + * Check if a given object implements the MlModelResource interface. + */ +export function instanceOfMlModelResource(value) { + let isInstance = true; + isInstance = isInstance && "id" in value; + isInstance = isInstance && "type" in value; + return isInstance; +} +export function MlModelResourceFromJSON(json) { + return MlModelResourceFromJSONTyped(json, false); +} +export function MlModelResourceFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'id': json['id'], + 'type': json['type'], + }; +} +export function MlModelResourceToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'id': value.id, + 'type': value.type, + }; +} diff --git a/typescript/dist/esm/models/PermissionListing.d.ts b/typescript/dist/esm/models/PermissionListing.d.ts index fe90496e..13d526d2 100644 --- a/typescript/dist/esm/models/PermissionListing.d.ts +++ b/typescript/dist/esm/models/PermissionListing.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import type { Permission } from './Permission'; -import type { ResourceId } from './ResourceId'; +import type { Resource } from './Resource'; import type { Role } from './Role'; /** * @@ -26,10 +26,10 @@ export interface PermissionListing { permission: Permission; /** * - * @type {ResourceId} + * @type {Resource} * @memberof PermissionListing */ - resourceId: ResourceId; + resource: Resource; /** * * @type {Role} diff --git a/typescript/dist/esm/models/PermissionListing.js b/typescript/dist/esm/models/PermissionListing.js index e77018ac..92ed5603 100644 --- a/typescript/dist/esm/models/PermissionListing.js +++ b/typescript/dist/esm/models/PermissionListing.js @@ -12,7 +12,7 @@ * Do not edit the class manually. */ import { PermissionFromJSON, PermissionToJSON, } from './Permission'; -import { ResourceIdFromJSON, ResourceIdToJSON, } from './ResourceId'; +import { ResourceFromJSON, ResourceToJSON, } from './Resource'; import { RoleFromJSON, RoleToJSON, } from './Role'; /** * Check if a given object implements the PermissionListing interface. @@ -20,7 +20,7 @@ import { RoleFromJSON, RoleToJSON, } from './Role'; export function instanceOfPermissionListing(value) { let isInstance = true; isInstance = isInstance && "permission" in value; - isInstance = isInstance && "resourceId" in value; + isInstance = isInstance && "resource" in value; isInstance = isInstance && "role" in value; return isInstance; } @@ -33,7 +33,7 @@ export function PermissionListingFromJSONTyped(json, ignoreDiscriminator) { } return { 'permission': PermissionFromJSON(json['permission']), - 'resourceId': ResourceIdFromJSON(json['resourceId']), + 'resource': ResourceFromJSON(json['resource']), 'role': RoleFromJSON(json['role']), }; } @@ -46,7 +46,7 @@ export function PermissionListingToJSON(value) { } return { 'permission': PermissionToJSON(value.permission), - 'resourceId': ResourceIdToJSON(value.resourceId), + 'resource': ResourceToJSON(value.resource), 'role': RoleToJSON(value.role), }; } diff --git a/typescript/dist/esm/models/Resource.d.ts b/typescript/dist/esm/models/Resource.d.ts index 9dbc0d1c..68910807 100644 --- a/typescript/dist/esm/models/Resource.d.ts +++ b/typescript/dist/esm/models/Resource.d.ts @@ -12,6 +12,7 @@ import { DatasetResource } from './DatasetResource'; import { LayerCollectionResource } from './LayerCollectionResource'; import { LayerResource } from './LayerResource'; +import { MlModelResource } from './MlModelResource'; import { ProjectResource } from './ProjectResource'; /** * @type Resource @@ -25,6 +26,8 @@ export type Resource = { } & LayerResource | { type: 'layerCollection'; } & LayerCollectionResource | { + type: 'mlModel'; +} & MlModelResource | { type: 'project'; } & ProjectResource; export declare function ResourceFromJSON(json: any): Resource; diff --git a/typescript/dist/esm/models/Resource.js b/typescript/dist/esm/models/Resource.js index add55604..719dd2b9 100644 --- a/typescript/dist/esm/models/Resource.js +++ b/typescript/dist/esm/models/Resource.js @@ -14,6 +14,7 @@ import { DatasetResourceFromJSONTyped, DatasetResourceToJSON, } from './DatasetResource'; import { LayerCollectionResourceFromJSONTyped, LayerCollectionResourceToJSON, } from './LayerCollectionResource'; import { LayerResourceFromJSONTyped, LayerResourceToJSON, } from './LayerResource'; +import { MlModelResourceFromJSONTyped, MlModelResourceToJSON, } from './MlModelResource'; import { ProjectResourceFromJSONTyped, ProjectResourceToJSON, } from './ProjectResource'; export function ResourceFromJSON(json) { return ResourceFromJSONTyped(json, false); @@ -29,6 +30,8 @@ export function ResourceFromJSONTyped(json, ignoreDiscriminator) { return Object.assign(Object.assign({}, LayerResourceFromJSONTyped(json, true)), { type: 'layer' }); case 'layerCollection': return Object.assign(Object.assign({}, LayerCollectionResourceFromJSONTyped(json, true)), { type: 'layerCollection' }); + case 'mlModel': + return Object.assign(Object.assign({}, MlModelResourceFromJSONTyped(json, true)), { type: 'mlModel' }); case 'project': return Object.assign(Object.assign({}, ProjectResourceFromJSONTyped(json, true)), { type: 'project' }); default: @@ -49,6 +52,8 @@ export function ResourceToJSON(value) { return LayerResourceToJSON(value); case 'layerCollection': return LayerCollectionResourceToJSON(value); + case 'mlModel': + return MlModelResourceToJSON(value); case 'project': return ProjectResourceToJSON(value); default: diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index 7b745df7..ccb8f378 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -79,6 +79,8 @@ export * from './MetaDataDefinition'; export * from './MetaDataSuggestion'; export * from './MlModel'; export * from './MlModelMetadata'; +export * from './MlModelNameResponse'; +export * from './MlModelResource'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/dist/esm/models/index.js b/typescript/dist/esm/models/index.js index 84bd63af..762a3e8b 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -81,6 +81,8 @@ export * from './MetaDataDefinition'; export * from './MetaDataSuggestion'; export * from './MlModel'; export * from './MlModelMetadata'; +export * from './MlModelNameResponse'; +export * from './MlModelResource'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/dist/esm/runtime.js b/typescript/dist/esm/runtime.js index ff19a17c..1073395b 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.18' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.19' } }); /** diff --git a/typescript/dist/models/MlModelNameResponse.d.ts b/typescript/dist/models/MlModelNameResponse.d.ts new file mode 100644 index 00000000..750bd6e1 --- /dev/null +++ b/typescript/dist/models/MlModelNameResponse.d.ts @@ -0,0 +1,31 @@ +/** + * Geo Engine 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 MlModelNameResponse + */ +export interface MlModelNameResponse { + /** + * + * @type {string} + * @memberof MlModelNameResponse + */ + mlModelName: string; +} +/** + * Check if a given object implements the MlModelNameResponse interface. + */ +export declare function instanceOfMlModelNameResponse(value: object): boolean; +export declare function MlModelNameResponseFromJSON(json: any): MlModelNameResponse; +export declare function MlModelNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelNameResponse; +export declare function MlModelNameResponseToJSON(value?: MlModelNameResponse | null): any; diff --git a/typescript/dist/models/MlModelNameResponse.js b/typescript/dist/models/MlModelNameResponse.js new file mode 100644 index 00000000..e139d8e9 --- /dev/null +++ b/typescript/dist/models/MlModelNameResponse.js @@ -0,0 +1,50 @@ +"use strict"; +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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.MlModelNameResponseToJSON = exports.MlModelNameResponseFromJSONTyped = exports.MlModelNameResponseFromJSON = exports.instanceOfMlModelNameResponse = void 0; +/** + * Check if a given object implements the MlModelNameResponse interface. + */ +function instanceOfMlModelNameResponse(value) { + let isInstance = true; + isInstance = isInstance && "mlModelName" in value; + return isInstance; +} +exports.instanceOfMlModelNameResponse = instanceOfMlModelNameResponse; +function MlModelNameResponseFromJSON(json) { + return MlModelNameResponseFromJSONTyped(json, false); +} +exports.MlModelNameResponseFromJSON = MlModelNameResponseFromJSON; +function MlModelNameResponseFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'mlModelName': json['mlModelName'], + }; +} +exports.MlModelNameResponseFromJSONTyped = MlModelNameResponseFromJSONTyped; +function MlModelNameResponseToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'mlModelName': value.mlModelName, + }; +} +exports.MlModelNameResponseToJSON = MlModelNameResponseToJSON; diff --git a/typescript/dist/models/MlModelResource.d.ts b/typescript/dist/models/MlModelResource.d.ts new file mode 100644 index 00000000..a72112d5 --- /dev/null +++ b/typescript/dist/models/MlModelResource.d.ts @@ -0,0 +1,44 @@ +/** + * Geo Engine 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 MlModelResource + */ +export interface MlModelResource { + /** + * + * @type {string} + * @memberof MlModelResource + */ + id: string; + /** + * + * @type {string} + * @memberof MlModelResource + */ + type: MlModelResourceTypeEnum; +} +/** + * @export + */ +export declare const MlModelResourceTypeEnum: { + readonly MlModel: "mlModel"; +}; +export type MlModelResourceTypeEnum = typeof MlModelResourceTypeEnum[keyof typeof MlModelResourceTypeEnum]; +/** + * Check if a given object implements the MlModelResource interface. + */ +export declare function instanceOfMlModelResource(value: object): boolean; +export declare function MlModelResourceFromJSON(json: any): MlModelResource; +export declare function MlModelResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelResource; +export declare function MlModelResourceToJSON(value?: MlModelResource | null): any; diff --git a/typescript/dist/models/MlModelResource.js b/typescript/dist/models/MlModelResource.js new file mode 100644 index 00000000..ce9e7045 --- /dev/null +++ b/typescript/dist/models/MlModelResource.js @@ -0,0 +1,59 @@ +"use strict"; +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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.MlModelResourceToJSON = exports.MlModelResourceFromJSONTyped = exports.MlModelResourceFromJSON = exports.instanceOfMlModelResource = exports.MlModelResourceTypeEnum = void 0; +/** + * @export + */ +exports.MlModelResourceTypeEnum = { + MlModel: 'mlModel' +}; +/** + * Check if a given object implements the MlModelResource interface. + */ +function instanceOfMlModelResource(value) { + let isInstance = true; + isInstance = isInstance && "id" in value; + isInstance = isInstance && "type" in value; + return isInstance; +} +exports.instanceOfMlModelResource = instanceOfMlModelResource; +function MlModelResourceFromJSON(json) { + return MlModelResourceFromJSONTyped(json, false); +} +exports.MlModelResourceFromJSON = MlModelResourceFromJSON; +function MlModelResourceFromJSONTyped(json, ignoreDiscriminator) { + if ((json === undefined) || (json === null)) { + return json; + } + return { + 'id': json['id'], + 'type': json['type'], + }; +} +exports.MlModelResourceFromJSONTyped = MlModelResourceFromJSONTyped; +function MlModelResourceToJSON(value) { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + 'id': value.id, + 'type': value.type, + }; +} +exports.MlModelResourceToJSON = MlModelResourceToJSON; diff --git a/typescript/dist/models/PermissionListing.d.ts b/typescript/dist/models/PermissionListing.d.ts index fe90496e..13d526d2 100644 --- a/typescript/dist/models/PermissionListing.d.ts +++ b/typescript/dist/models/PermissionListing.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import type { Permission } from './Permission'; -import type { ResourceId } from './ResourceId'; +import type { Resource } from './Resource'; import type { Role } from './Role'; /** * @@ -26,10 +26,10 @@ export interface PermissionListing { permission: Permission; /** * - * @type {ResourceId} + * @type {Resource} * @memberof PermissionListing */ - resourceId: ResourceId; + resource: Resource; /** * * @type {Role} diff --git a/typescript/dist/models/PermissionListing.js b/typescript/dist/models/PermissionListing.js index 95bbbc87..3ce178ab 100644 --- a/typescript/dist/models/PermissionListing.js +++ b/typescript/dist/models/PermissionListing.js @@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.PermissionListingToJSON = exports.PermissionListingFromJSONTyped = exports.PermissionListingFromJSON = exports.instanceOfPermissionListing = void 0; const Permission_1 = require("./Permission"); -const ResourceId_1 = require("./ResourceId"); +const Resource_1 = require("./Resource"); const Role_1 = require("./Role"); /** * Check if a given object implements the PermissionListing interface. @@ -23,7 +23,7 @@ const Role_1 = require("./Role"); function instanceOfPermissionListing(value) { let isInstance = true; isInstance = isInstance && "permission" in value; - isInstance = isInstance && "resourceId" in value; + isInstance = isInstance && "resource" in value; isInstance = isInstance && "role" in value; return isInstance; } @@ -38,7 +38,7 @@ function PermissionListingFromJSONTyped(json, ignoreDiscriminator) { } return { 'permission': (0, Permission_1.PermissionFromJSON)(json['permission']), - 'resourceId': (0, ResourceId_1.ResourceIdFromJSON)(json['resourceId']), + 'resource': (0, Resource_1.ResourceFromJSON)(json['resource']), 'role': (0, Role_1.RoleFromJSON)(json['role']), }; } @@ -52,7 +52,7 @@ function PermissionListingToJSON(value) { } return { 'permission': (0, Permission_1.PermissionToJSON)(value.permission), - 'resourceId': (0, ResourceId_1.ResourceIdToJSON)(value.resourceId), + 'resource': (0, Resource_1.ResourceToJSON)(value.resource), 'role': (0, Role_1.RoleToJSON)(value.role), }; } diff --git a/typescript/dist/models/Resource.d.ts b/typescript/dist/models/Resource.d.ts index 9dbc0d1c..68910807 100644 --- a/typescript/dist/models/Resource.d.ts +++ b/typescript/dist/models/Resource.d.ts @@ -12,6 +12,7 @@ import { DatasetResource } from './DatasetResource'; import { LayerCollectionResource } from './LayerCollectionResource'; import { LayerResource } from './LayerResource'; +import { MlModelResource } from './MlModelResource'; import { ProjectResource } from './ProjectResource'; /** * @type Resource @@ -25,6 +26,8 @@ export type Resource = { } & LayerResource | { type: 'layerCollection'; } & LayerCollectionResource | { + type: 'mlModel'; +} & MlModelResource | { type: 'project'; } & ProjectResource; export declare function ResourceFromJSON(json: any): Resource; diff --git a/typescript/dist/models/Resource.js b/typescript/dist/models/Resource.js index 814fcea3..e42b277e 100644 --- a/typescript/dist/models/Resource.js +++ b/typescript/dist/models/Resource.js @@ -17,6 +17,7 @@ exports.ResourceToJSON = exports.ResourceFromJSONTyped = exports.ResourceFromJSO const DatasetResource_1 = require("./DatasetResource"); const LayerCollectionResource_1 = require("./LayerCollectionResource"); const LayerResource_1 = require("./LayerResource"); +const MlModelResource_1 = require("./MlModelResource"); const ProjectResource_1 = require("./ProjectResource"); function ResourceFromJSON(json) { return ResourceFromJSONTyped(json, false); @@ -33,6 +34,8 @@ function ResourceFromJSONTyped(json, ignoreDiscriminator) { return Object.assign(Object.assign({}, (0, LayerResource_1.LayerResourceFromJSONTyped)(json, true)), { type: 'layer' }); case 'layerCollection': return Object.assign(Object.assign({}, (0, LayerCollectionResource_1.LayerCollectionResourceFromJSONTyped)(json, true)), { type: 'layerCollection' }); + case 'mlModel': + return Object.assign(Object.assign({}, (0, MlModelResource_1.MlModelResourceFromJSONTyped)(json, true)), { type: 'mlModel' }); case 'project': return Object.assign(Object.assign({}, (0, ProjectResource_1.ProjectResourceFromJSONTyped)(json, true)), { type: 'project' }); default: @@ -54,6 +57,8 @@ function ResourceToJSON(value) { return (0, LayerResource_1.LayerResourceToJSON)(value); case 'layerCollection': return (0, LayerCollectionResource_1.LayerCollectionResourceToJSON)(value); + case 'mlModel': + return (0, MlModelResource_1.MlModelResourceToJSON)(value); case 'project': return (0, ProjectResource_1.ProjectResourceToJSON)(value); default: diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index 7b745df7..ccb8f378 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -79,6 +79,8 @@ export * from './MetaDataDefinition'; export * from './MetaDataSuggestion'; export * from './MlModel'; export * from './MlModelMetadata'; +export * from './MlModelNameResponse'; +export * from './MlModelResource'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index 9f52efc3..52927ee1 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -97,6 +97,8 @@ __exportStar(require("./MetaDataDefinition"), exports); __exportStar(require("./MetaDataSuggestion"), exports); __exportStar(require("./MlModel"), exports); __exportStar(require("./MlModelMetadata"), exports); +__exportStar(require("./MlModelNameResponse"), exports); +__exportStar(require("./MlModelResource"), exports); __exportStar(require("./MockDatasetDataSourceLoadingInfo"), exports); __exportStar(require("./MockMetaData"), exports); __exportStar(require("./MultiBandRasterColorizer"), exports); diff --git a/typescript/dist/runtime.js b/typescript/dist/runtime.js index 750e1c8a..fd143b83 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.18' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.19' } }); /** diff --git a/typescript/package.json b/typescript/package.json index eea200da..1c68b870 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.18", + "version": "0.0.19", "description": "OpenAPI client for @geoengine/openapi-client", "author": "OpenAPI-Generator", "repository": { diff --git a/typescript/src/apis/DatasetsApi.ts b/typescript/src/apis/DatasetsApi.ts index 27401d20..ae06ffdc 100644 --- a/typescript/src/apis/DatasetsApi.ts +++ b/typescript/src/apis/DatasetsApi.ts @@ -170,7 +170,8 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ async createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters.createDataset === null || requestParameters.createDataset === undefined) { @@ -203,7 +204,8 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. + * Users can reference previously uploaded files. Admins can reference files from a volume. + * Creates a new dataset referencing files. */ async createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createDatasetHandlerRaw(requestParameters, initOverrides); diff --git a/typescript/src/apis/MLApi.ts b/typescript/src/apis/MLApi.ts index 7afac21a..6b69161d 100644 --- a/typescript/src/apis/MLApi.ts +++ b/typescript/src/apis/MLApi.ts @@ -16,10 +16,13 @@ import * as runtime from '../runtime'; import type { MlModel, + MlModelNameResponse, } from '../models/index'; import { MlModelFromJSON, MlModelToJSON, + MlModelNameResponseFromJSON, + MlModelNameResponseToJSON, } from '../models/index'; export interface AddMlModelRequest { @@ -38,7 +41,7 @@ export class MLApi extends runtime.BaseAPI { /** * Create a new ml model. */ - async addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async addMlModelRaw(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters.mlModel === null || requestParameters.mlModel === undefined) { throw new runtime.RequiredError('mlModel','Required parameter requestParameters.mlModel was null or undefined when calling addMlModel.'); } @@ -65,14 +68,15 @@ export class MLApi extends runtime.BaseAPI { body: MlModelToJSON(requestParameters.mlModel), }, initOverrides); - return new runtime.VoidApiResponse(response); + return new runtime.JSONApiResponse(response, (jsonValue) => MlModelNameResponseFromJSON(jsonValue)); } /** * Create a new ml model. */ - async addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { - await this.addMlModelRaw(requestParameters, initOverrides); + async addMlModel(requestParameters: AddMlModelRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + const response = await this.addMlModelRaw(requestParameters, initOverrides); + return await response.value(); } /** diff --git a/typescript/src/models/MlModelNameResponse.ts b/typescript/src/models/MlModelNameResponse.ts new file mode 100644 index 00000000..fa7016ed --- /dev/null +++ b/typescript/src/models/MlModelNameResponse.ts @@ -0,0 +1,66 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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 MlModelNameResponse + */ +export interface MlModelNameResponse { + /** + * + * @type {string} + * @memberof MlModelNameResponse + */ + mlModelName: string; +} + +/** + * Check if a given object implements the MlModelNameResponse interface. + */ +export function instanceOfMlModelNameResponse(value: object): boolean { + let isInstance = true; + isInstance = isInstance && "mlModelName" in value; + + return isInstance; +} + +export function MlModelNameResponseFromJSON(json: any): MlModelNameResponse { + return MlModelNameResponseFromJSONTyped(json, false); +} + +export function MlModelNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelNameResponse { + if ((json === undefined) || (json === null)) { + return json; + } + return { + + 'mlModelName': json['mlModelName'], + }; +} + +export function MlModelNameResponseToJSON(value?: MlModelNameResponse | null): any { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + + 'mlModelName': value.mlModelName, + }; +} + diff --git a/typescript/src/models/MlModelResource.ts b/typescript/src/models/MlModelResource.ts new file mode 100644 index 00000000..05805981 --- /dev/null +++ b/typescript/src/models/MlModelResource.ts @@ -0,0 +1,85 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.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 MlModelResource + */ +export interface MlModelResource { + /** + * + * @type {string} + * @memberof MlModelResource + */ + id: string; + /** + * + * @type {string} + * @memberof MlModelResource + */ + type: MlModelResourceTypeEnum; +} + + +/** + * @export + */ +export const MlModelResourceTypeEnum = { + MlModel: 'mlModel' +} as const; +export type MlModelResourceTypeEnum = typeof MlModelResourceTypeEnum[keyof typeof MlModelResourceTypeEnum]; + + +/** + * Check if a given object implements the MlModelResource interface. + */ +export function instanceOfMlModelResource(value: object): boolean { + let isInstance = true; + isInstance = isInstance && "id" in value; + isInstance = isInstance && "type" in value; + + return isInstance; +} + +export function MlModelResourceFromJSON(json: any): MlModelResource { + return MlModelResourceFromJSONTyped(json, false); +} + +export function MlModelResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlModelResource { + if ((json === undefined) || (json === null)) { + return json; + } + return { + + 'id': json['id'], + 'type': json['type'], + }; +} + +export function MlModelResourceToJSON(value?: MlModelResource | null): any { + if (value === undefined) { + return undefined; + } + if (value === null) { + return null; + } + return { + + 'id': value.id, + 'type': value.type, + }; +} + diff --git a/typescript/src/models/PermissionListing.ts b/typescript/src/models/PermissionListing.ts index 5436881d..13dfdff1 100644 --- a/typescript/src/models/PermissionListing.ts +++ b/typescript/src/models/PermissionListing.ts @@ -19,12 +19,12 @@ import { PermissionFromJSONTyped, PermissionToJSON, } from './Permission'; -import type { ResourceId } from './ResourceId'; +import type { Resource } from './Resource'; import { - ResourceIdFromJSON, - ResourceIdFromJSONTyped, - ResourceIdToJSON, -} from './ResourceId'; + ResourceFromJSON, + ResourceFromJSONTyped, + ResourceToJSON, +} from './Resource'; import type { Role } from './Role'; import { RoleFromJSON, @@ -46,10 +46,10 @@ export interface PermissionListing { permission: Permission; /** * - * @type {ResourceId} + * @type {Resource} * @memberof PermissionListing */ - resourceId: ResourceId; + resource: Resource; /** * * @type {Role} @@ -64,7 +64,7 @@ export interface PermissionListing { export function instanceOfPermissionListing(value: object): boolean { let isInstance = true; isInstance = isInstance && "permission" in value; - isInstance = isInstance && "resourceId" in value; + isInstance = isInstance && "resource" in value; isInstance = isInstance && "role" in value; return isInstance; @@ -81,7 +81,7 @@ export function PermissionListingFromJSONTyped(json: any, ignoreDiscriminator: b return { 'permission': PermissionFromJSON(json['permission']), - 'resourceId': ResourceIdFromJSON(json['resourceId']), + 'resource': ResourceFromJSON(json['resource']), 'role': RoleFromJSON(json['role']), }; } @@ -96,7 +96,7 @@ export function PermissionListingToJSON(value?: PermissionListing | null): any { return { 'permission': PermissionToJSON(value.permission), - 'resourceId': ResourceIdToJSON(value.resourceId), + 'resource': ResourceToJSON(value.resource), 'role': RoleToJSON(value.role), }; } diff --git a/typescript/src/models/Resource.ts b/typescript/src/models/Resource.ts index 0938bcba..37aaafb6 100644 --- a/typescript/src/models/Resource.ts +++ b/typescript/src/models/Resource.ts @@ -33,6 +33,13 @@ import { LayerResourceFromJSONTyped, LayerResourceToJSON, } from './LayerResource'; +import { + MlModelResource, + instanceOfMlModelResource, + MlModelResourceFromJSON, + MlModelResourceFromJSONTyped, + MlModelResourceToJSON, +} from './MlModelResource'; import { ProjectResource, instanceOfProjectResource, @@ -46,7 +53,7 @@ import { * * @export */ -export type Resource = { type: 'dataset' } & DatasetResource | { type: 'layer' } & LayerResource | { type: 'layerCollection' } & LayerCollectionResource | { type: 'project' } & ProjectResource; +export type Resource = { type: 'dataset' } & DatasetResource | { type: 'layer' } & LayerResource | { type: 'layerCollection' } & LayerCollectionResource | { type: 'mlModel' } & MlModelResource | { type: 'project' } & ProjectResource; export function ResourceFromJSON(json: any): Resource { return ResourceFromJSONTyped(json, false); @@ -63,6 +70,8 @@ export function ResourceFromJSONTyped(json: any, ignoreDiscriminator: boolean): return {...LayerResourceFromJSONTyped(json, true), type: 'layer'}; case 'layerCollection': return {...LayerCollectionResourceFromJSONTyped(json, true), type: 'layerCollection'}; + case 'mlModel': + return {...MlModelResourceFromJSONTyped(json, true), type: 'mlModel'}; case 'project': return {...ProjectResourceFromJSONTyped(json, true), type: 'project'}; default: @@ -84,6 +93,8 @@ export function ResourceToJSON(value?: Resource | null): any { return LayerResourceToJSON(value); case 'layerCollection': return LayerCollectionResourceToJSON(value); + case 'mlModel': + return MlModelResourceToJSON(value); case 'project': return ProjectResourceToJSON(value); default: diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index 84bd63af..762a3e8b 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -81,6 +81,8 @@ export * from './MetaDataDefinition'; export * from './MetaDataSuggestion'; export * from './MlModel'; export * from './MlModelMetadata'; +export * from './MlModelNameResponse'; +export * from './MlModelResource'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/src/runtime.ts b/typescript/src/runtime.ts index 4ca72203..c561f54f 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.18' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.19' } });