prediction-market-agent-tooling 0.49.1__py3-none-any.whl → 0.50.0__py3-none-any.whl

prediction_market_agent_tooling/markets/metaculus/data_models.py

@@ -1,9 +1,10 @@
-from datetime import datetime
 from enum import Enum
 from typing import Any
 
 from pydantic import BaseModel
 
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
+
 
 class QuestionType(str, Enum):
     forecast = "forecast"
@@ -33,7 +34,7 @@ class CommunityPrediction(BaseModel):
 
 
 class Prediction(BaseModel):
-    t: datetime
+    t: DatetimeUTC
     x: float
 
 
@@ -68,20 +69,20 @@ class MetaculusQuestion(BaseModel):
     group_label: str | None = None
     resolution: int | None
     resolved_option: int | None
-    created_time: datetime
-    publish_time: datetime | None = None
-    close_time: datetime | None = None
-    effected_close_time: datetime | None
-    resolve_time: datetime | None = None
+    created_time: DatetimeUTC
+    publish_time: DatetimeUTC | None = None
+    close_time: DatetimeUTC | None = None
+    effected_close_time: DatetimeUTC | None
+    resolve_time: DatetimeUTC | None = None
     possibilities: dict[Any, Any] | None = None
     scoring: dict[Any, Any] = {}
     type: QuestionType | None = None
     user_perms: Any
     weekly_movement: float | None
     weekly_movement_direction: int | None = None
-    cp_reveal_time: datetime | None = None
-    edited_time: datetime
-    last_activity_time: datetime
+    cp_reveal_time: DatetimeUTC | None = None
+    edited_time: DatetimeUTC
+    last_activity_time: DatetimeUTC
     activity: float
     comment_count: int
     votes: int

prediction_market_agent_tooling/markets/metaculus/metaculus.py

@@ -1,5 +1,4 @@
 import typing as t
-from datetime import datetime
 
 from prediction_market_agent_tooling.config import APIKeys
 from prediction_market_agent_tooling.gtypes import Probability
@@ -17,6 +16,7 @@ from prediction_market_agent_tooling.markets.metaculus.api import (
 from prediction_market_agent_tooling.markets.metaculus.data_models import (
     MetaculusQuestion,
 )
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 
 
 class MetaculusAgentMarket(AgentMarket):
@@ -52,7 +52,7 @@ class MetaculusAgentMarket(AgentMarket):
         limit: int,
         sort_by: SortBy = SortBy.NONE,
         filter_by: FilterBy = FilterBy.OPEN,
-        created_after: t.Optional[datetime] = None,
+        created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
         tournament_id: int | None = None,
     ) -> t.Sequence["MetaculusAgentMarket"]:

prediction_market_agent_tooling/markets/omen/data_models.py

@@ -1,7 +1,5 @@
 import typing as t
-from datetime import datetime
 
-import pytz
 from pydantic import BaseModel, ConfigDict, Field, computed_field
 from web3 import Web3
 
@@ -26,6 +24,7 @@ from prediction_market_agent_tooling.markets.data_models import (
     ResolvedBet,
 )
 from prediction_market_agent_tooling.tools.utils import (
+    DatetimeUTC,
     check_not_none,
     should_not_happen,
 )
@@ -71,7 +70,7 @@ class Question(BaseModel):
     outcomes: list[str]
     isPendingArbitration: bool
     openingTimestamp: int
-    answerFinalizedTimestamp: t.Optional[datetime] = None
+    answerFinalizedTimestamp: t.Optional[DatetimeUTC] = None
     currentAnswer: t.Optional[str] = None
 
     @property
@@ -84,8 +83,8 @@ class Question(BaseModel):
         return len(self.outcomes)
 
     @property
-    def opening_datetime(self) -> datetime:
-        return datetime.fromtimestamp(self.openingTimestamp)
+    def opening_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.openingTimestamp)
 
     @property
     def has_answer(self) -> bool:
@@ -218,11 +217,11 @@ class OmenMarket(BaseModel):
         return self.question.openingTimestamp
 
     @property
-    def opening_datetime(self) -> datetime:
-        return datetime.fromtimestamp(self.openingTimestamp, tz=pytz.UTC)
+    def opening_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.openingTimestamp)
 
     @property
-    def close_time(self) -> datetime:
+    def close_time(self) -> DatetimeUTC:
         # Opening of the Reality's question is close time for the market,
         # however, market is usually "closed" even sooner by removing all the liquidity.
         return self.opening_datetime
@@ -257,13 +256,13 @@ class OmenMarket(BaseModel):
         return self.title
 
     @property
-    def creation_datetime(self) -> datetime:
-        return datetime.fromtimestamp(self.creationTimestamp)
+    def creation_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.creationTimestamp)
 
     @property
-    def finalized_datetime(self) -> datetime | None:
+    def finalized_datetime(self) -> DatetimeUTC | None:
         return (
-            datetime.fromtimestamp(self.answerFinalizedTimestamp)
+            DatetimeUTC.to_datetime_utc(self.answerFinalizedTimestamp)
             if self.answerFinalizedTimestamp is not None
             else None
         )
@@ -490,8 +489,8 @@ class OmenBet(BaseModel):
     fpmm: OmenMarket
 
     @property
-    def creation_datetime(self) -> datetime:
-        return datetime.fromtimestamp(self.creationTimestamp, tz=pytz.UTC)
+    def creation_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.creationTimestamp)
 
     @property
     def boolean_outcome(self) -> bool:
@@ -548,9 +547,7 @@ class OmenBet(BaseModel):
             market_question=self.title,
             market_id=self.fpmm.id,
             market_outcome=self.fpmm.boolean_outcome,
-            resolved_time=datetime.fromtimestamp(
-                check_not_none(self.fpmm.answerFinalizedTimestamp)
-            ),
+            resolved_time=check_not_none(self.fpmm.finalized_datetime),
             profit=self.get_profit(),
         )
 
@@ -571,11 +568,23 @@ class RealityQuestion(BaseModel):
     id: str
     user: HexAddress
     historyHash: HexBytes | None
-    updatedTimestamp: datetime
+    updatedTimestamp: int
     contentHash: HexBytes
     questionId: HexBytes
-    answerFinalizedTimestamp: datetime
-    currentScheduledFinalizationTimestamp: datetime
+    answerFinalizedTimestamp: int
+    currentScheduledFinalizationTimestamp: int
+
+    @property
+    def updated_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.updatedTimestamp)
+
+    @property
+    def answer_finalized_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.answerFinalizedTimestamp)
+
+    @property
+    def current_scheduled_finalization_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.currentScheduledFinalizationTimestamp)
 
     @property
     def url(self) -> str:
@@ -584,13 +593,17 @@ class RealityQuestion(BaseModel):
 
 class RealityAnswer(BaseModel):
     id: str
-    timestamp: datetime
+    timestamp: int
     answer: HexBytes
     lastBond: Wei
     bondAggregate: Wei
     question: RealityQuestion
     createdBlock: int
 
+    @property
+    def timestamp_datetime(self) -> DatetimeUTC:
+        return DatetimeUTC.to_datetime_utc(self.timestamp)
+
 
 class RealityResponse(BaseModel):
     """
@@ -598,7 +611,7 @@ class RealityResponse(BaseModel):
     """
 
     id: str
-    timestamp: datetime
+    timestamp: int
     answer: HexBytes
     isUnrevealed: bool
     isCommitment: bool

prediction_market_agent_tooling/markets/omen/omen.py

@@ -1,6 +1,6 @@
 import sys
 import typing as t
-from datetime import datetime, timedelta
+from datetime import timedelta
 
 import tenacity
 from web3 import Web3
