From 4e84a14b5076e73983dfe23a9aaddb77d1411eb7 Mon Sep 17 00:00:00 2001 From: SDK Generator Bot Date: Mon, 11 May 2026 10:18:19 +0000 Subject: [PATCH] Generate observability --- services/observability/oas_commit | 2 +- .../src/stackit/observability/api_client.py | 32 +++++++++---------- .../src/stackit/observability/models/alert.py | 7 ++-- .../models/alert_config_receivers_response.py | 7 ++-- .../models/alert_config_route_response.py | 7 ++-- .../observability/models/alert_group.py | 7 ++-- .../models/alert_group_response.py | 7 ++-- .../models/alert_groups_response.py | 7 ++-- .../observability/models/alert_record.py | 7 ++-- .../models/alert_record_response.py | 7 ++-- .../models/alert_records_response.py | 7 ++-- .../observability/models/alert_rule.py | 7 ++-- .../observability/models/alert_rule_record.py | 7 ++-- .../models/alert_rule_response.py | 7 ++-- .../models/alert_rules_response.py | 7 ++-- .../observability/models/backup_response.py | 7 ++-- .../models/backup_retention_response.py | 7 ++-- .../observability/models/backup_schedule.py | 7 ++-- .../models/backup_schedule_post_response.py | 7 ++-- .../models/backup_schedule_response.py | 7 ++-- .../observability/models/basic_auth.py | 7 ++-- .../models/cert_check_child_response.py | 7 ++-- .../models/cert_check_response.py | 7 ++-- .../create_alert_config_receiver_payload.py | 7 ++-- ...ig_receiver_payload_email_configs_inner.py | 7 ++-- ...receiver_payload_opsgenie_configs_inner.py | 7 ++-- ...receiver_payload_web_hook_configs_inner.py | 7 ++-- .../create_alert_config_route_payload.py | 7 ++-- ...alert_config_route_payload_routes_inner.py | 7 ++-- .../models/create_alert_record_payload.py | 7 ++-- .../models/create_alertgroups_payload.py | 7 ++-- .../models/create_alertrules_payload.py | 7 ++-- .../models/create_backup_schedule_payload.py | 7 ++-- .../models/create_cert_check_payload.py | 7 ++-- .../models/create_credentials_payload.py | 7 ++-- .../models/create_credentials_response.py | 7 ++-- .../create_elasticsearch_check_payload.py | 7 ++-- .../models/create_http_check_payload.py | 7 ++-- .../models/create_instance_payload.py | 7 ++-- .../models/create_instance_response.py | 7 ++-- .../models/create_logs_alertgroups_payload.py | 7 ++-- ...te_logs_alertgroups_payload_rules_inner.py | 7 ++-- .../models/create_mongodb_check_payload.py | 7 ++-- .../models/create_mysql_check_payload.py | 7 ++-- .../models/create_network_check_payload.py | 7 ++-- .../models/create_ping_check_payload.py | 7 ++-- .../models/create_postgresql_check_payload.py | 7 ++-- .../models/create_rabbitmq_check_payload.py | 7 ++-- .../models/create_redis_check_payload.py | 7 ++-- .../models/create_scrape_config_payload.py | 7 ++-- .../observability/models/credentials.py | 7 ++-- .../models/credentials_remote_write_config.py | 7 ++-- ...redentials_remote_write_delete_response.py | 7 ++-- .../models/delete_scrape_config_response.py | 7 ++-- .../elasticsearch_check_child_response.py | 7 ++-- .../models/elasticsearch_check_response.py | 7 ++-- .../observability/models/email_config.py | 7 ++-- .../src/stackit/observability/models/error.py | 7 ++-- .../models/get_alert_configs_response.py | 7 ++-- .../models/get_credentials_response.py | 7 ++-- .../models/get_instance_response.py | 7 ++-- .../get_metrics_storage_retention_response.py | 7 ++-- .../models/get_scrape_config_response.py | 7 ++-- .../observability/models/grafana_configs.py | 7 ++-- .../observability/models/grafana_oauth.py | 7 ++-- .../models/http_check_child_response.py | 7 ++-- .../models/http_check_response.py | 7 ++-- .../observability/models/http_service_sd.py | 7 ++-- .../observability/models/inhibit_rules.py | 7 ++-- .../stackit/observability/models/instance.py | 7 ++-- .../observability/models/instance_response.py | 7 ++-- .../models/instance_sensitive_data.py | 7 ++-- .../src/stackit/observability/models/job.py | 7 ++-- .../observability/models/list_acl_response.py | 7 ++-- .../models/list_credentials_response.py | 7 ++-- .../models/list_instances_response.py | 7 ++-- .../models/list_scrape_configs_response.py | 7 ++-- .../observability/models/logs_config.py | 7 ++-- .../models/logs_config_response.py | 7 ++-- .../stackit/observability/models/message.py | 7 ++-- .../models/metrics_relabel_config.py | 7 ++-- .../observability/models/model_global.py | 7 ++-- .../models/mongodb_check_child_response.py | 7 ++-- .../models/mongodb_check_response.py | 7 ++-- .../models/mysql_check_child_response.py | 7 ++-- .../models/mysql_check_response.py | 7 ++-- .../models/network_check_child_response.py | 7 ++-- .../models/network_check_response.py | 7 ++-- .../stackit/observability/models/o_auth2.py | 7 ++-- .../stackit/observability/models/offerings.py | 7 ++-- .../observability/models/opsgenie_config.py | 7 ++-- ...tial_update_alert_records_request_inner.py | 7 ++-- ...partial_update_alertrules_request_inner.py | 7 ++-- ...ial_update_scrape_configs_request_inner.py | 7 ++-- ...scrape_configs_request_inner_basic_auth.py | 7 ++-- ...igs_request_inner_http_sd_configs_inner.py | 7 ++-- ...uest_inner_http_sd_configs_inner_oauth2.py | 7 ++-- ...http_sd_configs_inner_oauth2_tls_config.py | 7 ++-- ...est_inner_metrics_relabel_configs_inner.py | 7 ++-- ...figs_request_inner_static_configs_inner.py | 7 ++-- .../observability/models/permission_denied.py | 7 ++-- .../models/ping_check_child_response.py | 7 ++-- .../models/ping_check_response.py | 7 ++-- .../src/stackit/observability/models/plan.py | 7 ++-- .../observability/models/plan_model.py | 7 ++-- .../observability/models/plans_response.py | 7 ++-- .../models/postgresql_check_child_response.py | 7 ++-- .../models/postgresql_check_response.py | 7 ++-- .../models/project_instance_full.py | 7 ++-- .../models/rabbit_mq_check_child_response.py | 7 ++-- .../models/rabbitmq_check_response.py | 7 ++-- .../stackit/observability/models/receiver.py | 7 ++-- .../stackit/observability/models/receivers.py | 7 ++-- .../models/redis_check_child_response.py | 7 ++-- .../models/redis_check_response.py | 7 ++-- .../src/stackit/observability/models/route.py | 7 ++-- .../observability/models/route_serializer.py | 7 ++-- .../models/scrape_configs_response.py | 7 ++-- .../observability/models/service_keys_list.py | 7 ++-- .../observability/models/static_configs.py | 7 ++-- .../observability/models/tls_config.py | 7 ++-- .../observability/models/trace_config.py | 7 ++-- .../models/traces_config_response.py | 7 ++-- .../models/update_acl_payload.py | 7 ++-- .../update_alert_config_receiver_payload.py | 7 ++-- .../update_alert_config_route_payload.py | 7 ++-- .../models/update_alert_configs_payload.py | 7 ++-- .../update_alert_configs_payload_global.py | 7 ++-- ...ate_alert_configs_payload_inhibit_rules.py | 7 ++-- ...e_alert_configs_payload_receivers_inner.py | 7 ++-- .../update_alert_configs_payload_route.py | 7 ++-- ...lert_configs_payload_route_routes_inner.py | 7 ++-- .../models/update_alert_configs_response.py | 7 ++-- .../models/update_alert_record_payload.py | 7 ++-- .../models/update_alertgroup_payload.py | 7 ++-- .../update_alertgroups_request_inner.py | 7 ++-- ...e_alertgroups_request_inner_rules_inner.py | 7 ++-- .../models/update_alertrule_payload.py | 7 ++-- ...credentials_remote_write_config_payload.py | 7 ++-- .../models/update_grafana_configs_payload.py | 7 ++-- ...e_grafana_configs_payload_generic_oauth.py | 7 ++-- .../models/update_instance_payload.py | 7 ++-- .../models/update_logs_alertgroup_payload.py | 7 ++-- .../models/update_logs_configs_payload.py | 7 ++-- ...pdate_metrics_storage_retention_payload.py | 7 ++-- .../models/update_scrape_config_payload.py | 7 ++-- ...ape_config_payload_static_configs_inner.py | 7 ++-- .../models/update_traces_configs_payload.py | 7 ++-- .../stackit/observability/models/web_hook.py | 7 ++-- 149 files changed, 604 insertions(+), 459 deletions(-) diff --git a/services/observability/oas_commit b/services/observability/oas_commit index 36076afe8..b129c2291 100644 --- a/services/observability/oas_commit +++ b/services/observability/oas_commit @@ -1 +1 @@ -87a3ad63dec0a953ff5c6072ad9a15fddd8ec5f8 +98c11e0ee4834ddaaa474eccc437d234e6276a70 diff --git a/services/observability/src/stackit/observability/api_client.py b/services/observability/src/stackit/observability/api_client.py index 03da1bfa3..67cea8bac 100644 --- a/services/observability/src/stackit/observability/api_client.py +++ b/services/observability/src/stackit/observability/api_client.py @@ -67,6 +67,7 @@ class ApiClient: "date": datetime.date, "datetime": datetime.datetime, "decimal": decimal.Decimal, + "UUID": uuid.UUID, "object": object, } _pool = None @@ -266,7 +267,7 @@ def response_deserialize( response_text = None return_data = None try: - if response_type == "bytearray": + if response_type in ("bytearray", "bytes"): return_data = response_data.data elif response_type == "file": return_data = self.__deserialize_file(response_data) @@ -327,25 +328,20 @@ def sanitize_for_serialization(self, obj): return obj.isoformat() elif isinstance(obj, decimal.Decimal): return str(obj) - elif isinstance(obj, dict): - obj_dict = obj + return {key: self.sanitize_for_serialization(val) for key, val in obj.items()} + + # Convert model obj to dict except + # attributes `openapi_types`, `attribute_map` + # and attributes which value is not None. + # Convert attribute name to json key in + # model definition for request. + if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")): + obj_dict = obj.to_dict() else: - # Convert model obj to dict except - # attributes `openapi_types`, `attribute_map` - # and attributes which value is not None. - # Convert attribute name to json key in - # model definition for request. - if hasattr(obj, "to_dict") and callable(getattr(obj, "to_dict")): # noqa: B009 - obj_dict = obj.to_dict() - else: - obj_dict = obj.__dict__ - - if isinstance(obj_dict, list): - # here we handle instances that can either be a list or something else, and only became a real list by calling to_dict() # noqa: E501 - return self.sanitize_for_serialization(obj_dict) + obj_dict = obj.__dict__ - return {key: self.sanitize_for_serialization(val) for key, val in obj_dict.items()} + return self.sanitize_for_serialization(obj_dict) def deserialize(self, response_text: str, response_type: str, content_type: Optional[str]): """Deserializes response into an object. @@ -418,6 +414,8 @@ def __deserialize(self, data, klass): return self.__deserialize_datetime(data) elif klass is decimal.Decimal: return decimal.Decimal(data) + elif klass is uuid.UUID: + return uuid.UUID(data) elif issubclass(klass, Enum): return self.__deserialize_enum(data, klass) else: diff --git a/services/observability/src/stackit/observability/models/alert.py b/services/observability/src/stackit/observability/models/alert.py index ad5626a5e..f44c7a6e0 100644 --- a/services/observability/src/stackit/observability/models/alert.py +++ b/services/observability/src/stackit/observability/models/alert.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.observability.models.inhibit_rules import InhibitRules @@ -39,7 +40,8 @@ class Alert(BaseModel): __properties: ClassVar[List[str]] = ["global", "inhibitRules", "receivers", "route"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_config_receivers_response.py b/services/observability/src/stackit/observability/models/alert_config_receivers_response.py index 899b80f56..654a99c0f 100644 --- a/services/observability/src/stackit/observability/models/alert_config_receivers_response.py +++ b/services/observability/src/stackit/observability/models/alert_config_receivers_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.receivers import Receivers @@ -34,7 +35,8 @@ class AlertConfigReceiversResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_config_route_response.py b/services/observability/src/stackit/observability/models/alert_config_route_response.py index 2e5eceece..2d91ede03 100644 --- a/services/observability/src/stackit/observability/models/alert_config_route_response.py +++ b/services/observability/src/stackit/observability/models/alert_config_route_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.route import Route @@ -34,7 +35,8 @@ class AlertConfigRouteResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_group.py b/services/observability/src/stackit/observability/models/alert_group.py index 17914b1f1..efaf1ec93 100644 --- a/services/observability/src/stackit/observability/models/alert_group.py +++ b/services/observability/src/stackit/observability/models/alert_group.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_rule_record import AlertRuleRecord @@ -35,7 +36,8 @@ class AlertGroup(BaseModel): __properties: ClassVar[List[str]] = ["interval", "name", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_group_response.py b/services/observability/src/stackit/observability/models/alert_group_response.py index f2069074b..7ba22c1b2 100644 --- a/services/observability/src/stackit/observability/models/alert_group_response.py +++ b/services/observability/src/stackit/observability/models/alert_group_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_group import AlertGroup @@ -34,7 +35,8 @@ class AlertGroupResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_groups_response.py b/services/observability/src/stackit/observability/models/alert_groups_response.py index f4380286a..977ecabae 100644 --- a/services/observability/src/stackit/observability/models/alert_groups_response.py +++ b/services/observability/src/stackit/observability/models/alert_groups_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_group import AlertGroup @@ -34,7 +35,8 @@ class AlertGroupsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_record.py b/services/observability/src/stackit/observability/models/alert_record.py index a5a5b4cbd..eac7299d7 100644 --- a/services/observability/src/stackit/observability/models/alert_record.py +++ b/services/observability/src/stackit/observability/models/alert_record.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class AlertRecord(BaseModel): __properties: ClassVar[List[str]] = ["expr", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_record_response.py b/services/observability/src/stackit/observability/models/alert_record_response.py index fffd02284..6fc91ac1f 100644 --- a/services/observability/src/stackit/observability/models/alert_record_response.py +++ b/services/observability/src/stackit/observability/models/alert_record_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_record import AlertRecord @@ -34,7 +35,8 @@ class AlertRecordResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_records_response.py b/services/observability/src/stackit/observability/models/alert_records_response.py index dc973ed57..3db7b7f85 100644 --- a/services/observability/src/stackit/observability/models/alert_records_response.py +++ b/services/observability/src/stackit/observability/models/alert_records_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_record import AlertRecord @@ -34,7 +35,8 @@ class AlertRecordsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_rule.py b/services/observability/src/stackit/observability/models/alert_rule.py index 257aeed93..b15ab1df2 100644 --- a/services/observability/src/stackit/observability/models/alert_rule.py +++ b/services/observability/src/stackit/observability/models/alert_rule.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -35,7 +36,8 @@ class AlertRule(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -46,8 +48,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_rule_record.py b/services/observability/src/stackit/observability/models/alert_rule_record.py index cc652cb6a..ca79b9b2f 100644 --- a/services/observability/src/stackit/observability/models/alert_rule_record.py +++ b/services/observability/src/stackit/observability/models/alert_rule_record.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -36,7 +37,8 @@ class AlertRuleRecord(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_rule_response.py b/services/observability/src/stackit/observability/models/alert_rule_response.py index b2a1aaefd..ba42ad344 100644 --- a/services/observability/src/stackit/observability/models/alert_rule_response.py +++ b/services/observability/src/stackit/observability/models/alert_rule_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_rule import AlertRule @@ -34,7 +35,8 @@ class AlertRuleResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/alert_rules_response.py b/services/observability/src/stackit/observability/models/alert_rules_response.py index 78016637b..d627574df 100644 --- a/services/observability/src/stackit/observability/models/alert_rules_response.py +++ b/services/observability/src/stackit/observability/models/alert_rules_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert_rule import AlertRule @@ -34,7 +35,8 @@ class AlertRulesResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/backup_response.py b/services/observability/src/stackit/observability/models/backup_response.py index a82cc4a07..d95dc3621 100644 --- a/services/observability/src/stackit/observability/models/backup_response.py +++ b/services/observability/src/stackit/observability/models/backup_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -41,7 +42,8 @@ class BackupResponse(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -52,8 +54,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/backup_retention_response.py b/services/observability/src/stackit/observability/models/backup_retention_response.py index 2366d1d76..4f42c1a2c 100644 --- a/services/observability/src/stackit/observability/models/backup_retention_response.py +++ b/services/observability/src/stackit/observability/models/backup_retention_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -49,7 +50,8 @@ class BackupRetentionResponse(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/backup_schedule.py b/services/observability/src/stackit/observability/models/backup_schedule.py index 4887c97d4..8113a645e 100644 --- a/services/observability/src/stackit/observability/models/backup_schedule.py +++ b/services/observability/src/stackit/observability/models/backup_schedule.py @@ -20,6 +20,7 @@ from uuid import UUID from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class BackupSchedule(BaseModel): __properties: ClassVar[List[str]] = ["schedule", "scheduleId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/backup_schedule_post_response.py b/services/observability/src/stackit/observability/models/backup_schedule_post_response.py index 537b01001..0f1c3ad4d 100644 --- a/services/observability/src/stackit/observability/models/backup_schedule_post_response.py +++ b/services/observability/src/stackit/observability/models/backup_schedule_post_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class BackupSchedulePostResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "schedule"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/backup_schedule_response.py b/services/observability/src/stackit/observability/models/backup_schedule_response.py index 9bb9fff44..ddf8dbc6b 100644 --- a/services/observability/src/stackit/observability/models/backup_schedule_response.py +++ b/services/observability/src/stackit/observability/models/backup_schedule_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.backup_schedule import BackupSchedule @@ -49,7 +50,8 @@ class BackupScheduleResponse(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/basic_auth.py b/services/observability/src/stackit/observability/models/basic_auth.py index 1462ce81c..abb50640a 100644 --- a/services/observability/src/stackit/observability/models/basic_auth.py +++ b/services/observability/src/stackit/observability/models/basic_auth.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class BasicAuth(BaseModel): __properties: ClassVar[List[str]] = ["password", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/cert_check_child_response.py b/services/observability/src/stackit/observability/models/cert_check_child_response.py index 5f6f5635a..63ddba1ce 100644 --- a/services/observability/src/stackit/observability/models/cert_check_child_response.py +++ b/services/observability/src/stackit/observability/models/cert_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class CertCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "source"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/cert_check_response.py b/services/observability/src/stackit/observability/models/cert_check_response.py index 8284ec57f..5e7cd6272 100644 --- a/services/observability/src/stackit/observability/models/cert_check_response.py +++ b/services/observability/src/stackit/observability/models/cert_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.cert_check_child_response import ( @@ -37,7 +38,8 @@ class CertCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["certCheck", "certChecks", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload.py b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload.py index 82f0d2ce1..fa7b5b059 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_alert_config_receiver_payload_email_configs_inner import ( @@ -52,7 +53,8 @@ class CreateAlertConfigReceiverPayload(BaseModel): __properties: ClassVar[List[str]] = ["emailConfigs", "name", "opsgenieConfigs", "webHookConfigs"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -63,8 +65,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_email_configs_inner.py b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_email_configs_inner.py index 42d527e94..485b07b7f 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_email_configs_inner.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_email_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -65,7 +66,8 @@ class CreateAlertConfigReceiverPayloadEmailConfigsInner(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -76,8 +78,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_opsgenie_configs_inner.py b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_opsgenie_configs_inner.py index 704cdf28f..e839fb9de 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_opsgenie_configs_inner.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_opsgenie_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -49,7 +50,8 @@ class CreateAlertConfigReceiverPayloadOpsgenieConfigsInner(BaseModel): __properties: ClassVar[List[str]] = ["apiKey", "apiUrl", "priority", "sendResolved", "tags"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_web_hook_configs_inner.py b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_web_hook_configs_inner.py index 96c7a9bb8..6b1db1c1c 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_web_hook_configs_inner.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_receiver_payload_web_hook_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -47,7 +48,8 @@ class CreateAlertConfigReceiverPayloadWebHookConfigsInner(BaseModel): __properties: ClassVar[List[str]] = ["googleChat", "msTeams", "sendResolved", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -58,8 +60,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_route_payload.py b/services/observability/src/stackit/observability/models/create_alert_config_route_payload.py index ec758afb7..98c41371a 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_route_payload.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_route_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_alert_config_route_payload_routes_inner import ( @@ -89,7 +90,8 @@ class CreateAlertConfigRoutePayload(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -100,8 +102,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_config_route_payload_routes_inner.py b/services/observability/src/stackit/observability/models/create_alert_config_route_payload_routes_inner.py index 12201bfaf..0858b7d87 100644 --- a/services/observability/src/stackit/observability/models/create_alert_config_route_payload_routes_inner.py +++ b/services/observability/src/stackit/observability/models/create_alert_config_route_payload_routes_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -67,7 +68,8 @@ class CreateAlertConfigRoutePayloadRoutesInner(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -78,8 +80,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alert_record_payload.py b/services/observability/src/stackit/observability/models/create_alert_record_payload.py index 25e0dd63b..bd22d59b8 100644 --- a/services/observability/src/stackit/observability/models/create_alert_record_payload.py +++ b/services/observability/src/stackit/observability/models/create_alert_record_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -40,7 +41,8 @@ class CreateAlertRecordPayload(BaseModel): __properties: ClassVar[List[str]] = ["expr", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -51,8 +53,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alertgroups_payload.py b/services/observability/src/stackit/observability/models/create_alertgroups_payload.py index ca0df7006..f63b044ac 100644 --- a/services/observability/src/stackit/observability/models/create_alertgroups_payload.py +++ b/services/observability/src/stackit/observability/models/create_alertgroups_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.update_alertgroups_request_inner_rules_inner import ( @@ -42,7 +43,8 @@ class CreateAlertgroupsPayload(BaseModel): __properties: ClassVar[List[str]] = ["interval", "name", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -53,8 +55,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_alertrules_payload.py b/services/observability/src/stackit/observability/models/create_alertrules_payload.py index b4a0bdcd8..3c504517b 100644 --- a/services/observability/src/stackit/observability/models/create_alertrules_payload.py +++ b/services/observability/src/stackit/observability/models/create_alertrules_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -49,7 +50,8 @@ class CreateAlertrulesPayload(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_backup_schedule_payload.py b/services/observability/src/stackit/observability/models/create_backup_schedule_payload.py index f9722b949..f42b7db75 100644 --- a/services/observability/src/stackit/observability/models/create_backup_schedule_payload.py +++ b/services/observability/src/stackit/observability/models/create_backup_schedule_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateBackupSchedulePayload(BaseModel): __properties: ClassVar[List[str]] = ["schedule"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_cert_check_payload.py b/services/observability/src/stackit/observability/models/create_cert_check_payload.py index d7b9228e5..9c5460b09 100644 --- a/services/observability/src/stackit/observability/models/create_cert_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_cert_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreateCertCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["source"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_credentials_payload.py b/services/observability/src/stackit/observability/models/create_credentials_payload.py index bb85c9fd2..cc0091518 100644 --- a/services/observability/src/stackit/observability/models/create_credentials_payload.py +++ b/services/observability/src/stackit/observability/models/create_credentials_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateCredentialsPayload(BaseModel): __properties: ClassVar[List[str]] = ["description"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_credentials_response.py b/services/observability/src/stackit/observability/models/create_credentials_response.py index f13ac87d9..66a297063 100644 --- a/services/observability/src/stackit/observability/models/create_credentials_response.py +++ b/services/observability/src/stackit/observability/models/create_credentials_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.credentials import Credentials @@ -34,7 +35,8 @@ class CreateCredentialsResponse(BaseModel): __properties: ClassVar[List[str]] = ["credentials", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_elasticsearch_check_payload.py b/services/observability/src/stackit/observability/models/create_elasticsearch_check_payload.py index 4745f5875..11dd51da0 100644 --- a/services/observability/src/stackit/observability/models/create_elasticsearch_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_elasticsearch_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateElasticsearchCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["password", "server", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_http_check_payload.py b/services/observability/src/stackit/observability/models/create_http_check_payload.py index be4441e92..70effea2e 100644 --- a/services/observability/src/stackit/observability/models/create_http_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_http_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreateHttpCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_instance_payload.py b/services/observability/src/stackit/observability/models/create_instance_payload.py index 144926399..922d1a26b 100644 --- a/services/observability/src/stackit/observability/models/create_instance_payload.py +++ b/services/observability/src/stackit/observability/models/create_instance_payload.py @@ -25,6 +25,7 @@ StrictBool, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -46,7 +47,8 @@ class CreateInstancePayload(BaseModel): __properties: ClassVar[List[str]] = ["grafanaAdminEnabled", "name", "parameter", "planId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -57,8 +59,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_instance_response.py b/services/observability/src/stackit/observability/models/create_instance_response.py index 1b42eda40..d535e9132 100644 --- a/services/observability/src/stackit/observability/models/create_instance_response.py +++ b/services/observability/src/stackit/observability/models/create_instance_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateInstanceResponse(BaseModel): __properties: ClassVar[List[str]] = ["dashboardUrl", "instanceId", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload.py b/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload.py index 4a20f1015..94afe33d9 100644 --- a/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload.py +++ b/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_logs_alertgroups_payload_rules_inner import ( @@ -42,7 +43,8 @@ class CreateLogsAlertgroupsPayload(BaseModel): __properties: ClassVar[List[str]] = ["interval", "name", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -53,8 +55,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload_rules_inner.py b/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload_rules_inner.py index 3dd654b85..7ebc24382 100644 --- a/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload_rules_inner.py +++ b/services/observability/src/stackit/observability/models/create_logs_alertgroups_payload_rules_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -54,7 +55,8 @@ class CreateLogsAlertgroupsPayloadRulesInner(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -65,8 +67,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_mongodb_check_payload.py b/services/observability/src/stackit/observability/models/create_mongodb_check_payload.py index a3258aaaf..17e4e280e 100644 --- a/services/observability/src/stackit/observability/models/create_mongodb_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_mongodb_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreateMongodbCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["server"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_mysql_check_payload.py b/services/observability/src/stackit/observability/models/create_mysql_check_payload.py index aacdd4a05..990d7d1bf 100644 --- a/services/observability/src/stackit/observability/models/create_mysql_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_mysql_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreateMysqlCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["server"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_network_check_payload.py b/services/observability/src/stackit/observability/models/create_network_check_payload.py index 749c54da5..7ed8af960 100644 --- a/services/observability/src/stackit/observability/models/create_network_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_network_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreateNetworkCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["address"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_ping_check_payload.py b/services/observability/src/stackit/observability/models/create_ping_check_payload.py index 4d94985a8..ad9c49bf8 100644 --- a/services/observability/src/stackit/observability/models/create_ping_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_ping_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreatePingCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_postgresql_check_payload.py b/services/observability/src/stackit/observability/models/create_postgresql_check_payload.py index 3ba27f306..18e34829d 100644 --- a/services/observability/src/stackit/observability/models/create_postgresql_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_postgresql_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class CreatePostgresqlCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["address"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_rabbitmq_check_payload.py b/services/observability/src/stackit/observability/models/create_rabbitmq_check_payload.py index 8bbbea7c0..efab8c5f0 100644 --- a/services/observability/src/stackit/observability/models/create_rabbitmq_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_rabbitmq_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateRabbitmqCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["password", "url", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_redis_check_payload.py b/services/observability/src/stackit/observability/models/create_redis_check_payload.py index f8530b6ce..e62976a1d 100644 --- a/services/observability/src/stackit/observability/models/create_redis_check_payload.py +++ b/services/observability/src/stackit/observability/models/create_redis_check_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CreateRedisCheckPayload(BaseModel): __properties: ClassVar[List[str]] = ["password", "server", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/create_scrape_config_payload.py b/services/observability/src/stackit/observability/models/create_scrape_config_payload.py index e50871d58..1ee847293 100644 --- a/services/observability/src/stackit/observability/models/create_scrape_config_payload.py +++ b/services/observability/src/stackit/observability/models/create_scrape_config_payload.py @@ -28,6 +28,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.partial_update_scrape_configs_request_inner_basic_auth import ( @@ -140,7 +141,8 @@ def scheme_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -151,8 +153,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/credentials.py b/services/observability/src/stackit/observability/models/credentials.py index 53b479621..c6274fab6 100644 --- a/services/observability/src/stackit/observability/models/credentials.py +++ b/services/observability/src/stackit/observability/models/credentials.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class Credentials(BaseModel): __properties: ClassVar[List[str]] = ["description", "password", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/credentials_remote_write_config.py b/services/observability/src/stackit/observability/models/credentials_remote_write_config.py index ac47031f2..adbaf4afd 100644 --- a/services/observability/src/stackit/observability/models/credentials_remote_write_config.py +++ b/services/observability/src/stackit/observability/models/credentials_remote_write_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class CredentialsRemoteWriteConfig(BaseModel): __properties: ClassVar[List[str]] = ["credentialsMaxLimit", "maxLimit", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/credentials_remote_write_delete_response.py b/services/observability/src/stackit/observability/models/credentials_remote_write_delete_response.py index 5f314dfa6..cf163202f 100644 --- a/services/observability/src/stackit/observability/models/credentials_remote_write_delete_response.py +++ b/services/observability/src/stackit/observability/models/credentials_remote_write_delete_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class CredentialsRemoteWriteDeleteResponse(BaseModel): __properties: ClassVar[List[str]] = ["maxLimit", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/delete_scrape_config_response.py b/services/observability/src/stackit/observability/models/delete_scrape_config_response.py index c6882a669..e0085f605 100644 --- a/services/observability/src/stackit/observability/models/delete_scrape_config_response.py +++ b/services/observability/src/stackit/observability/models/delete_scrape_config_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.job import Job @@ -34,7 +35,8 @@ class DeleteScrapeConfigResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/elasticsearch_check_child_response.py b/services/observability/src/stackit/observability/models/elasticsearch_check_child_response.py index 647c689d7..99c1c37e7 100644 --- a/services/observability/src/stackit/observability/models/elasticsearch_check_child_response.py +++ b/services/observability/src/stackit/observability/models/elasticsearch_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class ElasticsearchCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "password", "server", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/elasticsearch_check_response.py b/services/observability/src/stackit/observability/models/elasticsearch_check_response.py index c293ef053..ab88dc68a 100644 --- a/services/observability/src/stackit/observability/models/elasticsearch_check_response.py +++ b/services/observability/src/stackit/observability/models/elasticsearch_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.elasticsearch_check_child_response import ( @@ -39,7 +40,8 @@ class ElasticsearchCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["elasticsearchCheck", "elasticsearchChecks", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/email_config.py b/services/observability/src/stackit/observability/models/email_config.py index dca92e68d..cf524981f 100644 --- a/services/observability/src/stackit/observability/models/email_config.py +++ b/services/observability/src/stackit/observability/models/email_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -53,7 +54,8 @@ class EmailConfig(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -64,8 +66,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/error.py b/services/observability/src/stackit/observability/models/error.py index 8f04197f4..0a24e2d68 100644 --- a/services/observability/src/stackit/observability/models/error.py +++ b/services/observability/src/stackit/observability/models/error.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class Error(BaseModel): __properties: ClassVar[List[str]] = ["errors", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/get_alert_configs_response.py b/services/observability/src/stackit/observability/models/get_alert_configs_response.py index 8534b2f02..6986156cd 100644 --- a/services/observability/src/stackit/observability/models/get_alert_configs_response.py +++ b/services/observability/src/stackit/observability/models/get_alert_configs_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert import Alert @@ -34,7 +35,8 @@ class GetAlertConfigsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/get_credentials_response.py b/services/observability/src/stackit/observability/models/get_credentials_response.py index a53cb0236..ea6aec7dd 100644 --- a/services/observability/src/stackit/observability/models/get_credentials_response.py +++ b/services/observability/src/stackit/observability/models/get_credentials_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class GetCredentialsResponse(BaseModel): __properties: ClassVar[List[str]] = ["credentialsInfo", "id", "message", "name"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/get_instance_response.py b/services/observability/src/stackit/observability/models/get_instance_response.py index 86c55e671..c9daed351 100644 --- a/services/observability/src/stackit/observability/models/get_instance_response.py +++ b/services/observability/src/stackit/observability/models/get_instance_response.py @@ -26,6 +26,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.instance_sensitive_data import InstanceSensitiveData @@ -87,7 +88,8 @@ def status_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -98,8 +100,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/get_metrics_storage_retention_response.py b/services/observability/src/stackit/observability/models/get_metrics_storage_retention_response.py index 933549f9d..3d1b7b77e 100644 --- a/services/observability/src/stackit/observability/models/get_metrics_storage_retention_response.py +++ b/services/observability/src/stackit/observability/models/get_metrics_storage_retention_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -45,7 +46,8 @@ class GetMetricsStorageRetentionResponse(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -56,8 +58,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/get_scrape_config_response.py b/services/observability/src/stackit/observability/models/get_scrape_config_response.py index a79389e57..26fb1ca04 100644 --- a/services/observability/src/stackit/observability/models/get_scrape_config_response.py +++ b/services/observability/src/stackit/observability/models/get_scrape_config_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.job import Job @@ -34,7 +35,8 @@ class GetScrapeConfigResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/grafana_configs.py b/services/observability/src/stackit/observability/models/grafana_configs.py index 7dce48af3..6d303b918 100644 --- a/services/observability/src/stackit/observability/models/grafana_configs.py +++ b/services/observability/src/stackit/observability/models/grafana_configs.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.grafana_oauth import GrafanaOauth @@ -36,7 +37,8 @@ class GrafanaConfigs(BaseModel): __properties: ClassVar[List[str]] = ["genericOauth", "message", "publicReadAccess", "useStackitSso"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/grafana_oauth.py b/services/observability/src/stackit/observability/models/grafana_oauth.py index b18aea651..b7e59de5e 100644 --- a/services/observability/src/stackit/observability/models/grafana_oauth.py +++ b/services/observability/src/stackit/observability/models/grafana_oauth.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -59,7 +60,8 @@ class GrafanaOauth(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -70,8 +72,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/http_check_child_response.py b/services/observability/src/stackit/observability/models/http_check_child_response.py index 92270922f..dd3def041 100644 --- a/services/observability/src/stackit/observability/models/http_check_child_response.py +++ b/services/observability/src/stackit/observability/models/http_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class HttpCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/http_check_response.py b/services/observability/src/stackit/observability/models/http_check_response.py index b1ea7f426..65c68a050 100644 --- a/services/observability/src/stackit/observability/models/http_check_response.py +++ b/services/observability/src/stackit/observability/models/http_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.http_check_child_response import ( @@ -37,7 +38,8 @@ class HttpCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["httpCheck", "httpChecks", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/http_service_sd.py b/services/observability/src/stackit/observability/models/http_service_sd.py index 6a6d4e276..2a44778a9 100644 --- a/services/observability/src/stackit/observability/models/http_service_sd.py +++ b/services/observability/src/stackit/observability/models/http_service_sd.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.basic_auth import BasicAuth @@ -41,7 +42,8 @@ class HTTPServiceSD(BaseModel): __properties: ClassVar[List[str]] = ["basicAuth", "oauth2", "refreshInterval", "tlsConfig", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -52,8 +54,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/inhibit_rules.py b/services/observability/src/stackit/observability/models/inhibit_rules.py index 3be92229c..c90769f87 100644 --- a/services/observability/src/stackit/observability/models/inhibit_rules.py +++ b/services/observability/src/stackit/observability/models/inhibit_rules.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -59,7 +60,8 @@ class InhibitRules(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -70,8 +72,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/instance.py b/services/observability/src/stackit/observability/models/instance.py index e5f08d909..468c523ab 100644 --- a/services/observability/src/stackit/observability/models/instance.py +++ b/services/observability/src/stackit/observability/models/instance.py @@ -26,6 +26,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.plan_model import PlanModel @@ -88,7 +89,8 @@ def state_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -99,8 +101,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/instance_response.py b/services/observability/src/stackit/observability/models/instance_response.py index f7835c990..d3129850b 100644 --- a/services/observability/src/stackit/observability/models/instance_response.py +++ b/services/observability/src/stackit/observability/models/instance_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class InstanceResponse(BaseModel): __properties: ClassVar[List[str]] = ["message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/instance_sensitive_data.py b/services/observability/src/stackit/observability/models/instance_sensitive_data.py index ffc3163af..f3b2aab7a 100644 --- a/services/observability/src/stackit/observability/models/instance_sensitive_data.py +++ b/services/observability/src/stackit/observability/models/instance_sensitive_data.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.plan_model import PlanModel @@ -95,7 +96,8 @@ class InstanceSensitiveData(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -106,8 +108,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/job.py b/services/observability/src/stackit/observability/models/job.py index 6e3feb455..e0eb6a10d 100644 --- a/services/observability/src/stackit/observability/models/job.py +++ b/services/observability/src/stackit/observability/models/job.py @@ -26,6 +26,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.basic_auth import BasicAuth @@ -95,7 +96,8 @@ def scheme_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -106,8 +108,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/list_acl_response.py b/services/observability/src/stackit/observability/models/list_acl_response.py index c977d3cea..0cb5cab32 100644 --- a/services/observability/src/stackit/observability/models/list_acl_response.py +++ b/services/observability/src/stackit/observability/models/list_acl_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class ListACLResponse(BaseModel): __properties: ClassVar[List[str]] = ["acl", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/list_credentials_response.py b/services/observability/src/stackit/observability/models/list_credentials_response.py index 72e233678..3f4718106 100644 --- a/services/observability/src/stackit/observability/models/list_credentials_response.py +++ b/services/observability/src/stackit/observability/models/list_credentials_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.service_keys_list import ServiceKeysList @@ -34,7 +35,8 @@ class ListCredentialsResponse(BaseModel): __properties: ClassVar[List[str]] = ["credentials", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/list_instances_response.py b/services/observability/src/stackit/observability/models/list_instances_response.py index 14967e853..d40af7e81 100644 --- a/services/observability/src/stackit/observability/models/list_instances_response.py +++ b/services/observability/src/stackit/observability/models/list_instances_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.project_instance_full import ProjectInstanceFull @@ -34,7 +35,8 @@ class ListInstancesResponse(BaseModel): __properties: ClassVar[List[str]] = ["instances", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/list_scrape_configs_response.py b/services/observability/src/stackit/observability/models/list_scrape_configs_response.py index b4255e62b..d3acae880 100644 --- a/services/observability/src/stackit/observability/models/list_scrape_configs_response.py +++ b/services/observability/src/stackit/observability/models/list_scrape_configs_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.job import Job @@ -34,7 +35,8 @@ class ListScrapeConfigsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/logs_config.py b/services/observability/src/stackit/observability/models/logs_config.py index e7db18fb1..043426e68 100644 --- a/services/observability/src/stackit/observability/models/logs_config.py +++ b/services/observability/src/stackit/observability/models/logs_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class LogsConfig(BaseModel): __properties: ClassVar[List[str]] = ["retention"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/logs_config_response.py b/services/observability/src/stackit/observability/models/logs_config_response.py index e16b78647..3267c8c38 100644 --- a/services/observability/src/stackit/observability/models/logs_config_response.py +++ b/services/observability/src/stackit/observability/models/logs_config_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.logs_config import LogsConfig @@ -34,7 +35,8 @@ class LogsConfigResponse(BaseModel): __properties: ClassVar[List[str]] = ["config", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/message.py b/services/observability/src/stackit/observability/models/message.py index 4bdc419d8..2295a5a20 100644 --- a/services/observability/src/stackit/observability/models/message.py +++ b/services/observability/src/stackit/observability/models/message.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class Message(BaseModel): __properties: ClassVar[List[str]] = ["message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/metrics_relabel_config.py b/services/observability/src/stackit/observability/models/metrics_relabel_config.py index 3349fa346..4644dab44 100644 --- a/services/observability/src/stackit/observability/models/metrics_relabel_config.py +++ b/services/observability/src/stackit/observability/models/metrics_relabel_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -61,7 +62,8 @@ def action_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -72,8 +74,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/model_global.py b/services/observability/src/stackit/observability/models/model_global.py index 9ddb3746f..b59079005 100644 --- a/services/observability/src/stackit/observability/models/model_global.py +++ b/services/observability/src/stackit/observability/models/model_global.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -63,7 +64,8 @@ class ModelGlobal(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -74,8 +76,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/mongodb_check_child_response.py b/services/observability/src/stackit/observability/models/mongodb_check_child_response.py index a209cf2e6..b64eff427 100644 --- a/services/observability/src/stackit/observability/models/mongodb_check_child_response.py +++ b/services/observability/src/stackit/observability/models/mongodb_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class MongodbCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "server"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/mongodb_check_response.py b/services/observability/src/stackit/observability/models/mongodb_check_response.py index 754bc1071..95fb4bf01 100644 --- a/services/observability/src/stackit/observability/models/mongodb_check_response.py +++ b/services/observability/src/stackit/observability/models/mongodb_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.mongodb_check_child_response import ( @@ -37,7 +38,8 @@ class MongodbCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "mongodbCheck", "mongodbChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/mysql_check_child_response.py b/services/observability/src/stackit/observability/models/mysql_check_child_response.py index 99e3a5bb2..b6b433944 100644 --- a/services/observability/src/stackit/observability/models/mysql_check_child_response.py +++ b/services/observability/src/stackit/observability/models/mysql_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class MysqlCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "server"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/mysql_check_response.py b/services/observability/src/stackit/observability/models/mysql_check_response.py index 8eacdebcb..7b70beafa 100644 --- a/services/observability/src/stackit/observability/models/mysql_check_response.py +++ b/services/observability/src/stackit/observability/models/mysql_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.mysql_check_child_response import ( @@ -37,7 +38,8 @@ class MysqlCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "mysqlCheck", "mysqlChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/network_check_child_response.py b/services/observability/src/stackit/observability/models/network_check_child_response.py index f0eed108f..65acf0829 100644 --- a/services/observability/src/stackit/observability/models/network_check_child_response.py +++ b/services/observability/src/stackit/observability/models/network_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class NetworkCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["address", "id"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/network_check_response.py b/services/observability/src/stackit/observability/models/network_check_response.py index b08d468c1..d36966780 100644 --- a/services/observability/src/stackit/observability/models/network_check_response.py +++ b/services/observability/src/stackit/observability/models/network_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.network_check_child_response import ( @@ -37,7 +38,8 @@ class NetworkCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "networkCheck", "networkChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/o_auth2.py b/services/observability/src/stackit/observability/models/o_auth2.py index 4adec4cb5..42d473373 100644 --- a/services/observability/src/stackit/observability/models/o_auth2.py +++ b/services/observability/src/stackit/observability/models/o_auth2.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.tls_config import TLSConfig @@ -39,7 +40,8 @@ class OAuth2(BaseModel): __properties: ClassVar[List[str]] = ["clientId", "clientSecret", "scopes", "tlsConfig", "tokenUrl"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/offerings.py b/services/observability/src/stackit/observability/models/offerings.py index f466c70e0..edcd472eb 100644 --- a/services/observability/src/stackit/observability/models/offerings.py +++ b/services/observability/src/stackit/observability/models/offerings.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.plan import Plan @@ -40,7 +41,8 @@ class Offerings(BaseModel): __properties: ClassVar[List[str]] = ["description", "documentationUrl", "imageUrl", "name", "plans", "tags"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -51,8 +53,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/opsgenie_config.py b/services/observability/src/stackit/observability/models/opsgenie_config.py index 0fcc786f0..346ec59db 100644 --- a/services/observability/src/stackit/observability/models/opsgenie_config.py +++ b/services/observability/src/stackit/observability/models/opsgenie_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -39,7 +40,8 @@ class OpsgenieConfig(BaseModel): __properties: ClassVar[List[str]] = ["apiKey", "apiUrl", "priority", "sendResolved", "tags"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_alert_records_request_inner.py b/services/observability/src/stackit/observability/models/partial_update_alert_records_request_inner.py index 06db88c8f..00383937d 100644 --- a/services/observability/src/stackit/observability/models/partial_update_alert_records_request_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_alert_records_request_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -40,7 +41,8 @@ class PartialUpdateAlertRecordsRequestInner(BaseModel): __properties: ClassVar[List[str]] = ["expr", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -51,8 +53,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_alertrules_request_inner.py b/services/observability/src/stackit/observability/models/partial_update_alertrules_request_inner.py index 4c7f24890..b9fc0b518 100644 --- a/services/observability/src/stackit/observability/models/partial_update_alertrules_request_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_alertrules_request_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -49,7 +50,8 @@ class PartialUpdateAlertrulesRequestInner(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner.py index 3b66d6857..a509326b8 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner.py @@ -28,6 +28,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.partial_update_scrape_configs_request_inner_basic_auth import ( @@ -140,7 +141,8 @@ def scheme_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -151,8 +153,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_basic_auth.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_basic_auth.py index 0429be2fb..949d78997 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_basic_auth.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_basic_auth.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -36,7 +37,8 @@ class PartialUpdateScrapeConfigsRequestInnerBasicAuth(BaseModel): __properties: ClassVar[List[str]] = ["password", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -47,8 +49,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner.py index 5c918b608..dba9219c6 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.partial_update_scrape_configs_request_inner_basic_auth import ( @@ -53,7 +54,8 @@ class PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInner(BaseModel): __properties: ClassVar[List[str]] = ["basicAuth", "oauth2", "refreshInterval", "tlsConfig", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -64,8 +66,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2.py index e4897e699..f6fd8714b 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2_tls_config import ( @@ -49,7 +50,8 @@ class PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2(BaseModel): __properties: ClassVar[List[str]] = ["clientId", "clientSecret", "scopes", "tlsConfig", "tokenUrl"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -60,8 +62,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2_tls_config.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2_tls_config.py index 1fc2e9d9a..bc7088013 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2_tls_config.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_http_sd_configs_inner_oauth2_tls_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -33,7 +34,8 @@ class PartialUpdateScrapeConfigsRequestInnerHttpSdConfigsInnerOauth2TlsConfig(Ba __properties: ClassVar[List[str]] = ["insecureSkipVerify"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_metrics_relabel_configs_inner.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_metrics_relabel_configs_inner.py index b2b90fdbb..a9ea6d588 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_metrics_relabel_configs_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_metrics_relabel_configs_inner.py @@ -27,6 +27,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -85,7 +86,8 @@ def action_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -96,8 +98,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_static_configs_inner.py b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_static_configs_inner.py index b05b8000c..980e93460 100644 --- a/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_static_configs_inner.py +++ b/services/observability/src/stackit/observability/models/partial_update_scrape_configs_request_inner_static_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -37,7 +38,8 @@ class PartialUpdateScrapeConfigsRequestInnerStaticConfigsInner(BaseModel): __properties: ClassVar[List[str]] = ["labels", "targets"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/permission_denied.py b/services/observability/src/stackit/observability/models/permission_denied.py index 71dc55d64..bfb7c6045 100644 --- a/services/observability/src/stackit/observability/models/permission_denied.py +++ b/services/observability/src/stackit/observability/models/permission_denied.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class PermissionDenied(BaseModel): __properties: ClassVar[List[str]] = ["detail"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/ping_check_child_response.py b/services/observability/src/stackit/observability/models/ping_check_child_response.py index c72136783..ae0f8c2c3 100644 --- a/services/observability/src/stackit/observability/models/ping_check_child_response.py +++ b/services/observability/src/stackit/observability/models/ping_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class PingCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/ping_check_response.py b/services/observability/src/stackit/observability/models/ping_check_response.py index a0ff5c214..07034fe7f 100644 --- a/services/observability/src/stackit/observability/models/ping_check_response.py +++ b/services/observability/src/stackit/observability/models/ping_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.ping_check_child_response import ( @@ -37,7 +38,8 @@ class PingCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "pingCheck", "pingChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/plan.py b/services/observability/src/stackit/observability/models/plan.py index 31103f741..83e343e20 100644 --- a/services/observability/src/stackit/observability/models/plan.py +++ b/services/observability/src/stackit/observability/models/plan.py @@ -26,6 +26,7 @@ StrictBool, StrictInt, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -87,7 +88,8 @@ class Plan(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -98,8 +100,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/plan_model.py b/services/observability/src/stackit/observability/models/plan_model.py index 4dc63f6af..c633864f0 100644 --- a/services/observability/src/stackit/observability/models/plan_model.py +++ b/services/observability/src/stackit/observability/models/plan_model.py @@ -20,6 +20,7 @@ from uuid import UUID from pydantic import BaseModel, ConfigDict, Field, StrictInt +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -75,7 +76,8 @@ class PlanModel(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -86,8 +88,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/plans_response.py b/services/observability/src/stackit/observability/models/plans_response.py index d798cae89..8334d3ce9 100644 --- a/services/observability/src/stackit/observability/models/plans_response.py +++ b/services/observability/src/stackit/observability/models/plans_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.plan import Plan @@ -34,7 +35,8 @@ class PlansResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "plans"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/postgresql_check_child_response.py b/services/observability/src/stackit/observability/models/postgresql_check_child_response.py index 43425d33c..f664d897d 100644 --- a/services/observability/src/stackit/observability/models/postgresql_check_child_response.py +++ b/services/observability/src/stackit/observability/models/postgresql_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class PostgresqlCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["address", "id"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/postgresql_check_response.py b/services/observability/src/stackit/observability/models/postgresql_check_response.py index e37f1a140..dccdb0a34 100644 --- a/services/observability/src/stackit/observability/models/postgresql_check_response.py +++ b/services/observability/src/stackit/observability/models/postgresql_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.postgresql_check_child_response import ( @@ -39,7 +40,8 @@ class PostgresqlCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "postgresqlCheck", "postgresqlChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/project_instance_full.py b/services/observability/src/stackit/observability/models/project_instance_full.py index 28ec205ff..9010f95ab 100644 --- a/services/observability/src/stackit/observability/models/project_instance_full.py +++ b/services/observability/src/stackit/observability/models/project_instance_full.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -58,7 +59,8 @@ def status_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -69,8 +71,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/rabbit_mq_check_child_response.py b/services/observability/src/stackit/observability/models/rabbit_mq_check_child_response.py index d6f75956a..98249382a 100644 --- a/services/observability/src/stackit/observability/models/rabbit_mq_check_child_response.py +++ b/services/observability/src/stackit/observability/models/rabbit_mq_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class RabbitMQCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "password", "url", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/rabbitmq_check_response.py b/services/observability/src/stackit/observability/models/rabbitmq_check_response.py index de0468f4c..1b9fe7b70 100644 --- a/services/observability/src/stackit/observability/models/rabbitmq_check_response.py +++ b/services/observability/src/stackit/observability/models/rabbitmq_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.rabbit_mq_check_child_response import ( @@ -37,7 +38,8 @@ class RabbitmqCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "rabbitmqCheck", "rabbitmqChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/receiver.py b/services/observability/src/stackit/observability/models/receiver.py index 28ed13c28..bcd01d769 100644 --- a/services/observability/src/stackit/observability/models/receiver.py +++ b/services/observability/src/stackit/observability/models/receiver.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.receivers import Receivers @@ -34,7 +35,8 @@ class Receiver(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/receivers.py b/services/observability/src/stackit/observability/models/receivers.py index e02c48d80..1e5902919 100644 --- a/services/observability/src/stackit/observability/models/receivers.py +++ b/services/observability/src/stackit/observability/models/receivers.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.email_config import EmailConfig @@ -38,7 +39,8 @@ class Receivers(BaseModel): __properties: ClassVar[List[str]] = ["emailConfigs", "name", "opsgenieConfigs", "webHookConfigs"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -49,8 +51,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/redis_check_child_response.py b/services/observability/src/stackit/observability/models/redis_check_child_response.py index 18e1b71fc..e477e948a 100644 --- a/services/observability/src/stackit/observability/models/redis_check_child_response.py +++ b/services/observability/src/stackit/observability/models/redis_check_child_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class RedisCheckChildResponse(BaseModel): __properties: ClassVar[List[str]] = ["id", "password", "server", "username"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/redis_check_response.py b/services/observability/src/stackit/observability/models/redis_check_response.py index 2f9f7d9d5..77afe9a19 100644 --- a/services/observability/src/stackit/observability/models/redis_check_response.py +++ b/services/observability/src/stackit/observability/models/redis_check_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.redis_check_child_response import ( @@ -37,7 +38,8 @@ class RedisCheckResponse(BaseModel): __properties: ClassVar[List[str]] = ["message", "redisCheck", "redisChecks"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/route.py b/services/observability/src/stackit/observability/models/route.py index ef0c191ea..b92bf8005 100644 --- a/services/observability/src/stackit/observability/models/route.py +++ b/services/observability/src/stackit/observability/models/route.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.route_serializer import RouteSerializer @@ -65,7 +66,8 @@ class Route(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -76,8 +78,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/route_serializer.py b/services/observability/src/stackit/observability/models/route_serializer.py index 6321be9d9..6eb9211c0 100644 --- a/services/observability/src/stackit/observability/models/route_serializer.py +++ b/services/observability/src/stackit/observability/models/route_serializer.py @@ -25,6 +25,7 @@ StrictBool, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -69,7 +70,8 @@ class RouteSerializer(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -80,8 +82,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/scrape_configs_response.py b/services/observability/src/stackit/observability/models/scrape_configs_response.py index 23427cd28..3fd2d9c48 100644 --- a/services/observability/src/stackit/observability/models/scrape_configs_response.py +++ b/services/observability/src/stackit/observability/models/scrape_configs_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.job import Job @@ -34,7 +35,8 @@ class ScrapeConfigsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/service_keys_list.py b/services/observability/src/stackit/observability/models/service_keys_list.py index dc118a509..cb39f9de9 100644 --- a/services/observability/src/stackit/observability/models/service_keys_list.py +++ b/services/observability/src/stackit/observability/models/service_keys_list.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictStr +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class ServiceKeysList(BaseModel): __properties: ClassVar[List[str]] = ["credentialsInfo", "description", "id", "name"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/static_configs.py b/services/observability/src/stackit/observability/models/static_configs.py index 1e7fe41db..71b3d792a 100644 --- a/services/observability/src/stackit/observability/models/static_configs.py +++ b/services/observability/src/stackit/observability/models/static_configs.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -32,7 +33,8 @@ class StaticConfigs(BaseModel): __properties: ClassVar[List[str]] = ["labels", "targets"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -43,8 +45,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/tls_config.py b/services/observability/src/stackit/observability/models/tls_config.py index f65a9a07e..d85a2538c 100644 --- a/services/observability/src/stackit/observability/models/tls_config.py +++ b/services/observability/src/stackit/observability/models/tls_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -31,7 +32,8 @@ class TLSConfig(BaseModel): __properties: ClassVar[List[str]] = ["insecureSkipVerify"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/trace_config.py b/services/observability/src/stackit/observability/models/trace_config.py index 4ba97f8a4..4005511bb 100644 --- a/services/observability/src/stackit/observability/models/trace_config.py +++ b/services/observability/src/stackit/observability/models/trace_config.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class TraceConfig(BaseModel): __properties: ClassVar[List[str]] = ["retention"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/traces_config_response.py b/services/observability/src/stackit/observability/models/traces_config_response.py index 2d2dd2aec..535e0fee1 100644 --- a/services/observability/src/stackit/observability/models/traces_config_response.py +++ b/services/observability/src/stackit/observability/models/traces_config_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.trace_config import TraceConfig @@ -34,7 +35,8 @@ class TracesConfigResponse(BaseModel): __properties: ClassVar[List[str]] = ["config", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_acl_payload.py b/services/observability/src/stackit/observability/models/update_acl_payload.py index aacccfc1f..3c3522e60 100644 --- a/services/observability/src/stackit/observability/models/update_acl_payload.py +++ b/services/observability/src/stackit/observability/models/update_acl_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -31,7 +32,8 @@ class UpdateACLPayload(BaseModel): __properties: ClassVar[List[str]] = ["acl"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -42,8 +44,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_config_receiver_payload.py b/services/observability/src/stackit/observability/models/update_alert_config_receiver_payload.py index ebfac06b7..6ce978c57 100644 --- a/services/observability/src/stackit/observability/models/update_alert_config_receiver_payload.py +++ b/services/observability/src/stackit/observability/models/update_alert_config_receiver_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_alert_config_receiver_payload_email_configs_inner import ( @@ -52,7 +53,8 @@ class UpdateAlertConfigReceiverPayload(BaseModel): __properties: ClassVar[List[str]] = ["emailConfigs", "name", "opsgenieConfigs", "webHookConfigs"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -63,8 +65,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_config_route_payload.py b/services/observability/src/stackit/observability/models/update_alert_config_route_payload.py index 3fe0a4434..d3f64713a 100644 --- a/services/observability/src/stackit/observability/models/update_alert_config_route_payload.py +++ b/services/observability/src/stackit/observability/models/update_alert_config_route_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_alert_config_route_payload_routes_inner import ( @@ -89,7 +90,8 @@ class UpdateAlertConfigRoutePayload(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -100,8 +102,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload.py index 5ff92707f..4a729b8b4 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.observability.models.update_alert_configs_payload_global import ( @@ -47,7 +48,8 @@ class UpdateAlertConfigsPayload(BaseModel): __properties: ClassVar[List[str]] = ["global", "inhibitRules", "receivers", "route"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -58,8 +60,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload_global.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload_global.py index 4f8cbefdc..fcc40a595 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload_global.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload_global.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -77,7 +78,8 @@ class UpdateAlertConfigsPayloadGlobal(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -88,8 +90,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload_inhibit_rules.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload_inhibit_rules.py index f8e22046f..e019e1dd0 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload_inhibit_rules.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload_inhibit_rules.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -54,7 +55,8 @@ class UpdateAlertConfigsPayloadInhibitRules(BaseModel): __properties: ClassVar[List[str]] = ["equal", "sourceMatch", "sourceMatchRe", "targetMatch", "targetMatchRe"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -65,8 +67,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload_receivers_inner.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload_receivers_inner.py index 48fbcb81e..f2456b98b 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload_receivers_inner.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload_receivers_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_alert_config_receiver_payload_email_configs_inner import ( @@ -52,7 +53,8 @@ class UpdateAlertConfigsPayloadReceiversInner(BaseModel): __properties: ClassVar[List[str]] = ["emailConfigs", "name", "opsgenieConfigs", "webHookConfigs"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -63,8 +65,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload_route.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload_route.py index a22b8dfab..21a2d2901 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload_route.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload_route.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.update_alert_configs_payload_route_routes_inner import ( @@ -84,7 +85,8 @@ class UpdateAlertConfigsPayloadRoute(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -95,8 +97,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_payload_route_routes_inner.py b/services/observability/src/stackit/observability/models/update_alert_configs_payload_route_routes_inner.py index ec6034c8f..9d458a484 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_payload_route_routes_inner.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_payload_route_routes_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -68,7 +69,8 @@ class UpdateAlertConfigsPayloadRouteRoutesInner(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -79,8 +81,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_configs_response.py b/services/observability/src/stackit/observability/models/update_alert_configs_response.py index 9d955fca0..239e897e2 100644 --- a/services/observability/src/stackit/observability/models/update_alert_configs_response.py +++ b/services/observability/src/stackit/observability/models/update_alert_configs_response.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.alert import Alert @@ -34,7 +35,8 @@ class UpdateAlertConfigsResponse(BaseModel): __properties: ClassVar[List[str]] = ["data", "message"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alert_record_payload.py b/services/observability/src/stackit/observability/models/update_alert_record_payload.py index f76e1d756..6a80d4dc8 100644 --- a/services/observability/src/stackit/observability/models/update_alert_record_payload.py +++ b/services/observability/src/stackit/observability/models/update_alert_record_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -37,7 +38,8 @@ class UpdateAlertRecordPayload(BaseModel): __properties: ClassVar[List[str]] = ["expr", "labels"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alertgroup_payload.py b/services/observability/src/stackit/observability/models/update_alertgroup_payload.py index 0577b8dd9..531c64fc0 100644 --- a/services/observability/src/stackit/observability/models/update_alertgroup_payload.py +++ b/services/observability/src/stackit/observability/models/update_alertgroup_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.update_alertgroups_request_inner_rules_inner import ( @@ -39,7 +40,8 @@ class UpdateAlertgroupPayload(BaseModel): __properties: ClassVar[List[str]] = ["interval", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alertgroups_request_inner.py b/services/observability/src/stackit/observability/models/update_alertgroups_request_inner.py index d29bc9f8f..5ef1c8bfd 100644 --- a/services/observability/src/stackit/observability/models/update_alertgroups_request_inner.py +++ b/services/observability/src/stackit/observability/models/update_alertgroups_request_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.update_alertgroups_request_inner_rules_inner import ( @@ -42,7 +43,8 @@ class UpdateAlertgroupsRequestInner(BaseModel): __properties: ClassVar[List[str]] = ["interval", "name", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -53,8 +55,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alertgroups_request_inner_rules_inner.py b/services/observability/src/stackit/observability/models/update_alertgroups_request_inner_rules_inner.py index 208118183..0a6556cfe 100644 --- a/services/observability/src/stackit/observability/models/update_alertgroups_request_inner_rules_inner.py +++ b/services/observability/src/stackit/observability/models/update_alertgroups_request_inner_rules_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -54,7 +55,8 @@ class UpdateAlertgroupsRequestInnerRulesInner(BaseModel): __properties: ClassVar[List[str]] = ["alert", "annotations", "expr", "for", "labels", "record"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -65,8 +67,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_alertrule_payload.py b/services/observability/src/stackit/observability/models/update_alertrule_payload.py index 7aedf57a3..64190170b 100644 --- a/services/observability/src/stackit/observability/models/update_alertrule_payload.py +++ b/services/observability/src/stackit/observability/models/update_alertrule_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -46,7 +47,8 @@ class UpdateAlertrulePayload(BaseModel): __properties: ClassVar[List[str]] = ["annotations", "expr", "for", "labels"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -57,8 +59,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_credentials_remote_write_config_payload.py b/services/observability/src/stackit/observability/models/update_credentials_remote_write_config_payload.py index e82332e42..81cbea9f3 100644 --- a/services/observability/src/stackit/observability/models/update_credentials_remote_write_config_payload.py +++ b/services/observability/src/stackit/observability/models/update_credentials_remote_write_config_payload.py @@ -25,6 +25,7 @@ StrictFloat, StrictInt, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -41,7 +42,8 @@ class UpdateCredentialsRemoteWriteConfigPayload(BaseModel): __properties: ClassVar[List[str]] = ["maxLimit"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -52,8 +54,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_grafana_configs_payload.py b/services/observability/src/stackit/observability/models/update_grafana_configs_payload.py index 2ee8eed29..9a823ef35 100644 --- a/services/observability/src/stackit/observability/models/update_grafana_configs_payload.py +++ b/services/observability/src/stackit/observability/models/update_grafana_configs_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Self from stackit.observability.models.update_grafana_configs_payload_generic_oauth import ( @@ -45,7 +46,8 @@ class UpdateGrafanaConfigsPayload(BaseModel): __properties: ClassVar[List[str]] = ["genericOauth", "publicReadAccess", "useStackitSso"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -56,8 +58,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_grafana_configs_payload_generic_oauth.py b/services/observability/src/stackit/observability/models/update_grafana_configs_payload_generic_oauth.py index 0548c0a05..87b94867d 100644 --- a/services/observability/src/stackit/observability/models/update_grafana_configs_payload_generic_oauth.py +++ b/services/observability/src/stackit/observability/models/update_grafana_configs_payload_generic_oauth.py @@ -25,6 +25,7 @@ StrictBool, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Self @@ -80,7 +81,8 @@ class UpdateGrafanaConfigsPayloadGenericOauth(BaseModel): ] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -91,8 +93,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_instance_payload.py b/services/observability/src/stackit/observability/models/update_instance_payload.py index 4869564d8..1579895a9 100644 --- a/services/observability/src/stackit/observability/models/update_instance_payload.py +++ b/services/observability/src/stackit/observability/models/update_instance_payload.py @@ -25,6 +25,7 @@ StrictBool, StrictStr, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -46,7 +47,8 @@ class UpdateInstancePayload(BaseModel): __properties: ClassVar[List[str]] = ["grafanaAdminEnabled", "name", "parameter", "planId"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -57,8 +59,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_logs_alertgroup_payload.py b/services/observability/src/stackit/observability/models/update_logs_alertgroup_payload.py index bd9d292f8..5547d1ef3 100644 --- a/services/observability/src/stackit/observability/models/update_logs_alertgroup_payload.py +++ b/services/observability/src/stackit/observability/models/update_logs_alertgroup_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.create_logs_alertgroups_payload_rules_inner import ( @@ -39,7 +40,8 @@ class UpdateLogsAlertgroupPayload(BaseModel): __properties: ClassVar[List[str]] = ["interval", "rules"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -50,8 +52,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_logs_configs_payload.py b/services/observability/src/stackit/observability/models/update_logs_configs_payload.py index 0f0c428a4..0b9c200b5 100644 --- a/services/observability/src/stackit/observability/models/update_logs_configs_payload.py +++ b/services/observability/src/stackit/observability/models/update_logs_configs_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class UpdateLogsConfigsPayload(BaseModel): __properties: ClassVar[List[str]] = ["retention"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_metrics_storage_retention_payload.py b/services/observability/src/stackit/observability/models/update_metrics_storage_retention_payload.py index e9d130e66..089685955 100644 --- a/services/observability/src/stackit/observability/models/update_metrics_storage_retention_payload.py +++ b/services/observability/src/stackit/observability/models/update_metrics_storage_retention_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -42,7 +43,8 @@ class UpdateMetricsStorageRetentionPayload(BaseModel): __properties: ClassVar[List[str]] = ["metricsRetentionTime1h", "metricsRetentionTime5m", "metricsRetentionTimeRaw"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -53,8 +55,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_scrape_config_payload.py b/services/observability/src/stackit/observability/models/update_scrape_config_payload.py index 25662e9f7..504676a9e 100644 --- a/services/observability/src/stackit/observability/models/update_scrape_config_payload.py +++ b/services/observability/src/stackit/observability/models/update_scrape_config_payload.py @@ -28,6 +28,7 @@ StrictStr, field_validator, ) +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self from stackit.observability.models.partial_update_scrape_configs_request_inner_basic_auth import ( @@ -119,7 +120,8 @@ def scheme_validate_enum(cls, value): return value model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -130,8 +132,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_scrape_config_payload_static_configs_inner.py b/services/observability/src/stackit/observability/models/update_scrape_config_payload_static_configs_inner.py index c33363a98..9d1cd8154 100644 --- a/services/observability/src/stackit/observability/models/update_scrape_config_payload_static_configs_inner.py +++ b/services/observability/src/stackit/observability/models/update_scrape_config_payload_static_configs_inner.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -37,7 +38,8 @@ class UpdateScrapeConfigPayloadStaticConfigsInner(BaseModel): __properties: ClassVar[List[str]] = ["labels", "targets"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -48,8 +50,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/update_traces_configs_payload.py b/services/observability/src/stackit/observability/models/update_traces_configs_payload.py index 3a630fa61..61a126401 100644 --- a/services/observability/src/stackit/observability/models/update_traces_configs_payload.py +++ b/services/observability/src/stackit/observability/models/update_traces_configs_payload.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -33,7 +34,8 @@ class UpdateTracesConfigsPayload(BaseModel): __properties: ClassVar[List[str]] = ["retention"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -44,8 +46,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: diff --git a/services/observability/src/stackit/observability/models/web_hook.py b/services/observability/src/stackit/observability/models/web_hook.py index d9958d881..f52ace50e 100644 --- a/services/observability/src/stackit/observability/models/web_hook.py +++ b/services/observability/src/stackit/observability/models/web_hook.py @@ -19,6 +19,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set from pydantic import BaseModel, ConfigDict, Field, StrictBool +from pydantic_core import to_jsonable_python from typing_extensions import Annotated, Self @@ -34,7 +35,8 @@ class WebHook(BaseModel): __properties: ClassVar[List[str]] = ["googleChat", "msTeams", "sendResolved", "url"] model_config = ConfigDict( - populate_by_name=True, + validate_by_name=True, + validate_by_alias=True, validate_assignment=True, protected_namespaces=(), ) @@ -45,8 +47,7 @@ def to_str(self) -> str: 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()) + return json.dumps(to_jsonable_python(self.to_dict())) @classmethod def from_json(cls, json_str: str) -> Optional[Self]: