Migrate blocking client

MIGRATION.md

@@ -1,6 +1,6 @@
 # Migration Guide
 
-## 1.4.x -> 1.5.0 (REST / Onboarding / Stream clients)
+## 1.4.x -> 2.0.0 (new project structure)
 
 - `x10.perpetual.trading_client.PerpetualTradingClient` has been replaced with
 `x10.clients.rest.RestApiClient` (client has the same interface but new name reflects its purpose better).
@@ -12,6 +12,8 @@
 - `UserClient` replaced by `OnboardingClient`, which accepts an account address and a sign-message callback instead of a raw L1 private key.
 - `onboard_subaccount` error handling has changed. Previously, it silently recovered an existing sub-account (HTTP 409) by fetching it from `get_accounts()`. Now it raises `ValidationError` on conflict. Handle duplicates explicitly if you relied on the automatic recovery.
 - Signing-related modules have been extracted from `x10.perpetual` into a dedicated `x10.signing` package. The old paths no longer exist — there are no backwards-compatible re-exports.
+- `x10.perpetual.orderbook` has moved to `x10.tools.orderbook`.
+- `x10.perpetual.simple_client.simple_trading_client.BlockingTradingClient` has moved to `x10.clients.blocking.BlockingTradingClient`. The class is also re-exported from `x10.clients.blocking` directly for convenience (aligned with other clients).
 - Fixes https://github.com/x10xchange/python_sdk/issues/99.
 
 ---

examples/cases/advanced/market_maker.py

@@ -7,7 +7,7 @@
 
 from examples.utils import BTC_USD_MARKET, create_rest_client
 from x10.models.order import OrderSide
-from x10.perpetual.orderbook import OrderBook, OrderBookEntry
+from x10.tools.orderbook import OrderBook, OrderBookEntry
 
 LOGGER = logging.getLogger()
 MARKET_NAME = BTC_USD_MARKET
@@ -145,7 +145,7 @@ async def on_best_bid_change(best_bid: OrderBookEntry | None):
 
     orderbook = await OrderBook.create(
         rest_client.config,
-        market.name,
+        market_name=market.name,
         start=True,
         best_ask_change_callback=on_best_ask_change,
         best_bid_change_callback=on_best_bid_change,

examples/cases/createorder/create_market_order_with_blocking_client.py

@@ -5,7 +5,7 @@
 from x10.config import TESTNET_CONFIG
 from x10.errors import ValidationError
 from x10.models.order import OrderSide, OrderType, TimeInForce
-from x10.perpetual.orderbook import OrderBook
+from x10.tools.orderbook import OrderBook
 from x10.utils.order import get_price_with_slippage
 
 LOGGER = logging.getLogger()

examples/utils.py

@@ -10,12 +10,12 @@
 import yaml
 from dotenv import load_dotenv
 
+from x10.clients.blocking import BlockingTradingClient
 from x10.clients.rest import RestApiClient
 from x10.clients.stream import StreamClient
 from x10.config import TESTNET_CONFIG, Config
 from x10.core.stark_account import StarkPerpetualAccount
 from x10.models.market import TradingConfigModel
-from x10.perpetual.simple_client.simple_trading_client import BlockingTradingClient
 from x10.utils.string import is_hex_string
 
 BTC_USD_MARKET = "BTC-USD"

pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "x10-python-trading-starknet"
-version = "1.5.0"
+version = "2.0.0"
 description = "Python client for X10 API"
 authors = ["X10 <tech@ex10.org>"]
 repository = "https://github.com/x10xchange/python_sdk"
@@ -29,9 +29,9 @@ pydantic = ">=2.9.0"
 python = "^3.10"
 pyyaml = ">=6.0.1"
 sortedcontainers = ">=2.4.0"
-strenum = "^0.4.15"
-tenacity = "^9.1.2"
-websockets = ">=12.0,<14.0"
+strenum = ">=0.4.15"
+tenacity = ">=9.1.2"
+websockets = ">=12.0"
 
 [tool.poetry.group.dev.dependencies]
 black = "==23.12.0"
@@ -52,7 +52,7 @@ python-dotenv = "==1.0.1"
 safety = "==3.5.1"
 tox = "==4.11.4"
 types-pyyaml = "==6.0.12.12"
-typing-extensions = ">=4.9.0"
+typing-extensions = "==4.15.0"
 
 
 [tool.mypy]

tests/perpetual/test_orderbook_price_impact.py → tests/tools/test_orderbook_price_impact.py

@@ -6,7 +6,7 @@
 
 from x10.config import TESTNET_CONFIG
 from x10.models.orderbook import OrderbookQuantityModel, OrderbookUpdateModel
-from x10.perpetual.orderbook import OrderBook
+from x10.tools.orderbook import OrderBook
 
 
 async def populate_dummy_data(market_name: str, orderbook: OrderBook):

x10/clients/blocking/__init__.py

@@ -0,0 +1,3 @@
+from x10.clients.blocking.blocking_trading_client import (  # noqa: F401
+    BlockingTradingClient,
+)

x10/perpetual/simple_client/simple_trading_client.py → x10/clients/blocking/blocking_trading_client.py

@@ -72,6 +72,11 @@ class CancelWaiter:
 
 
 class BlockingTradingClient:
+    """
+    A client for placing orders and receiving updates in a blocking manner.
+    Waits for the confirmation from the WS stream after placing or canceling an order.
+    """
+
     def __init__(self, config: Config, account: StarkPerpetualAccount):
         if not asyncio.get_event_loop().is_running():
             raise SdkError(

x10/perpetual/orderbook.py → x10/tools/orderbook.py

@@ -31,6 +31,7 @@ class OrderBook:
     @staticmethod
     async def create(
         config: Config,
+        *,
         market_name: str,
         best_ask_change_callback: Callable[[OrderBookEntry | None], Awaitable[None]] | None = None,
         best_bid_change_callback: Callable[[OrderBookEntry | None], Awaitable[None]] | None = None,