diff --git a/.generation/config.ini b/.generation/config.ini index 74e872a2..8f1b838e 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,9 +1,9 @@ [input] -backendCommit = 1076a616369dcc33e86b422a9364ac99553a18f8 +backendCommit = cdb162df11bff5a3ae5854126d15538c77a2cabb [general] githubUrl = https://github.com/geo-engine/openapi-client -version = 0.0.23 +version = 0.0.24 [python] name = geoengine_openapi_client diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index a68008f2..409f8495 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -6953,20 +6953,22 @@ "required": [ "fileName", "inputType", - "numInputBands", - "outputType" + "outputType", + "inputShape", + "outputShape" ], "properties": { "fileName": { "type": "string" }, + "inputShape": { + "$ref": "#/components/schemas/MlTensorShape3D" + }, "inputType": { "$ref": "#/components/schemas/RasterDataType" }, - "numInputBands": { - "type": "integer", - "format": "int32", - "minimum": 0 + "outputShape": { + "$ref": "#/components/schemas/MlTensorShape3D" }, "outputType": { "$ref": "#/components/schemas/RasterDataType" @@ -7005,6 +7007,32 @@ } } }, + "MlTensorShape3D": { + "type": "object", + "description": "A struct describing tensor shape for `MlModelMetadata`", + "required": [ + "y", + "x", + "bands" + ], + "properties": { + "bands": { + "type": "integer", + "format": "int32", + "minimum": 0 + }, + "x": { + "type": "integer", + "format": "int32", + "minimum": 0 + }, + "y": { + "type": "integer", + "format": "int32", + "minimum": 0 + } + } + }, "MockDatasetDataSourceLoadingInfo": { "type": "object", "required": [ diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index cd77744f..f8712378 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -87,6 +87,7 @@ docs/MlModel.md docs/MlModelMetadata.md docs/MlModelNameResponse.md docs/MlModelResource.md +docs/MlTensorShape3D.md docs/MockDatasetDataSourceLoadingInfo.md docs/MockMetaData.md docs/MultiBandRasterColorizer.md @@ -338,6 +339,7 @@ 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/ml_tensor_shape3_d.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 @@ -567,6 +569,7 @@ 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_ml_tensor_shape3_d.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 9485a987..6d9b9e2d 100644 --- a/python/README.md +++ b/python/README.md @@ -267,6 +267,7 @@ Class | Method | HTTP request | Description - [MlModelMetadata](docs/MlModelMetadata.md) - [MlModelNameResponse](docs/MlModelNameResponse.md) - [MlModelResource](docs/MlModelResource.md) + - [MlTensorShape3D](docs/MlTensorShape3D.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 02f22047..7db0e36b 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -127,6 +127,7 @@ 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.ml_tensor_shape3_d import MlTensorShape3D 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/__init__.py b/python/geoengine_openapi_client/models/__init__.py index eb84f304..0f13786b 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -95,6 +95,7 @@ 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.ml_tensor_shape3_d import MlTensorShape3D 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/ml_model_metadata.py b/python/geoengine_openapi_client/models/ml_model_metadata.py index 7587f379..595d392f 100644 --- a/python/geoengine_openapi_client/models/ml_model_metadata.py +++ b/python/geoengine_openapi_client/models/ml_model_metadata.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List -from typing_extensions import Annotated +from geoengine_openapi_client.models.ml_tensor_shape3_d import MlTensorShape3D from geoengine_openapi_client.models.raster_data_type import RasterDataType from typing import Optional, Set from typing_extensions import Self @@ -30,10 +30,11 @@ class MlModelMetadata(BaseModel): MlModelMetadata """ # noqa: E501 file_name: StrictStr = Field(alias="fileName") + input_shape: MlTensorShape3D = Field(alias="inputShape") input_type: RasterDataType = Field(alias="inputType") - num_input_bands: Annotated[int, Field(strict=True, ge=0)] = Field(alias="numInputBands") + output_shape: MlTensorShape3D = Field(alias="outputShape") output_type: RasterDataType = Field(alias="outputType") - __properties: ClassVar[List[str]] = ["fileName", "inputType", "numInputBands", "outputType"] + __properties: ClassVar[List[str]] = ["fileName", "inputShape", "inputType", "outputShape", "outputType"] model_config = ConfigDict( populate_by_name=True, @@ -74,6 +75,12 @@ def to_dict(self) -> Dict[str, Any]: exclude=excluded_fields, exclude_none=True, ) + # override the default output from pydantic by calling `to_dict()` of input_shape + if self.input_shape: + _dict['inputShape'] = self.input_shape.to_dict() + # override the default output from pydantic by calling `to_dict()` of output_shape + if self.output_shape: + _dict['outputShape'] = self.output_shape.to_dict() return _dict @classmethod @@ -87,8 +94,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: _obj = cls.model_validate({ "fileName": obj.get("fileName"), + "inputShape": MlTensorShape3D.from_dict(obj["inputShape"]) if obj.get("inputShape") is not None else None, "inputType": obj.get("inputType"), - "numInputBands": obj.get("numInputBands"), + "outputShape": MlTensorShape3D.from_dict(obj["outputShape"]) if obj.get("outputShape") is not None else None, "outputType": obj.get("outputType") }) return _obj diff --git a/python/geoengine_openapi_client/models/ml_tensor_shape3_d.py b/python/geoengine_openapi_client/models/ml_tensor_shape3_d.py new file mode 100644 index 00000000..65a01213 --- /dev/null +++ b/python/geoengine_openapi_client/models/ml_tensor_shape3_d.py @@ -0,0 +1,93 @@ +# 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, ConfigDict, Field +from typing import Any, ClassVar, Dict, List +from typing_extensions import Annotated +from typing import Optional, Set +from typing_extensions import Self + +class MlTensorShape3D(BaseModel): + """ + A struct describing tensor shape for `MlModelMetadata` + """ # noqa: E501 + bands: Annotated[int, Field(strict=True, ge=0)] + x: Annotated[int, Field(strict=True, ge=0)] + y: Annotated[int, Field(strict=True, ge=0)] + __properties: ClassVar[List[str]] = ["bands", "x", "y"] + + model_config = ConfigDict( + populate_by_name=True, + validate_assignment=True, + protected_namespaces=(), + ) + + + def to_str(self) -> str: + """Returns the string representation of the model using alias""" + return pprint.pformat(self.model_dump(by_alias=True)) + + def to_json(self) -> str: + """Returns the JSON representation of the model using alias""" + # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead + return json.dumps(self.to_dict()) + + @classmethod + def from_json(cls, json_str: str) -> Optional[Self]: + """Create an instance of MlTensorShape3D from a JSON string""" + return cls.from_dict(json.loads(json_str)) + + def to_dict(self) -> Dict[str, Any]: + """Return the dictionary representation of the model using alias. + + This has the following differences from calling pydantic's + `self.model_dump(by_alias=True)`: + + * `None` is only added to the output dict for nullable fields that + were set at model initialization. Other fields with value `None` + are ignored. + """ + excluded_fields: Set[str] = set([ + ]) + + _dict = self.model_dump( + by_alias=True, + exclude=excluded_fields, + exclude_none=True, + ) + return _dict + + @classmethod + def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + """Create an instance of MlTensorShape3D from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "bands": obj.get("bands"), + "x": obj.get("x"), + "y": obj.get("y") + }) + return _obj + + diff --git a/python/test/test_ml_model.py b/python/test/test_ml_model.py index aadc36d3..17b3a047 100644 --- a/python/test/test_ml_model.py +++ b/python/test/test_ml_model.py @@ -40,8 +40,15 @@ def make_instance(self, include_optional) -> MlModel: display_name = '', metadata = geoengine_openapi_client.models.ml_model_metadata.MlModelMetadata( file_name = '', + input_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), input_type = 'U8', - num_input_bands = 0, + output_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), output_type = 'U8', ), name = '', upload = '' @@ -52,8 +59,15 @@ def make_instance(self, include_optional) -> MlModel: display_name = '', metadata = geoengine_openapi_client.models.ml_model_metadata.MlModelMetadata( file_name = '', + input_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), input_type = 'U8', - num_input_bands = 0, + output_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), output_type = 'U8', ), name = '', upload = '', diff --git a/python/test/test_ml_model_metadata.py b/python/test/test_ml_model_metadata.py index 492e7f20..fbae68e2 100644 --- a/python/test/test_ml_model_metadata.py +++ b/python/test/test_ml_model_metadata.py @@ -37,15 +37,29 @@ def make_instance(self, include_optional) -> MlModelMetadata: if include_optional: return MlModelMetadata( file_name = '', + input_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), input_type = 'U8', - num_input_bands = 0, + output_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), output_type = 'U8' ) else: return MlModelMetadata( file_name = '', + input_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), input_type = 'U8', - num_input_bands = 0, + output_shape = geoengine_openapi_client.models.ml_tensor_shape3_d.MlTensorShape3D( + bands = 0, + x = 0, + y = 0, ), output_type = 'U8', ) """ diff --git a/python/test/test_ml_tensor_shape3_d.py b/python/test/test_ml_tensor_shape3_d.py new file mode 100644 index 00000000..e3463f32 --- /dev/null +++ b/python/test/test_ml_tensor_shape3_d.py @@ -0,0 +1,57 @@ +# 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 + +from geoengine_openapi_client.models.ml_tensor_shape3_d import MlTensorShape3D + +class TestMlTensorShape3D(unittest.TestCase): + """MlTensorShape3D unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> MlTensorShape3D: + """Test MlTensorShape3D + include_optional is a boolean, when False only required + params are included, when True both required and + optional params are included """ + # uncomment below to create an instance of `MlTensorShape3D` + """ + model = MlTensorShape3D() + if include_optional: + return MlTensorShape3D( + bands = 0, + x = 0, + y = 0 + ) + else: + return MlTensorShape3D( + bands = 0, + x = 0, + y = 0, + ) + """ + + def testMlTensorShape3D(self): + """Test MlTensorShape3D""" + # 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/typescript/dist/esm/models/MlModelMetadata.d.ts b/typescript/dist/esm/models/MlModelMetadata.d.ts index 7316b1cc..97858d4a 100644 --- a/typescript/dist/esm/models/MlModelMetadata.d.ts +++ b/typescript/dist/esm/models/MlModelMetadata.d.ts @@ -9,6 +9,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import type { MlTensorShape3D } from './MlTensorShape3D'; import type { RasterDataType } from './RasterDataType'; /** * @@ -22,6 +23,12 @@ export interface MlModelMetadata { * @memberof MlModelMetadata */ fileName: string; + /** + * + * @type {MlTensorShape3D} + * @memberof MlModelMetadata + */ + inputShape: MlTensorShape3D; /** * * @type {RasterDataType} @@ -30,10 +37,10 @@ export interface MlModelMetadata { inputType: RasterDataType; /** * - * @type {number} + * @type {MlTensorShape3D} * @memberof MlModelMetadata */ - numInputBands: number; + outputShape: MlTensorShape3D; /** * * @type {RasterDataType} diff --git a/typescript/dist/esm/models/MlModelMetadata.js b/typescript/dist/esm/models/MlModelMetadata.js index cd54e11c..e5e3fbab 100644 --- a/typescript/dist/esm/models/MlModelMetadata.js +++ b/typescript/dist/esm/models/MlModelMetadata.js @@ -11,6 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import { MlTensorShape3DFromJSON, MlTensorShape3DToJSON, } from './MlTensorShape3D'; import { RasterDataTypeFromJSON, RasterDataTypeToJSON, } from './RasterDataType'; /** * Check if a given object implements the MlModelMetadata interface. @@ -18,9 +19,11 @@ import { RasterDataTypeFromJSON, RasterDataTypeToJSON, } from './RasterDataType' export function instanceOfMlModelMetadata(value) { if (!('fileName' in value) || value['fileName'] === undefined) return false; + if (!('inputShape' in value) || value['inputShape'] === undefined) + return false; if (!('inputType' in value) || value['inputType'] === undefined) return false; - if (!('numInputBands' in value) || value['numInputBands'] === undefined) + if (!('outputShape' in value) || value['outputShape'] === undefined) return false; if (!('outputType' in value) || value['outputType'] === undefined) return false; @@ -35,8 +38,9 @@ export function MlModelMetadataFromJSONTyped(json, ignoreDiscriminator) { } return { 'fileName': json['fileName'], + 'inputShape': MlTensorShape3DFromJSON(json['inputShape']), 'inputType': RasterDataTypeFromJSON(json['inputType']), - 'numInputBands': json['numInputBands'], + 'outputShape': MlTensorShape3DFromJSON(json['outputShape']), 'outputType': RasterDataTypeFromJSON(json['outputType']), }; } @@ -49,8 +53,9 @@ export function MlModelMetadataToJSONTyped(value, ignoreDiscriminator = false) { } return { 'fileName': value['fileName'], + 'inputShape': MlTensorShape3DToJSON(value['inputShape']), 'inputType': RasterDataTypeToJSON(value['inputType']), - 'numInputBands': value['numInputBands'], + 'outputShape': MlTensorShape3DToJSON(value['outputShape']), 'outputType': RasterDataTypeToJSON(value['outputType']), }; } diff --git a/typescript/dist/esm/models/MlTensorShape3D.d.ts b/typescript/dist/esm/models/MlTensorShape3D.d.ts new file mode 100644 index 00000000..bdbb9421 --- /dev/null +++ b/typescript/dist/esm/models/MlTensorShape3D.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. + */ +/** + * A struct describing tensor shape for `MlModelMetadata` + * @export + * @interface MlTensorShape3D + */ +export interface MlTensorShape3D { + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + bands: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + x: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + y: number; +} +/** + * Check if a given object implements the MlTensorShape3D interface. + */ +export declare function instanceOfMlTensorShape3D(value: object): value is MlTensorShape3D; +export declare function MlTensorShape3DFromJSON(json: any): MlTensorShape3D; +export declare function MlTensorShape3DFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlTensorShape3D; +export declare function MlTensorShape3DToJSON(json: any): MlTensorShape3D; +export declare function MlTensorShape3DToJSONTyped(value?: MlTensorShape3D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/MlTensorShape3D.js b/typescript/dist/esm/models/MlTensorShape3D.js new file mode 100644 index 00000000..23fd4e9b --- /dev/null +++ b/typescript/dist/esm/models/MlTensorShape3D.js @@ -0,0 +1,51 @@ +/* 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 MlTensorShape3D interface. + */ +export function instanceOfMlTensorShape3D(value) { + if (!('bands' in value) || value['bands'] === undefined) + return false; + if (!('x' in value) || value['x'] === undefined) + return false; + if (!('y' in value) || value['y'] === undefined) + return false; + return true; +} +export function MlTensorShape3DFromJSON(json) { + return MlTensorShape3DFromJSONTyped(json, false); +} +export function MlTensorShape3DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'bands': json['bands'], + 'x': json['x'], + 'y': json['y'], + }; +} +export function MlTensorShape3DToJSON(json) { + return MlTensorShape3DToJSONTyped(json, false); +} +export function MlTensorShape3DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'bands': value['bands'], + 'x': value['x'], + 'y': value['y'], + }; +} diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index 636d9880..62429a06 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -78,6 +78,7 @@ export * from './MlModel'; export * from './MlModelMetadata'; export * from './MlModelNameResponse'; export * from './MlModelResource'; +export * from './MlTensorShape3D'; 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 1fd7bb3c..ee89092a 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -80,6 +80,7 @@ export * from './MlModel'; export * from './MlModelMetadata'; export * from './MlModelNameResponse'; export * from './MlModelResource'; +export * from './MlTensorShape3D'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/dist/models/MlModelMetadata.d.ts b/typescript/dist/models/MlModelMetadata.d.ts index 7316b1cc..97858d4a 100644 --- a/typescript/dist/models/MlModelMetadata.d.ts +++ b/typescript/dist/models/MlModelMetadata.d.ts @@ -9,6 +9,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ +import type { MlTensorShape3D } from './MlTensorShape3D'; import type { RasterDataType } from './RasterDataType'; /** * @@ -22,6 +23,12 @@ export interface MlModelMetadata { * @memberof MlModelMetadata */ fileName: string; + /** + * + * @type {MlTensorShape3D} + * @memberof MlModelMetadata + */ + inputShape: MlTensorShape3D; /** * * @type {RasterDataType} @@ -30,10 +37,10 @@ export interface MlModelMetadata { inputType: RasterDataType; /** * - * @type {number} + * @type {MlTensorShape3D} * @memberof MlModelMetadata */ - numInputBands: number; + outputShape: MlTensorShape3D; /** * * @type {RasterDataType} diff --git a/typescript/dist/models/MlModelMetadata.js b/typescript/dist/models/MlModelMetadata.js index 5038f886..cc9a553f 100644 --- a/typescript/dist/models/MlModelMetadata.js +++ b/typescript/dist/models/MlModelMetadata.js @@ -18,6 +18,7 @@ exports.MlModelMetadataFromJSON = MlModelMetadataFromJSON; exports.MlModelMetadataFromJSONTyped = MlModelMetadataFromJSONTyped; exports.MlModelMetadataToJSON = MlModelMetadataToJSON; exports.MlModelMetadataToJSONTyped = MlModelMetadataToJSONTyped; +const MlTensorShape3D_1 = require("./MlTensorShape3D"); const RasterDataType_1 = require("./RasterDataType"); /** * Check if a given object implements the MlModelMetadata interface. @@ -25,9 +26,11 @@ const RasterDataType_1 = require("./RasterDataType"); function instanceOfMlModelMetadata(value) { if (!('fileName' in value) || value['fileName'] === undefined) return false; + if (!('inputShape' in value) || value['inputShape'] === undefined) + return false; if (!('inputType' in value) || value['inputType'] === undefined) return false; - if (!('numInputBands' in value) || value['numInputBands'] === undefined) + if (!('outputShape' in value) || value['outputShape'] === undefined) return false; if (!('outputType' in value) || value['outputType'] === undefined) return false; @@ -42,8 +45,9 @@ function MlModelMetadataFromJSONTyped(json, ignoreDiscriminator) { } return { 'fileName': json['fileName'], + 'inputShape': (0, MlTensorShape3D_1.MlTensorShape3DFromJSON)(json['inputShape']), 'inputType': (0, RasterDataType_1.RasterDataTypeFromJSON)(json['inputType']), - 'numInputBands': json['numInputBands'], + 'outputShape': (0, MlTensorShape3D_1.MlTensorShape3DFromJSON)(json['outputShape']), 'outputType': (0, RasterDataType_1.RasterDataTypeFromJSON)(json['outputType']), }; } @@ -56,8 +60,9 @@ function MlModelMetadataToJSONTyped(value, ignoreDiscriminator = false) { } return { 'fileName': value['fileName'], + 'inputShape': (0, MlTensorShape3D_1.MlTensorShape3DToJSON)(value['inputShape']), 'inputType': (0, RasterDataType_1.RasterDataTypeToJSON)(value['inputType']), - 'numInputBands': value['numInputBands'], + 'outputShape': (0, MlTensorShape3D_1.MlTensorShape3DToJSON)(value['outputShape']), 'outputType': (0, RasterDataType_1.RasterDataTypeToJSON)(value['outputType']), }; } diff --git a/typescript/dist/models/MlTensorShape3D.d.ts b/typescript/dist/models/MlTensorShape3D.d.ts new file mode 100644 index 00000000..bdbb9421 --- /dev/null +++ b/typescript/dist/models/MlTensorShape3D.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. + */ +/** + * A struct describing tensor shape for `MlModelMetadata` + * @export + * @interface MlTensorShape3D + */ +export interface MlTensorShape3D { + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + bands: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + x: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + y: number; +} +/** + * Check if a given object implements the MlTensorShape3D interface. + */ +export declare function instanceOfMlTensorShape3D(value: object): value is MlTensorShape3D; +export declare function MlTensorShape3DFromJSON(json: any): MlTensorShape3D; +export declare function MlTensorShape3DFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlTensorShape3D; +export declare function MlTensorShape3DToJSON(json: any): MlTensorShape3D; +export declare function MlTensorShape3DToJSONTyped(value?: MlTensorShape3D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/MlTensorShape3D.js b/typescript/dist/models/MlTensorShape3D.js new file mode 100644 index 00000000..0999d3b2 --- /dev/null +++ b/typescript/dist/models/MlTensorShape3D.js @@ -0,0 +1,58 @@ +"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.instanceOfMlTensorShape3D = instanceOfMlTensorShape3D; +exports.MlTensorShape3DFromJSON = MlTensorShape3DFromJSON; +exports.MlTensorShape3DFromJSONTyped = MlTensorShape3DFromJSONTyped; +exports.MlTensorShape3DToJSON = MlTensorShape3DToJSON; +exports.MlTensorShape3DToJSONTyped = MlTensorShape3DToJSONTyped; +/** + * Check if a given object implements the MlTensorShape3D interface. + */ +function instanceOfMlTensorShape3D(value) { + if (!('bands' in value) || value['bands'] === undefined) + return false; + if (!('x' in value) || value['x'] === undefined) + return false; + if (!('y' in value) || value['y'] === undefined) + return false; + return true; +} +function MlTensorShape3DFromJSON(json) { + return MlTensorShape3DFromJSONTyped(json, false); +} +function MlTensorShape3DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'bands': json['bands'], + 'x': json['x'], + 'y': json['y'], + }; +} +function MlTensorShape3DToJSON(json) { + return MlTensorShape3DToJSONTyped(json, false); +} +function MlTensorShape3DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'bands': value['bands'], + 'x': value['x'], + 'y': value['y'], + }; +} diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index 636d9880..62429a06 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -78,6 +78,7 @@ export * from './MlModel'; export * from './MlModelMetadata'; export * from './MlModelNameResponse'; export * from './MlModelResource'; +export * from './MlTensorShape3D'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index b17b6c8d..cbcb7bad 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -96,6 +96,7 @@ __exportStar(require("./MlModel"), exports); __exportStar(require("./MlModelMetadata"), exports); __exportStar(require("./MlModelNameResponse"), exports); __exportStar(require("./MlModelResource"), exports); +__exportStar(require("./MlTensorShape3D"), exports); __exportStar(require("./MockDatasetDataSourceLoadingInfo"), exports); __exportStar(require("./MockMetaData"), exports); __exportStar(require("./MultiBandRasterColorizer"), exports); diff --git a/typescript/src/models/MlModelMetadata.ts b/typescript/src/models/MlModelMetadata.ts index b6185c64..4e21372f 100644 --- a/typescript/src/models/MlModelMetadata.ts +++ b/typescript/src/models/MlModelMetadata.ts @@ -13,6 +13,13 @@ */ import { mapValues } from '../runtime'; +import type { MlTensorShape3D } from './MlTensorShape3D'; +import { + MlTensorShape3DFromJSON, + MlTensorShape3DFromJSONTyped, + MlTensorShape3DToJSON, + MlTensorShape3DToJSONTyped, +} from './MlTensorShape3D'; import type { RasterDataType } from './RasterDataType'; import { RasterDataTypeFromJSON, @@ -33,6 +40,12 @@ export interface MlModelMetadata { * @memberof MlModelMetadata */ fileName: string; + /** + * + * @type {MlTensorShape3D} + * @memberof MlModelMetadata + */ + inputShape: MlTensorShape3D; /** * * @type {RasterDataType} @@ -41,10 +54,10 @@ export interface MlModelMetadata { inputType: RasterDataType; /** * - * @type {number} + * @type {MlTensorShape3D} * @memberof MlModelMetadata */ - numInputBands: number; + outputShape: MlTensorShape3D; /** * * @type {RasterDataType} @@ -60,8 +73,9 @@ export interface MlModelMetadata { */ export function instanceOfMlModelMetadata(value: object): value is MlModelMetadata { if (!('fileName' in value) || value['fileName'] === undefined) return false; + if (!('inputShape' in value) || value['inputShape'] === undefined) return false; if (!('inputType' in value) || value['inputType'] === undefined) return false; - if (!('numInputBands' in value) || value['numInputBands'] === undefined) return false; + if (!('outputShape' in value) || value['outputShape'] === undefined) return false; if (!('outputType' in value) || value['outputType'] === undefined) return false; return true; } @@ -77,8 +91,9 @@ export function MlModelMetadataFromJSONTyped(json: any, ignoreDiscriminator: boo return { 'fileName': json['fileName'], + 'inputShape': MlTensorShape3DFromJSON(json['inputShape']), 'inputType': RasterDataTypeFromJSON(json['inputType']), - 'numInputBands': json['numInputBands'], + 'outputShape': MlTensorShape3DFromJSON(json['outputShape']), 'outputType': RasterDataTypeFromJSON(json['outputType']), }; } @@ -95,8 +110,9 @@ export function MlModelMetadataToJSONTyped(value?: MlModelMetadata | null, ignor return { 'fileName': value['fileName'], + 'inputShape': MlTensorShape3DToJSON(value['inputShape']), 'inputType': RasterDataTypeToJSON(value['inputType']), - 'numInputBands': value['numInputBands'], + 'outputShape': MlTensorShape3DToJSON(value['outputShape']), 'outputType': RasterDataTypeToJSON(value['outputType']), }; } diff --git a/typescript/src/models/MlTensorShape3D.ts b/typescript/src/models/MlTensorShape3D.ts new file mode 100644 index 00000000..13903e67 --- /dev/null +++ b/typescript/src/models/MlTensorShape3D.ts @@ -0,0 +1,84 @@ +/* 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 { mapValues } from '../runtime'; +/** + * A struct describing tensor shape for `MlModelMetadata` + * @export + * @interface MlTensorShape3D + */ +export interface MlTensorShape3D { + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + bands: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + x: number; + /** + * + * @type {number} + * @memberof MlTensorShape3D + */ + y: number; +} + +/** + * Check if a given object implements the MlTensorShape3D interface. + */ +export function instanceOfMlTensorShape3D(value: object): value is MlTensorShape3D { + if (!('bands' in value) || value['bands'] === undefined) return false; + if (!('x' in value) || value['x'] === undefined) return false; + if (!('y' in value) || value['y'] === undefined) return false; + return true; +} + +export function MlTensorShape3DFromJSON(json: any): MlTensorShape3D { + return MlTensorShape3DFromJSONTyped(json, false); +} + +export function MlTensorShape3DFromJSONTyped(json: any, ignoreDiscriminator: boolean): MlTensorShape3D { + if (json == null) { + return json; + } + return { + + 'bands': json['bands'], + 'x': json['x'], + 'y': json['y'], + }; +} + +export function MlTensorShape3DToJSON(json: any): MlTensorShape3D { + return MlTensorShape3DToJSONTyped(json, false); +} + +export function MlTensorShape3DToJSONTyped(value?: MlTensorShape3D | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'bands': value['bands'], + 'x': value['x'], + 'y': value['y'], + }; +} + diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index 1fd7bb3c..ee89092a 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -80,6 +80,7 @@ export * from './MlModel'; export * from './MlModelMetadata'; export * from './MlModelNameResponse'; export * from './MlModelResource'; +export * from './MlTensorShape3D'; export * from './MockDatasetDataSourceLoadingInfo'; export * from './MockMetaData'; export * from './MultiBandRasterColorizer';