stadiamaps 1.0.7__py3-none-any.whl → 2.1.0__py3-none-any.whl

stadiamaps/api_response.py

@@ -1,25 +1,21 @@
 """API response object."""
 
 from __future__ import annotations
-from typing import Any, Dict, Optional
-from pydantic import Field, StrictInt, StrictStr
+from typing import Optional, Generic, Mapping, TypeVar
+from pydantic import Field, StrictInt, StrictBytes, BaseModel
 
-class ApiResponse:
+T = TypeVar("T")
+
+class ApiResponse(BaseModel, Generic[T]):
     """
     API response object
     """
 
-    status_code: Optional[StrictInt] = Field(None, description="HTTP status code")
-    headers: Optional[Dict[StrictStr, StrictStr]] = Field(None, description="HTTP headers")
-    data: Optional[Any] = Field(None, description="Deserialized data given the data type")
-    raw_data: Optional[Any] = Field(None, description="Raw data (HTTP response body)")
+    status_code: StrictInt = Field(description="HTTP status code")
+    headers: Optional[Mapping[str, str]] = Field(None, description="HTTP headers")
+    data: T = Field(description="Deserialized data given the data type")
+    raw_data: StrictBytes = Field(description="Raw data (HTTP response body)")
 
-    def __init__(self,
-                 status_code=None,
-                 headers=None,
-                 data=None,
-                 raw_data=None):
-        self.status_code = status_code
-        self.headers = headers
-        self.data = data
-        self.raw_data = raw_data
+    model_config = {
+        "arbitrary_types_allowed": True
+    }

stadiamaps/configuration.py

@@ -3,24 +3,25 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.6
+    The version of the OpenAPI document: 6.1.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 import copy
 import logging
+from logging import FileHandler
 import multiprocessing
 import sys
+from typing import Optional
 import urllib3
 
 import http.client as httplib
-from stadiamaps.exceptions import ApiValueError
 
 JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'multipleOf', 'maximum', 'exclusiveMaximum',
@@ -28,7 +29,7 @@ JSON_SCHEMA_VALIDATION_KEYWORDS = {
     'minLength', 'pattern', 'maxItems', 'minItems'
 }
 
-class Configuration(object):
+class Configuration:
     """This class contains various settings of the API client.
 
     :param host: Base url.
@@ -50,7 +51,8 @@ class Configuration(object):
       configuration.
     :param server_operation_variables: Mapping from operation ID to a mapping with
       string values to replace variables in templated server configuration.
-      The validation of enums is performed for variables with defined enum values before.
+      The validation of enums is performed for variables with defined enum
+      values before.
     :param ssl_ca_cert: str - the path to a file of concatenated CA certificates
       in PEM format.
 
@@ -85,7 +87,7 @@ conf = stadiamaps.Configuration(
                  server_index=None, server_variables=None,
                  server_operation_index=None, server_operation_variables=None,
                  ssl_ca_cert=None,
-                 ):
+                 ) -> None:
         """Constructor
         """
         self._base_path = "https://api.stadiamaps.com" if host is None else host
@@ -136,7 +138,7 @@ conf = stadiamaps.Configuration(
         self.logger_stream_handler = None
         """Log stream handler
         """
-        self.logger_file_handler = None
+        self.logger_file_handler: Optional[FileHandler] = None
         """Log file handler
         """
         self.logger_file = None
@@ -176,7 +178,7 @@ conf = stadiamaps.Configuration(
            cpu_count * 5 is used as default value to increase performance.
         """
 
-        self.proxy = None
+        self.proxy: Optional[str] = None
         """Proxy URL
         """
         self.proxy_headers = None
