Skip to content

Commit a622fc2

Browse files
committed
update prefixes
1 parent 9fe06e7 commit a622fc2

File tree

1 file changed

+14
-23
lines changed
  • uncoder-core/app/translator/platforms/elasticsearch/renders

1 file changed

+14
-23
lines changed

uncoder-core/app/translator/platforms/elasticsearch/renders/esql.py

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from app.translator.core.render import BaseFieldValueRender, PlatformQueryRender
2727
from app.translator.managers import render_manager
2828
from app.translator.platforms.elasticsearch.const import elasticsearch_esql_query_details
29-
from app.translator.platforms.elasticsearch.mapping import ElasticESQLMappings, esql_query_mappings
29+
from app.translator.platforms.elasticsearch.mapping import LuceneMappings, esql_query_mappings
3030
from app.translator.platforms.elasticsearch.str_value_manager import (
3131
ESQLQueryStrValueManager,
3232
esql_query_str_value_manager,
@@ -54,61 +54,52 @@ 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-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
58-
return f"{field} == {value}"
57+
return f"{field} == {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
5958

6059
def less_modifier(self, field: str, value: Union[int, str]) -> str:
61-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
62-
return f"{field} < {value}"
60+
return f"{field} < {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
6361

6462
def less_or_equal_modifier(self, field: str, value: Union[int, str]) -> str:
65-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
66-
return f"{field} <= {value}"
63+
return f"{field} <= {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
6764

6865
def greater_modifier(self, field: str, value: Union[int, str]) -> str:
69-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
70-
return f"{field} > {value}"
66+
return f"{field} > {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
7167

7268
def greater_or_equal_modifier(self, field: str, value: Union[int, str]) -> str:
73-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
74-
return f"{field} >= {value}"
69+
return f"{field} >= {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
7570

7671
def not_equal_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
7772
if isinstance(value, list):
7873
return f"({self.or_token.join([self.not_equal_modifier(field=field, value=v) for v in value])})"
79-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True, wrap_int=True)
80-
return f"{field} != {value}"
74+
return f"{field} != {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)}"
8175

8276
def contains_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
8377
if isinstance(value, list):
8478
return f"({self.or_token.join(self.contains_modifier(field=field, value=v) for v in value)})"
8579
if field.endswith(".text"):
8680
return self.regex_modifier(field=field, value=value)
87-
value = self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=False, wrap_int=True)
88-
return f'{field} like "*{value}*"'
81+
return f'{field} like "*{self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=False)}*"'
8982

9083
def endswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
9184
if field.endswith(".text"):
9285
return self.regex_modifier(field=field, value=value)
9386
if isinstance(value, list):
9487
return f"({self.or_token.join(self.endswith_modifier(field=field, value=v) for v in value)})"
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})"
88+
return f"ends_with({field}, {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)})"
9789

9890
def startswith_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
9991
if field.endswith(".text"):
10092
return self.regex_modifier(field=field, value=value)
10193
if isinstance(value, list):
10294
return f"({self.or_token.join(self.startswith_modifier(field=field, value=v) for v in value)})"
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})"
95+
return (
96+
f"starts_with({field}, {self._pre_process_value(field, value, value_type=ValueType.value, wrap_str=True)})"
97+
)
10598

10699
def regex_modifier(self, field: str, value: DEFAULT_VALUE_TYPE) -> str:
107100
if isinstance(value, list):
108101
return f"({self.or_token.join(self.regex_modifier(field=field, value=v) for v in value)})"
109-
pre_processed_value = self._pre_process_value(
110-
field, value, value_type=ValueType.regex_value, wrap_str=False, wrap_int=True
111-
)
102+
pre_processed_value = self._pre_process_value(field, value, value_type=ValueType.regex_value, wrap_str=False)
112103
if isinstance(pre_processed_value, str):
113104
value = self._make_case_insensitive(pre_processed_value)
114105
else:
@@ -122,7 +113,7 @@ def keywords(self, field: str, value: DEFAULT_VALUE_TYPE) -> str: # noqa: ARG00
122113
@render_manager.register
123114
class ESQLQueryRender(PlatformQueryRender):
124115
details: PlatformDetails = elasticsearch_esql_query_details
125-
mappings: ElasticESQLMappings = esql_query_mappings
116+
mappings: LuceneMappings = esql_query_mappings
126117
comment_symbol = "//"
127118

128119
or_token = "or"

0 commit comments

Comments
 (0)