@@ -54,63 +54,54 @@ def _wrap_str_value(value: str) -> str:
5454 def equal_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
5555 if isinstance (value , list ):
5656 return f"({ self .or_token .join ([self .equal_modifier (field = field , value = v ) for v in value ])} )"
57- return f"{ field } == { self ._pre_process_value (
58- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
59- )} "
57+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
58+ return f"{ field } == { value } "
6059
6160 def less_modifier (self , field : str , value : Union [int , str ]) -> str :
62- return f"{ field } < { self ._pre_process_value (
63- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
64- )} "
61+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
62+ return f"{ field } < { value } "
6563
6664 def less_or_equal_modifier (self , field : str , value : Union [int , str ]) -> str :
67- return f"{ field } <= { self ._pre_process_value (
68- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
69- )} "
65+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
66+ return f"{ field } <= { value } "
7067
7168 def greater_modifier (self , field : str , value : Union [int , str ]) -> str :
72- return f"{ field } > { self ._pre_process_value (
73- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
74- )} "
69+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
70+ return f"{ field } > { value } "
7571
7672 def greater_or_equal_modifier (self , field : str , value : Union [int , str ]) -> str :
77- return f"{ field } >= { self ._pre_process_value (
78- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
79- )} "
73+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
74+ return f"{ field } >= { value } "
8075
8176 def not_equal_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
8277 if isinstance (value , list ):
8378 return f"({ self .or_token .join ([self .not_equal_modifier (field = field , value = v ) for v in value ])} )"
84- return f"{ field } != { self ._pre_process_value (
85- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
86- )} "
79+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
80+ return f"{ field } != { value } "
8781
8882 def contains_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
8983 if isinstance (value , list ):
9084 return f"({ self .or_token .join (self .contains_modifier (field = field , value = v ) for v in value )} )"
9185 if field .endswith (".text" ):
9286 return self .regex_modifier (field = field , value = value )
93- return f'{ field } like "*{ self ._pre_process_value (
94- field , value , value_type = ValueType .value , wrap_str = False , wrap_int = True
95- )} *"'
87+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = False , wrap_int = True )
88+ return f'{ field } like "*{ value } *"'
9689
9790 def endswith_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
9891 if field .endswith (".text" ):
9992 return self .regex_modifier (field = field , value = value )
10093 if isinstance (value , list ):
10194 return f"({ self .or_token .join (self .endswith_modifier (field = field , value = v ) for v in value )} )"
102- return f"ends_with({ field } , { self ._pre_process_value (
103- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
104- )} )"
95+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
96+ return f"ends_with({ field } , { value } )"
10597
10698 def startswith_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
10799 if field .endswith (".text" ):
108100 return self .regex_modifier (field = field , value = value )
109101 if isinstance (value , list ):
110102 return f"({ self .or_token .join (self .startswith_modifier (field = field , value = v ) for v in value )} )"
111- return f"starts_with({ field } , { self ._pre_process_value (
112- field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True
113- )} )"
103+ value = self ._pre_process_value (field , value , value_type = ValueType .value , wrap_str = True , wrap_int = True )
104+ return f"starts_with({ field } , { value } )"
114105
115106 def regex_modifier (self , field : str , value : DEFAULT_VALUE_TYPE ) -> str :
116107 if isinstance (value , list ):
0 commit comments