pdmt5 0.1.9__py3-none-any.whl → 0.2.1__py3-none-any.whl

pdmt5/trading.py

@@ -131,6 +131,7 @@ class Mt5TradingClient(Mt5DataClient):
         self,
         symbol: str | None = None,
         order_filling_mode: Literal["IOC", "FOK", "RETURN"] = "IOC",
+        raise_on_error: bool = False,
         dry_run: bool = False,
         **kwargs: Any,  # noqa: ANN401
     ) -> list[dict[str, Any]]:
@@ -139,6 +140,7 @@ class Mt5TradingClient(Mt5DataClient):
         Args:
             symbol: Optional symbol filter.
             order_filling_mode: Order filling mode, either "IOC", "FOK", or "RETURN".
+            raise_on_error: If True, raise an exception on error.
             dry_run: If True, only check the order without sending it.
             **kwargs: Additional keyword arguments for request parameters.
 
@@ -170,6 +172,7 @@ class Mt5TradingClient(Mt5DataClient):
                         "position": p["ticket"],
                         **kwargs,
                     },
+                    raise_on_error=raise_on_error,
                     dry_run=dry_run,
                 )
                 for p in positions_dict
@@ -225,6 +228,7 @@ class Mt5TradingClient(Mt5DataClient):
         order_side: Literal["BUY", "SELL"],
         order_filling_mode: Literal["IOC", "FOK", "RETURN"] = "IOC",
         order_time_mode: Literal["GTC", "DAY", "SPECIFIED", "SPECIFIED_DAY"] = "GTC",
+        raise_on_error: bool = False,
         dry_run: bool = False,
         **kwargs: Any,  # noqa: ANN401
     ) -> dict[str, Any]:
@@ -237,12 +241,14 @@ class Mt5TradingClient(Mt5DataClient):
             order_filling_mode: Order filling mode, either "IOC", "FOK", or "RETURN".
             order_time_mode: Order time mode, either "GTC", "DAY", "SPECIFIED",
                 or "SPECIFIED_DAY".
+            raise_on_error: If True, raise an error on operation failure.
             dry_run: If True, only check the order without sending it.
             **kwargs: Additional keyword arguments for request parameters.
 
         Returns:
             Dictionary with operation result.
         """
+        self.logger.info("Placing market order: %s %s %s", order_side, volume, symbol)
         return self._send_or_check_order(
             request={
                 "action": self.mt5.TRADE_ACTION_DEAL,
@@ -255,6 +261,7 @@ class Mt5TradingClient(Mt5DataClient):
                 "type_time": getattr(self.mt5, f"ORDER_TIME_{order_time_mode.upper()}"),
                 **kwargs,
             },
+            raise_on_error=raise_on_error,
             dry_run=dry_run,
         )
 
@@ -264,6 +271,7 @@ class Mt5TradingClient(Mt5DataClient):
         stop_loss: float | None = None,
         take_profit: float | None = None,
         tickets: list[int] | None = None,
+        raise_on_error: bool = False,
         dry_run: bool = False,
         **kwargs: Any,  # noqa: ANN401
     ) -> list[dict[str, Any]]:
@@ -275,6 +283,7 @@ class Mt5TradingClient(Mt5DataClient):
             take_profit: New Take Profit price. If None, it will not be changed.
             tickets: List of position tickets to filter positions. If None, all open
                 positions for the symbol will be considered.
+            raise_on_error: If True, raise an error on operation failure.
             dry_run: If True, only check the order without sending it.
             **kwargs: Additional keyword arguments for request parameters.
 
@@ -315,8 +324,17 @@ class Mt5TradingClient(Mt5DataClient):
                 if sl != p["sl"] or tp != p["tp"]
             ]
             if order_requests:
+                self.logger.info(
+                    "Updating SL/TP for %d positions for %s: %s/%s",
+                    len(order_requests),
+                    symbol,
+                    sl,
+                    tp,
+                )
                 return [
-                    self._send_or_check_order(request=r, dry_run=dry_run)
+                    self._send_or_check_order(
+                        request=r, raise_on_error=raise_on_error, dry_run=dry_run
+                    )
                     for r in order_requests
                 ]
             else:
@@ -354,15 +372,22 @@ class Mt5TradingClient(Mt5DataClient):
                 else symbol_info_tick["ask"]
             ),
         )
+        result = {"volume": symbol_info["volume_min"], "margin": margin}
         if margin:
-            return {"volume": symbol_info["volume_min"], "margin": margin}
+            self.logger.info(
+                "Calculated minimum %s order margin for %s: %s",
+                order_side,
+                symbol,
+                result,
+            )
         else:
             self.logger.warning(
-                "No margin available for symbol: %s with order side: %s",
-                symbol,
+                "Calculated minimum order margin to %s %s: %s",
                 order_side,
+                symbol,
+                result,
             )
-            return {"volume": symbol_info["volume_min"], "margin": 0.0}
+        return result
 
     def calculate_volume_by_margin(
         self,
@@ -385,12 +410,19 @@ class Mt5TradingClient(Mt5DataClient):
             order_side=order_side,
         )
         if min_order_margin_dict["margin"]:
-            return (
+            result = (
                 floor(margin / min_order_margin_dict["margin"])
                 * min_order_margin_dict["volume"]
             )
         else:
-            return 0.0
+            result = 0.0
+        self.logger.info(
+            "Calculated volume by margin to %s %s: %s",
+            order_side,
+            symbol,
+            result,
+        )
+        return result
 
     def calculate_spread_ratio(
         self,
@@ -405,11 +437,13 @@ class Mt5TradingClient(Mt5DataClient):
             Spread ratio as a float.
         """
         symbol_info_tick = self.symbol_info_tick_as_dict(symbol=symbol)
