Merge remote-tracking branch 'origin/task/python-312' into task/python-312

Author: liampauling

flumine/markets/middleware.py

@@ -306,6 +306,8 @@ def __init__(self, operation: str, directory: str):
     def __call__(self, market) -> None:
         pt = market.market_book.publish_time_epoch
         while True:
+            if self._next is None:
+                break
             for update in self._next:
                 if update.market_id != market.market_id:
                     continue
@@ -332,7 +334,13 @@ def add_market(self, market) -> None:
         # create sports data generator
         file_path = os.path.join(self.directory, market.market_id)
         self._gen = self._create_generator(file_path, self.operation, 123)()
-        self._next = next(self._gen)
+        try:
+            self._next = next(self._gen)
+        except StopIteration:
+            logger.error(
+                f"File {market.market_id} cannot be processed (data is not valid)"
+            )
+            self._next = None
 
     def remove_market(self, market) -> None:
         # clear gens

tests/test_middleware.py

@@ -477,6 +477,15 @@ def test_call(self, mock_call_strategy_error_handling):
             ]
         )
 
+    @mock.patch(
+        "flumine.markets.middleware.call_strategy_error_handling", return_value=True
+    )
+    def test_call_none(self, mock_call_strategy_error_handling):
+        self.middleware._next = None
+        mock_market = mock.Mock(market_id="1.1")
+        self.middleware(mock_market)
+        mock_call_strategy_error_handling.assert_not_called()
+
     @mock.patch(
         "flumine.markets.middleware.SimulatedSportsDataMiddleware._create_generator"
     )