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

stadiamaps/models/isochrone_feature.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,56 +18,73 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Any, Dict, Optional
-from pydantic import BaseModel, StrictStr, validator
+from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
 from stadiamaps.models.isochrone_properties import IsochroneProperties
+from typing import Optional, Set
+from typing_extensions import Self
 
 class IsochroneFeature(BaseModel):
     """
     IsochroneFeature
-    """
+    """ # noqa: E501
     properties: Optional[IsochroneProperties] = None
     geometry: Optional[Dict[str, Any]] = None
     type: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["properties", "geometry", "type"]
+    __properties: ClassVar[List[str]] = ["properties", "geometry", "type"]
 
-    @validator('type')
+    @field_validator('type')
     def type_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('Feature'):
+        if value not in set(['Feature']):
             raise ValueError("must be one of enum values ('Feature')")
         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) -> IsochroneFeature:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of IsochroneFeature 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 properties
         if self.properties:
             _dict['properties'] = self.properties.to_dict()
@@ -79,16 +96,16 @@ class IsochroneFeature(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> IsochroneFeature:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of IsochroneFeature from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return IsochroneFeature.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = IsochroneFeature.parse_obj({
-            "properties": IsochroneProperties.from_dict(obj.get("properties")) if obj.get("properties") is not None else None,
+        _obj = cls.model_validate({
+            "properties": IsochroneProperties.from_dict(obj["properties"]) if obj.get("properties") is not None else None,
             "geometry": obj.get("geometry"),
             "type": obj.get("type")
         })
@@ -99,3 +116,4 @@ class IsochroneFeature(BaseModel):
 
         return _obj
 
+

stadiamaps/models/isochrone_properties.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,59 +18,76 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, validator
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Optional, Set
+from typing_extensions import Self
 
 class IsochroneProperties(BaseModel):
     """
     IsochroneProperties
-    """
-    fill_color: Optional[StrictStr] = Field(None, alias="fillColor")
+    """ # noqa: E501
+    fill_color: Optional[StrictStr] = Field(default=None, alias="fillColor")
     opacity: Optional[Union[StrictFloat, StrictInt]] = None
     fill: Optional[StrictStr] = None
-    fill_opacity: Optional[Union[StrictFloat, StrictInt]] = Field(None, alias="fillOpacity")
+    fill_opacity: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, alias="fillOpacity")
     color: Optional[StrictStr] = None
     contour: Optional[Union[StrictFloat, StrictInt]] = None
     metric: Optional[StrictStr] = None
     additional_properties: Dict[str, Any] = {}
-    __properties = ["fillColor", "opacity", "fill", "fillOpacity", "color", "contour", "metric"]
+    __properties: ClassVar[List[str]] = ["fillColor", "opacity", "fill", "fillOpacity", "color", "contour", "metric"]
 
-    @validator('metric')
+    @field_validator('metric')
     def metric_validate_enum(cls, value):
         """Validates the enum"""
         if value is None:
             return value
 
-        if value not in ('time', 'distance'):
+        if value not in set(['time', 'distance']):
             raise ValueError("must be one of enum values ('time', 'distance')")
         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) -> IsochroneProperties:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of IsochroneProperties 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():
