pdmt5 0.0.7__tar.gz → 0.0.8__tar.gz

{pdmt5-0.0.7 → pdmt5-0.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.0.7
+Version: 0.0.8
 Summary: Pandas-based data handler for MetaTrader 5
 Project-URL: Repository, https://github.com/dceoy/pdmt5.git
 Author-email: dceoy <dceoy@users.noreply.github.com>

{pdmt5-0.0.7 → pdmt5-0.0.8}/pdmt5/__init__.py

@@ -4,7 +4,7 @@ from importlib.metadata import version
 
 from .dataframe import Mt5Config, Mt5DataClient
 from .mt5 import Mt5Client, Mt5RuntimeError
-from .trading import Mt5TradingClient
+from .trading import Mt5TradingClient, Mt5TradingError
 
 __version__ = version(__package__) if __package__ else None
 
@@ -14,4 +14,5 @@ __all__ = [
     "Mt5DataClient",
     "Mt5RuntimeError",
     "Mt5TradingClient",
+    "Mt5TradingError",
 ]

{pdmt5-0.0.7 → pdmt5-0.0.8}/pdmt5/mt5.py

@@ -6,12 +6,14 @@ from __future__ import annotations
 
 import importlib
 import logging
+from functools import wraps
 from types import ModuleType  # noqa: TC003
 from typing import TYPE_CHECKING, Any, Self
 
 from pydantic import BaseModel, ConfigDict, Field
 
 if TYPE_CHECKING:
+    from collections.abc import Callable
     from datetime import datetime
     from types import TracebackType
 
@@ -43,6 +45,37 @@ class Mt5Client(BaseModel):
     )
     _is_initialized: bool = False
 
+    @staticmethod
+    def _log_mt5_last_status_code(func: Callable[..., Any]) -> Callable[..., Any]:
+        """Decorator to log MetaTrader5 last status code after method execution.
+
+        Args:
+            func: The method to decorate.
+
+        Returns:
+            The decorated method.
+        """
+
+        @wraps(func)
+        def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
+            try:
+                result = func(self, *args, **kwargs)
+            except Exception as e:
+                error_message = f"Mt5Client operation failed: {func.__name__}"
+                self.logger.exception(error_message)
+                raise Mt5RuntimeError(error_message) from e
+            else:
+                return result
+            finally:
+                last_error_response = self.mt5.last_error()
+                message = f"MetaTrader5 last status: {last_error_response}"
+                if last_error_response[0] != self.mt5.RES_S_OK:
+                    self.logger.warning(message)
+                else:
+                    self.logger.info(message)
+
+        return wrapper
+
     def __enter__(self) -> Self:
         """Context manager entry.
 
@@ -61,6 +94,7 @@ class Mt5Client(BaseModel):
         """Context manager exit."""
         self.shutdown()
 
+    @_log_mt5_last_status_code
     def initialize(
         self,
         path: str | None = None,
@@ -83,9 +117,7 @@ class Mt5Client(BaseModel):
         Returns:
             True if successful, False otherwise.
         """
-        if self._is_initialized:
-            self.logger.warning("Skipping initialization, already initialized.")
-        elif path is not None:
+        if path is not None:
             self.logger.info(
                 "Initializing MetaTrader5 connection with path: %s",
                 path,
@@ -109,6 +141,7 @@ class Mt5Client(BaseModel):
             self._is_initialized = self.mt5.initialize()
         return self._is_initialized
 
+    @_log_mt5_last_status_code
     def login(
         self,
         login: int,
@@ -127,7 +160,7 @@ class Mt5Client(BaseModel):
         Returns:
             True if successful, False otherwise.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Logging in to MetaTrader5 account: %d", login)
         return self.mt5.login(
             login,
@@ -142,24 +175,22 @@ class Mt5Client(BaseModel):
             },
         )
 
+    @_log_mt5_last_status_code
     def shutdown(self) -> None:
         """Close the previously established connection to the MetaTrader 5 terminal."""
-        if self._is_initialized:
-            self.logger.info("Shutting down MetaTrader5 connection.")
-            self.mt5.shutdown()
-            self._is_initialized = False
-        else:
-            self.logger.warning(
-                "MetaTrader5 connection is not initialized, nothing to shut down"
-            )
+        self.logger.info("Shutting down MetaTrader5 connection.")
+        response = self.mt5.shutdown()
+        self._is_initialized = False
+        return response
 
+    @_log_mt5_last_status_code
     def version(self) -> tuple[int, int, str]:
         """Return the MetaTrader 5 terminal version.
 
         Returns:
             Tuple of (terminal_version, build, release_date).
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving MetaTrader5 version information.")
         return self.mt5.version()
 
@@ -172,43 +203,49 @@ class Mt5Client(BaseModel):
         self.logger.info("Retrieving last MetaTrader5 error")
         return self.mt5.last_error()
 
+    @_log_mt5_last_status_code
     def account_info(self) -> Any:
         """Get info on the current trading account.
 
         Returns:
             AccountInfo structure or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving account information.")
         response = self.mt5.account_info()
-        self._validate_metatrader5_response(response=response, operation="account_info")
+        self._validate_mt5_response_is_not_none(
+            response=response, operation="account_info"
+        )
         return response
 
+    @_log_mt5_last_status_code
     def terminal_info(self) -> Any:
         """Get the connected MetaTrader 5 client terminal status and settings.
 
         Returns:
             TerminalInfo structure or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving terminal information.")
         response = self.mt5.terminal_info()
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="terminal_info",
         )
         return response
 
+    @_log_mt5_last_status_code
     def symbols_total(self) -> int:
         """Get the number of all financial instruments in the terminal.
 
         Returns:
             Total number of symbols.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving total number of symbols.")
         return self.mt5.symbols_total()
 
+    @_log_mt5_last_status_code
     def symbols_get(self, group: str | None = None) -> tuple[Any, ...]:
         """Get all financial instruments from the terminal.
 
@@ -218,7 +255,7 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of symbol info structures or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         if group is not None:
             self.logger.info("Retrieving symbols for group: %s", group)
             response = self.mt5.symbols_get(group=group)
@@ -227,13 +264,14 @@ class Mt5Client(BaseModel):
             self.logger.info("Retrieving all symbols.")
             response = self.mt5.symbols_get()
             context = None
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="symbols_get",
             context=context,
         )
         return response
 
+    @_log_mt5_last_status_code
     def symbol_info(self, symbol: str) -> Any:
         """Get data on the specified financial instrument.
 
@@ -243,16 +281,17 @@ class Mt5Client(BaseModel):
         Returns:
             Symbol info structure or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving information for symbol: %s", symbol)
         response = self.mt5.symbol_info(symbol)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="symbol_info",
             context=f"symbol={symbol}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def symbol_info_tick(self, symbol: str) -> Any:
         """Get the last tick for the specified financial instrument.
 
@@ -262,16 +301,17 @@ class Mt5Client(BaseModel):
         Returns:
             Tick info structure or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving last tick for symbol: %s", symbol)
         response = self.mt5.symbol_info_tick(symbol)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="symbol_info_tick",
             context=f"symbol={symbol}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def symbol_select(self, symbol: str, enable: bool = True) -> bool:
         """Select a symbol in the MarketWatch window or remove a symbol from the window.
 
@@ -282,16 +322,17 @@ class Mt5Client(BaseModel):
         Returns:
             True if successful, False otherwise.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Selecting symbol: %s, enable=%s", symbol, enable)
         response = self.mt5.symbol_select(symbol, enable)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="symbol_select",
             context=f"symbol={symbol}, enable={enable}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def market_book_add(self, symbol: str) -> bool:
         """Subscribe the terminal to the Market Depth change events for a specified symbol.
 
@@ -301,16 +342,17 @@ class Mt5Client(BaseModel):
         Returns:
             True if successful, False otherwise.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Adding market book for symbol: %s", symbol)
         response = self.mt5.market_book_add(symbol)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="market_book_add",
             context=f"symbol={symbol}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def market_book_get(self, symbol: str) -> tuple[Any, ...]:
         """Return a tuple from BookInfo featuring Market Depth entries for the specified symbol.
 
@@ -320,16 +362,17 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of BookInfo structures or None.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving market book for symbol: %s", symbol)
         response = self.mt5.market_book_get(symbol)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="market_book_get",
             context=f"symbol={symbol}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def market_book_release(self, symbol: str) -> bool:
         """Cancels subscription of the terminal to the Market Depth change events for a specified symbol.
 
@@ -339,16 +382,17 @@ class Mt5Client(BaseModel):
         Returns:
             True if successful, False otherwise.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Releasing market book for symbol: %s", symbol)
         response = self.mt5.market_book_release(symbol)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="market_book_release",
             context=f"symbol={symbol}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def copy_rates_from(
         self,
         symbol: str,
@@ -367,7 +411,7 @@ class Mt5Client(BaseModel):
         Returns:
             Array of rates or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Copying rates from symbol: %s, timeframe: %d, date_from: %s, count: %d",
             symbol,
@@ -376,7 +420,7 @@ class Mt5Client(BaseModel):
             count,
         )
         response = self.mt5.copy_rates_from(symbol, timeframe, date_from, count)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="copy_rates_from",
             context=(
@@ -386,6 +430,7 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def copy_rates_from_pos(
         self,
         symbol: str,
@@ -404,7 +449,7 @@ class Mt5Client(BaseModel):
         Returns:
             Array of rates or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             (
                 "Copying rates from position:"
@@ -416,7 +461,7 @@ class Mt5Client(BaseModel):
             count,
         )
         response = self.mt5.copy_rates_from_pos(symbol, timeframe, start_pos, count)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="copy_rates_from_pos",
             context=(
@@ -426,6 +471,7 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def copy_rates_range(
         self,
         symbol: str,
@@ -444,7 +490,7 @@ class Mt5Client(BaseModel):
         Returns:
             Array of rates or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Copying rates range: symbol=%s, timeframe=%d, date_from=%s, date_to=%s",
             symbol,
@@ -453,7 +499,7 @@ class Mt5Client(BaseModel):
             date_to,
         )
         response = self.mt5.copy_rates_range(symbol, timeframe, date_from, date_to)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="copy_rates_range",
             context=(
@@ -463,6 +509,7 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def copy_ticks_from(
         self,
         symbol: str,
@@ -481,7 +528,7 @@ class Mt5Client(BaseModel):
         Returns:
             Array of ticks or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Copying ticks from symbol: %s, date_from: %s, count: %d, flags: %d",
             symbol,
@@ -490,7 +537,7 @@ class Mt5Client(BaseModel):
             flags,
         )
         response = self.mt5.copy_ticks_from(symbol, date_from, count, flags)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="copy_ticks_from",
             context=(
@@ -499,6 +546,7 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def copy_ticks_range(
         self,
         symbol: str,
@@ -517,7 +565,7 @@ class Mt5Client(BaseModel):
         Returns:
             Array of ticks or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Copying ticks range: symbol=%s, date_from=%s, date_to=%s, flags=%d",
             symbol,
@@ -526,7 +574,7 @@ class Mt5Client(BaseModel):
             flags,
         )
         response = self.mt5.copy_ticks_range(symbol, date_from, date_to, flags)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="copy_ticks_range",
             context=(
@@ -536,16 +584,18 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def orders_total(self) -> int:
         """Get the number of active orders.
 
         Returns:
             Number of active orders.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving total number of active orders.")
         return self.mt5.orders_total()
 
+    @_log_mt5_last_status_code
     def orders_get(
         self,
         symbol: str | None = None,
@@ -562,7 +612,7 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of order info structures or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         if ticket is not None:
             self.logger.info("Retrieving order with ticket: %d", ticket)
             response = self.mt5.orders_get(ticket=ticket)
@@ -579,13 +629,14 @@ class Mt5Client(BaseModel):
             self.logger.info("Retrieving all active orders.")
             response = self.mt5.orders_get()
             context = None
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="orders_get",
             context=context,
         )
         return response
 
+    @_log_mt5_last_status_code
     def order_calc_margin(
         self,
         action: int,
@@ -604,7 +655,7 @@ class Mt5Client(BaseModel):
         Returns:
             Required margin amount or None.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Calculating margin: action=%d, symbol=%s, volume=%.2f, price=%.5f",
             action,
@@ -613,13 +664,14 @@ class Mt5Client(BaseModel):
             price,
         )
         response = self.mt5.order_calc_margin(action, symbol, volume, price)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="order_calc_margin",
             context=f"action={action}, symbol={symbol}, volume={volume}, price={price}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def order_calc_profit(
         self,
         action: int,
@@ -640,7 +692,7 @@ class Mt5Client(BaseModel):
         Returns:
             Calculated profit or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             (
                 "Calculating profit: action=%d, symbol=%s, volume=%.2f,"
@@ -655,7 +707,7 @@ class Mt5Client(BaseModel):
         response = self.mt5.order_calc_profit(
             action, symbol, volume, price_open, price_close
         )
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="order_calc_profit",
             context=(
@@ -665,6 +717,7 @@ class Mt5Client(BaseModel):
         )
         return response
 
+    @_log_mt5_last_status_code
     def order_check(self, request: dict[str, Any]) -> Any:
         """Check funds sufficiency for performing a required trading operation.
 
@@ -674,16 +727,17 @@ class Mt5Client(BaseModel):
         Returns:
             OrderCheckResult structure or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Checking order with request: %s", request)
         response = self.mt5.order_check(request)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="order_check",
             context=f"request={request}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def order_send(self, request: dict[str, Any]) -> Any:
         """Send a request to perform a trading operation from the terminal to the trade server.
 
@@ -693,26 +747,28 @@ class Mt5Client(BaseModel):
         Returns:
             OrderSendResult structure or None.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Sending order with request: %s", request)
         response = self.mt5.order_send(request)
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="order_send",
             context=f"request={request}",
         )
         return response
 
+    @_log_mt5_last_status_code
     def positions_total(self) -> int:
         """Get the number of open positions.
 
         Returns:
             Number of open positions.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info("Retrieving total number of open positions.")
         return self.mt5.positions_total()
 
+    @_log_mt5_last_status_code
     def positions_get(
         self,
         symbol: str | None = None,
@@ -729,7 +785,7 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of position info structures or None.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         if ticket is not None:
             self.logger.info("Retrieving position with ticket: %d", ticket)
             response = self.mt5.positions_get(ticket=ticket)
@@ -746,13 +802,14 @@ class Mt5Client(BaseModel):
             self.logger.info("Retrieving all open positions.")
             response = self.mt5.positions_get()
             context = None
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="positions_get",
             context=context,
         )
         return response
 
+    @_log_mt5_last_status_code
     def history_orders_total(
         self,
         date_from: datetime | int,
@@ -767,7 +824,7 @@ class Mt5Client(BaseModel):
         Returns:
             Number of historical orders.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Retrieving total number of historical orders from %s to %s",
             date_from,
@@ -775,6 +832,7 @@ class Mt5Client(BaseModel):
         )
         return self.mt5.history_orders_total(date_from, date_to)
 
+    @_log_mt5_last_status_code
     def history_orders_get(
         self,
         date_from: datetime | int | None = None,
@@ -795,7 +853,7 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of historical order info structures or None.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         if ticket is not None:
             self.logger.info("Retrieving order with ticket: %d", ticket)
             response = self.mt5.history_orders_get(ticket=ticket)
@@ -821,13 +879,14 @@ class Mt5Client(BaseModel):
             )
             response = self.mt5.history_orders_get(date_from, date_to)
             context = f"date_from={date_from}, date_to={date_to}"
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="history_orders_get",
             context=context,
         )
         return response
 
+    @_log_mt5_last_status_code
     def history_deals_total(
         self,
         date_from: datetime | int,
@@ -842,7 +901,7 @@ class Mt5Client(BaseModel):
         Returns:
             Number of historical deals.
         """
-        self._ensure_initialized()
+        self._initialize_if_needed()
         self.logger.info(
             "Retrieving total number of historical deals from %s to %s",
             date_from,
@@ -850,6 +909,7 @@ class Mt5Client(BaseModel):
         )
         return self.mt5.history_deals_total(date_from, date_to)
 
+    @_log_mt5_last_status_code
     def history_deals_get(
         self,
         date_from: datetime | int | None = None,
@@ -870,7 +930,7 @@ class Mt5Client(BaseModel):
         Returns:
             Tuple of historical deal info structures or None.
         """  # noqa: E501
-        self._ensure_initialized()
+        self._initialize_if_needed()
         if ticket is not None:
             self.logger.info("Retrieving deal with ticket: %d", ticket)
             response = self.mt5.history_deals_get(ticket=ticket)
@@ -896,20 +956,25 @@ class Mt5Client(BaseModel):
             )
             response = self.mt5.history_deals_get(date_from, date_to)
             context = f"date_from={date_from}, date_to={date_to}"
-        self._validate_metatrader5_response(
+        self._validate_mt5_response_is_not_none(
             response=response,
             operation="history_deals_get",
             context=context,
         )
         return response
 
-    def _validate_metatrader5_response(
+    def _initialize_if_needed(self) -> None:
+        """Ensure the MetaTrader5 client is initialized before performing operations."""
+        if not self._is_initialized:
+            self.initialize()
+
+    def _validate_mt5_response_is_not_none(
         self,
         response: Any,
         operation: str,
         context: str | None = None,
     ) -> None:
-        """Validate the response from MetaTrader5 terminal functions.
+        """Validate that the MetaTrader5 response is not None.
 
         Args:
             response: The response object to validate.
@@ -920,20 +985,10 @@ class Mt5Client(BaseModel):
             Mt5RuntimeError: With error details from MetaTrader5.
         """
         if response is None:
-            error_code, error_description = self.last_error()
+            last_error_response = self.mt5.last_error()
             error_message = (
-                f"{operation} failed: {error_code} - {error_description}"
-                + (f" (context: {context})" if context else "")
-            )
+                f"MetaTrader5 {operation} returned {response}:"
+                f" last_error={last_error_response}"
+            ) + (f" context={context}" if context else "")
             self.logger.error(error_message)
             raise Mt5RuntimeError(error_message)
-
-    def _ensure_initialized(self) -> None:
-        """Ensure MetaTrader5 is initialized.
-
-        Raises:
-            Mt5RuntimeError: If MetaTrader5 is not initialized.
-        """
-        if not self._is_initialized:
-            error_message = "MetaTrader5 not initialized. Call initialize() first."
-            raise Mt5RuntimeError(error_message)

{pdmt5-0.0.7 → pdmt5-0.0.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pdmt5"
-version = "0.0.7"
+version = "0.0.8"
 description = "Pandas-based data handler for MetaTrader 5"
 authors = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]
 maintainers = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]
@@ -177,7 +177,7 @@ omit = [
 
 [tool.coverage.report]
 show_missing = true
-fail_under = 90
+fail_under = 100
 exclude_lines = ["if TYPE_CHECKING:"]
 
 [build-system]

{pdmt5-0.0.7 → pdmt5-0.0.8}/test/test_dataframe.py

@@ -82,6 +82,7 @@ def mock_mt5_import(
         mock_mt5.market_book_add = mocker.MagicMock()  # type: ignore[attr-defined]
         mock_mt5.market_book_release = mocker.MagicMock()  # type: ignore[attr-defined]
         mock_mt5.market_book_get = mocker.MagicMock()  # type: ignore[attr-defined]
+        mock_mt5.RES_S_OK = 1
         yield mock_mt5
 
 
@@ -494,11 +495,11 @@ class TestMt5DataClient:
         # Set _is_initialized to True to test the early return path
         client._is_initialized = True
 
-        # Call initialize when already initialized - should return True immediately
+        # Call initialize when already initialized - should still call mt5.initialize
         result = client.initialize()
 
-        assert result is True  # Method returns True when already initialized
-        mock_mt5_import.initialize.assert_not_called()
+        assert result is True  # Method returns True when successful
+        mock_mt5_import.initialize.assert_called_once()
 
     def test_shutdown(self, mock_mt5_import: ModuleType | None) -> None:
         """Test shutdown."""
@@ -932,7 +933,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"order_calc_margin failed: 1 - Invalid volume"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: order_calc_margin"
         ):
             client.order_calc_margin(0, "EURUSD", 0.0, 1.1300)
 
@@ -948,7 +949,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"order_calc_margin failed: 1 - Invalid price"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: order_calc_margin"
         ):
             client.order_calc_margin(0, "EURUSD", 0.1, 0.0)
 
