pybinbot 2.1.0__tar.gz → 2.1.1__tar.gz

{pybinbot-2.1.0/pybinbot.egg-info → pybinbot-2.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybinbot
-Version: 2.1.0
+Version: 2.1.1
 Summary: Utility functions for the binbot project.
 Author-email: Carlos Wu <carkodw@gmail.com>
 Requires-Python: >=3.15
@@ -11,7 +11,7 @@ Requires-Dist: numpy==2.5.4
 Requires-Dist: pandas==3.1.1
 Requires-Dist: pandas-stubs==3.1.0.261029
 Requires-Dist: requests>=2.32.5
-Requires-Dist: kucoin-universal-sdk>=1.3.0
+Requires-Dist: kucoin-universal-sdk>=1.3.2
 Requires-Dist: aiohttp<3.15,>=3.14.1
 Requires-Dist: websocket-client>=1.9.0
 Requires-Dist: python-dotenv>=1.2.1

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot/__init__.py

@@ -38,6 +38,7 @@ from pybinbot.shared.enums import (
     BinanceOrderModel,
     CloseConditions,
     DealType,
+    EntryMode,
     ExchangeId,
     KucoinKlineIntervals,
     MarketDominance,
@@ -282,6 +283,7 @@ __all__ = [
     # enums
     "CloseConditions",
     "DealType",
+    "EntryMode",
     "BinanceOrderModel",
     "Status",
     "Position",

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot/models/bot_base.py

@@ -1,11 +1,12 @@
 from typing import Literal
 from uuid import UUID
 
-from pydantic import BaseModel, Field, field_validator, model_validator
+from pydantic import BaseModel, Field, ValidationInfo, field_validator, model_validator
 
 from pybinbot.shared.enums import (
     BinanceKlineIntervals,
     CloseConditions,
+    EntryMode,
     MarketType,
     Position,
     QuoteAssets,
@@ -46,6 +47,14 @@ class BotBase(BaseModel):
     )
     created_at: float = Field(default_factory=timestamp)
     updated_at: float = Field(default_factory=timestamp)
+    entry_mode: EntryMode = Field(default=EntryMode.immediate, validate_default=True)
+    entry_price: float | None = Field(default=None, ge=0, allow_inf_nan=False)
+    entry_expires_at: float = Field(
+        default_factory=lambda data: data["created_at"] + 6 * 60 * 60 * 1000,
+        gt=0,
+        allow_inf_nan=False,
+        description="Absolute entry deadline in Unix milliseconds; defaults to creation + 6 hours",
+    )
     dynamic_trailing: bool = Field(default=False)
     dynamic_position_sizing: bool = Field(default=False)
     logs: list = Field(default=[])
@@ -104,6 +113,27 @@ class BotBase(BaseModel):
         },
     }
 
+    @field_validator("entry_mode", mode="before")
+    @classmethod
+    def default_entry_mode(cls, value):
+        return EntryMode.immediate if value is None else value
+
+    @field_validator("entry_expires_at", mode="before")
+    @classmethod
+    def default_entry_expiry(cls, value, info: ValidationInfo):
+        return info.data["created_at"] + 6 * 60 * 60 * 1000 if value is None else value
+
+    @model_validator(mode="after")
+    def validate_conditional_entry(self):
+        if self.entry_mode == EntryMode.conditional_limit:
+            if self.entry_price is None or self.entry_price <= 0:
+                raise ValueError(
+                    "Conditional limit entry requires a positive entry_price"
+                )
+            if self.market_type != MarketType.FUTURES:
+                raise ValueError("Conditional limit entry currently requires futures")
+        return self
+
     @model_validator(mode="after")
     def validate_dynamic_position_sizing(self):
         if self.dynamic_position_sizing:

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot/shared/enums.py

@@ -60,6 +60,11 @@ class Status(str, Enum):
     error = "error"
 
 
+class EntryMode(str, Enum):
+    immediate = "immediate"
+    conditional_limit = "conditional_limit"
+
+
 class Position(str, Enum):
     long = "long"
     short = "short"

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot/streaming/binance/socket_manager.py

@@ -1,7 +1,7 @@
 import json
 import logging
-import threading
 import time
+from threading import Thread
 
 from websocket import (
     ABNF,
@@ -11,7 +11,7 @@ from websocket import (
 )
 
 
-class BinanceSocketManager(threading.Thread):
+class BinanceSocketManager(Thread):
     def __init__(
         self,
         stream_url,
@@ -23,7 +23,7 @@ class BinanceSocketManager(threading.Thread):
         on_pong=None,
         logger=None,
     ):
-        threading.Thread.__init__(self)
+        Thread.__init__(self)
         if not logger:
             logger = logging.getLogger(__name__)
         self.logger = logger

{pybinbot-2.1.0 → pybinbot-2.1.1/pybinbot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pybinbot
-Version: 2.1.0
+Version: 2.1.1
 Summary: Utility functions for the binbot project.
 Author-email: Carlos Wu <carkodw@gmail.com>
 Requires-Python: >=3.15
@@ -11,7 +11,7 @@ Requires-Dist: numpy==2.5.4
 Requires-Dist: pandas==3.1.1
 Requires-Dist: pandas-stubs==3.1.0.261029
 Requires-Dist: requests>=2.32.5
-Requires-Dist: kucoin-universal-sdk>=1.3.0
+Requires-Dist: kucoin-universal-sdk>=1.3.2
 Requires-Dist: aiohttp<3.15,>=3.14.1
 Requires-Dist: websocket-client>=1.9.0
 Requires-Dist: python-dotenv>=1.2.1

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot.egg-info/SOURCES.txt

@@ -57,6 +57,7 @@ tests/test_bot_futures_leverage.py
 tests/test_breadth.py
 tests/test_candles.py
 tests/test_coingecko.py
+tests/test_conditional_entry.py
 tests/test_conditional_futures_orders.py
 tests/test_deal_model.py
 tests/test_derivatives_api.py

{pybinbot-2.1.0 → pybinbot-2.1.1}/pybinbot.egg-info/requires.txt

@@ -3,7 +3,7 @@ numpy==2.5.4
 pandas==3.1.1
 pandas-stubs==3.1.0.261029
 requests>=2.32.5
-kucoin-universal-sdk>=1.3.0
+kucoin-universal-sdk>=1.3.2
 aiohttp<3.15,>=3.14.1
 websocket-client>=1.9.0
 python-dotenv>=1.2.1

{pybinbot-2.1.0 → pybinbot-2.1.1}/pyproject.toml

@@ -22,7 +22,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "pybinbot"
-version = "2.1.0"
+version = "2.1.1"
 description = "Utility functions for the binbot project."
 authors = [
     { name="Carlos Wu", email="carkodw@gmail.com" }
@@ -35,7 +35,7 @@ dependencies = [
     "pandas==3.1.1",
     "pandas-stubs==3.1.0.261029",
     "requests>=2.32.5",
-    "kucoin-universal-sdk>=1.3.0",
+    "kucoin-universal-sdk>=1.3.2",
     "aiohttp>=3.14.1,<3.15",
     "websocket-client>=1.9.0",
     "python-dotenv>=1.2.1",

pybinbot-2.1.1/tests/test_conditional_entry.py

@@ -0,0 +1,45 @@
+import pytest
+from pydantic import ValidationError
+
+from pybinbot import BotBase, EntryMode, MarketType
+
+
+@pytest.mark.parametrize(
+    "overrides",
+    [{}, {"entry_mode": None, "entry_expires_at": None, "entry_price": None}],
+)
+def test_omitted_or_null_entry_fields_default_to_immediate_and_six_hours(overrides):
+    bot = BotBase(pair="XBTUSDTM", created_at=1000, **overrides)
+    assert bot.entry_mode == EntryMode.immediate
+    assert bot.entry_expires_at == 21_601_000
+    assert bot.entry_price is None
+    assert bot.model_dump(mode="json")["entry_price"] is None
+
+
+def test_conditional_entry_serializes_strings_and_preserves_deadline():
+    bot = BotBase(
+        pair="XBTUSDTM",
+        market_type=MarketType.FUTURES,
+        entry_mode="conditional_limit",
+        entry_price=100,
+        entry_expires_at=9000,
+    )
+    assert bot.model_dump(mode="json")["entry_mode"] == "conditional_limit"
+    assert bot.entry_expires_at == 9000
+
+
+@pytest.mark.parametrize(
+    "values",
+    [
+        {"entry_mode": "unknown"},
+        {"entry_mode": "conditional_limit"},
+        {"entry_mode": "conditional_limit", "entry_price": None},
+        {"entry_mode": "conditional_limit", "entry_price": 0},
+        {"entry_mode": "conditional_limit", "entry_price": -1},
+        {"entry_mode": "conditional_limit", "entry_price": float("inf")},
+        {"entry_expires_at": float("nan")},
+    ],
+)
+def test_invalid_entry_configuration_is_rejected(values):
+    with pytest.raises(ValidationError):
+        BotBase(pair="XBTUSDTM", market_type=MarketType.FUTURES, **values)