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

stadiamaps/models/coordinate.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,44 +18,62 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt
+from pydantic import BaseModel, ConfigDict, Field
+from typing import Any, ClassVar, Dict, List, Union
+from typing_extensions import Annotated
+from typing import Optional, Set
+from typing_extensions import Self
 
 class Coordinate(BaseModel):
     """
     Coordinate
-    """
-    lat: Union[StrictFloat, StrictInt] = Field(..., description="The latitude of a point in the shape.")
-    lon: Union[StrictFloat, StrictInt] = Field(..., description="The longitude of a point in the shape.")
+    """ # noqa: E501
+    lat: Union[Annotated[float, Field(le=90, strict=True, ge=-90)], Annotated[int, Field(le=90, strict=True, ge=-90)]] = Field(description="The latitude of a point in the shape.")
+    lon: Union[Annotated[float, Field(le=180, strict=True, ge=-180)], Annotated[int, Field(le=180, strict=True, ge=-180)]] = Field(description="The longitude of a point in the shape.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["lat", "lon"]
+    __properties: ClassVar[List[str]] = ["lat", "lon"]
+
+    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) -> Coordinate:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of Coordinate 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():
@@ -64,15 +82,15 @@ class Coordinate(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Coordinate:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of Coordinate from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return Coordinate.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = Coordinate.parse_obj({
+        _obj = cls.model_validate({
             "lat": obj.get("lat"),
             "lon": obj.get("lon")
         })
@@ -83,3 +101,4 @@ class Coordinate(BaseModel):
 
         return _obj
 
+

stadiamaps/models/costing_model.py

@@ -3,28 +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
 
 
+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 CostingModel(str, Enum):
     """
-    Costing models for determining the most optimal route to take. Note that bikeshare and motorcycle are still in beta. While Valhalla supports multimodal routing, we do not currently process transit data and have excluded it from the list. See https://valhalla.readthedocs.io/en/latest/api/turn-by-turn/api-reference/#costing-models for detailed descriptions of each model.
+    Costing models for determining the most optimal route to take. Note that bikeshare and motorcycle are still in beta. While Valhalla supports multimodal routing, we do not currently process transit data and have excluded it from the list. See https://valhalla.github.io/valhalla/api/turn-by-turn/api-reference/#costing-models for detailed descriptions of each model.
     """
 
     """
@@ -39,10 +36,11 @@ class CostingModel(str, Enum):
     MOTOR_SCOOTER = 'motor_scooter'
     MOTORCYCLE = 'motorcycle'
     PEDESTRIAN = 'pedestrian'
+    LOW_SPEED_VEHICLE = 'low_speed_vehicle'
 
     @classmethod
-    def from_json(cls, json_str: str) -> CostingModel:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of CostingModel from a JSON string"""
-        return CostingModel(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/costing_options.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,20 +18,21 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional
-from pydantic import BaseModel
+from pydantic import BaseModel, ConfigDict
+from typing import Any, ClassVar, Dict, List, Optional
 from stadiamaps.models.auto_costing_options import AutoCostingOptions
 from stadiamaps.models.bicycle_costing_options import BicycleCostingOptions
 from stadiamaps.models.motor_scooter_costing_options import MotorScooterCostingOptions
 from stadiamaps.models.motorcycle_costing_options import MotorcycleCostingOptions
 from stadiamaps.models.pedestrian_costing_options import PedestrianCostingOptions
 from stadiamaps.models.truck_costing_options import TruckCostingOptions
+from typing import Optional, Set
+from typing_extensions import Self
 
 class CostingOptions(BaseModel):
     """
     CostingOptions
-    """
+    """ # noqa: E501
     auto: Optional[AutoCostingOptions] = None
     bus: Optional[AutoCostingOptions] = None
     taxi: Optional[AutoCostingOptions] = None
@@ -41,33 +42,49 @@ class CostingOptions(BaseModel):
     motorcycle: Optional[MotorcycleCostingOptions] = None
     pedestrian: Optional[PedestrianCostingOptions] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["auto", "bus", "taxi", "truck", "bicycle", "motor_scooter", "motorcycle", "pedestrian"]
+    __properties: ClassVar[List[str]] = ["auto", "bus", "taxi", "truck", "bicycle", "motor_scooter", "motorcycle", "pedestrian"]
+
+    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) -> CostingOptions:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of CostingOptions 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 auto
         if self.auto:
             _dict['auto'] = self.auto.to_dict()
