cryptofeed 2.4.1__tar.gz → 2.5.0__tar.gz

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/CHANGES.md

@@ -1,5 +1,15 @@
 ## Changelog
 
+### 2.5.0 (2026-08-08)
+ * Update: Python 3.12+ required, completed move to uv, `setup.py` removed
+ * Update: CI/CD overhaul
+ * Bugfix: various bugs in FeedHandler that prevented it from running on 3.14+
+ * Bugfix: various backend issues that prevented them from working with later versions of Python
+ * Bugfix: Gemini authenticated issue with newer version of websocket library
+ * Bugfix: Binance listenKey refresh now uses aiohttp
+ * Update: Binance per connection stream limit (issue #1087)
+ * Bugfix: Bybit L2_BOOK callback timestamp normalization (issue #1083)
+
 ### 2.4.1 (2025-02-08)
  * Update: Added `is_data_json` to `write()` in `HTTPSync` from `connection.py` to support JSON payloads (#1071)
  * Bugfix: Handle empty nextFundingRate in OKX

cryptofeed-2.5.0/PKG-INFO

@@ -0,0 +1,257 @@
+Metadata-Version: 2.4
+Name: cryptofeed
+Version: 2.5.0
+Summary: Cryptocurrency Exchange Websocket Data Feed Handler
+Author-email: Bryant Moscon <bmoscon@gmail.com>
+License-Expression: XFree86-1.1
+Project-URL: Homepage, https://github.com/bmoscon/cryptofeed
+Keywords: cryptocurrency,bitcoin,btc,feed handler,market feed,market data,crypto assets,Trades,Tickers,BBO,Funding,Open Interest,Liquidation,Order book,Bid,Ask,fmfw.io,Bitfinex,bitFlyer,AscendEX,Bitstamp,Blockchain.com,Bybit,Binance,Binance Delivery,Binance Futures,Binance US,BitMEX,Coinbase,Deribit,EXX,Gate.io,Gemini,HitBTC,Huobi,Huobi DM,Huobi Swap,Kraken,Kraken Futures,OKCoin,OKX,Poloniex,ProBit,Upbit
+Classifier: Intended Audience :: Developers
+Classifier: Development Status :: 4 - Beta
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Framework :: AsyncIO
+Requires-Python: >=3.12
+Description-Content-Type: text/markdown
+License-File: LICENSE
+License-File: AUTHORS.md
+Requires-Dist: requests>=2.18.4
+Requires-Dist: websockets>=14.1
+Requires-Dist: pyyaml
+Requires-Dist: aiohttp>=3.11.6
+Requires-Dist: aiofile>=2.0.0
+Requires-Dist: yapic.json>=1.6.3
+Requires-Dist: uvloop; platform_system != "Windows"
+Requires-Dist: order_book>=0.6.0
+Requires-Dist: aiodns>=1.1
+Provides-Extra: arctic
+Requires-Dist: arctic; extra == "arctic"
+Requires-Dist: pandas; extra == "arctic"
+Provides-Extra: gcp-pubsub
+Requires-Dist: google_cloud_pubsub>=2.4.1; extra == "gcp-pubsub"
+Requires-Dist: gcloud_aio_pubsub; extra == "gcp-pubsub"
+Provides-Extra: kafka
+Requires-Dist: aiokafka>=0.7.0; extra == "kafka"
+Provides-Extra: mongo
+Requires-Dist: motor; extra == "mongo"
+Provides-Extra: postgres
+Requires-Dist: asyncpg; extra == "postgres"
+Provides-Extra: quasardb
+Requires-Dist: quasardb; extra == "quasardb"
+Requires-Dist: numpy; extra == "quasardb"
+Provides-Extra: rabbit
+Requires-Dist: aio_pika; extra == "rabbit"
+Requires-Dist: pika; extra == "rabbit"
+Provides-Extra: redis
+Requires-Dist: hiredis; extra == "redis"
+Requires-Dist: redis>=4.5.1; extra == "redis"
+Provides-Extra: zmq
+Requires-Dist: pyzmq; extra == "zmq"
+Provides-Extra: all
+Requires-Dist: arctic; extra == "all"
+Requires-Dist: google_cloud_pubsub>=2.4.1; extra == "all"
+Requires-Dist: gcloud_aio_pubsub; extra == "all"
+Requires-Dist: aiokafka>=0.7.0; extra == "all"
+Requires-Dist: motor; extra == "all"
+Requires-Dist: asyncpg; extra == "all"
+Requires-Dist: aio_pika; extra == "all"
+Requires-Dist: pika; extra == "all"
+Requires-Dist: hiredis; extra == "all"
+Requires-Dist: redis>=4.5.1; extra == "all"
+Requires-Dist: pyzmq; extra == "all"
+Dynamic: license-file
+
+# Cryptocurrency Exchange Feed Handler
+[![License](https://img.shields.io/badge/license-XFree86-blue.svg)](LICENSE)
+![Python](https://img.shields.io/badge/Python-3.12+-green.svg)
+[![PyPi](https://img.shields.io/badge/PyPi-cryptofeed-brightgreen.svg)](https://pypi.python.org/pypi/cryptofeed)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/efa4e0d6e10b41d0b51454d08f7b33b1)](https://www.codacy.com/app/bmoscon/cryptofeed?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=bmoscon/cryptofeed&amp;utm_campaign=Badge_Grade)
+
+Handles multiple cryptocurrency exchange data feeds and returns normalized and standardized results to client registered callbacks for events like trades, book updates, ticker updates, etc. Utilizes websockets when possible, but can also poll data via REST endpoints if a websocket is not provided.
+
+## Supported exchanges
+
+* [AscendEX](https://ascendex.com/)
+* [Bequant](https://bequant.io/)
+* [Bitfinex](https://bitfinex.com)
+* [bitFlyer](https://bitflyer.com/)
+* [Bithumb](https://en.bithumb.com/)
+* [Bitstamp](https://www.bitstamp.net/)
+* [Blockchain.com](https://www.blockchain.com/)
+* [Bybit](https://www.bybit.com/)
+* [Binance](https://www.binance.com/en)
+* [Binance Delivery](https://binance-docs.github.io/apidocs/delivery/en/)
+* [Binance Futures](https://www.binance.com/en/futures)
+* [Binance US](https://www.binance.us/en)
+* [Bit.com](https://www.bit.com)
+* [Bitget](https://www.bitget.com/)
+* [BitMEX](https://www.bitmex.com/)
+* [Coinbase](https://www.coinbase.com/)
+* [Crypto.com](https://www.crypto.com)
+* [Delta](https://www.delta.exchange/)
+* [Deribit](https://www.deribit.com/)
+* [dYdX](https://dydx.exchange/)
+* [FMFW.io](https://www.fmfw.io/)
+* [EXX](https://www.exx.com/)
+* [Gate.io](https://www.gate.io/)
+* [Gate.io Futures](https://www.gate.io/futures_center)
+* [Gemini](https://gemini.com/)
+* [HitBTC](https://hitbtc.com/)
+* [Huobi](https://www.hbg.com/)
+* [Huobi DM](https://www.huobi.com/en-us/markets/hb_dm/)
+* Huobi Swap (Coin-M and USDT-M)
+* [Independent Reserve](https://www.independentreserve.com/) 
+* [Kraken](https://www.kraken.com/)
+* [Kraken Futures](https://futures.kraken.com/)
+* [KuCoin](https://www.kucoin.com/)
+* [OKCoin](http://okcoin.com/)
+* [OKX](https://www.okx.com/)
+* [Phemex](https://phemex.com/)
+* [Poloniex](https://www.poloniex.com/)
+* [ProBit](https://www.probit.com/)
+* [Upbit](https://sg.upbit.com/home)
+
+
+## Basic Usage
+
+Create a FeedHandler object and add subscriptions. For the various data channels that an exchange supports, you can supply callbacks for data events, or use provided backends (described below) to handle the data for you. Start the feed handler and you're done!
+
+```python
+from cryptofeed import FeedHandler
+# not all imports shown for clarity
+
+fh = FeedHandler()
+
+# ticker, trade, and book are user defined functions that
+# will be called when ticker, trade and book updates are received
+ticker_cb = {TICKER: ticker}
+trade_cb = {TRADES: trade}
+gemini_cb = {TRADES: trade, L2_BOOK: book}
+
+
+fh.add_feed(Coinbase(symbols=['BTC-USD'], channels=[TICKER], callbacks=ticker_cb))
+fh.add_feed(Bitfinex(symbols=['BTC-USD'], channels=[TICKER], callbacks=ticker_cb))
+fh.add_feed(Poloniex(symbols=['BTC-USDT'], channels=[TRADES], callbacks=trade_cb))
+fh.add_feed(Gemini(symbols=['BTC-USD', 'ETH-USD'], channels=[TRADES, L2_BOOK], callbacks=gemini_cb))
+
+fh.run()
+```
+
+Please see the [examples](https://github.com/bmoscon/cryptofeed/tree/master/examples) for more code samples and the [documentation](https://github.com/bmoscon/cryptofeed/blob/master/docs/README.md) for more information about the library usage.
+
+
+For an example of a containerized application using cryptofeed to store data to a backend, please see [Cryptostore](https://github.com/bmoscon/cryptostore).
+
+
+## National Best Bid/Offer (NBBO)
+
+Cryptofeed also provides a synthetic [NBBO](examples/demo_nbbo.py) (National Best Bid/Offer) feed that aggregates the best bids and asks from the user specified feeds.
+
+```python
+from cryptofeed import FeedHandler
+from cryptofeed.exchanges import Coinbase, Gemini, Kraken
+
+
+def nbbo_update(symbol, bid, bid_size, ask, ask_size, bid_feed, ask_feed):
+    print(f'Pair: {symbol} Bid Price: {bid:.2f} Bid Size: {bid_size:.6f} Bid Feed: {bid_feed} Ask Price: {ask:.2f} Ask Size: {ask_size:.6f} Ask Feed: {ask_feed}')
+
+
+def main():
+    f = FeedHandler()
+    f.add_nbbo([Coinbase, Kraken, Gemini], ['BTC-USD'], nbbo_update)
+    f.run()
+```
+
+## Supported Channels
+
+Cryptofeed supports the following channels from exchanges:
+
+### Market Data Channels (Public)
+
+* L1_BOOK - Top of book
+* L2_BOOK - Price aggregated sizes. Some exchanges provide the entire depth, some provide a subset.
+* L3_BOOK - Price aggregated orders. Like the L2 book, some exchanges may only provide partial depth.
+* TRADES - Note this reports the taker's side, even for exchanges that report the maker side.
+* TICKER
+* FUNDING
+* OPEN_INTEREST - Open interest data.
+* LIQUIDATIONS
+* INDEX
+* CANDLES - Candlestick / K-Line data.
+
+### Authenticated Data Channels
+
+* ORDER_INFO - Order status updates
+* TRANSACTIONS - Real-time updates on account deposits and withdrawals
+* BALANCES - Updates on wallet funds
+* FILLS - User's executed trades
+
+
+## Backends
+
+Cryptofeed supports `backend` callbacks that will write directly to storage or other interfaces.
+
+Supported Backends:
+* Redis (Streams and Sorted Sets)
+* [Arctic](https://github.com/manahl/arctic)
+* ZeroMQ
+* UDP Sockets
+* TCP Sockets
+* Unix Domain Sockets
+* [InfluxDB v2](https://github.com/influxdata/influxdb)
+* MongoDB
+* Kafka
+* RabbitMQ
+* PostgreSQL
+* [QuasarDB](https://quasar.ai/)
+* GCP Pub/Sub
+* [QuestDB](https://questdb.io/)
+
+
+## Installation
+
+**Note:** cryptofeed requires Python 3.12+
+
+Cryptofeed can be installed from PyPi. (It's recommended that you install in a virtual environment of your choosing).
+
+    pip install cryptofeed
+
+Cryptofeed has optional dependencies, depending on the backends used. You can install them individually, or all at once. To install Cryptofeed along with all its optional dependencies in one bundle:
+
+    pip install cryptofeed[all]
+
+If you wish to clone the repository and work on it (development uses [uv](https://docs.astral.sh/uv/)), run this from the root of the cloned repository:
+
+    uv sync
+
+Alternatively, you can install from source in editable mode with pip:
+
+    pip install -e .
+
+See more discussion of package installation in [INSTALL.md](https://github.com/bmoscon/cryptofeed/blob/master/INSTALL.md).
+
+
+
+## Rest API
+
+Cryptofeed supports some REST interfaces for retrieving real-time and historical data, as well as order placement and account management. These are integrated into the exchange classes directly. You can view the supported methods by calling the `info()` method on any exchange. The methods for interacting with the exchange RET endpoints exist in two flavors, the synchronous methods (suffixed with `_sync`) as well as the asynchronous which can be utilized with asyncio. For more information see the [documentation](docs/rest.md).
+
+
+## Future Work
+
+There are a lot of planned features, new exchanges, etc planned! If you'd like to discuss ongoing development, please join the [discord](https://discord.gg/zaBYaGAYfR) or open a thread in the [discussions](https://github.com/bmoscon/cryptofeed/discussions) in GitHub.
+
+## Contributing
+
+Issues and PRs are welcomed!
+
+Cryptofeed wouldn't be possible without the help of many [contributors](AUTHORS.md)! I owe them and all other contributors my thanks!
+
+## Donations / Support
+
+Support and donations are appreciated but not required. You can donate via [GitHub Sponsors](https://github.com/sponsors/bmoscon), or via the addresses below:
+
+* Bitcoin: bc1qm0kxz8hqacaglku5fjhfe9a5hjnuyfwk02lsyr
+* Ethereum: 0x690709FEe13eEce9E7852089BB2D53Ae5D073154

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/README.md

@@ -1,6 +1,6 @@
 # Cryptocurrency Exchange Feed Handler
 [![License](https://img.shields.io/badge/license-XFree86-blue.svg)](LICENSE)
-![Python](https://img.shields.io/badge/Python-3.8+-green.svg)
+![Python](https://img.shields.io/badge/Python-3.12+-green.svg)
 [![PyPi](https://img.shields.io/badge/PyPi-cryptofeed-brightgreen.svg)](https://pypi.python.org/pypi/cryptofeed)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/efa4e0d6e10b41d0b51454d08f7b33b1)](https://www.codacy.com/app/bmoscon/cryptofeed?utm_source=github.com&utm_medium=referral&utm_content=bmoscon/cryptofeed&utm_campaign=Badge_Grade)
 
@@ -147,7 +147,7 @@ Supported Backends:
 
 ## Installation
 
-**Note:** cryptofeed requires Python 3.8+
+**Note:** cryptofeed requires Python 3.12+
 
 Cryptofeed can be installed from PyPi. (It's recommended that you install in a virtual environment of your choosing).
 
@@ -157,13 +157,13 @@ Cryptofeed has optional dependencies, depending on the backends used. You can in
 
     pip install cryptofeed[all]
 
-If you wish to clone the repository and install from source, run this command from the root of the cloned repository.
+If you wish to clone the repository and work on it (development uses [uv](https://docs.astral.sh/uv/)), run this from the root of the cloned repository:
 
-    python setup.py install
+    uv sync
 
-Alternatively, you can install in 'edit' mode (also called development mode):
+Alternatively, you can install from source in editable mode with pip:
 
-    python setup.py develop
+    pip install -e .
 
 See more discussion of package installation in [INSTALL.md](https://github.com/bmoscon/cryptofeed/blob/master/INSTALL.md).
 

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/backends/kafka.py

@@ -56,11 +56,10 @@ class KafkaCallback(BackendQueue):
 
     async def _connect(self):
         if not self.producer:
-            loop = asyncio.get_event_loop()
             try:
                 config_keys = ', '.join([k for k in self.producer_config.keys()])
                 LOG.info(f'{self.__class__.__name__}: Configuring AIOKafka with the following parameters: {config_keys}')
-                self.producer = AIOKafkaProducer(**self.producer_config, loop=loop)
+                self.producer = AIOKafkaProducer(**self.producer_config)
             # Quit if invalid config option passed to AIOKafka
             except (TypeError, ValueError) as e:
                 LOG.error(f'{self.__class__.__name__}: Invalid AIOKafka configuration: {e.args}{chr(10)}See https://aiokafka.readthedocs.io/en/stable/api.html#aiokafka.AIOKafkaProducer for list of configuration options')

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/backends/rabbitmq.py

@@ -4,7 +4,6 @@ Copyright (C) 2017-2025 Bryant Moscon - bmoscon@gmail.com
 Please see the LICENSE file for the terms and conditions
 associated with this software.
 '''
-import asyncio
 from collections import defaultdict
 
 import aio_pika
@@ -44,11 +43,11 @@ class RabbitCallback:
     async def connect(self):
         if not self.conn:
             if self.exchange_mode:
-                connection = await aio_pika.connect_robust(f"amqp://{self.host}", loop=asyncio.get_running_loop())
+                connection = await aio_pika.connect_robust(f"amqp://{self.host}")
                 self.conn = await connection.channel()
                 self.conn = await self.conn.declare_exchange(self.exchange_name, self.exchange_type, durable=True, auto_delete=False)
             else:
-                connection = await aio_pika.connect_robust(f"amqp://{self.host}", loop=asyncio.get_running_loop())
+                connection = await aio_pika.connect_robust(f"amqp://{self.host}")
                 self.conn = await connection.channel()
                 await self.conn.declare_queue(self.queue_name, auto_delete=False, durable=True)
 

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/backends/redis.py

@@ -24,7 +24,7 @@ class RedisCallback(BackendQueue):
             prefix = 'unix://'
             port = None
 
-        self.redis = f"{prefix}{host}" + f":{port}" if port else ""
+        self.redis = f"{prefix}{host}" + (f":{port}" if port else "")
         self.key = key if key else self.default_key
         self.numeric_type = numeric_type
         self.none_to = none_to

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/backends/socket.py

@@ -79,8 +79,8 @@ class SocketCallback(BackendQueue):
                     data = {'type': self.key, 'data': update}
                     data = json.dumps(data)
                     if self.conn_type == 'udp://':
-                        if len(update) > self.mtu:
-                            chunks = wrap(update, self.mtu)
+                        if len(data) > self.mtu:
+                            chunks = wrap(data, self.mtu)
                             for chunk in chunks:
                                 msg = json.dumps({'type': 'chunked', 'chunks': len(chunks), 'data': chunk}).encode()
                                 self.conn.sendto(msg)

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/callback.py

@@ -19,8 +19,8 @@ class Callback:
         elif self.is_async:
             await self.callback(obj, receipt_timestamp)
         else:
-            loop = asyncio.get_event_loop()
-            await loop.run_in_executor(None, self.callback, (obj, receipt_timestamp))
+            loop = asyncio.get_running_loop()
+            await loop.run_in_executor(None, self.callback, obj, receipt_timestamp)
 
 
 class TradeCallback(Callback):

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/binance.py

@@ -8,6 +8,7 @@ import logging
 from asyncio import create_task, sleep
 from collections import defaultdict
 from decimal import Decimal
+import aiohttp
 import requests
 import time
 from typing import Dict, Union, Tuple
@@ -45,6 +46,7 @@ class Binance(Feed, BinanceRestMixin):
         ORDER_INFO: ORDER_INFO
     }
     request_limit = 20
+    per_connection_limit = 1024
 
     @classmethod
     def timestamp_normalize(cls, ts: float) -> float:
@@ -135,14 +137,14 @@ class Binance(Feed, BinanceRestMixin):
                     pair = pair.lower()
                 subs.append(f"{pair}@{stream}")
 
-        if 0 < len(subs) < 200:
+        if 0 < len(subs) < self.per_connection_limit:
             return address + '/'.join(subs)
         else:
             def split_list(_list: list, n: int):
                 for i in range(0, len(_list), n):
                     yield _list[i:i + n]
 
-            return [address + '/'.join(chunk) for chunk in split_list(subs, 200)]
+            return [address + '/'.join(chunk) for chunk in split_list(subs, self.per_connection_limit)]
 
     def _reset(self):
         self._l2_book = {}
@@ -154,8 +156,10 @@ class Binance(Feed, BinanceRestMixin):
             if self._auth_token is None:
                 raise ValueError('There is no token to refresh')
             payload = {'listenKey': self._auth_token}
-            r = requests.put(f'{self.rest_endpoints[0].route("authentication", sandbox=self.sandbox)}?{urlencode(payload)}', headers={'X-MBX-APIKEY': self.key_id})
-            r.raise_for_status()
+            url = f'{self.rest_endpoints[0].route("authentication", sandbox=self.sandbox)}?{urlencode(payload)}'
+            async with aiohttp.ClientSession() as session:
+                async with session.put(url, headers={'X-MBX-APIKEY': self.key_id}) as r:
+                    r.raise_for_status()
 
     def _generate_token(self) -> str:
         url = self.rest_endpoints[0].route('authentication', sandbox=self.sandbox)

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/bybit.py

@@ -402,7 +402,7 @@ class Bybit(Feed):
         if update_type == 'delta':
             delta = {BID: data['b'], ASK: data['a']}
 
-        await self.book_callback(L2_BOOK, self._l2_book[pair], timestamp, timestamp=int(msg['ts']), raw=msg, delta=delta)
+        await self.book_callback(L2_BOOK, self._l2_book[pair], timestamp, timestamp=self.timestamp_normalize(int(msg['ts'])), raw=msg, delta=delta)
 
     async def _ticker_open_interest_funding_index(self, msg: dict, timestamp: float, conn: AsyncConnection):
         '''

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/gemini.py

@@ -196,7 +196,7 @@ class Gemini(Feed, GeminiRestMixin):
             if self.is_authenticated_channel(channel):
                 symbols.extend(self.subscription.get(channel))
         symbols = '&'.join([f"symbolFilter={s.lower()}" for s in symbols])  # needs to match REST format (lower case)
-        options['extra_headers'] = header
+        options['additional_headers'] = header
         return f'{address}?{symbols}', options
 
     async def subscribe(self, conn: AsyncConnection):

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/mixins/binance_rest.py

@@ -218,7 +218,7 @@ class BinanceDeliveryRestMixin(BinanceRestMixin):
 class BinanceUSRestMixin(BinanceRestMixin):
     api = 'https://api.binance.us/api/v3/'
     rest_channels = (
-        TRADES
+        TRADES,
     )
 
 

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/mixins/bitstamp_rest.py

@@ -21,7 +21,7 @@ LOG = logging.getLogger('feedhandler')
 
 class BitstampRestMixin(RestExchange):
     api = "https://www.bitstamp.net/api/v2/"
-    rest_channels = (CANDLES)
+    rest_channels = (CANDLES,)
     valid_candle_intervals = {'1m', '3m', '5m', '15m', '30m', '1h', '2h', '4h', '6h', '12h', '1d', '3d'}
 
     async def candles(self, symbol: str, start=None, end=None, interval='1m', retry_count=1, retry_delay=60):

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/exchanges/mixins/upbit_rest.py

@@ -22,7 +22,7 @@ LOG = logging.getLogger('feedhandler')
 
 class UpbitRestMixin(RestExchange):
     api = "https://api.upbit.com/v1/"
-    rest_channels = (CANDLES)
+    rest_channels = (CANDLES,)
     valid_candle_intervals = {'1m', '3m', '5m', '10m', '15m', '30m', '1h', '4h', '1d', '1w', '1M'}
 
     async def candles(self, symbol: str, start=None, end=None, interval='1m', retry_count=1, retry_delay=60):

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/feedhandler.py

@@ -10,6 +10,7 @@ import logging
 import signal
 from signal import SIGABRT, SIGINT, SIGTERM
 import sys
+import warnings
 from typing import List
 
 try:
@@ -32,6 +33,16 @@ from cryptofeed.exchanges import EXCHANGE_MAP
 LOG = logging.getLogger('feedhandler')
 
 
+def _get_event_loop():
+    # handle python versions where asyncio.get_event_loop() was removed
+    try:
+        return asyncio.get_event_loop()
+    except RuntimeError:
+        loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(loop)
+        return loop
+
+
 def setup_signal_handlers(loop):
     """
     This must be run from the loop in the main thread
@@ -73,7 +84,9 @@ class FeedHandler:
         if self.config.uvloop:
             try:
                 import uvloop
-                asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
+                with warnings.catch_warnings():
+                    warnings.simplefilter('ignore', DeprecationWarning)
+                    asyncio.set_event_loop_policy(uvloop.EventLoopPolicy())
                 LOG.info('FH: uvloop initalized')
             except ImportError:
                 LOG.info("FH: uvloop not initialized")
@@ -100,7 +113,7 @@ class FeedHandler:
 
         if self.running:
             if loop is None:
-                loop = asyncio.get_event_loop()
+                loop = _get_event_loop()
 
             self.feeds[-1].start(loop)
 
@@ -132,7 +145,7 @@ class FeedHandler:
             a custom exception handler for asyncio
         """
         self.running = True
-        loop = asyncio.get_event_loop()
+        loop = _get_event_loop()
         # Good to enable when debugging or without code change: export PYTHONASYNCIODEBUG=1)
         # loop.set_debug(True)
 
@@ -162,7 +175,7 @@ class FeedHandler:
     def _stop(self, loop=None):
         self.running = False
         if not loop:
-            loop = asyncio.get_event_loop()
+            loop = _get_event_loop()
 
         LOG.info('FH: shutdown connections handlers in feeds')
         for feed in self.feeds:
@@ -191,13 +204,15 @@ class FeedHandler:
         await asyncio.gather(*shutdown_tasks)
 
     def stop(self, loop=None):
+        if not loop:
+            loop = _get_event_loop()
         shutdown_tasks = self._stop(loop=loop)
         loop.run_until_complete(asyncio.gather(*shutdown_tasks))
 
     def close(self, loop=None):
         """Stop the asynchronous generators and close the event loop."""
         if not loop:
-            loop = asyncio.get_event_loop()
+            loop = _get_event_loop()
 
         LOG.info('FH: stop the AsyncIO loop')
         loop.stop()

{cryptofeed-2.4.1 → cryptofeed-2.5.0}/cryptofeed/raw_data_collection.py

@@ -19,7 +19,7 @@ from cryptofeed.exchanges import EXCHANGE_MAP
 
 def bytes_string_to_bytes(string):
     tree = ast.parse(string)
-    return tree.body[0].value.s
+    return tree.body[0].value.value
 
 
 def playback(feed: str, filenames: list, callbacks: dict = None, config: str = 'config.yaml'):