blockapi 2.10.3__tar.gz → 2.10.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 2.10.3
+Version: 2.10.5
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.

{blockapi-2.10.3 → blockapi-2.10.5}/blockapi/services.py

@@ -56,6 +56,9 @@ class Service(ABC):
             response = reqobj.get(request_url, headers=headers)
 
         self.last_response = response
+        # Naive local time on purpose: only used to measure elapsed time against
+        # datetime.now() in wait_for_next_request (rate limiting), never compared
+        # with tz-aware datetimes.
         self.last_response_time = datetime.now()
 
         if response.status_code != 200:

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

@@ -162,7 +162,9 @@ def test_parse_nfts(requests_mock, api, nfts_response, nfts_next_response):
         == 'data:application/json;base64,eyJuYW1lIjoiVW5pc3dhcCAtIDElIC0gUFJJTUUvV0VUSCAtIDMzMC4yMDw+NzgwLjI5In0='
     )
     assert not data.metadata
-    assert data.updated_time == datetime.datetime(2023, 8, 15, 13, 56, 39, 759414)
+    assert data.updated_time == datetime.datetime(
+        2023, 8, 15, 13, 56, 39, 759414, tzinfo=datetime.timezone.utc
+    )
     assert not data.is_disabled
     assert not data.is_nsfw
     assert data.blockchain == Blockchain.ETHEREUM

{blockapi-2.10.3 → blockapi-2.10.5}/blockapi/test/v2/api/nft/test_simple_hash.py

@@ -55,7 +55,9 @@ def test_parse_nfts(requests_mock, api, nfts_response):
     )
     assert not data.metadata_url
     assert not data.metadata
-    assert data.updated_time == datetime.datetime(2023, 3, 11, 3, 46, 15)
+    assert data.updated_time == datetime.datetime(
+        2023, 3, 11, 3, 46, 15, tzinfo=datetime.timezone.utc
+    )
     assert not data.is_disabled
     assert not data.is_nsfw
     assert data.blockchain == Blockchain.BITCOIN

{blockapi-2.10.3 → blockapi-2.10.5}/blockapi/utils/datetime.py

@@ -12,7 +12,12 @@ def parse_dt(dt: Union[str, int, float]) -> datetime:
         try:
             return datetime.fromtimestamp(int(dt), tz=timezone.utc)
         except ValueError:
-            return parse_date(dt)
+            parsed = parse_date(dt)
+            # Assume UTC for strings that carry no timezone, so parse_dt always
+            # returns a tz-aware datetime (consistent with the numeric paths).
+            if parsed.tzinfo is None:
+                parsed = parsed.replace(tzinfo=timezone.utc)
+            return parsed
     elif isinstance(dt, int) or isinstance(dt, float):
         return datetime.fromtimestamp(dt, tz=timezone.utc)
     else:

{blockapi-2.10.3 → blockapi-2.10.5}/blockapi/v2/api/debank.py

@@ -180,10 +180,7 @@ class DebankProtocolParser:
 
     @staticmethod
     def parse_item(item: DebankModelProtocol) -> Optional[Protocol]:
-        blockchain = get_blockchain_from_debank_chain(item.chain)
-        if not blockchain:
-            logger.warning(f'No blockchain found for protocol {item.id}. Skipping.')
-            return None
+        blockchain = get_blockchain_from_debank_chain(item.chain) or item.chain
 
         return Protocol.from_api(
             protocol_id=item.id,
@@ -243,6 +240,9 @@ class DebankProtocolCache:
     def __init__(self, timeout: int = 3600):
         self._timeout: int = timeout
         self._data: Dict[str, Protocol] = {}
+        # Naive local time on purpose: _timelimit is only ever compared against
+        # other datetime.now() values here (cache TTL), never mixed with the
+        # tz-aware datetimes used elsewhere, so there is no naive/aware hazard.
         self._timelimit = datetime.now()
 
     def invalidate(self):
@@ -326,12 +326,6 @@ class DebankBalanceParser:
             )
             return None
 
-        if not coin.blockchain:
-            logger.error(
-                f'DeBank: Skipping balance - could not parse blockchain "{balance_item.chain}". Amount={amount} (raw={raw_amount})'
-            )
-            return None
-
         if asset_type == AssetType.INVESTMENT and amount < 0:
             asset_type = AssetType.DEBT
             amount = -amount
@@ -360,7 +354,9 @@ class DebankBalanceParser:
 
     def get_coin(self, balance_item: DebankModelBalanceItem) -> Coin:
         contract = balance_item.id
