binaryoptionstoolsv2 0.2.11__tar.gz → 0.2.12__tar.gz

{binaryoptionstoolsv2-0.2.11 → binaryoptionstoolsv2-0.2.12}/BinaryOptionsToolsV2/__init__.py

@@ -4,7 +4,13 @@ import sys
 from .config import Config as Config
 from . import tracing as tracing
 from . import validator as validator
-from .pocketoption import PocketOptionAsync, PocketOption, __all__ as __pocket_all__  # noqa: F401
+from .pocketoption import (
+    PocketOptionAsync as PocketOptionAsync,
+    PocketOption as PocketOption,
+    RawHandler as RawHandler,
+    Validator as Validator,
+    __all__ as __pocket_all__,
+)
 
 # Import the Rust module and re-export its attributes
 _rust_module = None
@@ -25,12 +31,30 @@ elif os.environ.get("PYTEST_CURRENT_TEST"):
 
 # Names expected from the Rust cdylib; only those actually loaded will be available
 _rust_exported_names = [
-    "RawPocketOption", "RawValidator", "RawHandler", "RawHandle",
-    "Logger", "LogBuilder", "PyConfig", "PyBot", "PyStrategy",
-    "PyContext", "PyVirtualMarket", "Action",
-    "StreamLogsIterator", "StreamLogsLayer", "StreamIterator",
-    "RawStreamIterator", "start_tracing",
+    "RawPocketOption",
+    "RawValidator",
+    "RawHandler",
+    "RawHandle",
+    "Logger",
+    "LogBuilder",
+    "PyConfig",
+    "PyBot",
+    "PyStrategy",
+    "PyContext",
+    "PyVirtualMarket",
+    "Action",
+    "StreamLogsIterator",
+    "StreamLogsLayer",
+    "StreamIterator",
+    "RawStreamIterator",
+    "start_tracing",
 ]
 __rust_all__ = [n for n in _rust_exported_names if n in globals()]
 
-__all__ = list(set(__pocket_all__ + ["tracing", "validator", "PocketOptionAsync", "PocketOption"] + __rust_all__))
+__all__ = list(
+    set(
+        __pocket_all__
+        + ["tracing", "validator", "PocketOptionAsync", "PocketOption", "RawHandler", "Validator"]
+        + __rust_all__
+    )
+)

{binaryoptionstoolsv2-0.2.11 → binaryoptionstoolsv2-0.2.12}/BinaryOptionsToolsV2/pocketoption/__init__.py

@@ -7,13 +7,15 @@ as well as specific classes for Pocket Option trading.
 
 __all__ = [
     "asynchronous",
-    "synchronous",
+    "login",
+    "login_async",
     "PocketOptionAsync",
     "PocketOption",
     "RawHandler",
     "RawHandlerSync",
+    "Validator",
 ]
-
-from . import asynchronous, synchronous
-from .asynchronous import PocketOptionAsync, RawHandler
+from .tools.login import login, login_async
+from . import asynchronous, synchronous as synchronous
+from .asynchronous import PocketOptionAsync, RawHandler, Validator
 from .synchronous import PocketOption, RawHandlerSync

{binaryoptionstoolsv2-0.2.11 → binaryoptionstoolsv2-0.2.12}/BinaryOptionsToolsV2/pocketoption/asynchronous.py

@@ -191,7 +191,7 @@ def sanitize_and_validate_ssid(ssid: str, logger: "Logger") -> str:
             warnings_list.append(f"missing required field '{field}'")
 
     session = auth_data.get("session", "")
-    if session and not re.match(r'^[a-zA-Z0-9_\-]{10,}$', str(session)):
+    if session and not re.match(r"^[a-zA-Z0-9_\-]{10,}$", str(session)):
         warnings_list.append(f"session token has unexpected format (length={len(str(session))})")
 
     uid = auth_data.get("uid")
@@ -219,7 +219,8 @@ def sanitize_and_validate_ssid(ssid: str, logger: "Logger") -> str:
         raise ValueError(
             "Invalid SSID: " + "; ".join(critical) + ". "
             "The SSID payload must contain 'session' and 'uid' fields. "
-            "Ensure your SSID follows the format: 42['auth',{{'session':'...','uid':123,...}}]")
+            "Ensure your SSID follows the format: 42['auth',{{'session':'...','uid':123,...}}]"
+        )
 
     return ssid
 
@@ -462,8 +463,8 @@ class PocketOptionAsync:
 
         Args:
             asset (str): Trading asset (e.g., "EURUSD_otc")
-            timeframe (int): Candle timeframe in seconds (e.g., 60 for 1-minute candles)
             period (int): Historical period in seconds to fetch
+            offset (int): Candle timeframe in seconds (e.g., 60 for 1-minute candles)
 
         Returns:
             List[Dict]: List of candles, each containing:
@@ -486,8 +487,8 @@ class PocketOptionAsync:
 
         Args:
             asset (str): Trading asset (e.g., "EURUSD_otc")
-            timeframe (int): Candle timeframe in seconds (e.g., 60 for 1-minute candles)
             period (int): Historical period in seconds to fetch
+            offset (int): Candle timeframe in seconds (e.g., 60 for 1-minute candles)
             time (int): Time to fetch candles from
 
         Returns:
@@ -589,7 +590,7 @@ class PocketOptionAsync:
         if deal_json is None:
             return None
         return json.loads(deal_json)
-    
+
     async def open_pending_order(
         self,
         open_type: int,
@@ -608,7 +609,7 @@ class PocketOptionAsync:
             open_type (int): The type of the pending order.
             amount (float): The amount to trade.
             asset (str): The asset symbol (e.g., "EURUSD_otc").
-            open_time (int | str): The server time to open the trade. 
+            open_time (int | str): The server time to open the trade.
                 Can be a Unix timestamp (int) or a formatted string "YYYY-MM-DD HH:MM:SS".
             open_price (float): The price to open the trade at.
             timeframe (int): The duration of the trade in seconds.
@@ -641,13 +642,14 @@ class PocketOptionAsync:
                         # We can't easily convert "YYYY-MM-DD" to timestamp without more info,
                         # but for the sake of not crashing, we'll try to parse it or use 0.
                         from datetime import datetime
+
                         try:
                             # PocketOption strings are usually UTC
-                            dt = datetime.strptime(open_time, '%Y-%m-%d %H:%M:%S')
+                            dt = datetime.strptime(open_time, "%Y-%m-%d %H:%M:%S")
                             actual_open_time = int(dt.timestamp())
                         except Exception:
                             actual_open_time = 0
-                
+
                 # Retry with converted integer
                 order = await self.client.open_pending_order(
                     open_type, amount, asset, actual_open_time, open_price, timeframe, min_payout, command
@@ -789,7 +791,6 @@ class PocketOptionAsync:
             return None
         return json.loads(deal_json)
 
-
     async def clear_closed_deals(self) -> None:
         """Removes all closed deals from the client's memory.
 
@@ -1520,6 +1521,3 @@ class PocketOptionAsync:
             async context manager or when it is garbage collected.
         """
         return await self.client.create_raw_iterator(message, validator.raw_validator, timeout)
-
-
-