pdmt5 0.0.8__py3-none-any.whl → 0.0.9__py3-none-any.whl

pdmt5/dataframe.py

@@ -86,16 +86,16 @@ class Mt5DataClient(Mt5Client):
         for i in range(1 + max(0, self.retry_count)):
             if i:
                 self.logger.warning(
-                    "Retrying MetaTrader5 initialization (%d/%d)...",
+                    "Retrying MT5 initialization (%d/%d)...",
                     i,
                     self.retry_count,
                 )
                 time.sleep(i)
             if self.initialize(**initialize_kwargs):  # type: ignore[reportArgumentType]
-                self.logger.info("MetaTrader5 initialization successful.")
+                self.logger.info("MT5 initialization successful.")
                 return
         error_message = (
-            f"MetaTrader5 initialization failed after {self.retry_count} retries:"
+            f"MT5 initialization failed after {self.retry_count} retries:"
             f" {self.last_error()}"
         )
         raise Mt5RuntimeError(error_message)

pdmt5/mt5.py

@@ -59,16 +59,20 @@ class Mt5Client(BaseModel):
         @wraps(func)
         def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
             try:
-                result = func(self, *args, **kwargs)
+                response = func(self, *args, **kwargs)
             except Exception as e:
-                error_message = f"Mt5Client operation failed: {func.__name__}"
-                self.logger.exception(error_message)
+                error_message = f"MT5 {func.__name__} failed with error: {e}"
                 raise Mt5RuntimeError(error_message) from e
             else:
-                return result
+                self.logger.info(
+                    "MT5 %s returned a response: %s",
+                    func.__name__,
+                    response,
+                )
+                return response
             finally:
                 last_error_response = self.mt5.last_error()
-                message = f"MetaTrader5 last status: {last_error_response}"
+                message = f"MT5 last status: {last_error_response}"
                 if last_error_response[0] != self.mt5.RES_S_OK:
                     self.logger.warning(message)
                 else:
@@ -119,7 +123,7 @@ class Mt5Client(BaseModel):
         """
         if path is not None:
             self.logger.info(
-                "Initializing MetaTrader5 connection with path: %s",
+                "Initializing MT5 connection with path: %s",
                 path,
             )
             self._is_initialized = self.mt5.initialize(
@@ -137,7 +141,7 @@ class Mt5Client(BaseModel):
                 },
             )
         else:
-            self.logger.info("Initializing MetaTrader5 connection.")
+            self.logger.info("Initializing MT5 connection.")
             self._is_initialized = self.mt5.initialize()
         return self._is_initialized
 
@@ -161,7 +165,7 @@ class Mt5Client(BaseModel):
             True if successful, False otherwise.
         """
         self._initialize_if_needed()
-        self.logger.info("Logging in to MetaTrader5 account: %d", login)
+        self.logger.info("Logging in to MT5 account: %d", login)
         return self.mt5.login(
             login,
             **{
@@ -178,7 +182,7 @@ class Mt5Client(BaseModel):
     @_log_mt5_last_status_code
     def shutdown(self) -> None:
         """Close the previously established connection to the MetaTrader 5 terminal."""
-        self.logger.info("Shutting down MetaTrader5 connection.")
+        self.logger.info("Shutting down MT5 connection.")
         response = self.mt5.shutdown()
         self._is_initialized = False
         return response
@@ -191,16 +195,17 @@ class Mt5Client(BaseModel):
             Tuple of (terminal_version, build, release_date).
         """
         self._initialize_if_needed()
-        self.logger.info("Retrieving MetaTrader5 version information.")
+        self.logger.info("Retrieving MT5 version information.")
         return self.mt5.version()
 
+    @_log_mt5_last_status_code
     def last_error(self) -> tuple[int, str]:
         """Return data on the last error.
 
         Returns:
             Tuple of (error_code, error_description).
         """
-        self.logger.info("Retrieving last MetaTrader5 error")
+        self.logger.info("Retrieving last MT5 error")
         return self.mt5.last_error()
 
     @_log_mt5_last_status_code
@@ -985,10 +990,8 @@ class Mt5Client(BaseModel):
             Mt5RuntimeError: With error details from MetaTrader5.
         """
         if response is None:
-            last_error_response = self.mt5.last_error()
             error_message = (
-                f"MetaTrader5 {operation} returned {response}:"
-                f" last_error={last_error_response}"
+                f"MT5 {operation} returned {response}:"
+                f" last_error={self.mt5.last_error()}"
             ) + (f" context={context}" if context else "")
-            self.logger.error(error_message)
             raise Mt5RuntimeError(error_message)

pdmt5/trading.py

@@ -31,7 +31,7 @@ class Mt5TradingClient(Mt5DataClient):
 
     def close_open_positions(
         self,
-        symbols: str | list[str] | tuple[str] | None = None,
+        symbols: str | list[str] | tuple[str, ...] | None = None,
         **kwargs: Any,  # noqa: ANN401
     ) -> dict[str, list[dict[str, Any]]]:
         """Close all open positions for specified symbols.
@@ -51,6 +51,7 @@ class Mt5TradingClient(Mt5DataClient):
             symbol_list = symbols
         else:
             symbol_list = self.symbols_get()
+        self.logger.info("Fetching and closing positions for symbols: %s", symbol_list)
         return {
             s: self._fetch_and_close_position(symbol=s, **kwargs) for s in symbol_list
         }
@@ -99,11 +100,17 @@ class Mt5TradingClient(Mt5DataClient):
                 for p in positions_dict
             ]
 
-    def send_or_check_order(self, request: dict[str, Any]) -> dict[str, Any]:
+    def send_or_check_order(
+        self,
+        request: dict[str, Any],
+        dry_run: bool | None = None,
+    ) -> dict[str, Any]:
         """Send or check an order request.
 
         Args:
             request: Order request dictionary.
+            dry_run: Optional flag to enable dry run mode. If None, uses the instance's
+                `dry_run` attribute.
 
         Returns:
             Dictionary with operation result.
@@ -112,29 +119,66 @@ class Mt5TradingClient(Mt5DataClient):
             Mt5TradingError: If the order operation fails.
         """
         self.logger.debug("request: %s", request)
-        if self.dry_run:
+        is_dry_run = dry_run if dry_run is not None else self.dry_run
+        self.logger.debug("is_dry_run: %s", is_dry_run)
+        if is_dry_run:
             response = self.order_check_as_dict(request=request)
             order_func = "order_check"
         else:
             response = self.order_send_as_dict(request=request)
             order_func = "order_send"
         retcode = response.get("retcode")
-        if ((not self.dry_run) and retcode == self.mt5.TRADE_RETCODE_DONE) or (
-            self.dry_run and retcode == 0
+        if ((not is_dry_run) and retcode == self.mt5.TRADE_RETCODE_DONE) or (
+            is_dry_run and retcode == 0
         ):
-            self.logger.info("retcode: %s, response: %s", retcode, response)
+            self.logger.info("response: %s", response)
             return response
         elif retcode in {
             self.mt5.TRADE_RETCODE_TRADE_DISABLED,
             self.mt5.TRADE_RETCODE_MARKET_CLOSED,
         }:
-            self.logger.info("retcode: %s, response: %s", retcode, response)
+            self.logger.info("response: %s", response)
             comment = response.get("comment", "Unknown error")
             self.logger.warning("%s() failed and skipped. <= `%s`", order_func, comment)
             return response
         else:
-            self.logger.error("retcode: %s, response: %s", retcode, response)
+            self.logger.error("response: %s", response)
             comment = response.get("comment", "Unknown error")
             error_message = f"{order_func}() failed and aborted. <= `{comment}`"
-            self.logger.error(error_message)
+            raise Mt5TradingError(error_message)
+
+    def calculate_minimum_order_margins(self, symbol: str) -> dict[str, float]:
+        """Calculate minimum order margins for a given symbol.
+
+        Args:
+            symbol: Symbol for which to calculate minimum order margins.
+
+        Returns:
+            Dictionary with margin information.
+
+        Raises:
+            Mt5TradingError: If margin calculation fails.
+        """
+        symbol_info = self.symbol_info_as_dict(symbol=symbol)
+        symbol_info_tick = self.symbol_info_tick_as_dict(symbol=symbol)
+        min_ask_order_margin = self.mt5.order_calc_margin(
+            action=self.mt5.ORDER_TYPE_BUY,
+            symbol=symbol,
+            volume=symbol_info["volume_min"],
+            price=symbol_info_tick["ask"],
+        )
+        min_bid_order_margin = self.mt5.order_calc_margin(
+            action=self.mt5.ORDER_TYPE_SELL,
+            symbol=symbol,
+            volume=symbol_info["volume_min"],
+            price=symbol_info_tick["bid"],
+        )
+        min_order_margins = {"ask": min_ask_order_margin, "bid": min_bid_order_margin}
+        self.logger.info("Minimum order margins for %s: %s", symbol, min_order_margins)
+        if all(min_order_margins.values()):
+            return min_order_margins
+        else:
+            error_message = (
+                f"Failed to calculate minimum order margins for symbol: {symbol}."
+            )
             raise Mt5TradingError(error_message)

{pdmt5-0.0.8.dist-info → pdmt5-0.0.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.0.8
+Version: 0.0.9
 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.9.dist-info/RECORD

@@ -0,0 +1,9 @@
+pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
+pdmt5/dataframe.py,sha256=MumdFp72ZN_394X_viMkovfyb1c8C-LxLFTdymLEMYM,38345
+pdmt5/mt5.py,sha256=rAY7MQalobUWZtMfC_xyTFCDTuU3EkFAyY_geBl6cyg,32379
+pdmt5/trading.py,sha256=NCrZZuPC1AoUQ_Rmv3_g39VbMxq7R1wASQa5oAMBKDQ,6995
+pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
+pdmt5-0.0.9.dist-info/METADATA,sha256=Dpc0ApxD4EK_E1Bggyv2vexqIVr4JnfuCglERHHuy8s,9029
+pdmt5-0.0.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pdmt5-0.0.9.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
+pdmt5-0.0.9.dist-info/RECORD,,

pdmt5-0.0.8.dist-info/RECORD

@@ -1,9 +0,0 @@
-pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
-pdmt5/dataframe.py,sha256=808kwi_eUlpXvgvJzXxwDTvxp80z-1zh605ONyOIoU4,38369
-pdmt5/mt5.py,sha256=NOcG4NrsgH7Jbs5keXdQgri2UNt9JKrxcf-FBxchEbE,32390
-pdmt5/trading.py,sha256=8JagrLc9cjr9TUdkoRmyAmVUOV2SQElqsrtcwg5FqBs,5284
-pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
-pdmt5-0.0.8.dist-info/METADATA,sha256=PbbFgHdYLTwcDnm3Uf8sswIUnShTl5xbw9E20bBqrrI,9029
-pdmt5-0.0.8.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pdmt5-0.0.8.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
-pdmt5-0.0.8.dist-info/RECORD,,