📌 fix: Fix typing issue

Signed-off-by: Saif Ul Islam <[email protected]>

Author: Rubix982

setup.py

@@ -23,7 +23,7 @@
 
 # Setup variables. Change as needed
 NAME = "mapillary"  
-VERSION = "1.0.10"
+VERSION = "1.0.11"
 AUTHOR = "Christopher Beddow"
 AUTHOR_EMAIL = "[email protected]"
 LICENSE = "MIT"

src/mapillary/models/api/general.py

@@ -15,7 +15,7 @@
 
 # Package imports
 import mercantile
-from typing import Literal
+import typing
 from vt2geojson.tools import vt_bytes_to_geojson
 
 # Local imports
@@ -51,8 +51,12 @@ class GeneralAdapter(object):
     """
 
     # layer types
-    __LAYER_TYPES = Literal[
-        "overview", "sequence", "image", "map_feature", "traffic_sign"
+    __LAYER_TYPES: typing.List[str] = [
+        "overview",
+        "sequence",
+        "image",
+        "map_feature",
+        "traffic_sign",
     ]
 
     def __init__(self, *args: object) -> None:
@@ -73,7 +77,7 @@ def fetch_image_tiles(
         zoom: int,
         longitude: float,
         latitude: float,
-        layer: __LAYER_TYPES = "image",
+        layer: str = "image",
     ) -> dict:
         """
         Get the tiles for a given image.
@@ -93,7 +97,6 @@ def fetch_image_tiles(
 
         # Perform validation checks
         self.__validation_checks(
-            function=self.fetch_image_tiles,
             zoom=zoom,
             longitude=longitude,
             latitude=latitude,
@@ -114,7 +117,7 @@ def fetch_computed_image_tiles(
         zoom: int,
         longitude: float,
         latitude: float,
-        layer: __LAYER_TYPES = "image",
+        layer: str = "image",
     ) -> dict:
         """
         Get the image type for a given image.
@@ -133,7 +136,6 @@ def fetch_computed_image_tiles(
         """
         # Perform validation checks
         self.__validation_checks(
-            function=self.fetch_computed_image_tiles,
             zoom=zoom,
             longitude=longitude,
             latitude=latitude,
@@ -155,7 +157,7 @@ def fetch_map_features_tiles(
         zoom: int,
         longitude: float,
         latitude: float,
-        layer: __LAYER_TYPES = "image",
+        layer: str = "image",
     ):
         """
         Get the map features for a given coordinate set
@@ -174,7 +176,6 @@ def fetch_map_features_tiles(
         """
         # Perform validation checks
         self.__validation_checks(
-            function=self.fetch_map_features_tiles,
             zoom=zoom,
             longitude=longitude,
             latitude=latitude,
@@ -210,7 +211,6 @@ def fetch_map_features_traffic_tiles(
         """
         # Perform validation checks
         self.__validation_checks(
-            function=self.fetch_map_features_traffic_tiles,
             zoom=zoom,
             longitude=longitude,
             latitude=latitude,
@@ -241,7 +241,7 @@ def __preprocess_layer(
             )
 
             return vt_bytes_to_geojson(
-                # Paramaters appropriately
+                # Parameters appropriately
                 b_content=self.client.get(
                     self.__preprocess_api_string(
                         # Turn coordinates into a tile
@@ -445,7 +445,12 @@ def __zoom_range_check(self, layer: str, zoom: int):
             )
 
     def __validation_checks(
-        self, function, longitude: float, latitude: float, zoom: int, layer: str
+        self,
+        longitude: float,
+        latitude: float,
+        zoom: int,
+        layer: str,
+        layer_options: typing.List[str] = [],
     ) -> None:
         """
         Validation checks for the parameters of longitude, latitude, layer, zoom
@@ -465,7 +470,11 @@ def __validation_checks(
         :raises InvalidOptionError: Invalid option passed
         """
         # Check if the correct literals were passed to the function
-        LiteralEnforcementException.enforce_literal(function=function)
+        LiteralEnforcementException.enforce_literal(
+            option_selected=layer,
+            options=self.__LAYER_TYPES if layer_options == [] else layer_options,
+            param="layer",
+        )
 
         # Check the parameters for the correct range
         self.__check_parameters(longitude, latitude)

src/mapillary/models/exceptions.py

@@ -13,11 +13,6 @@
 - License: MIT LICENSE
 """
 
-# Local imports
-import inspect
-
-from typing import Literal, get_args, get_origin
-
 # Package imports
 import typing
 
@@ -349,19 +344,14 @@ def __init__(self, *args: object) -> None:
         super().__init__(*args)
 
     @staticmethod
-    def enforce_literal(function: any):
-        frame = inspect.stack()[1].frame
-
-        *_, parameters = inspect.getargvalues(frame)
-
-        for name, literal in function.__annotations__.items():
-
-            if get_origin(literal) is Literal and name in parameters:
-
-                value = parameters[name]
+    def enforce_literal(
+        option_selected: str,
+        options: typing.Union[typing.List[str], typing.List[int]],
+        param: str,
+    ):
 
-                if value not in get_args(literal):
+        if option_selected not in options:
 
-                    raise InvalidOptionError(
-                        param=name, value=value, options=get_args(literal)
-                    )
+            raise InvalidOptionError(
+                param=param, value=option_selected, options=options
+            )