fix(Client): gateway API uses complex object for addresses now

Author: fubuloubu

ape_safe/client/types.py

@@ -1,30 +1,46 @@
 from datetime import datetime, timezone
 from enum import Enum
-from typing import NewType, Optional, Union, cast
+from typing import Annotated, NewType, Optional, Union, cast
 
 from ape.types import AddressType, HexBytes
 from eip712.common import SafeTxV1, SafeTxV2
 from eth_typing import HexStr
 from eth_utils import add_0x_prefix, to_hex
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, BeforeValidator, Field, field_validator
 
 from ape_safe.utils import get_safe_tx_hash
 
 SafeTx = Union[SafeTxV1, SafeTxV2]
 SafeTxID = NewType("SafeTxID", str)
 
 
+def clean_api_address(data: AddressType | dict) -> AddressType:
+    # NOTE: Safe API returns `{'value':'<addr>', ...}` object
+    if isinstance(data, dict):
+        return data["value"]
+    return data
+
+
+Address = Annotated[AddressType, BeforeValidator(clean_api_address)]
+
+
 class SafeDetails(BaseModel):
-    address: AddressType
+    address: Address
     nonce: int
     threshold: int
-    owners: list[AddressType]
-    master_copy: AddressType = Field(alias="masterCopy")
-    modules: list[AddressType]
-    fallback_handler: AddressType = Field(alias="fallbackHandler")
+    owners: list[Address]
+    master_copy: Address = Field(alias="implementation")
+    modules: list[Address] = []
+    fallback_handler: Address = Field(alias="fallbackHandler")
     guard: AddressType
     version: str
 
+    @field_validator("modules", mode="before")
+    def convert_none_to_empty_list(cls, value):
+        if not value:
+            return []
+        return value
+
 
 class SignatureType(str, Enum):
     APPROVED_HASH = "APPROVED_HASH"