Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .generation/config.ini
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[input]
backendCommit = 7aadfa3
backendCommit = ae4b8041b8c6ea5e9bf5e51133a7ca5070afb6d0

[general]
githubUrl = https://github.com/geo-engine/openapi-client
version = 0.0.25
version = 0.0.26

[python]
name = geoengine_openapi_client
Expand Down
68 changes: 63 additions & 5 deletions .generation/input/openapi.json
Original file line number Diff line number Diff line change
Expand Up @@ -6924,7 +6924,8 @@
"displayName",
"description",
"upload",
"metadata"
"metadata",
"fileName"
],
"properties": {
"description": {
Expand All @@ -6933,6 +6934,9 @@
"displayName": {
"type": "string"
},
"fileName": {
"type": "string"
},
"metadata": {
"$ref": "#/components/schemas/MlModelMetadata"
},
Expand All @@ -6948,25 +6952,54 @@
"type": "string",
"format": "uuid"
},
"MlModelInputNoDataHandling": {
"type": "object",
"required": [
"variant"
],
"properties": {
"noDataValue": {
"type": [
"number",
"null"
],
"format": "float"
},
"variant": {
"$ref": "#/components/schemas/MlModelInputNoDataHandlingVariant"
}
}
},
"MlModelInputNoDataHandlingVariant": {
"type": "string",
"enum": [
"encodedNoData",
"skipIfNoData"
]
},
"MlModelMetadata": {
"type": "object",
"required": [
"fileName",
"inputType",
"outputType",
"inputShape",
"outputShape"
"outputShape",
"inputNoDataHandling",
"outputNoDataHandling"
],
"properties": {
"fileName": {
"type": "string"
"inputNoDataHandling": {
"$ref": "#/components/schemas/MlModelInputNoDataHandling"
},
"inputShape": {
"$ref": "#/components/schemas/MlTensorShape3D"
},
"inputType": {
"$ref": "#/components/schemas/RasterDataType"
},
"outputNoDataHandling": {
"$ref": "#/components/schemas/MlModelOutputNoDataHandling"
},
"outputShape": {
"$ref": "#/components/schemas/MlTensorShape3D"
},
Expand All @@ -6989,6 +7022,31 @@
}
}
},
"MlModelOutputNoDataHandling": {
"type": "object",
"required": [
"variant"
],
"properties": {
"noDataValue": {
"type": [
"number",
"null"
],
"format": "float"
},
"variant": {
"$ref": "#/components/schemas/MlModelOutputNoDataHandlingVariant"
}
}
},
"MlModelOutputNoDataHandlingVariant": {
"type": "string",
"enum": [
"encodedNoData",
"nanIsNoData"
]
},
"MlModelResource": {
"type": "object",
"required": [
Expand Down
12 changes: 12 additions & 0 deletions python/.openapi-generator/FILES
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,12 @@ docs/Measurement.md
docs/MetaDataDefinition.md
docs/MetaDataSuggestion.md
docs/MlModel.md
docs/MlModelInputNoDataHandling.md
docs/MlModelInputNoDataHandlingVariant.md
docs/MlModelMetadata.md
docs/MlModelNameResponse.md
docs/MlModelOutputNoDataHandling.md
docs/MlModelOutputNoDataHandlingVariant.md
docs/MlModelResource.md
docs/MlTensorShape3D.md
docs/MockDatasetDataSourceLoadingInfo.md
Expand Down Expand Up @@ -336,8 +340,12 @@ geoengine_openapi_client/models/measurement.py
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_input_no_data_handling.py
geoengine_openapi_client/models/ml_model_input_no_data_handling_variant.py
geoengine_openapi_client/models/ml_model_metadata.py
geoengine_openapi_client/models/ml_model_name_response.py
geoengine_openapi_client/models/ml_model_output_no_data_handling.py
geoengine_openapi_client/models/ml_model_output_no_data_handling_variant.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
Expand Down Expand Up @@ -566,8 +574,12 @@ test/test_meta_data_definition.py
test/test_meta_data_suggestion.py
test/test_ml_api.py
test/test_ml_model.py
test/test_ml_model_input_no_data_handling.py
test/test_ml_model_input_no_data_handling_variant.py
test/test_ml_model_metadata.py
test/test_ml_model_name_response.py
test/test_ml_model_output_no_data_handling.py
test/test_ml_model_output_no_data_handling_variant.py
test/test_ml_model_resource.py
test/test_ml_tensor_shape3_d.py
test/test_mock_dataset_data_source_loading_info.py
Expand Down
6 changes: 5 additions & 1 deletion python/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.25
- Package version: 0.0.26
- Generator version: 7.12.0
- Build package: org.openapitools.codegen.languages.PythonClientCodegen

Expand Down Expand Up @@ -264,8 +264,12 @@ Class | Method | HTTP request | Description
- [MetaDataDefinition](docs/MetaDataDefinition.md)
- [MetaDataSuggestion](docs/MetaDataSuggestion.md)
- [MlModel](docs/MlModel.md)
- [MlModelInputNoDataHandling](docs/MlModelInputNoDataHandling.md)
- [MlModelInputNoDataHandlingVariant](docs/MlModelInputNoDataHandlingVariant.md)
- [MlModelMetadata](docs/MlModelMetadata.md)
- [MlModelNameResponse](docs/MlModelNameResponse.md)
- [MlModelOutputNoDataHandling](docs/MlModelOutputNoDataHandling.md)
- [MlModelOutputNoDataHandlingVariant](docs/MlModelOutputNoDataHandlingVariant.md)
- [MlModelResource](docs/MlModelResource.md)
- [MlTensorShape3D](docs/MlTensorShape3D.md)
- [MockDatasetDataSourceLoadingInfo](docs/MockDatasetDataSourceLoadingInfo.md)
Expand Down
6 changes: 5 additions & 1 deletion python/geoengine_openapi_client/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
""" # noqa: E501


__version__ = "0.0.25"
__version__ = "0.0.26"

# import apis into sdk package
from geoengine_openapi_client.api.datasets_api import DatasetsApi
Expand Down Expand Up @@ -124,8 +124,12 @@
from geoengine_openapi_client.models.meta_data_definition import MetaDataDefinition
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_input_no_data_handling import MlModelInputNoDataHandling
from geoengine_openapi_client.models.ml_model_input_no_data_handling_variant import MlModelInputNoDataHandlingVariant
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_output_no_data_handling import MlModelOutputNoDataHandling
from geoengine_openapi_client.models.ml_model_output_no_data_handling_variant import MlModelOutputNoDataHandlingVariant
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
Expand Down
2 changes: 1 addition & 1 deletion python/geoengine_openapi_client/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ def __init__(
self.default_headers[header_name] = header_value
self.cookie = cookie
# Set default User-Agent.
self.user_agent = 'geoengine/openapi-client/python/0.0.25'
self.user_agent = 'geoengine/openapi-client/python/0.0.26'
self.client_side_validation = configuration.client_side_validation

def __enter__(self):
Expand Down
2 changes: 1 addition & 1 deletion python/geoengine_openapi_client/configuration.py
Original file line number Diff line number Diff line change
Expand Up @@ -512,7 +512,7 @@ def to_debug_report(self) -> str:
"OS: {env}\n"\
"Python Version: {pyversion}\n"\
"Version of the API: 0.8.0\n"\
"SDK Package Version: 0.0.25".\
"SDK Package Version: 0.0.26".\
format(env=sys.platform, pyversion=sys.version)

def get_host_settings(self) -> List[HostSetting]:
Expand Down
4 changes: 4 additions & 0 deletions python/geoengine_openapi_client/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,12 @@
from geoengine_openapi_client.models.meta_data_definition import MetaDataDefinition
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_input_no_data_handling import MlModelInputNoDataHandling
from geoengine_openapi_client.models.ml_model_input_no_data_handling_variant import MlModelInputNoDataHandlingVariant
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_output_no_data_handling import MlModelOutputNoDataHandling
from geoengine_openapi_client.models.ml_model_output_no_data_handling_variant import MlModelOutputNoDataHandlingVariant
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
Expand Down
4 changes: 3 additions & 1 deletion python/geoengine_openapi_client/models/ml_model.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,11 @@ class MlModel(BaseModel):
""" # noqa: E501
description: StrictStr
display_name: StrictStr = Field(alias="displayName")
file_name: StrictStr = Field(alias="fileName")
metadata: MlModelMetadata
name: StrictStr
upload: StrictStr
__properties: ClassVar[List[str]] = ["description", "displayName", "metadata", "name", "upload"]
__properties: ClassVar[List[str]] = ["description", "displayName", "fileName", "metadata", "name", "upload"]

model_config = ConfigDict(
populate_by_name=True,
Expand Down Expand Up @@ -91,6 +92,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
_obj = cls.model_validate({
"description": obj.get("description"),
"displayName": obj.get("displayName"),
"fileName": obj.get("fileName"),
"metadata": MlModelMetadata.from_dict(obj["metadata"]) if obj.get("metadata") is not None else None,
"name": obj.get("name"),
"upload": obj.get("upload")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
# 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: [email protected]
Generated by OpenAPI Generator (https://openapi-generator.tech)

Do not edit the class manually.
""" # noqa: E501


from __future__ import annotations
import pprint
import re # noqa: F401
import json

from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt
from typing import Any, ClassVar, Dict, List, Optional, Union
from geoengine_openapi_client.models.ml_model_input_no_data_handling_variant import MlModelInputNoDataHandlingVariant
from typing import Optional, Set
from typing_extensions import Self

class MlModelInputNoDataHandling(BaseModel):
"""
MlModelInputNoDataHandling
""" # noqa: E501
no_data_value: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, alias="noDataValue")
variant: MlModelInputNoDataHandlingVariant
__properties: ClassVar[List[str]] = ["noDataValue", "variant"]

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 MlModelInputNoDataHandling 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,
)
# set to None if no_data_value (nullable) is None
# and model_fields_set contains the field
if self.no_data_value is None and "no_data_value" in self.model_fields_set:
_dict['noDataValue'] = None

return _dict

@classmethod
def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
"""Create an instance of MlModelInputNoDataHandling from a dict"""
if obj is None:
return None

if not isinstance(obj, dict):
return cls.model_validate(obj)

_obj = cls.model_validate({
"noDataValue": obj.get("noDataValue"),
"variant": obj.get("variant")
})
return _obj


Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# 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: [email protected]
Generated by OpenAPI Generator (https://openapi-generator.tech)

Do not edit the class manually.
""" # noqa: E501


from __future__ import annotations
import json
from enum import Enum
from typing_extensions import Self


class MlModelInputNoDataHandlingVariant(str, Enum):
"""
MlModelInputNoDataHandlingVariant
"""

"""
allowed enum values
"""
ENCODEDNODATA = 'encodedNoData'
SKIPIFNODATA = 'skipIfNoData'

@classmethod
def from_json(cls, json_str: str) -> Self:
"""Create an instance of MlModelInputNoDataHandlingVariant from a JSON string"""
return cls(json.loads(json_str))


Loading