Skip to content

Commit 93649af

Browse files
author
dlacher
committed
updated Filters to support predicate logic
1 parent 003a0b7 commit 93649af

File tree

4 files changed

+176
-13
lines changed

4 files changed

+176
-13
lines changed

‎jsonpath_ng/ext/filter.py‎

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,34 @@
2727
'>': operator.gt,
2828
}
2929

30+
def eval_exp(expressions,val):
31+
for expression in expressions:
32+
if type(expression)==tuple and expression[0]=='|':
33+
val1=eval_exp(expression[1],val)
34+
val2=eval_exp(expression[2],val)
35+
if (val1 or val2):
36+
return True
37+
else:
38+
return False
39+
if type(expression)==tuple and expression[0]=='&':
40+
val1=eval_exp(expression[1],val)
41+
val2=eval_exp(expression[2],val)
42+
if (val1 and val2):
43+
return True
44+
else:
45+
return False
46+
if type(expression)==tuple and expression[0]=='!':
47+
val1=eval_exp(expression[1],val)
48+
if (val1):
49+
return False
50+
else:
51+
return True
52+
else:
53+
if(len([expression])==len(list(filter(lambda x: x.find(val),[expression])))):
54+
return True
55+
else:
56+
return False
57+
3058

3159
class Filter(JSONPath):
3260
"""The JSONQuery filter"""
@@ -41,12 +69,11 @@ def find(self, datum):
4169
datum = DatumInContext.wrap(datum)
4270
if not isinstance(datum.value, list):
4371
return []
44-
45-
return [DatumInContext(datum.value[i], path=Index(i), context=datum)
46-
for i in moves.range(0, len(datum.value))
47-
if (len(self.expressions) ==
48-
len(list(filter(lambda x: x.find(datum.value[i]),
49-
self.expressions))))]
72+
res=[]
73+
for i in moves.range(0,len(datum.value)):
74+
if eval_exp(self.expressions,datum.value[i]):
75+
res.append(DatumInContext(datum.value[i], path=Index(i), context=datum))
76+
return(res)
5077

5178
def __repr__(self):
5279
return '%s(%r)' % (self.__class__.__name__, self.expressions)
@@ -65,7 +92,6 @@ def __init__(self, target, op, value):
6592

6693
def find(self, datum):
6794
datum = self.target.find(DatumInContext.wrap(datum))
68-
6995
if not datum:
7096
return []
7197
if self.op is None:

‎jsonpath_ng/ext/parser.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
from .. import lexer
1515
from .. import parser
1616
from .. import Fields, This, Child
17-
1817
from . import arithmetic as _arithmetic
1918
from . import filter as _filter
2019
from . import iterable as _iterable
@@ -119,11 +118,18 @@ def p_expression(self, p):
119118
def p_expressions_expression(self, p):
120119
"expressions : expression"
121120
p[0] = [p[1]]
122-
121+
122+
def p_expressions_not(self, p):
123+
"expressions : '!' expressions"
124+
p[0]=[('!',p[2])]
125+
123126
def p_expressions_and(self, p):
124127
"expressions : expressions '&' expressions"
125-
# TODO(sileht): implements '|'
126-
p[0] = p[1] + p[3]
128+
p[0] = [('&',p[1],p[3])]
129+
130+
def p_expressions_or(self, p):
131+
"expressions : expressions '|' expressions"
132+
p[0] = [('|',p[1],p[3])]
127133

128134
def p_expressions_parens(self, p):
129135
"expressions : '(' expressions ')'"

‎jsonpath_ng/lexer.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def tokenize(self, string):
4848
#
4949
# Anyhow, it is pythonic to give some rope to hang oneself with :-)
5050

51-
literals = ['*', '.', '[', ']', '(', ')', '$', ',', ':', '|', '&']
51+
literals = ['*', '.', '[', ']', '(', ')', '$', ',', ':', '|', '&', '!']
5252

5353
reserved_words = { 'where': 'WHERE' }
5454

‎tests/test_jsonpath_rw_ext.py‎

Lines changed: 132 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,53 @@
2525
import testscenarios
2626