@@ -963,7 +964,7 @@ class TestMt5DataClient:
         client.initialize()
         with pytest.raises(
             Mt5RuntimeError,
-            match=r"order_calc_margin failed: 1 - Order calc margin failed",
+            match=r"Mt5Client operation failed: order_calc_margin",
         ):
             client.order_calc_margin(0, "EURUSD", 0.1, 1.1300)
 
@@ -991,7 +992,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"order_calc_profit failed: 1 - Invalid volume"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: order_calc_profit"
         ):
             client.order_calc_profit(0, "EURUSD", 0.0, 1.1300, 1.1400)
 
@@ -1007,7 +1008,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"order_calc_profit failed: 1 - Invalid price_open"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: order_calc_profit"
         ):
             client.order_calc_profit(0, "EURUSD", 0.1, 0.0, 1.1400)
 
@@ -1023,7 +1024,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"order_calc_profit failed: 1 - Invalid price_close"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: order_calc_profit"
         ):
             client.order_calc_profit(0, "EURUSD", 0.1, 1.1300, 0.0)
 
@@ -1038,7 +1039,7 @@ class TestMt5DataClient:
         client.initialize()
         with pytest.raises(
             Mt5RuntimeError,
-            match=r"order_calc_profit failed: 1 - Order calc profit failed",
+            match=r"Mt5Client operation failed: order_calc_profit",
         ):
             client.order_calc_profit(0, "EURUSD", 0.1, 1.1300, 1.1400)
 
