blockapi 2.10.1__tar.gz → 2.10.3__tar.gz

{blockapi-2.10.1 → blockapi-2.10.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 2.10.1
+Version: 2.10.3
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
@@ -9,18 +9,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests<3.0,>=2.28
 Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: cytoolz>=0.12.0
+Requires-Dist: eth-utils>=2.0.0
 Requires-Dist: coinaddrng==1.1.1
-Requires-Dist: web3<8.0.0,>=5.2.2
-Requires-Dist: bs4>=0.0.1
-Requires-Dist: lxml>=4.4.1
 Requires-Dist: pydantic>=1.10.2
-Requires-Dist: marko<2.0.0,>=1.3.0
 Requires-Dist: fake_useragent>=1.1.3
 Requires-Dist: pytest
 Requires-Dist: pytest-vcr
 Requires-Dist: requests_mock>=1.9.3
 Requires-Dist: attrs<23.0.0,>=17.4.0
-Requires-Dist: solders>=0.22.0
 Requires-Dist: base58>=2.1.0
 Requires-Dist: aiohttp<3.14
 Dynamic: author

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/__init__.py

@@ -1,4 +1,3 @@
-import inspect
 import random
 
 import coinaddrng

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/test/v2/api/nft/test_opensea.py

@@ -84,7 +84,7 @@ def test_fetch_ntfs(
     nfts = api.fetch_nfts(nfts_test_address)
     assert len(nfts.data) == 2
     assert len(fake_sleep_provider.calls)
-    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.25)
+    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.75)
 
 
 def test_fetch_ntfs_error_response(requests_mock, api, fake_sleep_provider):
@@ -96,7 +96,7 @@ def test_fetch_ntfs_error_response(requests_mock, api, fake_sleep_provider):
     nfts = api.fetch_nfts(nfts_test_address)
     assert len(nfts.data) == 0
     assert len(fake_sleep_provider.calls)
