Feature: new field for PriceRespond cost instead of filling required_token with cost

Author: 1yam

src/aleph/sdk/client/http.py

@@ -3,7 +3,6 @@
 import os.path
 import ssl
 import time
-from decimal import Decimal
 from io import BytesIO
 from pathlib import Path
 from typing import (
@@ -532,7 +531,10 @@ async def get_estimated_price(
             try:
                 resp.raise_for_status()
                 response_json = await resp.json()
+                cost = response_json.get("cost", None)
+
                 return PriceResponse(
+                    cost=cost,
                     required_tokens=response_json["required_tokens"],
                     payment_type=response_json["payment_type"],
                 )
@@ -544,16 +546,12 @@ async def get_program_price(self, item_hash: str) -> PriceResponse:
             try:
                 resp.raise_for_status()
                 response_json = await resp.json()
-                token_value = response_json.get(
-                    "cost", response_json.get("required_tokens")
-                )
-                if isinstance(token_value, str):
-                    required_tokens = Decimal(token_value)
-                else:
-                    required_tokens = Decimal(str(token_value))
+                cost = response_json.get("cost", None)
+                required_tokens = response_json["required_tokens"]
 
                 return PriceResponse(
                     required_tokens=required_tokens,
+                    cost=cost,
                     payment_type=response_json["payment_type"],
                 )
             except aiohttp.ClientResponseError as e:

src/aleph/sdk/query/responses.py

@@ -80,6 +80,7 @@ class PriceResponse(BaseModel):
     """Response from an aleph.im node API on the path /api/v0/price/{item_hash}"""
 
     required_tokens: Decimal
+    cost: Optional[str] = None
     payment_type: str
 
 

tests/unit/test_price.py

@@ -46,7 +46,8 @@ async def test_get_program_price_cost_and_required_token():
 
     # Expected model using the cost field as the source of truth
     expected_model = PriceResponse(
-        required_tokens=Decimal("0.001527777777777777"),
+        required_tokens=Decimal("0.001527777777777778"),
+        cost=expected["cost"],
         payment_type=expected["payment_type"],
     )
 
@@ -61,11 +62,15 @@ async def test_get_program_price_cost_and_required_token():
 
     async with mock_session:
         response = await mock_session.get_program_price("cacacacacacaca")
-        assert response == expected_model
+        assert str(response.required_tokens) == str(expected_model.required_tokens)
+        assert response.cost == expected_model.cost
+        assert response.payment_type == expected_model.payment_type
 
     async with mock_session_old:
         response = await mock_session_old.get_program_price("cacacacacacaca")
-        assert response == expected_model_old
+        assert str(response.required_tokens) == str(expected_model_old.required_tokens)
+        assert response.cost == expected_model_old.cost
+        assert response.payment_type == expected_model_old.payment_type
 
 
 @pytest.mark.asyncio