@@ -1126,7 +1127,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"symbol_select failed: 1 - Symbol select failed"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: symbol_select"
         ):
             client.symbol_select("EURUSD")
 
@@ -1152,7 +1153,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"market_book_add failed: 1 - Market book add failed"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: market_book_add"
         ):
             client.market_book_add("EURUSD")
 
@@ -1181,7 +1182,7 @@ class TestMt5DataClient:
         client.initialize()
         with pytest.raises(
             Mt5RuntimeError,
-            match=r"market_book_release failed: 1 - Market book release failed",
+            match=r"Mt5Client operation failed: market_book_release",
         ):
             client.market_book_release("EURUSD")
 
@@ -1485,7 +1486,7 @@ class TestMt5DataClient:
         client = Mt5DataClient(mt5=mock_mt5_import)
         client.initialize()
         with pytest.raises(
-            Mt5RuntimeError, match=r"market_book_get failed: 1 - Market book get failed"
+            Mt5RuntimeError, match=r"Mt5Client operation failed: market_book_get"
         ):
             client.market_book_get("EURUSD")
 
@@ -1497,9 +1498,9 @@ class TestMt5DataClient:
 
         client = Mt5DataClient(mt5=mock_mt5_import)
         # Don't initialize
-        client.shutdown()  # Should not call mt5.shutdown()
+        client.shutdown()  # Should call mt5.shutdown()
 
