remove jsonpath_rw

Author: guzzijones

fixed-requirements.txt

@@ -10,7 +10,7 @@ amqp==5.3.1
 apscheduler==3.11.0
 chardet==5.2.0
 cffi==1.17.1
-cryptography=<47.0.0
+cryptography==45.0.7
 eventlet==0.39.1
 flex==6.14.1
 # Note: installs gitpython==3.1.37 (security fixed) under py3.8 and gitpython==3.1.18 (latest available, vulnerable) under py3.6
@@ -21,14 +21,11 @@ gitdb==4.0.12
 # Note: greenlet is used by eventlet
 greenlet==3.1.1
 gunicorn==23.0.0
-jsonpath-rw==1.4.0
 jsonschema==3.2.0
 kombu==5.5.4
 lockfile==0.12.2
 mongoengine==0.29.1
 networkx==3.1
-# jsonpath-rw is the only thing that depends on decorator (a transitive dep)
-decorator==5.2.1
 # 202403: Bump oslo.config for py3.10 support.
 oslo.config==9.6.0
 oslo.utils==7.3.0

requirements-pants.txt

@@ -22,7 +22,7 @@ gitpython
 greenlet
 gunicorn
 jinja2
-jsonpath-rw
+jsonpath-ng
 jsonschema>=3,<4
 kombu
 lockfile

requirements.txt

@@ -14,8 +14,8 @@ bcrypt==4.3.0
 cffi==1.17.1
 chardet==5.2.0
 ciso8601
-cryptography==43.0.3
-decorator==5.2.1
+cryptography==45.0.7
+decorator
 dnspython
 editor==1.6.6
 eventlet==0.39.1
@@ -26,7 +26,7 @@ greenlet==3.1.1
 gunicorn==23.0.0
 importlib-metadata==7.1.0
 jinja2==3.1.6
-jsonpath-rw==1.4.0
+jsonpath-ng
 jsonschema==3.2.0
 kombu==5.5.4
 lockfile==0.12.2
@@ -39,6 +39,7 @@ orquesta@ git+https://github.com/StackStorm/orquesta.git@5ba1467614b2ef8b4709b2c
 oslo.config==9.6.0
 oslo.utils==7.3.0
 paramiko==3.5.1
+ply
 prettytable==3.10.2
 prompt-toolkit==3.0.52
 psutil==7.0.0

st2client/in-requirements.txt

@@ -4,11 +4,12 @@ importlib-metadata
 typing-extensions
 argcomplete
 prettytable
+ply
 pytz
 python-dateutil
 pyyaml
 jsonschema
-jsonpath-rw
+jsonpath-ng
 requests
 # urllib3 is a transitive dep
 urllib3

st2client/requirements.txt

@@ -8,12 +8,13 @@
 argcomplete==3.6.2
 cffi==1.17.1
 chardet==5.2.0
-cryptography==43.0.3
+cryptography==45.0.7
 editor==1.6.6
 importlib-metadata==7.1.0
-jsonpath-rw==1.4.0
+jsonpath-ng
 jsonschema==3.2.0
 orjson==3.10.15
+ply
 prettytable==3.10.2
 prompt-toolkit==3.0.52
 pyOpenSSL

st2client/st2client/utils/jsutil.py

@@ -13,8 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from __future__ import absolute_import
-from jsonpath_rw import parse
+from jsonpath_ng import parse
 import re
 
 # A simple expression is defined as a series of letters [a-zA-Z], numbers [0-9],
@@ -65,8 +64,7 @@ def _get_value_complex(doc, key):
     """
     Extracts a value from a nested set of dictionaries 'doc' based on
     a 'key' string.
-    The key is expected to be a jsonpath_rw expression:
-    http://jsonpath-rw.readthedocs.io/en/stable/
+    The key is expected to be a jsonpath_ng expression:
 
     Returns the extracted value from the key specified (if found)
     Returns None if the key can not be found
@@ -85,10 +83,10 @@ def get_value(doc, key):
         raise ValueError(
             "doc is not an instance of dict: type={} value='{}'".format(type(doc), doc)
         )
-    # jsonpath_rw can be very slow when processing expressions.
+    # jsonpath_ng can be very slow when processing expressions.
     # In the case of a simple expression we've created a "fast path" that avoids
-    # the complexity introduced by running jsonpath_rw code.
-    # For more complex expressions we fall back to using jsonpath_rw.
+    # the complexity introduced by running jsonpath_ng code.
+    # For more complex expressions we fall back to using jsonpath_ng.
     # This provides flexibility and increases performance in the base case.
     match = SIMPLE_EXPRESSION_REGEX_CMPL.match(key)
     if match:

st2common/in-requirements.txt

@@ -39,7 +39,7 @@ redis
 routes
 flex
 webob
-jsonpath-rw
+jsonpath-ng
 pyOpenSSL
 python-statsd
 ciso8601

st2common/requirements.txt

@@ -11,16 +11,16 @@ backports.zoneinfo[tzdata]; python_version<"3.9"
 cffi==1.17.1
 chardet==5.2.0
 ciso8601
-cryptography==43.0.3
-decorator==5.2.1
+cryptography==45.0.7
+decorator
 dnspython
 eventlet==0.39.1
 flex==6.14.1
 gitdb==4.0.12
 gitpython==3.1.45
 greenlet==3.1.1
 jinja2==3.1.6
-jsonpath-rw==1.4.0
+jsonpath-ng
 jsonschema==3.2.0
 kombu==5.5.4
 lockfile==0.12.2

st2common/st2common/expressions/functions/data.py

@@ -16,7 +16,7 @@
 from __future__ import absolute_import
 
 import json
-import jsonpath_rw
+import jsonpath_ng
 import six
 import orjson
 
@@ -91,13 +91,12 @@ def json_escape(value):
 
 def jsonpath_query(value, query):
     """Extracts data from an object `value` using a JSONPath `query`.
-    :link: https://github.com/kennknowles/python-jsonpath-rw
     :param value: a object (dict, array, etc) to query
     :param query: a JSONPath query expression (string)
     :returns: the result of the query executed on the value
     :rtype: dict, array, int, string, bool
     """
-    expr = jsonpath_rw.parse(query)
+    expr = jsonpath_ng.parse(query)
 
     matches = [match.value for match in expr.find(value)]
 

st2common/st2common/util/payload.py

@@ -14,7 +14,7 @@
 # limitations under the License.
 
 from __future__ import absolute_import
-from jsonpath_rw import parse
+from jsonpath_ng import parse
 
 from st2common.constants.keyvalue import SYSTEM_SCOPES
 from st2common.constants.rules import TRIGGER_PAYLOAD_PREFIX