kopia lustrzana https://github.com/glidernet/ogn-python
flake8 refactoring
Konstantin Gründger
rodzic
ad05de59e8
commit
966b7d9c73
|
|
@ -65,7 +65,8 @@ def update_devices():
|
||||||
app.session.commit()
|
app.session.commit()
|
||||||
|
|
||||||
# For each address in the new beacons: get firstseen, lastseen and last values != NULL
|
# For each address in the new beacons: get firstseen, lastseen and last values != NULL
|
||||||
last_valid_values = app.session.query(distinct(AircraftBeacon.address).label('address'),
|
last_valid_values = app.session.query(
|
||||||
|
distinct(AircraftBeacon.address).label('address'),
|
||||||
func.first_value(AircraftBeacon.timestamp)
|
func.first_value(AircraftBeacon.timestamp)
|
||||||
.over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.timestamp == null(), None), (AircraftBeacon.timestamp != null(), AircraftBeacon.timestamp)]))
|
.over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.timestamp == null(), None), (AircraftBeacon.timestamp != null(), AircraftBeacon.timestamp)]))
|
||||||
.label('firstseen'),
|
.label('firstseen'),
|
||||||
|
|
@ -87,44 +88,47 @@ def update_devices():
|
||||||
func.first_value(AircraftBeacon.real_address)
|
func.first_value(AircraftBeacon.real_address)
|
||||||
.over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.real_address == null(), None), (AircraftBeacon.real_address != null(), AircraftBeacon.real_address)]))
|
.over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.real_address == null(), None), (AircraftBeacon.real_address != null(), AircraftBeacon.real_address)]))
|
||||||
.label('real_address')) \
|
.label('real_address')) \
|
||||||
.filter(and_(AircraftBeacon.device_id == null(), AircraftBeacon.error_count == 0)) \
|
.filter(and_(AircraftBeacon.device_id == null(), AircraftBeacon.error_count == 0)) \
|
||||||
.subquery()
|
.subquery()
|
||||||
|
|
||||||
update_values = app.session.query(Device.address,
|
update_values = app.session.query(
|
||||||
case([(or_(Device.firstseen == null(), Device.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
|
Device.address,
|
||||||
(Device.firstseen <= last_valid_values.c.firstseen, Device.firstseen)]).label('firstseen'),
|
case([(or_(Device.firstseen == null(), Device.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
|
||||||
case([(or_(Device.lastseen == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
|
(Device.firstseen <= last_valid_values.c.firstseen, Device.firstseen)]).label('firstseen'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.lastseen)]).label('lastseen'),
|
case([(or_(Device.lastseen == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
|
||||||
case([(or_(Device.aircraft_type == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.aircraft_type),
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.lastseen)]).label('lastseen'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.aircraft_type)]).label('aircraft_type'),
|
case([(or_(Device.aircraft_type == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.aircraft_type),
|
||||||
case([(or_(Device.stealth == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.stealth),
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.aircraft_type)]).label('aircraft_type'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.stealth)]).label('stealth'),
|
case([(or_(Device.stealth == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.stealth),
|
||||||
case([(or_(Device.software_version == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.software_version),
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.stealth)]).label('stealth'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.software_version)]).label('software_version'),
|
case([(or_(Device.software_version == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.software_version),
|
||||||
case([(or_(Device.hardware_version == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.hardware_version),
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.software_version)]).label('software_version'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.hardware_version)]).label('hardware_version'),
|
case([(or_(Device.hardware_version == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.hardware_version),
|
||||||
case([(or_(Device.real_address == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.real_address),
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.hardware_version)]).label('hardware_version'),
|
||||||
(Device.lastseen >= last_valid_values.c.lastseen, Device.real_address)]).label('real_address')) \
|
case([(or_(Device.real_address == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.real_address),
|
||||||
.filter(Device.address == last_valid_values.c.address) \
|
(Device.lastseen >= last_valid_values.c.lastseen, Device.real_address)]).label('real_address')) \
|
||||||
.subquery()
|
.filter(Device.address == last_valid_values.c.address) \
|
||||||
|
.subquery()
|
||||||
|
|
||||||
update_receivers = app.session.query(Device) \
|
update_receivers = app.session.query(Device) \
|
||||||
.filter(Device.address == update_values.c.address) \
|
.filter(Device.address == update_values.c.address) \
|
||||||
.update({Device.firstseen: update_values.c.firstseen,
|
.update({
|
||||||
Device.lastseen: update_values.c.lastseen,
|
Device.firstseen: update_values.c.firstseen,
|
||||||
Device.aircraft_type: update_values.c.aircraft_type,
|
Device.lastseen: update_values.c.lastseen,
|
||||||
Device.stealth: update_values.c.stealth,
|
Device.aircraft_type: update_values.c.aircraft_type,
|
||||||
Device.software_version: update_values.c.software_version,
|
Device.stealth: update_values.c.stealth,
|
||||||
Device.hardware_version: update_values.c.hardware_version,
|
Device.software_version: update_values.c.software_version,
|
||||||
Device.real_address: update_values.c.real_address},
|
Device.hardware_version: update_values.c.hardware_version,
|
||||||
synchronize_session='fetch')
|
Device.real_address: update_values.c.real_address},
|
||||||
|
synchronize_session='fetch')
|
||||||
|
|
||||||
# Update relations to aircraft beacons
|
# Update relations to aircraft beacons
|
||||||
upd = app.session.query(AircraftBeacon) \
|
upd = app.session.query(AircraftBeacon) \
|
||||||
.filter(AircraftBeacon.device_id == null()) \
|
.filter(AircraftBeacon.device_id == null()) \
|
||||||
.filter(AircraftBeacon.address == Device.address) \
|
.filter(AircraftBeacon.address == Device.address) \
|
||||||
.update({AircraftBeacon.device_id: Device.id},
|
.update({
|
||||||
synchronize_session='fetch')
|
AircraftBeacon.device_id: Device.id},
|
||||||
|
synchronize_session='fetch')
|
||||||
|
|
||||||
app.session.commit()
|
app.session.commit()
|
||||||
print("Devices: {} inserted, {} updated".format(insert_count, update_receivers))
|
print("Devices: {} inserted, {} updated".format(insert_count, update_receivers))
|
||||||
|
|
@ -147,7 +151,8 @@ def update_receivers():
|
||||||
insert_count = res.rowcount
|
insert_count = res.rowcount
|
||||||
|
|
||||||
# For each name in the new beacons: get firstseen, lastseen and last values != NULL
|
# For each name in the new beacons: get firstseen, lastseen and last values != NULL
|
||||||
last_valid_values = app.session.query(distinct(ReceiverBeacon.name).label('name'),
|
last_valid_values = app.session.query(
|
||||||
|
distinct(ReceiverBeacon.name).label('name'),
|
||||||
func.first_value(ReceiverBeacon.timestamp)
|
func.first_value(ReceiverBeacon.timestamp)
|
||||||
.over(partition_by=ReceiverBeacon.name, order_by=case([(ReceiverBeacon.timestamp == null(), None), (ReceiverBeacon.timestamp != null(), ReceiverBeacon.timestamp)]))
|
.over(partition_by=ReceiverBeacon.name, order_by=case([(ReceiverBeacon.timestamp == null(), None), (ReceiverBeacon.timestamp != null(), ReceiverBeacon.timestamp)]))
|
||||||
.label('firstseen'),
|
.label('firstseen'),
|
||||||
|
|
@ -169,34 +174,36 @@ def update_receivers():
|
||||||
.filter(ReceiverBeacon.receiver_id == null()) \
|
.filter(ReceiverBeacon.receiver_id == null()) \
|
||||||
.subquery()
|
.subquery()
|
||||||
|
|
||||||
update_values = app.session.query(Receiver.name,
|
update_values = app.session.query(
|
||||||
case([(or_(Receiver.firstseen == null(), Receiver.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
|
Receiver.name,
|
||||||
(Receiver.firstseen <= last_valid_values.c.firstseen, Receiver.firstseen)]).label('firstseen'),
|
case([(or_(Receiver.firstseen == null(), Receiver.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
|
||||||
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
|
(Receiver.firstseen <= last_valid_values.c.firstseen, Receiver.firstseen)]).label('firstseen'),
|
||||||
(Receiver.firstseen >= last_valid_values.c.firstseen, Receiver.firstseen)]).label('lastseen'),
|
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
|
||||||
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), func.ST_Transform(last_valid_values.c.location_wkt, 4326)),
|
(Receiver.firstseen >= last_valid_values.c.firstseen, Receiver.firstseen)]).label('lastseen'),
|
||||||
(Receiver.lastseen >= last_valid_values.c.lastseen, func.ST_Transform(Receiver.location_wkt, 4326))]).label('location_wkt'),
|
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), func.ST_Transform(last_valid_values.c.location_wkt, 4326)),
|
||||||
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.altitude),
|
(Receiver.lastseen >= last_valid_values.c.lastseen, func.ST_Transform(Receiver.location_wkt, 4326))]).label('location_wkt'),
|
||||||
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.altitude)]).label('altitude'),
|
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.altitude),
|
||||||
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.version),
|
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.altitude)]).label('altitude'),
|
||||||
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.version)]).label('version'),
|
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.version),
|
||||||
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.platform),
|
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.version)]).label('version'),
|
||||||
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.platform)]).label('platform'),
|
case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.platform),
|
||||||
case([(or_(Receiver.location_wkt == null(), not_(func.ST_Equals(Receiver.location_wkt, last_valid_values.c.location_wkt))), None), # set country code to None if location changed
|
(Receiver.lastseen >= last_valid_values.c.lastseen, Receiver.platform)]).label('platform'),
|
||||||
(func.ST_Equals(Receiver.location_wkt, last_valid_values.c.location_wkt), Receiver.country_code)]).label('country_code')) \
|
case([(or_(Receiver.location_wkt == null(), not_(func.ST_Equals(Receiver.location_wkt, last_valid_values.c.location_wkt))), None), # set country code to None if location changed
|
||||||
.filter(Receiver.name == last_valid_values.c.name) \
|
(func.ST_Equals(Receiver.location_wkt, last_valid_values.c.location_wkt), Receiver.country_code)]).label('country_code')) \
|
||||||
.subquery()
|
.filter(Receiver.name == last_valid_values.c.name) \
|
||||||
|
.subquery()
|
||||||
|
|
||||||
update_receivers = app.session.query(Receiver) \
|
update_receivers = app.session.query(Receiver) \
|
||||||
.filter(Receiver.name == update_values.c.name) \
|
.filter(Receiver.name == update_values.c.name) \
|
||||||
.update({Receiver.firstseen: update_values.c.firstseen,
|
.update({
|
||||||
Receiver.lastseen: update_values.c.lastseen,
|
Receiver.firstseen: update_values.c.firstseen,
|
||||||
Receiver.location_wkt: update_values.c.location_wkt,
|
Receiver.lastseen: update_values.c.lastseen,
|
||||||
Receiver.altitude: update_values.c.altitude,
|
Receiver.location_wkt: update_values.c.location_wkt,
|
||||||
Receiver.version: update_values.c.version,
|
Receiver.altitude: update_values.c.altitude,
|
||||||
Receiver.platform: update_values.c.platform,
|
Receiver.version: update_values.c.version,
|
||||||
Receiver.country_code: update_values.c.country_code},
|
Receiver.platform: update_values.c.platform,
|
||||||
synchronize_session='fetch')
|
Receiver.country_code: update_values.c.country_code},
|
||||||
|
synchronize_session='fetch')
|
||||||
|
|
||||||
# Update relations to aircraft beacons
|
# Update relations to aircraft beacons
|
||||||
update_aircraft_beacons = app.session.query(AircraftBeacon) \
|
update_aircraft_beacons = app.session.query(AircraftBeacon) \
|
||||||
|
|
|
||||||
|
|
@ -93,12 +93,13 @@ def update_receivers():
|
||||||
def update_receiver_stats():
|
def update_receiver_stats():
|
||||||
"""Add/update entries in receiver stats table."""
|
"""Add/update entries in receiver stats table."""
|
||||||
|
|
||||||
asdf = session.query(ReceiverBeacon.receiver_id,
|
asdf = session.query(
|
||||||
func.count(distinct(AircraftBeacon.device_id)).label('device_count'),
|
ReceiverBeacon.receiver_id,
|
||||||
func.max(AircraftBeacon.altitude).label('max_altitude'),
|
func.count(distinct(AircraftBeacon.device_id)).label('device_count'),
|
||||||
func.max(func.ST_Distance(AircraftBeacon.location_wkt, AircraftBeacon.location_wkt)).label('max_distance')) \
|
func.max(AircraftBeacon.altitude).label('max_altitude'),
|
||||||
.filter(ReceiverBeacon.receiver_id == AircraftBeacon.receiver_id) \
|
func.max(func.ST_Distance(AircraftBeacon.location_wkt, AircraftBeacon.location_wkt)).label('max_distance')) \
|
||||||
.group_by(ReceiverBeacon.id)
|
.filter(ReceiverBeacon.receiver_id == AircraftBeacon.receiver_id) \
|
||||||
|
.group_by(ReceiverBeacon.id)
|
||||||
|
|
||||||
print(asdf)
|
print(asdf)
|
||||||
for a in asdf.all():
|
for a in asdf.all():
|
||||||
|
|
|
||||||
Ładowanie…
Reference in New Issue