bump nptyping (#722)

* update nptyping

Signed-off-by: Andrey Parfenov <[email protected]>

python_package/brainflow/board_shim.py

@@ -10,7 +10,7 @@
 import pkg_resources
 from brainflow.exit_codes import BrainFlowExitCodes, BrainFlowError
 from brainflow.utils import LogLevels
-from nptyping import NDArray, Float64
+from nptyping import NDArray, Float64, Shape
 from numpy.ctypeslib import ndpointer
 
 
@@ -1266,15 +1266,15 @@ def release_session(self) -> None:
         if res != BrainFlowExitCodes.STATUS_OK.value:
             raise BrainFlowError('unable to release streaming session', res)
 
-    def get_current_board_data(self, num_samples: int, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Float64]:
+    def get_current_board_data(self, num_samples: int, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Shape["*, *"], Float64]:
         """Get specified amount of data or less if there is not enough data, doesnt remove data from ringbuffer
 
         :param num_samples: max number of samples
         :type num_samples: int
         :param preset: preset
         :type preset: int
         :return: latest data from a board
-        :rtype: NDArray[Float64]
+        :rtype: NDArray[Shape["*, *"], Float64]
         """
 
         package_length = BoardShim.get_num_rows(self._master_board_id, preset)
@@ -1345,15 +1345,15 @@ def is_prepared(self) -> bool:
             raise BrainFlowError('unable to check session status', res)
         return bool(prepared[0])
 
-    def get_board_data(self, num_samples=None, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Float64]:
+    def get_board_data(self, num_samples=None, preset: int = BrainFlowPresets.DEFAULT_PRESET) -> NDArray[Shape["*, *"], Float64]:
         """Get board data and remove data from ringbuffer
 
         :param num_samples: number of packages to get
         :type num_samples: int
         :param preset: preset
         :type preset: int
         :return: all data from a board if num_samples is None, num_samples packages or less if not None
-        :rtype: NDArray[Float64]
+        :rtype: NDArray[Shape["*, *"], Float64]
         """
 
         data_size = self.get_board_data_count(preset)

python_package/brainflow/ml_model.py

@@ -10,7 +10,7 @@
 import pkg_resources
 from brainflow.board_shim import BrainFlowError, LogLevels
 from brainflow.exit_codes import BrainFlowExitCodes
-from nptyping import NDArray
+from nptyping import NDArray, Float64, Shape
 from numpy.ctypeslib import ndpointer
 
 
@@ -262,11 +262,11 @@ def release(self) -> None:
         if res != BrainFlowExitCodes.STATUS_OK.value:
             raise BrainFlowError('unable to release classifier', res)
 
-    def predict(self, data: NDArray) -> List:
+    def predict(self, data: NDArray[Shape["*"], Float64]) -> List:
         """calculate metric from data
 
         :param data: input array
-        :type data: NDArray
+        :type data: NDArray[Shape["*"], Float64]
         :return: metric value
         :rtype: List
         """

python_package/examples/tests/board_descr.py

@@ -1,4 +1,3 @@
-import brainflow
 from brainflow.board_shim import BoardShim
 
 BoardShim.enable_dev_board_logger()

python_package/examples/tests/brainflow_get_data.py

@@ -1,7 +1,7 @@
 import argparse
 import time
 
-from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds, BrainFlowPresets
+from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds
 
 
 def main():

python_package/examples/tests/csp.py

@@ -10,7 +10,7 @@ def main():
 
     data = np.array([[[6, 3, 1, 5], [3, 0, 5, 1]], [[1, 5, 6, 2], [5, 1, 2, 2]]]).astype('float64')
 
-    filters, eigvals = DataFilter.get_csp(data, labels);
+    filters, eigvals = DataFilter.get_csp(data, labels)
 
     true_filters = np.array([[-0.313406, 0.0792153], [-0.280803, -0.480046]])
 

python_package/examples/tests/data_collector.py

@@ -1,7 +1,7 @@
 import argparse
 import time
 
-from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds, BrainFlowPresets
+from brainflow.board_shim import BoardShim, BrainFlowInputParams
 
 
 def main():

python_package/examples/tests/ganglion_resist.py

@@ -11,7 +11,7 @@ def main():
     board.prepare_session()
     # expected result: 5 seconds of resistance data(unknown sampling rate) after that 5 seconds of exg data
     board.config_board('z')
-    board.start_stream(45000, f'file://raw_data.csv:w')
+    board.start_stream(45000, 'file://raw_data.csv:w')
     time.sleep(5)
     board.config_board('Z')
     time.sleep(5)

python_package/examples/tests/ganglion_wifi_resist.py

@@ -13,8 +13,8 @@ def main():
     BoardShim.enable_dev_board_logger()
 
     params = BrainFlowInputParams()
-    params.ip_address = args.ip_address;
-    params.ip_port = args.ip_port;
+    params.ip_address = args.ip_address
+    params.ip_port = args.ip_port
     board = BoardShim(BoardIds.GANGLION_WIFI_BOARD.value, params)
     board.prepare_session()
 

python_package/examples/tests/peaks_detection.py

@@ -8,7 +8,7 @@
 import matplotlib.pyplot as plt
 
 from brainflow.board_shim import BoardShim, BrainFlowInputParams, LogLevels, BoardIds
-from brainflow.data_filter import DataFilter, ThresholdTypes, AggOperations, NoiseTypes, WaveletTypes, DetrendOperations
+from brainflow.data_filter import DataFilter, NoiseTypes, WaveletTypes, DetrendOperations
 
 
 def main():

python_package/examples/tests/plotjuggler.py

@@ -1,7 +1,7 @@
 import argparse
 import time
 
-from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds, BrainFlowPresets
+from brainflow.board_shim import BoardShim, BrainFlowInputParams, BoardIds
 
 
 def main():
@@ -44,7 +44,7 @@ def main():
     for preset in presets:
         # to stream to plotjuggler
         board.add_streamer(
-            f'plotjuggler_udp://127.0.0.1:9870', preset)
+            'plotjuggler_udp://127.0.0.1:9870', preset)
         # to store data in a file
         board.add_streamer(f'file://data_{preset}.csv:w', preset)
     board.start_stream ()

python_package/setup.py

@@ -18,7 +18,8 @@
     packages=find_packages(),
     install_requires=[
         'numpy',
-        'nptyping==1.4.4'
+        'nptyping>=2.0.0',
+        'setuptools'
     ],
     package_data={
         'brainflow': [

src/board_controller/brainalive/brainalive.cpp

@@ -204,6 +204,7 @@ int BrainAlive::start_stream (int buffer_size, const char *streamer_params)
         return (int)BrainFlowExitCodes::BOARD_NOT_CREATED_ERROR;
     }
     int res = prepare_for_acquisition (buffer_size, streamer_params);
+
     if (res == (int)BrainFlowExitCodes::STATUS_OK)
     {
         res = config_board ("0a8100000d");