stackit-intake 0.5.1__tar.gz → 0.7.0__tar.gz

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: stackit-intake
-Version: 0.5.1
+Version: 0.7.0
 Summary: STACKIT Intake API
 Project-URL: Homepage, https://github.com/stackitcloud/stackit-sdk-python
 Project-URL: Issues, https://github.com/stackitcloud/stackit-sdk-python/issues
@@ -10,16 +10,15 @@ License-File: NOTICE.txt
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
-Requires-Python: <4,>=3.9
+Requires-Python: <4.0,>=3.10
 Requires-Dist: pydantic>=2.9.2
 Requires-Dist: python-dateutil>=2.9.0.post0
-Requires-Dist: requests>=2.32.3
+Requires-Dist: requests>=2.33.0
 Requires-Dist: stackit-core>=0.0.1a
 Description-Content-Type: text/markdown
 

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/pyproject.toml

@@ -1,15 +1,14 @@
 [project]
 name = "stackit-intake"
-version = "v0.5.1"
+version = "v0.7.0"
 description = "STACKIT Intake API"
 authors = [{ name = "STACKIT Developer Tools", email = "developer-tools@stackit.cloud" }]
-requires-python = ">=3.9,<4"
+requires-python = ">=3.10,<4.0"
 readme = "README.md"
 classifiers = [
     "Programming Language :: Python :: 3",
     "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
@@ -18,7 +17,7 @@ classifiers = [
 ]
 dependencies = [
     "stackit-core>=0.0.1a",
-    "requests>=2.32.3",
+    "requests>=2.33.0",
     "pydantic>=2.9.2",
     "python-dateutil>=2.9.0.post0",
 ]
@@ -29,8 +28,8 @@ Issues = "https://github.com/stackitcloud/stackit-sdk-python/issues"
 
 [dependency-groups]
 dev = [
-    "black>=24.8.0",
-    "pytest>=8.3.3",
+    "black>=26.3.1",
+    "pytest>=9.1.1",
     "flake8>=5.0.3 ; python_full_version < '3.12'",
     "flake8>=6.0.1 ; python_full_version >= '3.12'",
     "flake8-black>=0.3.6",
@@ -102,7 +101,8 @@ show-source = false
 max-line-length = 120
 # E203,W503 and E704 are incompatible with the formatter black
 # W291 needs to be disabled because some doc-strings get generated with trailing whitespace but black won't re-format comments
-ignore = ["E203", "W503", "E704", "W291"]
+# fixing B042 in upstream exceptions.mustache would be a breaking change
+ignore = ["E203", "W503", "E704", "W291", "B042"]
 inline-quotes = '"'
 docstring-quotes = '"""'
 multiline-quotes = '"""'

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/__init__.py

@@ -3,17 +3,16 @@
 # flake8: noqa
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
-
 __version__ = "1.0.0"
 
 # Define package exports

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/api/default_api.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from typing import Any, Dict, List, Optional, Tuple, Union

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/api_client.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 import datetime
@@ -36,7 +36,6 @@ from stackit.intake.exceptions import (
     ApiException,
 )
 
-
 RequestSerialized = Tuple[str, str, Dict[str, str], Optional[str], List[str]]
 
 
@@ -66,6 +65,7 @@ class ApiClient:
         "date": datetime.date,
         "datetime": datetime.datetime,
         "decimal": decimal.Decimal,
+        "UUID": uuid.UUID,
         "object": object,
     }
     _pool = None
@@ -265,7 +265,7 @@ class ApiClient:
         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)
@@ -326,25 +326,20 @@ class ApiClient:
             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")):  # noqa: B009
+            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.
@@ -417,6 +412,8 @@ class ApiClient:
             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:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/api_response.py

@@ -6,7 +6,6 @@ from typing import Generic, Mapping, Optional, TypeVar
 
 from pydantic import BaseModel, Field, StrictBytes, StrictInt
 
-
 T = TypeVar("T")
 
 

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/configuration.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 import sys
@@ -18,7 +18,6 @@ from typing_extensions import NotRequired
 
 import os
 