2727
from jsonpath_ng.ext import parser
28-
28+
rest_response1={
29+
"items":
30+
[
31+
{
32+
"status": "UP",
33+
"kind": "compute#region",
34+
"description": "us-central1",
35+
"quotas": [
36+
{"usage": 3.0, "metric": "CPUS", "limit": 72.0},
37+
{"usage": 261.0, "metric": "DISKS", "limit": 40960.0},
38+
{"usage": 0.0, "metric": "STATIC", "limit": 21.0},
39+
{"usage": 0.0, "metric": "IN_USE", "limit": 69.0},
40+
{"usage": 0.0, "metric": "SSD", "limit": 20480.0}
41+
],
42+
"id": "1000",
43+
"name": "us-central1"
44+
},
45+
{
46+
"status": "UP",
47+
"kind": "compute#region",
48+
"description": "us-central2",
49+
"quotas": [
50+
{"usage": 0.0, "metric": "CPUS", "limit": 72.0},
51+
{"usage": 0.0, "metric": "DISKS", "limit": 40960.0},
52+
{"usage": 0.0, "metric": "STATIC", "limit": 21.0},
53+
{"usage": 0.0, "metric": "IN_USE", "limit": 69.0},
54+
{"usage": 0.0, "metric": "SSD", "limit": 20480.0}
55+
],
56+
"id": "1001",
57+
"name": "us-central2"
58+
},
59+
{
60+
"status": "UP",
61+
"kind": "compute#region",
62+
"description": "us-central3",
63+
"quotas": [
64+
{"usage": 0.0, "metric": "CPUS", "limit": 90.0},
65+
{"usage": 0.0, "metric": "DISKS", "limit": 2040.0},
66+
{"usage": 0.0, "metric": "STATIC", "limit": 46.0},
67+
{"usage": 0.0, "metric": "IN_USE", "limit": 80.0},
68+
{"usage": 500.0, "metric": "SSD", "limit": 20480.0}
69+
],
70+
"id": "1002",
71+
"name": "us-central3"
72+
}
73+
]
74+
}
2975

