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

stadiamaps/models/nearest_roads_request.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,51 +18,82 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional
-from pydantic import BaseModel, Field, StrictBool, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing_extensions import Annotated
 from stadiamaps.models.coordinate import Coordinate
 from stadiamaps.models.costing_model import CostingModel
 from stadiamaps.models.costing_options import CostingOptions
-from stadiamaps.models.directions_options import DirectionsOptions
+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 NearestRoadsRequest(BaseModel):
     """
     NearestRoadsRequest
-    """
-    locations: conlist(Coordinate, min_items=1) = Field(...)
+    """ # noqa: E501
+    units: Optional[DistanceUnit] = None
+    language: Optional[ValhallaLanguages] = None
+    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.")
+    locations: Annotated[List[Coordinate], Field(min_length=1)]
     costing: Optional[CostingModel] = None
     costing_options: Optional[CostingOptions] = None
     verbose: Optional[StrictBool] = False
-    directions_options: Optional[DirectionsOptions] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["locations", "costing", "costing_options", "verbose", "directions_options"]
+    __properties: ClassVar[List[str]] = ["units", "language", "directions_type", "locations", "costing", "costing_options", "verbose"]
+
+    @field_validator('directions_type')
+    def directions_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['none', 'maneuvers', 'instructions']):
+            raise ValueError("must be one of enum values ('none', 'maneuvers', 'instructions')")
+        return value
+
+    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) -> NearestRoadsRequest:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of NearestRoadsRequest 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 locations (list)
         _items = []
         if self.locations:
@@ -73,9 +104,6 @@ class NearestRoadsRequest(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of costing_options
         if self.costing_options:
             _dict['costing_options'] = self.costing_options.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of directions_options
-        if self.directions_options:
-            _dict['directions_options'] = self.directions_options.to_dict()
         # 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():
@@ -84,20 +112,22 @@ class NearestRoadsRequest(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> NearestRoadsRequest:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of NearestRoadsRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return NearestRoadsRequest.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = NearestRoadsRequest.parse_obj({
-            "locations": [Coordinate.from_dict(_item) for _item in obj.get("locations")] if obj.get("locations") is not None else None,
+        _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',
+            "locations": [Coordinate.from_dict(_item) for _item in obj["locations"]] if obj.get("locations") is not None else None,
             "costing": obj.get("costing"),
-            "costing_options": CostingOptions.from_dict(obj.get("costing_options")) if obj.get("costing_options") is not None else None,
-            "verbose": obj.get("verbose") if obj.get("verbose") is not None else False,
-            "directions_options": DirectionsOptions.from_dict(obj.get("directions_options")) if obj.get("directions_options") is not None else None
+            "costing_options": CostingOptions.from_dict(obj["costing_options"]) if obj.get("costing_options") is not None else None,
+            "verbose": obj.get("verbose") if obj.get("verbose") is not None else False
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -106,3 +136,4 @@ class NearestRoadsRequest(BaseModel):
 
         return _obj
 
+

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

stadiamaps/models/node_type.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 NodeType(str, Enum):
@@ -41,8 +38,8 @@ class NodeType(str, Enum):
     BORDER_CONTROL = 'border_control'
 
     @classmethod
-    def from_json(cls, json_str: str) -> NodeType:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of NodeType from a JSON string"""
-        return NodeType(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/optimized_route_request.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,51 +18,82 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional
-from pydantic import BaseModel, Field, StrictStr, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
+from typing_extensions import Annotated
 from stadiamaps.models.coordinate import Coordinate
 from stadiamaps.models.costing_options import CostingOptions
-from stadiamaps.models.directions_options import DirectionsOptions
+from stadiamaps.models.distance_unit import DistanceUnit
 from stadiamaps.models.matrix_costing_model import MatrixCostingModel
+from stadiamaps.models.valhalla_languages import ValhallaLanguages
+from typing import Optional, Set
+from typing_extensions import Self
 
 class OptimizedRouteRequest(BaseModel):
     """
     OptimizedRouteRequest
-    """
-    id: Optional[StrictStr] = Field(None, description="An identifier to disambiguate requests (echoed by the server).")
-    locations: conlist(Coordinate, min_items=3) = Field(..., description="The list of locations. The first and last are assumed to be the start and end points, and all intermediate points are locations that you want to visit along the way.")
-    costing: MatrixCostingModel = Field(...)
+    """ # noqa: E501
+    units: Optional[DistanceUnit] = None
+    language: Optional[ValhallaLanguages] = None
+    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.")
+    id: Optional[StrictStr] = Field(default=None, description="An identifier to disambiguate requests (echoed by the server).")
+    locations: Annotated[List[Coordinate], Field(min_length=3)] = Field(description="The list of locations. The first and last are assumed to be the start and end points, and all intermediate points are locations that you want to visit along the way.")
+    costing: MatrixCostingModel
     costing_options: Optional[CostingOptions] = None
-    directions_options: Optional[DirectionsOptions] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["id", "locations", "costing", "costing_options", "directions_options"]
+    __properties: ClassVar[List[str]] = ["units", "language", "directions_type", "id", "locations", "costing", "costing_options"]
+
+    @field_validator('directions_type')
+    def directions_type_validate_enum(cls, value):
+        """Validates the enum"""
+        if value is None:
+            return value
+
+        if value not in set(['none', 'maneuvers', 'instructions']):
+            raise ValueError("must be one of enum values ('none', 'maneuvers', 'instructions')")
+        return value
+
+    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) -> OptimizedRouteRequest:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of OptimizedRouteRequest 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 locations (list)
         _items = []
         if self.locations:
@@ -73,9 +104,6 @@ class OptimizedRouteRequest(BaseModel):
         # override the default output from pydantic by calling `to_dict()` of costing_options
         if self.costing_options:
             _dict['costing_options'] = self.costing_options.to_dict()
-        # override the default output from pydantic by calling `to_dict()` of directions_options
-        if self.directions_options:
-            _dict['directions_options'] = self.directions_options.to_dict()
         # 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():
@@ -84,20 +112,22 @@ class OptimizedRouteRequest(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> OptimizedRouteRequest:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of OptimizedRouteRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return OptimizedRouteRequest.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = OptimizedRouteRequest.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',
             "id": obj.get("id"),
-            "locations": [Coordinate.from_dict(_item) for _item in obj.get("locations")] if obj.get("locations") is not None else None,
+            "locations": [Coordinate.from_dict(_item) for _item in obj["locations"]] if obj.get("locations") is not None else None,
             "costing": obj.get("costing"),
-            "costing_options": CostingOptions.from_dict(obj.get("costing_options")) if obj.get("costing_options") is not None else None,
-            "directions_options": DirectionsOptions.from_dict(obj.get("directions_options")) if obj.get("directions_options") is not None else None
+            "costing_options": CostingOptions.from_dict(obj["costing_options"]) if obj.get("costing_options") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -106,3 +136,4 @@ class OptimizedRouteRequest(BaseModel):
 
         return _obj
 
+