-        return (
+        result = (
             (symbol_info_tick["ask"] - symbol_info_tick["bid"])
             / (symbol_info_tick["ask"] + symbol_info_tick["bid"])
             * 2
         )
+        self.logger.info("Calculated spread ratio for %s: %s", symbol, result)
+        return result
 
     def fetch_latest_rates_as_df(
         self,
@@ -440,13 +474,20 @@ class Mt5TradingClient(Mt5DataClient):
             )
             raise Mt5TradingError(error_message) from e
         else:
-            return self.copy_rates_from_pos_as_df(
+            result = self.copy_rates_from_pos_as_df(
                 symbol=symbol,
                 timeframe=timeframe,
                 start_pos=0,
                 count=count,
                 index_keys=index_keys,
             )
+            self.logger.info(
+                "Fetched latest %s rates for %s: %d rows",
+                granularity,
+                symbol,
+                result.shape[0],
+            )
+            return result
 
     def fetch_latest_ticks_as_df(
         self,
@@ -465,13 +506,19 @@ class Mt5TradingClient(Mt5DataClient):
             pd.DataFrame: Tick data with time index.
         """
         last_tick_time = self.symbol_info_tick_as_dict(symbol=symbol)["time"]
-        return self.copy_ticks_range_as_df(
+        result = self.copy_ticks_range_as_df(
             symbol=symbol,
             date_from=(last_tick_time - timedelta(seconds=seconds)),
             date_to=(last_tick_time + timedelta(seconds=seconds)),
             flags=self.mt5.COPY_TICKS_ALL,
             index_keys=index_keys,
         )
+        self.logger.info(
+            "Fetched latest ticks for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def collect_entry_deals_as_df(
         self,
@@ -497,14 +544,20 @@ class Mt5TradingClient(Mt5DataClient):
             index_keys=index_keys,
         )
         if deals_df.empty:
-            return deals_df
+            result = deals_df
         else:
-            return deals_df.pipe(
+            result = deals_df.pipe(
                 lambda d: d[
                     d["entry"]
                     & d["type"].isin({self.mt5.DEAL_TYPE_BUY, self.mt5.DEAL_TYPE_SELL})
                 ]
             )
+        self.logger.info(
+            "Collected entry deals for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def fetch_positions_with_metrics_as_df(
         self,
@@ -520,7 +573,7 @@ class Mt5TradingClient(Mt5DataClient):
         """
         positions_df = self.positions_get_as_df(symbol=symbol)
         if positions_df.empty:
-            return positions_df
+            result = positions_df
         else:
             symbol_info_tick = self.symbol_info_tick_as_dict(symbol=symbol)
             ask_margin = self.order_calc_margin(
@@ -535,7 +588,7 @@ class Mt5TradingClient(Mt5DataClient):
                 volume=1,
                 price=symbol_info_tick["bid"],
             )
-            return (
+            result = (
                 positions_df.assign(
                     elapsed_seconds=lambda d: (
                         symbol_info_tick["time"] - d["time"]
@@ -566,6 +619,12 @@ class Mt5TradingClient(Mt5DataClient):
                 )
                 .drop(columns=["buy_i", "sell_i", "sign", "underlier_increase_ratio"])
             )
+        self.logger.info(
+            "Fetched positions with metrics for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def calculate_new_position_margin_ratio(
         self,
@@ -585,7 +644,7 @@ class Mt5TradingClient(Mt5DataClient):
         """
         account_info = self.account_info_as_dict()
         if not account_info["equity"]:
-            return 0.0
+            result = 0.0
         else:
             positions_df = self.fetch_positions_with_metrics_as_df(symbol=symbol)
             current_signed_margin = (
@@ -610,6 +669,12 @@ class Mt5TradingClient(Mt5DataClient):
                 )
             else:
                 new_signed_margin = 0
-            return abs(
+            result = abs(
                 (new_signed_margin + current_signed_margin) / account_info["equity"]
             )
+        self.logger.info(
+            "Calculated new position margin ratio for %s: %s",
+            symbol,
+            result,
+        )
+        return result

{pdmt5-0.1.9.dist-info → pdmt5-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.1.9
+Version: 0.2.1
 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>
@@ -15,7 +15,7 @@ Classifier: Operating System :: Microsoft :: Windows
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Office/Business :: Financial :: Investment
-Requires-Python: >=3.11
+Requires-Python: <3.14,>=3.11
 Requires-Dist: metatrader5>=5.0.4424; sys_platform == 'win32'
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: pydantic>=2.9.0
@@ -56,8 +56,7 @@ Pandas-based data handler for MetaTrader 5
 ### Using pip
 
 ```bash
-pip install -U pdmt5
-pip install -U MetaTrader5
+pip install -U pdmt5 MetaTrader5
 ```
 
 ### Using uv

{pdmt5-0.1.9.dist-info → pdmt5-0.2.1.dist-info}/RECORD

@@ -1,9 +1,9 @@
 pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
 pdmt5/dataframe.py,sha256=rUWtR23hrXBdBqzJhbOlIemNy73RrjSTZZJUhwoL6io,38084
 pdmt5/mt5.py,sha256=KgxHapIrh5b4L0wIOAQIjfXNZafalihbFrh9fhYHmrI,32254
-pdmt5/trading.py,sha256=U_6h8yR54-5_S_3hmYlAiaNT87fqeb5AK4sUWLThnf8,23433
+pdmt5/trading.py,sha256=Qd4RhZprDcWTzT3JmKl8XGVq8i9hExNdPSJbCRdUx-s,25569
 pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
-pdmt5-0.1.9.dist-info/METADATA,sha256=3nWXNUqiPNDE5jMs7s_IPhtNBAdnVVMvhK1D_1mCij4,16109
-pdmt5-0.1.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pdmt5-0.1.9.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
-pdmt5-0.1.9.dist-info/RECORD,,
+pdmt5-0.2.1.dist-info/METADATA,sha256=OjDjumI_5kGHyEjpIg-xgZyGJSULRUJM_LQnv2IeJ-4,16100
+pdmt5-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pdmt5-0.2.1.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
+pdmt5-0.2.1.dist-info/RECORD,,