@@ -100,23 +117,23 @@ class CostingOptions(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> CostingOptions:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of CostingOptions from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return CostingOptions.parse_obj(obj)
-
-        _obj = CostingOptions.parse_obj({
-            "auto": AutoCostingOptions.from_dict(obj.get("auto")) if obj.get("auto") is not None else None,
-            "bus": AutoCostingOptions.from_dict(obj.get("bus")) if obj.get("bus") is not None else None,
-            "taxi": AutoCostingOptions.from_dict(obj.get("taxi")) if obj.get("taxi") is not None else None,
-            "truck": TruckCostingOptions.from_dict(obj.get("truck")) if obj.get("truck") is not None else None,
-            "bicycle": BicycleCostingOptions.from_dict(obj.get("bicycle")) if obj.get("bicycle") is not None else None,
-            "motor_scooter": MotorScooterCostingOptions.from_dict(obj.get("motor_scooter")) if obj.get("motor_scooter") is not None else None,
-            "motorcycle": MotorcycleCostingOptions.from_dict(obj.get("motorcycle")) if obj.get("motorcycle") is not None else None,
-            "pedestrian": PedestrianCostingOptions.from_dict(obj.get("pedestrian")) if obj.get("pedestrian") is not None else None
+            return cls.model_validate(obj)
+
+        _obj = cls.model_validate({
+            "auto": AutoCostingOptions.from_dict(obj["auto"]) if obj.get("auto") is not None else None,
+            "bus": AutoCostingOptions.from_dict(obj["bus"]) if obj.get("bus") is not None else None,
+            "taxi": AutoCostingOptions.from_dict(obj["taxi"]) if obj.get("taxi") is not None else None,
+            "truck": TruckCostingOptions.from_dict(obj["truck"]) if obj.get("truck") is not None else None,
+            "bicycle": BicycleCostingOptions.from_dict(obj["bicycle"]) if obj.get("bicycle") is not None else None,
+            "motor_scooter": MotorScooterCostingOptions.from_dict(obj["motor_scooter"]) if obj.get("motor_scooter") is not None else None,
+            "motorcycle": MotorcycleCostingOptions.from_dict(obj["motorcycle"]) if obj.get("motorcycle") is not None else None,
+            "pedestrian": PedestrianCostingOptions.from_dict(obj["pedestrian"]) if obj.get("pedestrian") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -125,3 +142,4 @@ class CostingOptions(BaseModel):
 
         return _obj
 
+

stadiamaps/models/directions_options.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,57 +18,74 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional
-from pydantic import BaseModel, Field, StrictStr, validator
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
 from stadiamaps.models.distance_unit import DistanceUnit
 from stadiamaps.models.valhalla_languages import ValhallaLanguages
+from typing import Optional, Set
+from typing_extensions import Self
 
 class DirectionsOptions(BaseModel):
     """
     DirectionsOptions
-    """
+    """ # noqa: E501
     units: Optional[DistanceUnit] = None
     language: Optional[ValhallaLanguages] = None
-    directions_type: Optional[StrictStr] = Field('instructions', description="The level of directional narrative to include. Locations and times will always be returned, but narrative generation verbosity can be controlled with this parameter.")
+    directions_type: Optional[StrictStr] = Field(default='instructions', description="The level of directional narrative to include. Locations and times will always be returned, but narrative generation verbosity can be controlled with this parameter.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["units", "language", "directions_type"]
+    __properties: ClassVar[List[str]] = ["units", "language", "directions_type"]
 
-    @validator('directions_type')
+    @field_validator('directions_type')
     def directions_type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('none', 'maneuvers', 'instructions'):
+        if value not in set(['none', 'maneuvers', 'instructions']):
             raise ValueError("must be one of enum values ('none', 'maneuvers', 'instructions')")
         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) -> DirectionsOptions:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of DirectionsOptions 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():
@@ -77,15 +94,15 @@ class DirectionsOptions(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> DirectionsOptions:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of DirectionsOptions from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return DirectionsOptions.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = DirectionsOptions.parse_obj({
+        _obj = cls.model_validate({
             "units": obj.get("units"),
             "language": obj.get("language"),
             "directions_type": obj.get("directions_type") if obj.get("directions_type") is not None else 'instructions'
@@ -97,3 +114,4 @@ class DirectionsOptions(BaseModel):
 
         return _obj
 
+

stadiamaps/models/distance_unit.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.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
 import json
-import pprint
-import re  # noqa: F401
-from aenum import Enum, no_arg
-
-
-
+from enum import Enum
+from typing_extensions import Self
 
 
 class DistanceUnit(str, Enum):
@@ -34,8 +31,8 @@ class DistanceUnit(str, Enum):
     MI = 'mi'
 
     @classmethod
-    def from_json(cls, json_str: str) -> DistanceUnit:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of DistanceUnit from a JSON string"""
-        return DistanceUnit(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/edge_sign.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 List, Optional
-from pydantic import BaseModel, StrictStr, conlist
+from pydantic import BaseModel, ConfigDict, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional
+from typing import Optional, Set
+from typing_extensions import Self
 
 class EdgeSign(BaseModel):
     """
     EdgeSign
-    """
-    exit_number: Optional[conlist(StrictStr)] = None
-    exit_branch: Optional[conlist(StrictStr)] = None
-    exit_toward: Optional[conlist(StrictStr)] = None
-    exit_name: Optional[conlist(StrictStr)] = None
+    """ # noqa: E501
+    exit_number: Optional[List[StrictStr]] = None
+    exit_branch: Optional[List[StrictStr]] = None
+    exit_toward: Optional[List[StrictStr]] = None
+    exit_name: Optional[List[StrictStr]] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["exit_number", "exit_branch", "exit_toward", "exit_name"]
+    __properties: ClassVar[List[str]] = ["exit_number", "exit_branch", "exit_toward", "exit_name"]
+
+    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) -> EdgeSign:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of EdgeSign 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 EdgeSign(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> EdgeSign:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of EdgeSign from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return EdgeSign.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = EdgeSign.parse_obj({
+        _obj = cls.model_validate({
             "exit_number": obj.get("exit_number"),
             "exit_branch": obj.get("exit_branch"),
             "exit_toward": obj.get("exit_toward"),
@@ -87,3 +104,4 @@ class EdgeSign(BaseModel):
 
         return _obj
 
+