prediction-market-agent-tooling 0.69.10.dev1119__py3-none-any.whl → 0.69.10.dev1120__py3-none-any.whl

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/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.dist-info → prediction_market_agent_tooling-0.69.10.dev1120.dist-info}/METADATA

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

{prediction_market_agent_tooling-0.69.10.dev1119.dist-info → prediction_market_agent_tooling-0.69.10.dev1120.dist-info}/RECORD

@@ -36,7 +36,7 @@ prediction_market_agent_tooling/deploy/gcp/deploy.py,sha256=CYUgnfy-9XVk04kkxA_5
 prediction_market_agent_tooling/deploy/gcp/kubernetes_models.py,sha256=OsPboCFGiZKsvGyntGZHwdqPlLTthITkNF5rJFvGgU8,2582
 prediction_market_agent_tooling/deploy/gcp/utils.py,sha256=WI2ycX1X-IlTRoNoG4ggFlRwPL28kwM9VGDFD2fePLo,5699
 prediction_market_agent_tooling/deploy/trade_interval.py,sha256=Xk9j45alQ_vrasGvsNyuW70XHIQ7wfvjoxNR3F6HYCw,1155
-prediction_market_agent_tooling/gtypes.py,sha256=bUIZfZIGvIi3aiZNu5rVE9kRevw8sfMa4bcze6QeBg8,6058
+prediction_market_agent_tooling/gtypes.py,sha256=tHXMBjh0iAEJEcBywFvwzwPqDkBUpjEyeb7ynh7fOKc,6469
 prediction_market_agent_tooling/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 prediction_market_agent_tooling/jobs/jobs_models.py,sha256=4KZ0iaKZx5zEZBBiEo9CHk0OpX3bKjoYA0wmptR0Wyk,2455
 prediction_market_agent_tooling/jobs/omen/omen_jobs.py,sha256=CojpgghRs0lFEf5wl-oWhGaQozG616YD0cXdlmFO-U0,5116
@@ -96,7 +96,7 @@ prediction_market_agent_tooling/tools/contract.py,sha256=BzpAFcbKl_KqwgAlaXx63Fg
 prediction_market_agent_tooling/tools/contract_utils.py,sha256=9X9raICUZkPDShilt02aYzS_ILZ62u0vG5081uWLdqk,2152
 prediction_market_agent_tooling/tools/costs.py,sha256=EaAJ7v9laD4VEV3d8B44M4u3_oEO_H16jRVCdoZ93Uw,954
 prediction_market_agent_tooling/tools/cow/cow_order.py,sha256=DN_8cPrr4jWVpXdS4D0j1QB19nB8fxDoSheo2BFMc8M,14523
-prediction_market_agent_tooling/tools/cow/models.py,sha256=y_zsPEw7sG-OV6ooycQ9mx75GtnG3SuwXc6xuxL_o3I,3799
+prediction_market_agent_tooling/tools/cow/models.py,sha256=EpCziNs4sGmN7ZvPKpqdqjhVd_-zPZHsJVeVfFu4Y60,3005
 prediction_market_agent_tooling/tools/cow/semaphore.py,sha256=LPB-4wNQf7El7dgBD4Tmol6vr5j1CP9qMeDm8dcs6RI,3741
 prediction_market_agent_tooling/tools/custom_exceptions.py,sha256=Fh8z1fbwONvP4-j7AmV_PuEcoqb6-QXa9PJ9m7guMcM,93
 prediction_market_agent_tooling/tools/datetime_utc.py,sha256=_oO6mMc28C9aSmQfrG-S7UQy5uMHVEQqia8arnscVCk,3213
@@ -137,8 +137,8 @@ prediction_market_agent_tooling/tools/tokens/usd.py,sha256=DPO-4HBTy1-TZHKL_9CnH
 prediction_market_agent_tooling/tools/transaction_cache.py,sha256=K5YKNL2_tR10Iw2TD9fuP-CTGpBbZtNdgbd0B_R7pjg,1814
 prediction_market_agent_tooling/tools/utils.py,sha256=ruq6P5TFs8CBHxeBLj1Plpx7kuNFPpDgMsJGQgDiRNs,8785
 prediction_market_agent_tooling/tools/web3_utils.py,sha256=CDbaidlLeQ4VHzSg150L7QNfHfGveljSePGuDVFEYqc,13963
-prediction_market_agent_tooling-0.69.10.dev1119.dist-info/METADATA,sha256=4cM7-CJ3tpEUsBYQasv-387chs1IoRw0L1l5Xs7CqIU,8899
-prediction_market_agent_tooling-0.69.10.dev1119.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-prediction_market_agent_tooling-0.69.10.dev1119.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
-prediction_market_agent_tooling-0.69.10.dev1119.dist-info/licenses/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
-prediction_market_agent_tooling-0.69.10.dev1119.dist-info/RECORD,,
+prediction_market_agent_tooling-0.69.10.dev1120.dist-info/METADATA,sha256=_zBgziT22Ha55DnWQSUlO2ITl7W1-zIXoNY19nKoGqs,8899
+prediction_market_agent_tooling-0.69.10.dev1120.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+prediction_market_agent_tooling-0.69.10.dev1120.dist-info/entry_points.txt,sha256=m8PukHbeH5g0IAAmOf_1Ahm-sGAMdhSSRQmwtpmi2s8,81
+prediction_market_agent_tooling-0.69.10.dev1120.dist-info/licenses/LICENSE,sha256=6or154nLLU6bELzjh0mCreFjt0m2v72zLi3yHE0QbeE,7650
+prediction_market_agent_tooling-0.69.10.dev1120.dist-info/RECORD,,