@@ -47,6 +47,7 @@ from prediction_market_agent_tooling.markets.omen.data_models import (
 )
 from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     OMEN_DEFAULT_MARKET_FEE_PERC,
+    REALITY_DEFAULT_FINALIZATION_TIMEOUT,
     Arbitrator,
     OmenConditionalTokenContract,
     OmenFixedProductMarketMakerContract,
@@ -69,6 +70,7 @@ from prediction_market_agent_tooling.tools.contract import (
 )
 from prediction_market_agent_tooling.tools.hexbytes_custom import HexBytes
 from prediction_market_agent_tooling.tools.utils import (
+    DatetimeUTC,
     calculate_sell_amount_in_collateral,
     check_not_none,
 )
@@ -96,9 +98,9 @@ class OmenAgentMarket(AgentMarket):
     collateral_token_contract_address_checksummed: ChecksumAddress
     market_maker_contract_address_checksummed: ChecksumAddress
     condition: Condition
-    finalized_time: datetime | None
-    created_time: datetime
-    close_time: datetime
+    finalized_time: DatetimeUTC | None
+    created_time: DatetimeUTC
+    close_time: DatetimeUTC
     fee: float  # proportion, from 0 to 1
 
     _binary_market_p_yes_history: list[Probability] | None = None
@@ -362,7 +364,7 @@ class OmenAgentMarket(AgentMarket):
         limit: int,
         sort_by: SortBy,
         filter_by: FilterBy = FilterBy.OPEN,
