Linted code, sorted imports

Author: SonjaSt

src/explorepy/asr_processor.py

@@ -1,17 +1,25 @@
+import logging
 import math
 import time
-from enum import Enum, auto
+from enum import (
+    Enum,
+    auto
+)
 
-from eegprep import clean_flatlines
 import numpy as np
-import logging
-
-from eegprep import clean_windows
+from eegprep import (
+    clean_flatlines,
+    clean_windows
+)
 from eegprep.utils import round_mat
-from eegprep.utils.asr import asr_calibrate, asr_process
+from eegprep.utils.asr import (
+    asr_calibrate,
+    asr_process
+)
 
 from explorepy.filters import ExGFilter
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -24,18 +32,20 @@ class State(Enum):
 def clean_calib_data(clean_data, sampling_rate):
     EEG = {'data': clean_data, 'srate': sampling_rate, 'xmin': 0}
     try:
-        cleaned_windows = clean_windows(EEG) # throws index error
-        logger.info(f"cleaned window shape: {cleaned_windows[0]['data'].shape} and original data shape: {clean_data.shape}")
+        cleaned_windows = clean_windows(EEG)  # throws index error
+        logger.info(f"cleaned window shape: {cleaned_windows[0]['data'].shape} and "
+                    f"original data shape: {clean_data.shape}")
 
         cleaned = clean_flatlines(cleaned_windows[0])
         if cleaned['data'].shape[0] != clean_data.shape[0]:
             logger.info(f"clean_data.shape: f{clean_data.shape} and cleaned['data'].shape: {cleaned['data'].shape}")
             raise IndexError
         return cleaned['data'], State.STABLE
     except IndexError:
-        logger.info(f"Calibration error")
+        logger.info("Calibration error")
         return None, State.CALIBRATION_ERROR
 
+
 def asr_pipeline(data_array, sampling_rate, n_chan, state, step_size=None, window_len=None, max_dims=0.66):
     """This code is mostly taken from the eegprep implementation of clean_asr and adapted to work with a previously
     calculated state."""

src/explorepy/csv_client.py

@@ -1,10 +1,18 @@
-import time
 import os
-from enum import Enum, auto
+import time
+from enum import (
+    Enum,
+    auto
+)
+
 import numpy as np
-from explorepy.packet import BleImpedancePacket, DeviceInfoBLE, OrientationV1, OrientationV2
 from pylsl import local_clock
-from typing_extensions import override
+
+from explorepy.packet import (
+    BleImpedancePacket,
+    DeviceInfoBLE,
+    OrientationV2
+)
 
 
 class ClientState(Enum):
@@ -13,14 +21,16 @@ class ClientState(Enum):
     STREAMING = auto()
     STOPPED = auto()
 
+
 class PacketSize(Enum):
     EEG_8 = 40
     EEG_32 = 112
     ORN = 50
     DEVICE_INFO = 38
 
+
 class CsvClient:
-    def __init__(self, channel_count, file_path: str=None):
+    def __init__(self, channel_count, file_path: str = None):
         if file_path is None:
             self.file_name = "32channel_semidry_artefacts_ExG.csv"
             file_path = os.path.join("/Users/sonjastefani/Documents/dev/explore-desktop/test-data/", self.file_name)
@@ -31,10 +41,10 @@ def __init__(self, channel_count, file_path: str=None):
             raise FileNotFoundError(f"File not found: {file_path}")
 
         self.server = CsvServer(
-    channel_count=channel_count,
-    csv_path=file_path,
-    loop=True
-)
+            channel_count=channel_count,
+            csv_path=file_path,
+            loop=True
+        )
         self._state = ClientState.DISCONNECTED
 
     def set_state(self, state: ClientState):
@@ -73,7 +83,6 @@ def read(self):
                 device_info_packet.set_info(self.server.device_info)
                 return device_info_packet
 
-
         self.server.tick += 1
         if self.server.tick % 5 == 0:
             orn_packet = OrientationMock(timestamp=self.server.ts, payload=None)
@@ -97,9 +106,6 @@ def read(self):
     def write(self, bytes):
         pass
 
-import numpy as np
-from pylsl import local_clock
-
 
 class CsvServer:
     def __init__(self, channel_count: int, csv_path: str, loop: bool = True):
@@ -108,7 +114,7 @@ def __init__(self, channel_count: int, csv_path: str, loop: bool = True):
 
         self.channel_count = channel_count
         self.loop = loop
-        self.csv_data = np.loadtxt(csv_path, delimiter=',', skiprows=1) # skip row 0
+        self.csv_data = np.loadtxt(csv_path, delimiter=',', skiprows=1)  # skip row 0
 
         self.csv_ts = self.csv_data[:, 0]
         self.csv_data = self.csv_data[:, 1:]
@@ -182,6 +188,7 @@ def read_sample(self):
     def read_device_info(self):
         return self.device_info
 
+
 class DeviceInfoMock(DeviceInfoBLE):
     def __init__(self, timestamp, payload, time_offset=0):
         self.timestamp = timestamp

src/explorepy/parser.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 """Parser module"""
 import asyncio
 import binascii
@@ -83,8 +82,8 @@ def start_streaming(self, device_name, mac_address, file_path=None):
             self.stream_interface = MockBtClient(device_name=device_name, mac_address=mac_address)
         elif explorepy.get_bt_interface() == 'csv':
             from explorepy.csv_client import CsvClient
-            device_id = str.split(device_name, '_')[1] # split by underscore and take second part
-            ch_count = 32 if device_id[0] == 'D' else 8 #dynamic channel selection based on first character
+            device_id = str.split(device_name, '_')[1]  # split by underscore and take second part
+            ch_count = 32 if device_id[0] == 'D' else 8  # dynamic channel selection based on first character
             self.stream_interface = CsvClient(ch_count, file_path=file_path)
         elif is_usb_mode():
             from explorepy.serial_client import SerialStream

src/explorepy/stream_processor.py

@@ -14,6 +14,8 @@
 )
 
 import numpy as np
+
+from explorepy.asr_processor import AsrProcessor
 from explorepy.command import (
     DeviceConfiguration,
     ZMeasurementDisable,
@@ -22,10 +24,8 @@
 from explorepy.filters import ExGFilter
 from explorepy.packet import (
     EEG,
-    CalibrationInfo,
-    CalibrationInfo_USBC,
-    CleanEEG,
     CalibrationInfoBase,
+    CleanEEG,
     CommandRCV,
     CommandStatus,
     DeviceInfo,
@@ -45,7 +45,6 @@
     is_usb_mode
 )
 
-from explorepy.asr_processor import AsrProcessor
 
 TOPICS =\
     Enum('Topics', 'raw_ExG filtered_ExG asr_ExG device_info marker raw_orn cmd_ack env cmd_status imp packet_bin')