ExternalVendorCode/sondehub-infra
1
0
Fork 0
mirror of https://github.com/projecthorus/sondehub-infra.git synced 2024-12-21 06:03:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

add chase only

Browse Source
This commit is contained in:
Michaela 2021-04-10 15:06:44 +10:00
parent 2f34d42df2
commit 4d8fda7441
2 changed files with 130 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

244
query/lambda_function.py
View File

@ -225,130 +225,131 @@ def datanew(event, context):
else: else:
lt = datetime.now(timezone.utc) lt = datetime.now(timezone.utc)
gte = datetime.now(timezone.utc) - timedelta(0, duration) gte = datetime.now(timezone.utc) - timedelta(0, duration)
output = {"positions": {"position": []}}
path = "telm-*/_search" if "chase_only" not in event["queryStringParameters"] or event["queryStringParameters"]["chase_only"] != "true":
payload = { path = "telm-*/_search"
"aggs": { payload = {
"2": { "aggs": {
"terms": { "2": {
"field": "serial.keyword", "terms": {
"order": {"_key": "desc"}, "field": "serial.keyword",
"size": 10000, "order": {"_key": "desc"},
}, "size": 10000,
"aggs": { },
"3": { "aggs": {
"date_histogram": { "3": {
"field": "datetime", "date_histogram": {
"fixed_interval": f"{str(interval)}s", "field": "datetime",
"min_doc_count": 1, "fixed_interval": f"{str(interval)}s",
}, "min_doc_count": 1,
"aggs": { },
"1": { "aggs": {
"top_hits": { "1": {
"size": 1, "top_hits": {
"sort": [{"datetime": {"order": "desc"}}], "size": 1,
"sort": [{"datetime": {"order": "desc"}}],
}
} }
} },
},
}
},
}
},
"query": {
"bool": {
"filter": [
{"match_all": {}},
{
"range": {
"datetime": {"gte": gte.isoformat(), "lt": lt.isoformat()}
} }
}, },
],
"must_not": [{"match_phrase": {"software_name": "SondehubV1"}}],
}
},
}
if (
"vehicles" in event["queryStringParameters"]
and event["queryStringParameters"]["vehicles"] != "RS_*;*chase"
and event["queryStringParameters"]["vehicles"] != ""
):
payload["query"]["bool"]["filter"].append(
{
"match_phrase": {
"serial": str(event["queryStringParameters"]["vehicles"])
} }
} },
) "query": {
results = es_request(payload, path, "POST") "bool": {
"filter": [
output = {"positions": {"position": []}} {"match_all": {}},
{
for sonde in results["aggregations"]["2"]["buckets"]: "range": {
for frame in sonde["3"]["buckets"]: "datetime": {"gte": gte.isoformat(), "lt": lt.isoformat()}
try: }
frame_data = frame["1"]["hits"]["hits"][0]["_source"] },
],
# Use subtype if it exists, else just use the basic type. "must_not": [{"match_phrase": {"software_name": "SondehubV1"}}],
if "subtype" in frame_data:
_type = frame_data["subtype"]
else:
_type = frame_data["type"]
data = {
"manufacturer": frame_data['manufacturer'],
"type": _type
} }
},
if "temp" in frame_data: }
data["temperature_external"] = frame_data["temp"] if (
"vehicles" in event["queryStringParameters"]
if "humidity" in frame_data: and event["queryStringParameters"]["vehicles"] != "RS_*;*chase"
data["humidity"] = frame_data["humidity"] and event["queryStringParameters"]["vehicles"] != ""
):
if "pressure" in frame_data: payload["query"]["bool"]["filter"].append(
data["pressure"] = frame_data["pressure"] {
"match_phrase": {
if "sats" in frame_data: "serial": str(event["queryStringParameters"]["vehicles"])
data["sats"] = frame_data["sats"]
if "batt" in frame_data:
data["batt"] = frame_data["batt"]
if "burst_timer" in frame_data:
data["burst_timer"] = frame_data["burst_timer"]
if "frequency" in frame_data:
data["frequency"] = frame_data["frequency"]
# May need to revisit this, if the resultant strings are too long.
if "xdata" in frame_data:
data["xdata"] = frame_data["xdata"]
output["positions"]["position"].append(
{
"position_id": f'{frame_data["serial"]}-{frame_data["datetime"]}',
"mission_id": "0",
"vehicle": frame_data["serial"],
"server_time": frame_data["datetime"],
"gps_time": frame_data["datetime"],
"gps_lat": frame_data["lat"],
"gps_lon": frame_data["lon"],
"gps_alt": frame_data["alt"],
"gps_heading": frame_data["heading"]
if "heading" in frame_data
else "",
"gps_speed": frame_data["vel_h"],
"type": _type,
"picture": "",
"temp_inside": "",
"data": data,
"callsign": frame_data["uploader_callsign"],
"sequence": "0",
} }
) }
except: )
traceback.print_exc(file=sys.stdout) results = es_request(payload, path, "POST")
for sonde in results["aggregations"]["2"]["buckets"]:
for frame in sonde["3"]["buckets"]:
try:
frame_data = frame["1"]["hits"]["hits"][0]["_source"]
# Use subtype if it exists, else just use the basic type.
if "subtype" in frame_data:
_type = frame_data["subtype"]
else:
_type = frame_data["type"]
data = {
"manufacturer": frame_data['manufacturer'],
"type": _type
}
if "temp" in frame_data:
data["temperature_external"] = frame_data["temp"]
if "humidity" in frame_data:
data["humidity"] = frame_data["humidity"]
if "pressure" in frame_data:
data["pressure"] = frame_data["pressure"]
if "sats" in frame_data:
data["sats"] = frame_data["sats"]
if "batt" in frame_data:
data["batt"] = frame_data["batt"]
if "burst_timer" in frame_data:
data["burst_timer"] = frame_data["burst_timer"]
if "frequency" in frame_data:
data["frequency"] = frame_data["frequency"]
# May need to revisit this, if the resultant strings are too long.
if "xdata" in frame_data:
data["xdata"] = frame_data["xdata"]
output["positions"]["position"].append(
{
"position_id": f'{frame_data["serial"]}-{frame_data["datetime"]}',
"mission_id": "0",
"vehicle": frame_data["serial"],
"server_time": frame_data["datetime"],
"gps_time": frame_data["datetime"],
"gps_lat": frame_data["lat"],
"gps_lon": frame_data["lon"],
"gps_alt": frame_data["alt"],
"gps_heading": frame_data["heading"]
if "heading" in frame_data
else "",
"gps_speed": frame_data["vel_h"],
"type": _type,
"picture": "",
"temp_inside": "",
"data": data,
"callsign": frame_data["uploader_callsign"],
"sequence": "0",
}
)
except:
traceback.print_exc(file=sys.stdout)
# get chase cars # get chase cars
@ -569,12 +570,13 @@ if __name__ == "__main__":
# position_id: 0 # position_id: 0
# vehicles: RS_*;*chase # vehicles: RS_*;*chase
print( print(
get_listeners( datanew(
{ {
"queryStringParameters": { "queryStringParameters": {
"type" : "positions", "type" : "positions",
"mode": "1hour", "mode": "6hours",
"position_id": "0" "position_id": "0",
"chase_only": "true"
} }
}, },
{}, {},

7
swagger.yaml
View File

@ -223,6 +223,13 @@ paths:
- "6hours" - "6hours"
- "3hours" - "3hours"
- "1hour" - "1hour"
- in: query
name: chase_only
type: string
description: Return only chase cars
enum:
- "true"
- "false"
- in: query - in: query
name: vehicles name: vehicles
type: string type: string