mt5cli 1.1.5__tar.gz → 1.1.6__tar.gz

{mt5cli-1.1.5 → mt5cli-1.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mt5cli
-Version: 1.1.5
+Version: 1.1.6
 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.1
+Requires-Dist: pdmt5>=1.2.0
 Requires-Dist: pydantic>=2.13.4
 Requires-Dist: typer>=0.15.0
 Provides-Extra: otel

{mt5cli-1.1.5 → mt5cli-1.1.6}/mt5cli/converters.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import UTC, datetime, timedelta
 from typing import TYPE_CHECKING
 
-from pdmt5 import get_timeframe_name as _get_timeframe_name
+from pdmt5.constants import get_timeframe_name as _get_timeframe_name
 
 from .utils import parse_datetime, parse_tick_flags, parse_timeframe
 

{mt5cli-1.1.5 → mt5cli-1.1.6}/mt5cli/history.py

@@ -13,7 +13,7 @@ from typing import TYPE_CHECKING, Literal, SupportsInt, cast, overload
 
 import pandas as pd
 from pdmt5 import Mt5RuntimeError
-from pdmt5 import get_timeframe_name as _get_timeframe_name
+from pdmt5.constants import get_timeframe_name as _get_timeframe_name
 
 from .schemas import DEDUP_KEYS, REQUIRED_COLUMNS, DataKind, ensure_utc_columns
 from .utils import (

{mt5cli-1.1.5 → mt5cli-1.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mt5cli"
-version = "1.1.5"
+version = "1.1.6"
 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.1",
+  "pdmt5 >= 1.2.0",
   "pandas >= 2.2.2",
   "pydantic >= 2.13.4",
   "click >= 8.1.0",

mt5cli-1.1.6/tests/test_client.py

@@ -0,0 +1,44 @@
+"""Tests for mt5cli.client module."""
+
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+from mt5cli.client import MT5Client, mt5_session
+from mt5cli.sdk import build_config
+
+if TYPE_CHECKING:
+    from unittest.mock import MagicMock
+
+    from pytest_mock import MockerFixture
+
+
+def test_order_check_and_order_send_route_through_connected_client(
+    mock_client: MagicMock,
+) -> None:
+    """order_check/order_send fetch through the same connected client path."""
+    request = {"action": 1}
+    client = MT5Client()
+    client.order_check(request)
+    client.order_send(request)
+    mock_client.order_check_as_df.assert_called_once_with(request=request)
+    mock_client.order_send_as_df.assert_called_once_with(request=request)
+
+
+def test_from_connected_client_binds_without_owning(mock_client: MagicMock) -> None:
+    """from_connected_client wraps an injected client without shutting it down."""
+    client = MT5Client.from_connected_client(mock_client)
+    with client:
+        client.order_check({"action": 1})
+    mock_client.shutdown.assert_not_called()
+
+
+def test_mt5_session_yields_connected_mt5_client(mocker: MockerFixture) -> None:
+    """Public mt5_session yields an MT5Client bound to a connected session."""
+    connected = mocker.MagicMock()
+    context = mocker.MagicMock()
+    context.__enter__.return_value = connected
+    context.__exit__.return_value = False
+    mocker.patch("mt5cli.client.connected_client", return_value=context)
+    with mt5_session(build_config()) as client:
+        assert isinstance(client, MT5Client)

{mt5cli-1.1.5 → mt5cli-1.1.6}/tests/test_contracts.py

@@ -2,15 +2,7 @@
 
 from __future__ import annotations
 
-import importlib
-import sqlite3
 from datetime import UTC, datetime
-from importlib.metadata import requires
-from typing import TYPE_CHECKING, get_type_hints
-from unittest.mock import MagicMock
-
-if TYPE_CHECKING:
-    from pathlib import Path
 
 import pandas as pd
 import pytest
@@ -20,37 +12,9 @@ from pytest_mock import MockerFixture  # noqa: TC002
 import mt5cli
 from mt5cli import (
     STABLE_SDK_EXPORTS,
-    AccountSpec,
-    ExecutionStatus,
-    MarginVolume,
-    MT5Client,
     Mt5CliError,
     Mt5ConnectionError,
     Mt5SchemaError,
-    OrderExecutionResult,
-    OrderLimits,
-    RateTarget,
-    build_config,
-    build_rate_targets,
-    calculate_account_projected_margin_ratio,
-    calculate_margin_and_volume,
-    calculate_positions_margin,
-    calculate_projected_margin_ratio,
-    calculate_symbol_group_margin_ratio,
-    calculate_trailing_stop_updates,
-    drop_forming_rate_bar,
-    ensure_symbol_selected,
-    extract_tick_price,
-    fetch_latest_closed_rates,
-    fetch_latest_closed_rates_for_trading_client,
-    fetch_latest_closed_rates_indexed,
-    load_rate_series_from_sqlite,
-    mt5_session,
-    mt5_trading_session,
-    normalize_order_volume,
-    place_market_order,
-    resolve_account_spec,
-    resolve_account_specs,
 )
 from mt5cli.converters import (
     ensure_utc,
@@ -65,11 +29,6 @@ from mt5cli.exceptions import (
     is_recoverable_mt5_error,
     normalize_mt5_exception,
 )
-from mt5cli.history import (
-    create_rate_compatibility_views,
-    load_rate_data,
-    resolve_rate_view_name,
-)
 from mt5cli.retry import retry_with_backoff
 from mt5cli.schemas import (
     DEDUP_KEYS,
@@ -82,12 +41,6 @@ from mt5cli.schemas import (
     schema_columns,
     validate_schema,
 )
-from mt5cli.utils import (
-    Dataset,
-    detect_format,
-    export_dataframe,
-    export_dataframe_to_sqlite,
-)
 
 _SAMPLE_FRAME_COLUMNS: dict[DataKind, dict[str, list[object]]] = {
     DataKind.rates: {
@@ -198,13 +151,6 @@ def test_validate_schema_raises_for_missing_columns() -> None:
         validate_schema(pd.DataFrame({"time": [1]}), DataKind.rates)
 
 
-def test_history_dedup_keys_match_schema_contract() -> None:
-    """SQLite history dedup keys stay aligned with schema contracts."""
-    assert DEDUP_KEYS[DataKind.rates][0] == ("symbol", "timeframe", "time")
-    assert DEDUP_KEYS[DataKind.ticks][0] == ("symbol", "time_msc")
-    assert Dataset.rates.table_name == "rates"
-
-
 @pytest.mark.parametrize(
     ("raw", "expected"),
     [
@@ -308,40 +254,6 @@ def test_retry_with_backoff_retries_recoverable_errors(
     assert calls["count"] == 2
 
 
-def test_public_api_exports_mt5_client() -> None:
-    """MT5Client is the primary importable client abstraction."""
-    client = MT5Client(config=build_config())
-    assert isinstance(client, MT5Client)
-    assert isinstance(client, MT5Client.__mro__[1])
-
-
-def test_mt5_client_order_primitives_use_connected_client(
-    mock_client: object,
-) -> None:
-    """Order check/send route through the same client fetch path as exports."""
-    request = {"action": 1}
-    client = MT5Client()
-    client.order_check(request)
-    client.order_send(request)
-    assert mock_client.order_check_as_df.call_count == 1  # type: ignore[attr-defined]
-    assert mock_client.order_send_as_df.call_count == 1  # type: ignore[attr-defined]
-
-
-def test_storage_export_round_trip_csv(tmp_path: Path) -> None:
-    """Storage helpers export normalized rate frames to CSV."""
-    frame = normalize_dataframe(
-        _sample_frame(DataKind.rates),
-        DataKind.rates,
-        symbol="EURUSD",
-        timeframe="M1",
-    )
-    output = tmp_path / "rates.csv"
-    export_dataframe(frame, output, detect_format(output))
-    loaded = pd.read_csv(output)
-    assert len(loaded) == 1
-    assert "close" in loaded.columns
-
-
 def test_normalize_symbol_rejects_empty_value() -> None:
     """Empty symbols are rejected after trimming."""
     with pytest.raises(ValueError, match="must not be empty"):
@@ -408,6 +320,18 @@ def test_schema_columns_and_extra_required_validation() -> None:
         validate_schema(frame, DataKind.rates, extra_required=["storage_symbol"])
 
 
+def test_dedup_keys_match_storage_deduplication_contract() -> None:
+    """SQLite history dedup keys stay aligned with the documented schema contract."""
+    assert DEDUP_KEYS[DataKind.rates][0] == ("symbol", "timeframe", "time")
+    assert DEDUP_KEYS[DataKind.ticks][0] == ("symbol", "time_msc")
+
+
+def test_time_columns_include_optional_order_fields() -> None:
+    """Schema contracts document optional MT5 time columns per dataset kind."""
+    assert "time_done" in TIME_COLUMNS[DataKind.orders]
+    assert "time_setup_msc" in TIME_COLUMNS[DataKind.history_orders]
+
+
 def test_normalize_dataframe_empty_and_tick_sort_paths() -> None:
     """Normalization handles empty frames and tick time_msc sorting."""
     empty = pd.DataFrame()
@@ -492,12 +416,6 @@ def test_normalize_time_columns_handles_optional_order_times() -> None:
     )
 
 
-def test_time_columns_include_optional_order_fields() -> None:
-    """Schema contracts document optional MT5 time columns per dataset kind."""
-    assert "time_done" in TIME_COLUMNS[DataKind.orders]
-    assert "time_setup_msc" in TIME_COLUMNS[DataKind.history_orders]
-
-
 def test_normalize_dataframe_sorts_ticks_by_time_msc(
     mocker: MockerFixture,
 ) -> None:
@@ -527,17 +445,6 @@ def test_ensure_utc_columns_coerces_non_mt5_columns() -> None:
     assert result.loc[0, "created_at"] == pd.Timestamp("2024-01-01T00:00:00+00:00")
 
 
-def test_mt5_session_yields_connected_client(mocker: MockerFixture) -> None:
-    """Public mt5_session yields an MT5Client bound to a connected session."""
-    connected = mocker.MagicMock()
-    context = mocker.MagicMock()
-    context.__enter__.return_value = connected
-    context.__exit__.return_value = False
-    mocker.patch("mt5cli.client.connected_client", return_value=context)
-    with mt5_session(build_config()) as client:
-        assert isinstance(client, MT5Client)
-
-
 def test_retry_with_backoff_reraises_non_recoverable_errors() -> None:
     """Non-MT5 errors are not retried."""
 
@@ -549,40 +456,9 @@ def test_retry_with_backoff_reraises_non_recoverable_errors() -> None:
         retry_with_backoff(_raise, retry_count=2)
 
 
-def test_storage_export_round_trip_sqlite(tmp_path: Path) -> None:
-    """Storage helpers append deduplicated frames to SQLite."""
-    frame = normalize_dataframe(
-        _sample_frame(DataKind.rates),
-        DataKind.rates,
-        symbol="EURUSD",
-        timeframe="M1",
-    )
-    output = tmp_path / "rates.db"
-    export_dataframe_to_sqlite(
-        frame,
-        output,
-        "rates",
-        deduplicate_on=DEDUP_KEYS[DataKind.rates][0],
-    )
-    with __import__("sqlite3").connect(output) as conn:
-        count = conn.execute("SELECT COUNT(*) FROM rates").fetchone()[0]
-    assert count == 1
-
-
-def test_storage_module_does_not_exist() -> None:
-    """mt5cli.storage re-export module has been removed."""
-    with pytest.raises(ModuleNotFoundError):
-        importlib.import_module("mt5cli.storage")
-
-
 class TestStableSdkContract:
     """Tests for the documented stable downstream SDK contract."""
 
-    def test_stable_exports_are_subset_of_all(self) -> None:
-        """Every stable export is also listed in the package __all__."""
-        missing = sorted(STABLE_SDK_EXPORTS - set(mt5cli.__all__))
-        assert not missing, f"STABLE_SDK_EXPORTS missing from __all__: {missing}"
-
     def test_stable_exports_cover_root_api(self) -> None:
         """STABLE_SDK_EXPORTS classifies every package-root symbol."""
         tier_metadata = {"STABLE_SDK_EXPORTS"}
@@ -603,277 +479,27 @@ class TestStableSdkContract:
         """Stable SDK names resolve through ``from mt5cli import ...``."""
         assert hasattr(mt5cli, name), f"{name!r} missing from mt5cli package root"
 
-    def test_drop_forming_rate_bar_from_package_root(self) -> None:
-        """Closed-bar trimming is available from the stable package surface."""
-        frame = pd.DataFrame({"time": [1, 2, 3], "close": [1.0, 1.1, 1.2]})
-        closed = drop_forming_rate_bar(frame)
-        assert list(closed["close"]) == [1.0, 1.1]
-        assert len(closed) == 2
-
-    def test_fetch_latest_closed_rates_from_package_root(self) -> None:
-        """Single-client closed-bar helper drops the forming row."""
-        client = MagicMock()
-        client.latest_rates.return_value = pd.DataFrame(
-            {"time": [1, 2, 3], "close": [1.0, 1.1, 1.2]},
-        )
-
-        result = fetch_latest_closed_rates(
-            client,
-            symbol="EURUSD",
-            granularity="M1",
-            count=2,
-        )
-
-        client.latest_rates.assert_called_once_with("EURUSD", "M1", 3, start_pos=0)
-        assert list(result["close"]) == [1.0, 1.1]
-
-    def test_fetch_latest_closed_rates_for_trading_client_from_package_root(
-        self,
-    ) -> None:
-        """Trading-client closed-bar helper is importable from the stable surface."""
-        client = MagicMock()
-        client.fetch_latest_rates_as_df.return_value = pd.DataFrame(
-            {"time": [1, 2, 3], "close": [1.0, 1.1, 1.2]},
-        )
-
-        result = fetch_latest_closed_rates_for_trading_client(
-            client,
-            symbol="EURUSD",
-            granularity="M1",
-            count=2,
-        )
-
-        assert list(result["close"]) == [1.0, 1.1]
-
-    def test_normalize_order_volume_from_package_root(self) -> None:
-        """Volume normalization helper is importable from the stable surface."""
-        result = normalize_order_volume(
-            0.25,
-            volume_min=0.1,
-            volume_max=1.0,
-            volume_step=0.1,
-        )
-        assert abs(result - 0.2) < 1e-9
-
-    def test_calculate_positions_margin_from_package_root(self) -> None:
-        """Position margin helper is importable from the stable surface."""
-        client = MagicMock()
-        client.mt5.POSITION_TYPE_BUY = 0
-        client.mt5.POSITION_TYPE_SELL = 1
-        client.mt5.ORDER_TYPE_BUY = 10
-        client.mt5.ORDER_TYPE_SELL = 11
-        client.positions_get_as_df.return_value = pd.DataFrame()
-
-        assert calculate_positions_margin(client) == 0
-
-    def test_generic_trading_helpers_from_package_root(self) -> None:
-        """New generic trading helpers resolve through the stable surface."""
-        price = extract_tick_price({"bid": "1.2"}, "bid")
-        assert price is not None
-        assert abs(price - 1.2) < 1e-9
-        assert callable(calculate_trailing_stop_updates)
-        assert callable(calculate_account_projected_margin_ratio)
-        assert callable(calculate_projected_margin_ratio)
-        assert callable(calculate_symbol_group_margin_ratio)
-
-    def test_load_rate_series_from_sqlite_requires_managed_views(
-        self,
-        tmp_path: Path,
-    ) -> None:
-        """Multi-series loading fails clearly when managed views are absent."""
-        db_path = tmp_path / "empty-views.db"
-        with sqlite3.connect(db_path) as conn:
-            conn.execute(
-                "CREATE TABLE rates("
-                " symbol TEXT, timeframe INTEGER, time TEXT, close REAL)",
-            )
-
-        targets = build_rate_targets(["EURUSD"], ["M1"])
-        with pytest.raises(ValueError, match="No rate compatibility view exists"):
-            load_rate_series_from_sqlite(db_path, targets, count=10)
-
-        assert targets == [RateTarget(symbol="EURUSD", timeframe=1)]
-
-    def test_resolve_account_spec_from_package_root(
-        self,
-        monkeypatch: pytest.MonkeyPatch,
-    ) -> None:
-        """Account credential resolution uses generic ${ENV_VAR} placeholders."""
-        monkeypatch.setenv("APP_MT5_LOGIN", "555")
-        monkeypatch.setenv("APP_MT5_PASSWORD", "secret")
-        account = AccountSpec(
-            symbols=["EURUSD"],
-            login="${APP_MT5_LOGIN}",
-            password="${APP_MT5_PASSWORD}",
-            server="Broker-Demo",
-        )
-
-        resolved = resolve_account_spec(account, timeout=3000)
-        assert resolved.login == "555"
-        assert resolved.password == "secret"  # noqa: S105
-        assert resolved.timeout == 3000
-
-        batch = resolve_account_specs([account], server="Override")
-        assert batch[0].server == "Override"
-
-    def test_mt5_trading_session_lifecycle_from_package_root(
-        self,
-        mocker: MockerFixture,
-    ) -> None:
-        """Trading session helper initializes and always shuts down."""
-        mock_client = MagicMock()
-        mocker.patch(
-            "mt5cli.trading.Mt5DataClient",
-            return_value=mock_client,
-        )
-
-        with mt5_trading_session(login=12345, server="Broker-Demo") as client:
-            assert client is mock_client
-            mock_client.initialize_and_login_mt5.assert_called_once()
-
-        mock_client.shutdown.assert_called_once()
-
-    def test_trading_order_helpers_importable_from_package_root(self) -> None:
-        """Order planning helpers resolve through the stable package surface."""
-        assert callable(calculate_margin_and_volume)
-        assert callable(ensure_symbol_selected)
-        assert callable(place_market_order)
-        margin_hints = get_type_hints(MarginVolume)
-        limits_hints = get_type_hints(OrderLimits)
-        execution_hints = get_type_hints(OrderExecutionResult)
-        assert margin_hints["buy_volume"] is float
-        assert limits_hints["stop_loss"] == float | None
-        assert execution_hints["status"] == ExecutionStatus
-
-    def test_mt5_trading_session_shuts_down_on_exception(
-        self,
-        mocker: MockerFixture,
-    ) -> None:
-        """Trading session helper shuts down even when the body raises."""
-        mock_client = MagicMock()
-        mocker.patch(
-            "mt5cli.trading.Mt5DataClient",
-            return_value=mock_client,
-        )
-
-        message = "strategy error"
-        with (
-            pytest.raises(RuntimeError, match=message),
-            mt5_trading_session(login=12345, server="Broker-Demo"),
-        ):
-            raise RuntimeError(message)
-
-        mock_client.shutdown.assert_called_once()
-
-    def test_fetch_latest_closed_rates_indexed_from_package_root(
-        self,
-        mocker: MockerFixture,
-    ) -> None:
-        """Indexed closed-bar helper returns a UTC DatetimeIndex named 'time'."""
-        client = MagicMock()
-        mocker.patch(
-            "mt5cli.trading.fetch_latest_closed_rates_for_trading_client",
-            return_value=pd.DataFrame(
-                {
-                    "time": [1704067200, 1704153600, 1704240000],
-                    "close": [1.0, 1.1, 1.2],
-                },
-            ),
-        )
-
-        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 result.index.tz is not None
-        assert "time" not in result.columns
-        assert "close" in result.columns
-
-    def test_rate_view_helpers_in_history_module(self, tmp_path: Path) -> None:
-        """Rate view helpers are available from mt5cli.history."""
-        db_path = tmp_path / "rates.db"
-        with sqlite3.connect(db_path) as conn:
-            conn.execute(
-                "CREATE TABLE rates("
-                " symbol TEXT, timeframe INTEGER, time TEXT, close REAL)",
-            )
-            conn.execute(
-                "INSERT INTO rates(symbol, timeframe, time, close) VALUES (?, ?, ?, ?)",
-                ("EURUSD", 1, "2024-01-01T00:00:00+00:00", 1.0),
-            )
-            create_rate_compatibility_views(conn)
-
-        assert resolve_rate_view_name(db_path, "EURUSD", "M1") == "rate_EURUSD__1"
-        missing = tmp_path / "missing.db"
-        with pytest.raises(ValueError, match="SQLite database not found"):
-            resolve_rate_view_name(missing, "EURUSD", "M1", require_existing=True)
-
-    def test_load_rate_data_in_history_module(self, tmp_path: Path) -> None:
-        """SQLite rate loading normalizes timestamps through mt5cli.history."""
-        db_path = tmp_path / "view.db"
-        with sqlite3.connect(db_path) as conn:
-            conn.execute(
-                'CREATE VIEW "rate_EURUSD__1" AS'
-                " SELECT '2024-01-01T00:00:00+00:00' AS time, 1.1 AS close",
-            )
-
-        frame = load_rate_data(db_path, "rate_EURUSD__1")
-        assert frame.index.name == "time"
-        assert abs(float(frame.iloc[0]["close"]) - 1.1) < 1e-9
-
 
 @pytest.mark.parametrize(
     "name",
     [
         "Mt5Config",
         "Mt5RuntimeError",
-        "Mt5TradingClient",
-        "Mt5TradingError",
-        "TICK_FLAG_MAP",
+        "Mt5DataClient",
         "TIMEFRAME_MAP",
+        "COPY_TICKS_MAP",
+        "ORDER_TYPE_MAP",
     ],
 )
-def test_pdmt5_pass_through_names_removed_from_public_contract(name: str) -> None:
-    """Removed pdmt5 pass-through names are not part of the public contract."""
+def test_pdmt5_pass_through_names_stay_out_of_public_contract(name: str) -> None:
+    """Downstream code must import pdmt5 types/constants directly from pdmt5.
+
+    docs/api/public-contract.md documents that mt5cli is not a pass-through
+    compatibility namespace for pdmt5; these names must never reappear on the
+    mt5cli package root.
+    """
     assert name not in STABLE_SDK_EXPORTS, (
         f"{name!r} should not be in STABLE_SDK_EXPORTS"
     )
     assert name not in mt5cli.__all__, f"{name!r} should not be in mt5cli.__all__"
-
-
-def test_mt5cli_does_not_import_high_level_trading_symbols() -> None:
-    """mt5cli doesn't import Mt5TradingClient or Mt5TradingError at module level."""
-    trading_module = importlib.import_module("mt5cli.trading")
-    module_dict = vars(trading_module)
-    assert "Mt5TradingClient" not in module_dict, (
-        "mt5cli.trading should not import Mt5TradingClient at module level"
-    )
-    assert "Mt5TradingError" not in module_dict, (
-        "mt5cli.trading should not import Mt5TradingError at module level"
-    )
-
-
-# ---------------------------------------------------------------------------
-# Packaging metadata
-# ---------------------------------------------------------------------------
-
-
-def test_parquet_extra_declares_pyarrow() -> None:
-    """Package metadata lists pyarrow under the parquet optional extra."""
-    reqs = requires("mt5cli") or []
-    parquet_reqs = [r for r in reqs if "pyarrow" in r and "parquet" in r]
-    assert parquet_reqs, "pyarrow not found in parquet optional extra"
-
-
-def test_pyarrow_not_in_core_dependencies() -> None:
-    """Pyarrow is not a core dependency; it belongs only in the parquet extra."""
-    reqs = requires("mt5cli") or []
-    core_reqs = [r for r in reqs if "extra ==" not in r]
-    assert not any("pyarrow" in r for r in core_reqs), (
-        "pyarrow should not appear in core dependencies"
-    )
+    assert not hasattr(mt5cli, name), f"{name!r} should not be on the mt5cli root"

{mt5cli-1.1.5 → mt5cli-1.1.6}/tests/test_examples.py

@@ -29,10 +29,6 @@ def dashboard_path(request: pytest.FixtureRequest) -> Iterator[Path]:
 class TestGrafanaExamples:
     """Validate structure and content of bundled Grafana example files."""
 
-    def test_dashboard_json_files_are_present(self) -> None:
-        """At least one dashboard JSON file is bundled."""
-        assert _dashboard_json_files(), "No dashboard JSON files found"
-
     def test_dashboard_json_file_is_valid_json(self, dashboard_path: Path) -> None:
         """Each dashboard JSON file parses to a JSON object."""
         content = dashboard_path.read_text(encoding="utf-8")
@@ -41,6 +37,13 @@ class TestGrafanaExamples:
             f"{dashboard_path.name} root must be a JSON object"
         )
 
+    def test_dashboard_json_uses_grafana_views(self, dashboard_path: Path) -> None:
+        """Each dashboard JSON file queries grafana_* views."""
+        content = dashboard_path.read_text(encoding="utf-8")
+        assert "grafana_" in content, (
+            f"{dashboard_path.name} must contain queries against grafana_* views"
+        )
+
     @pytest.mark.parametrize("private_pattern", ["password", "api_key", "apikey"])
     def test_dashboard_json_has_no_private_placeholders(
         self,
@@ -53,13 +56,6 @@ class TestGrafanaExamples:
             f"{dashboard_path.name} contains {private_pattern!r}"
         )
 
-    def test_dashboard_json_uses_grafana_views(self, dashboard_path: Path) -> None:
-        """Each dashboard JSON file queries grafana_* views."""
-        content = dashboard_path.read_text(encoding="utf-8")
-        assert "grafana_" in content, (
-            f"{dashboard_path.name} must contain queries against grafana_* views"
-        )
-
     @pytest.mark.parametrize("field", ["uid", "title"])
     def test_dashboard_json_has_required_field(
         self,

{mt5cli-1.1.5 → mt5cli-1.1.6}/tests/test_grafana.py

@@ -127,19 +127,6 @@ class TestSnapshotTables:
 class TestCreateViewSafe:
     """Tests for _create_view_safe."""
 
-    def test_creates_view_successfully(self, conn: sqlite3.Connection) -> None:
-        """A valid select SQL creates the named view."""
-        _create_view_safe(conn, "test_view", "SELECT 1 AS val")
-        views = _get_names(conn, "view")
-        assert "test_view" in views
-
-    def test_replaces_existing_view(self, conn: sqlite3.Connection) -> None:
-        """Calling again with a new SQL replaces the existing view."""
-        _create_view_safe(conn, "test_view", "SELECT 1 AS val")
-        _create_view_safe(conn, "test_view", "SELECT 2 AS val")
-        result = conn.execute("SELECT val FROM test_view").fetchone()
-        assert result == (2,)
-
     def test_logs_warning_on_sqlite_error(
         self,
         caplog: pytest.LogCaptureFixture,

mt5cli-1.1.6/tests/test_packaging.py

@@ -0,0 +1,36 @@
+"""Packaging metadata invariants for mt5cli."""
+
+from __future__ import annotations
+
+from importlib.metadata import requires
+
+from packaging.requirements import Requirement
+
+
+def _mt5cli_requirements() -> list[Requirement]:
+    reqs = requires("mt5cli") or []
+    return [Requirement(r) for r in reqs]
+
+
+def test_parquet_extra_declares_pyarrow() -> None:
+    """Package metadata lists pyarrow under the parquet optional extra."""
+    parquet_reqs = [
+        req
+        for req in _mt5cli_requirements()
+        if req.name == "pyarrow"
+        and req.marker is not None
+        and 'extra == "parquet"' in str(req.marker)
+    ]
+    assert parquet_reqs, "pyarrow not found in parquet optional extra"
+
+
+def test_pyarrow_not_in_core_dependencies() -> None:
+    """Pyarrow is not a core dependency; it belongs only in the parquet extra."""
+    core_reqs = [
+        req
+        for req in _mt5cli_requirements()
+        if req.marker is None or "extra ==" not in str(req.marker)
+    ]
+    assert not any(req.name == "pyarrow" for req in core_reqs), (
+        "pyarrow should not appear in core dependencies"
+    )

{mt5cli-1.1.5 → mt5cli-1.1.6}/tests/test_telemetry.py

@@ -6,29 +6,15 @@ from unittest.mock import MagicMock
 
 import pytest
 from opentelemetry.sdk.metrics.export import InMemoryMetricReader
+from pytest_mock import MockerFixture  # noqa: TC002
 
 from mt5cli.telemetry import (
-    _OTEL_AVAILABLE,  # type: ignore[reportPrivateUsage]
     _Mt5Metrics,  # type: ignore[reportPrivateUsage]
-    _NoOp,  # type: ignore[reportPrivateUsage]
     configure_metrics,
     enable_otel_metrics,
-    get_metrics,
 )
 
 
-class TestNoOp:
-    """Tests for _NoOp no-op instrument."""
-
-    @pytest.mark.parametrize("method", ["add", "set", "record"])
-    def test_method_is_noop(self, method: str) -> None:
-        """_NoOp methods accept amount and optional attributes without error."""
-        noop = _NoOp()
-        bound = getattr(noop, method)
-        bound(1.0)
-        bound(1.0, {"key": "val"})
-
-
 class TestMt5Metrics:
     """Tests for _Mt5Metrics."""
 
@@ -244,17 +230,17 @@ class TestMt5Metrics:
 
 
 class TestConfigureMetrics:
-    """Tests for configure_metrics and get_metrics."""
+    """Tests for the module-level configure_metrics wiring function."""
 
-    def test_configure_metrics_updates_global(self) -> None:
-        """configure_metrics wires up the global singleton."""
+    def test_configure_metrics_delegates_to_global_registry(
+        self,
+        mocker: MockerFixture,
+    ) -> None:
+        """configure_metrics(meter) delegates exactly once to the registry."""
         meter = MagicMock()
+        configure_spy = mocker.patch("mt5cli.telemetry._metrics.configure")
         configure_metrics(meter)
-        assert get_metrics() is get_metrics()
-
-    def test_get_metrics_returns_mt5metrics(self) -> None:
-        """get_metrics returns the global _Mt5Metrics instance."""
-        assert isinstance(get_metrics(), _Mt5Metrics)
+        configure_spy.assert_called_once_with(meter)
 
 
 class TestEnableOtelMetrics:
@@ -306,7 +292,3 @@ class TestEnableOtelMetrics:
         monkeypatch.setattr("mt5cli.telemetry._OtelOTLPExporter", None)
         with pytest.raises(ImportError, match="opentelemetry-exporter-otlp-proto-http"):
             enable_otel_metrics()
-
-    def test_otel_available_flag_is_bool(self) -> None:
-        """_OTEL_AVAILABLE is a boolean."""
-        assert isinstance(_OTEL_AVAILABLE, bool)

{mt5cli-1.1.5 → mt5cli-1.1.6}/tests/test_utils.py

@@ -11,8 +11,6 @@ from typing import TYPE_CHECKING
 import pandas as pd
 import pytest
 
-import mt5cli.utils
-
 if TYPE_CHECKING:
     from pathlib import Path
 
@@ -397,11 +395,6 @@ class TestParseRequest:
 class TestConstants:
     """Tests for module constants."""
 
-    @pytest.mark.parametrize("name", ["TIMEFRAME_MAP", "TICK_FLAG_MAP"])
-    def test_private_maps_absent_from_utils(self, name: str) -> None:
-        """Private pdmt5 maps are not exposed as public mt5cli.utils attributes."""
-        assert not hasattr(mt5cli.utils, name)
-
     @pytest.mark.parametrize(
         ("dataset", "expected"),
         [

{mt5cli-1.1.5 → mt5cli-1.1.6}/uv.lock

@@ -370,7 +370,7 @@ name = "metatrader5"
 version = "5.0.5735"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
-    { name = "numpy" },
+    { name = "numpy", marker = "sys_platform == 'win32'" },
 ]
 wheels = [
     { url = "https://files.pythonhosted.org/packages/07/0b/3dd5143f14319dca393a3bcf11ddf24f36f16dfb8c6d1bf2b193ce0c5733/metatrader5-5.0.5735-cp311-cp311-win_amd64.whl", hash = "sha256:0d05b69cef5eb3f43ea47cb6d36dac0e7e15f82a4fb77974439c565daa54d1c9", size = 48091, upload-time = "2026-04-04T16:44:08.677Z" },
@@ -499,7 +499,7 @@ wheels = [
 
 [[package]]
 name = "mt5cli"
-version = "1.1.5"
+version = "1.1.6"
 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.1" },
+    { name = "pdmt5", specifier = ">=1.2.0" },
     { 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.1"
+version = "1.2.0"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "metatrader5", marker = "sys_platform == 'win32'" },
     { name = "pandas" },
     { name = "pydantic" },
 ]
-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" }
+sdist = { url = "https://files.pythonhosted.org/packages/9b/44/410bdc4d567ddb49f5b8d0d366467c9cce5e1862ecfbbcd09734c8f34eac/pdmt5-1.2.0.tar.gz", hash = "sha256:972f500ee7e50032a14f83874baccbef69bf7377335011f72d0bbdd6e221edcd", size = 24017, upload-time = "2026-07-10T15:21:27.215Z" }
 wheels = [
-    { 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" },
+    { url = "https://files.pythonhosted.org/packages/12/ec/88297de8aad400c922715cbdc15804dcf1ac5fbc0a3a0abeafc988c3c25d/pdmt5-1.2.0-py3-none-any.whl", hash = "sha256:ce355f24f4ec08ba5cc0148b5c529f73c671ea2e83b1d65248de1150369daeb7", size = 22369, upload-time = "2026-07-10T15:21:25.833Z" },
 ]
 
 [[package]]