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

stadiamaps/models/edge_use.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 EdgeUse(str, Enum):
@@ -63,8 +60,8 @@ class EdgeUse(str, Enum):
     TRANSIT_CONNECTION = 'transit_connection'
 
     @classmethod
-    def from_json(cls, json_str: str) -> EdgeUse:
+    def from_json(cls, json_str: str) -> Self:
         """Create an instance of EdgeUse from a JSON string"""
-        return EdgeUse(json.loads(json_str))
+        return cls(json.loads(json_str))
 
 

stadiamaps/models/end_node.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,50 +18,67 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import List, Optional, Union
-from pydantic import BaseModel, Field, StrictBool, StrictFloat, StrictInt, StrictStr, conlist
+from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictFloat, StrictInt, StrictStr
+from typing import Any, ClassVar, Dict, List, Optional, Union
 from stadiamaps.models.intersecting_edge import IntersectingEdge
 from stadiamaps.models.node_type import NodeType
+from typing import Optional, Set
+from typing_extensions import Self
 
 class EndNode(BaseModel):
     """
     The node at the end of this edge
-    """
-    intersecting_edges: Optional[conlist(IntersectingEdge)] = Field(None, description="A set of edges intersecting this node.")
-    elapsed_time: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The elapsed time along the path to arrive at this node.")
-    admin_index: Optional[StrictInt] = Field(None, description="The index into the `admins` list in which this node lies.")
+    """ # noqa: E501
+    intersecting_edges: Optional[List[IntersectingEdge]] = Field(default=None, description="A set of edges intersecting this node.")
+    elapsed_time: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The elapsed time along the path to arrive at this node.")
+    admin_index: Optional[StrictInt] = Field(default=None, description="The index into the `admins` list in which this node lies.")
     type: Optional[NodeType] = None
-    fork: Optional[StrictBool] = Field(None, description="True if this node is a fork.")
-    time_zone: Optional[StrictStr] = Field(None, description="The canonical TZDB identifier for the node's time zone.")
+    fork: Optional[StrictBool] = Field(default=None, description="True if this node is a fork.")
+    time_zone: Optional[StrictStr] = Field(default=None, description="The canonical TZDB identifier for the node's time zone.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["intersecting_edges", "elapsed_time", "admin_index", "type", "fork", "time_zone"]
+    __properties: ClassVar[List[str]] = ["intersecting_edges", "elapsed_time", "admin_index", "type", "fork", "time_zone"]
+
+    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) -> EndNode:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of EndNode 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 intersecting_edges (list)
         _items = []
         if self.intersecting_edges:
@@ -77,16 +94,16 @@ class EndNode(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> EndNode:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of EndNode from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return EndNode.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = EndNode.parse_obj({
-            "intersecting_edges": [IntersectingEdge.from_dict(_item) for _item in obj.get("intersecting_edges")] if obj.get("intersecting_edges") is not None else None,
+        _obj = cls.model_validate({
+            "intersecting_edges": [IntersectingEdge.from_dict(_item) for _item in obj["intersecting_edges"]] if obj.get("intersecting_edges") is not None else None,
             "elapsed_time": obj.get("elapsed_time"),
             "admin_index": obj.get("admin_index"),
             "type": obj.get("type"),
@@ -100,3 +117,4 @@ class EndNode(BaseModel):
 
         return _obj
 
+

stadiamaps/models/geo_attributes.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,64 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-from typing import Optional, Union
-from pydantic import BaseModel, Field, StrictFloat, StrictInt
+from pydantic import BaseModel, ConfigDict, Field, StrictFloat, StrictInt
+from typing import Any, ClassVar, Dict, List, Optional, Union
+from typing import Optional, Set
+from typing_extensions import Self
 
 class GeoAttributes(BaseModel):
     """
     GeoAttributes
