prediction-market-agent-tooling 0.69.10.dev1119__tar.gz → 0.69.11__tar.gz

{prediction_market_agent_tooling-0.69.10.dev1119 → prediction_market_agent_tooling-0.69.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: prediction-market-agent-tooling
-Version: 0.69.10.dev1119
+Version: 0.69.11
 Summary: Tools to benchmark, deploy and monitor prediction market agents.
 License-File: LICENSE
 Author: Gnosis

{prediction_market_agent_tooling-0.69.10.dev1119 → prediction_market_agent_tooling-0.69.11}/prediction_market_agent_tooling/gtypes.py

@@ -1,6 +1,6 @@
 import typing as t
 from decimal import Decimal
-from typing import NewType
+from typing import Annotated, NewType, TypeAlias
 
 from eth_typing.evm import (  # noqa: F401  # Import for the sake of easy importing with others from here.
     Address,
@@ -8,6 +8,7 @@ from eth_typing.evm import (  # noqa: F401  # Import for the sake of easy import
     HexAddress,
     HexStr,
 )
+from pydantic import BeforeValidator
 from pydantic.types import SecretStr
 from pydantic.v1.types import SecretStr as SecretStrV1
 from web3 import Web3
@@ -18,6 +19,7 @@ from web3.types import (  # noqa: F401  # Import for the sake of easy importing
 )
 from web3.types import Wei as Web3Wei
 
+from prediction_market_agent_tooling.gtypes import ChecksumAddress
 from prediction_market_agent_tooling.tools._generic_value import _GenericValue
 from prediction_market_agent_tooling.tools.datetime_utc import (  # noqa: F401  # Import for the sake of easy importing with others from here.
     DatetimeUTC,
@@ -26,6 +28,14 @@ from prediction_market_agent_tooling.tools.hexbytes_custom import (  # noqa: F40
     HexBytes,
 )
 
+VerifiedChecksumAddress: TypeAlias = Annotated[
+    ChecksumAddress, BeforeValidator(Web3.to_checksum_address)
+]
+VerifiedChecksumAddressOrNone: TypeAlias = Annotated[
+    ChecksumAddress | None,
+    BeforeValidator(lambda x: Web3.to_checksum_address(x) if x is not None else None),
+]
+
 
 class CollateralToken(_GenericValue[int | float | str | Decimal, float], parser=float):
     """

{prediction_market_agent_tooling-0.69.10.dev1119 → prediction_market_agent_tooling-0.69.11}/prediction_market_agent_tooling/tools/caches/serializers.py

@@ -4,6 +4,7 @@ from datetime import date, timedelta
 
 from pydantic import BaseModel
 
+from prediction_market_agent_tooling.gtypes import HexBytes
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
 
 
@@ -12,7 +13,7 @@ def json_serializer(x: t.Any) -> str:
 
 
 def json_serializer_default_fn(
-    y: DatetimeUTC | timedelta | date | BaseModel,
+    y: DatetimeUTC | timedelta | date | HexBytes | BaseModel,
 ) -> str | dict[str, t.Any]:
     """
     Used to serialize objects that don't support it by default into a specific string that can be deserialized out later.
@@ -25,6 +26,8 @@ def json_serializer_default_fn(
         return f"timedelta::{y.total_seconds()}"
     elif isinstance(y, date):
         return f"date::{y.isoformat()}"
+    elif isinstance(y, HexBytes):
+        return f"HexBytes::{y.to_0x_hex()}"
     elif isinstance(y, BaseModel):
         return y.model_dump()
     raise TypeError(
@@ -51,6 +54,9 @@ def replace_custom_stringified_objects(obj: t.Any) -> t.Any:
         elif obj.startswith("date::"):
             iso_str = obj[len("date::") :]
             return date.fromisoformat(iso_str)
+        elif obj.startswith("HexBytes::"):
+            hex_str = obj[len("HexBytes::") :]
+            return HexBytes(hex_str)
         else:
             return obj
     elif isinstance(obj, dict):

{prediction_market_agent_tooling-0.69.10.dev1119 → prediction_market_agent_tooling-0.69.11}/prediction_market_agent_tooling/tools/cow/models.py

@@ -1,18 +1,22 @@
 from enum import Enum
-from typing import Annotated, Optional
+from typing import Optional
 
-from pydantic import BaseModel, BeforeValidator, ConfigDict
+from pydantic import BaseModel, ConfigDict
 from sqlmodel import Field, SQLModel
-from web3 import Web3
 
-from prediction_market_agent_tooling.gtypes import ChecksumAddress, HexBytes, Wei
+from prediction_market_agent_tooling.gtypes import (
+    HexBytes,
+    VerifiedChecksumAddress,
+    VerifiedChecksumAddressOrNone,
+    Wei,
+)
 from prediction_market_agent_tooling.tools.datetime_utc import DatetimeUTC
 from prediction_market_agent_tooling.tools.utils import utcnow
 
 
 class MinimalisticTrade(BaseModel):
-    sellToken: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
-    buyToken: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
+    sellToken: VerifiedChecksumAddress
+    buyToken: VerifiedChecksumAddress
     orderUid: HexBytes
     txHash: HexBytes
 
@@ -29,7 +33,7 @@ class PlacementError(str, Enum):
 
 
 class OnchainOrderData(BaseModel):
-    sender: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
+    sender: VerifiedChecksumAddress
     placementError: Optional[PlacementError]
 
 
@@ -77,15 +81,10 @@ class Order(BaseModel):
     quoteId: int | None = None
     validTo: int
     sellAmount: Wei
-    sellToken: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
+    sellToken: VerifiedChecksumAddress
     buyAmount: Wei
-    buyToken: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
-    receiver: Annotated[
-        ChecksumAddress | None,
-        BeforeValidator(
-            lambda x: Web3.to_checksum_address(x) if x is not None else None
-        ),
-    ]
+    buyToken: VerifiedChecksumAddress
+    receiver: VerifiedChecksumAddressOrNone
     feeAmount: Wei
     creationDate: DatetimeUTC
     kind: OrderKind
@@ -94,17 +93,12 @@ class Order(BaseModel):
     buyTokenBalance: BuyTokenBalance | None
     signingScheme: SigningScheme
     signature: HexBytes
-    from_: Annotated[
-        ChecksumAddress | None,
-        BeforeValidator(
-            lambda x: Web3.to_checksum_address(x) if x is not None else None
-        ),
-    ] = Field(None, alias="from")
+    from_: VerifiedChecksumAddressOrNone = Field(None, alias="from")
     appData: str
     fullAppData: str | None
     appDataHash: HexBytes | None = None
     class_: str = Field(None, alias="class")
-    owner: Annotated[ChecksumAddress, BeforeValidator(Web3.to_checksum_address)]
+    owner: VerifiedChecksumAddress
     executedSellAmount: Wei
     executedSellAmountBeforeFees: Wei
     executedBuyAmount: Wei
@@ -113,19 +107,9 @@ class Order(BaseModel):
     status: str
     isLiquidityOrder: bool | None
     ethflowData: EthFlowData | None = None
-    onchainUser: Annotated[
-        ChecksumAddress | None,
-        BeforeValidator(
-            lambda x: Web3.to_checksum_address(x) if x is not None else None
-        ),
-    ] = None
+    onchainUser: VerifiedChecksumAddressOrNone = None
     executedFee: Wei
-    executedFeeToken: Annotated[
-        ChecksumAddress | None,
-        BeforeValidator(
-            lambda x: Web3.to_checksum_address(x) if x is not None else None
-        ),
-    ]
+    executedFeeToken: VerifiedChecksumAddressOrNone
 
 
 class RateLimit(SQLModel, table=True):

{prediction_market_agent_tooling-0.69.10.dev1119 → prediction_market_agent_tooling-0.69.11}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "prediction-market-agent-tooling"
-version = "0.69.10.dev1119"
+version = "0.69.11"
 description = "Tools to benchmark, deploy and monitor prediction market agents."
 authors = ["Gnosis"]
 readme = "README.md"