flake8 refactoring

ogn/collect/database.py

@@ -65,7 +65,8 @@ def update_devices():
     app.session.commit()
 
     # 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)
                 .over(partition_by=AircraftBeacon.address, order_by=case([(AircraftBeacon.timestamp == null(), None), (AircraftBeacon.timestamp != null(), AircraftBeacon.timestamp)]))
                 .label('firstseen'),
@@ -90,7 +91,8 @@ def update_devices():
         .filter(and_(AircraftBeacon.device_id == null(), AircraftBeacon.error_count == 0)) \
         .subquery()
 
-    update_values = app.session.query(Device.address,
+    update_values = app.session.query(
+            Device.address,
             case([(or_(Device.firstseen == null(), Device.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
                   (Device.firstseen <= last_valid_values.c.firstseen, Device.firstseen)]).label('firstseen'),
             case([(or_(Device.lastseen == null(), Device.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
@@ -110,7 +112,8 @@ def update_devices():
 
     update_receivers = app.session.query(Device) \
         .filter(Device.address == update_values.c.address) \
-        .update({Device.firstseen: update_values.c.firstseen,
+        .update({
+            Device.firstseen: update_values.c.firstseen,
             Device.lastseen: update_values.c.lastseen,
             Device.aircraft_type: update_values.c.aircraft_type,
             Device.stealth: update_values.c.stealth,
@@ -123,7 +126,8 @@ def update_devices():
     upd = app.session.query(AircraftBeacon) \
         .filter(AircraftBeacon.device_id == null()) \
         .filter(AircraftBeacon.address == Device.address) \
-        .update({AircraftBeacon.device_id: Device.id},
+        .update({
+            AircraftBeacon.device_id: Device.id},
             synchronize_session='fetch')
 
     app.session.commit()
@@ -147,7 +151,8 @@ def update_receivers():
     insert_count = res.rowcount
 
     # 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)
                 .over(partition_by=ReceiverBeacon.name, order_by=case([(ReceiverBeacon.timestamp == null(), None), (ReceiverBeacon.timestamp != null(), ReceiverBeacon.timestamp)]))
                 .label('firstseen'),
@@ -169,7 +174,8 @@ def update_receivers():
         .filter(ReceiverBeacon.receiver_id == null()) \
         .subquery()
 
-    update_values = app.session.query(Receiver.name,
+    update_values = app.session.query(
+            Receiver.name,
             case([(or_(Receiver.firstseen == null(), Receiver.firstseen > last_valid_values.c.firstseen), last_valid_values.c.firstseen),
                   (Receiver.firstseen <= last_valid_values.c.firstseen, Receiver.firstseen)]).label('firstseen'),
             case([(or_(Receiver.lastseen == null(), Receiver.lastseen < last_valid_values.c.lastseen), last_valid_values.c.lastseen),
@@ -189,7 +195,8 @@ def update_receivers():
 
     update_receivers = app.session.query(Receiver) \
         .filter(Receiver.name == update_values.c.name) \
-        .update({Receiver.firstseen: update_values.c.firstseen,
+        .update({
+            Receiver.firstseen: update_values.c.firstseen,
             Receiver.lastseen: update_values.c.lastseen,
             Receiver.location_wkt: update_values.c.location_wkt,
             Receiver.altitude: update_values.c.altitude,

ogn/commands/database.py

@@ -93,7 +93,8 @@ def update_receivers():
 def update_receiver_stats():
     """Add/update entries in receiver stats table."""
 
-    asdf = session.query(ReceiverBeacon.receiver_id,
+    asdf = session.query(
+        ReceiverBeacon.receiver_id,
         func.count(distinct(AircraftBeacon.device_id)).label('device_count'),
         func.max(AircraftBeacon.altitude).label('max_altitude'),
         func.max(func.ST_Distance(AircraftBeacon.location_wkt, AircraftBeacon.location_wkt)).label('max_distance')) \