blockapi 2.3.3__tar.gz → 2.3.4__tar.gz

{blockapi-2.3.3 → blockapi-2.3.4}/PKG-INFO

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

{blockapi-2.3.3 → blockapi-2.3.4}/blockapi/v2/api/__init__.py

@@ -8,7 +8,6 @@ from blockapi.v2.api.blockchair import (
 from blockapi.v2.api.debank import (
     DebankApi,
     DebankApp,
-    DebankAppDeposit,
     DebankPrediction,
 )
 from blockapi.v2.api.ethplorer import EthplorerApi

{blockapi-2.3.3 → blockapi-2.3.4}/blockapi/v2/api/debank.py

@@ -5,7 +5,7 @@ from functools import lru_cache
 from typing import Dict, Iterable, List, Optional, Union
 
 import attr
-from pydantic import BaseModel, ValidationError, validator
+from pydantic import BaseModel, validator
 
 from blockapi.utils.address import make_checksum_address
 from blockapi.utils.datetime import parse_dt
@@ -37,13 +37,12 @@ from blockapi.v2.models import (
     PoolInfo,
     Protocol,
     DebankApp,
-    DebankAppDeposit,
     DebankPrediction,
     DebankModelAppPortfolioItem,
     DebankModelApp,
     DebankModelPredictionDetail,
-    DebankDepositToken,
 )
+from blockapi.v2.coin_mapping import symbol_to_coin_map
 
 logger = logging.getLogger(__name__)
 
@@ -601,10 +600,8 @@ class DebankPortfolioParser:
 
 
 class DebankAppParser:
-    """Parser for Debank complex_app_list responses."""
 
     def parse(self, response: list) -> list[DebankApp]:
-        """Parse the full response from get_complex_app_list."""
         if not response:
             return []
 
@@ -617,13 +614,17 @@ class DebankAppParser:
         return apps
 
     def _parse_app(self, raw_app: dict) -> Optional[DebankApp]:
-        """Parse a single app from the response."""
         model = DebankModelApp(**raw_app)
 
         deposits = []
         predictions = []
 
         chain = DEBANK_APP_CHAIN_MAP.get(model.id)
+        if not chain:
+            logger.error(
+                f'No chain mapping found for app {model.id} ({model.name}). Skipping.'
+            )
+            return
 
         for portfolio_item in model.portfolio_item_list:
             detail_types = portfolio_item.detail_types
@@ -636,7 +637,7 @@ class DebankAppParser:
                 # Parse as deposit (common, etc.)
                 deposit = self._parse_deposit(portfolio_item, chain)
                 if deposit:
-                    deposits.append(deposit)
+                    deposits.extend(deposit)
 
         return DebankApp.from_api(
             app_id=model.id,
@@ -649,9 +650,8 @@ class DebankAppParser:
         )
 
     def _parse_prediction(
-        self, item: DebankModelAppPortfolioItem, chain: Optional[Blockchain]
+        self, item: DebankModelAppPortfolioItem, chain: Blockchain
     ) -> Optional[DebankPrediction]:
-        """Parse a prediction market position."""
         detail = DebankModelPredictionDetail(**item.detail)
 
         return DebankPrediction.from_api(
@@ -669,26 +669,28 @@ class DebankAppParser:
         )
 
     def _parse_deposit(
-        self, item: DebankModelAppPortfolioItem, chain: Optional[Blockchain]
-    ) -> Optional[DebankAppDeposit]:
-        """Parse a deposit/common type portfolio item."""
-        parsed_tokens = [
-            self._parse_token(t.model_dump()) for t in item.asset_token_list or []
-        ]
-
-        return DebankAppDeposit.from_api(
-            name=item.name,
-            asset_usd_value=item.stats.asset_usd_value,
-            debt_usd_value=item.stats.debt_usd_value,
-            net_usd_value=item.stats.net_usd_value,
-            tokens=[t for t in parsed_tokens if t is not None],
-            chain=chain,
-            position_index=item.position_index,
-            update_at=item.update_at,
-        )
+        self, item: DebankModelAppPortfolioItem, chain: Blockchain
+    ) -> list[BalanceItem]:
+        balances = []
+        for token in item.asset_token_list or []:
+            coin = symbol_to_coin_map.get(token.symbol)
+            if not coin:
+                logger.error(
+                    f'No coin mapping found for app deposit token {token.symbol} in chain {chain}. Skipping.'
+                )
+                continue
+
+            balance = BalanceItem.from_api(
+                balance=Decimal(token.amount),
+                balance_raw=token.amount,
+                asset_type=AssetType.DEPOSITED,
+                coin=coin,
+                raw=token.model_dump(),
+                last_updated=int(item.update_at) if item.update_at else None,
+            )
+            balances.append(balance)
 
-    def _parse_token(self, raw_token: dict) -> Optional[DebankDepositToken]:
-        return DebankDepositToken.from_api(**raw_token)
+        return balances
 
 
 class DebankApi(CustomizableBlockchainApi, BalanceMixin, IPortfolio):

{blockapi-2.3.3 → blockapi-2.3.4}/blockapi/v2/coin_mapping.py

@@ -1,3 +1,6 @@
+import inspect
+
+from blockapi.v2 import coins as _coins_module
 from blockapi.v2.coins import (
     COIN_DAI,
     COIN_ETH,
@@ -8,6 +11,15 @@ from blockapi.v2.coins import (
 )
 from blockapi.v2.models import Blockchain, Coin
 
+# Dynamically collect all COIN_* variables from coins module
+coins: list[Coin] = [
+    obj
+    for name, obj in inspect.getmembers(_coins_module)
+    if name.startswith('COIN_') and isinstance(obj, Coin)
+]
+
+symbol_to_coin_map: dict[str, Coin] = {coin.symbol: coin for coin in coins}
+
 OPENSEA_COINS: dict[str, Coin] = {
     'ETH': COIN_ETH,
     'USDC': COIN_USDC,

{blockapi-2.3.3 → blockapi-2.3.4}/blockapi/v2/models.py

@@ -1282,85 +1282,6 @@ class DebankPrediction:
         )
 
 
-@attr.s(auto_attribs=True, slots=True, frozen=True)
-class DebankDepositToken:
-    id: str
-    symbol: str
-    name: str
-    amount: Decimal
-    decimals: int
-    app_id: str
-    price: Decimal
-    logo_url: Optional[str]
-
-    @classmethod
-    def from_api(
-        cls,
-        *,
-        id: str,
-        symbol: str,
-        name: str,
-        amount: Union[str, float, int],
-        decimals: int,
-        app_id: str,
-        price: Union[str, float, int],
-        logo_url: Optional[str] = None,
-    ) -> 'DebankDepositToken':
-        return cls(
-            id=id,
-            symbol=symbol,
-            decimals=decimals,
-            name=name,
-            amount=to_decimal(amount),
-            app_id=app_id,
-            price=to_decimal(price),
-            logo_url=logo_url,
-        )
-
-
-@attr.s(auto_attribs=True, slots=True, frozen=True)
-class DebankAppDeposit:
-    """Represents a deposit/holding within a Debank App (e.g., Polymarket cash deposit)."""
-
-    name: str
-    asset_usd_value: Decimal
-    debt_usd_value: Decimal
-    net_usd_value: Decimal
-    tokens: list[DebankDepositToken]
-    chain: Optional[Blockchain]
-    position_index: Optional[str]
-    update_at: Optional[datetime]
-
-    @classmethod
-    def from_api(
-        cls,
-        *,
-        name: str,
-        asset_usd_value: Union[str, float, int],
-        debt_usd_value: Union[str, float, int],
-        net_usd_value: Union[str, float, int],
-        position_index: str,
-        tokens: Optional[list[DebankDepositToken]] = None,
-        chain: Optional[Blockchain] = None,
-        update_at: Optional[Union[int, float]] = None,
-    ) -> 'DebankAppDeposit':
-        return cls(
-            name=name,
-            asset_usd_value=to_decimal(asset_usd_value),
-            debt_usd_value=to_decimal(debt_usd_value),
-            net_usd_value=to_decimal(net_usd_value),
-            tokens=tokens or [],
-            chain=chain,
-            position_index=position_index,
-            update_at=parse_dt(update_at) if update_at else None,
-        )
-
-    @property
-    def token_symbols(self) -> list[str]:
-        """Get list of token symbols in this deposit."""
-        return [t.symbol for t in self.tokens]
-
-
 @attr.s(auto_attribs=True, slots=True, frozen=True)
 class DebankApp:
     """Represents a Debank App with its deposits and predictions."""
@@ -1370,7 +1291,7 @@ class DebankApp:
     site_url: Optional[str]
     logo_url: Optional[str]
     has_supported_portfolio: bool
-    deposits: list[DebankAppDeposit]
+    deposits: list[BalanceItem]
     predictions: list[DebankPrediction]
 
     @classmethod
@@ -1382,7 +1303,7 @@ class DebankApp:
         site_url: Optional[str] = None,
         logo_url: Optional[str] = None,
         has_supported_portfolio: bool = False,
-        deposits: Optional[list[DebankAppDeposit]] = None,
+        deposits: Optional[list[BalanceItem]] = None,
         predictions: Optional[list[DebankPrediction]] = None,
     ) -> 'DebankApp':
         return cls(

{blockapi-2.3.3 → blockapi-2.3.4}/blockapi.egg-info/PKG-INFO

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

{blockapi-2.3.3 → blockapi-2.3.4}/setup.py

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