-    """
-    curvature: Optional[StrictInt] = Field(None, description="Curvature factor.")
-    max_down_slope: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The maximum downward slope. Uses 1 degree precision for slopes to -16 degrees, and 4 degree precision afterwards (up to a max of -76 degrees).")
-    max_up_slope: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The maximum upward slope. Uses 1 degree precision for slopes to 16 degrees, and 4 degree precision afterwards (up to a max of 76 degrees).")
-    weighted_grade: Optional[Union[StrictFloat, StrictInt]] = Field(None, description="The weighted estimate of the grade.")
-    length: Optional[StrictInt] = Field(None, description="The length of the edge, in meters.")
+    """ # noqa: E501
+    curvature: Optional[StrictInt] = Field(default=None, description="Curvature factor.")
+    max_down_slope: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The maximum downward slope. Uses 1 degree precision for slopes to -16 degrees, and 4 degree precision afterwards (up to a max of -76 degrees).")
+    max_up_slope: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The maximum upward slope. Uses 1 degree precision for slopes to 16 degrees, and 4 degree precision afterwards (up to a max of 76 degrees).")
+    weighted_grade: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="The weighted estimate of the grade.")
+    length: Optional[StrictInt] = Field(default=None, description="The length of the edge, in meters.")
     additional_properties: Dict[str, Any] = {}