@@ -397,8 +399,8 @@ conf = stadiamaps.Configuration(
         return "Python SDK Debug Report:\n"\
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
-               "Version of the API: 5.0.6\n"\
-               "SDK Package Version: 1.0.7".\
+               "Version of the API: 6.1.0\n"\
+               "SDK Package Version: 2.1.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self):

stadiamaps/exceptions.py

@@ -3,15 +3,17 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.6
+    The version of the OpenAPI document: 6.1.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
+from typing import Any, Optional
+from typing_extensions import Self
 
 class OpenApiException(Exception):
     """The base exception class for all OpenAPIExceptions"""
@@ -19,7 +21,7 @@ class OpenApiException(Exception):
 
 class ApiTypeError(OpenApiException, TypeError):
     def __init__(self, msg, path_to_item=None, valid_classes=None,
-                 key_type=None):
+                 key_type=None) -> None:
         """ Raises an exception for TypeErrors
 
         Args:
@@ -47,7 +49,7 @@ class ApiTypeError(OpenApiException, TypeError):
 
 
 class ApiValueError(OpenApiException, ValueError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -65,7 +67,7 @@ class ApiValueError(OpenApiException, ValueError):
 
 
 class ApiAttributeError(OpenApiException, AttributeError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Raised when an attribute reference or assignment fails.
 
@@ -84,7 +86,7 @@ class ApiAttributeError(OpenApiException, AttributeError):
 
 
 class ApiKeyError(OpenApiException, KeyError):
-    def __init__(self, msg, path_to_item=None):
+    def __init__(self, msg, path_to_item=None) -> None:
         """
         Args:
             msg (str): the exception message
@@ -102,17 +104,56 @@ class ApiKeyError(OpenApiException, KeyError):
 
 class ApiException(OpenApiException):
 
-    def __init__(self, status=None, reason=None, http_resp=None):
+    def __init__(
+        self, 
+        status=None, 
+        reason=None, 
+        http_resp=None,
+        *,
+        body: Optional[str] = None,
+        data: Optional[Any] = None,
+    ) -> None:
+        self.status = status
+        self.reason = reason
+        self.body = body
+        self.data = data
+        self.headers = None
+
         if http_resp:
-            self.status = http_resp.status
-            self.reason = http_resp.reason
-            self.body = http_resp.data
+            if self.status is None:
+                self.status = http_resp.status
+            if self.reason is None:
+                self.reason = http_resp.reason
+            if self.body is None:
+                try:
+                    self.body = http_resp.data.decode('utf-8')
+                except Exception:
+                    pass
             self.headers = http_resp.getheaders()
-        else:
-            self.status = status
-            self.reason = reason
-            self.body = None
-            self.headers = None
+
+    @classmethod
+    def from_response(
+        cls, 
+        *, 
+        http_resp, 
+        body: Optional[str], 
+        data: Optional[Any],
+    ) -> Self:
+        if http_resp.status == 400:
+            raise BadRequestException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 401:
+            raise UnauthorizedException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 403:
+            raise ForbiddenException(http_resp=http_resp, body=body, data=data)
+
+        if http_resp.status == 404:
+            raise NotFoundException(http_resp=http_resp, body=body, data=data)
+
+        if 500 <= http_resp.status <= 599:
+            raise ServiceException(http_resp=http_resp, body=body, data=data)
+        raise ApiException(http_resp=http_resp, body=body, data=data)
 
     def __str__(self):
         """Custom error messages for exception"""
@@ -122,34 +163,30 @@ class ApiException(OpenApiException):
             error_message += "HTTP response headers: {0}\n".format(
                 self.headers)
 
-        if self.body:
-            error_message += "HTTP response body: {0}\n".format(self.body)
+        if self.data or self.body:
+            error_message += "HTTP response body: {0}\n".format(self.data or self.body)
 
         return error_message
 
 
-class NotFoundException(ApiException):
+class BadRequestException(ApiException):
+    pass
 
-    def __init__(self, status=None, reason=None, http_resp=None):
-        super(NotFoundException, self).__init__(status, reason, http_resp)
 
+class NotFoundException(ApiException):
+    pass
 
-class UnauthorizedException(ApiException):
 
-    def __init__(self, status=None, reason=None, http_resp=None):
-        super(UnauthorizedException, self).__init__(status, reason, http_resp)
+class UnauthorizedException(ApiException):
+    pass
 
 
 class ForbiddenException(ApiException):
-
-    def __init__(self, status=None, reason=None, http_resp=None):
-        super(ForbiddenException, self).__init__(status, reason, http_resp)
+    pass
 
 
 class ServiceException(ApiException):
-
-    def __init__(self, status=None, reason=None, http_resp=None):
-        super(ServiceException, self).__init__(status, reason, http_resp)
+    pass
 
 
 def render_path(path_to_item):

stadiamaps/models/__init__.py

