Skip to content

Commit e9e2aeb

Browse files
michaelmattigmichaelmattig
authored
Merge pull request #31 from geo-engine/ml_and_dataset_name_as_resource_name
update openapi-client
2 parents 36fd39f + 4a1b385 commit e9e2aeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+1004
-281
lines changed

‎.generation/config.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[input]
2-
backendTag = pro-nightly-2024-12-24
2+
backendTag = pro-nightly-2025-01-23
33

44
[general]
55
githubUrl = https://github.com/geo-engine/openapi-client
66

77
[python]
88
name = geoengine_openapi_client
9-
version = 0.0.18
9+
version = 0.0.19
1010

1111
[typescript]
1212
name = @geoengine/openapi-client
13-
version = 0.0.18
13+
version = 0.0.19
1414

‎.generation/input/openapi.json‎

Lines changed: 48 additions & 186 deletions
Original file line numberDiff line numberDiff line change
@@ -75,106 +75,14 @@
7575
"tags": [
7676
"Datasets"
7777
],
78-
"summary": "Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume.",
78+
"summary": "Creates a new dataset referencing files.",
79+
"description": "Users can reference previously uploaded files.\nAdmins can reference files from a volume.",
7980
"operationId": "create_dataset_handler",
8081
"requestBody": {
8182
"content": {
8283
"application/json": {
8384
"schema": {
8485
"$ref": "#/components/schemas/CreateDataset"
85-
},
86-
"examples": {
87-
"Germany Border": {
88-
"value": {
89-
"dataPath": {
90-
"upload": "420b06de-0a7e-45cb-9c1c-ea901b46ab69"
91-
},
92-
"definition": {
93-
"properties": {
94-
"name": "germany_border",
95-
"displayName": "Germany Border",
96-
"description": "The Outline of Germany",
97-
"sourceOperator": "OgrSource"
98-
},
99-
"metaData": {
100-
"type": "OgrMetaData",
101-
"loadingInfo": {
102-
"fileName": "germany_polygon.gpkg",
103-
"layerName": "test_germany",
104-
"dataType": "MultiPolygon",
105-
"time": {
106-
"type": "none"
107-
},
108-
"columns": {
109-
"x": "",
110-
"y": null,
111-
"text": [],
112-
"float": [],
113-
"int": [],
114-
"bool": [],
115-
"datetime": []
116-
},
117-
"forceOgrTimeFilter": false,
118-
"onError": "ignore"
119-
},
120-
"resultDescriptor": {
121-
"dataType": "MultiPolygon",
122-
"spatialReference": "EPSG:4326",
123-
"columns": {}
124-
}
125-
}
126-
}
127-
}
128-
},
129-
"Plain Data": {
130-
"value": {
131-
"dataPath": {
132-
"upload": "f3bd61ef-d9ce-471c-89a1-46b5f7295886"
133-
},
134-
"definition": {
135-
"properties": {
136-
"name": "plain_data",
137-
"displayName": "Plain Data",
138-
"description": "Demo Dataset",
139-
"sourceOperator": "OgrSource"
140-
},
141-
"metaData": {
142-
"type": "OgrMetaData",
143-
"loadingInfo": {
144-
"fileName": "plain_data.csv",
145-
"layerName": "plain_data",
146-
"dataType": "Data",
147-
"time": {
148-
"type": "none"
149-
},
150-
"columns": {
151-
"x": "",
152-
"y": null,
153-
"text": [],
154-
"float": [],
155-
"int": [
156-
"a"
157-
]
158-
},
159-
"forceOgrTimeFilter": false,
160-
"onError": "abort"
161-
},
162-
"resultDescriptor": {
163-
"dataType": "Data",
164-
"spatialReference": "EPSG:4326",
165-
"columns": {
166-
"a": {
167-
"dataType": "int",
168-
"measurement": {
169-
"type": "unitless"
170-
}
171-
}
172-
}
173-
}
174-
}
175-
}
176-
}
177-
}
17886
}
17987
}
18088
},
@@ -183,93 +91,6 @@
18391
"responses": {
18492
"200": {
18593
"$ref": "#/components/responses/DatasetNameResponse"
186-
},
187-
"400": {
188-
"description": "Bad request",
189-
"content": {
190-
"application/json": {
191-
"schema": {
192-
"$ref": "#/components/schemas/ErrorResponse"
193-
},
194-
"examples": {
195-
"Admin tried to create dataset from an upload": {
196-
"value": {
197-
"error": "AdminsCannotCreateDatasetFromUpload",
198-
"message": "Admins cannot create dataset from upload"
199-
}
200-
},
201-
"Body is invalid json": {
202-
"value": {
203-
"error": "BodyDeserializeError",
204-
"message": "expected `,` or `}` at line 13 column 7"
205-
}
206-
},
207-
"Failed to read body": {
208-
"value": {
209-
"error": "Payload",
210-
"message": "Error that occur during reading payload: Can not decode content-encoding."
211-
}
212-
},
213-
"Filepath in metadata is invalid": {
214-
"value": {
215-
"error": "CannotResolveUploadFilePath",
216-
"message": "CannotResolveUploadFilePath: PathIsNotAFile"
217-
}
218-
},
219-
"Normal user tried to create dataset from a volume": {
220-
"value": {
221-
"error": "OnlyAdminsCanCreateDatasetFromVolume",
222-
"message": "Only admins can create dataset from volume"
223-
}
224-
},
225-
"Referenced an unknown upload": {
226-
"value": {
227-
"error": "UploadNotFound",
228-
"message": "UploadNotFound: UnknownUploadId"
229-
}
230-
},
231-
"Referenced an unknown volume": {
232-
"value": {
233-
"error": "UnknownVolume",
234-
"message": "Unknown volume"
235-
}
236-
}
237-
}
238-
}
239-
}
240-
},
241-
"401": {
242-
"$ref": "#/components/responses/UnauthorizedUserResponse"
243-
},
244-
"413": {
245-
"$ref": "#/components/responses/PayloadTooLargeResponse"
246-
},
247-
"415": {
248-
"$ref": "#/components/responses/UnsupportedMediaTypeForJsonResponse"
249-
},
250-
"500": {
251-
"description": "Internal server error",
252-
"content": {
253-
"application/json": {
254-
"schema": {
255-
"$ref": "#/components/schemas/ErrorResponse"
256-
},
257-
"examples": {
258-
"Cannot access config": {
259-
"value": {
260-
"error": "CannotAccessConfig",
261-
"message": "CannotAccessConfig: ConfigLockFailed"
262-
}
263-
},
264-
"Failed to access database": {
265-
"value": {
266-
"error": "DatabaseAccessError",
267-
"message": "DatabaseAccessError: connection closed"
268-
}
269-
}
270-
}
271-
}
272-
}
27394
}
27495
},
27596
"security": [
@@ -2360,7 +2181,14 @@
23602181
},
23612182
"responses": {
23622183
"200": {
2363-
"description": ""
2184+
"description": "",
2185+
"content": {
2186+
"application/json": {
2187+
"schema": {
2188+
"$ref": "#/components/schemas/MlModelNameResponse"
2189+
}
2190+
}
2191+
}
23642192
}
23652193
},
23662194
"security": [
@@ -6059,7 +5887,7 @@
60595887
],
60605888
"properties": {
60615889
"id": {
6062-
"$ref": "#/components/schemas/DatasetId"
5890+
"$ref": "#/components/schemas/DatasetName"
60635891
},
60645892
"type": {
60655893
"type": "string",
@@ -7046,6 +6874,36 @@
70466874
"MlModelName": {
70476875
"type": "string"
70486876
},
6877+
"MlModelNameResponse": {
6878+
"type": "object",
6879+
"required": [
6880+
"mlModelName"
6881+
],
6882+
"properties": {
6883+
"mlModelName": {
6884+
"$ref": "#/components/schemas/MlModelName"
6885+
}
6886+
}
6887+
},
6888+
"MlModelResource": {
6889+
"type": "object",
6890+
"title": "MlModelResource",
6891+
"required": [
6892+
"type",
6893+
"id"
6894+
],
6895+
"properties": {
6896+
"id": {
6897+
"$ref": "#/components/schemas/MlModelName"
6898+
},
6899+
"type": {
6900+
"type": "string",
6901+
"enum": [
6902+
"mlModel"
6903+
]
6904+
}
6905+
}
6906+
},
70496907
"MockDatasetDataSourceLoadingInfo": {
70506908
"type": "object",
70516909
"required": [
@@ -7760,16 +7618,16 @@
77607618
"PermissionListing": {
77617619
"type": "object",
77627620
"required": [
7763-
"resourceId",
7621+
"resource",
77647622
"role",
77657623
"permission"
77667624
],
77677625
"properties": {
77687626
"permission": {
77697627
"$ref": "#/components/schemas/Permission"
77707628
},
7771-
"resourceId": {
7772-
"$ref": "#/components/schemas/ResourceId"
7629+
"resource": {
7630+
"$ref": "#/components/schemas/Resource"
77737631
},
77747632
"role": {
77757633
"$ref": "#/components/schemas/Role"
@@ -8496,6 +8354,9 @@
84968354
},
84978355
{
84988356
"$ref": "#/components/schemas/DatasetResource"
8357+
},
8358+
{
8359+
"$ref": "#/components/schemas/MlModelResource"
84998360
}
85008361
],
85018362
"discriminator": {
@@ -8504,6 +8365,7 @@
85048365
"dataset": "#/components/schemas/DatasetResource",
85058366
"layer": "#/components/schemas/LayerResource",
85068367
"layerCollection": "#/components/schemas/LayerCollectionResource",
8368+
"mlModel": "#/components/schemas/MlModelResource",
85078369
"project": "#/components/schemas/ProjectResource"
85088370
}
85098371
}

‎python/.openapi-generator/FILES‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,8 @@ docs/MetaDataDefinition.md
8888
docs/MetaDataSuggestion.md
8989
docs/MlModel.md
9090
docs/MlModelMetadata.md
91+
docs/MlModelNameResponse.md
92+
docs/MlModelResource.md
9193
docs/MockDatasetDataSourceLoadingInfo.md
9294
docs/MockMetaData.md
9395
docs/MultiBandRasterColorizer.md
@@ -345,6 +347,8 @@ geoengine_openapi_client/models/meta_data_definition.py
345347
geoengine_openapi_client/models/meta_data_suggestion.py
346348
geoengine_openapi_client/models/ml_model.py
347349
geoengine_openapi_client/models/ml_model_metadata.py
350+
geoengine_openapi_client/models/ml_model_name_response.py
351+
geoengine_openapi_client/models/ml_model_resource.py
348352
geoengine_openapi_client/models/mock_dataset_data_source_loading_info.py
349353
geoengine_openapi_client/models/mock_meta_data.py
350354
geoengine_openapi_client/models/multi_band_raster_colorizer.py
@@ -580,6 +584,8 @@ test/test_meta_data_suggestion.py
580584
test/test_ml_api.py
581585
test/test_ml_model.py
582586
test/test_ml_model_metadata.py
587+
test/test_ml_model_name_response.py
588+
test/test_ml_model_resource.py
583589
test/test_mock_dataset_data_source_loading_info.py
584590
test/test_mock_meta_data.py
585591
test/test_multi_band_raster_colorizer.py

‎python/README.md‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ No description provided (generated by Openapi Generator https://github.com/opena
44
This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
55

66
- API version: 0.8.0
7-
- Package version: 0.0.18
7+
- Package version: 0.0.19
88
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
99

1010
## Requirements.
@@ -95,7 +95,7 @@ All URIs are relative to *http://127.0.0.1:3030/api*
9595
Class | Method | HTTP request | Description
9696
------------ | ------------- | ------------- | -------------
9797
*DatasetsApi* | [**auto_create_dataset_handler**](docs/DatasetsApi.md#auto_create_dataset_handler) | **POST** /dataset/auto | Creates a new dataset using previously uploaded files.
98-
*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.
98+
*DatasetsApi* | [**create_dataset_handler**](docs/DatasetsApi.md#create_dataset_handler) | **POST** /dataset | Creates a new dataset referencing files.
9999
*DatasetsApi* | [**delete_dataset_handler**](docs/DatasetsApi.md#delete_dataset_handler) | **DELETE** /dataset/{dataset} | Delete a dataset
100100
*DatasetsApi* | [**get_dataset_handler**](docs/DatasetsApi.md#get_dataset_handler) | **GET** /dataset/{dataset} | Retrieves details about a dataset using the internal name.
101101
*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
268268
- [MetaDataSuggestion](docs/MetaDataSuggestion.md)
269269
- [MlModel](docs/MlModel.md)
270270
- [MlModelMetadata](docs/MlModelMetadata.md)
271+
- [MlModelNameResponse](docs/MlModelNameResponse.md)
272+
- [MlModelResource](docs/MlModelResource.md)
271273
- [MockDatasetDataSourceLoadingInfo](docs/MockDatasetDataSourceLoadingInfo.md)
272274
- [MockMetaData](docs/MockMetaData.md)
273275
- [MultiBandRasterColorizer](docs/MultiBandRasterColorizer.md)

‎python/geoengine_openapi_client/__init__.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
""" # noqa: E501
1616

1717

18-
__version__ = "0.0.18"
18+
__version__ = "0.0.19"
1919

2020
# import apis into sdk package
2121
from geoengine_openapi_client.api.datasets_api import DatasetsApi
@@ -128,6 +128,8 @@
128128
from geoengine_openapi_client.models.meta_data_suggestion import MetaDataSuggestion
129129
from geoengine_openapi_client.models.ml_model import MlModel
130130
from geoengine_openapi_client.models.ml_model_metadata import MlModelMetadata
131+
from geoengine_openapi_client.models.ml_model_name_response import MlModelNameResponse
132+
from geoengine_openapi_client.models.ml_model_resource import MlModelResource
131133
from geoengine_openapi_client.models.mock_dataset_data_source_loading_info import MockDatasetDataSourceLoadingInfo
132134
from geoengine_openapi_client.models.mock_meta_data import MockMetaData
133135
from geoengine_openapi_client.models.multi_band_raster_colorizer import MultiBandRasterColorizer

0 commit comments

Comments
 (0)