diff --git a/.generation/config.ini b/.generation/config.ini index 8569d0a3..608f8acf 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,9 +1,9 @@ [input] -backendCommit = a67f76af99b5b579fa0823bfa5908fae0049cb22 +backendCommit = 811d415f68e4e4878e7ff7f69eaad4a08d6fc16c [general] githubUrl = https://github.com/geo-engine/openapi-client -version = 0.0.27 +version = 0.0.28 [python] name = geoengine_openapi_client diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index 66a4d334..0a316505 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -9528,6 +9528,10 @@ } } }, + "Secret_String": { + "type": "string", + "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." + }, "SentinelS2L2ACogsProviderDefinition": { "type": "object", "required": [ @@ -11036,14 +11040,15 @@ "description" ], "properties": { - "apiKey": { + "description": { + "type": "string" + }, + "expiryDate": { "type": [ "string", "null" - ] - }, - "description": { - "type": "string" + ], + "format": "date-time" }, "id": { "$ref": "#/components/schemas/DataProviderId" @@ -11058,11 +11063,27 @@ ], "format": "int32" }, + "refreshToken": { + "oneOf": [ + { + "type": "null" + }, + { + "$ref": "#/components/schemas/Secret_String" + } + ] + }, "type": { "type": "string", "enum": [ "WildLIVE!" ] + }, + "user": { + "type": [ + "string", + "null" + ] } } }, diff --git a/python/README.md b/python/README.md index 86050d33..657ce246 100644 --- a/python/README.md +++ b/python/README.md @@ -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.27 +- Package version: 0.0.28 - Generator version: 7.12.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 21c06c7e..7880306f 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -15,7 +15,7 @@ """ # noqa: E501 -__version__ = "0.0.27" +__version__ = "0.0.28" # import apis into sdk package from geoengine_openapi_client.api.datasets_api import DatasetsApi diff --git a/python/geoengine_openapi_client/api_client.py b/python/geoengine_openapi_client/api_client.py index 6f6c8828..e7b27391 100644 --- a/python/geoengine_openapi_client/api_client.py +++ b/python/geoengine_openapi_client/api_client.py @@ -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.27' + self.user_agent = 'geoengine/openapi-client/python/0.0.28' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/python/geoengine_openapi_client/configuration.py b/python/geoengine_openapi_client/configuration.py index 455fd5b2..d774c0c0 100644 --- a/python/geoengine_openapi_client/configuration.py +++ b/python/geoengine_openapi_client/configuration.py @@ -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.27".\ + "SDK Package Version: 0.0.28".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self) -> List[HostSetting]: diff --git a/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py b/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py index 62bf47ce..fd518455 100644 --- a/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py +++ b/python/geoengine_openapi_client/models/wildlive_data_connector_definition.py @@ -18,6 +18,7 @@ import re # noqa: F401 import json +from datetime import datetime from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator from typing import Any, ClassVar, Dict, List, Optional from typing import Optional, Set @@ -27,13 +28,14 @@ class WildliveDataConnectorDefinition(BaseModel): """ WildliveDataConnectorDefinition """ # noqa: E501 - api_key: Optional[StrictStr] = Field(default=None, alias="apiKey") description: StrictStr + expiry_date: Optional[datetime] = Field(default=None, alias="expiryDate") id: StrictStr name: StrictStr priority: Optional[StrictInt] = None + 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") type: StrictStr - __properties: ClassVar[List[str]] = ["apiKey", "description", "id", "name", "priority", "type"] + __properties: ClassVar[List[str]] = ["description", "expiryDate", "id", "name", "priority", "refreshToken", "type"] @field_validator('type') def type_validate_enum(cls, value): @@ -81,10 +83,10 @@ def to_dict(self) -> Dict[str, Any]: exclude=excluded_fields, exclude_none=True, ) - # set to None if api_key (nullable) is None + # set to None if expiry_date (nullable) is None # and model_fields_set contains the field - if self.api_key is None and "api_key" in self.model_fields_set: - _dict['apiKey'] = None + if self.expiry_date is None and "expiry_date" in self.model_fields_set: + _dict['expiryDate'] = None # set to None if priority (nullable) is None # and model_fields_set contains the field @@ -103,11 +105,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "apiKey": obj.get("apiKey"), "description": obj.get("description"), + "expiryDate": obj.get("expiryDate"), "id": obj.get("id"), "name": obj.get("name"), "priority": obj.get("priority"), + "refreshToken": obj.get("refreshToken"), "type": obj.get("type") }) return _obj diff --git a/python/pyproject.toml b/python/pyproject.toml index e3847c4c..503e0ea9 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geoengine_openapi_client" -version = "0.0.27" +version = "0.0.28" description = "Geo Engine API" authors = ["Geo Engine Developers "] license = "Apache-2.0" diff --git a/python/setup.py b/python/setup.py index a1f3cd1e..14df219e 100644 --- a/python/setup.py +++ b/python/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools NAME = "geoengine-openapi-client" -VERSION = "0.0.27" +VERSION = "0.0.28" PYTHON_REQUIRES = ">= 3.8" REQUIRES = [ "urllib3 >= 1.25.3, < 3.0.0", diff --git a/python/test/test_typed_data_provider_definition.py b/python/test/test_typed_data_provider_definition.py index df7013a8..54203299 100644 --- a/python/test/test_typed_data_provider_definition.py +++ b/python/test/test_typed_data_provider_definition.py @@ -119,7 +119,8 @@ def make_instance(self, include_optional) -> TypedDataProviderDefinition: epsg = 0, name = '', ) ], - api_key = '' + expiry_date = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), + refresh_token = '' ) else: return TypedDataProviderDefinition( diff --git a/python/test/test_wildlive_data_connector_definition.py b/python/test/test_wildlive_data_connector_definition.py index a90aa069..a1c3de97 100644 --- a/python/test/test_wildlive_data_connector_definition.py +++ b/python/test/test_wildlive_data_connector_definition.py @@ -36,11 +36,12 @@ def make_instance(self, include_optional) -> WildliveDataConnectorDefinition: model = WildliveDataConnectorDefinition() if include_optional: return WildliveDataConnectorDefinition( - api_key = '', description = '', + expiry_date = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), id = '', name = '', priority = 56, + refresh_token = '', type = 'WildLIVE!' ) else: diff --git a/typescript/README.md b/typescript/README.md index 36941a22..050b21f4 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,4 +1,4 @@ -## @geoengine/openapi-client@0.0.27 +## @geoengine/openapi-client@0.0.28 This generator creates TypeScript/JavaScript client that utilizes [Fetch API](https://fetch.spec.whatwg.org/). The generated Node module can be used in the following environments: @@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co _published:_ ``` -npm install @geoengine/openapi-client@0.0.27 --save +npm install @geoengine/openapi-client@0.0.28 --save ``` _unPublished (not recommended):_ diff --git a/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts index 9d119585..6cd7ebe7 100644 --- a/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts +++ b/typescript/dist/esm/models/WildliveDataConnectorDefinition.d.ts @@ -20,13 +20,13 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - apiKey?: string | null; + description: string; /** * - * @type {string} + * @type {Date} * @memberof WildliveDataConnectorDefinition */ - description: string; + expiryDate?: Date | null; /** * * @type {string} @@ -45,12 +45,26 @@ export interface WildliveDataConnectorDefinition { * @memberof WildliveDataConnectorDefinition */ priority?: number | null; + /** + * 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. + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + refreshToken?: string; /** * * @type {string} * @memberof WildliveDataConnectorDefinition */ type: WildliveDataConnectorDefinitionTypeEnum; + /** + * + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + user?: string | null; } /** * @export diff --git a/typescript/dist/esm/models/WildliveDataConnectorDefinition.js b/typescript/dist/esm/models/WildliveDataConnectorDefinition.js index 0db0d8e0..9b2a7741 100644 --- a/typescript/dist/esm/models/WildliveDataConnectorDefinition.js +++ b/typescript/dist/esm/models/WildliveDataConnectorDefinition.js @@ -39,12 +39,14 @@ export function WildliveDataConnectorDefinitionFromJSONTyped(json, ignoreDiscrim return json; } return { - 'apiKey': json['apiKey'] == null ? undefined : json['apiKey'], 'description': json['description'], + 'expiryDate': json['expiryDate'] == null ? undefined : (new Date(json['expiryDate'])), 'id': json['id'], 'name': json['name'], 'priority': json['priority'] == null ? undefined : json['priority'], + 'refreshToken': json['refreshToken'] == null ? undefined : json['refreshToken'], 'type': json['type'], + 'user': json['user'] == null ? undefined : json['user'], }; } export function WildliveDataConnectorDefinitionToJSON(json) { @@ -55,11 +57,13 @@ export function WildliveDataConnectorDefinitionToJSONTyped(value, ignoreDiscrimi return value; } return { - 'apiKey': value['apiKey'], 'description': value['description'], + 'expiryDate': value['expiryDate'] == null ? undefined : (value['expiryDate'].toISOString()), 'id': value['id'], 'name': value['name'], 'priority': value['priority'], + 'refreshToken': value['refreshToken'], 'type': value['type'], + 'user': value['user'], }; } diff --git a/typescript/dist/esm/runtime.js b/typescript/dist/esm/runtime.js index 1fa177b5..06a287af 100644 --- a/typescript/dist/esm/runtime.js +++ b/typescript/dist/esm/runtime.js @@ -69,7 +69,7 @@ export class Configuration { } export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.27' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.28' } }); /** diff --git a/typescript/dist/models/WildliveDataConnectorDefinition.d.ts b/typescript/dist/models/WildliveDataConnectorDefinition.d.ts index 9d119585..6cd7ebe7 100644 --- a/typescript/dist/models/WildliveDataConnectorDefinition.d.ts +++ b/typescript/dist/models/WildliveDataConnectorDefinition.d.ts @@ -20,13 +20,13 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - apiKey?: string | null; + description: string; /** * - * @type {string} + * @type {Date} * @memberof WildliveDataConnectorDefinition */ - description: string; + expiryDate?: Date | null; /** * * @type {string} @@ -45,12 +45,26 @@ export interface WildliveDataConnectorDefinition { * @memberof WildliveDataConnectorDefinition */ priority?: number | null; + /** + * 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. + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + refreshToken?: string; /** * * @type {string} * @memberof WildliveDataConnectorDefinition */ type: WildliveDataConnectorDefinitionTypeEnum; + /** + * + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + user?: string | null; } /** * @export diff --git a/typescript/dist/models/WildliveDataConnectorDefinition.js b/typescript/dist/models/WildliveDataConnectorDefinition.js index 2b969374..da152a6b 100644 --- a/typescript/dist/models/WildliveDataConnectorDefinition.js +++ b/typescript/dist/models/WildliveDataConnectorDefinition.js @@ -47,12 +47,14 @@ function WildliveDataConnectorDefinitionFromJSONTyped(json, ignoreDiscriminator) return json; } return { - 'apiKey': json['apiKey'] == null ? undefined : json['apiKey'], 'description': json['description'], + 'expiryDate': json['expiryDate'] == null ? undefined : (new Date(json['expiryDate'])), 'id': json['id'], 'name': json['name'], 'priority': json['priority'] == null ? undefined : json['priority'], + 'refreshToken': json['refreshToken'] == null ? undefined : json['refreshToken'], 'type': json['type'], + 'user': json['user'] == null ? undefined : json['user'], }; } function WildliveDataConnectorDefinitionToJSON(json) { @@ -63,11 +65,13 @@ function WildliveDataConnectorDefinitionToJSONTyped(value, ignoreDiscriminator = return value; } return { - 'apiKey': value['apiKey'], 'description': value['description'], + 'expiryDate': value['expiryDate'] == null ? undefined : (value['expiryDate'].toISOString()), 'id': value['id'], 'name': value['name'], 'priority': value['priority'], + 'refreshToken': value['refreshToken'], 'type': value['type'], + 'user': value['user'], }; } diff --git a/typescript/dist/runtime.js b/typescript/dist/runtime.js index 726f843a..7ce95fca 100644 --- a/typescript/dist/runtime.js +++ b/typescript/dist/runtime.js @@ -77,7 +77,7 @@ class Configuration { exports.Configuration = Configuration; exports.DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.27' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.28' } }); /** diff --git a/typescript/package-lock.json b/typescript/package-lock.json index 1efbc0c3..4438862c 100644 --- a/typescript/package-lock.json +++ b/typescript/package-lock.json @@ -1,12 +1,12 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.27", + "version": "0.0.28", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@geoengine/openapi-client", - "version": "0.0.27", + "version": "0.0.28", "devDependencies": { "typescript": "^4.0 || ^5.0" } diff --git a/typescript/package.json b/typescript/package.json index 727fde04..88fd2791 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.27", + "version": "0.0.28", "description": "OpenAPI client for @geoengine/openapi-client", "author": "OpenAPI-Generator", "repository": { diff --git a/typescript/src/models/WildliveDataConnectorDefinition.ts b/typescript/src/models/WildliveDataConnectorDefinition.ts index cabcc67d..74669435 100644 --- a/typescript/src/models/WildliveDataConnectorDefinition.ts +++ b/typescript/src/models/WildliveDataConnectorDefinition.ts @@ -24,13 +24,13 @@ export interface WildliveDataConnectorDefinition { * @type {string} * @memberof WildliveDataConnectorDefinition */ - apiKey?: string | null; + description: string; /** * - * @type {string} + * @type {Date} * @memberof WildliveDataConnectorDefinition */ - description: string; + expiryDate?: Date | null; /** * * @type {string} @@ -49,12 +49,26 @@ export interface WildliveDataConnectorDefinition { * @memberof WildliveDataConnectorDefinition */ priority?: number | null; + /** + * 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. + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + refreshToken?: string; /** * * @type {string} * @memberof WildliveDataConnectorDefinition */ type: WildliveDataConnectorDefinitionTypeEnum; + /** + * + * @type {string} + * @memberof WildliveDataConnectorDefinition + */ + user?: string | null; } @@ -88,12 +102,14 @@ export function WildliveDataConnectorDefinitionFromJSONTyped(json: any, ignoreDi } return { - 'apiKey': json['apiKey'] == null ? undefined : json['apiKey'], 'description': json['description'], + 'expiryDate': json['expiryDate'] == null ? undefined : (new Date(json['expiryDate'])), 'id': json['id'], 'name': json['name'], 'priority': json['priority'] == null ? undefined : json['priority'], + 'refreshToken': json['refreshToken'] == null ? undefined : json['refreshToken'], 'type': json['type'], + 'user': json['user'] == null ? undefined : json['user'], }; } @@ -108,12 +124,14 @@ export function WildliveDataConnectorDefinitionToJSONTyped(value?: WildliveDataC return { - 'apiKey': value['apiKey'], 'description': value['description'], + 'expiryDate': value['expiryDate'] == null ? undefined : ((value['expiryDate'] as any).toISOString()), 'id': value['id'], 'name': value['name'], 'priority': value['priority'], + 'refreshToken': value['refreshToken'], 'type': value['type'], + 'user': value['user'], }; } diff --git a/typescript/src/runtime.ts b/typescript/src/runtime.ts index fdd2e7db..180daecc 100644 --- a/typescript/src/runtime.ts +++ b/typescript/src/runtime.ts @@ -86,7 +86,7 @@ export class Configuration { export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.27' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.28' } });