-    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.25)
+    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.75)
 
 
 def test_fetch_offers(
@@ -114,7 +114,7 @@ def test_fetch_offers(
     offers = api.fetch_offers(test_collection_slug)
     assert len(offers.data) == 2
     assert len(fake_sleep_provider.calls)
-    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.25)
+    assert fake_sleep_provider.calls[0] == ('https://api.opensea.io/', 0.75)
 
 
 def test_fetch_offers_error_response(requests_mock, api, offers_response):

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/test/v2/test_base.py

@@ -1,3 +1,4 @@
+import logging
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -117,3 +118,60 @@ def mocked_500_with_success_response():
 def test_5xx_will_retry(customizable_api, mocked_500_with_success_response):
     response = customizable_api.get_data("test_method")
     assert response.status_code == 200
+
+
+@pytest.fixture()
+def mocked_429_with_success_response():
+    mocked_throttled = MagicMock()
+    mocked_throttled.status_code = 429
+    mocked_throttled.raise_for_status.side_effect = HTTPError(
+        "test_method", 429, "exception", {}, None
+    )
+    mocked_throttled.json.return_value = {}
+    mocked_throttled.headers = {}
+
+    mocked_success = MagicMock()
+    mocked_success.status_code = 200
+    mocked_success.json.return_value = {}
+    mocked_success.headers = {}
+
+    with patch('blockapi.v2.base.CustomizableBlockchainApi._get_response') as patched:
+        patched.side_effect = [
+            mocked_throttled,
+            mocked_success,
+        ]
+        yield patched
+
+
+def test_429_retried_logs_warning_not_error(
+    customizable_api, mocked_429_with_success_response, caplog
+):
+    with caplog.at_level(logging.WARNING, logger='blockapi.v2.base'):
+        response = customizable_api.get_data("test_method")
+
+    assert response.status_code == 200
+    assert not any(r.levelno >= logging.ERROR for r in caplog.records)
+    assert any(r.levelno == logging.WARNING for r in caplog.records)
+
+
+@pytest.fixture()
+def mocked_429_only_response():
+    mocked_throttled = MagicMock()
+    mocked_throttled.status_code = 429
+    mocked_throttled.raise_for_status.side_effect = HTTPError(
+        "test_method", 429, "exception", {}, None
+    )
+    mocked_throttled.json.return_value = {}
+    mocked_throttled.headers = {}
+
+    with patch('blockapi.v2.base.CustomizableBlockchainApi._get_response') as patched:
+        patched.side_effect = [mocked_throttled] * 5
+        yield patched
+
+
+def test_429_exhausted_logs_error(customizable_api, mocked_429_only_response, caplog):
+    with caplog.at_level(logging.WARNING, logger='blockapi.v2.base'):
+        response = customizable_api.get_data("test_method")
+
+    assert response.status_code == 429
+    assert any(r.levelno == logging.ERROR for r in caplog.records)

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/test/v2/test_data.py

@@ -10,7 +10,6 @@ from blockapi.v2.api import (
     EthplorerApi,
     KusamaSubscanApi,
     OptimismEtherscanApi,
-    PerpetualApi,
     PolkadotSubscanApi,
     SolanaApi,
     SubscanApi,
@@ -32,7 +31,6 @@ from blockapi.v2.api.covalenth.moonbeam import MoonBeamCovalentApi
 from blockapi.v2.api.covalenth.palm import PalmCovalentApi
 from blockapi.v2.api.covalenth.polygon import PolygonCovalentApi
 from blockapi.v2.api.covalenth.rsk import RskCovalentApi
-from blockapi.v2.api.synthetix import SynthetixApi
 
 # TODO create method for auto loading all classes
 from blockapi.v2.base import BalanceMixin, IBalance
@@ -93,8 +91,6 @@ API_CLASSES = [
     PolkadotSubscanApi,
     KusamaSubscanApi,
     CosmosApi,
-    SynthetixApi,
-    PerpetualApi,
     BlockchairBitcoinApi,
 ]
 
@@ -187,8 +183,6 @@ def yield_api_balance_classes():
                 CosmosApiBase,
                 CovalentApiBase,
                 DebankApi,
-                PerpetualApi,
-                SynthetixApi,
                 SubscanApi,
                 TrezorApi,
             ),

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/test/v2/test_enumerate_classes.py

@@ -5,7 +5,7 @@ from blockapi.test.v2.test_data import (
     yield_api_balance_classes,
     yield_covalent_api_classes,
 )
-from blockapi.v2.api import DebankApi, EthplorerApi, PerpetualApi
+from blockapi.v2.api import DebankApi, EthplorerApi
 from blockapi.v2.api.covalenth.arbitrum import ArbitrumCovalentApi
 from blockapi.v2.api.covalenth.astar import AstarCovalentApi
 from blockapi.v2.api.covalenth.avalanche import AvalancheCovalentApi
@@ -20,7 +20,6 @@ from blockapi.v2.api.covalenth.moonbeam import MoonBeamCovalentApi
 from blockapi.v2.api.covalenth.palm import PalmCovalentApi
 from blockapi.v2.api.covalenth.polygon import PolygonCovalentApi
 from blockapi.v2.api.covalenth.rsk import RskCovalentApi
-from blockapi.v2.api.synthetix import SynthetixApi
 
 
 def test_enumerate_subclasses():
@@ -29,8 +28,6 @@ def test_enumerate_subclasses():
     assert classes
     assert EthplorerApi.__name__ in classes
     assert DebankApi.__name__ not in classes
-    assert PerpetualApi.__name__ not in classes
-    assert SynthetixApi.__name__ not in classes
 
     for cls in classes:
         assert 'Base' not in cls

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/api/__init__.py

@@ -12,7 +12,6 @@ from blockapi.v2.api.ethplorer import EthplorerApi
 from blockapi.v2.api.haskoin import HaskoinApi
 from blockapi.v2.api.litecoinspace import LitecoinSpaceApi
 from blockapi.v2.api.optimistic_etherscan import OptimismEtherscanApi
-from blockapi.v2.api.perpetual import PerpetualApi, perp_contract_address
 from blockapi.v2.api.solana import SolanaApi, SolscanApi
 from blockapi.v2.api.subscan import KusamaSubscanApi, PolkadotSubscanApi, SubscanApi
 from blockapi.v2.api.terra import TerraApi

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/api/nft/magic_eden.py

@@ -399,7 +399,7 @@ class MagicEdenApi(BlockchainApi, INftProvider, INftParser):
             return False
 
         retry = bool(
-            [t for t in data.errors if str(t).upper() == 'SERVICE UNAVAILABLE']
+            [t for t in data.errors if 'SERVICE UNAVAILABLE' in str(t).upper()]
         )
         if retry:
             logger.warning('Service unavailable - will retry after long sleep')

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/api/nft/opensea.py

@@ -75,7 +75,7 @@ class OpenSeaApi(BlockchainApi, INftProvider, INftParser):
     api_options = ApiOptions(
         blockchain=Blockchain.ETHEREUM,
         base_url='https://api.opensea.io/',
-        rate_limit=0.25,  # 4 per second
+        rate_limit=0.75,  # 4 requests per 3 seconds
     )
 
     supported_requests = {

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/base.py

@@ -113,15 +113,17 @@ class CustomizableBlockchainApi(ABC):
                 self.sleep_provider.sleep(self.base_url, seconds=sleep_seconds)
                 continue
             except HTTPError:
-                logger.error(f"Request failed with http error: {response.status_code}")
-
                 retries -= 1
 
-                if (
-                    retries <= 0
-                    or (response.status_code < 500 and response.status_code != 429)
-                    or not self.sleep_provider
-                ):
+                retryable = response.status_code == 429 or response.status_code >= 500
+
+                if retries <= 0 or not retryable or not self.sleep_provider:
+                    # Genuine failure: out of retries, non-retryable status,
+                    # or nothing to pace the retry with. This is the only path
+                    # that surfaces an error to the caller, so log at ERROR.
+                    logger.error(
+                        f"Request failed with http error: {response.status_code}"
+                    )
                     time = self._get_response_time(response.headers)
                     return FetchResult(
                         status_code=response.status_code,
@@ -137,9 +139,12 @@ class CustomizableBlockchainApi(ABC):
                 except ValueError:
                     seconds = 60
 
+                # Retryable error that will be retried, so this is expected
+                # noise (e.g. 429 throttling) rather than a failure: WARNING.
                 logger.warning(
-                    f'Too Many Requests: Will retry after {seconds}s sleep.'
-                    f' Remaining attempts {retries}.'
+                    f'Request failed with retryable http error'
+                    f' {response.status_code}: will retry after {seconds}s'
+                    f' sleep. Remaining attempts {retries}.'
                 )
                 self.sleep_provider.sleep(self.base_url, seconds=seconds)
                 continue
@@ -193,15 +198,19 @@ class CustomizableBlockchainApi(ABC):
     def _get_reason(response):
         reason = response.reason
         if not reason and response.status_code >= 400:
-            return f'Error {response.status_code}'
+            reason = f'Error {response.status_code}'
 
-        if not isinstance(reason, bytes):
-            return reason
-
-        try:
-            return reason.decode("utf-8")
-        except UnicodeDecodeError:
-            return reason.decode("iso-8859-1")
+        if isinstance(reason, bytes):
+            try:
+                reason = reason.decode("utf-8")
+            except UnicodeDecodeError:
+                reason = reason.decode("iso-8859-1")
+
+        # Append the response body so the error carries the server's own
+        # message instead of just the HTTP status phrase. Truncated to keep
+        # logs readable.
+        body = (response.text or '').strip()
+        return f'{reason}: {body[:500]}' if body else reason
 
     @staticmethod
     def _raise_from_response(response: Response) -> None:

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/coins.py

@@ -431,15 +431,6 @@ COIN_DOGE = Coin(
     info=CoinInfo(coingecko_id=CoingeckoId.DOGECOIN),
 )
 
-COIN_SNX = Coin(
-    symbol='SNX',
-    name='Synthetix',
-    decimals=18,
-    address='0xc011a73ee8576fb46f5e1c5751ca3b9fe0af2a6f',
-    blockchain=Blockchain.ETHEREUM,
-    info=CoinInfo(coingecko_id=CoingeckoId.SYNTHETIX),
-)
-
 
 COIN_CANTO = Coin(
     symbol='CANTO',

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi/v2/models.py

@@ -473,7 +473,6 @@ class CoingeckoId(str, Enum):
     SOLANA = 'solana'
     SONGBIRD = 'songbird'
     SUI = 'sui'
-    SYNTHETIX = 'havven'
     TELOS = 'telos'
     USDC = 'usd-coin'
     WANCHAIN = 'wanchain'

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 2.10.1
+Version: 2.10.3
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.
@@ -9,18 +9,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: requests<3.0,>=2.28
 Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: cytoolz>=0.12.0
+Requires-Dist: eth-utils>=2.0.0
 Requires-Dist: coinaddrng==1.1.1
-Requires-Dist: web3<8.0.0,>=5.2.2
-Requires-Dist: bs4>=0.0.1
-Requires-Dist: lxml>=4.4.1
 Requires-Dist: pydantic>=1.10.2
-Requires-Dist: marko<2.0.0,>=1.3.0
 Requires-Dist: fake_useragent>=1.1.3
 Requires-Dist: pytest
 Requires-Dist: pytest-vcr
 Requires-Dist: requests_mock>=1.9.3
 Requires-Dist: attrs<23.0.0,>=17.4.0
-Requires-Dist: solders>=0.22.0
 Requires-Dist: base58>=2.1.0
 Requires-Dist: aiohttp<3.14
 Dynamic: author

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi.egg-info/SOURCES.txt

@@ -51,10 +51,6 @@ blockapi/test/v2/api/nft/test_magic_eden.py
 blockapi/test/v2/api/nft/test_opensea.py
 blockapi/test/v2/api/nft/test_simple_hash.py
 blockapi/test/v2/api/nft/test_unisat.py
-blockapi/test/v2/api/perpetual/__init__.py
-blockapi/test/v2/api/perpetual/test_perpetual.py
-blockapi/test/v2/api/synthetix/__init__.py
-blockapi/test/v2/api/synthetix/test_synthetix.py
 blockapi/utils/__init__.py
 blockapi/utils/address.py
 blockapi/utils/datetime.py
@@ -83,7 +79,6 @@ blockapi/v2/api/subscan.py
 blockapi/v2/api/sui.py
 blockapi/v2/api/terra.py
 blockapi/v2/api/trezor.py
-blockapi/v2/api/web3_utils.py
 blockapi/v2/api/covalenth/__init__.py
 blockapi/v2/api/covalenth/arbitrum.py
 blockapi/v2/api/covalenth/astar.py
@@ -104,10 +99,4 @@ blockapi/v2/api/nft/__init__.py
 blockapi/v2/api/nft/magic_eden.py
 blockapi/v2/api/nft/opensea.py
 blockapi/v2/api/nft/simple_hash.py
-blockapi/v2/api/nft/unisat.py
-blockapi/v2/api/perpetual/__init__.py
-blockapi/v2/api/perpetual/perp_abi.py
-blockapi/v2/api/perpetual/perpetual.py
-blockapi/v2/api/synthetix/__init__.py
-blockapi/v2/api/synthetix/synthetix.py
-blockapi/v2/api/synthetix/synthetix_abi.py
+blockapi/v2/api/nft/unisat.py

{blockapi-2.10.1 → blockapi-2.10.3}/blockapi.egg-info/requires.txt

@@ -1,16 +1,13 @@
 requests<3.0,>=2.28
 python-dateutil>=2.8.0
+cytoolz>=0.12.0
+eth-utils>=2.0.0
 coinaddrng==1.1.1
-web3<8.0.0,>=5.2.2
-bs4>=0.0.1
-lxml>=4.4.1
 pydantic>=1.10.2
-marko<2.0.0,>=1.3.0
 fake_useragent>=1.1.3
 pytest
 pytest-vcr
 requests_mock>=1.9.3
 attrs<23.0.0,>=17.4.0
-solders>=0.22.0
 base58>=2.1.0
 aiohttp<3.14

{blockapi-2.10.1 → blockapi-2.10.3}/setup.py

@@ -6,7 +6,7 @@ with open("README.md", "r") as f:
 
 PACKAGES = find_packages(where='.')
 
-__version__ = "2.10.1"
+__version__ = "2.10.3"
 
 setuptools.setup(
     name='blockapi',
@@ -20,18 +20,15 @@ setuptools.setup(
     install_requires=[
         'requests>=2.28,<3.0',
         'python-dateutil>=2.8.0',
+        'cytoolz>=0.12.0',
+        'eth-utils>=2.0.0',
         'coinaddrng==1.1.1',
-        'web3>=5.2.2,<8.0.0',
-        'bs4>=0.0.1',
-        'lxml>=4.4.1',
         'pydantic>=1.10.2',
-        'marko>=1.3.0,<2.0.0',
         'fake_useragent>=1.1.3',
         'pytest',
         'pytest-vcr',
         'requests_mock>=1.9.3',
         'attrs>=17.4.0,<23.0.0',
-        'solders>=0.22.0',
         'base58>=2.1.0',
         # vcrpy incompatible with 3.14, remove once vcrpy>8.1.1 is out
         'aiohttp<3.14',

blockapi-2.10.1/blockapi/test/v2/api/perpetual/test_perpetual.py

@@ -1,94 +0,0 @@
-import os
-
-import pytest
-from _decimal import Decimal
-
-from blockapi.v2.api import PerpetualApi, perp_contract_address
-from blockapi.v2.base import ApiException
-from blockapi.v2.models import FetchResult
-
-
-@pytest.fixture
-def perp_api():
-    return PerpetualApi('http://localhost:2048/')
-
-
-test_address = '0x134089B387E22f52b1e06CC80d9a5F622032EF74'
-
-
-@pytest.mark.skip(
-    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
-)
-def test_perp_contract_address():
-    contract = perp_contract_address('PERP')
-    assert contract == '0xbC396689893D065F41bc2C6EcbeE5e0085233447'
-
-
-@pytest.mark.skip(
-    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
-)
-def test_perp_invalid_contract_raises():
-    with pytest.raises(ValueError, match='Invalid contract name.'):
-        perp_contract_address("abc")
-
-
-def test_perp_has_coin(perp_api):
-    assert perp_api.coin.symbol == 'PERP'
-
-
-def filter_infura_key(request):
-    if 'infura.io' in request.host:
-        request.uri = 'https://mainnet.infura.io/v3/API_KEY_FILTERED'
-    return request
-
-
-@pytest.mark.integration
-@pytest.mark.skip(
-    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
-)
-def test_fetch():
-    key = os.environ.get('INFURA_API_KEY')
-    api = PerpetualApi(f'https://mainnet.infura.io/v3/{key}')
-    raw = api.fetch_balances(test_address)
-    assert raw.data
-
-
-@pytest.mark.integration
-@pytest.mark.skip(
-    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
-)
-def test_fetch_error():
-    api = PerpetualApi(f'https://mainnet.infura.io/v3/no-key')
-    raw = api.fetch_balances(test_address)
-    assert raw.status_code == 401
-    assert (
-        raw.errors[0]
-        == '401 Client Error: Unauthorized for url: https://mainnet.infura.io/v3/no-key'
-    )
-
-
-@pytest.mark.skip(
-    reason='metadata.perp.exchange/production.json returns 404 — upstream endpoint is offline'
-)
-def test_fetch_error_raises_from_get_balances():
-    api = PerpetualApi(f'https://mainnet.infura.io/v3/no-key')
-    with pytest.raises(ApiException) as exc:
-        api.get_balance(test_address)
-
-    assert exc.match('401 Client Error: Unauthorized for url')
-
-
-def test_parse(perp_api):
-    raw = FetchResult(
-        status_code=200,
-        data=dict(
-            staking_claimable='1.10',
-            vesting_claimable='2.02',
-            vesting_locked='3.30',
-        ),
-    )
-
-    parsed = perp_api.parse_balances(raw)
-
-    assert parsed.data[0].balance == Decimal('3.12')
-    assert parsed.data[1].balance == Decimal('3.30')