stadiamaps 1.0.6__py3-none-any.whl → 2.0.0__py3-none-any.whl

stadiamaps/models/trace_attributes_response.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.5
+    The version of the OpenAPI document: 6.0.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,56 +18,74 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictInt, StrictStr, confloat, conint, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing_extensions import Annotated
 from stadiamaps.models.admin_region import AdminRegion
 from stadiamaps.models.matched_point import MatchedPoint
 from stadiamaps.models.trace_attributes_base_response import TraceAttributesBaseResponse
 from stadiamaps.models.trace_edge import TraceEdge
 from stadiamaps.models.valhalla_long_units import ValhallaLongUnits
+from typing import Optional, Set
+from typing_extensions import Self
 
 class TraceAttributesResponse(BaseModel):
     """
     TraceAttributesResponse
-    """
-    edges: Optional[conlist(TraceEdge)] = Field(None, description="The list of edges matched along the path.")
-    admins: Optional[conlist(AdminRegion)] = Field(None, description="The set of administrative regions matched along the path. Rather than repeating this information for every end node, the admins in this list are referenced by index.")
-    matched_points: Optional[conlist(MatchedPoint)] = Field(None, description="List of match results when using the map_snap shape match algorithm. There is a one-to-one correspondence with the input set of latitude, longitude coordinates and this list of match results.")
+    """ # noqa: E501
+    edges: Optional[List[TraceEdge]] = Field(default=None, description="The list of edges matched along the path.")
+    admins: Optional[List[AdminRegion]] = Field(default=None, description="The set of administrative regions matched along the path. Rather than repeating this information for every end node, the admins in this list are referenced by index.")
+    matched_points: Optional[List[MatchedPoint]] = Field(default=None, description="List of match results when using the map_snap shape match algorithm. There is a one-to-one correspondence with the input set of latitude, longitude coordinates and this list of match results.")
     osm_changeset: Optional[StrictInt] = None
-    shape: Optional[StrictStr] = Field(None, description="The encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm) of the matched path.")
-    confidence_score: Optional[Union[confloat(le=1, ge=0, strict=True), conint(le=1, ge=0, strict=True)]] = None
-    id: Optional[StrictStr] = Field(None, description="An identifier to disambiguate requests (echoed by the server).")
+    shape: Optional[StrictStr] = Field(default=None, description="The encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm) of the matched path.")
+    confidence_score: Optional[Union[Annotated[float, Field(le=1, strict=True, ge=0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = None
+    id: Optional[StrictStr] = Field(default=None, description="An identifier to disambiguate requests (echoed by the server).")
     units: Optional[ValhallaLongUnits] = None
-    alternate_paths: Optional[conlist(TraceAttributesBaseResponse)] = Field(None, description="Alternate paths, if any, that were not classified as the best match.")
+    alternate_paths: Optional[List[TraceAttributesBaseResponse]] = Field(default=None, description="Alternate paths, if any, that were not classified as the best match.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["edges", "admins", "matched_points", "osm_changeset", "shape", "confidence_score", "id", "units", "alternate_paths"]
+    __properties: ClassVar[List[str]] = ["edges", "admins", "matched_points", "osm_changeset", "shape", "confidence_score", "id", "units", "alternate_paths"]
+
+    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) -> TraceAttributesResponse:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of TraceAttributesResponse 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,
+        )
         # override the default output from pydantic by calling `to_dict()` of each item in edges (list)
         _items = []
         if self.edges:
@@ -104,24 +122,24 @@ class TraceAttributesResponse(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> TraceAttributesResponse:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of TraceAttributesResponse from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return TraceAttributesResponse.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = TraceAttributesResponse.parse_obj({
-            "edges": [TraceEdge.from_dict(_item) for _item in obj.get("edges")] if obj.get("edges") is not None else None,
-            "admins": [AdminRegion.from_dict(_item) for _item in obj.get("admins")] if obj.get("admins") is not None else None,
-            "matched_points": [MatchedPoint.from_dict(_item) for _item in obj.get("matched_points")] if obj.get("matched_points") is not None else None,
+        _obj = cls.model_validate({
+            "edges": [TraceEdge.from_dict(_item) for _item in obj["edges"]] if obj.get("edges") is not None else None,
+            "admins": [AdminRegion.from_dict(_item) for _item in obj["admins"]] if obj.get("admins") is not None else None,
+            "matched_points": [MatchedPoint.from_dict(_item) for _item in obj["matched_points"]] if obj.get("matched_points") is not None else None,
             "osm_changeset": obj.get("osm_changeset"),
             "shape": obj.get("shape"),
             "confidence_score": obj.get("confidence_score"),
             "id": obj.get("id"),
             "units": obj.get("units"),
-            "alternate_paths": [TraceAttributesBaseResponse.from_dict(_item) for _item in obj.get("alternate_paths")] if obj.get("alternate_paths") is not None else None
+            "alternate_paths": [TraceAttributesBaseResponse.from_dict(_item) for _item in obj["alternate_paths"]] if obj.get("alternate_paths") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -130,3 +148,4 @@ class TraceAttributesResponse(BaseModel):
 
         return _obj
 
+

stadiamaps/models/trace_attributes_response_all_of.py

@@ -5,7 +5,7 @@
 
     The Stadia Maps Geospatial APIs provide you with the data you need to build awesome applications.  # noqa: E501
 
-    The version of the OpenAPI document: 5.0.5
+    The version of the OpenAPI document: 5.0.6
     Contact: support@stadiamaps.com
     Generated by OpenAPI Generator (https://openapi-generator.tech)
 

stadiamaps/models/trace_edge.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.5
+    The version of the OpenAPI document: 6.0.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,38 +18,39 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Any, List, Optional, Union
-from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, conlist, validator
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional, Union
 from stadiamaps.models.edge_sign import EdgeSign
 from stadiamaps.models.edge_use import EdgeUse
 from stadiamaps.models.end_node import EndNode
 from stadiamaps.models.road_class import RoadClass
 from stadiamaps.models.travel_mode import TravelMode
 from stadiamaps.models.traversability import Traversability
+from typing import Optional, Set
+from typing_extensions import Self
 
 class TraceEdge(BaseModel):
     """
     TraceEdge
-    """
-    names: Optional[conlist(StrictStr)] = Field(None, description="The name(s) of the road at this edge, if any.")
-    length: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The length of this edge in `units`.")
-    speed: Optional[StrictInt] = Field(None, description="The speed of this edge in `units`/hr, in terms of average/free-flow speed for routing purposes. This is affected by any number of factors such as the road service, vehicle type, etc. and not just the posted speed limits.")
+    """ # noqa: E501
+    names: Optional[List[StrictStr]] = Field(default=None, description="The name(s) of the road at this edge, if any.")
+    length: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The length of this edge in `units`.")
+    speed: Optional[StrictInt] = Field(default=None, description="The speed of this edge in `units`/hr, in terms of average/free-flow speed for routing purposes. This is affected by any number of factors such as the road service, vehicle type, etc. and not just the posted speed limits.")
     road_class: Optional[RoadClass] = None
-    begin_heading: Optional[StrictInt] = Field(None, description="The direction at the beginning of an edge. The units are degrees clockwise from north.")
-    end_heading: Optional[StrictInt] = Field(None, description="The direction at the end of an edge. The units are degrees clockwise from north.")
-    begin_shape_index: Optional[StrictInt] = Field(None, description="Index into the list of shape points for the start of the edge.")
-    end_shape_index: Optional[StrictInt] = Field(None, description="Index into the list of shape points for the end of the edge.")
+    begin_heading: Optional[StrictInt] = Field(default=None, description="The direction at the beginning of an edge. The units are degrees clockwise from north.")
+    end_heading: Optional[StrictInt] = Field(default=None, description="The direction at the end of an edge. The units are degrees clockwise from north.")
+    begin_shape_index: Optional[StrictInt] = Field(default=None, description="Index into the list of shape points for the start of the edge.")
+    end_shape_index: Optional[StrictInt] = Field(default=None, description="Index into the list of shape points for the end of the edge.")
     traversability: Optional[Traversability] = None
     use: Optional[EdgeUse] = None
-    toll: Optional[StrictBool] = Field(None, description="True if the edge has a toll.")
-    unpaved: Optional[StrictBool] = Field(None, description="True if the edge has rough payment.")
-    tunnel: Optional[StrictBool] = Field(None, description="True if the edge has a tunnel.")
-    bridge: Optional[StrictBool] = Field(None, description="True if the edge has a bridge.")
-    roundabout: Optional[StrictBool] = Field(None, description="True if the edge has a roundabout.")
-    internal_intersection: Optional[StrictBool] = Field(None, description="True if the edge has an internal intersection.")
-    drive_on_right: Optional[StrictBool] = Field(None, description="True if the edge is in an area where you must drive on the right side of the road.")
-    surface: Optional[StrictStr] = Field(None, description="The type of surface for the edge.")
+    toll: Optional[StrictBool] = Field(default=None, description="True if the edge has a toll.")
+    unpaved: Optional[StrictBool] = Field(default=None, description="True if the edge has rough payment.")
+    tunnel: Optional[StrictBool] = Field(default=None, description="True if the edge is a tunnel.")
+    bridge: Optional[StrictBool] = Field(default=None, description="True if the edge is a bridge.")
+    roundabout: Optional[StrictBool] = Field(default=None, description="True if the edge is a roundabout.")
+    internal_intersection: Optional[StrictBool] = Field(default=None, description="True if the edge is an internal intersection.")
+    drive_on_right: Optional[StrictBool] = Field(default=None, description="True if the edge is in an area where you must drive on the right side of the road.")
+    surface: Optional[StrictStr] = Field(default=None, description="The type of surface for the edge.")
     sign: Optional[EdgeSign] = None
     travel_mode: Optional[TravelMode] = None
     vehicle_type: Optional[StrictStr] = None
@@ -57,119 +58,135 @@ class TraceEdge(BaseModel):
     bicycle_type: Optional[StrictStr] = None
     transit_type: Optional[StrictStr] = None
     id: Optional[StrictInt] = None
-    way_id: Optional[StrictInt] = Field(None, description="The way identifier of the edge in OSM.")
-    weighted_grade: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The weighted grade factor. Valhalla manufactures a weighted grade from elevation data. It is a measure used for hill avoidance in routing - sort of a relative energy use along an edge. But since an edge in Valhalla can possibly go up and down over several hills it might not equate to what you would normally think of as grade.")
-    max_upward_grade: Optional[StrictInt] = Field(None, description="The maximum upward slope. A value of 32768 indicates no elevation data is available for this edge.")
-    max_downward_grade: Optional[StrictInt] = Field(None, description="The maximum downward slope. A value of 32768 indicates no elevation data is available for this edge.")
-    mean_elevation: Optional[StrictInt] = Field(None, description="The mean elevation along the edge. Units are meters by default. If the `units` are specified as miles, then the mean elevation is returned in feet. A value of 32768 indicates no elevation data is available for this edge.")
-    lane_count: Optional[StrictInt] = Field(None, description="The number of lanes for this edge.")
-    cycle_lane: Optional[StrictStr] = Field(None, description="The type of cycle lane (if any) along this edge.")
-    bicycle_network: Optional[StrictInt] = Field(None, description="The type of bicycle network, if any. This is an integer comprised of constants bitwise or'd together. For example, a route that's part of both a local and mountain network would have a value of 12. 1 - National 2 - Regional 4 - Local 8 - Mountain")
-    sac_scale: Optional[StrictInt] = Field(None, description="The difficulty of the hiking trail according to the SAC scale. 0 - No Sac Scale 1 - Hiking 2 - Mountain hiking 3 - Demanding mountain hiking 4 - Alpine hiking 5 - Demanding alpine hiking 6 - Difficult alpine hiking")
+    way_id: Optional[StrictInt] = Field(default=None, description="The way identifier of the edge in OSM.")
+    weighted_grade: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The weighted grade factor. Valhalla manufactures a weighted grade from elevation data. It is a measure used for hill avoidance in routing - sort of a relative energy use along an edge. But since an edge in Valhalla can possibly go up and down over several hills it might not equate to what you would normally think of as grade.")
+    max_upward_grade: Optional[StrictInt] = Field(default=None, description="The maximum upward slope. A value of 32768 indicates no elevation data is available for this edge.")
+    max_downward_grade: Optional[StrictInt] = Field(default=None, description="The maximum downward slope. A value of 32768 indicates no elevation data is available for this edge.")
+    mean_elevation: Optional[StrictInt] = Field(default=None, description="The mean elevation along the edge. Units are meters by default. If the `units` are specified as miles, then the mean elevation is returned in feet. A value of 32768 indicates no elevation data is available for this edge.")
+    lane_count: Optional[StrictInt] = Field(default=None, description="The number of lanes for this edge.")
+    cycle_lane: Optional[StrictStr] = Field(default=None, description="The type of cycle lane (if any) along this edge.")
+    bicycle_network: Optional[StrictInt] = Field(default=None, description="The type of bicycle network, if any. This is an integer comprised of constants bitwise or'd together. For example, a route that's part of both a local and mountain network would have a value of 12. 1 - National 2 - Regional 4 - Local 8 - Mountain")
+    sac_scale: Optional[StrictInt] = Field(default=None, description="The difficulty of the hiking trail according to the SAC scale. 0 - No Sac Scale 1 - Hiking 2 - Mountain hiking 3 - Demanding mountain hiking 4 - Alpine hiking 5 - Demanding alpine hiking 6 - Difficult alpine hiking")
     sidewalk: Optional[StrictStr] = None
     density: Optional[StrictInt] = None
-    speed_limit: Optional[Any] = Field(None, description="The speed limit along the edge measured in `units`/hr. This may be either an integer or the string \"unlimited\" if speed limit data is available. If absent, there is no speed limit data available.")
-    truck_speed: Optional[StrictInt] = Field(None, description="The truck speed of this edge in `units`/hr, in terms of average/free-flow speed for routing purposes. This is affected by any number of factors such as the road service, vehicle type, etc. and not just the posted speed limits.")
-    truck_route: Optional[StrictBool] = Field(None, description="True if the edge is part of a truck route/network.")
+    speed_limit: Optional[Any] = Field(default=None, description="The speed limit along the edge measured in `units`/hr. This may be either an integer or the string \"unlimited\" if speed limit data is available. If absent, there is no speed limit data available.")
+    truck_speed: Optional[StrictInt] = Field(default=None, description="The truck speed of this edge in `units`/hr, in terms of average/free-flow speed for routing purposes. This is affected by any number of factors such as the road service, vehicle type, etc. and not just the posted speed limits.")
+    truck_route: Optional[StrictBool] = Field(default=None, description="True if the edge is part of a truck route/network.")
     end_node: Optional[EndNode] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["names", "length", "speed", "road_class", "begin_heading", "end_heading", "begin_shape_index", "end_shape_index", "traversability", "use", "toll", "unpaved", "tunnel", "bridge", "roundabout", "internal_intersection", "drive_on_right", "surface", "sign", "travel_mode", "vehicle_type", "pedestrian_type", "bicycle_type", "transit_type", "id", "way_id", "weighted_grade", "max_upward_grade", "max_downward_grade", "mean_elevation", "lane_count", "cycle_lane", "bicycle_network", "sac_scale", "sidewalk", "density", "speed_limit", "truck_speed", "truck_route", "end_node"]
+    __properties: ClassVar[List[str]] = ["names", "length", "speed", "road_class", "begin_heading", "end_heading", "begin_shape_index", "end_shape_index", "traversability", "use", "toll", "unpaved", "tunnel", "bridge", "roundabout", "internal_intersection", "drive_on_right", "surface", "sign", "travel_mode", "vehicle_type", "pedestrian_type", "bicycle_type", "transit_type", "id", "way_id", "weighted_grade", "max_upward_grade", "max_downward_grade", "mean_elevation", "lane_count", "cycle_lane", "bicycle_network", "sac_scale", "sidewalk", "density", "speed_limit", "truck_speed", "truck_route", "end_node"]
 
-    @validator('surface')
+    @field_validator('surface')
     def surface_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('paved_smooth', 'paved', 'paved_rough', 'compacted', 'dirt', 'gravel', 'path', 'impassable'):
+        if value not in set(['paved_smooth', 'paved', 'paved_rough', 'compacted', 'dirt', 'gravel', 'path', 'impassable']):
             raise ValueError("must be one of enum values ('paved_smooth', 'paved', 'paved_rough', 'compacted', 'dirt', 'gravel', 'path', 'impassable')")
         return value
 
-    @validator('vehicle_type')
+    @field_validator('vehicle_type')
     def vehicle_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('car', 'motorcycle', 'bus', 'tractor_trailer'):
-            raise ValueError("must be one of enum values ('car', 'motorcycle', 'bus', 'tractor_trailer')")
+        if value not in set(['car', 'motorcycle', 'bus', 'tractor_trailer', 'golf_cart', 'low_speed_vehicle']):
+            raise ValueError("must be one of enum values ('car', 'motorcycle', 'bus', 'tractor_trailer', 'golf_cart', 'low_speed_vehicle')")
         return value
 
-    @validator('pedestrian_type')
+    @field_validator('pedestrian_type')
     def pedestrian_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('foot', 'wheelchair', 'segway'):
+        if value not in set(['foot', 'wheelchair', 'segway']):
             raise ValueError("must be one of enum values ('foot', 'wheelchair', 'segway')")
         return value
 
-    @validator('bicycle_type')
+    @field_validator('bicycle_type')
     def bicycle_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('road', 'cross', 'hybrid', 'mountain'):
+        if value not in set(['road', 'cross', 'hybrid', 'mountain']):
             raise ValueError("must be one of enum values ('road', 'cross', 'hybrid', 'mountain')")
         return value
 
-    @validator('transit_type')
+    @field_validator('transit_type')
     def transit_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('tram', 'metro', 'rail', 'bus', 'ferry', 'cable_car', 'gondola', 'funicular'):
+        if value not in set(['tram', 'metro', 'rail', 'bus', 'ferry', 'cable_car', 'gondola', 'funicular']):
             raise ValueError("must be one of enum values ('tram', 'metro', 'rail', 'bus', 'ferry', 'cable_car', 'gondola', 'funicular')")
         return value
 
-    @validator('cycle_lane')
+    @field_validator('cycle_lane')
     def cycle_lane_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('none', 'shared', 'dedicated', 'separated'):
+        if value not in set(['none', 'shared', 'dedicated', 'separated']):
             raise ValueError("must be one of enum values ('none', 'shared', 'dedicated', 'separated')")
         return value
 
-    @validator('sidewalk')
+    @field_validator('sidewalk')
     def sidewalk_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('left', 'right', 'both', 'none'):
+        if value not in set(['left', 'right', 'both', 'none']):
             raise ValueError("must be one of enum values ('left', 'right', 'both', 'none')")
         return value
 
-    class Config:
-        """Pydantic configuration"""
-        allow_population_by_field_name = True
-        validate_assignment = True
+    model_config = ConfigDict(
+        populate_by_name=True,
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
+
 
     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) -> TraceEdge:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of TraceEdge 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,
+        )
         # override the default output from pydantic by calling `to_dict()` of sign
         if self.sign:
             _dict['sign'] = self.sign.to_dict()
@@ -182,22 +199,22 @@ class TraceEdge(BaseModel):
                 _dict[_key] = _value
 
         # set to None if speed_limit (nullable) is None
-        # and __fields_set__ contains the field
-        if self.speed_limit is None and "speed_limit" in self.__fields_set__:
+        # and model_fields_set contains the field
+        if self.speed_limit is None and "speed_limit" in self.model_fields_set:
             _dict['speed_limit'] = None
 
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> TraceEdge:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of TraceEdge from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return TraceEdge.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = TraceEdge.parse_obj({
+        _obj = cls.model_validate({
             "names": obj.get("names"),
             "length": obj.get("length"),
             "speed": obj.get("speed"),
@@ -216,7 +233,7 @@ class TraceEdge(BaseModel):
             "internal_intersection": obj.get("internal_intersection"),
             "drive_on_right": obj.get("drive_on_right"),
             "surface": obj.get("surface"),
-            "sign": EdgeSign.from_dict(obj.get("sign")) if obj.get("sign") is not None else None,
+            "sign": EdgeSign.from_dict(obj["sign"]) if obj.get("sign") is not None else None,
             "travel_mode": obj.get("travel_mode"),
             "vehicle_type": obj.get("vehicle_type"),
             "pedestrian_type": obj.get("pedestrian_type"),
@@ -237,7 +254,7 @@ class TraceEdge(BaseModel):
             "speed_limit": obj.get("speed_limit"),
             "truck_speed": obj.get("truck_speed"),
             "truck_route": obj.get("truck_route"),
-            "end_node": EndNode.from_dict(obj.get("end_node")) if obj.get("end_node") is not None else None
+            "end_node": EndNode.from_dict(obj["end_node"]) if obj.get("end_node") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -246,3 +263,4 @@ class TraceEdge(BaseModel):
 
         return _obj
 
+

stadiamaps/models/travel_mode.py

@@ -3,23 +3,20 @@
 """
     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.5
+    The version of the OpenAPI document: 6.0.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
 import json
-import pprint
-import re  # noqa: F401
-from aenum import Enum, no_arg
-
-
-
+from enum import Enum
+from typing_extensions import Self
 
 
 class TravelMode(str, Enum):
@@ -36,8 +33,8 @@ class TravelMode(str, Enum):
     TRANSIT = 'transit'
 
     @classmethod
-    def from_json(cls, json_str: str) -> TravelMode:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of TravelMode from a JSON string"""
-        return TravelMode(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/traversability.py

@@ -3,23 +3,20 @@
 """
     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.5
+    The version of the OpenAPI document: 6.0.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
 import json
-import pprint
-import re  # noqa: F401
-from aenum import Enum, no_arg
-
-
-
+from enum import Enum
+from typing_extensions import Self
 
 
 class Traversability(str, Enum):
@@ -35,8 +32,8 @@ class Traversability(str, Enum):
     BOTH = 'both'
 
     @classmethod
-    def from_json(cls, json_str: str) -> Traversability:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of Traversability from a JSON string"""
-        return Traversability(json.loads(json_str))
+        return cls(json.loads(json_str))