-        created_after: t.Optional[datetime] = None,
+        created_after: t.Optional[DatetimeUTC] = None,
         excluded_questions: set[str] | None = None,
     ) -> t.Sequence["OmenAgentMarket"]:
         return [
@@ -386,7 +388,7 @@ class OmenAgentMarket(AgentMarket):
 
     @staticmethod
     def get_bets_made_since(
-        better_address: ChecksumAddress, start_time: datetime
+        better_address: ChecksumAddress, start_time: DatetimeUTC
     ) -> list[Bet]:
         bets = OmenSubgraphHandler().get_bets(
             better_address=better_address, start_time=start_time
@@ -396,7 +398,9 @@ class OmenAgentMarket(AgentMarket):
 
     @staticmethod
     def get_resolved_bets_made_since(
-        better_address: ChecksumAddress, start_time: datetime, end_time: datetime | None
+        better_address: ChecksumAddress,
+        start_time: DatetimeUTC,
+        end_time: DatetimeUTC | None,
     ) -> list[ResolvedBet]:
         subgraph_handler = OmenSubgraphHandler()
         bets = subgraph_handler.get_resolved_bets_with_valid_answer(
@@ -835,12 +839,12 @@ def omen_create_market_tx(
     api_keys: APIKeys,
     initial_funds: xDai,
     question: str,
-    closing_time: datetime,
+    closing_time: DatetimeUTC,
     category: str,
     language: str,
     outcomes: list[str],
     auto_deposit: bool,
-    finalization_timeout: timedelta = timedelta(days=1),
+    finalization_timeout: timedelta = REALITY_DEFAULT_FINALIZATION_TIMEOUT,
     fee_perc: float = OMEN_DEFAULT_MARKET_FEE_PERC,
     distribution_hint: list[OmenOutcomeToken] | None = None,
     collateral_token_address: ChecksumAddress = WrappedxDaiContract().address,

prediction_market_agent_tooling/markets/omen/omen_contracts.py

@@ -1,7 +1,7 @@
 import os
 import random
 import typing as t
-from datetime import datetime, timedelta
+from datetime import timedelta
 from enum import Enum
 
 from web3 import Web3
@@ -40,6 +40,7 @@ from prediction_market_agent_tooling.tools.contract import (
     init_collateral_token_contract,
     to_gnosis_chain_contract,
 )
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 from prediction_market_agent_tooling.tools.web3_utils import (
     ZERO_BYTES,
     byte32_to_ipfscidv0,
@@ -431,6 +432,7 @@ class sDaiContract(ContractERC4626OnGnosisChain):
 
 
 OMEN_DEFAULT_MARKET_FEE_PERC = 0.02  # 2% fee from the buying shares amount.
+REALITY_DEFAULT_FINALIZATION_TIMEOUT = timedelta(days=3)
 
 
 class OmenFixedProductMarketMakerFactoryContract(ContractOnGnosisChain):
@@ -574,7 +576,7 @@ class OmenRealitioContract(ContractOnGnosisChain):
         outcomes: list[str],
         language: str,
         arbitrator: Arbitrator,
-        opening: datetime,
+        opening: DatetimeUTC,
         timeout: timedelta,
         nonce: int | None = None,
         tx_params: t.Optional[TxParams] = None,

prediction_market_agent_tooling/markets/omen/omen_resolving.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from web3 import Web3
 
 from prediction_market_agent_tooling.config import APIKeys
@@ -33,6 +31,7 @@ from prediction_market_agent_tooling.markets.omen.omen_subgraph_handler import (
 from prediction_market_agent_tooling.markets.polymarket.utils import (
     find_resolution_on_polymarket,
 )
+from prediction_market_agent_tooling.tools.utils import utcnow
 from prediction_market_agent_tooling.tools.web3_utils import ZERO_BYTES, xdai_to_wei
 
 
@@ -131,7 +130,7 @@ def finalize_markets(
         logger.info(
             f"[{idx+1} / {len(markets_with_resolutions)}] Looking into {market.url=} {market.question_title=}"
         )
-        closed_before_days = (datetime.now() - market.close_time).days
+        closed_before_days = (utcnow() - market.close_time).days
 
         if resolution is None:
             if closed_before_days > wait_n_days_before_invalid:
@@ -240,7 +239,7 @@ def omen_resolve_market_tx(
     web3: Web3 | None = None,
 ) -> None:
     """
-    Market can be resolved 24h after last answer was submitted via `omen_submit_answer_market_tx`.
+    Market can be resolved after the answer if finalized on Reality.
     """
     oracle_contract = OmenOracleContract()
     oracle_contract.resolve(

prediction_market_agent_tooling/markets/omen/omen_subgraph_handler.py

@@ -1,6 +1,5 @@
 import sys
 import typing as t
-from datetime import datetime
 
 import requests
 import tenacity
@@ -35,7 +34,11 @@ from prediction_market_agent_tooling.markets.omen.omen_contracts import (
     sDaiContract,
 )
 from prediction_market_agent_tooling.tools.singleton import SingletonMeta
-from prediction_market_agent_tooling.tools.utils import to_int_timestamp, utcnow
+from prediction_market_agent_tooling.tools.utils import (
+    DatetimeUTC,
+    to_int_timestamp,
+    utcnow,
+)
 from prediction_market_agent_tooling.tools.web3_utils import (
     ZERO_BYTES,
     byte32_to_ipfscidv0,
@@ -213,11 +216,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         creator: t.Optional[HexAddress] = None,
         creator_in: t.Optional[t.Sequence[HexAddress]] = None,
         outcomes: list[str] = OMEN_BINARY_MARKET_OUTCOMES,
-        created_after: t.Optional[datetime] = None,
-        opened_before: t.Optional[datetime] = None,
-        opened_after: t.Optional[datetime] = None,
-        finalized_before: t.Optional[datetime] = None,
-        finalized_after: t.Optional[datetime] = None,
+        created_after: t.Optional[DatetimeUTC] = None,
+        opened_before: t.Optional[DatetimeUTC] = None,
+        opened_after: t.Optional[DatetimeUTC] = None,
+        finalized_before: t.Optional[DatetimeUTC] = None,
+        finalized_after: t.Optional[DatetimeUTC] = None,
         finalized: bool | None = None,
         resolved: bool | None = None,
         liquidity_bigger_than: Wei | None = None,
@@ -319,6 +322,16 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
                 sort_by_field = (
                     self.trades_subgraph.FixedProductMarketMaker.openingTimestamp
                 )
+            case SortBy.HIGHEST_LIQUIDITY:
+                sort_direction = "desc"
+                sort_by_field = (
+                    self.trades_subgraph.FixedProductMarketMaker.liquidityMeasure
+                )
+            case SortBy.LOWEST_LIQUIDITY:
+                sort_direction = "asc"
+                sort_by_field = (
+                    self.trades_subgraph.FixedProductMarketMaker.liquidityMeasure
+                )
             case SortBy.NONE:
                 sort_direction = None
                 sort_by_field = None
@@ -334,7 +347,7 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         filter_by: FilterBy,
         sort_by: SortBy,
         # Additional filters, these can not be modified by the enums above.
-        created_after: datetime | None = None,
+        created_after: DatetimeUTC | None = None,
         excluded_questions: set[str] | None = None,  # question titles
         collateral_token_address_in: (
             tuple[ChecksumAddress, ...] | None
@@ -347,7 +360,7 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         # These values need to be set according to the filter_by value, so they can not be passed as arguments.
         finalized: bool | None = None
         resolved: bool | None = None
-        opened_after: datetime | None = None
+        opened_after: DatetimeUTC | None = None
         liquidity_bigger_than: Wei | None = None
 
         if filter_by == FilterBy.RESOLVED:
@@ -383,11 +396,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_omen_binary_markets(
         self,
         limit: t.Optional[int],
-        created_after: t.Optional[datetime] = None,
-        opened_before: t.Optional[datetime] = None,
-        opened_after: t.Optional[datetime] = None,
-        finalized_before: t.Optional[datetime] = None,
-        finalized_after: t.Optional[datetime] = None,
+        created_after: t.Optional[DatetimeUTC] = None,
+        opened_before: t.Optional[DatetimeUTC] = None,
+        opened_after: t.Optional[DatetimeUTC] = None,
+        finalized_before: t.Optional[DatetimeUTC] = None,
+        finalized_after: t.Optional[DatetimeUTC] = None,
         finalized: bool | None = None,
         resolved: bool | None = None,
         creator: t.Optional[HexAddress] = None,
@@ -544,12 +557,12 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_trades(
         self,
         better_address: ChecksumAddress | None = None,
-        start_time: datetime | None = None,
-        end_time: t.Optional[datetime] = None,
+        start_time: DatetimeUTC | None = None,
+        end_time: t.Optional[DatetimeUTC] = None,
         market_id: t.Optional[ChecksumAddress] = None,
         filter_by_answer_finalized_not_null: bool = False,
         type_: t.Literal["Buy", "Sell"] | None = None,
-        market_opening_after: datetime | None = None,
+        market_opening_after: DatetimeUTC | None = None,
         collateral_amount_more_than: Wei | None = None,
     ) -> list[OmenBet]:
         if not end_time:
@@ -587,11 +600,11 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_bets(
         self,
         better_address: ChecksumAddress | None = None,
-        start_time: datetime | None = None,
-        end_time: t.Optional[datetime] = None,
+        start_time: DatetimeUTC | None = None,
+        end_time: t.Optional[DatetimeUTC] = None,
         market_id: t.Optional[ChecksumAddress] = None,
         filter_by_answer_finalized_not_null: bool = False,
-        market_opening_after: datetime | None = None,
+        market_opening_after: DatetimeUTC | None = None,
         collateral_amount_more_than: Wei | None = None,
     ) -> list[OmenBet]:
         return self.get_trades(
@@ -608,8 +621,8 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_resolved_bets(
         self,
         better_address: ChecksumAddress,
-        start_time: datetime,
-        end_time: t.Optional[datetime] = None,
+        start_time: DatetimeUTC,
+        end_time: t.Optional[DatetimeUTC] = None,
         market_id: t.Optional[ChecksumAddress] = None,
     ) -> list[OmenBet]:
         omen_bets = self.get_bets(
@@ -624,8 +637,8 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_resolved_bets_with_valid_answer(
         self,
         better_address: ChecksumAddress,
-        start_time: datetime,
-        end_time: t.Optional[datetime] = None,
+        start_time: DatetimeUTC,
+        end_time: t.Optional[DatetimeUTC] = None,
         market_id: t.Optional[ChecksumAddress] = None,
     ) -> list[OmenBet]:
         bets = self.get_resolved_bets(
@@ -640,9 +653,9 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
     def get_reality_question_filters(
         user: HexAddress | None = None,
         claimed: bool | None = None,
-        current_answer_before: datetime | None = None,
-        finalized_before: datetime | None = None,
-        finalized_after: datetime | None = None,
+        current_answer_before: DatetimeUTC | None = None,
+        finalized_before: DatetimeUTC | None = None,
+        finalized_after: DatetimeUTC | None = None,
         id_in: list[str] | None = None,
         question_id: HexBytes | None = None,
         question_id_in: list[HexBytes] | None = None,
@@ -689,9 +702,9 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         limit: int | None,
         user: HexAddress | None = None,
         claimed: bool | None = None,
-        current_answer_before: datetime | None = None,
-        finalized_before: datetime | None = None,
-        finalized_after: datetime | None = None,
+        current_answer_before: DatetimeUTC | None = None,
+        finalized_before: DatetimeUTC | None = None,
+        finalized_after: DatetimeUTC | None = None,
         id_in: list[str] | None = None,
         question_id_in: list[HexBytes] | None = None,
     ) -> list[RealityQuestion]:
@@ -734,9 +747,9 @@ class OmenSubgraphHandler(metaclass=SingletonMeta):
         user: HexAddress | None = None,
         question_id: HexBytes | None = None,
         question_claimed: bool | None = None,
-        question_finalized_before: datetime | None = None,
-        question_finalized_after: datetime | None = None,
-        question_current_answer_before: datetime | None = None,
+        question_finalized_before: DatetimeUTC | None = None,
+        question_finalized_after: DatetimeUTC | None = None,
+        question_current_answer_before: DatetimeUTC | None = None,
         question_id_in: list[HexBytes] | None = None,
     ) -> list[RealityResponse]:
         where_stms: dict[str, t.Any] = {}

prediction_market_agent_tooling/markets/polymarket/api.py

@@ -2,8 +2,8 @@ import typing as t
 
 import requests
 import tenacity
-from loguru import logger
 
+from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.polymarket.data_models import (
     POLYMARKET_FALSE_OUTCOME,
     POLYMARKET_TRUE_OUTCOME,

prediction_market_agent_tooling/markets/polymarket/data_models.py

@@ -1,5 +1,3 @@
-from datetime import datetime
-
 from pydantic import BaseModel
 
 from prediction_market_agent_tooling.gtypes import USDC, Probability, usdc_type
@@ -10,13 +8,14 @@ from prediction_market_agent_tooling.markets.polymarket.data_models_web import (
     PolymarketFullMarket,
     construct_polymarket_url,
 )
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 
 
 class PolymarketRewards(BaseModel):
     min_size: int
     max_spread: float | None
-    event_start_date: datetime | None = None
-    event_end_date: datetime | None = None
+    event_start_date: DatetimeUTC | None = None
+    event_end_date: DatetimeUTC | None = None
     in_game_multiplier: int | None = None
     reward_epoch: int | None = None
 
@@ -39,8 +38,8 @@ class PolymarketMarket(BaseModel):
     question: str
     description: str
     market_slug: str
-    end_date_iso: datetime | None
-    game_start_time: datetime | None
+    end_date_iso: DatetimeUTC | None
+    game_start_time: DatetimeUTC | None
     seconds_delay: int
     fpmm: str
     maker_base_fee: int

prediction_market_agent_tooling/markets/polymarket/data_models_web.py

@@ -7,7 +7,6 @@ These models are based on what Polymarket's website returns in the response, and
 
 import json
 import typing as t
-from datetime import datetime
 
 import requests
 from pydantic import BaseModel, field_validator
@@ -15,6 +14,7 @@ from pydantic import BaseModel, field_validator
 from prediction_market_agent_tooling.gtypes import USDC, HexAddress
 from prediction_market_agent_tooling.loggers import logger
 from prediction_market_agent_tooling.markets.data_models import Resolution
+from prediction_market_agent_tooling.tools.utils import DatetimeUTC
 
 POLYMARKET_BASE_URL = "https://polymarket.com"
 POLYMARKET_TRUE_OUTCOME = "Yes"
@@ -38,7 +38,7 @@ class Event(BaseModel):
 
 
 class Event1(BaseModel):
-    startDate: datetime | None = None
+    startDate: DatetimeUTC | None = None
     slug: str
 
 
@@ -60,7 +60,7 @@ class Market1(BaseModel):
 class ResolutionData(BaseModel):
     id: str
     author: str
-    lastUpdateTimestamp: datetime
+    lastUpdateTimestamp: int
     status: str
     wasDisputed: bool
     price: str
@@ -79,13 +79,13 @@ class Market(BaseModel):
     slug: str
     twitterCardImage: t.Any | None = None
     resolutionSource: str | None = None
-    endDate: datetime
+    endDate: DatetimeUTC
     category: t.Any | None = None
     ammType: t.Any | None = None
     description: str
     liquidity: str | None = None
-    startDate: datetime | None = None
-    createdAt: datetime
+    startDate: DatetimeUTC | None = None
+    createdAt: DatetimeUTC
     xAxisValue: t.Any | None = None
     yAxisValue: t.Any | None = None
     denominationToken: t.Any | None = None
@@ -106,7 +106,7 @@ class Market(BaseModel):
     upperBoundDate: t.Any | None = None
     closed: bool
     marketMakerAddress: HexAddress
-    closedTime: datetime | None = None
+    closedTime: DatetimeUTC | None = None
     wideFormat: bool | None = None
     new: bool | None = None
     sentDiscord: t.Any | None = None
@@ -129,9 +129,9 @@ class Market(BaseModel):
     curationOrder: t.Any | None = None
     volumeNum: USDC | None = None
     liquidityNum: float | None = None
-    endDateIso: datetime | None = None
-    startDateIso: datetime | None = None
-    umaEndDateIso: datetime | None = None
+    endDateIso: DatetimeUTC | None = None
+    startDateIso: DatetimeUTC | None = None
+    umaEndDateIso: DatetimeUTC | None = None
     commentsEnabled: bool | None = None
     disqusThread: t.Any | None = None
     gameStartTime: t.Any | None = None
@@ -236,8 +236,8 @@ class PolymarketFullMarket(BaseModel):
     description: str
     commentCount: int | None = None
     resolutionSource: str | None = None
-    startDate: datetime | None = None
-    endDate: datetime
+    startDate: DatetimeUTC | None = None
+    endDate: DatetimeUTC
     image: str | None = None
     icon: str | None = None
     featuredImage: str | None = None
@@ -253,10 +253,10 @@ class PolymarketFullMarket(BaseModel):
     competitive: float | None = None
     openInterest: int | None = None
     sortBy: str | None = None
-    createdAt: datetime
+    createdAt: DatetimeUTC
     commentsEnabled: bool | None = None
     disqusThread: t.Any | None = None
-    updatedAt: datetime
+    updatedAt: DatetimeUTC
     enableOrderBook: bool | None = None
     liquidityAmm: float | None = None
     liquidityClob: float | None = None