@@ -4,14 +4,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.6
+    The version of the OpenAPI document: 6.1.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 # import models into model package
@@ -19,11 +19,9 @@ from stadiamaps.models.access import Access
 from stadiamaps.models.admin_region import AdminRegion
 from stadiamaps.models.administrative import Administrative
 from stadiamaps.models.auto_costing_options import AutoCostingOptions
-from stadiamaps.models.auto_costing_options_all_of import AutoCostingOptionsAllOf
 from stadiamaps.models.base_costing_options import BaseCostingOptions
 from stadiamaps.models.base_trace_request import BaseTraceRequest
 from stadiamaps.models.bicycle_costing_options import BicycleCostingOptions
-from stadiamaps.models.bicycle_costing_options_all_of import BicycleCostingOptionsAllOf
 from stadiamaps.models.bike_network import BikeNetwork
 from stadiamaps.models.contour import Contour
 from stadiamaps.models.coordinate import Coordinate
@@ -38,11 +36,8 @@ from stadiamaps.models.geo_attributes import GeoAttributes
 from stadiamaps.models.geo_json_geometry import GeoJSONGeometry
 from stadiamaps.models.geo_json_geometry_base import GeoJSONGeometryBase
 from stadiamaps.models.geo_json_line_string import GeoJSONLineString
-from stadiamaps.models.geo_json_line_string_all_of import GeoJSONLineStringAllOf
 from stadiamaps.models.geo_json_point import GeoJSONPoint
-from stadiamaps.models.geo_json_point_all_of import GeoJSONPointAllOf
 from stadiamaps.models.geo_json_polygon import GeoJSONPolygon
-from stadiamaps.models.geo_json_polygon_all_of import GeoJSONPolygonAllOf
 from stadiamaps.models.geocoding_object import GeocodingObject
 from stadiamaps.models.height_request import HeightRequest
 from stadiamaps.models.height_response import HeightResponse
@@ -57,27 +52,21 @@ from stadiamaps.models.locate_detailed_edge import LocateDetailedEdge
 from stadiamaps.models.locate_edge import LocateEdge
 from stadiamaps.models.locate_edge_info import LocateEdgeInfo
 from stadiamaps.models.locate_node import LocateNode
-from stadiamaps.models.locate_node_all_of import LocateNodeAllOf
 from stadiamaps.models.locate_object import LocateObject
 from stadiamaps.models.maneuver_sign import ManeuverSign
 from stadiamaps.models.maneuver_sign_element import ManeuverSignElement
 from stadiamaps.models.map_match_costing_model import MapMatchCostingModel
 from stadiamaps.models.map_match_request import MapMatchRequest
-from stadiamaps.models.map_match_request_all_of import MapMatchRequestAllOf
 from stadiamaps.models.map_match_route_response import MapMatchRouteResponse
-from stadiamaps.models.map_match_route_response_all_of import MapMatchRouteResponseAllOf
 from stadiamaps.models.map_match_trace_options import MapMatchTraceOptions
 from stadiamaps.models.map_match_waypoint import MapMatchWaypoint
-from stadiamaps.models.map_match_waypoint_all_of import MapMatchWaypointAllOf
 from stadiamaps.models.matched_point import MatchedPoint
 from stadiamaps.models.matrix_costing_model import MatrixCostingModel
 from stadiamaps.models.matrix_distance import MatrixDistance
 from stadiamaps.models.matrix_request import MatrixRequest
 from stadiamaps.models.matrix_response import MatrixResponse
 from stadiamaps.models.motor_scooter_costing_options import MotorScooterCostingOptions
-from stadiamaps.models.motor_scooter_costing_options_all_of import MotorScooterCostingOptionsAllOf
 from stadiamaps.models.motorcycle_costing_options import MotorcycleCostingOptions
-from stadiamaps.models.motorcycle_costing_options_all_of import MotorcycleCostingOptionsAllOf
 from stadiamaps.models.nearest_roads_request import NearestRoadsRequest
 from stadiamaps.models.node_id import NodeId
 from stadiamaps.models.node_type import NodeType
@@ -89,7 +78,6 @@ from stadiamaps.models.pelias_geo_json_properties_addendum import PeliasGeoJSONP
 from stadiamaps.models.pelias_geo_json_properties_addendum_osm import PeliasGeoJSONPropertiesAddendumOsm
 from stadiamaps.models.pelias_layer import PeliasLayer
 from stadiamaps.models.pelias_response import PeliasResponse
