5b1d54bfe9
* Add SDK orchestration helpers for resilient multi-account collection
- collect_latest_rates_for_accounts_with_retries(): exponential-backoff
retries around collect_latest_rates_for_accounts(), retrying only
Mt5TradingError/Mt5RuntimeError and re-raising on exhaustion.
- resolve_account_spec()/resolve_account_specs() and
substitute_env_placeholders(): merge explicit overrides over AccountSpec
fields and expand ${ENV_VAR} placeholders, raising ValueError on missing
variables.
- ThrottledHistoryUpdater: monotonic-clock throttled wrapper around
update_history() with should_update()/update() and opt-in suppress_errors.
- load_rate_series_by_granularity(): rate-series loader keyed by
(symbol | None, granularity_name).
- Export new APIs, add unit tests (100% coverage), and document in README
and docs/api.
* chore: bump version from 0.5.1 to 0.5.3 (#24)
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Daichi Narushima <dceoy@users.noreply.github.com>
* fix: resolve leftover merge conflict markers in version files
Co-authored-by: Daichi Narushima <dceoy@users.noreply.github.com>
* fix: address PR review feedback on SDK orchestration helpers
- Use single-pass env substitution to avoid TOCTOU KeyError
- Apply backoff_base to all retry delays (backoff_base ** (attempt + 1))
- Preserve integer logins in resolve_account_spec; hide login in repr
- Fix docs examples (env ordering, while True loop, backoff comment)
- Parametrize suppress_errors tests for MT5 and SQLite errors
Co-authored-by: Daichi Narushima <dceoy@users.noreply.github.com>
---------
Co-authored-by: Claude <noreply@anthropic.com>
Co-authored-by: Cursor Agent <cursoragent@cursor.com>
Co-authored-by: Daichi Narushima <dceoy@users.noreply.github.com>
230 lines
8.2 KiB
Markdown
230 lines
8.2 KiB
Markdown
# History Collection (SQLite)
|
|
|
|
::: mt5cli.history
|
|
|
|
## `collect-history` schema
|
|
|
|
The `collect-history` command (and the matching `collect_history` SDK function) writes
|
|
selected MT5 datasets into one SQLite database. Each dataset becomes a table; column
|
|
names and types mirror the pdmt5 DataFrame schema for that export, with two additions:
|
|
|
|
- `symbol` is prepended on every table.
|
|
- `timeframe` is prepended on `rates` so appended runs at different bar sizes stay
|
|
distinguishable.
|
|
|
|
SQLite does not declare foreign keys. Rows are linked logically by `symbol`, time
|
|
windows, and (for deals) `position_id` / `order`. Duplicate rows are removed on
|
|
append using dataset-specific keys (for example `ticket` on history tables, or
|
|
`(symbol, timeframe, time)` on rates).
|
|
|
|
Optional views are created when `--with-views` is set and the `history-deals` dataset
|
|
was written.
|
|
|
|
### Entity-relationship diagram
|
|
|
|
Sample layout for a full collection with `--with-views`:
|
|
|
|
```mermaid
|
|
erDiagram
|
|
rates {
|
|
TEXT symbol "dedup key"
|
|
INTEGER timeframe "dedup key"
|
|
TEXT time "dedup key"
|
|
REAL open
|
|
REAL high
|
|
REAL low
|
|
REAL close
|
|
INTEGER tick_volume
|
|
INTEGER spread
|
|
INTEGER real_volume
|
|
}
|
|
|
|
ticks {
|
|
TEXT symbol "dedup key"
|
|
TEXT time "dedup key"
|
|
INTEGER time_msc "dedup key (preferred)"
|
|
REAL bid
|
|
REAL ask
|
|
REAL last
|
|
INTEGER volume
|
|
INTEGER flags
|
|
REAL volume_real
|
|
}
|
|
|
|
history_orders {
|
|
INTEGER ticket "dedup key"
|
|
TEXT symbol
|
|
TEXT time
|
|
INTEGER type
|
|
INTEGER state
|
|
REAL volume_initial
|
|
REAL price_open
|
|
REAL price_current
|
|
INTEGER magic
|
|
}
|
|
|
|
history_deals {
|
|
INTEGER ticket "dedup key"
|
|
INTEGER order
|
|
INTEGER position_id "groups position view"
|
|
TEXT symbol
|
|
TEXT time
|
|
INTEGER type "0/1 trade, else cash event"
|
|
INTEGER entry "0 IN, 1 OUT, 2 INOUT, 3 OUT_BY"
|
|
REAL volume
|
|
REAL price
|
|
REAL profit
|
|
REAL commission
|
|
REAL swap
|
|
REAL fee
|
|
}
|
|
|
|
cash_events {
|
|
INTEGER ticket
|
|
TEXT symbol
|
|
TEXT time
|
|
INTEGER type
|
|
REAL profit
|
|
}
|
|
|
|
positions_reconstructed {
|
|
INTEGER position_id
|
|
TEXT symbol
|
|
TEXT open_time
|
|
TEXT close_time
|
|
INTEGER direction
|
|
REAL volume_open
|
|
REAL volume_close
|
|
REAL volume_reversal
|
|
REAL open_price
|
|
REAL close_price
|
|
REAL total_profit
|
|
INTEGER reversal_count
|
|
INTEGER deals_count
|
|
}
|
|
|
|
rates ||--o{ history_deals : "symbol (logical)"
|
|
ticks ||--o{ history_deals : "symbol (logical)"
|
|
history_orders ||--o{ history_deals : "order ~ ticket (logical)"
|
|
history_deals ||--|| cash_events : "VIEW: type NOT IN (0,1)"
|
|
history_deals ||--o{ positions_reconstructed : "VIEW: GROUP BY position_id"
|
|
```
|
|
|
|
### Tables and views
|
|
|
|
| Object | Kind | Source | Notes |
|
|
| ------------------------- | ----- | -------------------- | ------------------------------------------------------------------------------------------- |
|
|
| `rates` | table | `copy_rates_range` | Indexed on `(symbol, timeframe, time)` when columns exist. |
|
|
| `ticks` | table | `copy_ticks_range` | Indexed on `(symbol, time)` when columns exist. |
|
|
| `history_orders` | table | `history_orders_get` | Fetched per `--symbol`, then concatenated. |
|
|
| `history_deals` | table | `history_deals_get` | Fetched per `--symbol`, then concatenated. Indexed on `(position_id, symbol)` when present. |
|
|
| `cash_events` | view | `history_deals` | Non-trade deal types (deposits, balance ops, etc.). Requires `type` column. |
|
|
| `positions_reconstructed` | view | `history_deals` | One row per closed `position_id`; volume-weighted prices and reversal stats. |
|
|
|
|
Column sets can vary with terminal and pdmt5 version. Views are skipped with a warning
|
|
when required columns are missing.
|
|
|
|
### Incremental collection
|
|
|
|
The `update_history` SDK path uses the same base tables and optional
|
|
`cash_events` / `positions_reconstructed` views. It additionally maintains
|
|
`rate_<symbol>__<timeframe>` compatibility views when `create_rate_views=True`.
|
|
|
|
### Rate view resolution
|
|
|
|
Downstream tools can resolve mt5cli-managed compatibility view names from an
|
|
existing SQLite history database without creating files or guessing naming
|
|
schemes:
|
|
|
|
```python
|
|
from pathlib import Path
|
|
|
|
from mt5cli.history import resolve_rate_view_name, resolve_rate_view_names
|
|
|
|
# Single symbol and granularity
|
|
view = resolve_rate_view_name(Path("history.db"), "EURUSD", "M1")
|
|
|
|
# Batch resolution in row-major order
|
|
views = resolve_rate_view_names(
|
|
Path("history.db"),
|
|
["EURUSD", "GBPUSD"],
|
|
["M1", "H1"],
|
|
)
|
|
```
|
|
|
|
Resolution rules:
|
|
|
|
- Returns `rate_<symbol>__<timeframe>` when a symbol stores one timeframe.
|
|
- Returns `rate_<symbol>__<granularity>_<timeframe>` when multiple timeframes
|
|
are stored for the same symbol.
|
|
- When multiple naming candidates apply, prefers an existing managed
|
|
`rate_*__*` view from the candidate list.
|
|
- Falls back to single-timeframe naming when the database path is missing or
|
|
`rates` metadata is unavailable.
|
|
- Pass `require_existing=True` to raise `ValueError` instead of returning a
|
|
best-guess name when the database or view is missing.
|
|
- Accepts either a SQLite path or an open `sqlite3.Connection`.
|
|
|
|
### Rate data loading
|
|
|
|
Use `load_rate_data()` to load a table or view from a SQLite path, or
|
|
`load_rate_data_from_connection()` when you already have a connection:
|
|
|
|
```python
|
|
from pathlib import Path
|
|
|
|
from mt5cli import load_rate_data
|
|
from mt5cli.history import resolve_rate_view_name
|
|
|
|
view = resolve_rate_view_name(Path("history.db"), "EURUSD", "M1", require_existing=True)
|
|
rates = load_rate_data(Path("history.db"), view, count=1000)
|
|
```
|
|
|
|
The loader accepts close-based OHLC rate data or tick-like bid/ask data. It
|
|
validates that `time` exists, parses timestamps with pandas, and returns a
|
|
DataFrame indexed by ascending `DatetimeIndex` named `time`.
|
|
|
|
### Multi-series rate loading
|
|
|
|
For loading many rate series at once, build neutral `RateTarget` pairs and load
|
|
them from SQLite in one call. View names are resolved via the same
|
|
compatibility-view rules, or you can pass `explicit_tables` to bypass resolution:
|
|
|
|
```python
|
|
from pathlib import Path
|
|
|
|
from mt5cli import build_rate_targets, load_rate_series_from_sqlite
|
|
|
|
targets = build_rate_targets(["EURUSD", "GBPUSD"], ["M1", "H1"])
|
|
series = load_rate_series_from_sqlite(Path("history.db"), targets, count=1000)
|
|
frame = series["EURUSD", 1] # keyed by (symbol, integer timeframe)
|
|
```
|
|
|
|
- `build_rate_targets()` returns `RateTarget(symbol, timeframe)` pairs in
|
|
row-major order, normalizing timeframe names such as `"M1"` to their integer
|
|
values; set `allow_missing_symbol=True` to address series solely by
|
|
`explicit_tables` (targets carry `symbol=None`).
|
|
- `resolve_rate_tables()` maps targets to table or view names and validates that
|
|
any `explicit_tables` count matches the target count. Pass
|
|
`require_existing=True` to raise `ValueError` instead of returning a
|
|
best-guess name when the database or managed view is missing. When
|
|
`explicit_tables` is provided, names are returned as-is and
|
|
`require_existing` is ignored.
|
|
- `load_rate_series_from_sqlite()` returns a mapping keyed by
|
|
`(symbol, integer timeframe)`. Unless `explicit_tables` is supplied, it
|
|
requires existing managed `rate_*` compatibility views and raises
|
|
`ValueError` when they are missing. Duplicate `(symbol, timeframe)` targets
|
|
are rejected.
|
|
- `load_rate_series_by_granularity()` is a thin wrapper that builds the targets,
|
|
loads the series, and rekeys the result by granularity name to avoid
|
|
converting integer timeframes downstream:
|
|
|
|
```python
|
|
from mt5cli import load_rate_series_by_granularity
|
|
|
|
series = load_rate_series_by_granularity(
|
|
"history.db", ["EURUSD"], ["M1", "H1"], count=1000
|
|
)
|
|
frame = series["EURUSD", "M1"] # keyed by (symbol | None, granularity_name)
|
|
```
|