poly-position-watcher 0.2.7__tar.gz → 0.2.9__tar.gz

{poly_position_watcher-0.2.7/poly_position_watcher.egg-info → poly_position_watcher-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: poly-position-watcher
-Version: 0.2.7
+Version: 0.2.9
 Summary: polymarket proxy wallet redeem
 Home-page: https://github.com/tosmart01/polymarket-position-watcher
 Author: pinbar
@@ -19,7 +19,11 @@ Dynamic: requires-python
 
 # poly-position-watcher
 
-English README (default). For Chinese: [README.zh.md](README.zh.md)
+![PyPI](https://img.shields.io/pypi/v/poly-web3)
+![Python](https://img.shields.io/pypi/pyversions/poly-web3)
+![License](https://img.shields.io/github/license/tosmart01/poly-web3)
+
+[English](README.md) | [中文](README.zh.md)
 
 ## Overview
 
@@ -28,6 +32,9 @@ English README (default). For Chinese: [README.zh.md](README.zh.md)
 - WSS real-time tracking for `TRADE` and `ORDER` (positions + orders)
 - HTTP polling fallback for reliability
 - Optional fee calculation (toggle + custom formula)
+- Position fields for fill checks:
+  `size` (post-fee net size), `original_size` (pre-fee net size), `sellable_size` (on-chain confirmed size), `fee_amount` (accumulated fee amount)
+- Failed trades are detected and returned on positions (`has_failed`, `failed_trades`)
 
 **Note: WSS disconnects are auto-detected and reconnected.**
 
@@ -65,6 +72,10 @@ with PositionWatcherService(
     order: OrderMessage = service.get_order("<order_id>")
     print(position)
     print(order)
+    if position:
+        print("size(post-fee):", position.size)
+        print("size(pre-fee):", position.original_size)
+        print("fee_amount:", position.fee_amount)
     service.show_positions(limit=10)
     service.show_orders(limit=10)
     
@@ -107,17 +118,22 @@ OrderMessage(
 UserPosition(
   price: 0.0,
   size: 0.0,
+  original_size: 0.0,
   volume: 0.0,
+  fee_amount: 0.0,
+  sellable_size: 0.0,
   token_id: '',
   last_update: 0.0,
   market_id: None,
   outcome: None,
-  created_at: None
+  created_at: None,
+  has_failed: False,
+  failed_trades: []
 )
 ```
 
 
-**Full example (`examples/http_bootstrap_example.py`)**
+**Full example (`examples/example.py`)**
 
 ## Pretty printing
 
@@ -136,6 +152,8 @@ Some Polymarket markets enable taker fee / maker rebate. This library **fully su
 - Enable with `enable_fee_calc=True` to apply fees using `feeRateBps` from trades/orders
 - Customize with `fee_calc_fn` if you need a different formula
 - Disable (default) if you prefer pre-fee positions
+- Returned position fields:
+  `size` = post-fee net size, `original_size` = pre-fee net size, `fee_amount` = accumulated fee amount
 
 Default fee formula (when `fee_calc_fn` is not provided):
 `fee = 0.25 * (p * (1 - p)) ** 2 * (fee_rate_bps / 1000)`, and `new_size = (1 - fee) * size`.

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/README.md

@@ -1,6 +1,10 @@
 # poly-position-watcher
 
-English README (default). For Chinese: [README.zh.md](README.zh.md)
+![PyPI](https://img.shields.io/pypi/v/poly-web3)
+![Python](https://img.shields.io/pypi/pyversions/poly-web3)
+![License](https://img.shields.io/github/license/tosmart01/poly-web3)
+
+[English](README.md) | [中文](README.zh.md)
 
 ## Overview
 
@@ -9,6 +13,9 @@ English README (default). For Chinese: [README.zh.md](README.zh.md)
 - WSS real-time tracking for `TRADE` and `ORDER` (positions + orders)
 - HTTP polling fallback for reliability
 - Optional fee calculation (toggle + custom formula)
+- Position fields for fill checks:
+  `size` (post-fee net size), `original_size` (pre-fee net size), `sellable_size` (on-chain confirmed size), `fee_amount` (accumulated fee amount)
+- Failed trades are detected and returned on positions (`has_failed`, `failed_trades`)
 
 **Note: WSS disconnects are auto-detected and reconnected.**
 
@@ -46,6 +53,10 @@ with PositionWatcherService(
     order: OrderMessage = service.get_order("<order_id>")
     print(position)
     print(order)
+    if position:
+        print("size(post-fee):", position.size)
+        print("size(pre-fee):", position.original_size)
+        print("fee_amount:", position.fee_amount)
     service.show_positions(limit=10)
     service.show_orders(limit=10)
     
@@ -88,17 +99,22 @@ OrderMessage(
 UserPosition(
   price: 0.0,
   size: 0.0,
+  original_size: 0.0,
   volume: 0.0,
+  fee_amount: 0.0,
+  sellable_size: 0.0,
   token_id: '',
   last_update: 0.0,
   market_id: None,
   outcome: None,
-  created_at: None
+  created_at: None,
+  has_failed: False,
+  failed_trades: []
 )
 ```
 
 
-**Full example (`examples/http_bootstrap_example.py`)**
+**Full example (`examples/example.py`)**
 
 ## Pretty printing
 
@@ -117,6 +133,8 @@ Some Polymarket markets enable taker fee / maker rebate. This library **fully su
 - Enable with `enable_fee_calc=True` to apply fees using `feeRateBps` from trades/orders
 - Customize with `fee_calc_fn` if you need a different formula
 - Disable (default) if you prefer pre-fee positions
+- Returned position fields:
+  `size` = post-fee net size, `original_size` = pre-fee net size, `fee_amount` = accumulated fee amount
 
 Default fee formula (when `fee_calc_fn` is not provided):
 `fee = 0.25 * (p * (1 - p)) ** 2 * (fee_rate_bps / 1000)`, and `new_size = (1 - fee) * size`.

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/_version.py

@@ -1,3 +1,3 @@
 __all__ = ["__version__"]
 
-__version__ = "0.2.6"
+__version__ = "0.2.9"

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/api_worker.py

@@ -262,6 +262,18 @@ class HttpFallbackManager:
             if order_ids:
                 self.orders.update(order_ids)
             logger.info(f"Added HTTP monitoring: {len(market_ids or [])} markets, {len(order_ids or [])} orders")
+
+    def set_markets(self, market_ids: list[str] | None = None):
+        """Replace monitored markets with the provided list."""
+        with self._lock:
+            self.markets = set(market_ids or [])
+            logger.info(f"Set HTTP monitoring markets: {len(self.markets)} total")
+
+    def set_orders(self, order_ids: list[str] | None = None):
+        """Replace monitored orders with the provided list."""
+        with self._lock:
+            self.orders = set(order_ids or [])
+            logger.info(f"Set HTTP monitoring orders: {len(self.orders)} total")
     
     def remove(self, market_ids: list[str] = None, order_ids: list[str] = None):
         """Remove markets/orders from monitoring."""

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/common/enums.py

@@ -18,3 +18,13 @@ class MarketEvent(str, Enum):
     PRICE_CHANGE = "price_change"
     TICK_SIZE_CHANGE = "tick_size_change"
     BOOK = "book"
+
+
+class TradeStatus(str, Enum):
+    """Trade status values from Polymarket."""
+
+    MATCHED = "MATCHED"
+    MINED = "MINED"
+    CONFIRMED = "CONFIRMED"
+    RETRYING = "RETRYING"
+    FAILED = "FAILED"

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/position_service.py

@@ -12,7 +12,7 @@ from queue import Queue, Empty
 from collections import defaultdict
 from typing import Callable, Dict, List
 
-from poly_position_watcher.common.enums import Side
+from poly_position_watcher.common.enums import Side, TradeStatus
 from poly_position_watcher.common.logger import logger
 from poly_position_watcher.api_worker import APIWorker, HttpFallbackManager
 
@@ -27,7 +27,7 @@ from rich.console import Console
 from rich.table import Table
 from poly_position_watcher.wss_worker import PolymarketUserWS
 
-FILLED_TRADE = "FAILED"
+FAILED_TRADE = TradeStatus.FAILED
 
 
 class PositionStore:
@@ -139,8 +139,14 @@ class PositionStore:
     def build_position(
             self, trades: list[TradeMessage], token_id, outcome: str
     ) -> UserPosition | None:
-        filled_trades = [i for i in trades if i.status == FILLED_TRADE]
-        success_trades = [i for i in trades if i.status != FILLED_TRADE]
+        def _status_is(trade: TradeMessage, status: TradeStatus) -> bool:
+            return trade.status == status or trade.status == status.value
+
+        filled_trades = [i for i in trades if _status_is(i, FAILED_TRADE)]
+        success_trades = [i for i in trades if not _status_is(i, FAILED_TRADE)]
+        confirmed_trades = [
+            i for i in success_trades if _status_is(i, TradeStatus.CONFIRMED)
+        ]
         has_failed = bool(len(filled_trades))
         if has_failed:
             filled_size = sum([i.size for i in filled_trades])
@@ -152,10 +158,22 @@ class PositionStore:
             enable_fee_calc=self.enable_fee_calc,
             fee_calc_fn=self.fee_calc_fn,
         )
+        sellable_size = 0.0
+        if confirmed_trades:
+            confirmed_result = calculate_position_from_trades(
+                confirmed_trades,
+                user_address=self.user_address,
+                enable_fee_calc=self.enable_fee_calc,
+                fee_calc_fn=self.fee_calc_fn,
+            )
+            sellable_size = confirmed_result.size
         current = UserPosition(
             price=position_result.avg_price,
             size=position_result.size,
+            original_size=position_result.original_size,
             volume=position_result.amount,
+            fee_amount=position_result.fee_amount,
+            sellable_size=sellable_size,
             token_id=token_id,
             last_update=position_result.last_update,
             market_id=trades[0].market,
@@ -591,6 +609,28 @@ class PositionWatcherService:
 
         self._http_fallback.remove(market_ids=market_ids, order_ids=order_ids)
 
+    def set_market_http_listen(self, market_ids: list[str] = None):
+        """
+        Replace HTTP fallback market monitoring list.
+
+        :param market_ids: List of market (condition) IDs to monitor
+        """
+        if not self.enable_http_fallback or not self._http_fallback:
+            return
+
+        self._http_fallback.set_markets(market_ids=market_ids)
+
+    def set_order_http_listen(self, order_ids: list[str] = None):
+        """
+        Replace HTTP fallback order monitoring list.
+
+        :param order_ids: List of order IDs to monitor
+        """
+        if not self.enable_http_fallback or not self._http_fallback:
+            return
+
+        self._http_fallback.set_orders(order_ids=order_ids)
+
     def clear_http(self):
         """Clear all HTTP fallback monitoring (threads keep running)."""
         if not self.enable_http_fallback or not self._http_fallback:

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/schema/position_model.py

@@ -9,7 +9,7 @@ from typing import List, Optional, Literal
 
 from pydantic import BaseModel, Field, field_validator, model_validator
 
-from poly_position_watcher.common.enums import Side
+from poly_position_watcher.common.enums import Side, TradeStatus
 from poly_position_watcher.schema.base import PrettyPrintBaseModel
 
 
@@ -52,7 +52,7 @@ class TradeMessage(BaseModel):
     price: float
     side: Side
     size: float
-    status: str
+    status: TradeStatus | str
     taker_order_id: str
     timestamp: int | None = None
     match_time: int | None = None
@@ -122,7 +122,10 @@ class OrderMessage(PrettyPrintBaseModel):
 class UserPosition(PrettyPrintBaseModel):
     price: float
     size: float
+    original_size: float = 0.0
     volume: float
+    fee_amount: float = 0.0
+    sellable_size: float = 0.0
     token_id: Optional[str] = None
     last_update: float
     market_id: Optional[str] = None
@@ -133,8 +136,8 @@ class UserPosition(PrettyPrintBaseModel):
     failed_trades: list[TradeMessage] = Field(default_factory=list)
 
     @property
-    def failed_size(self) -> float | None:
-        return sum([i.size for i in self.failed_trades])
+    def failed_size(self) -> float:
+        return sum(i.size for i in self.failed_trades)
 
 
 class PositionDetails(BaseModel):
@@ -149,9 +152,11 @@ class PositionResult(PrettyPrintBaseModel):
     """仓位计算结果"""
 
     size: float
+    original_size: float = 0.0
     avg_price: float
     realized_pnl: float
     amount: float
+    fee_amount: float = 0.0
     position_value: Optional[float] = None
     unrealized_pnl: Optional[float] = None
     total_pnl: Optional[float] = None

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/poly_position_watcher/trade_calculator.py

@@ -39,18 +39,23 @@ def calculate_position_from_trades(
 
     buy_events = []
     sell_events = []
+    total_original_size = 0.0
 
     def apply_fee(
         size: float, price: float, fee_rate_bps: float, trader_side: str | None
-    ) -> float:
+    ) -> tuple[float, float]:
         if (
             not enable_fee_calc
             or fee_rate_bps <= 0
             or trader_side != "TAKER"
         ):
-            return size
+            return size, 0.0
         calc = fee_calc_fn or _default_fee_calc
-        return calc(size, price, fee_rate_bps)
+        size_after_fee = calc(size, price, fee_rate_bps)
+        fee_amount = (size - size_after_fee) * price
+        return size_after_fee, fee_amount
+
+    total_fee_amount = 0.0
 
     # --- 1. 解析所有交易 ---
     for trade in trades:
@@ -61,24 +66,30 @@ def calculate_position_from_trades(
             if order.maker_address.upper() != user_address.upper():
                 continue
             is_maker_order = True
-            size = apply_fee(
+            size, fee_amount = apply_fee(
                 order.size, order.price, order.fee_rate_bps, trade.trader_side
             )
+            total_fee_amount += fee_amount
 
             if order.side == Side.BUY:
                 buy_events.append((size, order.price, trade.match_time))
+                total_original_size += order.size
             else:
                 sell_events.append((-size, order.price, trade.match_time))
+                total_original_size -= order.size
 
         # taker 部分
         if not is_maker_order and trade.maker_address.upper() == user_address.upper():
-            size = apply_fee(
+            size, fee_amount = apply_fee(
                 trade.size, trade.price, trade.fee_rate_bps, trade.trader_side
             )
+            total_fee_amount += fee_amount
             if trade.side == Side.BUY:
                 buy_events.append((size, trade.price, trade.match_time))
+                total_original_size += trade.size
             else:
                 sell_events.append((-size, trade.price, trade.match_time))
+                total_original_size -= trade.size
 
     # --- 2. 时间排序 ---
     all_events = sorted(buy_events + sell_events, key=lambda x: x[2])
@@ -118,20 +129,25 @@ def calculate_position_from_trades(
 
     # --- 4. 计算最终持仓 ---
     total_size = clean(sum(q[0] for q in buy_queue))
+    original_size = clean(total_original_size)
     cost_basis = clean(sum(clean(q[0]) * q[1] for q in buy_queue))
 
     # 若因误差产生 0.0000003 的 ghost position → 完全清掉
     if abs(total_size) < EPS:
         total_size = 0.0
         cost_basis = 0.0
+    if abs(original_size) < EPS:
+        original_size = 0.0
 
     avg_price = cost_basis / total_size if total_size != 0 else 0.0
 
     return PositionResult(
         size=total_size,
+        original_size=original_size,
         avg_price=avg_price,
         realized_pnl=realized_pnl,
         amount=cost_basis,
+        fee_amount=total_fee_amount,
         is_long=total_size > 0,
         is_short=total_size < 0,
         details=PositionDetails(

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9/poly_position_watcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: poly-position-watcher
-Version: 0.2.7
+Version: 0.2.9
 Summary: polymarket proxy wallet redeem
 Home-page: https://github.com/tosmart01/polymarket-position-watcher
 Author: pinbar
@@ -19,7 +19,11 @@ Dynamic: requires-python
 
 # poly-position-watcher
 
-English README (default). For Chinese: [README.zh.md](README.zh.md)
+![PyPI](https://img.shields.io/pypi/v/poly-web3)
+![Python](https://img.shields.io/pypi/pyversions/poly-web3)
+![License](https://img.shields.io/github/license/tosmart01/poly-web3)
+
+[English](README.md) | [中文](README.zh.md)
 
 ## Overview
 
@@ -28,6 +32,9 @@ English README (default). For Chinese: [README.zh.md](README.zh.md)
 - WSS real-time tracking for `TRADE` and `ORDER` (positions + orders)
 - HTTP polling fallback for reliability
 - Optional fee calculation (toggle + custom formula)
+- Position fields for fill checks:
+  `size` (post-fee net size), `original_size` (pre-fee net size), `sellable_size` (on-chain confirmed size), `fee_amount` (accumulated fee amount)
+- Failed trades are detected and returned on positions (`has_failed`, `failed_trades`)
 
 **Note: WSS disconnects are auto-detected and reconnected.**
 
@@ -65,6 +72,10 @@ with PositionWatcherService(
     order: OrderMessage = service.get_order("<order_id>")
     print(position)
     print(order)
+    if position:
+        print("size(post-fee):", position.size)
+        print("size(pre-fee):", position.original_size)
+        print("fee_amount:", position.fee_amount)
     service.show_positions(limit=10)
     service.show_orders(limit=10)
     
@@ -107,17 +118,22 @@ OrderMessage(
 UserPosition(
   price: 0.0,
   size: 0.0,
+  original_size: 0.0,
   volume: 0.0,
+  fee_amount: 0.0,
+  sellable_size: 0.0,
   token_id: '',
   last_update: 0.0,
   market_id: None,
   outcome: None,
-  created_at: None
+  created_at: None,
+  has_failed: False,
+  failed_trades: []
 )
 ```
 
 
-**Full example (`examples/http_bootstrap_example.py`)**
+**Full example (`examples/example.py`)**
 
 ## Pretty printing
 
@@ -136,6 +152,8 @@ Some Polymarket markets enable taker fee / maker rebate. This library **fully su
 - Enable with `enable_fee_calc=True` to apply fees using `feeRateBps` from trades/orders
 - Customize with `fee_calc_fn` if you need a different formula
 - Disable (default) if you prefer pre-fee positions
+- Returned position fields:
+  `size` = post-fee net size, `original_size` = pre-fee net size, `fee_amount` = accumulated fee amount
 
 Default fee formula (when `fee_calc_fn` is not provided):
 `fee = 0.25 * (p * (1 - p)) ** 2 * (fee_rate_bps / 1000)`, and `new_size = (1 - fee) * size`.

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/pyproject.toml

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

{poly_position_watcher-0.2.7 → poly_position_watcher-0.2.9}/setup.py

@@ -24,7 +24,7 @@ for cache_dir in HERE.rglob("__pycache__"):
 
 setup(
     name=PROJECT.get("name", "poly-position-watcher"),
-    version=PROJECT.get("version", "0.2.7"),
+    version=PROJECT.get("version", "0.2.9"),
     description=PROJECT.get("description", ""),
     long_description=README_PATH.read_text(encoding="utf-8") if README_PATH.exists() else "",
     long_description_content_type="text/markdown",