-    __properties = ["curvature", "max_down_slope", "max_up_slope", "weighted_grade", "length"]
+    __properties: ClassVar[List[str]] = ["curvature", "max_down_slope", "max_up_slope", "weighted_grade", "length"]
+
+    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) -> GeoAttributes:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of GeoAttributes 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():
@@ -67,15 +84,15 @@ class GeoAttributes(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> GeoAttributes:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of GeoAttributes from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return GeoAttributes.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = GeoAttributes.parse_obj({
+        _obj = cls.model_validate({
             "curvature": obj.get("curvature"),
             "max_down_slope": obj.get("max_down_slope"),
             "max_up_slope": obj.get("max_up_slope"),
@@ -89,3 +106,4 @@ class GeoAttributes(BaseModel):
 
         return _obj
 
+

stadiamaps/models/geo_json_geometry.py

@@ -3,29 +3,27 @@
 """
     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
-from inspect import getfullargspec
 import json
 import pprint
-import re  # noqa: F401
-
+from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator
 from typing import Any, List, Optional
-from pydantic import BaseModel, Field, StrictStr, ValidationError, validator
 from stadiamaps.models.geo_json_line_string import GeoJSONLineString
 from stadiamaps.models.geo_json_point import GeoJSONPoint
 from stadiamaps.models.geo_json_polygon import GeoJSONPolygon
-from typing import Any, List
 from pydantic import StrictStr, Field
+from typing import Union, List, Optional, Dict
+from typing_extensions import Literal, Self
 
 GEOJSONGEOMETRY_ONE_OF_SCHEMAS = ["GeoJSONLineString", "GeoJSONPoint", "GeoJSONPolygon"]
 
@@ -39,16 +37,19 @@ class GeoJSONGeometry(BaseModel):
     oneof_schema_2_validator: Optional[GeoJSONLineString] = None
     # data type: GeoJSONPolygon
     oneof_schema_3_validator: Optional[GeoJSONPolygon] = None
-    actual_instance: Any
-    one_of_schemas: List[str] = Field(GEOJSONGEOMETRY_ONE_OF_SCHEMAS, const=True)
+    actual_instance: Optional[Union[GeoJSONLineString, GeoJSONPoint, GeoJSONPolygon]] = None
+    one_of_schemas: List[str] = Field(default=Literal["GeoJSONLineString", "GeoJSONPoint", "GeoJSONPolygon"])
 
-    class Config:
-        validate_assignment = True
+    model_config = ConfigDict(
+        validate_assignment=True,
+        protected_namespaces=(),
+    )
 
-    discriminator_value_class_map = {
+
+    discriminator_value_class_map: Dict[str, str] = {
     }
 
-    def __init__(self, *args, **kwargs):
+    def __init__(self, *args, **kwargs) -> None:
         if args:
             if len(args) > 1:
                 raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`")
@@ -58,9 +59,9 @@ class GeoJSONGeometry(BaseModel):
         else:
             super().__init__(**kwargs)
 
-    @validator('actual_instance')
+    @field_validator('actual_instance')
     def actual_instance_must_validate_oneof(cls, v):
-        instance = GeoJSONGeometry.construct()
+        instance = GeoJSONGeometry.model_construct()
         error_messages = []
         match = 0
         # validate data type: GeoJSONPoint
@@ -88,13 +89,13 @@ class GeoJSONGeometry(BaseModel):
             return v
 
     @classmethod
-    def from_dict(cls, obj: dict) -> GeoJSONGeometry:
+    def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self:
         return cls.from_json(json.dumps(obj))
 
     @classmethod
-    def from_json(cls, json_str: str) -> GeoJSONGeometry:
+    def from_json(cls, json_str: str) -> Self:
         """Returns the object represented by the json string"""
-        instance = GeoJSONGeometry.construct()
+        instance = cls.model_construct()
         error_messages = []
         match = 0
 
@@ -131,19 +132,17 @@ class GeoJSONGeometry(BaseModel):
         if self.actual_instance is None:
             return "null"
 
-        to_json = getattr(self.actual_instance, "to_json", None)
-        if callable(to_json):
+        if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json):
             return self.actual_instance.to_json()
         else:
             return json.dumps(self.actual_instance)
 
-    def to_dict(self) -> dict:
+    def to_dict(self) -> Optional[Union[Dict[str, Any], GeoJSONLineString, GeoJSONPoint, GeoJSONPolygon]]:
         """Returns the dict representation of the actual instance"""
         if self.actual_instance is None:
             return None
 
-        to_dict = getattr(self.actual_instance, "to_dict", None)
-        if callable(to_dict):
+        if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict):
             return self.actual_instance.to_dict()
         else:
             # primitive type
@@ -151,5 +150,6 @@ class GeoJSONGeometry(BaseModel):
 
     def to_str(self) -> str:
         """Returns the string representation of the actual instance"""
-        return pprint.pformat(self.dict())
+        return pprint.pformat(self.model_dump())
+
 

stadiamaps/models/geo_json_geometry_base.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,50 +18,67 @@ import pprint
 import re  # noqa: F401
 import json
 
-
-
-from pydantic import BaseModel, Field, StrictStr, validator
+from pydantic import BaseModel, ConfigDict, StrictStr, field_validator
+from typing import Any, ClassVar, Dict, List
+from typing import Optional, Set
+from typing_extensions import Self
 
 class GeoJSONGeometryBase(BaseModel):
     """
     GeoJSONGeometryBase
-    """
-    type: StrictStr = Field(...)
+    """ # noqa: E501
+    type: StrictStr
     additional_properties: Dict[str, Any] = {}
-    __properties = ["type"]
+    __properties: ClassVar[List[str]] = ["type"]
 
-    @validator('type')
+    @field_validator('type')
     def type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in ('Point', 'MultiPoint', 'LineString', 'MultiLineString', 'Polygon', 'MultiPolygon'):
+        if value not in set(['Point', 'MultiPoint', 'LineString', 'MultiLineString', 'Polygon', 'MultiPolygon']):
             raise ValueError("must be one of enum values ('Point', 'MultiPoint', 'LineString', 'MultiLineString', 'Polygon', 'MultiPolygon')")
         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) -> GeoJSONGeometryBase:
+    def from_json(cls, json_str: str) -> Optional[Self]:
         """Create an instance of GeoJSONGeometryBase 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():
@@ -70,15 +87,15 @@ class GeoJSONGeometryBase(BaseModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> GeoJSONGeometryBase:
+    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
         """Create an instance of GeoJSONGeometryBase from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return GeoJSONGeometryBase.parse_obj(obj)
+            return cls.model_validate(obj)
 
-        _obj = GeoJSONGeometryBase.parse_obj({
+        _obj = cls.model_validate({
             "type": obj.get("type")
         })
         # store additional fields in additional_properties
@@ -88,3 +105,4 @@ class GeoJSONGeometryBase(BaseModel):
 
         return _obj
 
+