XF/neptune
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement query strings for shareable search links

Browse Source
This commit is contained in:
Mark Veidemanis
2022-08-10 09:27:01 +01:00
parent c1071f3d55
commit 648526a6bf
3 changed files with 225 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
core/lib/opensearch.py
View File

@@ -141,7 +141,7 @@ def run_main_query(client, user, query, custom_query=False, index=None, size=Non
return response
def query_results(request, size=None):
def query_results(request, query_params, size=None):
"""
API helper to alter the OpenSearch return format into something
a bit better to parse.
@@ -160,14 +160,14 @@ def query_results(request, size=None):
else:
sizes = settings.OPENSEARCH_MAIN_SIZES
if not size:
if "size" in request.POST:
size = request.POST["size"]
if "size" in query_params:
size = query_params["size"]
if size not in sizes:
message = "Size is not permitted"
message_class = "danger"
return {"message": message, "class": message_class}
if "source" in request.POST:
source = request.POST["source"]
if "source" in query_params:
source = query_params["source"]
if source not in settings.OPENSEARCH_MAIN_SOURCES:
message = "Invalid source"
message_class = "danger"
@@ -175,27 +175,24 @@ def query_results(request, size=None):
if source != "all":
add_bool.append({"src": source})
if "dates" in request.POST:
dates = request.POST["dates"]
spl = dates.split(" - ")
if all(spl):
spl = [f"{x.replace(' ', 'T')}Z" for x in spl]
if not len(spl) == 2:
message = "Invalid dates"
message_class = "danger"
return {"message": message, "class": message_class}
from_ts, to_ts = spl
range_query = {
"range": {
"ts": {
"gt": from_ts,
"lt": to_ts,
}
if set({"from_date", "to_date", "from_time", "to_time"}).issubset(
query_params.keys()
):
from_ts = f"{query_params['from_date']}T{query_params['from_time']}Z"
to_ts = f"{query_params['to_date']}T{query_params['to_time']}Z"
print("from ts", from_ts)
print("to_ts", to_ts)
range_query = {
"range": {
"ts": {
"gt": from_ts,
"lt": to_ts,
}
}
add_top.append(range_query)
if "sorting" in request.POST:
sorting = request.POST["sorting"]
}
add_top.append(range_query)
if "sorting" in query_params:
sorting = query_params["sorting"]
if sorting not in ("asc", "desc", "none"):
message = "Invalid sort"
message_class = "danger"
@@ -209,20 +206,20 @@ def query_results(request, size=None):
}
]
if "check-sentiment" in request.POST:
if "sentiment-method" not in request.POST:
if "check_sentiment" in query_params:
if "sentiment_method" not in query_params:
message = "No sentiment method"
message_class = "danger"
return {"message": message, "class": message_class}
if "sentiment" in request.POST:
sentiment = request.POST["sentiment"]
if "sentiment" in query_params:
sentiment = query_params["sentiment"]
try:
sentiment = float(sentiment)
except ValueError:
message = "Sentiment is not a float"
message_class = "danger"
return {"message": message, "class": message_class}
sentiment_method = request.POST["sentiment-method"]
sentiment_method = query_params["sentiment_method"]
range_query_compare = {"range": {"sentiment": {}}}
range_query_precise = {
"match": {
@@ -242,8 +239,8 @@ def query_results(request, size=None):
range_query_precise["match"]["sentiment"] = 0
add_top_negative.append(range_query_precise)
if "query" in request.POST:
query = request.POST["query"]
if "query" in query_params:
query = query_params["query"]
search_query = construct_query(query, size)
if add_bool:
for item in add_bool: