poly-position-watcher 0.3.2__tar.gz → 0.3.4__tar.gz

{poly_position_watcher-0.3.2/poly_position_watcher.egg-info → poly_position_watcher-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: poly-position-watcher
-Version: 0.3.2
+Version: 0.3.4
 Summary: polymarket proxy wallet redeem
 Home-page: https://github.com/tosmart01/polymarket-position-watcher
 Author: pinbar

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/poly_position_watcher/_version.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/poly_position_watcher/api_worker.py

@@ -117,7 +117,7 @@ class APIWorker:
         Uses taker mode (maker_orders=[]) so trade_calculator will use outer fields directly.
 
         :param user_address: User wallet address
-        :return: List of TradeMessage instances sorted by match_time
+        :return: List of TradeMessage instances sorted by effective event time
         """
         positions = self.fetch_positions(user_address)
         if not positions:
@@ -315,7 +315,7 @@ class HttpFallbackManager:
                         logger.error(f"Failed to http fetch trades market {task._market_id}: {e}")
                         continue
                     
-                    for trade in sorted(trades, key=lambda x: x.match_time or 0):
+                    for trade in sorted(trades, key=lambda x: x.event_time):
                         self.service._ingest_trade(trade)
             except Exception as e:
                 logger.error(f"Error in trade loop: {e}")
@@ -563,9 +563,9 @@ class HttpListenerContext:
                 logger.error(f"Failed to http fetch trades market {task._market_id}: {e}")
                 continue
             if is_init:
-                self.service._init_trades(sorted(trades, key=lambda x: x.match_time))
+                self.service._init_trades(sorted(trades, key=lambda x: x.event_time))
             else:
-                for trade in sorted(trades, key=lambda x: x.match_time):
+                for trade in sorted(trades, key=lambda x: x.event_time):
                     self.service._ingest_trade(trade)
 
     def sync_order_from_http(self):

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/poly_position_watcher/position_service.py

@@ -56,6 +56,7 @@ class PositionStore:
         self.trades_by_token: Dict[str, Dict[str, TradeMessage]] = defaultdict(dict)
         self.positions: Dict[str, UserPosition] = {}
         self.orders: Dict[str, OrderMessage] = {}
+        self._warned_failed_trade_keys: set[tuple[str, str]] = set()
         self._lock = threading.RLock()
         self.queue_dict: Dict[str, Queue] = {}
 
@@ -96,7 +97,7 @@ class PositionStore:
             outcome, token_id = result
             trades_map = self.trades_by_token[token_id]
             existing = trades_map.get(trade.id)
-            if existing and trade.last_update < existing.last_update:
+            if existing and trade.event_time < existing.event_time:
                 return
             else:
                 trades_map[trade.id] = trade
@@ -201,9 +202,17 @@ class PositionStore:
             i for i in success_trades if _status_is(i, TradeStatus.CONFIRMED)
         ]
         has_failed = bool(len(failed_trades))
-        if has_failed:
-            failed_size = sum(i.size for i in failed_trades)
-            failed_trade_ids = [trade.id for trade in failed_trades]
+        new_failed_trades = [
+            trade
+            for trade in failed_trades
+            if (token_id, trade.id) not in self._warned_failed_trade_keys
+        ]
+        if new_failed_trades:
+            self._warned_failed_trade_keys.update(
+                (token_id, trade.id) for trade in new_failed_trades
+            )
+            failed_size = sum(i.size for i in new_failed_trades)
+            failed_trade_ids = [trade.id for trade in new_failed_trades]
             logger.warning(
                 "Found failed trades, total size: {}, ids: {}",
                 failed_size,
@@ -240,7 +249,11 @@ class PositionStore:
             last_update=position_result.last_update,
             market_id=trades[0].market,
             outcome=outcome,
-            created_at=datetime.fromtimestamp(position_result.last_update),
+            created_at=(
+                datetime.fromtimestamp(position_result.last_update)
+                if position_result.last_update > 0
+                else None
+            ),
             has_failed=has_failed,
             market_slug=market_slug,
             failed_trades=failed_trades,

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/poly_position_watcher/schema/position_model.py

@@ -63,10 +63,20 @@ class TradeMessage(BaseModel):
     created_at: datetime | None = None
     market_slug: Optional[str] = ""
 
+    @property
+    def event_time(self) -> int:
+        return self.match_time or self.last_update or self.timestamp or 0
+
     @model_validator(mode="after")
     def validate_datetime(self):
-        base_ts = self.match_time or self.last_update
-        if base_ts:
+        base_ts = self.event_time
+        if self.match_time is None:
+            self.match_time = base_ts or None
+        if self.last_update is None:
+            self.last_update = base_ts or None
+        if self.timestamp is None:
+            self.timestamp = base_ts or None
+        if base_ts > 0:
             self.created_at = datetime.fromtimestamp(base_ts)
         return self
 

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/poly_position_watcher/trade_calculator.py

@@ -102,6 +102,7 @@ def calculate_position_from_trades(
             if order.maker_address.upper() != user_address.upper():
                 continue
             is_maker_order = True
+            event_time = trade.event_time
             size, fee_amount = apply_fee(
                 order.size,
                 order.price,
@@ -113,7 +114,7 @@ def calculate_position_from_trades(
 
             if order.side == Side.BUY:
                 buy_events.append(
-                    (size, order.price, trade.match_time, order.size * order.price)
+                    (size, order.price, event_time, order.size * order.price)
                 )
                 total_original_size += order.size
             else:
@@ -121,7 +122,7 @@ def calculate_position_from_trades(
                     (
                         -size,
                         order.price,
-                        trade.match_time,
+                        event_time,
                         size * order.price - fee_amount,
                     )
                 )
@@ -129,6 +130,7 @@ def calculate_position_from_trades(
 
         # taker 部分
         if not is_maker_order and trade.maker_address.upper() == user_address.upper():
+            event_time = trade.event_time
             size, fee_amount = apply_fee(
                 trade.size,
                 trade.price,
@@ -139,7 +141,7 @@ def calculate_position_from_trades(
             total_fee_amount += fee_amount
             if trade.side == Side.BUY:
                 buy_events.append(
-                    (size, trade.price, trade.match_time, trade.size * trade.price)
+                    (size, trade.price, event_time, trade.size * trade.price)
                 )
                 total_original_size += trade.size
             else:
@@ -147,7 +149,7 @@ def calculate_position_from_trades(
                     (
                         -size,
                         trade.price,
-                        trade.match_time,
+                        event_time,
                         size * trade.price - fee_amount,
                     )
                 )
@@ -219,7 +221,7 @@ def calculate_position_from_trades(
             sell_events=len(sell_events),
             total_trades=len(all_events),
         ),
-        last_update=max([i.match_time for i in trades]) if trades else None,
+        last_update=max((trade.event_time for trade in trades), default=0),
     )
 
 

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4/poly_position_watcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: poly-position-watcher
-Version: 0.3.2
+Version: 0.3.4
 Summary: polymarket proxy wallet redeem
 Home-page: https://github.com/tosmart01/polymarket-position-watcher
 Author: pinbar

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "poly-position-watcher"
-version = "0.3.2"
+version = "0.3.4"
 description = "polymarket proxy wallet redeem"
 readme = "README.md"
 requires-python = ">=3.11"

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/tests/test_position_model.py

@@ -1,11 +1,13 @@
 from __future__ import annotations
 
 import unittest
+from unittest.mock import patch
 
+from poly_position_watcher.position_service import PositionStore
 from poly_position_watcher.schema.position_model import TradeMessage, UserPosition
 
 
-def build_failed_trade(trade_id: str) -> TradeMessage:
+def build_trade(trade_id: str, status: str = "FAILED", size: float = 10.0) -> TradeMessage:
     return TradeMessage(
         type="TRADE",
         event_type="trade",
@@ -19,8 +21,8 @@ def build_failed_trade(trade_id: str) -> TradeMessage:
         owner="0xuser",
         price=0.25,
         side="BUY",
-        size=10.0,
-        status="FAILED",
+        size=size,
+        status=status,
         taker_order_id=f"0xorder-{trade_id}",
         timestamp=1,
         match_time=1,
@@ -46,7 +48,7 @@ class UserPositionTests(unittest.TestCase):
             market_id="0xmarket",
             outcome="YES",
             has_failed=True,
-            failed_trades=[build_failed_trade("failed-1"), build_failed_trade("failed-2")],
+            failed_trades=[build_trade("failed-1"), build_trade("failed-2")],
         )
 
         self.assertEqual(position.failed_trade_ids, ["failed-1", "failed-2"])
@@ -54,6 +56,23 @@ class UserPositionTests(unittest.TestCase):
         self.assertIn("failed_trades: ['failed-1', 'failed-2']", rendered)
         self.assertNotIn("transaction_hash", rendered)
 
+    def test_failed_trade_warning_logs_once_per_token_and_trade_id(self) -> None:
+        store = PositionStore(user_address="0xuser")
+        trades = [
+            build_trade("confirmed-1", status="CONFIRMED", size=5.0),
+            build_trade("failed-1", status="FAILED", size=10.0),
+        ]
+
+        with patch("poly_position_watcher.position_service.logger.warning") as warning:
+            store.build_position(trades=trades, token_id="0xtoken", outcome="YES")
+            store.build_position(trades=trades, token_id="0xtoken", outcome="YES")
+
+        warning.assert_called_once_with(
+            "Found failed trades, total size: {}, ids: {}",
+            10.0,
+            ["failed-1"],
+        )
+
 
 if __name__ == "__main__":
     unittest.main()

{poly_position_watcher-0.3.2 → poly_position_watcher-0.3.4}/tests/test_trade_calculator.py

@@ -212,6 +212,45 @@ class TradeCalculatorFeeTests(unittest.TestCase):
             math.isclose(result.fee_amount, buy_fee + sell_fee, rel_tol=0, abs_tol=1e-9)
         )
 
+    def test_last_update_falls_back_to_last_update_when_match_time_is_missing(self) -> None:
+        trade = build_taker_trade(
+            trade_id="buy-missing-match-time",
+            side=Side.BUY.value,
+            size=10.0,
+            price=0.25,
+            match_time=1,
+        )
+        trade.match_time = None
+        trade.last_update = 123
+
+        result = calculate_position_from_trades(
+            [trade],
+            user_address=USER_ADDRESS,
+            enable_fee_calc=False,
+        )
+
+        self.assertEqual(result.last_update, 123)
+
+    def test_last_update_defaults_to_zero_when_all_trade_timestamps_are_missing(self) -> None:
+        trade = build_taker_trade(
+            trade_id="buy-missing-all-times",
+            side=Side.BUY.value,
+            size=10.0,
+            price=0.25,
+            match_time=1,
+        )
+        trade.match_time = None
+        trade.last_update = None
+        trade.timestamp = None
+
+        result = calculate_position_from_trades(
+            [trade],
+            user_address=USER_ADDRESS,
+            enable_fee_calc=False,
+        )
+
+        self.assertEqual(result.last_update, 0)
+
 
 if __name__ == "__main__":
     unittest.main()