twitter-openapi-python-generated 0.0.33__py3-none-any.whl → 0.0.34__py3-none-any.whl

twitter_openapi_python_generated/models/delete_bookmark_response.py

@@ -24,6 +24,7 @@ from twitter_openapi_python_generated.models.delete_bookmark_response_data impor
 from twitter_openapi_python_generated.models.error_response import ErrorResponse
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteBookmarkResponse(BaseModel):
     """
@@ -34,7 +35,8 @@ class DeleteBookmarkResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["data", "errors"]
 
     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 DeleteBookmarkResponse(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]:

twitter_openapi_python_generated/models/delete_bookmark_response_data.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteBookmarkResponseData(BaseModel):
     """
@@ -31,7 +32,8 @@ class DeleteBookmarkResponseData(BaseModel):
     __properties: ClassVar[List[str]] = ["tweet_bookmark_delete"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class DeleteBookmarkResponseData(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]:

twitter_openapi_python_generated/models/delete_retweet.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List
 from twitter_openapi_python_generated.models.retweet import Retweet
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteRetweet(BaseModel):
     """
@@ -32,7 +33,8 @@ class DeleteRetweet(BaseModel):
     __properties: ClassVar[List[str]] = ["result"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class DeleteRetweet(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]:

twitter_openapi_python_generated/models/delete_retweet_response.py

@@ -24,6 +24,7 @@ from twitter_openapi_python_generated.models.delete_retweet_response_data import
 from twitter_openapi_python_generated.models.error_response import ErrorResponse
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteRetweetResponse(BaseModel):
     """
@@ -34,7 +35,8 @@ class DeleteRetweetResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["data", "errors"]
 
     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 DeleteRetweetResponse(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]:

twitter_openapi_python_generated/models/delete_retweet_response_data.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.delete_retweet_response_result import DeleteRetweetResponseResult
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteRetweetResponseData(BaseModel):
     """
@@ -32,7 +33,8 @@ class DeleteRetweetResponseData(BaseModel):
     __properties: ClassVar[List[str]] = ["create_retweet"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class DeleteRetweetResponseData(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]:

twitter_openapi_python_generated/models/delete_retweet_response_result.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.delete_retweet import DeleteRetweet
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteRetweetResponseResult(BaseModel):
     """
@@ -32,7 +33,8 @@ class DeleteRetweetResponseResult(BaseModel):
     __properties: ClassVar[List[str]] = ["retweet_results"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class DeleteRetweetResponseResult(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]:

twitter_openapi_python_generated/models/delete_tweet_response.py

@@ -24,6 +24,7 @@ from twitter_openapi_python_generated.models.delete_tweet_response_data import D
 from twitter_openapi_python_generated.models.error_response import ErrorResponse
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteTweetResponse(BaseModel):
     """
@@ -34,7 +35,8 @@ class DeleteTweetResponse(BaseModel):
     __properties: ClassVar[List[str]] = ["data", "errors"]
 
     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 DeleteTweetResponse(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]:

twitter_openapi_python_generated/models/delete_tweet_response_data.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.delete_tweet_response_result import DeleteTweetResponseResult
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteTweetResponseData(BaseModel):
     """
@@ -32,7 +33,8 @@ class DeleteTweetResponseData(BaseModel):
     __properties: ClassVar[List[str]] = ["delete_retweet"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class DeleteTweetResponseData(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]:

twitter_openapi_python_generated/models/delete_tweet_response_result.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ConfigDict
 from typing import Any, ClassVar, Dict, List
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DeleteTweetResponseResult(BaseModel):
     """
@@ -31,7 +32,8 @@ class DeleteTweetResponseResult(BaseModel):
     __properties: ClassVar[List[str]] = ["tweet_results"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class DeleteTweetResponseResult(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]:

twitter_openapi_python_generated/models/display_treatment.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class DisplayTreatment(BaseModel):
     """
@@ -32,7 +33,8 @@ class DisplayTreatment(BaseModel):
     __properties: ClassVar[List[str]] = ["actionText", "labelText"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class DisplayTreatment(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]:

twitter_openapi_python_generated/models/entities.py

@@ -21,25 +21,29 @@ import json
 from pydantic import BaseModel, ConfigDict
 from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.media import Media
+from twitter_openapi_python_generated.models.smarttag import Smarttag
 from twitter_openapi_python_generated.models.timestamp import Timestamp
 from twitter_openapi_python_generated.models.url import Url
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class Entities(BaseModel):
     """
     Entities
     """ # noqa: E501
-    hashtags: List[Dict[str, Any]]
+    hashtags: Optional[List[Dict[str, Any]]] = None
     media: Optional[List[Media]] = None
-    symbols: List[Dict[str, Any]]
+    smarttags: Optional[List[Smarttag]] = None
+    symbols: Optional[List[Dict[str, Any]]] = None
     timestamps: Optional[List[Timestamp]] = None
-    urls: List[Url]
-    user_mentions: List[Dict[str, Any]]
-    __properties: ClassVar[List[str]] = ["hashtags", "media", "symbols", "timestamps", "urls", "user_mentions"]
+    urls: Optional[List[Url]] = None
+    user_mentions: Optional[List[Dict[str, Any]]] = None
+    __properties: ClassVar[List[str]] = ["hashtags", "media", "smarttags", "symbols", "timestamps", "urls", "user_mentions"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -51,8 +55,7 @@ class Entities(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]:
@@ -84,6 +87,13 @@ class Entities(BaseModel):
                 if _item_media:
                     _items.append(_item_media.to_dict())
             _dict['media'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in smarttags (list)
+        _items = []
+        if self.smarttags:
+            for _item_smarttags in self.smarttags:
+                if _item_smarttags:
+                    _items.append(_item_smarttags.to_dict())
+            _dict['smarttags'] = _items
         # override the default output from pydantic by calling `to_dict()` of each item in timestamps (list)
         _items = []
         if self.timestamps:
@@ -112,6 +122,7 @@ class Entities(BaseModel):
         _obj = cls.model_validate({
             "hashtags": obj.get("hashtags"),
             "media": [Media.from_dict(_item) for _item in obj["media"]] if obj.get("media") is not None else None,
+            "smarttags": [Smarttag.from_dict(_item) for _item in obj["smarttags"]] if obj.get("smarttags") is not None else None,
             "symbols": obj.get("symbols"),
             "timestamps": [Timestamp.from_dict(_item) for _item in obj["timestamps"]] if obj.get("timestamps") is not None else None,
             "urls": [Url.from_dict(_item) for _item in obj["urls"]] if obj.get("urls") is not None else None,

twitter_openapi_python_generated/models/error_extensions.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.tracing import Tracing
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class ErrorExtensions(BaseModel):
     """
@@ -37,7 +38,8 @@ class ErrorExtensions(BaseModel):
     __properties: ClassVar[List[str]] = ["code", "kind", "name", "retry_after", "source", "tracing"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -49,8 +51,7 @@ class ErrorExtensions(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]:

twitter_openapi_python_generated/models/error_response.py

@@ -21,10 +21,12 @@ import json
 from pydantic import BaseModel, ConfigDict, StrictInt, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from twitter_openapi_python_generated.models.error_extensions import ErrorExtensions
+from twitter_openapi_python_generated.models.error_response_path_inner import ErrorResponsePathInner
 from twitter_openapi_python_generated.models.location import Location
 from twitter_openapi_python_generated.models.tracing import Tracing
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class ErrorResponse(BaseModel):
     """
@@ -36,14 +38,15 @@ class ErrorResponse(BaseModel):
     locations: List[Location]
     message: StrictStr
     name: StrictStr
-    path: List[Any]
+    path: List[ErrorResponsePathInner]
     retry_after: Optional[StrictInt] = None
     source: StrictStr
     tracing: Tracing
     __properties: ClassVar[List[str]] = ["code", "extensions", "kind", "locations", "message", "name", "path", "retry_after", "source", "tracing"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -55,8 +58,7 @@ class ErrorResponse(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]:
@@ -91,6 +93,13 @@ class ErrorResponse(BaseModel):
                 if _item_locations:
                     _items.append(_item_locations.to_dict())
             _dict['locations'] = _items
+        # override the default output from pydantic by calling `to_dict()` of each item in path (list)
+        _items = []
+        if self.path:
+            for _item_path in self.path:
+                if _item_path:
+                    _items.append(_item_path.to_dict())
+            _dict['path'] = _items
         # override the default output from pydantic by calling `to_dict()` of tracing
         if self.tracing:
             _dict['tracing'] = self.tracing.to_dict()
@@ -112,7 +121,7 @@ class ErrorResponse(BaseModel):
             "locations": [Location.from_dict(_item) for _item in obj["locations"]] if obj.get("locations") is not None else None,
             "message": obj.get("message"),
             "name": obj.get("name"),
-            "path": obj.get("path"),
+            "path": [ErrorResponsePathInner.from_dict(_item) for _item in obj["path"]] if obj.get("path") is not None else None,
             "retry_after": obj.get("retry_after"),
             "source": obj.get("source"),
             "tracing": Tracing.from_dict(obj["tracing"]) if obj.get("tracing") is not None else None

twitter_openapi_python_generated/models/error_response_path_inner.py

@@ -0,0 +1,144 @@
+# coding: utf-8
+
+"""
+    Twitter OpenAPI
+
+    Twitter OpenAPI(Swagger) specification
+
+    The version of the OpenAPI document: 0.0.1
+    Contact: yuki@yuki0311.com
+    Generated by OpenAPI Generator (https://openapi-generator.tech)
+
+    Do not edit the class manually.
+"""  # noqa: E501
+
+
+from __future__ import annotations
+import json
+import pprint
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr, ValidationError, field_validator
+from typing import Any, List, Optional
+from pydantic import StrictStr, Field
+from typing import Union, List, Set, Optional, Dict
+from typing_extensions import Literal, Self
+
+ERRORRESPONSEPATHINNER_ONE_OF_SCHEMAS = ["int", "str"]
+
+class ErrorResponsePathInner(BaseModel):
+    """
+    ErrorResponsePathInner
+    """
+    # data type: str
+    oneof_schema_1_validator: Optional[StrictStr] = None
+    # data type: int
+    oneof_schema_2_validator: Optional[StrictInt] = None
+    actual_instance: Optional[Union[int, str]] = None
+    one_of_schemas: Set[str] = { "int", "str" }
+
+    model_config = ConfigDict(
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
+
+    def __init__(self, *args, **kwargs) -> None:
+        if args:
+            if len(args) > 1:
+                raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`")
+            if kwargs:
+                raise ValueError("If a position argument is used, keyword arguments cannot be used.")
+            super().__init__(actual_instance=args[0])
+        else:
+            super().__init__(**kwargs)
+
+    @field_validator('actual_instance')
+    def actual_instance_must_validate_oneof(cls, v):
+        instance = ErrorResponsePathInner.model_construct()
+        error_messages = []
+        match = 0
+        # validate data type: str
+        try:
+            instance.oneof_schema_1_validator = v
+            match += 1
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+        # validate data type: int
+        try:
+            instance.oneof_schema_2_validator = v
+            match += 1
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+        if match > 1:
+            # more than 1 match
+            raise ValueError("Multiple matches found when setting `actual_instance` in ErrorResponsePathInner with oneOf schemas: int, str. Details: " + ", ".join(error_messages))
+        elif match == 0:
+            # no match
+            raise ValueError("No match found when setting `actual_instance` in ErrorResponsePathInner with oneOf schemas: int, str. Details: " + ", ".join(error_messages))
+        else:
+            return v
+
+    @classmethod
+    def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self:
+        return cls.from_json(json.dumps(obj))
+
+    @classmethod
+    def from_json(cls, json_str: str) -> Self:
+        """Returns the object represented by the json string"""
+        instance = cls.model_construct()
+        error_messages = []
+        match = 0
+
+        # deserialize data into str
+        try:
+            # validation
+            instance.oneof_schema_1_validator = json.loads(json_str)
+            # assign value to actual_instance
+            instance.actual_instance = instance.oneof_schema_1_validator
+            match += 1
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+        # deserialize data into int
+        try:
+            # validation
+            instance.oneof_schema_2_validator = json.loads(json_str)
+            # assign value to actual_instance
+            instance.actual_instance = instance.oneof_schema_2_validator
+            match += 1
+        except (ValidationError, ValueError) as e:
+            error_messages.append(str(e))
+
+        if match > 1:
+            # more than 1 match
+            raise ValueError("Multiple matches found when deserializing the JSON string into ErrorResponsePathInner with oneOf schemas: int, str. Details: " + ", ".join(error_messages))
+        elif match == 0:
+            # no match
+            raise ValueError("No match found when deserializing the JSON string into ErrorResponsePathInner with oneOf schemas: int, str. Details: " + ", ".join(error_messages))
+        else:
+            return instance
+
+    def to_json(self) -> str:
+        """Returns the JSON representation of the actual instance"""
+        if self.actual_instance is None:
+            return "null"
+
+        if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json):
+            return self.actual_instance.to_json()
+        else:
+            return json.dumps(self.actual_instance)
+
+    def to_dict(self) -> Optional[Union[Dict[str, Any], int, str]]:
+        """Returns the dict representation of the actual instance"""
+        if self.actual_instance is None:
+            return None
+
+        if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict):
+            return self.actual_instance.to_dict()
+        else:
+            # primitive type
+            return self.actual_instance
+
+    def to_str(self) -> str:
+        """Returns the string representation of the actual instance"""
+        return pprint.pformat(self.model_dump())
+
+

twitter_openapi_python_generated/models/ext_media_availability.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class ExtMediaAvailability(BaseModel):
     """
@@ -42,7 +43,8 @@ class ExtMediaAvailability(BaseModel):
         return value
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -54,8 +56,7 @@ class ExtMediaAvailability(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]:

twitter_openapi_python_generated/models/extended_entities.py

@@ -23,6 +23,7 @@ from typing import Any, ClassVar, Dict, List
 from twitter_openapi_python_generated.models.media_extended import MediaExtended
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class ExtendedEntities(BaseModel):
     """
@@ -32,7 +33,8 @@ class ExtendedEntities(BaseModel):
     __properties: ClassVar[List[str]] = ["media"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -44,8 +46,7 @@ class ExtendedEntities(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]:

twitter_openapi_python_generated/models/favorite_tweet.py

@@ -22,6 +22,7 @@ from pydantic import BaseModel, ConfigDict, StrictStr
 from typing import Any, ClassVar, Dict, List, Optional
 from typing import Optional, Set
 from typing_extensions import Self
+from pydantic_core import to_jsonable_python
 
 class FavoriteTweet(BaseModel):
     """
@@ -31,7 +32,8 @@ class FavoriteTweet(BaseModel):
     __properties: ClassVar[List[str]] = ["favorite_tweet"]
 
     model_config = ConfigDict(
-        populate_by_name=True,
+        validate_by_name=True,
+        validate_by_alias=True,
         validate_assignment=True,
         protected_namespaces=(),
     )
@@ -43,8 +45,7 @@ class FavoriteTweet(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]: