mt5cli 1.1.3__tar.gz → 1.1.4__tar.gz

{mt5cli-1.1.3 → mt5cli-1.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mt5cli
-Version: 1.1.3
+Version: 1.1.4
 Summary: Generic MT5 data and execution infrastructure for Python applications
 Project-URL: Repository, https://github.com/dceoy/mt5cli.git
 Author-email: dceoy <dceoy@users.noreply.github.com>
@@ -18,7 +18,7 @@ Classifier: Topic :: Office/Business :: Financial :: Investment
 Requires-Python: <3.14,>=3.11
 Requires-Dist: click>=8.1.0
 Requires-Dist: pandas>=2.2.2
-Requires-Dist: pdmt5>=1.1.0
+Requires-Dist: pdmt5>=1.1.1
 Requires-Dist: pydantic>=2.13.4
 Requires-Dist: typer>=0.15.0
 Provides-Extra: otel
@@ -189,37 +189,37 @@ python -m mt5cli -o account.csv account-info
 
 ## Commands
 
-| Command                | Description                                                                                                                                           |
-| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `rates-from`           | Export rates from a start date                                                                                                                        |
-| `rates-from-pos`       | Export rates from a start position                                                                                                                    |
-| `latest-rates`         | Export latest rates from a start position                                                                                                             |
-| `rates-range`          | Export rates for a date range                                                                                                                         |
-| `ticks-from`           | Export ticks from a start date                                                                                                                        |
-| `ticks-range`          | Export ticks for a date range                                                                                                                         |
-| `ticks-recent`         | Export ticks from a recent trailing window                                                                                                            |
-| `account-info`         | Export account information                                                                                                                            |
-| `terminal-info`        | Export terminal information                                                                                                                           |
-| `version`              | Export MetaTrader 5 version information                                                                                                               |
-| `last-error`           | Export the last error information                                                                                                                     |
-| `symbols`              | Export symbol list                                                                                                                                    |
-| `symbol-info`          | Export symbol details                                                                                                                                 |
-| `symbol-info-tick`     | Export the last tick for a symbol                                                                                                                     |
-| `minimum-margins`      | Export minimum-volume buy and sell margin requirements                                                                                                |
-| `market-book`          | Export market depth (order book)                                                                                                                      |
-| `orders`               | Export active orders                                                                                                                                  |
-| `positions`            | Export open positions                                                                                                                                 |
-| `history-orders`       | Export historical orders                                                                                                                              |
-| `history-deals`        | Export historical deals                                                                                                                               |
-| `recent-history-deals` | Export historical deals from a recent trailing window                                                                                                 |
-| `mt5-summary`          | Export terminal/account status summary                                                                                                                |
-| `order-check`          | Check funds sufficiency for a trade request                                                                                                           |
-| `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                          |
-| `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--deviation` / `--comment` / `--magic`) |
-| `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)           |
-| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                           |
-| `grafana-schema`       | Create or refresh Grafana-ready views and indexes in an existing SQLite database (idempotent, no MT5 connection)                                      |
-| `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite for live Grafana dashboards                                                 |
+| Command                | Description                                                                                                                                                              |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `rates-from`           | Export rates from a start date                                                                                                                                           |
+| `rates-from-pos`       | Export rates from a start position                                                                                                                                       |
+| `latest-rates`         | Export latest rates from a start position                                                                                                                                |
+| `rates-range`          | Export rates for a date range                                                                                                                                            |
+| `ticks-from`           | Export ticks from a start date                                                                                                                                           |
+| `ticks-range`          | Export ticks for a date range                                                                                                                                            |
+| `ticks-recent`         | Export ticks from a recent trailing window                                                                                                                               |
+| `account-info`         | Export account information                                                                                                                                               |
+| `terminal-info`        | Export terminal information                                                                                                                                              |
+| `version`              | Export MetaTrader 5 version information                                                                                                                                  |
+| `last-error`           | Export the last error information                                                                                                                                        |
+| `symbols`              | Export symbol list                                                                                                                                                       |
+| `symbol-info`          | Export symbol details                                                                                                                                                    |
+| `symbol-info-tick`     | Export the last tick for a symbol                                                                                                                                        |
+| `minimum-margins`      | Export minimum-volume buy and sell margin requirements                                                                                                                   |
+| `market-book`          | Export market depth (order book)                                                                                                                                         |
+| `orders`               | Export active orders                                                                                                                                                     |
+| `positions`            | Export open positions                                                                                                                                                    |
+| `history-orders`       | Export historical orders                                                                                                                                                 |
+| `history-deals`        | Export historical deals                                                                                                                                                  |
+| `recent-history-deals` | Export historical deals from a recent trailing window                                                                                                                    |
+| `mt5-summary`          | Export terminal/account status summary                                                                                                                                   |
+| `order-check`          | Check funds sufficiency for a trade request                                                                                                                              |
+| `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                                             |
+| `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--filling-mode` / `--deviation` / `--comment` / `--magic`) |
+| `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)                              |
+| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                                              |
+| `grafana-schema`       | Create or refresh Grafana-ready views and indexes in an existing SQLite database (idempotent, no MT5 connection)                                                         |
+| `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite for live Grafana dashboards                                                                    |
 
 Use `order-check` to validate a request payload before running `order-send --yes`.
 `close-positions` is the safer high-level alternative that builds correct close

