mt5cli 0.7.1__tar.gz → 0.7.2__tar.gz

{mt5cli-0.7.1 → mt5cli-0.7.2}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: mt5cli
-Version: 0.7.1
-Summary: Command-line tool for MetaTrader 5
+Version: 0.7.2
+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>
 Maintainer-email: dceoy <dceoy@users.noreply.github.com>
@@ -26,14 +26,14 @@ Description-Content-Type: text/markdown
 
 [![CI/CD](https://github.com/dceoy/mt5cli/actions/workflows/ci.yml/badge.svg)](https://github.com/dceoy/mt5cli/actions/workflows/ci.yml)
 
-Command-line tool for exporting MetaTrader 5 data to CSV, JSON, Parquet, and SQLite3.
+Generic MT5 data and execution infrastructure for Python applications. Export from the CLI or import a small, stable Python API in downstream packages.
 
 Built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data handler for MetaTrader 5.
 
 ## Architecture
 
 - **pdmt5** — canonical MT5 client, DataFrame/trading primitives, and MT5 constant parsing (`TIMEFRAME_*`, `COPY_TICKS_*`, order types).
-- **mt5cli** — CLI commands, CSV/JSON/Parquet/SQLite export, SQLite history collection, rate views, and local batch/automation SDK helpers built on pdmt5.
+- **mt5cli** — public `MT5Client` API, standardized dataset schemas, storage helpers, CLI commands, and SQLite history collection built on pdmt5.
 - **mt5api** — sibling HTTP adapter for remote MT5 access; not a dependency of mt5cli.
 
 ## Features
@@ -51,7 +51,65 @@ Built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data han
 pip install -U mt5cli MetaTrader5
 ```
 
-## Usage
+## Python API (downstream packages)
+
+Import `MT5Client` for generic MT5 data access, schema normalization, and optional order primitives. `Mt5CliClient` remains available as a backward-compatible alias.
+
+```python
+from datetime import UTC, datetime
+from pathlib import Path
+
+from mt5cli import (
+    DataKind,
+    Dataset,
+    MT5Client,
+    build_config,
+    collect_history,
+    export_dataframe,
+    mt5_session,
+    normalize_dataframe,
+    update_history_with_config,
+)
+
+# Persistent session for multiple calls
+with mt5_session(build_config(login=12345, server="Broker-Demo")) as client:
+    rates = client.copy_rates_range(
+        "EURUSD",
+        timeframe="H1",
+        date_from="2024-01-01",
+        date_to="2024-02-01",
+    )
+    positions = client.positions()
+    check = client.order_check({"action": 1, "symbol": "EURUSD", "volume": 0.1})
+
+# Normalize MT5 frames to the public schema contract before storage
+closed_rates = normalize_dataframe(
+    rates, DataKind.rates, symbol="EURUSD", timeframe="H1"
+)
+export_dataframe(closed_rates, Path("rates.csv"), "csv")
+
+# Bulk SQLite history (same behavior as collect-history CLI command)
+collect_history(
+    Path("history.db"),
+    symbols=["EURUSD"],
+    date_from=datetime(2024, 1, 1, tzinfo=UTC),
+    date_to=datetime(2024, 2, 1, tzinfo=UTC),
+    datasets={Dataset.rates, Dataset.history_deals},
+)
+
+# Incremental append for automated pipelines
+update_history_with_config(
+    output="history.db",
+    symbols=["EURUSD"],
+    config=build_config(login=12345),
+)
+```
+
+Schema contracts live in `mt5cli.schemas` (`DataKind`, `validate_schema`, `normalize_dataframe`). Storage helpers are re-exported from `mt5cli.storage` and the package root.
+
+`MT5Client.order_send()` is a live execution primitive: it can place real trades on the connected account. mt5cli does not implement strategy logic, signal generation, backtesting, or optimization — downstream applications must gate live execution explicitly.
+
+## CLI usage
 
 ```bash
 # Export account information to CSV
@@ -185,7 +243,7 @@ eurusd_m1 = rates["EURUSD", "M1"]  # closed bars only
 - **Throttled history updates**: use `ThrottledHistoryUpdater` to wrap `update_history()` with a minimum `interval_seconds` between successful runs (monotonic clock). Call `should_update()` / `update(client, symbols)` from an application loop; errors propagate by default, or pass `suppress_errors=True` to swallow recoverable `Mt5*Error`, `sqlite3.Error`, `ValueError`, `OSError`, and MT5 client capability errors for history API methods without advancing the throttle (other `AttributeError` / `TypeError` values always propagate).
 - **Trading session helpers**: use `mt5_trading_session()` for a trading-capable `pdmt5.Mt5TradingClient` that initializes/logs in via `Mt5Config.path` and always shuts down safely. Pair with `detect_position_side()`, `calculate_margin_and_volume()`, and `determine_order_limits()` for generic position and sizing utilities. The read-only `mt5_session()` / `Mt5CliClient` SDK is unchanged.
 - **Granularity-keyed rate loading**: `load_rate_series_by_granularity()` builds targets with `build_rate_targets()`, loads them with `load_rate_series_from_sqlite()`, and returns a mapping keyed by `(symbol | None, granularity_name)` such as `("EURUSD", "M1")` to reduce downstream boilerplate.
-- **MT5 session helper**: use the `mt5_session()` context manager to attach to (or, when `Mt5Config.path` is set, launch) an MT5 terminal, log in, and yield a connected `Mt5CliClient` that shuts down on exit.
+- **MT5 session helper**: use the `mt5_session()` context manager to attach to (or, when `Mt5Config.path` is set, launch) an MT5 terminal, log in, and yield a connected `MT5Client` that shuts down on exit.
 - **SQLite export helpers**: use `export_dataframe_to_sqlite()` for append mode, optional index export, and post-write deduplication by key columns.
 - **Recent ticks and margins**: `recent_ticks()` and `minimum_margins()` SDK helpers (and matching CLI commands) cover common downstream read-only queries.
 
@@ -250,7 +308,7 @@ finally:
     client.shutdown()
 ```
 
-Read-only collectors can keep using `mt5_session()` and `Mt5CliClient` without changes.
+Read-only collectors can keep using `mt5_session()` and `MT5Client` (or the `Mt5CliClient` alias) without changes.
 
 ## Development
 

{mt5cli-0.7.1 → mt5cli-0.7.2}/README.md

@@ -2,14 +2,14 @@
 
 [![CI/CD](https://github.com/dceoy/mt5cli/actions/workflows/ci.yml/badge.svg)](https://github.com/dceoy/mt5cli/actions/workflows/ci.yml)
 
-Command-line tool for exporting MetaTrader 5 data to CSV, JSON, Parquet, and SQLite3.
+Generic MT5 data and execution infrastructure for Python applications. Export from the CLI or import a small, stable Python API in downstream packages.
 
 Built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data handler for MetaTrader 5.
 
 ## Architecture
 
 - **pdmt5** — canonical MT5 client, DataFrame/trading primitives, and MT5 constant parsing (`TIMEFRAME_*`, `COPY_TICKS_*`, order types).
-- **mt5cli** — CLI commands, CSV/JSON/Parquet/SQLite export, SQLite history collection, rate views, and local batch/automation SDK helpers built on pdmt5.
+- **mt5cli** — public `MT5Client` API, standardized dataset schemas, storage helpers, CLI commands, and SQLite history collection built on pdmt5.
 - **mt5api** — sibling HTTP adapter for remote MT5 access; not a dependency of mt5cli.
 
 ## Features
@@ -27,7 +27,65 @@ Built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data han
 pip install -U mt5cli MetaTrader5
 ```
 
-## Usage
+## Python API (downstream packages)
+
+Import `MT5Client` for generic MT5 data access, schema normalization, and optional order primitives. `Mt5CliClient` remains available as a backward-compatible alias.
+
+```python
+from datetime import UTC, datetime
+from pathlib import Path
+
+from mt5cli import (
+    DataKind,
+    Dataset,
+    MT5Client,
+    build_config,
+    collect_history,
+    export_dataframe,
+    mt5_session,
+    normalize_dataframe,
+    update_history_with_config,
+)
+
+# Persistent session for multiple calls
+with mt5_session(build_config(login=12345, server="Broker-Demo")) as client:
+    rates = client.copy_rates_range(
+        "EURUSD",
+        timeframe="H1",
+        date_from="2024-01-01",
+        date_to="2024-02-01",
+    )
+    positions = client.positions()
+    check = client.order_check({"action": 1, "symbol": "EURUSD", "volume": 0.1})
+
+# Normalize MT5 frames to the public schema contract before storage
+closed_rates = normalize_dataframe(
+    rates, DataKind.rates, symbol="EURUSD", timeframe="H1"
+)
+export_dataframe(closed_rates, Path("rates.csv"), "csv")
+
+# Bulk SQLite history (same behavior as collect-history CLI command)
+collect_history(
+    Path("history.db"),
+    symbols=["EURUSD"],
+    date_from=datetime(2024, 1, 1, tzinfo=UTC),
+    date_to=datetime(2024, 2, 1, tzinfo=UTC),
+    datasets={Dataset.rates, Dataset.history_deals},
+)
+
+# Incremental append for automated pipelines
+update_history_with_config(
+    output="history.db",
+    symbols=["EURUSD"],
+    config=build_config(login=12345),
+)
+```
+
+Schema contracts live in `mt5cli.schemas` (`DataKind`, `validate_schema`, `normalize_dataframe`). Storage helpers are re-exported from `mt5cli.storage` and the package root.
+
+`MT5Client.order_send()` is a live execution primitive: it can place real trades on the connected account. mt5cli does not implement strategy logic, signal generation, backtesting, or optimization — downstream applications must gate live execution explicitly.
+
+## CLI usage
 
 ```bash
 # Export account information to CSV
@@ -161,7 +219,7 @@ eurusd_m1 = rates["EURUSD", "M1"]  # closed bars only
 - **Throttled history updates**: use `ThrottledHistoryUpdater` to wrap `update_history()` with a minimum `interval_seconds` between successful runs (monotonic clock). Call `should_update()` / `update(client, symbols)` from an application loop; errors propagate by default, or pass `suppress_errors=True` to swallow recoverable `Mt5*Error`, `sqlite3.Error`, `ValueError`, `OSError`, and MT5 client capability errors for history API methods without advancing the throttle (other `AttributeError` / `TypeError` values always propagate).
 - **Trading session helpers**: use `mt5_trading_session()` for a trading-capable `pdmt5.Mt5TradingClient` that initializes/logs in via `Mt5Config.path` and always shuts down safely. Pair with `detect_position_side()`, `calculate_margin_and_volume()`, and `determine_order_limits()` for generic position and sizing utilities. The read-only `mt5_session()` / `Mt5CliClient` SDK is unchanged.
 - **Granularity-keyed rate loading**: `load_rate_series_by_granularity()` builds targets with `build_rate_targets()`, loads them with `load_rate_series_from_sqlite()`, and returns a mapping keyed by `(symbol | None, granularity_name)` such as `("EURUSD", "M1")` to reduce downstream boilerplate.
-- **MT5 session helper**: use the `mt5_session()` context manager to attach to (or, when `Mt5Config.path` is set, launch) an MT5 terminal, log in, and yield a connected `Mt5CliClient` that shuts down on exit.
+- **MT5 session helper**: use the `mt5_session()` context manager to attach to (or, when `Mt5Config.path` is set, launch) an MT5 terminal, log in, and yield a connected `MT5Client` that shuts down on exit.
 - **SQLite export helpers**: use `export_dataframe_to_sqlite()` for append mode, optional index export, and post-write deduplication by key columns.
 - **Recent ticks and margins**: `recent_ticks()` and `minimum_margins()` SDK helpers (and matching CLI commands) cover common downstream read-only queries.
 
@@ -226,7 +284,7 @@ finally:
     client.shutdown()
 ```
 
-Read-only collectors can keep using `mt5_session()` and `Mt5CliClient` without changes.
+Read-only collectors can keep using `mt5_session()` and `MT5Client` (or the `Mt5CliClient` alias) without changes.
 
 ## Development
 

mt5cli-0.7.2/docs/api/client.md

@@ -0,0 +1,3 @@
+# Client
+
+::: mt5cli.client

mt5cli-0.7.2/docs/api/converters.md

@@ -0,0 +1,3 @@
+# Converters
+
+::: mt5cli.converters

mt5cli-0.7.2/docs/api/exceptions.md

@@ -0,0 +1,3 @@
+# Exceptions
+
+::: mt5cli.exceptions

mt5cli-0.7.2/docs/api/index.md

@@ -0,0 +1,53 @@
+# API Reference
+
+This section documents the mt5cli public Python API and CLI modules.
+
+## Public API layers
+
+| Module                                    | Purpose                                                                   |
+| ----------------------------------------- | ------------------------------------------------------------------------- |
+| [Client](client.md)                       | `MT5Client` session abstraction for data access and order primitives      |
+| [Schemas](schemas.md)                     | Canonical DataFrame contracts and normalization helpers                   |
+| [Storage](storage.md)                     | CSV/JSON/Parquet/SQLite export and history collection helpers             |
+| [Converters](converters.md)               | Symbol, timeframe, timezone, and date-range utilities                     |
+| [Exceptions](exceptions.md)               | Stable mt5cli exception types and MT5 error normalization                 |
+| [SDK](sdk.md)                             | Module-level fetch helpers, multi-account collectors, incremental history |
+| [Trading](trading.md)                     | Trading-capable sessions and operational helpers                          |
+| [History Collection (SQLite)](history.md) | SQLite schema, incremental writes, dedup, and rate views                  |
+| [CLI](cli.md)                             | Typer commands that delegate to the Python API                            |
+| [Utils](utils.md)                         | Parsing helpers and Click parameter types                                 |
+
+## Architecture overview
+
+```mermaid
+flowchart TD
+    App["Downstream application"] --> Client["MT5Client"]
+    CLI["mt5cli CLI"] --> Client
+    Client --> SDK["sdk / pdmt5"]
+    Client --> Schemas["schemas"]
+    Storage["storage"] --> History["history SQLite"]
+    Storage --> Utils["utils export"]
+    SDK --> PDMT5["pdmt5.Mt5DataClient"]
+```
+
+Downstream packages should depend on the package root exports (`MT5Client`, `DataKind`, `normalize_dataframe`, `export_dataframe`, `collect_history`, etc.) rather than private modules.
+
+`MT5Client.order_send()` is a live execution primitive that can place real trades. mt5cli exposes minimal execution helpers only; strategy logic, signals, backtests, and optimization remain out of scope and must be implemented downstream with explicit execution gating.
+
+## Quick start
+
+```python
+from mt5cli import MT5Client, build_config, mt5_session
+
+with mt5_session(build_config(login=12345)) as client:
+    rates = client.copy_rates_range("EURUSD", "H1", "2024-01-01", "2024-02-01")
+    positions = client.positions()
+```
+
+```bash
+mt5cli -o account.csv account-info
+mt5cli -o rates.parquet rates-range --symbol EURUSD --timeframe H1 \
+  --date-from 2024-01-01 --date-to 2024-02-01
+```
+
+See individual module pages for detailed usage examples.

mt5cli-0.7.2/docs/api/schemas.md

@@ -0,0 +1,3 @@
+# Schemas
+
+::: mt5cli.schemas

mt5cli-0.7.2/docs/api/storage.md

@@ -0,0 +1,3 @@
+# Storage
+
+::: mt5cli.storage

{mt5cli-0.7.1 → mt5cli-0.7.2}/docs/index.md

@@ -1,15 +1,15 @@
 # mt5cli
 
-Command-line tool for MetaTrader 5 data export.
+Generic MT5 data and execution infrastructure for Python applications.
 
 ## Overview
 
-mt5cli is a CLI application that exports MetaTrader 5 trading data to multiple file formats. It is built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data handler for MetaTrader 5.
+mt5cli provides a stable `MT5Client` Python API, standardized dataset schemas, storage helpers, and a CLI for exporting MetaTrader 5 data. It is built on top of [pdmt5](https://github.com/dceoy/pdmt5), a pandas-based data handler for MetaTrader 5.
 
 ## Architecture
 
 - **pdmt5** — canonical MT5 client, DataFrame/trading primitives, and MT5 constant parsing (`TIMEFRAME_*`, `COPY_TICKS_*`, order types).
-- **mt5cli** — CLI commands, CSV/JSON/Parquet/SQLite export, SQLite history collection, rate views, and local batch/automation SDK helpers built on pdmt5.
+- **mt5cli** — public `MT5Client` API, schema contracts, storage helpers, CLI commands, and SQLite history collection built on pdmt5.
 - **mt5api** — sibling HTTP adapter for remote MT5 access; not a dependency of mt5cli.
 
 ## Features
@@ -27,66 +27,68 @@ mt5cli is a CLI application that exports MetaTrader 5 trading data to multiple f
 pip install mt5cli
 ```
 
-## Programmatic usage / SDK usage
+## Python API for downstream packages
 
-mt5cli can be used as a small Python SDK for read-only MetaTrader 5 data collection. SDK functions return pandas DataFrames without writing files. Use `export_dataframe` or `export_dataframe_to_sqlite` when you need to persist results.
+Import `MT5Client` for generic MT5 data access, schema normalization, and optional order primitives. `Mt5CliClient` remains available as a backward-compatible alias.
 
 ```python
 from datetime import UTC, datetime
 from pathlib import Path
 
 from mt5cli import (
-    Mt5CliClient,
+    DataKind,
+    Dataset,
+    MT5Client,
+    build_config,
     collect_history,
-    copy_rates_range,
     export_dataframe,
-    export_dataframe_to_sqlite,
     load_rate_data,
     minimum_margins,
+    mt5_session,
+    normalize_dataframe,
     recent_ticks,
+    resolve_rate_view_name,
 )
-from mt5cli.history import resolve_rate_view_name
-
-# One-off fetch with module-level helpers
-rates = copy_rates_range(
-    "EURUSD",
-    timeframe="H1",
-    date_from="2024-01-01",
-    date_to="2024-02-01",
+
+# Persistent session for multiple calls
+with mt5_session(build_config(login=12345, server="Broker-Demo")) as client:
+    rates = client.copy_rates_range(
+        "EURUSD",
+        timeframe="H1",
+        date_from="2024-01-01",
+        date_to="2024-02-01",
+    )
+    positions = client.positions()
+    check = client.order_check({"action": 1, "symbol": "EURUSD", "volume": 0.1})
+
+# Normalize MT5 frames to the public schema contract before storage
+closed_rates = normalize_dataframe(
+    rates, DataKind.rates, symbol="EURUSD", timeframe="H1"
 )
-export_dataframe(rates, Path("rates.csv"), "csv")
+export_dataframe(closed_rates, Path("rates.csv"), "csv")
 
-# Resolve SQLite rate compatibility views for downstream tools
+# Offline rate loading from mt5cli-managed SQLite history
 view = resolve_rate_view_name(Path("history.db"), "EURUSD", "M1", require_existing=True)
 offline_rates = load_rate_data(Path("history.db"), view, count=1000)
 
-# Recent tick window and minimum margin summary
+# One-off helpers still work without instantiating a client
 ticks = recent_ticks("EURUSD", seconds=300)
 margins = minimum_margins("EURUSD")
 
-# Reuse one MT5 connection for multiple calls
-with Mt5CliClient(login=12345, password="secret", server="Broker-Demo") as client:
-    account = client.account_info()
-    positions = client.positions()
-    latest = client.latest_rates("EURUSD", "M1", count=100)
-    summary = client.mt5_summary()
-    summary_table = client.mt5_summary_as_df()
-
-# Bulk SQLite collection (same behavior as the collect-history CLI command)
 collect_history(
     Path("history.db"),
     symbols=["EURUSD", "GBPUSD"],
     date_from=datetime(2024, 1, 1, tzinfo=UTC),
     date_to=datetime(2024, 2, 1, tzinfo=UTC),
-    timeframe="M1",
-    flags="ALL",
-    with_views=True,
+    datasets={Dataset.rates, Dataset.history_deals},
 )
 ```
 
-Timeframes, tick flags, and ISO 8601 date strings are accepted wherever noted in the SDK API.
+Schema contracts live in `mt5cli.schemas` (`DataKind`, `validate_schema`, `normalize_dataframe`). Storage helpers are re-exported from `mt5cli.storage` and the package root.
+
+`MT5Client.order_send()` is a live execution primitive: it can place real trades on the connected account. mt5cli does not implement strategy logic, signal generation, backtesting, or optimization — downstream applications must gate live execution explicitly (the CLI requires `--yes` for `order-send`).
 
-`Mt5CliClient.mt5_summary()` returns the SDK structured form as plain nested Python values. Use `Mt5CliClient.mt5_summary_as_df()` when you need a one-row DataFrame for export. The `mt5-summary` CLI command uses this tabular form, so nested terminal/account fields are JSON-encoded strings that are safe for CSV, JSON, Parquet, and SQLite output.
+`MT5Client.mt5_summary()` returns structured nested Python values. Use `MT5Client.mt5_summary_as_df()` when you need a one-row DataFrame for export.
 
 ## Quick Start
 

{mt5cli-0.7.1 → mt5cli-0.7.2}/mkdocs.yml

@@ -1,5 +1,5 @@
 site_name: mt5cli API Documentation
-site_description: Command-line tool for MetaTrader 5
+site_description: Generic MT5 data and execution infrastructure for Python
 site_author: dceoy
 site_url: https://github.com/dceoy/mt5cli
 
@@ -56,6 +56,11 @@ nav:
   - Home: index.md
   - API Reference:
       - Overview: api/index.md
+      - Client: api/client.md
+      - Schemas: api/schemas.md
+      - Storage: api/storage.md
+      - Converters: api/converters.md
+      - Exceptions: api/exceptions.md
       - CLI: api/cli.md
       - SDK: api/sdk.md
       - Trading: api/trading.md

{mt5cli-0.7.1 → mt5cli-0.7.2}/mt5cli/__init__.py

@@ -1,7 +1,25 @@
-"""mt5cli: Command-line tool and SDK for MetaTrader 5."""
+"""mt5cli: Generic MT5 data and execution infrastructure for Python applications."""
 
 from importlib.metadata import version
 
+from .client import MT5Client, build_config, mt5_session
+from .converters import (
+    ensure_utc,
+    granularity_name,
+    normalize_symbol,
+    normalize_symbols,
+    parse_date_range,
+    recent_window,
+)
+from .exceptions import (
+    Mt5CliError,
+    Mt5ConnectionError,
+    Mt5OperationError,
+    Mt5SchemaError,
+    call_with_normalized_errors,
+    is_recoverable_mt5_error,
+    normalize_mt5_exception,
+)
 from .history import (
     RateTarget,
     build_rate_targets,
@@ -18,12 +36,22 @@ from .history import (
     resolve_rate_view_name,
     resolve_rate_view_names,
 )
+from .schemas import (
+    DEDUP_KEYS,
+    KNOWN_MT5_TIME_COLUMNS,
+    REQUIRED_COLUMNS,
+    TIME_COLUMNS,
+    DataKind,
+    normalize_dataframe,
+    normalize_time_columns,
+    schema_columns,
+    validate_schema,
+)
 from .sdk import (
     AccountSpec,
     Mt5CliClient,
     ThrottledHistoryUpdater,
     account_info,
-    build_config,
     collect_history,
     collect_latest_closed_rates_by_granularity,
     collect_latest_closed_rates_for_accounts,
@@ -41,7 +69,6 @@ from .sdk import (
     latest_rates,
     market_book,
     minimum_margins,
-    mt5_session,
     mt5_summary,
     mt5_summary_as_df,
     orders,
@@ -61,6 +88,13 @@ from .sdk import (
 from .sdk import (
     version as mt5_version,
 )
+from .storage import (
+    Dataset,
+    IfExists,
+    detect_format,
+    export_dataframe,
+    export_dataframe_to_sqlite,
+)
 from .trading import (
     calculate_margin_and_volume,
     detect_position_side,
@@ -70,11 +104,6 @@ from .trading import (
 from .utils import (
     TICK_FLAG_MAP,
     TIMEFRAME_MAP,
-    Dataset,
-    IfExists,
-    detect_format,
-    export_dataframe,
-    export_dataframe_to_sqlite,
     parse_datetime,
     parse_tick_flags,
     parse_timeframe,
@@ -83,12 +112,22 @@ from .utils import (
 __version__ = version(__package__) if __package__ else None
 
 __all__ = [
+    "DEDUP_KEYS",
+    "KNOWN_MT5_TIME_COLUMNS",
+    "REQUIRED_COLUMNS",
     "TICK_FLAG_MAP",
     "TIMEFRAME_MAP",
+    "TIME_COLUMNS",
     "AccountSpec",
+    "DataKind",
     "Dataset",
     "IfExists",
+    "MT5Client",
     "Mt5CliClient",
+    "Mt5CliError",
+    "Mt5ConnectionError",
+    "Mt5OperationError",
+    "Mt5SchemaError",
     "RateTarget",
     "ThrottledHistoryUpdater",
     "account_info",
@@ -96,6 +135,7 @@ __all__ = [
     "build_rate_targets",
     "build_rate_view_name",
     "calculate_margin_and_volume",
+    "call_with_normalized_errors",
     "collect_history",
     "collect_latest_closed_rates_by_granularity",
     "collect_latest_closed_rates_for_accounts",
@@ -111,10 +151,13 @@ __all__ = [
     "detect_position_side",
     "determine_order_limits",
     "drop_forming_rate_bar",
+    "ensure_utc",
     "export_dataframe",
     "export_dataframe_to_sqlite",
+    "granularity_name",
     "history_deals",
     "history_orders",
+    "is_recoverable_mt5_error",
     "last_error",
     "latest_rates",
     "load_rate_data",
@@ -128,13 +171,20 @@ __all__ = [
     "mt5_summary_as_df",
     "mt5_trading_session",
     "mt5_version",
+    "normalize_dataframe",
+    "normalize_mt5_exception",
+    "normalize_symbol",
+    "normalize_symbols",
+    "normalize_time_columns",
     "orders",
+    "parse_date_range",
     "parse_datetime",
     "parse_tick_flags",
     "parse_timeframe",
     "positions",
     "recent_history_deals",
     "recent_ticks",
+    "recent_window",
     "resolve_account_spec",
     "resolve_account_specs",
     "resolve_history_datasets",
@@ -143,6 +193,7 @@ __all__ = [
     "resolve_rate_tables",
     "resolve_rate_view_name",
     "resolve_rate_view_names",
+    "schema_columns",
     "substitute_env_placeholders",
     "symbol_info",
     "symbol_info_tick",
@@ -150,4 +201,5 @@ __all__ = [
     "terminal_info",
     "update_history",
     "update_history_with_config",
+    "validate_schema",
 ]

{mt5cli-0.7.1 → mt5cli-0.7.2}/mt5cli/cli.py

@@ -12,6 +12,7 @@ import typer
 from pdmt5 import Mt5Config
 
 from . import sdk
+from .client import MT5Client
 from .utils import (
     DATETIME_TYPE,
     REQUEST_TYPE,
@@ -91,14 +92,14 @@ def _execute_export(
     )
 
 
-def _sdk_client(ctx: typer.Context) -> sdk.Mt5CliClient:
+def _sdk_client(ctx: typer.Context) -> MT5Client:
     export_ctx = _get_export_context(ctx)
-    return sdk.Mt5CliClient(config=export_ctx.config)
+    return MT5Client(config=export_ctx.config)
 
 
 def _export_command(
     ctx: typer.Context,
-    fetch_fn: Callable[[sdk.Mt5CliClient], pd.DataFrame],
+    fetch_fn: Callable[[MT5Client], pd.DataFrame],
 ) -> None:
     """Create an SDK client, fetch a DataFrame, and export it."""
     client = _sdk_client(ctx)
@@ -573,15 +574,7 @@ def order_check(
     ],
 ) -> None:
     """Check funds sufficiency for a trading operation."""
-    export_ctx = _get_export_context(ctx)
-
-    def _fetch() -> pd.DataFrame:
-        return sdk._run_with_client(  # noqa: SLF001  # pyright: ignore[reportPrivateUsage]
-            export_ctx.config,
-            lambda c: c.order_check_as_df(request=request),
-        )
-
-    _execute_export(ctx, _fetch)
+    _export_command(ctx, lambda client: client.order_check(request))
 
 
 @app.command()
@@ -604,15 +597,7 @@ def order_send(
     if not yes:
         msg = "Pass --yes to send a live trade request."
         raise typer.BadParameter(msg, param_hint="--yes")
-    export_ctx = _get_export_context(ctx)
-
-    def _fetch() -> pd.DataFrame:
-        return sdk._run_with_client(  # noqa: SLF001  # pyright: ignore[reportPrivateUsage]
-            export_ctx.config,
-            lambda c: c.order_send_as_df(request=request),
-        )
-
-    _execute_export(ctx, _fetch)
+    _export_command(ctx, lambda client: client.order_send(request))
 
 
 @app.command()