oxarchive 0.3.1__py3-none-any.whl → 0.3.3__py3-none-any.whl

oxarchive/__init__.py

@@ -57,7 +57,7 @@ except ImportError:
     OxArchiveWs = None  # type: ignore
     WsOptions = None  # type: ignore
 
-__version__ = "0.1.0"
+__version__ = "0.3.3"
 
 __all__ = [
     # Client

oxarchive/http.py

@@ -50,13 +50,26 @@ class HttpClient:
         return self._async_client
 
     def close(self) -> None:
-        """Close the HTTP clients."""
+        """Close the HTTP clients.
+
+        Note: This closes the sync client immediately. For the async client,
+        use aclose() instead, or call this from a sync context where you
+        don't need to await the async cleanup.
+        """
         if self._client is not None:
             self._client.close()
             self._client = None
         if self._async_client is not None:
-            # Note: async client should be closed with await
-            pass
+            # Close async client synchronously (will log warning but works)
+            # For proper cleanup, use aclose() in async contexts
+            try:
+                import asyncio
+                loop = asyncio.get_running_loop()
+                loop.create_task(self._async_client.aclose())
+            except RuntimeError:
+                # No running loop, close synchronously (httpx supports this)
+                self._async_client.close()
+            self._async_client = None
 
     async def aclose(self) -> None:
         """Close the async HTTP client."""

oxarchive/types.py

@@ -124,11 +124,17 @@ class Trade(BaseModel):
     start_position: Optional[str] = None
     """Position size before this trade."""
 
-    source: Optional[Literal["s3", "ws", "api"]] = None
-    """Data source."""
+    source: Optional[Literal["s3", "ws", "api", "live"]] = None
+    """Data source: 's3' (historical), 'api' (REST backfill), 'ws' (websocket), 'live' (real-time ingestion)."""
 
     user_address: Optional[str] = None
-    """User's wallet address."""
+    """User's wallet address (for fill-level data)."""
+
+    maker_address: Optional[str] = None
+    """Maker's wallet address (for market-level WebSocket trades)."""
+
+    taker_address: Optional[str] = None
+    """Taker's wallet address (for market-level WebSocket trades)."""
 
 
 # =============================================================================

oxarchive/websocket.py

@@ -120,6 +120,50 @@ StreamProgressHandler = Callable[[int], None]  # snapshots_sent
 StreamCompleteHandler = Callable[[WsChannel, str, int], None]  # channel, coin, snapshots_sent
 
 
+def _transform_trade(coin: str, raw: dict) -> Trade:
+    """Transform raw Hyperliquid trade format to SDK Trade type.
+
+    Raw WebSocket format: { coin, side, px, sz, time, hash, tid, users: [maker, taker] }
+    SDK format: { coin, side, price, size, timestamp, tx_hash, trade_id, maker_address, taker_address }
+    """
+    from datetime import datetime
+
+    # Check if already in SDK format (from REST API or historical replay)
+    if "price" in raw and "size" in raw:
+        return Trade(**raw)
+
+    # Transform from Hyperliquid raw format
+    time_ms = raw.get("time")
+    timestamp = datetime.utcfromtimestamp(time_ms / 1000).isoformat() + "Z" if time_ms else None
+
+    # Extract maker/taker addresses from users array
+    # WebSocket trades have: users: [maker_address, taker_address]
+    users = raw.get("users", [])
+    maker_address = users[0] if len(users) > 0 else None
+    taker_address = users[1] if len(users) > 1 else None
+
+    return Trade(
+        coin=raw.get("coin", coin),
+        side=raw.get("side", "B"),
+        price=str(raw.get("px", "0")),
+        size=str(raw.get("sz", "0")),
+        timestamp=timestamp,
+        tx_hash=raw.get("hash"),
+        trade_id=raw.get("tid"),
+        maker_address=maker_address,
+        taker_address=taker_address,
+        # user_address is for fill-level data (REST API), not market-level WebSocket trades
+        user_address=raw.get("user_address"),
+    )
+
+
+def _transform_trades(coin: str, raw_data: list) -> list[Trade]:
+    """Transform a list of raw trades to SDK Trade types."""
+    if not isinstance(raw_data, list):
+        return [_transform_trade(coin, raw_data)]
+    return [_transform_trade(coin, t) for t in raw_data]
+
+
 def _transform_orderbook(coin: str, raw: dict) -> OrderBook:
     """Transform raw Hyperliquid orderbook format to SDK OrderBook type.
 
@@ -642,7 +686,8 @@ class OxArchiveWs:
                     self._on_orderbook(coin, orderbook)
 
                 elif channel == "trades" and self._on_trades:
-                    trades = [Trade(**t) for t in raw_data]
+                    # Transform raw Hyperliquid format to SDK Trade type
+                    trades = _transform_trades(coin, raw_data)
                     self._on_trades(coin, trades)
 
             # Replay messages (Option B)

{oxarchive-0.3.1.dist-info → oxarchive-0.3.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: oxarchive
-Version: 0.3.1
+Version: 0.3.3
 Summary: Official Python SDK for 0xarchive - Hyperliquid Historical Data API
 Project-URL: Homepage, https://0xarchive.io
 Project-URL: Documentation, https://0xarchive.io/docs/sdks
@@ -28,6 +28,7 @@ Requires-Dist: websockets>=12.0; extra == 'all'
 Provides-Extra: dev
 Requires-Dist: mypy>=1.9.0; extra == 'dev'
 Requires-Dist: pytest-asyncio>=0.23.0; extra == 'dev'
+Requires-Dist: pytest-cov>=4.0.0; extra == 'dev'
 Requires-Dist: pytest>=8.0.0; extra == 'dev'
 Requires-Dist: ruff>=0.4.0; extra == 'dev'
 Provides-Extra: websocket

{oxarchive-0.3.1.dist-info → oxarchive-0.3.3.dist-info}/RECORD

@@ -1,14 +1,14 @@
-oxarchive/__init__.py,sha256=QqBnxRIGEBXE2wHdmynznUEBoJsePN_xObo_v79lPZI,2181
+oxarchive/__init__.py,sha256=9mUMJPsr1Yi--7G8ivg-_d8iWGmiynTNZXn3L-VgvKY,2181
 oxarchive/client.py,sha256=3P0fvOcyM5BWppkVV4054NduDHKvRg-cWeluoGymmRk,3163
-oxarchive/http.py,sha256=LJgw488_nNb14ixRoDv5ChuhUvyzTGtQ4aTSdEEwXww,3577
-oxarchive/types.py,sha256=8PD5LV5YSx-FdrPehvqALCLykfjdDmxNfqo_vPB3JkY,10686
-oxarchive/websocket.py,sha256=BM6CmUbRdYptNnlicmAVPKBdqlyZBSI1l5iUt_OzWwo,25126
+oxarchive/http.py,sha256=SY_o9Ag8ADo1HI3i3uAKW1xwkYjPE75gRAjnMsddAGs,4211
+oxarchive/types.py,sha256=bd08H1oS2SNAcb1zsiw8P9qgqYa2eFdc9Ue_MUMffz8,11034
+oxarchive/websocket.py,sha256=hodeRIfY3sHrdD1DMexInnDvLXTtUzyXOrRM37Iyark,26941
 oxarchive/resources/__init__.py,sha256=WQ4GYQ8p3L0D2Isk4IV4h1DRpvyZlt6tOF1t_CJr6ls,385
 oxarchive/resources/funding.py,sha256=TXkZxodVQTVcVbzNG6SpMQAzf8AkLm2NYZJxnP4MNXw,3500
 oxarchive/resources/instruments.py,sha256=flD1sH6x3P3CTqV1ZwkfwbranVacmhsHn5Dhr7lGQhM,1606
 oxarchive/resources/openinterest.py,sha256=h13yLA72LpfryUf8IqF6W7uE4ObYY2Qbc-auv4LtPqc,3552
 oxarchive/resources/orderbook.py,sha256=o_DTdpzKrZvHL9YXm8cGGUugPM8uUa6r9O_72r1ByV0,4557
 oxarchive/resources/trades.py,sha256=XCi2rXA2hxaTt0KNlWw8f7W0hzAvNWyT7DaivMz_rHw,10012
-oxarchive-0.3.1.dist-info/METADATA,sha256=rMdddr7UhWAF5XjykaItJ7o9KG2-Hh9lADtMtqepBFM,8749
-oxarchive-0.3.1.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-oxarchive-0.3.1.dist-info/RECORD,,
+oxarchive-0.3.3.dist-info/METADATA,sha256=la3_AkxO_R3b5sP9EQbgaFAt4R5vRMmV_UtkwwEXhUQ,8798
+oxarchive-0.3.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+oxarchive-0.3.3.dist-info/RECORD,,