Skip to content

Commit 7922574

Browse files
committed
update openapi-client
1 parent 0c69a3a commit 7922574

38 files changed

+1140
-124
lines changed

.generation/input/openapi.json

Lines changed: 135 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3196,6 +3196,125 @@
31963196
]
31973197
}
31983198
},
3199+
"/quota/dataUsage": {
3200+
"get": {
3201+
"tags": [
3202+
"User"
3203+
],
3204+
"summary": "Retrieves the quota used on data",
3205+
"operationId": "data_usage_handler",
3206+
"parameters": [
3207+
{
3208+
"name": "offset",
3209+
"in": "query",
3210+
"required": true,
3211+
"schema": {
3212+
"type": "integer",
3213+
"format": "int64",
3214+
"minimum": 0
3215+
}
3216+
},
3217+
{
3218+
"name": "limit",
3219+
"in": "query",
3220+
"required": true,
3221+
"schema": {
3222+
"type": "integer",
3223+
"format": "int64",
3224+
"minimum": 0
3225+
}
3226+
}
3227+
],
3228+
"responses": {
3229+
"200": {
3230+
"description": "The quota used on data",
3231+
"content": {
3232+
"application/json": {
3233+
"schema": {
3234+
"type": "array",
3235+
"items": {
3236+
"$ref": "#/components/schemas/DataUsage"
3237+
}
3238+
}
3239+
}
3240+
}
3241+
}
3242+
},
3243+
"security": [
3244+
{
3245+
"session_token": []
3246+
}
3247+
]
3248+
}
3249+
},
3250+
"/quota/dataUsage/summary": {
3251+
"get": {
3252+
"tags": [
3253+
"User"
3254+
],
3255+
"summary": "Retrieves the quota used by computations",
3256+
"operationId": "data_usage_summary_handler",
3257+
"parameters": [
3258+
{
3259+
"name": "granularity",
3260+
"in": "query",
3261+
"required": true,
3262+
"schema": {
3263+
"$ref": "#/components/schemas/UsageSummaryGranularity"
3264+
}
3265+
},
3266+
{
3267+
"name": "offset",
3268+
"in": "query",
3269+
"required": true,
3270+
"schema": {
3271+
"type": "integer",
3272+
"format": "int64",
3273+
"minimum": 0
3274+
}
3275+
},
3276+
{
3277+
"name": "limit",
3278+
"in": "query",
3279+
"required": true,
3280+
"schema": {
3281+
"type": "integer",
3282+
"format": "int64",
3283+
"minimum": 0
3284+
}
3285+
},
3286+
{
3287+
"name": "dataset",
3288+
"in": "query",
3289+
"required": false,
3290+
"schema": {
3291+
"type": "string",
3292+
"nullable": true
3293+
}
3294+
}
3295+
],
3296+
"responses": {
3297+
"200": {
3298+
"description": "The quota used on data",
3299+
"content": {
3300+
"application/json": {
3301+
"schema": {
3302+
"type": "array",
3303+
"items": {
3304+
"$ref": "#/components/schemas/DataUsageSummary"
3305+
}
3306+
}
3307+
}
3308+
}
3309+
}
3310+
},
3311+
"security": [
3312+
{
3313+
"session_token": []
3314+
}
3315+
]
3316+
}
3317+
},
31993318
"/quotas/{user}": {
32003319
"get": {
32013320
"tags": [
@@ -5761,7 +5880,6 @@
57615880
"required": [
57625881
"timestamp",
57635882
"userId",
5764-
"workflowId",
57655883
"computationId",
57665884
"data",
57675885
"count"
@@ -5786,19 +5904,14 @@
57865904
"userId": {
57875905
"type": "string",
57885906
"format": "uuid"
5789-
},
5790-
"workflowId": {
5791-
"type": "string",
5792-
"format": "uuid"
57935907
}
57945908
}
57955909
},
57965910
"DataUsageSummary": {
57975911
"type": "object",
57985912
"required": [
5799-
"year",
5800-
"month",
5801-
"data",
5913+
"timestamp",
5914+
"dataset",
58025915
"count"
58035916
],
58045917
"properties": {
@@ -5807,18 +5920,12 @@
58075920
"format": "int64",
58085921
"minimum": 0
58095922
},
5810-
"data": {
5923+
"dataset": {
58115924
"type": "string"
58125925
},
5813-
"month": {
5814-
"type": "integer",
5815-
"format": "int32",
5816-
"minimum": 0
5817-
},
5818-
"year": {
5819-
"type": "integer",
5820-
"format": "int32",
5821-
"minimum": 0
5926+
"timestamp": {
5927+
"type": "string",
5928+
"format": "date-time"
58225929
}
58235930
}
58245931
},
@@ -9632,6 +9739,16 @@
96329739
"type": "string",
96339740
"format": "uuid"
96349741
},
9742+
"UsageSummaryGranularity": {
9743+
"type": "string",
9744+
"enum": [
9745+
"minutes",
9746+
"hours",
9747+
"days",
9748+
"months",
9749+
"years"
9750+
]
9751+
},
96359752
"UserCredentials": {
96369753
"type": "object",
96379754
"required": [

python/.openapi-generator/FILES

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,7 @@ docs/UpdateQuota.md
219219
docs/UploadFileLayersResponse.md
220220
docs/UploadFilesResponse.md
221221
docs/UploadsApi.md
222+
docs/UsageSummaryGranularity.md
222223
docs/UserApi.md
223224
docs/UserCredentials.md
224225
docs/UserInfo.md
@@ -465,6 +466,7 @@ geoengine_openapi_client/models/update_project.py
465466
geoengine_openapi_client/models/update_quota.py
466467
geoengine_openapi_client/models/upload_file_layers_response.py
467468
geoengine_openapi_client/models/upload_files_response.py
469+
geoengine_openapi_client/models/usage_summary_granularity.py
468470
geoengine_openapi_client/models/user_credentials.py
469471
geoengine_openapi_client/models/user_info.py
470472
geoengine_openapi_client/models/user_registration.py
@@ -709,6 +711,7 @@ test/test_update_quota.py
709711
test/test_upload_file_layers_response.py
710712
test/test_upload_files_response.py
711713
test/test_uploads_api.py
714+
test/test_usage_summary_granularity.py
712715
test/test_user_api.py
713716
test/test_user_credentials.py
714717
test/test_user_info.py

python/README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ Class | Method | HTTP request | Description
167167
*UserApi* | [**assign_role_handler**](docs/UserApi.md#assign_role_handler) | **POST** /users/{user}/roles/{role} | Assign a role to a user. Requires admin privilige.
168168
*UserApi* | [**computation_quota_handler**](docs/UserApi.md#computation_quota_handler) | **GET** /quota/computations/{computation} | Retrieves the quota used by computations
169169
*UserApi* | [**computations_quota_handler**](docs/UserApi.md#computations_quota_handler) | **GET** /quota/computations | Retrieves the quota used by computations
170+
*UserApi* | [**data_usage_handler**](docs/UserApi.md#data_usage_handler) | **GET** /quota/dataUsage | Retrieves the quota used on data
171+
*UserApi* | [**data_usage_summary_handler**](docs/UserApi.md#data_usage_summary_handler) | **GET** /quota/dataUsage/summary | Retrieves the quota used by computations
170172
*UserApi* | [**get_role_by_name_handler**](docs/UserApi.md#get_role_by_name_handler) | **GET** /roles/byName/{name} | Get role by name
171173
*UserApi* | [**get_role_descriptions**](docs/UserApi.md#get_role_descriptions) | **GET** /user/roles/descriptions | Query roles for the current user.
172174
*UserApi* | [**get_user_quota_handler**](docs/UserApi.md#get_user_quota_handler) | **GET** /quotas/{user} | Retrieves the available and used quota of a specific user.
@@ -387,6 +389,7 @@ Class | Method | HTTP request | Description
387389
- [UpdateQuota](docs/UpdateQuota.md)
388390
- [UploadFileLayersResponse](docs/UploadFileLayersResponse.md)
389391
- [UploadFilesResponse](docs/UploadFilesResponse.md)
392+
- [UsageSummaryGranularity](docs/UsageSummaryGranularity.md)
390393
- [UserCredentials](docs/UserCredentials.md)
391394
- [UserInfo](docs/UserInfo.md)
392395
- [UserRegistration](docs/UserRegistration.md)

python/geoengine_openapi_client/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,7 @@
249249
from geoengine_openapi_client.models.update_quota import UpdateQuota
250250
from geoengine_openapi_client.models.upload_file_layers_response import UploadFileLayersResponse
251251
from geoengine_openapi_client.models.upload_files_response import UploadFilesResponse
252+
from geoengine_openapi_client.models.usage_summary_granularity import UsageSummaryGranularity
252253
from geoengine_openapi_client.models.user_credentials import UserCredentials
253254
from geoengine_openapi_client.models.user_info import UserInfo
254255
from geoengine_openapi_client.models.user_registration import UserRegistration

0 commit comments

Comments
 (0)