{mt5cli-1.1.3 → mt5cli-1.1.4}/README.md

@@ -158,37 +158,37 @@ python -m mt5cli -o account.csv account-info
 
 ## Commands
 
-| Command                | Description                                                                                                                                           |
-| ---------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
-| `rates-from`           | Export rates from a start date                                                                                                                        |
-| `rates-from-pos`       | Export rates from a start position                                                                                                                    |
-| `latest-rates`         | Export latest rates from a start position                                                                                                             |
-| `rates-range`          | Export rates for a date range                                                                                                                         |
-| `ticks-from`           | Export ticks from a start date                                                                                                                        |
-| `ticks-range`          | Export ticks for a date range                                                                                                                         |
-| `ticks-recent`         | Export ticks from a recent trailing window                                                                                                            |
-| `account-info`         | Export account information                                                                                                                            |
-| `terminal-info`        | Export terminal information                                                                                                                           |
-| `version`              | Export MetaTrader 5 version information                                                                                                               |
-| `last-error`           | Export the last error information                                                                                                                     |
-| `symbols`              | Export symbol list                                                                                                                                    |
-| `symbol-info`          | Export symbol details                                                                                                                                 |
-| `symbol-info-tick`     | Export the last tick for a symbol                                                                                                                     |
-| `minimum-margins`      | Export minimum-volume buy and sell margin requirements                                                                                                |
-| `market-book`          | Export market depth (order book)                                                                                                                      |
-| `orders`               | Export active orders                                                                                                                                  |
-| `positions`            | Export open positions                                                                                                                                 |
-| `history-orders`       | Export historical orders                                                                                                                              |
-| `history-deals`        | Export historical deals                                                                                                                               |
-| `recent-history-deals` | Export historical deals from a recent trailing window                                                                                                 |
-| `mt5-summary`          | Export terminal/account status summary                                                                                                                |
-| `order-check`          | Check funds sufficiency for a trade request                                                                                                           |
-| `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                          |
-| `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--deviation` / `--comment` / `--magic`) |
-| `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)           |
-| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                           |
-| `grafana-schema`       | Create or refresh Grafana-ready views and indexes in an existing SQLite database (idempotent, no MT5 connection)                                      |
-| `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite for live Grafana dashboards                                                 |
+| Command                | Description                                                                                                                                                              |
+| ---------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
+| `rates-from`           | Export rates from a start date                                                                                                                                           |
+| `rates-from-pos`       | Export rates from a start position                                                                                                                                       |
+| `latest-rates`         | Export latest rates from a start position                                                                                                                                |
+| `rates-range`          | Export rates for a date range                                                                                                                                            |
+| `ticks-from`           | Export ticks from a start date                                                                                                                                           |
+| `ticks-range`          | Export ticks for a date range                                                                                                                                            |
+| `ticks-recent`         | Export ticks from a recent trailing window                                                                                                                               |
+| `account-info`         | Export account information                                                                                                                                               |
+| `terminal-info`        | Export terminal information                                                                                                                                              |
+| `version`              | Export MetaTrader 5 version information                                                                                                                                  |
+| `last-error`           | Export the last error information                                                                                                                                        |
+| `symbols`              | Export symbol list                                                                                                                                                       |
+| `symbol-info`          | Export symbol details                                                                                                                                                    |
+| `symbol-info-tick`     | Export the last tick for a symbol                                                                                                                                        |
+| `minimum-margins`      | Export minimum-volume buy and sell margin requirements                                                                                                                   |
+| `market-book`          | Export market depth (order book)                                                                                                                                         |
+| `orders`               | Export active orders                                                                                                                                                     |
+| `positions`            | Export open positions                                                                                                                                                    |
+| `history-orders`       | Export historical orders                                                                                                                                                 |
+| `history-deals`        | Export historical deals                                                                                                                                                  |
+| `recent-history-deals` | Export historical deals from a recent trailing window                                                                                                                    |
+| `mt5-summary`          | Export terminal/account status summary                                                                                                                                   |
+| `order-check`          | Check funds sufficiency for a trade request                                                                                                                              |
+| `order-send`           | Send a raw trade request to the trade server (`--yes` required; expert path)                                                                                             |
+| `close-positions`      | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` available; optional `--filling-mode` / `--deviation` / `--comment` / `--magic`) |
+| `collect-history`      | Collect rates, history-orders, and history-deals for one or more symbols into a single SQLite database (ticks opt-in via `--dataset ticks`)                              |
+| `history-gaps`         | Export a SQLite-only one-row-per-gap report from managed rate compatibility views without connecting to MT5                                                              |
+| `grafana-schema`       | Create or refresh Grafana-ready views and indexes in an existing SQLite database (idempotent, no MT5 connection)                                                         |
+| `snapshot`             | Snapshot current account, position, order, and terminal state into SQLite for live Grafana dashboards                                                                    |
 
 Use `order-check` to validate a request payload before running `order-send --yes`.
 `close-positions` is the safer high-level alternative that builds correct close

{mt5cli-1.1.3 → mt5cli-1.1.4}/docs/api/public-contract.md

@@ -234,8 +234,12 @@ that closes open positions by `--symbol` or `--ticket` using
 `close_open_positions()`. Both `order-send --yes` and `close-positions --yes`
 are live execution paths. `close-positions --dry-run` previews close orders
 without placing them and does not require `--yes`. `close-positions` also
-accepts optional `--deviation`, `--comment`, and `--magic`; `--magic` scopes
-the selected open positions fail-closed when position magic metadata is absent.
+accepts optional `--filling-mode`, `--deviation`, `--comment`, and `--magic`;
+`--magic` scopes the selected open positions fail-closed when position magic
+metadata is absent. When `--filling-mode` (or the `order_filling_mode`
+parameter of `close_open_positions()`) is omitted, the filling mode is
+resolved per symbol with `resolve_broker_filling_mode()` so closes are not
+rejected on brokers whose symbols do not support IOC.
 
 `history-gaps` reads an existing SQLite history database and exports one row
 per detected gap from managed rate compatibility views. It never initializes

{mt5cli-1.1.3 → mt5cli-1.1.4}/docs/index.md

@@ -166,10 +166,10 @@ mt5cli --login '${MT5_LOGIN}' --password '${MT5_PASSWORD}' --server '${MT5_SERVE
 These commands send requests to the live trade server and can place or close
 real trades. Both require `--yes` for live execution.
 
-| Command           | Description                                                                                                                                            |
-| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `order-send`      | Send a **raw** trade request directly to MT5 (`--yes` required; expert path — no extra validation)                                                     |
-| `close-positions` | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` to preview; optional `--deviation` / `--comment` / `--magic`) |
+| Command           | Description                                                                                                                                                               |
+| ----------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `order-send`      | Send a **raw** trade request directly to MT5 (`--yes` required; expert path — no extra validation)                                                                        |
+| `close-positions` | Close open positions by `--symbol` or `--ticket` (`--yes` required for live; `--dry-run` to preview; optional `--filling-mode` / `--deviation` / `--comment` / `--magic`) |
 
 Use `order-check` (Trading State) to validate funds before running `order-send --yes`.
 `close-positions` is the safer high-level alternative that builds correct close

{mt5cli-1.1.3 → mt5cli-1.1.4}/mt5cli/cli.py

@@ -37,6 +37,8 @@ if TYPE_CHECKING:
 
     from pdmt5 import Mt5Config
 
+    from .trading import OrderFillingMode
+
 logger = logging.getLogger(__name__)
 
 # ---------------------------------------------------------------------------
@@ -727,6 +729,16 @@ def close_positions(
             help="Position ticket to close (repeat for multiple tickets).",
         ),
     ] = None,
+    filling_mode: Annotated[
+        str | None,
+        typer.Option(
+            "--filling-mode",
+            help=(
+                "Order filling mode for close requests (IOC, FOK, or RETURN)."
+                " Defaults to per-symbol broker resolution."
+            ),
+        ),
+    ] = None,
     deviation: Annotated[
         int | None,
         typer.Option(help="Optional slippage/deviation for each close request."),
@@ -762,11 +774,19 @@ def close_positions(
 
     Raises:
         typer.BadParameter: If neither ``--symbol`` nor ``--ticket`` is given,
-            or if ``--yes`` is missing for a live (non-dry-run) run.
+            if ``--filling-mode`` is not IOC, FOK, or RETURN, or if ``--yes``
+            is missing for a live (non-dry-run) run.
     """
     if not symbol and not ticket:
         msg = "Provide at least one --symbol or --ticket to close positions."
         raise typer.BadParameter(msg)
+    order_filling_mode: OrderFillingMode | None = None
+    if filling_mode is not None:
+        normalized_filling_mode = filling_mode.upper()
+        if normalized_filling_mode not in {"IOC", "FOK", "RETURN"}:
+            msg = f"Unsupported filling mode: {filling_mode!r}."
+            raise typer.BadParameter(msg, param_hint="--filling-mode")
+        order_filling_mode = cast("OrderFillingMode", normalized_filling_mode)
     if not dry_run and not yes:
         msg = "Pass --yes to close live positions."
         raise typer.BadParameter(msg, param_hint="--yes")
@@ -777,6 +797,7 @@ def close_positions(
             client,
             symbols=list(symbol) if symbol else None,
             tickets=list(ticket) if ticket else None,
+            order_filling_mode=order_filling_mode,
             deviation=deviation,
             comment=comment,
             magic=magic,

{mt5cli-1.1.3 → mt5cli-1.1.4}/mt5cli/trading.py

@@ -767,6 +767,18 @@ def _supported_filling_modes(
             supported.add("FOK")
         if isinstance(ioc_flag, int) and filling_mode & ioc_flag:
             supported.add("IOC")
+    # MQL5 permits IOC/FOK for Request and Instant execution regardless of the
+    # SYMBOL_FILLING_MODE bitmask, which only governs Market/Exchange execution.
+    implicit_ioc_fok_modes = {
+        mode
+        for mode in (
+            getattr(client.mt5, "SYMBOL_TRADE_EXECUTION_REQUEST", None),
+            getattr(client.mt5, "SYMBOL_TRADE_EXECUTION_INSTANT", None),
+        )
+        if isinstance(mode, int)
+    }
+    if trade_exemode is not None and trade_exemode in implicit_ioc_fok_modes:
+        supported.update({"IOC", "FOK"})
     market_execution = getattr(client.mt5, "SYMBOL_TRADE_EXECUTION_MARKET", None)
     if trade_exemode is not None and not (
         isinstance(market_execution, int) and trade_exemode == market_execution
@@ -1548,6 +1560,7 @@ def close_open_positions(
     *,
     symbols: str | list[str] | None = None,
     tickets: list[int] | None = None,
+    order_filling_mode: OrderFillingMode | None = None,
     deviation: int | None = None,
     comment: str | None = None,
     magic: int | None = None,
@@ -1555,6 +1568,10 @@ def close_open_positions(
 ) -> list[OrderExecutionResult]:
     """Close matching open positions.
 
+    When ``order_filling_mode`` is ``None``, the filling mode is resolved per
+    symbol with :func:`resolve_broker_filling_mode` so closes are not rejected
+    on brokers whose symbols do not support IOC.
+
     Returns:
         Normalized execution results for matching positions.
     """
@@ -1565,14 +1582,26 @@ def close_open_positions(
         magic=magic,
     )
     results: list[OrderExecutionResult] = []
+    resolved_filling_modes: dict[str, OrderFillingMode] = {}
     for row in positions.to_dict("records"):
         pos_type = row["type"]
         side: OrderSide = "SELL" if pos_type == client.mt5.POSITION_TYPE_BUY else "BUY"
+        symbol = str(row["symbol"])
+        if order_filling_mode is None:
+            if symbol not in resolved_filling_modes:
+                resolved_filling_modes[symbol] = resolve_broker_filling_mode(
+                    client,
+                    symbol=symbol,
+                )
+            filling_mode = resolved_filling_modes[symbol]
+        else:
+            filling_mode = order_filling_mode
         result = place_market_order(
             client,
-            symbol=str(row["symbol"]),
+            symbol=symbol,
             volume=float(row["volume"]),
             order_side=side,
+            order_filling_mode=filling_mode,
             position=int(row["ticket"]),
             deviation=deviation,
             comment=comment,

{mt5cli-1.1.3 → mt5cli-1.1.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mt5cli"
-version = "1.1.3"
+version = "1.1.4"
 description = "Generic MT5 data and execution infrastructure for Python applications"
 authors = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]
 maintainers = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]
@@ -9,7 +9,7 @@ license-files = ["LICENSE"]
 readme = "README.md"
 requires-python = ">= 3.11, < 3.14"
 dependencies = [
-  "pdmt5 >= 1.1.0",
+  "pdmt5 >= 1.1.1",
   "pandas >= 2.2.2",
   "pydantic >= 2.13.4",
   "click >= 8.1.0",

{mt5cli-1.1.3 → mt5cli-1.1.4}/tests/test_cli.py

@@ -603,6 +603,15 @@ class TestHelpText:
         assert "--dry-run" in output
         assert "--yes" in output
 
+    def test_close_positions_help_mentions_filling_mode(self) -> None:
+        """close-positions help must document the --filling-mode option."""
+        result = runner.invoke(
+            app,
+            ["-o", "out.csv", "close-positions", "--help"],
+        )
+        assert result.exit_code == 0
+        assert "--filling-mode" in normalize_cli_output(result.output)
+
 
 # ---------------------------------------------------------------------------
 # close-positions command
@@ -798,6 +807,84 @@ class TestClosePositions:
         assert request["comment"] == "close-me"
         assert request["magic"] == 7
 
+    @pytest.mark.parametrize(
+        ("cli_value", "expected"),
+        [
+            pytest.param("ioc", 30, id="lowercase-ioc"),
+            pytest.param("IOC", 30, id="uppercase-ioc"),
+            pytest.param("fok", 31, id="lowercase-fok"),
+            pytest.param("FOK", 31, id="uppercase-fok"),
+            pytest.param("return", 32, id="lowercase-return"),
+            pytest.param("RETURN", 32, id="uppercase-return"),
+            pytest.param("Return", 32, id="mixed-case-return"),
+        ],
+    )
+    def test_close_positions_forwards_explicit_filling_mode(
+        self,
+        tmp_path: Path,
+        trading_client: MagicMock,
+        cli_value: str,
+        expected: int,
+    ) -> None:
+        """--filling-mode is normalized and forwarded without broker resolution."""
+        trading_client.mt5.ORDER_FILLING_FOK = 31
+        trading_client.mt5.ORDER_FILLING_RETURN = 32
+        output = tmp_path / "close.json"
+        result = runner.invoke(
+            app,
+            [
+                "-o",
+                str(output),
+                "close-positions",
+                "--symbol",
+                "JP225",
+                "--filling-mode",
+                cli_value,
+                "--dry-run",
+            ],
+        )
+        assert result.exit_code == 0, result.output
+        data = json.loads(output.read_text())
+        request = json.loads(data[0]["request"])
+        assert request["type_filling"] == expected
+        trading_client.symbol_info_as_dict.assert_not_called()
+
+    @pytest.mark.parametrize(
+        "cli_value",
+        ["BOGUS", "ioc ", " FOK", "GTC", ""],
+        ids=[
+            "unknown-word",
+            "trailing-space",
+            "leading-space",
+            "order-time-mode",
+            "empty",
+        ],
+    )
+    def test_close_positions_rejects_unknown_filling_mode(
+        self,
+        tmp_path: Path,
+        trading_client: MagicMock,
+        cli_value: str,
+    ) -> None:
+        """Unknown --filling-mode values fail closed before any close request."""
+        output = tmp_path / "close.json"
+        result = runner.invoke(
+            app,
+            [
+                "-o",
+                str(output),
+                "close-positions",
+                "--symbol",
+                "JP225",
+                "--filling-mode",
+                cli_value,
+                "--dry-run",
+            ],
+        )
+        assert result.exit_code != 0
+        assert "filling mode" in normalize_cli_output(result.output).lower()
+        trading_client.order_send.assert_not_called()
+
     def test_order_send_unchanged(
         self,
         tmp_path: Path,

{mt5cli-1.1.3 → mt5cli-1.1.4}/tests/test_trading.py

@@ -73,6 +73,7 @@ def _mock_trade_client() -> MagicMock:
     client.mt5.ORDER_TIME_GTC = 40
     client.mt5.SYMBOL_TRADE_EXECUTION_MARKET = 3
     client.mt5.SYMBOL_TRADE_EXECUTION_REQUEST = 4
+    client.mt5.SYMBOL_TRADE_EXECUTION_INSTANT = 5
     client.mt5.TRADE_RETCODE_PLACED = 10008
     client.mt5.TRADE_RETCODE_DONE = 10009
     client.mt5.TRADE_RETCODE_DONE_PARTIAL = 10010
@@ -2434,6 +2435,49 @@ class TestVolumeAndExecution:
 
         assert result == "RETURN"
 
+    @pytest.mark.parametrize(
+        "execution_attr",
+        ["SYMBOL_TRADE_EXECUTION_REQUEST", "SYMBOL_TRADE_EXECUTION_INSTANT"],
+        ids=["request-execution", "instant-execution"],
+    )
+    @pytest.mark.parametrize(
+        "filling_mode", [0, None], ids=["filling-mode-zero", "filling-mode-none"]
+    )
+    @pytest.mark.parametrize(
+        ("preferred_modes", "expected"),
+        [
+            pytest.param(("IOC", "FOK"), "IOC", id="prefers-ioc"),
+            pytest.param(("FOK", "IOC"), "FOK", id="prefers-fok"),
+        ],
+    )
+    def test_resolve_broker_filling_mode_request_instant_execution_implies_ioc_fok(
+        self,
+        execution_attr: str,
+        filling_mode: int | None,
+        preferred_modes: tuple[str, str],
+        expected: str,
+    ) -> None:
+        """Request/Instant execution supports IOC/FOK regardless of the mask.
+
+        MQL5 permits IOC and FOK for Request and Instant execution even when
+        ``SYMBOL_FILLING_MODE`` carries no matching bits (that bitmask only
+        governs Market/Exchange execution), so the resolver must honor
+        whichever of IOC/FOK is preferred without requiring mask bits.
+        """
+        client = _mock_trade_client()
+        client.symbol_info_as_dict.return_value = {
+            "filling_mode": filling_mode,
+            "trade_exemode": getattr(client.mt5, execution_attr),
+        }
+
+        result = resolve_broker_filling_mode(
+            client,
+            symbol="EURUSD",
+            preferred_modes=cast("Any", preferred_modes),
+        )
+
+        assert result == expected
+
     def test_resolve_broker_filling_mode_keeps_preferred_when_metadata_unparseable(
         self,
         caplog: pytest.LogCaptureFixture,
@@ -2545,6 +2589,114 @@ class TestVolumeAndExecution:
         assert result == []
         client.order_send.assert_not_called()
 
+    def test_close_open_positions_resolves_filling_mode_per_symbol(self) -> None:
+        """Default closes resolve the broker filling mode instead of assuming IOC."""
+        client = _mock_trade_client()
+        client.mt5.ORDER_FILLING_FOK = 31
+        client.positions_get_as_df.return_value = pd.DataFrame(
+            [
+                {"ticket": 1, "symbol": "EURUSD", "type": 0, "volume": 0.1},
+                {"ticket": 2, "symbol": "EURUSD", "type": 0, "volume": 0.2},
+            ],
+        )
+        client.symbol_info_as_dict.return_value = {
+            "filling_mode": client.mt5.SYMBOL_FILLING_FOK,
+            "trade_exemode": client.mt5.SYMBOL_TRADE_EXECUTION_MARKET,
+        }
+        client.symbol_info_tick_as_dict.return_value = {"ask": 1.2, "bid": 1.1}
+
+        result = close_open_positions(client, symbols="EURUSD", dry_run=True)
+
+        assert [_request_from_result(r)["type_filling"] for r in result] == [31, 31]
+        client.symbol_info_as_dict.assert_called_once()
+
+    def test_close_open_positions_resolves_filling_mode_per_distinct_symbol(
+        self,
+    ) -> None:
+        """Each distinct symbol gets its own resolved mode with one lookup each."""
+        client = _mock_trade_client()
+        client.mt5.ORDER_FILLING_FOK = 31
+        client.positions_get_as_df.return_value = pd.DataFrame(
+            [
+                {"ticket": 1, "symbol": "EURUSD", "type": 0, "volume": 0.1},
+                {"ticket": 2, "symbol": "USDJPY", "type": 0, "volume": 0.2},
+                {"ticket": 3, "symbol": "EURUSD", "type": 0, "volume": 0.3},
+            ],
+        )
+        snapshots = {
+            "EURUSD": {
+                "filling_mode": client.mt5.SYMBOL_FILLING_FOK,
+                "trade_exemode": client.mt5.SYMBOL_TRADE_EXECUTION_MARKET,
+            },
+            "USDJPY": {
+                "filling_mode": (
+                    client.mt5.SYMBOL_FILLING_FOK | client.mt5.SYMBOL_FILLING_IOC
+                ),
+                "trade_exemode": client.mt5.SYMBOL_TRADE_EXECUTION_MARKET,
+            },
+        }
+        client.symbol_info_as_dict.side_effect = (
+            lambda symbol: snapshots[symbol]  # pyright: ignore[reportUnknownLambdaType]
+        )
+        client.symbol_info_tick_as_dict.return_value = {"ask": 1.2, "bid": 1.1}
+
+        result = close_open_positions(client, dry_run=True)
+
+        # Order matches the source positions frame: EURUSD, USDJPY, EURUSD.
+        type_fillings = [_request_from_result(r)["type_filling"] for r in result]
+        assert [r["symbol"] for r in result] == ["EURUSD", "USDJPY", "EURUSD"]
+        assert type_fillings == [31, 30, 31]
+        # One symbol_info lookup per unique symbol, not per position.
+        assert client.symbol_info_as_dict.call_count == 2
+
+    def test_close_open_positions_keeps_ioc_when_supported(self) -> None:
+        """Symbols advertising IOC support keep the IOC close default."""
+        client = _mock_trade_client()
+        client.positions_get_as_df.return_value = pd.DataFrame(
+            [{"ticket": 1, "symbol": "EURUSD", "type": 0, "volume": 0.1}],
+        )
+        client.symbol_info_as_dict.return_value = {
+            "filling_mode": (
+                client.mt5.SYMBOL_FILLING_FOK | client.mt5.SYMBOL_FILLING_IOC
+            ),
+            "trade_exemode": client.mt5.SYMBOL_TRADE_EXECUTION_MARKET,
+        }
+        client.symbol_info_tick_as_dict.return_value = {"ask": 1.2, "bid": 1.1}
+
+        result = close_open_positions(client, symbols="EURUSD", dry_run=True)
+
+        assert _request_from_result(result[0])["type_filling"] == 30
+
+    @pytest.mark.parametrize(
+        ("order_filling_mode", "expected"),
+        [
+            pytest.param("IOC", 30, id="ioc"),
+            pytest.param("FOK", 31, id="fok"),
+            pytest.param("RETURN", 32, id="return"),
+        ],
+    )
+    def test_close_open_positions_forwards_explicit_filling_mode(
+        self, order_filling_mode: str, expected: int
+    ) -> None:
+        """An explicit order_filling_mode bypasses broker resolution."""
+        client = _mock_trade_client()
+        client.mt5.ORDER_FILLING_FOK = 31
+        client.mt5.ORDER_FILLING_RETURN = 32
+        client.positions_get_as_df.return_value = pd.DataFrame(
+            [{"ticket": 1, "symbol": "EURUSD", "type": 0, "volume": 0.1}],
+        )
+        client.symbol_info_tick_as_dict.return_value = {"ask": 1.2, "bid": 1.1}
+
+        result = close_open_positions(
+            client,
+            symbols="EURUSD",
+            order_filling_mode=cast("Any", order_filling_mode),
+            dry_run=True,
+        )
+
+        assert _request_from_result(result[0])["type_filling"] == expected
+        client.symbol_info_as_dict.assert_not_called()
+
     def test_filter_positions_magic_is_fail_closed_without_magic_column(self) -> None:
         """Test direct magic filtering fails closed when the DataFrame lacks magic."""
         positions = pd.DataFrame([{"ticket": 1, "symbol": "EURUSD"}])

{mt5cli-1.1.3 → mt5cli-1.1.4}/uv.lock

@@ -499,7 +499,7 @@ wheels = [
 
 [[package]]
 name = "mt5cli"
-version = "1.1.3"
+version = "1.1.4"
 source = { editable = "." }
 dependencies = [
     { name = "click" },
@@ -543,7 +543,7 @@ requires-dist = [
     { name = "opentelemetry-exporter-otlp-proto-http", marker = "extra == 'otel'" },
     { name = "opentelemetry-sdk", marker = "extra == 'otel'" },
     { name = "pandas", specifier = ">=2.2.2" },
-    { name = "pdmt5", specifier = ">=1.1.0" },
+    { name = "pdmt5", specifier = ">=1.1.1" },
     { name = "pyarrow", marker = "extra == 'parquet'", specifier = ">=19.0.0" },
     { name = "pydantic", specifier = ">=2.13.4" },
     { name = "typer", specifier = ">=0.15.0" },
@@ -800,16 +800,16 @@ wheels = [
 
 [[package]]
 name = "pdmt5"
-version = "1.1.0"
+version = "1.1.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "metatrader5", marker = "sys_platform == 'win32'" },
     { name = "pandas" },
     { name = "pydantic" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/35/7a/7caafb93b74ccaa60a1c844948698bed714e04aa3be292a05fd71864faa0/pdmt5-1.1.0.tar.gz", hash = "sha256:fcdab1924e001204ae776dd2afc1f150fe01e6944cba99dae72af23bc99137c6", size = 22160, upload-time = "2026-07-04T04:41:51.476Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/4d/9c/4c51e9b109440629762a5ca719c367798469bb590b8ce99aa0652c467549/pdmt5-1.1.1.tar.gz", hash = "sha256:2d8e4e9b87d237793f8534813b373545eadb5c0e1ced13ee8be8dc473c77190d", size = 23879, upload-time = "2026-07-07T15:50:19.604Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/6f/80/1062ea4e4c82de81d91ba8bb43b1a6d4903771010d87eca15d5d18d827df/pdmt5-1.1.0-py3-none-any.whl", hash = "sha256:603273065814824680d6ec8847139b3029c7dd04da7c25868ad7f4ede55a9acf", size = 20489, upload-time = "2026-07-04T04:41:49.999Z" },
+    { url = "https://files.pythonhosted.org/packages/8f/18/4221deef65dc320da9b6299e1914c36c1e81b29a5557f0c1083718b36545/pdmt5-1.1.1-py3-none-any.whl", hash = "sha256:9df16148ebec754c15ce3d1b02af82aaeec3c5cb1603a47258fa68c74f45b453", size = 22274, upload-time = "2026-07-07T15:50:18.489Z" },
 ]
 
 [[package]]