ExternalVendorCode/sondehub-infra
1
0
Fork 0
mirror of https://github.com/projecthorus/sondehub-infra.git synced 2024-12-30 09:58:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

various prediction fixes

Browse Source
This commit is contained in:
Michaela 2021-04-04 10:47:31 +10:00
parent 677c8684be
commit bc8acf5074
2 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main.tf
View File

@ -507,7 +507,7 @@ resource "aws_lambda_function" "LambdaFunction" {
memory_size = 256 memory_size = 256
role = aws_iam_role.IAMRole5.arn role = aws_iam_role.IAMRole5.arn
runtime = "python3.7" runtime = "python3.7"
timeout = 10 timeout = 30
tracing_config { tracing_config {
mode = "Active" mode = "Active"
} }
@ -1054,7 +1054,7 @@ resource "aws_elasticsearch_domain" "ElasticsearchDomain" {
dedicated_master_count = 3 dedicated_master_count = 3
dedicated_master_enabled = false dedicated_master_enabled = false
dedicated_master_type = "t3.small.elasticsearch" dedicated_master_type = "t3.small.elasticsearch"
instance_count = 4 instance_count = 6
instance_type = "t3.medium.elasticsearch" instance_type = "t3.medium.elasticsearch"
zone_awareness_enabled = true zone_awareness_enabled = true
zone_awareness_config { zone_awareness_config {

30
predict/lambda_function.py
View File

@ -11,9 +11,12 @@ from datetime import datetime, timedelta, timezone
import sys, traceback import sys, traceback
import http.client import http.client
import math import math
import logging
logging.basicConfig(format='%(asctime)s %(message)s', level=logging.DEBUG)
HOST = os.getenv("ES") HOST = os.getenv("ES")
def getDensity(altitude): def getDensity(altitude):
""" """
Calculate the atmospheric density for a given altitude in metres. Calculate the atmospheric density for a given altitude in metres.
@ -90,7 +93,6 @@ def seaLevelDescentRate(descent_rate, altitude):
def predict(event, context): def predict(event, context):
path = "telm-*/_search" path = "telm-*/_search"
payload = { payload = {
"aggs": { "aggs": {
@ -206,7 +208,7 @@ def predict(event, context):
{ {
"range": { "range": {
"datetime": { "datetime": {
"gte": "now-1h", "gte": "now-5m",
"lte": "now", "lte": "now",
"format": "strict_date_optional_time" "format": "strict_date_optional_time"
} }
@ -233,7 +235,9 @@ def predict(event, context):
} }
} }
) )
logging.debug("Start ES Request")
results = es_request(payload, path, "GET") results = es_request(payload, path, "GET")
logging.debug("Finished ES Request")
@ -251,9 +255,9 @@ def predict(event, context):
conn = http.client.HTTPSConnection("predict.cusf.co.uk") conn = http.client.HTTPSConnection("predict.cusf.co.uk")
serial_data={} serial_data={}
logging.debug("Start Predict")
for serial in serials: for serial in serials:
print(serial)
value = serials[serial] value = serials[serial]
ascent_rate=value['rate'] if value['rate'] > 0.5 else 5 # this shouldn't really be used but it makes the API happy ascent_rate=value['rate'] if value['rate'] > 0.5 else 5 # this shouldn't really be used but it makes the API happy
descent_rate= seaLevelDescentRate(abs(value['rate']),value['alt']) if value['rate'] < 0 else 6 descent_rate= seaLevelDescentRate(abs(value['rate']),value['alt']) if value['rate'] < 0 else 6
@ -263,16 +267,22 @@ def predict(event, context):
burst_altitude = value['alt']+0.05 burst_altitude = value['alt']+0.05
else: else:
burst_altitude = (value['alt']+0.05) if value['alt'] > 26000 else 26000 burst_altitude = (value['alt']+0.05) if value['alt'] > 26000 else 26000
url = f"/api/v1/?launch_latitude={value['position'][0].strip()}&launch_longitude={float(value['position'][1].strip())+ 180:.2f}&launch_datetime={value['time']}&launch_altitude={value['alt']:.2f}&ascent_rate={ascent_rate:.2f}&burst_altitude={burst_altitude:.2f}&descent_rate={descent_rate:.2f}"
longitude = float(value['position'][1].strip())
if longitude < 0:
longitude += 360
url = f"/api/v1/?launch_latitude={value['position'][0].strip()}&launch_longitude={longitude:.2f}&launch_datetime={value['time']}&launch_altitude={value['alt']:.2f}&ascent_rate={ascent_rate:.2f}&burst_altitude={burst_altitude:.2f}&descent_rate={descent_rate:.2f}"
print(serial)
print(url) print(url)
conn.request("GET", url conn.request("GET", url
) )
res = conn.getresponse() res = conn.getresponse()
data = res.read() data = res.read()
print(data)
serial_data[serial] = json.loads(data.decode("utf-8")) serial_data[serial] = json.loads(data.decode("utf-8"))
logging.debug("Stop Predict")
output = [] output = []
for serial in serial_data: for serial in serial_data:
value = serial_data[serial] value = serial_data[serial]
@ -288,7 +298,7 @@ def predict(event, context):
data.append({ data.append({
"time": int(datetime.fromisoformat(item['datetime'].split(".")[0].replace("Z","")).timestamp()), "time": int(datetime.fromisoformat(item['datetime'].split(".")[0].replace("Z","")).timestamp()),
"lat": item['latitude'], "lat": item['latitude'],
"lon": item['longitude']-180, "lon": item['longitude'] - 360 if item['longitude'] > 180 else item['longitude'],
"alt": item['altitude'], "alt": item['altitude'],
}) })
@ -304,7 +314,7 @@ def predict(event, context):
"landed": 0, "landed": 0,
"data": json.dumps(data) "data": json.dumps(data)
}) })
logging.debug("Finished")
return json.dumps(output) return json.dumps(output)
def es_request(payload, path, method): def es_request(payload, path, method):
@ -331,13 +341,11 @@ if __name__ == "__main__":
# max_positions: 0 # max_positions: 0
# position_id: 0 # position_id: 0
# vehicles: RS_*;*chase # vehicles: RS_*;*chase
print(
predict( predict(
{"queryStringParameters" : { {"queryStringParameters" : {
"vehicles": "P4930339"
}},{} }},{}
) )
)
# get list of sondes, serial, lat,lon, alt # get list of sondes, serial, lat,lon, alt