-from stadiamaps.models.pelias_response_geocoding import PeliasResponseGeocoding
 from stadiamaps.models.pelias_source import PeliasSource
 from stadiamaps.models.restrictions import Restrictions
 from stadiamaps.models.road_class import RoadClass
@@ -97,29 +85,23 @@ from stadiamaps.models.route_leg import RouteLeg
 from stadiamaps.models.route_maneuver import RouteManeuver
 from stadiamaps.models.route_request import RouteRequest
 from stadiamaps.models.route_response import RouteResponse
-from stadiamaps.models.route_response_trip import RouteResponseTrip
+from stadiamaps.models.route_response_alternates_inner import RouteResponseAlternatesInner
 from stadiamaps.models.route_summary import RouteSummary
+from stadiamaps.models.route_trip import RouteTrip
 from stadiamaps.models.routing_response_waypoint import RoutingResponseWaypoint
-from stadiamaps.models.routing_response_waypoint_all_of import RoutingResponseWaypointAllOf
 from stadiamaps.models.routing_waypoint import RoutingWaypoint
-from stadiamaps.models.routing_waypoint_all_of import RoutingWaypointAllOf
 from stadiamaps.models.routing_waypoint_all_of_search_filter import RoutingWaypointAllOfSearchFilter
 from stadiamaps.models.simple_routing_waypoint import SimpleRoutingWaypoint
-from stadiamaps.models.simple_routing_waypoint_all_of import SimpleRoutingWaypointAllOf
 from stadiamaps.models.speeds import Speeds
 from stadiamaps.models.trace_attribute_filter_options import TraceAttributeFilterOptions
 from stadiamaps.models.trace_attribute_key import TraceAttributeKey
 from stadiamaps.models.trace_attributes_base_response import TraceAttributesBaseResponse
 from stadiamaps.models.trace_attributes_request import TraceAttributesRequest
-from stadiamaps.models.trace_attributes_request_all_of import TraceAttributesRequestAllOf
-from stadiamaps.models.trace_attributes_request_all_of_filters import TraceAttributesRequestAllOfFilters
 from stadiamaps.models.trace_attributes_response import TraceAttributesResponse
-from stadiamaps.models.trace_attributes_response_all_of import TraceAttributesResponseAllOf
 from stadiamaps.models.trace_edge import TraceEdge
 from stadiamaps.models.travel_mode import TravelMode
 from stadiamaps.models.traversability import Traversability
 from stadiamaps.models.truck_costing_options import TruckCostingOptions
-from stadiamaps.models.truck_costing_options_all_of import TruckCostingOptionsAllOf
 from stadiamaps.models.tz_response import TzResponse
 from stadiamaps.models.valhalla_languages import ValhallaLanguages
 from stadiamaps.models.valhalla_long_units import ValhallaLongUnits

stadiamaps/models/access.py

@@ -3,14 +3,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.6
+    The version of the OpenAPI document: 6.1.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 from __future__ import annotations
@@ -18,18 +18,19 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional
-from pydantic import BaseModel, Field, StrictBool
+from pydantic import BaseModel, ConfigDict, Field, StrictBool
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
 
 class Access(BaseModel):
     """
     Access
-    """
+    """ # noqa: E501
     golf_cart: Optional[StrictBool] = None
     wheelchair: Optional[StrictBool] = None
     taxi: Optional[StrictBool] = None
-    hov: Optional[StrictBool] = Field(None, alias="HOV")
+    hov: Optional[StrictBool] = Field(default=None, alias="HOV")
     truck: Optional[StrictBool] = None
     emergency: Optional[StrictBool] = None
     pedestrian: Optional[StrictBool] = None
@@ -39,33 +40,49 @@ class Access(BaseModel):
     motorcycle: Optional[StrictBool] = None
     moped: Optional[StrictBool] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["golf_cart", "wheelchair", "taxi", "HOV", "truck", "emergency", "pedestrian", "car", "bus", "bicycle", "motorcycle", "moped"]
+    __properties: ClassVar[List[str]] = ["golf_cart", "wheelchair", "taxi", "HOV", "truck", "emergency", "pedestrian", "car", "bus", "bicycle", "motorcycle", "moped"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.dict(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True))
 
     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())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Access:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of Access from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
-    def to_dict(self):
-        """Returns the dictionary representation of the model using alias"""
-        _dict = self.dict(by_alias=True,
-                          exclude={
-                            "additional_properties"
-                          },
-                          exclude_none=True)
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * Fields in `self.additional_properties` are added to the output dict.
+        """
+        excluded_fields: Set[str] = set([
+            "additional_properties",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
         # puts key-value pairs in additional_properties in the top level
         if self.additional_properties is not None:
             for _key, _value in self.additional_properties.items():
@@ -74,19 +91,19 @@ class Access(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Access:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of Access from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return Access.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = Access.parse_obj({
+        _obj = cls.model_validate({
             "golf_cart": obj.get("golf_cart"),
             "wheelchair": obj.get("wheelchair"),
             "taxi": obj.get("taxi"),
-            "hov": obj.get("HOV"),
+            "HOV": obj.get("HOV"),
             "truck": obj.get("truck"),
             "emergency": obj.get("emergency"),
             "pedestrian": obj.get("pedestrian"),
@@ -103,3 +120,4 @@ class Access(BaseModel):
 
         return _obj
 
+

stadiamaps/models/admin_region.py

@@ -3,14 +3,14 @@
 """
     Stadia Maps Geospatial APIs
 
-    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
+    The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.
 
-    The version of the OpenAPI document: 5.0.6
+    The version of the OpenAPI document: 6.1.0
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 
     Do not edit the class manually.
-"""
+"""  # noqa: E501
 
 
 from __future__ import annotations
@@ -18,46 +18,63 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional
-from pydantic import BaseModel, Field, StrictStr
+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
 
 class AdminRegion(BaseModel):
     """
     AdminRegion
-    """
-    country_code: Optional[StrictStr] = Field(None, description="The [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country code.")
-    country_text: Optional[StrictStr] = Field(None, description="The country name")
-    state_code: Optional[StrictStr] = Field(None, description="The abbreviation code for the state (varies by country).")
-    state_text: Optional[StrictStr] = Field(None, description="The state name.")
+    """ # noqa: E501
+    country_code: Optional[StrictStr] = Field(default=None, description="The [ISO 3166-1 alpha-2](https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2) country code.")
+    country_text: Optional[StrictStr] = Field(default=None, description="The country name")
+    state_code: Optional[StrictStr] = Field(default=None, description="The abbreviation code for the state (varies by country).")
+    state_text: Optional[StrictStr] = Field(default=None, description="The state name.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["country_code", "country_text", "state_code", "state_text"]
+    __properties: ClassVar[List[str]] = ["country_code", "country_text", "state_code", "state_text"]
+
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
 
     def to_str(self) -> str:
         """Returns the string representation of the model using alias"""
-        return pprint.pformat(self.dict(by_alias=True))
+        return pprint.pformat(self.model_dump(by_alias=True))
 
     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())
 
     @classmethod
-    def from_json(cls, json_str: str) -> AdminRegion:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of AdminRegion from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
-    def to_dict(self):
-        """Returns the dictionary representation of the model using alias"""
-        _dict = self.dict(by_alias=True,
-                          exclude={
-                            "additional_properties"
-                          },
-                          exclude_none=True)
+    def to_dict(self) -> Dict[str, Any]:
+        """Return the dictionary representation of the model using alias.
+
+        This has the following differences from calling pydantic's
+        `self.model_dump(by_alias=True)`:
+
+        * `None` is only added to the output dict for nullable fields that
+          were set at model initialization. Other fields with value `None`
+          are ignored.
+        * Fields in `self.additional_properties` are added to the output dict.
+        """
+        excluded_fields: Set[str] = set([
+            "additional_properties",
+        ])
+
+        _dict = self.model_dump(
+            by_alias=True,
+            exclude=excluded_fields,
+            exclude_none=True,
+        )
         # puts key-value pairs in additional_properties in the top level
         if self.additional_properties is not None:
             for _key, _value in self.additional_properties.items():
@@ -66,15 +83,15 @@ class AdminRegion(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> AdminRegion:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of AdminRegion from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return AdminRegion.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = AdminRegion.parse_obj({
+        _obj = cls.model_validate({
             "country_code": obj.get("country_code"),
             "country_text": obj.get("country_text"),
             "state_code": obj.get("state_code"),
@@ -87,3 +104,4 @@ class AdminRegion(BaseModel):
 
         return _obj
 
+