pmxt 1.5.6__py3-none-any.whl → 1.6.0__py3-none-any.whl

pmxt/__init__.py

@@ -33,7 +33,23 @@ from .models import (
     CreateOrderParams,
 )
 
-__version__ = "1.5.6"
+
+# Global server management functions
+_default_manager = ServerManager()
+
+def stop_server():
+    """
+    Stop the background PMXT sidecar server.
+    """
+    _default_manager.stop()
+
+def restart_server():
+    """
+    Restart the background PMXT sidecar server.
+    """
+    _default_manager.restart()
+
+__version__ = "1.6.0"
 __all__ = [
     # Exchanges
     "Polymarket",
@@ -42,6 +58,8 @@ __all__ = [
     "Exchange",
     # Server Management
     "ServerManager",
+    "stop_server",
+    "restart_server",
     # Data Models
     "UnifiedMarket",
     "MarketOutcome",

pmxt/_server/server/bundled.js

@@ -24494,6 +24494,227 @@ var require_BaseExchange = __commonJS({
         return (0, math_1.getExecutionPriceDetailed)(orderBook, side, amount);
       }
       // ----------------------------------------------------------------------------
+      // Filtering Methods
+      // ----------------------------------------------------------------------------
+      /**
+       * Filter markets based on criteria or custom function.
+       *
+       * @param markets - Array of markets to filter
+       * @param criteria - Filter criteria object, string (simple text search), or predicate function
+       * @returns Filtered array of markets
+       *
+       * @example Simple text search
+       * api.filterMarkets(markets, 'Trump')
+       *
+       * @example Advanced filtering
+       * api.filterMarkets(markets, {
+       *   text: 'Trump',
+       *   searchIn: ['title', 'tags'],
+       *   volume24h: { min: 10000 },
+       *   category: 'Politics',
+       *   price: { outcome: 'yes', max: 0.5 }
+       * })
+       *
+       * @example Custom predicate
+       * api.filterMarkets(markets, m => m.liquidity > 5000 && m.yes?.price < 0.3)
+       */
+      filterMarkets(markets, criteria) {
+        if (typeof criteria === "function") {
+          return markets.filter(criteria);
+        }
+        if (typeof criteria === "string") {
+          const lowerQuery = criteria.toLowerCase();
+          return markets.filter((m) => m.title.toLowerCase().includes(lowerQuery));
+        }
+        return markets.filter((market) => {
+          if (criteria.text) {
+            const lowerQuery = criteria.text.toLowerCase();
+            const searchIn = criteria.searchIn || ["title"];
+            let textMatch = false;
+            for (const field of searchIn) {
+              if (field === "title" && market.title?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "description" && market.description?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "category" && market.category?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "tags" && market.tags?.some((tag) => tag.toLowerCase().includes(lowerQuery))) {
+                textMatch = true;
+                break;
+              }
+              if (field === "outcomes" && market.outcomes?.some((o) => o.label.toLowerCase().includes(lowerQuery))) {
+                textMatch = true;
+                break;
+              }
+            }
+            if (!textMatch)
+              return false;
+          }
+          if (criteria.category && market.category !== criteria.category) {
+            return false;
+          }
+          if (criteria.tags && criteria.tags.length > 0) {
+            const hasMatchingTag = criteria.tags.some((tag) => market.tags?.some((marketTag) => marketTag.toLowerCase() === tag.toLowerCase()));
+            if (!hasMatchingTag)
+              return false;
+          }
+          if (criteria.volume24h) {
+            if (criteria.volume24h.min !== void 0 && market.volume24h < criteria.volume24h.min) {
+              return false;
+            }
+            if (criteria.volume24h.max !== void 0 && market.volume24h > criteria.volume24h.max) {
+              return false;
+            }
+          }
+          if (criteria.volume) {
+            if (criteria.volume.min !== void 0 && (market.volume || 0) < criteria.volume.min) {
+              return false;
+            }
+            if (criteria.volume.max !== void 0 && (market.volume || 0) > criteria.volume.max) {
+              return false;
+            }
+          }
+          if (criteria.liquidity) {
+            if (criteria.liquidity.min !== void 0 && market.liquidity < criteria.liquidity.min) {
+              return false;
+            }
+            if (criteria.liquidity.max !== void 0 && market.liquidity > criteria.liquidity.max) {
+              return false;
+            }
+          }
+          if (criteria.openInterest) {
+            if (criteria.openInterest.min !== void 0 && (market.openInterest || 0) < criteria.openInterest.min) {
+              return false;
+            }
+            if (criteria.openInterest.max !== void 0 && (market.openInterest || 0) > criteria.openInterest.max) {
+              return false;
+            }
+          }
+          if (criteria.resolutionDate) {
+            const resDate = market.resolutionDate;
+            if (criteria.resolutionDate.before && resDate >= criteria.resolutionDate.before) {
+              return false;
+            }
+            if (criteria.resolutionDate.after && resDate <= criteria.resolutionDate.after) {
+              return false;
+            }
+          }
+          if (criteria.price) {
+            const outcome = market[criteria.price.outcome];
+            if (!outcome)
+              return false;
+            if (criteria.price.min !== void 0 && outcome.price < criteria.price.min) {
+              return false;
+            }
+            if (criteria.price.max !== void 0 && outcome.price > criteria.price.max) {
+              return false;
+            }
+          }
+          if (criteria.priceChange24h) {
+            const outcome = market[criteria.priceChange24h.outcome];
+            if (!outcome || outcome.priceChange24h === void 0)
+              return false;
+            if (criteria.priceChange24h.min !== void 0 && outcome.priceChange24h < criteria.priceChange24h.min) {
+              return false;
+            }
+            if (criteria.priceChange24h.max !== void 0 && outcome.priceChange24h > criteria.priceChange24h.max) {
+              return false;
+            }
+          }
+          return true;
+        });
+      }
+      /**
+       * Filter events based on criteria or custom function.
+       *
+       * @param events - Array of events to filter
+       * @param criteria - Filter criteria object, string (simple text search), or predicate function
+       * @returns Filtered array of events
+       *
+       * @example Simple text search
+       * api.filterEvents(events, 'Trump')
+       *
+       * @example Advanced filtering
+       * api.filterEvents(events, {
+       *   text: 'Election',
+       *   searchIn: ['title', 'tags'],
+       *   category: 'Politics',
+       *   marketCount: { min: 5 }
+       * })
+       *
+       * @example Custom predicate
+       * api.filterEvents(events, e => e.markets.length > 10)
+       */
+      filterEvents(events, criteria) {
+        if (typeof criteria === "function") {
+          return events.filter(criteria);
+        }
+        if (typeof criteria === "string") {
+          const lowerQuery = criteria.toLowerCase();
+          return events.filter((e) => e.title.toLowerCase().includes(lowerQuery));
+        }
+        return events.filter((event) => {
+          if (criteria.text) {
+            const lowerQuery = criteria.text.toLowerCase();
+            const searchIn = criteria.searchIn || ["title"];
+            let textMatch = false;
+            for (const field of searchIn) {
+              if (field === "title" && event.title?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "description" && event.description?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "category" && event.category?.toLowerCase().includes(lowerQuery)) {
+                textMatch = true;
+                break;
+              }
+              if (field === "tags" && event.tags?.some((tag) => tag.toLowerCase().includes(lowerQuery))) {
+                textMatch = true;
+                break;
+              }
+            }
+            if (!textMatch)
+              return false;
+          }
+          if (criteria.category && event.category !== criteria.category) {
+            return false;
+          }
+          if (criteria.tags && criteria.tags.length > 0) {
+            const hasMatchingTag = criteria.tags.some((tag) => event.tags?.some((eventTag) => eventTag.toLowerCase() === tag.toLowerCase()));
+            if (!hasMatchingTag)
+              return false;
+          }
+          if (criteria.marketCount) {
+            const count = event.markets.length;
+            if (criteria.marketCount.min !== void 0 && count < criteria.marketCount.min) {
+              return false;
+            }
+            if (criteria.marketCount.max !== void 0 && count > criteria.marketCount.max) {
+              return false;
+            }
+          }
+          if (criteria.totalVolume) {
+            const totalVolume = event.markets.reduce((sum, m) => sum + m.volume24h, 0);
+            if (criteria.totalVolume.min !== void 0 && totalVolume < criteria.totalVolume.min) {
+              return false;
+            }
+            if (criteria.totalVolume.max !== void 0 && totalVolume > criteria.totalVolume.max) {
+              return false;
+            }
+          }
+          return true;
+        });
+      }
+      // ----------------------------------------------------------------------------
       // WebSocket Streaming Methods
       // ----------------------------------------------------------------------------
       /**
@@ -38170,9 +38391,11 @@ var require_utils4 = __commonJS({
           if (index === 0 || label.toLowerCase() === "yes" || candidateName && label === candidateName) {
             priceChange = Number(market.oneDayPriceChange || 0);
           }
+          const outcomeIdValue = clobTokenIds[index] || String(index);
           outcomes.push({
-            id: clobTokenIds[index] || String(index),
+            id: outcomeIdValue,
             // Use CLOB Token ID as the primary ID
+            outcomeId: outcomeIdValue,
             label: outcomeLabel,
             price: parseFloat(rawPrice) || 0,
             priceChange24h: priceChange,
@@ -38185,6 +38408,7 @@ var require_utils4 = __commonJS({
       }
       const um = {
         id: market.id,
+        marketId: market.id,
         title: market.question ? `${event.title} - ${market.question}` : event.title,
         description: market.description || event.description,
         outcomes,
@@ -38421,6 +38645,26 @@ var require_getMarketsBySlug = __commonJS({
   }
 });
 
+// dist/utils/validation.js
+var require_validation = __commonJS({
+  "dist/utils/validation.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.validateOutcomeId = validateOutcomeId;
+    exports2.validateIdFormat = validateIdFormat;
+    function validateOutcomeId(id, context) {
+      if (id.length < 10 && /^\d+$/.test(id)) {
+        throw new Error(`Invalid ID for ${context}: "${id}". This appears to be a market ID (deprecated: market.id, use: market.marketId). Please use outcome ID (preferred: outcome.outcomeId, deprecated: outcome.id).`);
+      }
+    }
+    function validateIdFormat(id, context) {
+      if (!id || id.trim().length === 0) {
+        throw new Error(`Invalid ID for ${context}: ID cannot be empty`);
+      }
+    }
+  }
+});
+
 // dist/exchanges/polymarket/fetchOHLCV.js
 var require_fetchOHLCV = __commonJS({
   "dist/exchanges/polymarket/fetchOHLCV.js"(exports2) {
@@ -38432,10 +38676,10 @@ var require_fetchOHLCV = __commonJS({
     exports2.fetchOHLCV = fetchOHLCV;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils4();
+    var validation_1 = require_validation();
     async function fetchOHLCV(id, params) {
-      if (id.length < 10 && /^\d+$/.test(id)) {
-        throw new Error(`Invalid ID for Polymarket history: "${id}". You provided a Market ID, but Polymarket's CLOB API requires a Token ID. Ensure you are using 'outcome.id'.`);
-      }
+      (0, validation_1.validateIdFormat)(id, "OHLCV");
+      (0, validation_1.validateOutcomeId)(id, "OHLCV");
       try {
         const fidelity = (0, utils_1.mapIntervalToFidelity)(params.resolution);
         const nowTs = Math.floor(Date.now() / 1e3);
@@ -38519,7 +38763,10 @@ var require_fetchOrderBook = __commonJS({
     exports2.fetchOrderBook = fetchOrderBook;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils4();
+    var validation_1 = require_validation();
     async function fetchOrderBook(id) {
+      (0, validation_1.validateIdFormat)(id, "OrderBook");
+      (0, validation_1.validateOutcomeId)(id, "OrderBook");
       try {
         const response = await axios_1.default.get(`${utils_1.CLOB_API_URL}/book`, {
           params: { token_id: id }
@@ -38557,10 +38804,10 @@ var require_fetchTrades = __commonJS({
     exports2.fetchTrades = fetchTrades;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils4();
+    var validation_1 = require_validation();
     async function fetchTrades(id, params) {
-      if (id.length < 10 && /^\d+$/.test(id)) {
-        throw new Error(`Invalid ID for Polymarket trades: "${id}". You provided a Market ID, but Polymarket's CLOB API requires a Token ID.`);
-      }
+      (0, validation_1.validateIdFormat)(id, "Trades");
+      (0, validation_1.validateOutcomeId)(id, "Trades");
       try {
         const queryParams = {
           asset_id: id
@@ -76055,7 +76302,7 @@ var require_permessage_deflate = __commonJS({
 });
 
 // ../node_modules/ws/lib/validation.js
-var require_validation = __commonJS({
+var require_validation2 = __commonJS({
   "../node_modules/ws/lib/validation.js"(exports2, module2) {
     "use strict";
     var { isUtf8 } = require("buffer");
@@ -76268,7 +76515,7 @@ var require_receiver = __commonJS({
       kWebSocket
     } = require_constants();
     var { concat: concat2, toArrayBuffer, unmask } = require_buffer_util();
-    var { isValidStatusCode, isValidUTF8 } = require_validation();
+    var { isValidStatusCode, isValidUTF8 } = require_validation2();
     var FastBuffer = Buffer[Symbol.species];
     var GET_INFO = 0;
     var GET_PAYLOAD_LENGTH_16 = 1;
@@ -76855,7 +77102,7 @@ var require_sender = __commonJS({
     var { randomFillSync } = require("crypto");
     var PerMessageDeflate = require_permessage_deflate();
     var { EMPTY_BUFFER, kWebSocket, NOOP } = require_constants();
-    var { isBlob: isBlob2, isValidStatusCode } = require_validation();
+    var { isBlob: isBlob2, isValidStatusCode } = require_validation2();
     var { mask: applyMask, toBuffer } = require_buffer_util();
     var kByteLength = Symbol("kByteLength");
     var maskBuffer = Buffer.alloc(4);
@@ -77568,7 +77815,7 @@ var require_event_target = __commonJS({
 var require_extension = __commonJS({
   "../node_modules/ws/lib/extension.js"(exports2, module2) {
     "use strict";
-    var { tokenChars } = require_validation();
+    var { tokenChars } = require_validation2();
     function push(dest, name, elem) {
       if (dest[name] === void 0) dest[name] = [elem];
       else dest[name].push(elem);
@@ -77732,7 +77979,7 @@ var require_websocket = __commonJS({
     var PerMessageDeflate = require_permessage_deflate();
     var Receiver = require_receiver();
     var Sender = require_sender();
-    var { isBlob: isBlob2 } = require_validation();
+    var { isBlob: isBlob2 } = require_validation2();
     var {
       BINARY_TYPES,
       EMPTY_BUFFER,
@@ -78701,7 +78948,7 @@ var require_stream = __commonJS({
 var require_subprotocol = __commonJS({
   "../node_modules/ws/lib/subprotocol.js"(exports2, module2) {
     "use strict";
-    var { tokenChars } = require_validation();
+    var { tokenChars } = require_validation2();
     function parse(header) {
       const protocols = /* @__PURE__ */ new Set();
       let start = -1;
@@ -83892,7 +84139,7 @@ var require_permessage_deflate2 = __commonJS({
 });
 
 // ../node_modules/@nevuamarkets/poly-websockets/node_modules/ws/lib/validation.js
-var require_validation2 = __commonJS({
+var require_validation3 = __commonJS({
   "../node_modules/@nevuamarkets/poly-websockets/node_modules/ws/lib/validation.js"(exports2, module2) {
     "use strict";
     var { isUtf8 } = require("buffer");
@@ -84105,7 +84352,7 @@ var require_receiver2 = __commonJS({
       kWebSocket
     } = require_constants2();
     var { concat: concat2, toArrayBuffer, unmask } = require_buffer_util2();
-    var { isValidStatusCode, isValidUTF8 } = require_validation2();
+    var { isValidStatusCode, isValidUTF8 } = require_validation3();
     var FastBuffer = Buffer[Symbol.species];
     var GET_INFO = 0;
     var GET_PAYLOAD_LENGTH_16 = 1;
@@ -84692,7 +84939,7 @@ var require_sender2 = __commonJS({
     var { randomFillSync } = require("crypto");
     var PerMessageDeflate = require_permessage_deflate2();
     var { EMPTY_BUFFER, kWebSocket, NOOP } = require_constants2();
-    var { isBlob: isBlob2, isValidStatusCode } = require_validation2();
+    var { isBlob: isBlob2, isValidStatusCode } = require_validation3();
     var { mask: applyMask, toBuffer } = require_buffer_util2();
     var kByteLength = Symbol("kByteLength");
     var maskBuffer = Buffer.alloc(4);
@@ -85405,7 +85652,7 @@ var require_event_target2 = __commonJS({
 var require_extension2 = __commonJS({
   "../node_modules/@nevuamarkets/poly-websockets/node_modules/ws/lib/extension.js"(exports2, module2) {
     "use strict";
-    var { tokenChars } = require_validation2();
+    var { tokenChars } = require_validation3();
     function push(dest, name, elem) {
       if (dest[name] === void 0) dest[name] = [elem];
       else dest[name].push(elem);
@@ -85569,7 +85816,7 @@ var require_websocket2 = __commonJS({
     var PerMessageDeflate = require_permessage_deflate2();
     var Receiver = require_receiver2();
     var Sender = require_sender2();
-    var { isBlob: isBlob2 } = require_validation2();
+    var { isBlob: isBlob2 } = require_validation3();
     var {
       BINARY_TYPES,
       CLOSE_TIMEOUT,
@@ -86542,7 +86789,7 @@ var require_stream2 = __commonJS({
 var require_subprotocol2 = __commonJS({
   "../node_modules/@nevuamarkets/poly-websockets/node_modules/ws/lib/subprotocol.js"(exports2, module2) {
     "use strict";
-    var { tokenChars } = require_validation2();
+    var { tokenChars } = require_validation3();
     function parse(header) {
       const protocols = /* @__PURE__ */ new Set();
       let start = -1;
@@ -104956,13 +105203,16 @@ var require_polymarket = __commonJS({
           }
         }
         try {
-          const response = await client.createAndPostOrder({
+          const orderArgs = {
             tokenID: params.outcomeId,
             price,
             side,
-            size: params.amount,
-            feeRateBps: 0
-          }, {
+            size: params.amount
+          };
+          if (params.fee !== void 0 && params.fee !== null) {
+            orderArgs.feeRateBps = params.fee;
+          }
+          const response = await client.createAndPostOrder(orderArgs, {
             tickSize
           });
           if (!response || !response.success) {
@@ -104979,6 +105229,7 @@ var require_polymarket = __commonJS({
             status: "open",
             filled: 0,
             remaining: params.amount,
+            fee: params.fee,
             timestamp: Date.now()
           };
         } catch (error) {
@@ -105188,8 +105439,10 @@ var require_utils10 = __commonJS({
         const tokenEntries = Object.entries(market.tokens);
         tokenEntries.forEach(([label, tokenId], index) => {
           const outcomePrice = market.prices[index] || 0;
+          const outcomeIdValue = tokenId;
           outcomes.push({
-            id: tokenId,
+            id: outcomeIdValue,
+            outcomeId: outcomeIdValue,
             label: label.charAt(0).toUpperCase() + label.slice(1),
             // Capitalize 'yes'/'no'
             price: outcomePrice,
@@ -105203,6 +105456,7 @@ var require_utils10 = __commonJS({
       }
       const um = {
         id: market.slug,
+        marketId: market.slug,
         title: market.title || market.question,
         description: market.description,
         outcomes,
@@ -105411,7 +105665,9 @@ var require_fetchOHLCV2 = __commonJS({
     exports2.fetchOHLCV = fetchOHLCV;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils10();
+    var validation_1 = require_validation();
     async function fetchOHLCV(id, params) {
+      (0, validation_1.validateIdFormat)(id, "OHLCV");
       try {
         const fidelity = (0, utils_1.mapIntervalToFidelity)(params.resolution);
         const url2 = `${utils_1.LIMITLESS_API_URL}/markets/${id}/historical-price`;
@@ -105462,7 +105718,9 @@ var require_fetchOrderBook2 = __commonJS({
     exports2.fetchOrderBook = fetchOrderBook;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils10();
+    var validation_1 = require_validation();
     async function fetchOrderBook(id) {
+      (0, validation_1.validateIdFormat)(id, "OrderBook");
       try {
         const url2 = `${utils_1.LIMITLESS_API_URL}/markets/${id}/orderbook`;
         const response = await axios_1.default.get(url2);
@@ -106088,6 +106346,7 @@ var require_utils11 = __commonJS({
         {
           id: market.ticker,
           // The actual market ticker (primary tradeable)
+          outcomeId: market.ticker,
           label: candidateName || "Yes",
           price,
           priceChange24h: priceChange
@@ -106095,6 +106354,7 @@ var require_utils11 = __commonJS({
         {
           id: `${market.ticker}-NO`,
           // Virtual ID for the No outcome
+          outcomeId: `${market.ticker}-NO`,
           label: candidateName ? `Not ${candidateName}` : "No",
           price: 1 - price,
           priceChange24h: -priceChange
@@ -106114,6 +106374,7 @@ var require_utils11 = __commonJS({
       }
       const um = {
         id: market.ticker,
+        marketId: market.ticker,
         title: event.title,
         description: market.rules_primary || market.rules_secondary || "",
         outcomes,
@@ -106442,7 +106703,9 @@ var require_fetchOHLCV3 = __commonJS({
     exports2.fetchOHLCV = fetchOHLCV;
     var axios_1 = __importDefault(require_axios());
     var utils_1 = require_utils11();
+    var validation_1 = require_validation();
     async function fetchOHLCV(id, params) {
+      (0, validation_1.validateIdFormat)(id, "OHLCV");
       try {
         const cleanedId = id.replace(/-NO$/, "");
         const normalizedId = cleanedId.toUpperCase();
@@ -106528,7 +106791,9 @@ var require_fetchOrderBook3 = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.fetchOrderBook = fetchOrderBook;
     var axios_1 = __importDefault(require_axios());
+    var validation_1 = require_validation();
     async function fetchOrderBook(id) {
+      (0, validation_1.validateIdFormat)(id, "OrderBook");
       try {
         const isNoOutcome = id.endsWith("-NO");
         const ticker = id.replace(/-NO$/, "");

pmxt/client.py

@@ -7,7 +7,7 @@ OpenAPI client, matching the JavaScript API exactly.
 
 import os
 import sys
-from typing import List, Optional, Dict, Any, Literal
+from typing import List, Optional, Dict, Any, Literal, Union
 from datetime import datetime
 from abc import ABC, abstractmethod
 import json
@@ -37,6 +37,10 @@ from .models import (
     HistoryFilterParams,
     CreateOrderParams,
     ExecutionPriceResult,
+    MarketFilterCriteria,
+    MarketFilterFunction,
+    EventFilterCriteria,
+    EventFilterFunction,
 )
 from .server_manager import ServerManager
 
@@ -432,7 +436,223 @@ class Exchange(ABC):
             return [_convert_market(m) for m in data]
         except ApiException as e:
             raise Exception(f"Failed to get markets by slug: {e}")
-    
+
+    # ----------------------------------------------------------------------------
+    # Filtering Methods
+    # ----------------------------------------------------------------------------
+
+    def filter_markets(
+        self,
+        markets: List[UnifiedMarket],
+        criteria: Union[str, MarketFilterCriteria, MarketFilterFunction]
+    ) -> List[UnifiedMarket]:
+        """
+        Filter markets based on criteria or custom function.
+
+        Args:
+            markets: List of markets to filter
+            criteria: Filter criteria object, string (simple text search), or predicate function
+            
+        Returns:
+            Filtered list of markets
+            
+        Example:
+            >>> api.filter_markets(markets, "Trump")
+            >>> api.filter_markets(markets, {"volume_24h": {"min": 1000}})
+            >>> api.filter_markets(markets, lambda m: m.yes and m.yes.price > 0.5)
+        """
+        # Handle predicate function
+        if callable(criteria):
+            return list(filter(criteria, markets))
+
+        # Handle simple string search
+        if isinstance(criteria, str):
+            lower_query = criteria.lower()
+            return [m for m in markets if m.title and lower_query in m.title.lower()]
+
+        # Handle criteria object
+        params: MarketFilterCriteria = criteria # type: ignore
+        results = []
+        
+        for market in markets:
+            # Text search
+            if "text" in params:
+                lower_query = params["text"].lower()
+                search_in = params.get("search_in", ["title"])
+                match = False
+                
+                if "title" in search_in and market.title and lower_query in market.title.lower():
+                    match = True
+                elif "description" in search_in and market.description and lower_query in market.description.lower():
+                    match = True
+                elif "category" in search_in and market.category and lower_query in market.category.lower():
+                    match = True
+                elif "tags" in search_in and market.tags and any(lower_query in t.lower() for t in market.tags):
+                    match = True
+                elif "outcomes" in search_in and market.outcomes and any(lower_query in o.label.lower() for o in market.outcomes):
+                    match = True
+                
+                if not match:
+                    continue
+
+            # Category filter
+            if "category" in params:
+                if market.category != params["category"]:
+                    continue
+
+            # Tags filter (match ANY)
+            if "tags" in params and params["tags"]:
+                if not market.tags:
+                    continue
+                query_tags = [t.lower() for t in params["tags"]]
+                market_tags = [t.lower() for t in market.tags]
+                if not any(t in market_tags for t in query_tags):
+                    continue
+
+            # Volume 24h
+            if "volume_24h" in params:
+                f = params["volume_24h"]
+                val = market.volume_24h
+                if "min" in f and val < f["min"]: continue
+                if "max" in f and val > f["max"]: continue
+
+            # Volume
+            if "volume" in params:
+                f = params["volume"]
+                val = market.volume or 0
+                if "min" in f and val < f["min"]: continue
+                if "max" in f and val > f["max"]: continue
+
+            # Liquidity
+            if "liquidity" in params:
+                f = params["liquidity"]
+                val = market.liquidity
+                if "min" in f and val < f["min"]: continue
+                if "max" in f and val > f["max"]: continue
+            
+            # Open Interest
+            if "open_interest" in params:
+                f = params["open_interest"]
+                val = market.open_interest or 0
+                if "min" in f and val < f["min"]: continue
+                if "max" in f and val > f["max"]: continue
+
+            # Resolution Date
+            if "resolution_date" in params:
+                f = params["resolution_date"]
+                val = market.resolution_date
+                
+                if not val:
+                     continue
+                
+                # Ensure val is timezone-aware if the filter dates are, or naive if filter dates are.
+                # Assuming standard library comparison works (or both are TZ aware/naive).
+                if "before" in f and val >= f["before"]: continue
+                if "after" in f and val <= f["after"]: continue
+
+            # Price filter
+            if "price" in params:
+                f = params["price"]
+                outcome_key = f.get("outcome")
+                if outcome_key:
+                    outcome = getattr(market, outcome_key, None)
+                    if not outcome: continue
+                    if "min" in f and outcome.price < f["min"]: continue
+                    if "max" in f and outcome.price > f["max"]: continue
+
+            # Price Change 24h
+            if "price_change_24h" in params:
+                f = params["price_change_24h"]
+                outcome_key = f.get("outcome")
+                if outcome_key:
+                    outcome = getattr(market, outcome_key, None)
+                    if not outcome or outcome.price_change_24h is None: continue
+                    if "min" in f and outcome.price_change_24h < f["min"]: continue
+                    if "max" in f and outcome.price_change_24h > f["max"]: continue
+
+            results.append(market)
+            
+        return results
+
+    def filter_events(
+        self,
+        events: List[UnifiedEvent],
+        criteria: Union[str, EventFilterCriteria, EventFilterFunction]
+    ) -> List[UnifiedEvent]:
+        """
+        Filter events based on criteria or custom function.
+
+        Args:
+            events: List of events to filter
+            criteria: Filter criteria object, string, or function
+            
+        Returns:
+            Filtered list of events
+        """
+        # Handle predicate function
+        if callable(criteria):
+            return list(filter(criteria, events))
+
+        # Handle simple string search
+        if isinstance(criteria, str):
+            lower_query = criteria.lower()
+            return [e for e in events if e.title and lower_query in e.title.lower()]
+
+        # Handle criteria object
+        params: EventFilterCriteria = criteria # type: ignore
+        results = []
+
+        for event in events:
+            # Text search
+            if "text" in params:
+                lower_query = params["text"].lower()
+                search_in = params.get("search_in", ["title"])
+                match = False
+                
+                if "title" in search_in and event.title and lower_query in event.title.lower():
+                    match = True
+                elif "description" in search_in and event.description and lower_query in event.description.lower():
+                    match = True
+                elif "category" in search_in and event.category and lower_query in event.category.lower():
+                    match = True
+                elif "tags" in search_in and event.tags and any(lower_query in t.lower() for t in event.tags):
+                    match = True
+                
+                if not match:
+                    continue
+
+            # Category
+            if "category" in params:
+                if event.category != params["category"]:
+                    continue
+
+            # Tags
+            if "tags" in params and params["tags"]:
+                if not event.tags:
+                    continue
+                query_tags = [t.lower() for t in params["tags"]]
+                event_tags = [t.lower() for t in event.tags]
+                if not any(t in event_tags for t in query_tags):
+                    continue
+
+            # Market Count
+            if "market_count" in params:
+                f = params["market_count"]
+                count = len(event.markets)
+                if "min" in f and count < f["min"]: continue
+                if "max" in f and count > f["max"]: continue
+
+            # Total Volume
+            if "total_volume" in params:
+                f = params["total_volume"]
+                total_vol = sum(m.volume_24h for m in event.markets)
+                if "min" in f and total_vol < f["min"]: continue
+                if "max" in f and total_vol > f["max"]: continue
+
+            results.append(event)
+            
+        return results
+
     def fetch_ohlcv(
         self,
         outcome_id: str,
@@ -678,6 +898,8 @@ class Exchange(ABC):
             }
             if params.price is not None:
                 params_dict["price"] = params.price
+            if params.fee is not None:
+                params_dict["fee"] = params.fee
             
             request_body_dict = {"args": [params_dict]}
             

pmxt/models.py

@@ -15,6 +15,7 @@ SortOption = Literal["volume", "liquidity", "newest"]
 SearchIn = Literal["title", "description", "both"]
 OrderSide = Literal["buy", "sell"]
 OrderType = Literal["market", "limit"]
+OutcomeType = Literal["yes", "no", "up", "down"]
 
 
 @dataclass
@@ -395,3 +396,73 @@ class CreateOrderParams:
     
     price: Optional[float] = None
     """Limit price (required for limit orders, 0.0-1.0)"""
+    
+    fee: Optional[int] = None
+    """Optional fee rate (e.g., 1000 for 0.1%)"""
+
+
+# ----------------------------------------------------------------------------
+# Filtering Types
+# ----------------------------------------------------------------------------
+
+from typing import TypedDict, Callable, Union
+
+class MinMax(TypedDict, total=False):
+    """Range filter."""
+    min: float
+    max: float
+
+class DateRange(TypedDict, total=False):
+    """Date range filter."""
+    before: datetime
+    after: datetime
+
+class PriceFilter(TypedDict, total=False):
+    """Price filter."""
+    outcome: OutcomeType
+    min: float
+    max: float
+
+class MarketFilterCriteria(TypedDict, total=False):
+    """Criteria for filtering markets locally."""
+    
+    # Text search
+    text: str
+    search_in: List[Literal["title", "description", "category", "tags", "outcomes"]]
+    
+    # Numeric range filters
+    volume_24h: MinMax
+    volume: MinMax
+    liquidity: MinMax
+    open_interest: MinMax
+    
+    # Date filters
+    resolution_date: DateRange
+    
+    # Category/tag filters
+    category: str
+    tags: List[str]
+    
+    # Price filters
+    price: PriceFilter
+    price_change_24h: PriceFilter
+
+MarketFilterFunction = Callable[[UnifiedMarket], bool]
+
+class EventFilterCriteria(TypedDict, total=False):
+    """Criteria for filtering events locally."""
+    
+    # Text search
+    text: str
+    search_in: List[Literal["title", "description", "category", "tags"]]
+    
+    # Category/tag filters
+    category: str
+    tags: List[str]
+    
+    # Market metrics
+    market_count: MinMax
+    total_volume: MinMax
+
+EventFilterFunction = Callable[[UnifiedEvent], bool]
+

pmxt/server_manager.py

@@ -130,8 +130,25 @@ class ServerManager:
             
         return False
 
+    def stop(self) -> None:
+        """
+        Stop the currently running server.
+        
+        This reads the lock file to find the process ID and sends a SIGTERM.
+        """
+        self._kill_old_server()
+
+    def restart(self) -> None:
+        """
+        Restart the server.
+        
+        Stops the current server if running, and starts a fresh one.
+        """
+        self.stop()
+        self.ensure_server_running()
+
     def _kill_old_server(self) -> None:
-        """Kill the currently running server."""
+        """Kill the currently running server (Internal)."""
         server_info = self.get_server_info()
         if server_info and 'pid' in server_info:
             import signal

{pmxt-1.5.6.dist-info → pmxt-1.6.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pmxt
-Version: 1.5.6
+Version: 1.6.0
 Summary: Unified prediction market data API - The ccxt for prediction markets
 Author: PMXT Contributors
 License: MIT

{pmxt-1.5.6.dist-info → pmxt-1.6.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
-pmxt/__init__.py,sha256=L4Ry5foefYktLuO9kXI26RaKxnp9T2ZigKFjLITj00s,1178
-pmxt/client.py,sha256=Qm0gUWCM3sygaRrEVTwCE_YDv9GpA6wrFCFfoFa1PJ0,34711
-pmxt/models.py,sha256=-jiQ9mmv_qnF6mzj3DrvNgEA77tE_Pl0RCblM1VbV7o,8581
-pmxt/server_manager.py,sha256=6uS1LIZ2d5d_K-MtbMUAlCZvbvhZ_iyofKok55HEofc,11606
+pmxt/__init__.py,sha256=kbtmNd7bfDO-SNmmsJ0D11RuTWmX1gYBrJiVyTTRdgo,1520
+pmxt/client.py,sha256=lpDT0zDw1OXal_hbjcV69DidlgyyzKMmPMqvm4waNGg,43488
+pmxt/models.py,sha256=LYfbd_SEtvqI9gYnVz6wAqlijJkSODrodE7v0owbyok,10291
+pmxt/server_manager.py,sha256=kkbvQOgCBBDUbe0X4KGLZsWpuHxz3Yvb9ECDhjQxMOE,12050
 pmxt/_server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pmxt/_server/bin/pmxt-ensure-server,sha256=kXIond0UbxS52FAVQD7kHmSBaL_s6cbIyapLRr4KZJw,4544
 pmxt/_server/bin/pmxt-ensure-server.js,sha256=kXIond0UbxS52FAVQD7kHmSBaL_s6cbIyapLRr4KZJw,4544
-pmxt/_server/server/bundled.js,sha256=z3C4afJO903hHwA5FemFYu-SghMHShVoxrhjpwJH40U,4241214
-pmxt_internal/__init__.py,sha256=dAcjhk4vURY5ggLZ44vzP0NoMAsmnJwx3DQtOvCQAU4,7756
-pmxt_internal/api_client.py,sha256=mE5sbCyvcXI_MqlisZfK-MP1oIpNGZVVLycs2Yxm3aE,27889
+pmxt/_server/server/bundled.js,sha256=ZfMpYAXX5UZECbkYlvCB5mGPvhorSrkw-h4m0ZeRdEk,4251928
+pmxt_internal/__init__.py,sha256=CEpTnAT2C0rjNGAaRZbClTn4UvDWuHTe3AeC5n7AuBE,7756
+pmxt_internal/api_client.py,sha256=nNG9x5sU703c-iI5McO1R21TNLikw9sHxn5osmiSmkk,27889
 pmxt_internal/api_response.py,sha256=eMxw1mpmJcoGZ3gs9z6jM4oYoZ10Gjk333s9sKxGv7s,652
-pmxt_internal/configuration.py,sha256=TsiCWWLgYZCZx3C33QJ8cnmeCEzTXJ9jiz1gu_L3nlQ,18320
+pmxt_internal/configuration.py,sha256=QzLqWzVIo7r9XwfJKlfaHgWg7cbgNmERylbCO6Ja4b8,18320
 pmxt_internal/exceptions.py,sha256=txF8A7vlan57JS69kFPs-IZF-Qhp7IZobBTJVa4fOaM,6644
 pmxt_internal/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pmxt_internal/rest.py,sha256=FMj4yaV6XLr842u_ScWHSzQsTFdk0jaUeuWLJoRbogQ,9760
@@ -21,7 +21,7 @@ pmxt_internal/models/base_request.py,sha256=ZNipF7ycXFkQJ6j3QmB1TzA0UO3fB54AMPlA
 pmxt_internal/models/base_response.py,sha256=g-NG4Swxl3cg4-YOCPl65dUeHzOnA9S7ubTj8HOYZs0,2975
 pmxt_internal/models/cancel_order_request.py,sha256=Q_tKEneDlyD9ZsqCifr4No9coPmzUWAiSnJFH2BhL5k,3153
 pmxt_internal/models/create_order200_response.py,sha256=f4urlJUUhTCOON-alIg9Ac_q3ymHqHyP_BNtDB0pyh4,3345
-pmxt_internal/models/create_order_params.py,sha256=byTxIMNeABia2D7j0UBPnr5qWPxq-kSI-wWJzOTRGvA,3638
+pmxt_internal/models/create_order_params.py,sha256=VxrjO1OFh6bxPlQTtfJA_B79A6edOPgZ44j4HGBPdCk,3736
 pmxt_internal/models/create_order_request.py,sha256=prj6TnIFbhB8eDq-6e-MK2DtfDzAB6P-SoEEEST0cP8,3616
 pmxt_internal/models/error_detail.py,sha256=590jlnQmIgqcjUQ5ef07_nWMn7fnyjuAvkUjmSoAkMs,2605
 pmxt_internal/models/error_response.py,sha256=c5DgOpTGqx9Qoz7hYKhRPAM3UfoX4GBWkyhfxerMXEI,2979
@@ -50,7 +50,7 @@ pmxt_internal/models/get_markets_by_slug_request.py,sha256=PtjXAw6hixHuYzCvSGH1a
 pmxt_internal/models/health_check200_response.py,sha256=yR_OkIlTPztO0zFmpyWllSwyaEbI48RpumfmVVCJAyc,2758
 pmxt_internal/models/history_filter_params.py,sha256=0i9oQLwJsRWRyzPZuW467y_0ccKpc2_I6T2lgZCkHd4,3239
 pmxt_internal/models/market_filter_params.py,sha256=Jun3HbQP05HEXlht1bYCrqrlgbO0QjP6vCOKCHkZn-E,3638
-pmxt_internal/models/market_outcome.py,sha256=STS17FU7VmS7bgOfUejJqfqNs_An3NJVqPQByBKkdgI,3200
+pmxt_internal/models/market_outcome.py,sha256=W8-34Q-DQR-pVmpuAROSusu8BxwGfeUporTxh8BhKsQ,3532
 pmxt_internal/models/order.py,sha256=WniZ6JgnnhPBPyZje1wzgmsz4OjyOCIl5a-ksQFmUNM,4768
 pmxt_internal/models/order_book.py,sha256=FZQ5g81szBtpCun3vFFTDZb_xZkwUMVyEIF1ZZPzqhI,3615
 pmxt_internal/models/order_level.py,sha256=dMeuXlhBqe1kA-R1ysFjt77qJxx6ukrZHwO1y3hZ6EM,2735
@@ -62,11 +62,11 @@ pmxt_internal/models/search_markets_request.py,sha256=BARoy2GXgV7RQNIGck6UaOyQqf
 pmxt_internal/models/search_markets_request_args_inner.py,sha256=PkusFd_OxhUsItsBpluPJA11zg0sXXjbOK-lPmemvLs,5561
 pmxt_internal/models/trade.py,sha256=U6Fc18rbwILs9FmX8CSDYYL8dF6763l8QzeMQNRxQdo,3328
 pmxt_internal/models/unified_event.py,sha256=zJVokyA3_Ny9cFxI_kZaJShB_V-KMqr5rY-i6oMDXCU,3896
-pmxt_internal/models/unified_market.py,sha256=DoYhiH4HycYGlq858PEeB-CIA7haT6rxmJeYZJuulMA,5646
+pmxt_internal/models/unified_market.py,sha256=0y917aPCUNtlToDhfJWwVh3lGT-1VRFh_pDF9f3C9b8,5919
 pmxt_internal/models/watch_order_book_request.py,sha256=kavGUI-SLz2-Kam_jcJ_h0GDe0-9UkxqCmVsAi6Uios,3726
 pmxt_internal/models/watch_order_book_request_args_inner.py,sha256=ZHrjmFDGxRG5MXbuz4mUp9KFfo3XS7zuXWTyMNgi4xI,5464
 pmxt_internal/models/watch_trades_request.py,sha256=brrg8JbEe-aeg7mIe_Y2HzRPogp-IfRhkXChrxzqoLU,3722
-pmxt-1.5.6.dist-info/METADATA,sha256=o0vWlqzdF517MxC_zMVWPpbvv1-9g1VJ4_qibp-AAm8,6449
-pmxt-1.5.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-pmxt-1.5.6.dist-info/top_level.txt,sha256=J_jrcouJ-x-5lpcXMxeW0GOSi1HsBVR5_PdSfvigVrw,19
-pmxt-1.5.6.dist-info/RECORD,,
+pmxt-1.6.0.dist-info/METADATA,sha256=aglrK1EbEVfA2fdanlMDKDCmRdHd8ONF8mcUOuvf9h8,6449
+pmxt-1.6.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+pmxt-1.6.0.dist-info/top_level.txt,sha256=J_jrcouJ-x-5lpcXMxeW0GOSi1HsBVR5_PdSfvigVrw,19
+pmxt-1.6.0.dist-info/RECORD,,

pmxt_internal/__init__.py

@@ -14,7 +14,7 @@
 """  # noqa: E501
 
 
-__version__ = "1.5.6"
+__version__ = "1.6.0"
 
 # Define package exports
 __all__ = [

pmxt_internal/api_client.py

@@ -91,7 +91,7 @@ class ApiClient:
             self.default_headers[header_name] = header_value
         self.cookie = cookie
         # Set default User-Agent.
-        self.user_agent = 'OpenAPI-Generator/1.5.6/python'
+        self.user_agent = 'OpenAPI-Generator/1.6.0/python'
         self.client_side_validation = configuration.client_side_validation
 
     def __enter__(self):

pmxt_internal/configuration.py

@@ -506,7 +506,7 @@ class Configuration:
                "OS: {env}\n"\
                "Python Version: {pyversion}\n"\
                "Version of the API: 0.4.4\n"\
-               "SDK Package Version: 1.5.6".\
+               "SDK Package Version: 1.6.0".\
                format(env=sys.platform, pyversion=sys.version)
 
     def get_host_settings(self) -> List[HostSetting]:

pmxt_internal/models/create_order_params.py

@@ -32,7 +32,8 @@ class CreateOrderParams(BaseModel):
     type: StrictStr
     amount: Union[StrictFloat, StrictInt]
     price: Optional[Union[StrictFloat, StrictInt]] = None
-    __properties: ClassVar[List[str]] = ["marketId", "outcomeId", "side", "type", "amount", "price"]
+    fee: Optional[Union[StrictFloat, StrictInt]] = None
+    __properties: ClassVar[List[str]] = ["marketId", "outcomeId", "side", "type", "amount", "price", "fee"]
 
     @field_validator('side')
     def side_validate_enum(cls, value):
@@ -104,7 +105,8 @@ class CreateOrderParams(BaseModel):
             "side": obj.get("side"),
             "type": obj.get("type"),
             "amount": obj.get("amount"),
-            "price": obj.get("price")
+            "price": obj.get("price"),
+            "fee": obj.get("fee")
         })
         return _obj
 

pmxt_internal/models/market_outcome.py

@@ -26,12 +26,13 @@ class MarketOutcome(BaseModel):
     """
     MarketOutcome
     """ # noqa: E501
-    id: Optional[StrictStr] = None
+    id: Optional[StrictStr] = Field(default=None, description="DEPRECATED: Use outcomeId instead. Will be removed in v2.0")
+    outcome_id: Optional[StrictStr] = Field(default=None, description="Outcome ID for trading operations (CLOB Token ID for Polymarket, Market Ticker for Kalshi)", alias="outcomeId")
     label: Optional[StrictStr] = None
     price: Optional[Union[StrictFloat, StrictInt]] = None
     price_change24h: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, alias="priceChange24h")
     metadata: Optional[Dict[str, Any]] = Field(default=None, description="Exchange-specific metadata (e.g., clobTokenId for Polymarket)")
-    __properties: ClassVar[List[str]] = ["id", "label", "price", "priceChange24h", "metadata"]
+    __properties: ClassVar[List[str]] = ["id", "outcomeId", "label", "price", "priceChange24h", "metadata"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -85,6 +86,7 @@ class MarketOutcome(BaseModel):
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
+            "outcomeId": obj.get("outcomeId"),
             "label": obj.get("label"),
             "price": obj.get("price"),
             "priceChange24h": obj.get("priceChange24h"),

pmxt_internal/models/unified_market.py

@@ -28,7 +28,8 @@ class UnifiedMarket(BaseModel):
     """
     UnifiedMarket
     """ # noqa: E501
-    id: Optional[StrictStr] = None
+    id: Optional[StrictStr] = Field(default=None, description="DEPRECATED: Use marketId instead. Will be removed in v2.0")
+    market_id: Optional[StrictStr] = Field(default=None, description="The unique identifier for this market", alias="marketId")
     title: Optional[StrictStr] = None
     description: Optional[StrictStr] = None
     outcomes: Optional[List[MarketOutcome]] = None
@@ -45,7 +46,7 @@ class UnifiedMarket(BaseModel):
     no: Optional[MarketOutcome] = None
     up: Optional[MarketOutcome] = None
     down: Optional[MarketOutcome] = None
-    __properties: ClassVar[List[str]] = ["id", "title", "description", "outcomes", "resolutionDate", "volume24h", "volume", "liquidity", "openInterest", "url", "image", "category", "tags", "yes", "no", "up", "down"]
+    __properties: ClassVar[List[str]] = ["id", "marketId", "title", "description", "outcomes", "resolutionDate", "volume24h", "volume", "liquidity", "openInterest", "url", "image", "category", "tags", "yes", "no", "up", "down"]
 
     model_config = ConfigDict(
         populate_by_name=True,
@@ -118,6 +119,7 @@ class UnifiedMarket(BaseModel):
 
         _obj = cls.model_validate({
             "id": obj.get("id"),
+            "marketId": obj.get("marketId"),
             "title": obj.get("title"),
             "description": obj.get("description"),
             "outcomes": [MarketOutcome.from_dict(_item) for _item in obj["outcomes"]] if obj.get("outcomes") is not None else None,