-        blockchain = get_blockchain_from_debank_chain(balance_item.chain)
+        blockchain = (
+            get_blockchain_from_debank_chain(balance_item.chain) or balance_item.chain
+        )
         symbol = self.get_symbol(balance_item)
 
         coingecko_id = get_coingecko_id(contract, symbol)

{blockapi-2.10.3 → blockapi-2.10.5}/blockapi/v2/api/nft/unisat.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Optional, Dict, Generator, Tuple
 from enum import Enum
-from datetime import datetime
+from datetime import datetime, timezone
 
 from blockapi.v2.base import BlockchainApi, INftParser, INftProvider, ISleepProvider
 from blockapi.v2.coins import COIN_BTC
@@ -670,7 +670,7 @@ class UnisatApi(BlockchainApi, INftParser, INftProvider):
                 try:
                     timestamp_seconds = timestamp / 1000
                     formatted_time = datetime.fromtimestamp(
-                        timestamp_seconds
+                        timestamp_seconds, tz=timezone.utc
                     ).isoformat()
                 except (ValueError, TypeError, OverflowError):
                     logger.warning(

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

@@ -1,7 +1,7 @@
 import logging
 import time
 from abc import ABC
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Dict, List, Optional
 from urllib.parse import urljoin
 
@@ -107,7 +107,7 @@ class CustomizableBlockchainApi(ABC):
                     return FetchResult(
                         status_code=1,
                         errors=[str(connection_error)],
-                        time=datetime.utcnow(),
+                        time=datetime.now(timezone.utc),
                     )
 
                 self.sleep_provider.sleep(self.base_url, seconds=sleep_seconds)
@@ -155,7 +155,7 @@ class CustomizableBlockchainApi(ABC):
                     headers=dict(),
                     errors=[f'{type(ex).__name__}: {str(ex)}'],
                     extra=extra,
-                    time=datetime.utcnow(),
+                    time=datetime.now(timezone.utc),
                 )
 
             time = self._get_response_time(response.headers)
@@ -236,7 +236,7 @@ class CustomizableBlockchainApi(ABC):
             return parse_dt(date_str)
 
         if age_str := headers.get('age'):
-            return datetime.utcnow() - timedelta(seconds=int(age_str))
+            return datetime.now(timezone.utc) - timedelta(seconds=int(age_str))
 
         return None
 

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

@@ -1,5 +1,5 @@
 import json
-from datetime import datetime
+from datetime import datetime, timezone
 from decimal import Decimal
 from enum import Enum
 from typing import Dict, List, Literal, Optional, Union
@@ -561,7 +561,7 @@ class Coin:
     symbol: str
     name: str
     decimals: int
-    blockchain: Blockchain
+    blockchain: Union[Blockchain, str]
     address: Optional[str] = attr.ib(default=None)
     standards: Optional[List[str]] = attr.ib(default=None)
     protocol_id: Optional[str] = attr.ib(default=None)
@@ -576,7 +576,7 @@ class Coin:
     @classmethod
     def from_api(
         cls,
-        blockchain: Blockchain,
+        blockchain: Union[Blockchain, str],
         decimals: Union[int, str],
         symbol: Optional[str] = None,
         name: Optional[str] = None,
@@ -607,7 +607,7 @@ class CoingeckoMapping:
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class Protocol:
     protocol_id: str
-    chain: Blockchain
+    chain: Union[Blockchain, str]
     name: str
     user_deposit: Decimal
     site_url: Optional[str] = attr.ib(default=None)
@@ -619,7 +619,7 @@ class Protocol:
         cls,
         *,
         protocol_id: str,
-        chain: Blockchain,
+        chain: Union[Blockchain, str],
         name: str,
         user_deposit: Union[str, float, int],
         site_url: Optional[str] = None,
@@ -863,7 +863,9 @@ class NftOffer:
             contract=contract,
             blockchain=blockchain,
             offerer=offerer,
-            start_time=parse_dt(start_time) if start_time else datetime.utcnow(),
+            start_time=(
+                parse_dt(start_time) if start_time else datetime.now(timezone.utc)
+            ),
             end_time=parse_dt(end_time) if end_time else None,
             offer_coin=offer_coin,
             offer_contract=offer_contract.lower() if offer_contract else None,

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockapi
-Version: 2.10.3
+Version: 2.10.5
 Summary: BlockAPI library
 Home-page: https://github.com/crypkit/blockapi
 Author: Devmons s.r.o.

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

@@ -6,7 +6,7 @@ with open("README.md", "r") as f:
 
 PACKAGES = find_packages(where='.')
 
-__version__ = "2.10.3"
+__version__ = "2.10.5"
 
 setuptools.setup(
     name='blockapi',