fix: update pythclient to version 0.2.1 and integrate MarketSchedule for price feed checks

pyproject.toml

@@ -21,7 +21,7 @@ loguru = "^0.6.0"
 more-itertools = "^9.0.0"
 prometheus-client = "0.15.0"
 pycoingecko = "2.2.0"
-pythclient = "^0.1.24"
+pythclient = "^0.2.1"
 pyyaml = "^6.0"
 throttler = "1.2.1"
 types-pyyaml = "^6.0.12"

pyth_observer/__init__.py

@@ -4,6 +4,7 @@
 
 from base58 import b58decode
 from loguru import logger
+from pythclient.market_schedule import MarketSchedule
 from pythclient.pythaccounts import PythPriceAccount, PythPriceType, PythProductAccount
 from pythclient.pythclient import PythClient
 from pythclient.solana import (
@@ -120,6 +121,7 @@ async def run(self):
                         PriceFeedState(
                             symbol=product.attrs["symbol"],
                             asset_type=product.attrs["asset_type"],
+                            schedule=MarketSchedule(product.attrs["schedule"]),
                             public_key=price_account.key,
                             status=price_account.aggregate_price_status,
                             # this is the solana block slot when price account was fetched
@@ -146,6 +148,7 @@ async def run(self):
                                 publisher_name=publisher_name,
                                 symbol=product.attrs["symbol"],
                                 asset_type=product.attrs["asset_type"],
+                                schedule=MarketSchedule(product.attrs["schedule"]),
                                 public_key=component.publisher_key,
                                 confidence_interval=component.latest_price_info.confidence_interval,
                                 confidence_interval_aggregate=price_account.aggregate_price_info.confidence_interval,

pyth_observer/check/price_feed.py

@@ -5,7 +5,7 @@
 from zoneinfo import ZoneInfo
 
 import arrow
-from pythclient.calendar import is_market_open
+from pythclient.market_schedule import MarketSchedule
 from pythclient.pythaccounts import PythPriceStatus
 from pythclient.solana import SolanaPublicKey
 
@@ -16,6 +16,7 @@
 class PriceFeedState:
     symbol: str
     asset_type: str
+    schedule: MarketSchedule
     public_key: SolanaPublicKey
     status: PythPriceStatus
     latest_block_slot: int
@@ -55,8 +56,7 @@ def state(self) -> PriceFeedState:
         return self.__state
 
     def run(self) -> bool:
-        market_open = is_market_open(
-            self.__state.asset_type.lower(),
+        market_open = self.__state.schedule.is_market_open(
             datetime.now(ZoneInfo("America/New_York")),
         )
 
@@ -176,8 +176,7 @@ def run(self) -> bool:
         if self.__state.status != PythPriceStatus.TRADING:
             return True
 
-        market_open = is_market_open(
-            self.__state.asset_type.lower(),
+        market_open = self.__state.schedule.is_market_open(
             datetime.now(ZoneInfo("America/New_York")),
         )
 
@@ -237,8 +236,7 @@ def run(self) -> bool:
         if self.__state.status != PythPriceStatus.TRADING:
             return True
 
-        market_open = is_market_open(
-            self.__state.asset_type.lower(),
+        market_open = self.__state.schedule.is_market_open(
             datetime.now(ZoneInfo("America/New_York")),
         )
 

pyth_observer/check/publisher.py

@@ -6,7 +6,7 @@
 from zoneinfo import ZoneInfo
 
 from loguru import logger
-from pythclient.calendar import is_market_open
+from pythclient.market_schedule import MarketSchedule
 from pythclient.pythaccounts import PythPriceStatus
 from pythclient.solana import SolanaPublicKey
 
@@ -36,6 +36,7 @@ class PublisherState:
     publisher_name: str
     symbol: str
     asset_type: str
+    schedule: MarketSchedule
     public_key: SolanaPublicKey
     status: PythPriceStatus
     aggregate_status: PythPriceStatus
@@ -161,8 +162,7 @@ def state(self) -> PublisherState:
         return self.__state
 
     def run(self) -> bool:
-        market_open = is_market_open(
-            self.__state.asset_type.lower(),
+        market_open = self.__state.schedule.is_market_open(
             datetime.now(ZoneInfo("America/New_York")),
         )
 
@@ -272,8 +272,7 @@ def state(self) -> PublisherState:
         return self.__state
 
     def run(self) -> bool:
-        market_open = is_market_open(
-            self.__state.asset_type.lower(),
+        market_open = self.__state.schedule.is_market_open(
             datetime.now(ZoneInfo("America/New_York")),
         )
 

tests/test_checks_price_feed.py

@@ -1,3 +1,4 @@
+from pythclient.market_schedule import MarketSchedule
 from pythclient.pythaccounts import PythPriceStatus
 from pythclient.solana import SolanaPublicKey
 
@@ -8,6 +9,7 @@ def test_price_feed_offline_check():
     state = PriceFeedState(
         symbol="Crypto.BTC/USD",
         asset_type="Crypto",
+        schedule=MarketSchedule("America/New_York;O,O,O,O,O,O,O;"),
         public_key=SolanaPublicKey("2hgu6Umyokvo8FfSDdMa9nDKhcdv9Q4VvGNhRCeSWeD3"),
         status=PythPriceStatus.TRADING,
         latest_block_slot=100,

tests/test_checks_publisher.py

@@ -3,6 +3,7 @@
 from unittest.mock import patch
 
 import pytest
+from pythclient.market_schedule import MarketSchedule
 from pythclient.pythaccounts import PythPriceStatus
 from pythclient.solana import SolanaPublicKey
 
@@ -29,6 +30,7 @@ def make_publisher_state(
         publisher_name="publisher",
         symbol=symbol,
         asset_type=asset_type,
+        schedule=MarketSchedule("America/New_York;O,O,O,O,O,O,O;"),
         public_key=SolanaPublicKey("2hgu6Umyokvo8FfSDdMa9nDKhcdv9Q4VvGNhRCeSWeD3"),
         status=PythPriceStatus.TRADING,
         aggregate_status=PythPriceStatus.TRADING,