3076
class Testjsonpath_ng_ext(testscenarios.WithScenarios,
3177
base.BaseTestCase):
@@ -94,6 +140,12 @@ class Testjsonpath_ng_ext(testscenarios.WithScenarios,
94140
{'cow': 5},
95141
{'cow': 'neigh'}]},
96142
target=[{'cow': 8}, {'cow': 7}])),
143+
('filter_gt_negation', dict(string='objects[?!cow<=5]',
144+
data={'objects': [{'cow': 8},
145+
{'cow': 7},
146+
{'cow': 5},
147+
{'cow': 'neigh'}]},
148+
target=[{'cow': 8}, {'cow': 7},{'cow':'neigh'}])),
97149
('filter_and', dict(string='objects[?cow>5&cat=2]',
98150
data={'objects': [{'cow': 8, 'cat': 2},
99151
{'cow': 7, 'cat': 2},
@@ -102,6 +154,85 @@ class Testjsonpath_ng_ext(testscenarios.WithScenarios,
102154
{'cow': 8, 'cat': 3}]},
103155
target=[{'cow': 8, 'cat': 2},
104156
{'cow': 7, 'cat': 2}])),
157+
('filter_and_demorgans', dict(string='objects[?!(cow<=5|cat!=2)]',
158+
data={'objects': [{'cow': 8, 'cat': 2},
159+
{'cow': 7, 'cat': 2},
160+
{'cow': 2, 'cat': 2},
161+
{'cow': 5, 'cat': 3},
162+
{'cow': 8, 'cat': 3}]},
163+
target=[{'cow': 8, 'cat': 2},
164+
{'cow': 7, 'cat': 2}])),
165+
('filter_or', dict(string='objects[?cow=8|cat=3]',
166+
data={'objects': [{'cow': 8, 'cat': 2},
167+
{'cow': 7, 'cat': 2},
168+
{'cow': 2, 'cat': 2},
169+
{'cow': 5, 'cat': 3},
170+
{'cow': 8, 'cat': 3}]},
171+
target=[{'cow': 8, 'cat': 2},
172+
{'cow': 5, 'cat': 3},
173+
{'cow': 8, 'cat': 3}])),
174+
('filter_or_demorgans', dict(string='objects[?!(cow!=8&cat!=3)]',
175+
data={'objects': [{'cow': 8, 'cat': 2},
176+
{'cow': 7, 'cat': 2},
177+
{'cow': 2, 'cat': 2},
178+
{'cow': 5, 'cat': 3},
179+
{'cow': 8, 'cat': 3}]},
180+
target=[{'cow': 8, 'cat': 2},
181+
{'cow': 5, 'cat': 3},
182+
{'cow': 8, 'cat': 3}])),
183+
('filter_or_and', dict(string='objects[?cow=8&cat=2|cat=3]',
184+
data={'objects': [{'cow': 8, 'cat': 2},
185+
{'cow': 7, 'cat': 2},
186+
{'cow': 2, 'cat': 2},
187+
{'cow': 5, 'cat': 3},
188+
{'cow': 8, 'cat': 3}]},
189+
target=[{'cow': 8, 'cat': 2},
190+
{'cow': 5, 'cat': 3},
191+
{'cow': 8, 'cat': 3}])),
192+
('filter_or_and_overide', dict(string='objects[?cow=8&(cat=2|cat=3)]',
193+
data={'objects': [{'cow': 8, 'cat': 2},
194+
{'cow': 7, 'cat': 2},
195+
{'cow': 2, 'cat': 2},
196+
{'cow': 5, 'cat': 3},
197+
{'cow': 8, 'cat': 3}]},
198+
target=[{'cow': 8, 'cat': 2},
199+
{'cow': 8, 'cat': 3}])),
200+
('filter_or_and', dict(string='objects[?dog=1|cat=3&cow=8]',
201+
data={'objects': [{'cow': 8, 'cat': 2, 'dog':1},
202+
{'cow': 7, 'cat': 2},
203+
{'cow': 2, 'cat': 2},
204+
{'cow': 5, 'cat': 3},
205+
{'cow': 8, 'cat': 3}]},
206+
target=[{'cow': 8, 'cat': 2, 'dog':1},
207+
{'cow': 8, 'cat': 3}])),
208+
('filter_complex', dict(string='$.items[?((!(val==4))&(id==2))|(!((id!=1)&(id!=3)))]',
209+
data={"items":[{"id":1, "val":1, "info":1},{"id":2, "val":4},{"id":2,"val":2},{"id":3,"val":3}]},
210+
target=[{'info': 1, 'id': 1, 'val': 1},
211+
{'id': 2, 'val': 2},
212+
{'id': 3, 'val': 3}])),
213+
('filter_complex2', dict(string="$.items[?(@.quotas[?((@.metric='SSD' & @.usage>0) | (@.metric='CPU' & @.usage>0) | (@.metric='DISKS' & @.usage>0))])]",
214+
data=rest_response1,
215+
target=[{'description': 'us-central1',
216+
'id': '1000',
217+
'kind': 'compute#region',
218+
'name': 'us-central1',
219+
'quotas': [{'limit': 72.0, 'metric': 'CPUS', 'usage': 3.0},
220+
{'limit': 40960.0, 'metric': 'DISKS', 'usage': 261.0},
221+
{'limit': 21.0, 'metric': 'STATIC', 'usage': 0.0},
222+
{'limit': 69.0, 'metric': 'IN_USE', 'usage': 0.0},
223+
{'limit': 20480.0, 'metric': 'SSD', 'usage': 0.0}],
224+
'status': 'UP'},
225+
{'description': 'us-central3',
226+
'id': '1002',
227+
'kind': 'compute#region',
228+
'name': 'us-central3',
229+
'quotas': [{'limit': 90.0, 'metric': 'CPUS', 'usage': 0.0},
230+
{'limit': 2040.0, 'metric': 'DISKS', 'usage': 0.0},
231+
{'limit': 46.0, 'metric': 'STATIC', 'usage': 0.0},
232+
{'limit': 80.0, 'metric': 'IN_USE', 'usage': 0.0},
233+
{'limit': 20480.0, 'metric': 'SSD', 'usage': 500.0}],
234+
'status': 'UP'}])),
235+
105236
('filter_float_gt', dict(
106237
string='objects[?confidence>=0.5].prediction',
107238
data={

0 commit comments

Comments
 (0)