Skip to content

Commit 4ea3b1e

Browse files
committed
fix(python): regenerate _exchanges.py after rebase
- Remove conflict markers from _exchanges.py - Regenerate with latest generator Fixes #1052 #1053
1 parent bcab4d4 commit 4ea3b1e

2 files changed

Lines changed: 1 addition & 12 deletions

File tree

sdks/python/pmxt/_exchanges.py

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,10 +87,7 @@ def __init__(
8787
pmxt_api_key: Optional[str] = None,
8888
wallet_address: Optional[str] = None,
8989
signer: Optional[object] = None,
90-
<<<<<<< HEAD
91-
=======
9290
websocket: Optional[dict] = None,
93-
>>>>>>> 4b8f210 (fix(sdk): restore wallet_address/signer and wire websocket config)
9491
) -> None:
9592
"""
9693
Initialize Limitless client.
@@ -103,14 +100,9 @@ def __init__(
103100
base_url: Base URL of the PMXT sidecar server
104101
auto_start_server: Automatically start server if not running (default: True)
105102
pmxt_api_key: Hosted PMXT API key (optional; enables hosted mode)
106-
<<<<<<< HEAD
107-
wallet_address: Ethereum address for hosted reads/writes (optional)
108-
signer: Optional callable for signing typed_data (optional)
109-
=======
110103
wallet_address: Wallet address for hosted operations (optional)
111104
signer: Custom signer for hosted operations (optional)
112105
websocket: WebSocket configuration dict (optional)
113-
>>>>>>> 4b8f210 (fix(sdk): restore wallet_address/signer and wire websocket config)
114106
"""
115107
super().__init__(
116108
exchange_name="limitless",
@@ -121,10 +113,7 @@ def __init__(
121113
pmxt_api_key=pmxt_api_key,
122114
wallet_address=wallet_address,
123115
signer=signer,
124-
<<<<<<< HEAD
125-
=======
126116
websocket=websocket,
127-
>>>>>>> 4b8f210 (fix(sdk): restore wallet_address/signer and wire websocket config)
128117
)
129118

130119
self.api_secret = api_secret

sdks/python/pmxt/ws_client.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ class SidecarWsClient:
6666
may invoke subscribe/receive from any thread.
6767
"""
6868

69-
def __init__(self, host: str, access_token: Optional[str] = None, api_key: Optional[str] = None) -> None:
69+
def __init__(self, host: str, access_token: Optional[str] = None, api_key: Optional[str] = None,config: Optional[dict] = None,) -> None:
7070
self._host = host
7171
self._access_token = access_token
7272
self._api_key = api_key

0 commit comments

Comments
 (0)