mypy: unsupported operand type(s) for | in py3.9, rm unused import, fix wrong types

Author: philogicae

src/aleph/sdk/client/abstract.py

@@ -20,14 +20,13 @@
 
 from aleph_message.models import (
     AlephMessage,
-    InstanceContent,
+    ExecutableContent,
     ItemHash,
     ItemType,
     MessagesResponse,
     MessageType,
     Payment,
     PostMessage,
-    ProgramContent,
     parse_message,
 )
 from aleph_message.models.execution.environment import (
@@ -247,7 +246,7 @@ def watch_messages(
     @abstractmethod
     def get_estimated_price(
         self,
-        content: ProgramContent | InstanceContent,
+        content: ExecutableContent,
     ) -> Coroutine[Any, Any, PriceResponse]:
         """
         Get Instance/Program content estimated price

src/aleph/sdk/client/http.py

@@ -24,7 +24,7 @@
 from aleph_message.models import (
     AlephMessage,
     Chain,
-    InstanceContent,
+    ExecutableContent,
     ItemHash,
     ItemType,
     MessageType,
@@ -460,7 +460,7 @@ async def watch_messages(
 
     async def get_estimated_price(
         self,
-        content: ProgramContent | InstanceContent,
+        content: ExecutableContent,
     ) -> PriceResponse:
         item_content: str = json.dumps(
             content, separators=(",", ":"), default=extended_json_encoder

src/aleph/sdk/exceptions.py

@@ -80,10 +80,10 @@ def __init__(
         self, token_type: TokenType, required_funds: float, available_funds: float
     ):
         self.token_type = token_type
-        self.required_funds = displayable_amount(required_funds, decimals=8)
-        self.available_funds = displayable_amount(available_funds, decimals=8)
+        self.required_funds = required_funds
+        self.available_funds = available_funds
         super().__init__(
-            f"Insufficient funds ({self.token_type.value}): required {self.required_funds}, available {self.available_funds}"
+            f"Insufficient funds ({self.token_type.value}): required {displayable_amount(self.required_funds, decimals=8)}, available {displayable_amount(self.available_funds, decimals=8)}"
         )
 
 

src/aleph/sdk/utils.py

@@ -8,7 +8,7 @@
 import os
 import subprocess
 from datetime import date, datetime, time
-from decimal import ROUND_CEILING, Decimal
+from decimal import Decimal
 from enum import Enum
 from pathlib import Path
 from shutil import make_archive
@@ -414,7 +414,7 @@ def safe_getattr(obj, attr, default=None):
 
 
 def displayable_amount(
-    amount: str | int | float | Decimal, decimals: Optional[int] = None
+    amount: Union[str, int, float, Decimal], decimals: Optional[int] = None
 ) -> str:
     """Returns the amount as a string without unnecessary decimals."""