-        mock_mt5_import.shutdown.assert_not_called()
+        mock_mt5_import.shutdown.assert_called_once()
 
     def test_orders_get_missing_time_columns(
         self, mock_mt5_import: ModuleType | None
@@ -2202,7 +2203,8 @@ class TestMt5DataClientRetryLogic:
         # Test last_error method from parent class
         error = client.last_error()
         assert error == (0, "No error")
-        mock_mt5_import.last_error.assert_called_once()
+        # last_error is called multiple times (in decorators and explicitly)
+        assert mock_mt5_import.last_error.call_count >= 1
 
     def test_validate_history_input_with_ticket(
         self, mock_mt5_import: ModuleType | None
@@ -2418,11 +2420,11 @@ class TestMt5DataClientRetryLogic:
         # Reset the mock
         mock_mt5_import.initialize.reset_mock()
 
-        # Call initialize again - should take the early exit
+        # Call initialize again - should still call mt5.initialize()
         client.initialize()
 
-        # Initialize should not be called since we're already initialized
-        mock_mt5_import.initialize.assert_not_called()
+        # Initialize should be called again in current implementation
+        mock_mt5_import.initialize.assert_called_once()
         # The method should still return True (or whatever the expected behavior is)
         assert client._is_initialized is True
 

{pdmt5-0.0.7 → pdmt5-0.0.8}/test/test_init.py

@@ -14,9 +14,12 @@ class TestInit:
     def test_all_exports(self) -> None:
         """Test that all expected exports are available."""
         expected_exports = [
+            "Mt5Client",
             "Mt5Config",
             "Mt5DataClient",
             "Mt5RuntimeError",
+            "Mt5TradingClient",
+            "Mt5TradingError",
         ]
 
         for export in expected_exports:
@@ -25,6 +28,9 @@ class TestInit:
 
     def test_classes_accessible(self) -> None:
         """Test that main classes are accessible."""
+        assert hasattr(pdmt5, "Mt5Client")
         assert hasattr(pdmt5, "Mt5Config")
         assert hasattr(pdmt5, "Mt5DataClient")
         assert hasattr(pdmt5, "Mt5RuntimeError")
+        assert hasattr(pdmt5, "Mt5TradingClient")
+        assert hasattr(pdmt5, "Mt5TradingError")

{pdmt5-0.0.7 → pdmt5-0.0.8}/test/test_mt5.py

@@ -4,6 +4,7 @@
 
 from __future__ import annotations
 
+import contextlib
 from datetime import UTC, datetime
 from typing import TYPE_CHECKING
 
@@ -22,6 +23,7 @@ def mock_metatrader5_import(mocker: MockerFixture) -> Mock:
     """Mock MetaTrader5 import globally for all tests."""
     mock_mt5 = mocker.Mock()
     mock_mt5.last_error.return_value = (1001, "Test error")
+    mock_mt5.RES_S_OK = 1
     mocker.patch("pdmt5.mt5.importlib.import_module", return_value=mock_mt5)
     return mock_mt5
 
@@ -122,12 +124,17 @@ class TestMt5Client:
         assert error == (1001, "Test error")
         mock_mt5.last_error.assert_called_once()
 
-    def test_ensure_initialized_raises(self, client: Mt5Client) -> None:
-        """Test _ensure_initialized raises when not initialized."""
-        with pytest.raises(Mt5RuntimeError) as exc_info:
-            client._ensure_initialized()
+    def test_initialize_if_needed_calls_initialize(
+        self, client: Mt5Client, mock_mt5: Mock
+    ) -> None:
+        """Test _initialize_if_needed calls initialize when not initialized."""
+        mock_mt5.initialize.return_value = True
 
-        assert "not initialized" in str(exc_info.value)
+        assert client._is_initialized is False
+        client._initialize_if_needed()
+
+        mock_mt5.initialize.assert_called_once()
+        assert client._is_initialized is True
 
     def test_login_success(self, initialized_client: Mt5Client, mock_mt5: Mock) -> None:
         """Test successful login."""
@@ -204,7 +211,7 @@ class TestMt5Client:
         with pytest.raises(Mt5RuntimeError) as exc_info:
             initialized_client.symbols_get()
 
-        assert "symbols_get failed" in str(exc_info.value)
+        assert "Mt5Client operation failed: symbols_get" in str(exc_info.value)
 
     def test_symbol_info(
         self,
@@ -624,9 +631,9 @@ class TestMt5Client:
 
         for method_name, args in methods:
             method = getattr(client, method_name)
-            with pytest.raises(Mt5RuntimeError) as exc_info:
+            # Methods should automatically initialize if not already done
+            with contextlib.suppress(Mt5RuntimeError):
                 method(*args)
-            assert "not initialized" in str(exc_info.value)
 
     def test_error_handling_with_context(
         self, initialized_client: Mt5Client, mock_mt5: Mock
@@ -638,9 +645,7 @@ class TestMt5Client:
             initialized_client.symbol_info("EURUSD")
 
         error_msg = str(exc_info.value)
-        assert "symbol_info failed" in error_msg
-        assert "1001 - Test error" in error_msg
-        assert "symbol=EURUSD" in error_msg
+        assert "Mt5Client operation failed: symbol_info" in error_msg
 
     def test_default_mt5_import(self, mock_metatrader5_import: MockerFixture) -> None:
         """Test default MetaTrader5 module import."""
@@ -649,7 +654,7 @@ class TestMt5Client:
         assert client.mt5 is mock_metatrader5_import
 
     def test_multiple_initializations(self, client: Mt5Client, mock_mt5: Mock) -> None:
-        """Test that multiple initializations don't re-initialize."""
+        """Test that multiple initializations work correctly."""
         mock_mt5.initialize.return_value = True
 
         # First initialization
@@ -657,18 +662,18 @@ class TestMt5Client:
         assert result1 is True
         assert mock_mt5.initialize.call_count == 1
 
-        # Second initialization should return True without calling mt5.initialize
+        # Second initialization should call initialize again
         result2 = client.initialize()
         assert result2 is True
-        assert mock_mt5.initialize.call_count == 1  # Still 1, not called again
+        assert mock_mt5.initialize.call_count == 2  # Called again
 
     def test_shutdown_when_not_initialized(
         self, client: Mt5Client, mock_mt5: Mock
     ) -> None:
-        """Test shutdown when not initialized doesn't call mt5.shutdown."""
+        """Test shutdown when not initialized still calls mt5.shutdown."""
         client.shutdown()
 
-        mock_mt5.shutdown.assert_not_called()
+        mock_mt5.shutdown.assert_called_once()
 
     def test_error_handling_methods(
         self, initialized_client: Mt5Client, mock_mt5: Mock

{pdmt5-0.0.7 → pdmt5-0.0.8}/test/test_trading.py

@@ -66,6 +66,7 @@ def mock_mt5_import(
         mock_mt5.TRADE_RETCODE_DONE = 10009
         mock_mt5.TRADE_RETCODE_TRADE_DISABLED = 10017
         mock_mt5.TRADE_RETCODE_MARKET_CLOSED = 10018
+        mock_mt5.RES_S_OK = 1
 
         yield mock_mt5
 

{pdmt5-0.0.7 → pdmt5-0.0.8}/uv.lock

@@ -613,7 +613,7 @@ wheels = [
 
 [[package]]
 name = "pdmt5"
-version = "0.0.7"
+version = "0.0.8"
 source = { editable = "." }
 dependencies = [
     { name = "metatrader5", marker = "sys_platform == 'win32'" },