-
 ServerVariablesT = Dict[str, str]
 
 

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/exceptions.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from typing import Any, Optional

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/__init__.py

@@ -2,14 +2,14 @@
 
 # flake8: noqa
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 # import models into model package

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/catalog_auth.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -18,6 +18,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.intake.models.catalog_auth_type import CatalogAuthType
@@ -34,7 +35,8 @@ class CatalogAuth(BaseModel):
     __properties: ClassVar[List[str]] = ["dremio", "type"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ class CatalogAuth(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/catalog_auth_patch.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -18,6 +18,7 @@ import pprint
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict
+from pydantic_core import to_jsonable_python
 from typing_extensions import Self
 
 from stackit.intake.models.catalog_auth_type import CatalogAuthType
@@ -34,7 +35,8 @@ class CatalogAuthPatch(BaseModel):
     __properties: ClassVar[List[str]] = ["dremio", "type"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -45,8 +47,7 @@ class CatalogAuthPatch(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/catalog_auth_type.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/client_config.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -18,6 +18,7 @@ import pprint
 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 Self
 
 
@@ -31,7 +32,8 @@ class ClientConfig(BaseModel):
     __properties: ClassVar[List[str]] = ["java", "librdkafka"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -42,8 +44,7 @@ class ClientConfig(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/create_intake_payload.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -20,6 +20,7 @@ from typing import Any, ClassVar, Dict, List, Optional, Set
 from uuid import UUID
 
 from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 from stackit.intake.models.intake_catalog import IntakeCatalog
@@ -49,12 +50,16 @@ class CreateIntakePayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[\p{L}\p{N} -]{1,32}$", value):
             raise ValueError(r"must validate the regular expression /^[\p{L}\p{N} -]{1,32}$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -65,8 +70,7 @@ class CreateIntakePayload(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/create_intake_runner_payload.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -19,6 +19,7 @@ import re  # noqa: F401
 from typing import Any, ClassVar, Dict, List, Optional, Set
 
 from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, field_validator
+from pydantic_core import to_jsonable_python
 from typing_extensions import Annotated, Self
 
 
@@ -54,12 +55,16 @@ class CreateIntakeRunnerPayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[\p{L}\p{N} -]{1,32}$", value):
             raise ValueError(r"must validate the regular expression /^[\p{L}\p{N} -]{1,32}$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -70,8 +75,7 @@ class CreateIntakeRunnerPayload(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/create_intake_user_payload.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -19,6 +19,7 @@ import re  # noqa: F401
 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
 
 from stackit.intake.models.user_type import UserType
@@ -48,12 +49,16 @@ class CreateIntakeUserPayload(BaseModel):
     @field_validator("display_name")
     def display_name_validate_regular_expression(cls, value):
         """Validates the regular expression"""
+        if not isinstance(value, str):
+            value = str(value)
+
         if not re.match(r"^[\p{L}\p{N} -]{1,32}$", value):
             raise ValueError(r"must validate the regular expression /^[\p{L}\p{N} -]{1,32}$/")
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -64,8 +69,7 @@ class CreateIntakeUserPayload(BaseModel):
 
     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]:

{stackit_intake-0.5.1 → stackit_intake-0.7.0}/src/stackit/intake/models/dremio_auth.py

@@ -1,14 +1,14 @@
 # coding: utf-8
 
 """
-    STACKIT Intake API
+STACKIT Intake API
 
-    This API provides endpoints for managing Intakes. 
+This API provides endpoints for managing Intakes.
 
-    The version of the OpenAPI document: 1beta.3.6
-    Generated by OpenAPI Generator (https://openapi-generator.tech)
+The version of the OpenAPI document: 1beta.3.7
+Generated by OpenAPI Generator (https://openapi-generator.tech)
 
-    Do not edit the class manually.
+Do not edit the class manually.
 """  # noqa: E501
 
 from __future__ import annotations
@@ -18,6 +18,7 @@ import pprint
 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 DremioAuth(BaseModel):
     __properties: ClassVar[List[str]] = ["personalAccessToken", "tokenEndpoint"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -46,8 +48,7 @@ class DremioAuth(BaseModel):
 
     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]: