Skip to content

Commit 9158db2

Browse files
authored
Merge pull request #51 from geo-engine/create-pull-request/patch
Code for backend commit 7ff0ace96463ee8757a7382080c52802f85885fb
2 parents 2ca375c + 3cae79d commit 9158db2

24 files changed

+147
-50
lines changed

.generation/config.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
[input]
2-
backendCommit = 9c2decb9f961cdce3d26f278291344bc269b4cbe
2+
backendCommit = 7ff0ace96463ee8757a7382080c52802f85885fb
33

44
[general]
55
githubUrl = https://github.com/geo-engine/openapi-client
6-
version = 0.0.28
6+
version = 0.0.29
77

88
[python]
99
name = geoengine_openapi_client

.generation/input/openapi.json

Lines changed: 26 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9528,6 +9528,10 @@
95289528
}
95299529
}
95309530
},
9531+
"Secret_String": {
9532+
"type": "string",
9533+
"description": "A wrapper type that serializes to \"*****\" and can be deserialized from any string.\nIf the inner value is \"*****\", it is considered unknown and `as_option` returns `None`.\nThis is useful for secrets that should not be exposed in API responses, but can be set in API requests."
9534+
},
95319535
"SentinelS2L2ACogsProviderDefinition": {
95329536
"type": "object",
95339537
"required": [
@@ -11036,14 +11040,15 @@
1103611040
"description"
1103711041
],
1103811042
"properties": {
11039-
"apiKey": {
11043+
"description": {
11044+
"type": "string"
11045+
},
11046+
"expiryDate": {
1104011047
"type": [
1104111048
"string",
1104211049
"null"
11043-
]
11044-
},
11045-
"description": {
11046-
"type": "string"
11050+
],
11051+
"format": "date-time"
1104711052
},
1104811053
"id": {
1104911054
"$ref": "#/components/schemas/DataProviderId"
@@ -11058,11 +11063,27 @@
1105811063
],
1105911064
"format": "int32"
1106011065
},
11066+
"refreshToken": {
11067+
"oneOf": [
11068+
{
11069+
"type": "null"
11070+
},
11071+
{
11072+
"$ref": "#/components/schemas/Secret_String"
11073+
}
11074+
]
11075+
},
1106111076
"type": {
1106211077
"type": "string",
1106311078
"enum": [
1106411079
"WildLIVE!"
1106511080
]
11081+
},
11082+
"user": {
11083+
"type": [
11084+
"string",
11085+
"null"
11086+
]
1106611087
}
1106711088
}
1106811089
},

python/README.md

Lines changed: 1 addition & 1 deletion
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.28
7+
- Package version: 0.0.29
88
- Generator version: 7.17.0
99
- Build package: org.openapitools.codegen.languages.PythonClientCodegen
1010

python/geoengine_openapi_client/__init__.py

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

1717

18-
__version__ = "0.0.28"
18+
__version__ = "0.0.29"
1919

2020
# Define package exports
2121
__all__ = [

python/geoengine_openapi_client/api_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ def __init__(
9292
self.default_headers[header_name] = header_value
9393
self.cookie = cookie
9494
# Set default User-Agent.
95-
self.user_agent = 'geoengine/openapi-client/python/0.0.28'
95+
self.user_agent = 'geoengine/openapi-client/python/0.0.29'
9696
self.client_side_validation = configuration.client_side_validation
9797

9898
def __enter__(self):

python/geoengine_openapi_client/configuration.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ def to_debug_report(self) -> str:
516516
"OS: {env}\n"\
517517
"Python Version: {pyversion}\n"\
518518
"Version of the API: 0.8.0\n"\
519-
"SDK Package Version: 0.0.28".\
519+
"SDK Package Version: 0.0.29".\
520520
format(env=sys.platform, pyversion=sys.version)
521521

522522
def get_host_settings(self) -> List[HostSetting]:

python/geoengine_openapi_client/models/wildlive_data_connector_definition.py

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
import re # noqa: F401
1919
import json
2020

21+
from datetime import datetime
2122
from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
2223
from typing import Any, ClassVar, Dict, List, Optional
2324
from uuid import UUID
@@ -28,13 +29,15 @@ class WildliveDataConnectorDefinition(BaseModel):
2829
"""
2930
WildliveDataConnectorDefinition
3031
""" # noqa: E501
31-
api_key: Optional[StrictStr] = Field(default=None, alias="apiKey")
3232
description: StrictStr
33+
expiry_date: Optional[datetime] = Field(default=None, alias="expiryDate")
3334
id: UUID
3435
name: StrictStr
3536
priority: Optional[StrictInt] = None
37+
refresh_token: Optional[StrictStr] = Field(default=None, description="A wrapper type that serializes to \"*****\" and can be deserialized from any string. If the inner value is \"*****\", it is considered unknown and `as_option` returns `None`. This is useful for secrets that should not be exposed in API responses, but can be set in API requests.", alias="refreshToken")
3638
type: StrictStr
37-
__properties: ClassVar[List[str]] = ["apiKey", "description", "id", "name", "priority", "type"]
39+
user: Optional[StrictStr] = None
40+
__properties: ClassVar[List[str]] = ["description", "expiryDate", "id", "name", "priority", "refreshToken", "type", "user"]
3841

3942
@field_validator('type')
4043
def type_validate_enum(cls, value):
@@ -82,16 +85,21 @@ def to_dict(self) -> Dict[str, Any]:
8285
exclude=excluded_fields,
8386
exclude_none=True,
8487
)
85-
# set to None if api_key (nullable) is None
88+
# set to None if expiry_date (nullable) is None
8689
# and model_fields_set contains the field
87-
if self.api_key is None and "api_key" in self.model_fields_set:
88-
_dict['apiKey'] = None
90+
if self.expiry_date is None and "expiry_date" in self.model_fields_set:
91+
_dict['expiryDate'] = None
8992

9093
# set to None if priority (nullable) is None
9194
# and model_fields_set contains the field
9295
if self.priority is None and "priority" in self.model_fields_set:
9396
_dict['priority'] = None
9497

98+
# set to None if user (nullable) is None
99+
# and model_fields_set contains the field
100+
if self.user is None and "user" in self.model_fields_set:
101+
_dict['user'] = None
102+
95103
return _dict
96104

97105
@classmethod
@@ -104,12 +112,14 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
104112
return cls.model_validate(obj)
105113

106114
_obj = cls.model_validate({
107-
"apiKey": obj.get("apiKey"),
108115
"description": obj.get("description"),
116+
"expiryDate": obj.get("expiryDate"),
109117
"id": obj.get("id"),
110118
"name": obj.get("name"),
111119
"priority": obj.get("priority"),
112-
"type": obj.get("type")
120+
"refreshToken": obj.get("refreshToken"),
121+
"type": obj.get("type"),
122+
"user": obj.get("user")
113123
})
114124
return _obj
115125

python/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "geoengine_openapi_client"
3-
version = "0.0.28"
3+
version = "0.0.29"
44
description = "Geo Engine API"
55
authors = [
66
{name = "Geo Engine Developers",email = "[email protected]"},

python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
# prerequisite: setuptools
2323
# http://pypi.python.org/pypi/setuptools
2424
NAME = "geoengine-openapi-client"
25-
VERSION = "0.0.28"
25+
VERSION = "0.0.29"
2626
PYTHON_REQUIRES = ">= 3.9"
2727
REQUIRES = [
2828
"urllib3 >= 2.1.0, < 3.0.0",

python/test/test_typed_data_provider_definition.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,9 @@ def make_instance(self, include_optional) -> TypedDataProviderDefinition:
119119
epsg = 0,
120120
name = '', )
121121
],
122-
api_key = ''
122+
expiry_date = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'),
123+
refresh_token = '',
124+
user = ''
123125
)
124126
else:
125127
return TypedDataProviderDefinition(

0 commit comments

Comments
 (0)