improv: make jmespath an official project dep

Author: heitorlessa

aws_lambda_powertools/utilities/validation/base.py

@@ -1,25 +1,15 @@
-import json
 import logging
 from typing import Dict
 
 import fastjsonschema
+import jmespath
+from jmespath.exceptions import LexerError
 
 from .exceptions import InvalidEnvelopeExpressionError, InvalidSchemaError, SchemaValidationError
+from .jmespath_functions import PowertoolsJson
 
 logger = logging.getLogger(__name__)
 
-try:
-    import jmespath
-
-    class PowertoolsJson(jmespath.functions.Functions):
-        @jmespath.functions.signature({"types": ["string"]})
-        def _func_powertools_json(self, value):
-            return json.loads(value)
-
-
-except ModuleNotFoundError:
-    jmespath = None
-
 
 def validate_data_against_schema(data: Dict, schema: Dict):
     try:
@@ -32,14 +22,11 @@ def validate_data_against_schema(data: Dict, schema: Dict):
 
 
 def unwrap_event_from_envelope(data: Dict, envelope: str, jmespath_options: Dict):
-    if not jmespath:
-        raise ModuleNotFoundError("This feature require aws-lambda-powertools[jmespath] extra package")
-
     if not jmespath_options:
         jmespath_options = {"custom_functions": PowertoolsJson()}
 
     try:
         logger.debug(f"Envelope detected: {envelope}. JMESPath options: {jmespath_options}")
         return jmespath.search(envelope, data, options=jmespath.Options(**jmespath_options))
-    except jmespath.exceptions.LexerError as e:
+    except LexerError as e:
         raise InvalidEnvelopeExpressionError(e)

aws_lambda_powertools/utilities/validation/jmespath_functions.py

@@ -0,0 +1,9 @@
+import json
+
+import jmespath
+
+
+class PowertoolsJson(jmespath.functions.Functions):
+    @jmespath.functions.signature({"types": ["string"]})
+    def _func_powertools_json(self, value):
+        return json.loads(value)

pyproject.toml

@@ -22,12 +22,7 @@ python = "^3.6"
 aws-xray-sdk = "^2.5.0"
 fastjsonschema = "^2.14.5"
 boto3 = "^1.12"
-
-# optional dependency to allow envelope feature in validator utility
-jmespath = {version = "^0.10.0", optional = true }
-
-[tool.poetry.extras]
-jmespath = ["jmespath"]
+jmespath = "^0.10.0"
 
 [tool.poetry.dev-dependencies]
 coverage = {extras = ["toml"], version = "^5.0.3"}