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

stadiamaps/models/pelias_geo_json_properties_addendum_osm.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, StrictStr
+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 PeliasGeoJSONPropertiesAddendumOsm(BaseModel):
     """
     PeliasGeoJSONPropertiesAddendumOsm
-    """
+    """ # noqa: E501
     website: Optional[StrictStr] = None
     wikipedia: Optional[StrictStr] = None
     wikidata: Optional[StrictStr] = None
     phone: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["website", "wikipedia", "wikidata", "phone"]
+    __properties: ClassVar[List[str]] = ["website", "wikipedia", "wikidata", "phone"]
+
+    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) -> PeliasGeoJSONPropertiesAddendumOsm:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of PeliasGeoJSONPropertiesAddendumOsm 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 PeliasGeoJSONPropertiesAddendumOsm(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> PeliasGeoJSONPropertiesAddendumOsm:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of PeliasGeoJSONPropertiesAddendumOsm from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return PeliasGeoJSONPropertiesAddendumOsm.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = PeliasGeoJSONPropertiesAddendumOsm.parse_obj({
+        _obj = cls.model_validate({
             "website": obj.get("website"),
             "wikipedia": obj.get("wikipedia"),
             "wikidata": obj.get("wikidata"),
@@ -87,3 +104,4 @@ class PeliasGeoJSONPropertiesAddendumOsm(BaseModel):
 
         return _obj
 
+

stadiamaps/models/pelias_layer.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 PeliasLayer(str, Enum):
@@ -53,8 +50,8 @@ class PeliasLayer(str, Enum):
     OCEAN = 'ocean'
 
     @classmethod
-    def from_json(cls, json_str: str) -> PeliasLayer:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of PeliasLayer from a JSON string"""
-        return PeliasLayer(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/pelias_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.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,47 +18,65 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing_extensions import Annotated
+from stadiamaps.models.geocoding_object import GeocodingObject
 from stadiamaps.models.pelias_geo_json_feature import PeliasGeoJSONFeature
-from stadiamaps.models.pelias_response_geocoding import PeliasResponseGeocoding
+from typing import Optional, Set
+from typing_extensions import Self
 
 class PeliasResponse(BaseModel):
     """
     PeliasResponse
-    """
-    geocoding: PeliasResponseGeocoding = Field(...)
-    bbox: Optional[conlist(Union[StrictFloat, StrictInt], max_items=4, min_items=4)] = Field(None, description="An array of 4 floating point numbers representing the (W, S, E, N) extremes of the features found.")
-    features: conlist(PeliasGeoJSONFeature) = Field(...)
+    """ # noqa: E501
+    geocoding: GeocodingObject
+    bbox: Optional[Annotated[List[Union[StrictFloat, StrictInt]], Field(min_length=4, max_length=4)]] = Field(default=None, description="An array of 4 floating point numbers representing the (W, S, E, N) extremes of the features found.")
+    features: List[PeliasGeoJSONFeature]
     additional_properties: Dict[str, Any] = {}
-    __properties = ["geocoding", "bbox", "features"]
+    __properties: ClassVar[List[str]] = ["geocoding", "bbox", "features"]
+
+    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) -> PeliasResponse:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of PeliasResponse 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 geocoding
         if self.geocoding:
             _dict['geocoding'] = self.geocoding.to_dict()
@@ -77,18 +95,18 @@ class PeliasResponse(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> PeliasResponse:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of PeliasResponse from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return PeliasResponse.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = PeliasResponse.parse_obj({
-            "geocoding": PeliasResponseGeocoding.from_dict(obj.get("geocoding")) if obj.get("geocoding") is not None else None,
+        _obj = cls.model_validate({
+            "geocoding": GeocodingObject.from_dict(obj["geocoding"]) if obj.get("geocoding") is not None else None,
             "bbox": obj.get("bbox"),
-            "features": [PeliasGeoJSONFeature.from_dict(_item) for _item in obj.get("features")] if obj.get("features") is not None else None
+            "features": [PeliasGeoJSONFeature.from_dict(_item) for _item in obj["features"]] if obj.get("features") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -97,3 +115,4 @@ class PeliasResponse(BaseModel):
 
         return _obj
 
+

stadiamaps/models/pelias_source.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 PeliasSource(str, Enum):
@@ -36,8 +33,8 @@ class PeliasSource(str, Enum):
     GEONAMES = 'geonames'
 
     @classmethod
-    def from_json(cls, json_str: str) -> PeliasSource:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of PeliasSource from a JSON string"""
-        return PeliasSource(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/restrictions.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, 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 Restrictions(BaseModel):
     """
     Restrictions
-    """
+    """ # noqa: E501
     golf_cart: Optional[StrictBool] = None
     truck: Optional[StrictBool] = None
     pedestrian: 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")
     emergency: Optional[StrictBool] = None
     motorcycle: Optional[StrictBool] = None
     car: Optional[StrictBool] = None
@@ -39,33 +40,49 @@ class Restrictions(BaseModel):
     bus: Optional[StrictBool] = None
     bicycle: Optional[StrictBool] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["golf_cart", "truck", "pedestrian", "wheelchair", "taxi", "HOV", "emergency", "motorcycle", "car", "moped", "bus", "bicycle"]
+    __properties: ClassVar[List[str]] = ["golf_cart", "truck", "pedestrian", "wheelchair", "taxi", "HOV", "emergency", "motorcycle", "car", "moped", "bus", "bicycle"]
+
+    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) -> Restrictions:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of Restrictions 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,21 +91,21 @@ class Restrictions(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Restrictions:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of Restrictions from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return Restrictions.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = Restrictions.parse_obj({
+        _obj = cls.model_validate({
             "golf_cart": obj.get("golf_cart"),
             "truck": obj.get("truck"),
             "pedestrian": obj.get("pedestrian"),
             "wheelchair": obj.get("wheelchair"),
             "taxi": obj.get("taxi"),
-            "hov": obj.get("HOV"),
+            "HOV": obj.get("HOV"),
             "emergency": obj.get("emergency"),
             "motorcycle": obj.get("motorcycle"),
             "car": obj.get("car"),
@@ -103,3 +120,4 @@ class Restrictions(BaseModel):
 
         return _obj
 
+

stadiamaps/models/road_class.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 RoadClass(str, Enum):
@@ -40,8 +37,8 @@ class RoadClass(str, Enum):
     SERVICE_OTHER = 'service_other'
 
     @classmethod
-    def from_json(cls, json_str: str) -> RoadClass:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of RoadClass from a JSON string"""
-        return RoadClass(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/route_leg.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,47 +18,65 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List
-from pydantic import BaseModel, Field, StrictStr, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictStr
+from typing import Any, ClassVar, Dict, List
+from typing_extensions import Annotated
 from stadiamaps.models.route_maneuver import RouteManeuver
 from stadiamaps.models.route_summary import RouteSummary
+from typing import Optional, Set
+from typing_extensions import Self
 
 class RouteLeg(BaseModel):
     """
     RouteLeg
-    """
-    maneuvers: conlist(RouteManeuver, min_items=1) = Field(...)
-    shape: StrictStr = Field(..., description="An encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm) with 6 digits of decimal precision.")
-    summary: RouteSummary = Field(...)
+    """ # noqa: E501
+    maneuvers: Annotated[List[RouteManeuver], Field(min_length=1)]
+    shape: StrictStr = Field(description="An encoded polyline (https://developers.google.com/maps/documentation/utilities/polylinealgorithm) with 6 digits of decimal precision.")
+    summary: RouteSummary
     additional_properties: Dict[str, Any] = {}
-    __properties = ["maneuvers", "shape", "summary"]
+    __properties: ClassVar[List[str]] = ["maneuvers", "shape", "summary"]
+
+    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) -> RouteLeg:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of RouteLeg 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 maneuvers (list)
         _items = []
         if self.maneuvers:
@@ -77,18 +95,18 @@ class RouteLeg(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> RouteLeg:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of RouteLeg from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return RouteLeg.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = RouteLeg.parse_obj({
-            "maneuvers": [RouteManeuver.from_dict(_item) for _item in obj.get("maneuvers")] if obj.get("maneuvers") is not None else None,
+        _obj = cls.model_validate({
+            "maneuvers": [RouteManeuver.from_dict(_item) for _item in obj["maneuvers"]] if obj.get("maneuvers") is not None else None,
             "shape": obj.get("shape"),
-            "summary": RouteSummary.from_dict(obj.get("summary")) if obj.get("summary") is not None else None
+            "summary": RouteSummary.from_dict(obj["summary"]) if obj.get("summary") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():
@@ -97,3 +115,4 @@ class RouteLeg(BaseModel):
 
         return _obj
 
+