mt5cli 1.0.2__tar.gz → 1.0.3__tar.gz

{mt5cli-1.0.2 → mt5cli-1.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mt5cli
-Version: 1.0.2
+Version: 1.0.3
 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>
@@ -182,33 +182,33 @@ 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)          |
+| 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)                                         |
 | `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`) |
 
 Use `order-check` to validate a request payload before running `order-send --yes`.

{mt5cli-1.0.2 → mt5cli-1.0.3}/README.md

@@ -157,33 +157,33 @@ 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)          |
+| 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)                                         |
 | `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`) |
 
 Use `order-check` to validate a request payload before running `order-send --yes`.

{mt5cli-1.0.2 → mt5cli-1.0.3}/mt5cli/trading.py

@@ -15,6 +15,7 @@ from .exceptions import Mt5OperationError
 from .history import drop_forming_rate_bar
 from .sdk import build_config
 from .utils import coerce_login as _coerce_login
+from .utils import parse_timeframe
 
 if TYPE_CHECKING:
     from collections.abc import Iterator, Mapping, Sequence
@@ -1624,11 +1625,18 @@ def fetch_latest_closed_rates_for_trading_client(
     if count <= 0:
         msg = "count must be positive."
         raise ValueError(msg)
+    timeframe = parse_timeframe(granularity)
     fetch_method = getattr(client, "fetch_latest_rates_as_df", None)
-    if not callable(fetch_method):
+    copy_method = getattr(client, "copy_rates_from_pos_as_df", None)
+    if callable(fetch_method):
+        fetched = fetch_method(symbol, granularity, count + 1)
+    elif callable(copy_method):
+        fetched = copy_method(
+            symbol=symbol, timeframe=timeframe, start_pos=0, count=count + 1
+        )
+    else:
         msg = "MT5 trading client cannot fetch rate data."
         raise Mt5OperationError(msg)
-    fetched = fetch_method(symbol, granularity, count + 1)
     if not isinstance(fetched, pd.DataFrame):
         msg = (
             f"Malformed rate data for {symbol!r} at granularity {granularity!r}: "

{mt5cli-1.0.2 → mt5cli-1.0.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mt5cli"
-version = "1.0.2"
+version = "1.0.3"
 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"}]

{mt5cli-1.0.2 → mt5cli-1.0.3}/tests/test_trading.py

@@ -3198,6 +3198,71 @@ class TestFetchLatestClosedRatesForTradingClient:
                 count=2,
             )
 
+    def test_copy_rates_from_pos_fallback_drops_forming_bar(self) -> None:
+        """Regression: client with only copy_rates_from_pos_as_df works end-to-end."""
+        client = MagicMock(spec=["copy_rates_from_pos_as_df"])
+        client.copy_rates_from_pos_as_df.return_value = pd.DataFrame(
+            {
+                "time": [1700000000, 1700000060, 1700000120],
+                "close": [1.0, 1.1, 1.2],
+            },
+        )
+
+        result = fetch_latest_closed_rates_for_trading_client(
+            client,
+            symbol="EURUSD",
+            granularity="M1",
+            count=2,
+        )
+
+        client.copy_rates_from_pos_as_df.assert_called_once_with(
+            symbol="EURUSD", timeframe=1, start_pos=0, count=3
+        )
+        assert list(result["close"]) == [1.0, 1.1]
+        assert list(result["time"]) == [1700000000, 1700000060]
+
+    def test_copy_rates_from_pos_fallback_resolves_granularity(self) -> None:
+        """Fallback path resolves granularity string to integer timeframe."""
+        client = MagicMock(spec=["copy_rates_from_pos_as_df"])
+        client.copy_rates_from_pos_as_df.return_value = pd.DataFrame(
+            {"time": [1, 2, 3, 4], "close": [1.0, 1.1, 1.2, 1.3]},
+        )
+
+        fetch_latest_closed_rates_for_trading_client(
+            client, symbol="USDJPY", granularity="H1", count=3
+        )
+
+        call_kwargs = client.copy_rates_from_pos_as_df.call_args.kwargs
+        assert call_kwargs["symbol"] == "USDJPY"
+        assert call_kwargs["timeframe"] == 16385
+        assert call_kwargs["start_pos"] == 0
+        assert call_kwargs["count"] == 4
+
+    def test_copy_rates_from_pos_fallback_returns_count_closed_rows(self) -> None:
+        """Fallback path trims to exactly count closed rows after forming-bar drop."""
+        client = MagicMock(spec=["copy_rates_from_pos_as_df"])
+        client.copy_rates_from_pos_as_df.return_value = pd.DataFrame(
+            {"time": list(range(6)), "close": [float(i) for i in range(6)]},
+        )
+
+        result = fetch_latest_closed_rates_for_trading_client(
+            client, symbol="EURUSD", granularity="M1", count=4
+        )
+
+        assert len(result) == 4
+        assert list(result["close"]) == [1.0, 2.0, 3.0, 4.0]
+
+    def test_copy_rates_from_pos_fallback_raises_on_invalid_granularity(self) -> None:
+        """Invalid granularity raises ValueError before calling the fallback method."""
+        client = MagicMock(spec=["copy_rates_from_pos_as_df"])
+
+        with pytest.raises(ValueError, match="Invalid timeframe"):
+            fetch_latest_closed_rates_for_trading_client(
+                client, symbol="EURUSD", granularity="BADGRAN", count=1
+            )
+
+        client.copy_rates_from_pos_as_df.assert_not_called()
+
     def test_raises_when_trading_client_cannot_fetch_rates(self) -> None:
         """Test missing rate-fetch methods raise Mt5TradingError."""
         client = MagicMock(spec=[])
@@ -3528,6 +3593,29 @@ class TestFetchLatestClosedRatesIndexed:
         assert "close" in result.columns
         assert isinstance(result.index, pd.DatetimeIndex)
 
+    def test_copy_rates_from_pos_fallback_produces_utc_datetime_index(self) -> None:
+        """Fallback path via copy_rates_from_pos_as_df produces a UTC DatetimeIndex."""
+        client = MagicMock(spec=["copy_rates_from_pos_as_df"])
+        client.copy_rates_from_pos_as_df.return_value = pd.DataFrame(
+            {
+                "time": [1700000000, 1700003600, 1700007200],
+                "close": [1.1, 1.2, 1.3],
+            },
+        )
+
+        result = fetch_latest_closed_rates_indexed(
+            client,
+            symbol="EURUSD",
+            granularity="M1",
+            count=2,
+        )
+
+        assert isinstance(result.index, pd.DatetimeIndex)
+        assert result.index.name == "time"
+        assert str(result.index.tz) == "UTC"
+        assert "time" not in result.columns
+        assert list(result["close"]) == [1.1, 1.2]
+
 
 class TestExtractTickPrice:
     """Tests for the public extract_tick_price helper."""

{mt5cli-1.0.2 → mt5cli-1.0.3}/uv.lock

@@ -487,7 +487,7 @@ wheels = [
 
 [[package]]
 name = "mt5cli"
-version = "1.0.2"
+version = "1.0.3"
 source = { editable = "." }
 dependencies = [
     { name = "click" },