@@ -79,19 +96,19 @@ class IsochroneProperties(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> IsochroneProperties:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of IsochroneProperties from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return IsochroneProperties.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = IsochroneProperties.parse_obj({
-            "fill_color": obj.get("fillColor"),
+        _obj = cls.model_validate({
+            "fillColor": obj.get("fillColor"),
             "opacity": obj.get("opacity"),
             "fill": obj.get("fill"),
-            "fill_opacity": obj.get("fillOpacity"),
+            "fillOpacity": obj.get("fillOpacity"),
             "color": obj.get("color"),
             "contour": obj.get("contour"),
             "metric": obj.get("metric")
@@ -103,3 +120,4 @@ class IsochroneProperties(BaseModel):
 
         return _obj
 
+

stadiamaps/models/isochrone_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,55 +18,73 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, confloat, conint, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing_extensions import Annotated
 from stadiamaps.models.contour import Contour
 from stadiamaps.models.coordinate import Coordinate
 from stadiamaps.models.costing_options import CostingOptions
 from stadiamaps.models.isochrone_costing_model import IsochroneCostingModel
+from typing import Optional, Set
+from typing_extensions import Self
 
 class IsochroneRequest(BaseModel):
     """
     IsochroneRequest
-    """
-    id: Optional[StrictStr] = Field(None, description="An identifier to disambiguate requests (echoed by the server).")
-    locations: conlist(Coordinate) = Field(...)
-    costing: IsochroneCostingModel = Field(...)
+    """ # noqa: E501
+    id: Optional[StrictStr] = Field(default=None, description="An identifier to disambiguate requests (echoed by the server).")
+    locations: List[Coordinate]
+    costing: IsochroneCostingModel
     costing_options: Optional[CostingOptions] = None
-    contours: conlist(Contour, max_items=4, min_items=1) = Field(...)
-    polygons: Optional[StrictBool] = Field(False, description="If true, the generated GeoJSON will use polygons. The default is to use LineStrings. Polygon output makes it easier to render overlapping areas in some visualization tools (such as MapLibre renderers).")
-    denoise: Optional[Union[confloat(le=1, ge=0, strict=True), conint(le=1, ge=0, strict=True)]] = Field(1, description="A value in the range [0, 1] which will be used to smooth out or remove smaller contours. A value of 1 will only return the largest contour for a given time value. A value of 0.5 drops any contours that are less than half the area of the largest contour in the set of contours for that same time value.")
-    generalize: Optional[Union[StrictFloat, StrictInt]] = Field(200.0, description="The value in meters to be used as a tolerance for Douglas-Peucker generalization.")
-    show_locations: Optional[StrictBool] = Field(False, description="If true, then the output GeoJSON will include the input locations as two MultiPoint features: one for the exact input coordinates, and a second for the route network node location that the point was snapped to.")
+    contours: Annotated[List[Contour], Field(min_length=1, max_length=4)]
+    polygons: Optional[StrictBool] = Field(default=False, description="If true, the generated GeoJSON will use polygons. The default is to use LineStrings. Polygon output makes it easier to render overlapping areas in some visualization tools (such as MapLibre renderers).")
+    denoise: Optional[Union[Annotated[float, Field(le=1, strict=True, ge=0)], Annotated[int, Field(le=1, strict=True, ge=0)]]] = Field(default=1, description="A value in the range [0, 1] which will be used to smooth out or remove smaller contours. A value of 1 will only return the largest contour for a given time value. A value of 0.5 drops any contours that are less than half the area of the largest contour in the set of contours for that same time value.")
+    generalize: Optional[Union[StrictFloat, StrictInt]] = Field(default=200.0, description="The value in meters to be used as a tolerance for Douglas-Peucker generalization.")
+    show_locations: Optional[StrictBool] = Field(default=False, description="If true, then the output GeoJSON will include the input locations as two MultiPoint features: one for the exact input coordinates, and a second for the route network node location that the point was snapped to.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["id", "locations", "costing", "costing_options", "contours", "polygons", "denoise", "generalize", "show_locations"]
+    __properties: ClassVar[List[str]] = ["id", "locations", "costing", "costing_options", "contours", "polygons", "denoise", "generalize", "show_locations"]
+
+    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) -> IsochroneRequest:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of IsochroneRequest 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:
@@ -92,20 +110,20 @@ class IsochroneRequest(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> IsochroneRequest:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of IsochroneRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return IsochroneRequest.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = IsochroneRequest.parse_obj({
+        _obj = cls.model_validate({
             "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,
-            "contours": [Contour.from_dict(_item) for _item in obj.get("contours")] if obj.get("contours") is not None else None,
+            "costing_options": CostingOptions.from_dict(obj["costing_options"]) if obj.get("costing_options") is not None else None,
+            "contours": [Contour.from_dict(_item) for _item in obj["contours"]] if obj.get("contours") is not None else None,
             "polygons": obj.get("polygons") if obj.get("polygons") is not None else False,
             "denoise": obj.get("denoise") if obj.get("denoise") is not None else 1,
             "generalize": obj.get("generalize") if obj.get("generalize") is not None else 200.0,
@@ -118,3 +136,4 @@ class IsochroneRequest(BaseModel):
 
         return _obj
 
+

stadiamaps/models/isochrone_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,53 +18,70 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional
-from pydantic import BaseModel, Field, StrictStr, conlist, validator
+from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List, Optional
 from stadiamaps.models.isochrone_feature import IsochroneFeature
+from typing import Optional, Set
+from typing_extensions import Self
 
 class IsochroneResponse(BaseModel):
     """
     IsochroneResponse
-    """
+    """ # noqa: E501
     id: Optional[StrictStr] = None
-    features: conlist(IsochroneFeature) = Field(...)
-    type: StrictStr = Field(...)
+    features: List[IsochroneFeature]
+    type: StrictStr
     additional_properties: Dict[str, Any] = {}
-    __properties = ["id", "features", "type"]
+    __properties: ClassVar[List[str]] = ["id", "features", "type"]
 
-    @validator('type')
+    @field_validator('type')
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ('FeatureCollection'):
+        if value not in set(['FeatureCollection']):
             raise ValueError("must be one of enum values ('FeatureCollection')")
         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) -> IsochroneResponse:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of IsochroneResponse 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 features (list)
         _items = []
         if self.features:
@@ -80,17 +97,17 @@ class IsochroneResponse(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> IsochroneResponse:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of IsochroneResponse from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return IsochroneResponse.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = IsochroneResponse.parse_obj({
+        _obj = cls.model_validate({
             "id": obj.get("id"),
-            "features": [IsochroneFeature.from_dict(_item) for _item in obj.get("features")] if obj.get("features") is not None else None,
+            "features": [IsochroneFeature.from_dict(_item) for _item in obj["features"]] if obj.get("features") is not None else None,
             "type": obj.get("type")
         })
         # store additional fields in additional_properties
@@ -100,3 +117,4 @@ class IsochroneResponse(BaseModel):
 
         return _obj
 
+