pdmt5 0.2.1__py3-none-any.whl → 0.2.3__py3-none-any.whl

pdmt5/dataframe.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 import time
 from datetime import datetime  # noqa: TC003
-from typing import Any
+from typing import Any, cast
 
 import pandas as pd
 from pydantic import BaseModel, ConfigDict, Field
@@ -73,12 +73,10 @@ class Mt5DataClient(Mt5Client):
             Mt5RuntimeError: If initialization fails after retries.
         """
         path = path or self.config.path
-        login_kwargs = {
-            "login": login or self.config.login,
-            "password": password or self.config.password,
-            "server": server or self.config.server,
-            "timeout": timeout or self.config.timeout,
-        }
+        login_value = login if login is not None else self.config.login
+        password_value = password if password is not None else self.config.password
+        server_value = server if server is not None else self.config.server
+        timeout_value = timeout if timeout is not None else self.config.timeout
         for i in range(1 + max(0, self.retry_count)):
             if i:
                 self.logger.warning(
@@ -87,8 +85,20 @@ class Mt5DataClient(Mt5Client):
                     self.retry_count,
                 )
                 time.sleep(i)
-            if self.initialize(path=path, **login_kwargs) and (
-                (not login_kwargs["login"]) or self.login(**login_kwargs)
+            if self.initialize(
+                path=path,
+                login=login_value,
+                password=password_value,
+                server=server_value,
+                timeout=timeout_value,
+            ) and (
+                login_value is None
+                or self.login(
+                    login=login_value,
+                    password=password_value,
+                    server=server_value,
+                    timeout=timeout_value,
+                )
             ):
                 return
         error_message = (
@@ -359,14 +369,17 @@ class Mt5DataClient(Mt5Client):
         Returns:
             List of dictionaries with OHLCV data.
         """
-        return self.copy_rates_from_as_df(
-            symbol=symbol,
-            timeframe=timeframe,
-            date_from=date_from,
-            count=count,
-            skip_to_datetime=skip_to_datetime,
-            index_keys=None,
-        ).to_dict(orient="records")
+        return cast(
+            "list[dict[str, Any]]",
+            self.copy_rates_from_as_df(
+                symbol=symbol,
+                timeframe=timeframe,
+                date_from=date_from,
+                count=count,
+                skip_to_datetime=skip_to_datetime,
+                index_keys=None,
+            ).to_dict(orient="records"),
+        )
 
     @set_index_if_possible(index_parameters="index_keys")
     @detect_and_convert_time_to_datetime(skip_toggle="skip_to_datetime")
@@ -422,14 +435,17 @@ class Mt5DataClient(Mt5Client):
         Returns:
             List of dictionaries with OHLCV data.
         """
-        return self.copy_rates_from_pos_as_df(
-            symbol=symbol,
-            timeframe=timeframe,
-            start_pos=start_pos,
-            count=count,
-            skip_to_datetime=skip_to_datetime,
-            index_keys=None,
-        ).to_dict(orient="records")
+        return cast(
+            "list[dict[str, Any]]",
+            self.copy_rates_from_pos_as_df(
+                symbol=symbol,
+                timeframe=timeframe,
+                start_pos=start_pos,
+                count=count,
+                skip_to_datetime=skip_to_datetime,
+                index_keys=None,
+            ).to_dict(orient="records"),
+        )
 
     @set_index_if_possible(index_parameters="index_keys")
     @detect_and_convert_time_to_datetime(skip_toggle="skip_to_datetime")
@@ -486,14 +502,17 @@ class Mt5DataClient(Mt5Client):
         Returns:
             List of dictionaries with OHLCV data.
         """
-        return self.copy_rates_range_as_df(
-            symbol=symbol,
-            timeframe=timeframe,
-            date_from=date_from,
-            date_to=date_to,
-            skip_to_datetime=skip_to_datetime,
-            index_keys=None,
-        ).to_dict(orient="records")
+        return cast(
+            "list[dict[str, Any]]",
+            self.copy_rates_range_as_df(
+                symbol=symbol,
+                timeframe=timeframe,
+                date_from=date_from,
+                date_to=date_to,
+                skip_to_datetime=skip_to_datetime,
+                index_keys=None,
+            ).to_dict(orient="records"),
+        )
 
     @set_index_if_possible(index_parameters="index_keys")
     @detect_and_convert_time_to_datetime(skip_toggle="skip_to_datetime")
@@ -549,14 +568,17 @@ class Mt5DataClient(Mt5Client):
         Returns:
             List of dictionaries with tick data.
         """
-        return self.copy_ticks_from_as_df(
-            symbol=symbol,
-            date_from=date_from,
-            count=count,
-            flags=flags,
-            skip_to_datetime=skip_to_datetime,
-            index_keys=None,
-        ).to_dict(orient="records")  # type: ignore[reportReturnType]
+        return cast(
+            "list[dict[str, Any]]",
+            self.copy_ticks_from_as_df(
+                symbol=symbol,
+                date_from=date_from,
+                count=count,
+                flags=flags,
+                skip_to_datetime=skip_to_datetime,
+                index_keys=None,
+            ).to_dict(orient="records"),
+        )
 
     @set_index_if_possible(index_parameters="index_keys")
     @detect_and_convert_time_to_datetime(skip_toggle="skip_to_datetime")
@@ -612,14 +634,17 @@ class Mt5DataClient(Mt5Client):
         Returns:
             List of dictionaries with tick data.
         """
-        return self.copy_ticks_range_as_df(
-            symbol=symbol,
-            date_from=date_from,
-            date_to=date_to,
-            flags=flags,
-            skip_to_datetime=skip_to_datetime,
-            index_keys=None,
-        ).to_dict(orient="records")  # type: ignore[reportReturnType]
+        return cast(
+            "list[dict[str, Any]]",
+            self.copy_ticks_range_as_df(
+                symbol=symbol,
+                date_from=date_from,
+                date_to=date_to,
+                flags=flags,
+                skip_to_datetime=skip_to_datetime,
+                index_keys=None,
+            ).to_dict(orient="records"),
+        )
 
     @set_index_if_possible(index_parameters="index_keys")
     @detect_and_convert_time_to_datetime(skip_toggle="skip_to_datetime")
@@ -1110,10 +1135,11 @@ class Mt5DataClient(Mt5Client):
         Returns:
             Flattened dictionary.
         """
-        items = []
+        items: list[tuple[str, Any]] = []
         for k, v in dictionary.items():
             if isinstance(v, dict):
-                items.extend((f"{k}{sep}{sk}", sv) for sk, sv in v.items())
+                nested = cast("dict[str, Any]", v)
+                items.extend((f"{k}{sep}{sk}", sv) for sk, sv in nested.items())
             else:
                 items.append((k, v))
         return dict(items)

pdmt5/mt5.py

@@ -8,7 +8,7 @@ import importlib
 import logging
 from functools import wraps
 from types import ModuleType  # noqa: TC003
-from typing import TYPE_CHECKING, Any, Self
+from typing import TYPE_CHECKING, Any, Concatenate, ParamSpec, Self, TypeVar
 
 from pydantic import BaseModel, ConfigDict, Field
 
@@ -17,6 +17,9 @@ if TYPE_CHECKING:
     from datetime import datetime
     from types import TracebackType
 
+P = ParamSpec("P")
+R = TypeVar("R")
+
 
 class Mt5RuntimeError(RuntimeError):
     """MetaTrader5 specific runtime error.
@@ -46,7 +49,9 @@ class Mt5Client(BaseModel):
     _is_initialized: bool = False
 
     @staticmethod
-    def _log_mt5_last_status_code(func: Callable[..., Any]) -> Callable[..., Any]:
+    def _log_mt5_last_status_code(
+        func: Callable[Concatenate[Mt5Client, P], R],
+    ) -> Callable[Concatenate[Mt5Client, P], R]:
         """Decorator to log MetaTrader5 last status code after method execution.
 
         Args:
@@ -57,7 +62,11 @@ class Mt5Client(BaseModel):
         """
 
         @wraps(func)
-        def wrapper(self: Any, *args: Any, **kwargs: Any) -> Any:
+        def wrapper(
+            self: Mt5Client,
+            *args: P.args,
+            **kwargs: P.kwargs,
+        ) -> R:
             try:
                 response = func(self, *args, **kwargs)
             except Exception as e:

pdmt5/trading.py

@@ -589,30 +589,31 @@ class Mt5TradingClient(Mt5DataClient):
                 price=symbol_info_tick["bid"],
             )
             result = (
-                positions_df.assign(
+                positions_df
+                .assign(
                     elapsed_seconds=lambda d: (
                         symbol_info_tick["time"] - d["time"]
                     ).dt.total_seconds(),
                     underlier_increase_ratio=lambda d: (
                         d["price_current"] / d["price_open"] - 1
                     ),
-                    buy=lambda d: (d["type"] == self.mt5.POSITION_TYPE_BUY),
-                    sell=lambda d: (d["type"] == self.mt5.POSITION_TYPE_SELL),
+                    buy=lambda d: d["type"] == self.mt5.POSITION_TYPE_BUY,
+                    sell=lambda d: d["type"] == self.mt5.POSITION_TYPE_SELL,
                 )
                 .assign(
                     buy_i=lambda d: d["buy"].astype(int),
                     sell_i=lambda d: d["sell"].astype(int),
                 )
                 .assign(
-                    sign=lambda d: (d["buy_i"] - d["sell_i"]),
+                    sign=lambda d: d["buy_i"] - d["sell_i"],
                     margin=lambda d: (
                         (d["buy_i"] * ask_margin + d["sell_i"] * bid_margin)
                         * d["volume"]
                     ),
                 )
                 .assign(
-                    signed_volume=lambda d: (d["volume"] * d["sign"]),
-                    signed_margin=lambda d: (d["margin"] * d["sign"]),
+                    signed_volume=lambda d: d["volume"] * d["sign"],
+                    signed_margin=lambda d: d["margin"] * d["sign"],
                     underlier_profit_ratio=lambda d: (
                         d["underlier_increase_ratio"] * d["sign"]
                     ),

pdmt5/utils.py

@@ -3,17 +3,20 @@
 from __future__ import annotations
 
 from functools import wraps
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, ParamSpec, TypeVar, cast
 
 import pandas as pd
 
 if TYPE_CHECKING:
     from collections.abc import Callable
 
+P = ParamSpec("P")
+R = TypeVar("R")
+
 
 def detect_and_convert_time_to_datetime(
     skip_toggle: str | None = None,
-) -> Callable[..., Any]:
+) -> Callable[[Callable[P, R]], Callable[P, R]]:
     """Decorator to convert time values/columns to datetime based on result type.
 
     Automatically detects result type and applies appropriate time conversion:
@@ -28,25 +31,32 @@ def detect_and_convert_time_to_datetime(
         Decorator function.
     """
 
-    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+    def decorator(func: Callable[P, R]) -> Callable[P, R]:
         @wraps(func)
-        def wrapper(*args: Any, **kwargs: Any) -> Any:  # noqa: ANN401
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> R:
             result = func(*args, **kwargs)
             if skip_toggle and kwargs.get(skip_toggle):
                 return result
             elif isinstance(result, dict):
-                return _convert_time_values_in_dict(dictionary=result)
+                return cast(
+                    "R",
+                    _convert_time_values_in_dict(
+                        dictionary=cast("dict[str, Any]", result)
+                    ),
+                )
             elif isinstance(result, list):
                 return [
                     (
-                        _convert_time_values_in_dict(dictionary=d)
+                        _convert_time_values_in_dict(
+                            dictionary=cast("dict[str, Any]", d)
+                        )
                         if isinstance(d, dict)
                         else d
                     )
-                    for d in result
-                ]
+                    for d in cast("list[Any]", result)
+                ]  # type: ignore[return-value]
             elif isinstance(result, pd.DataFrame):
-                return _convert_time_columns_in_df(result)
+                return cast("R", _convert_time_columns_in_df(result))
             else:
                 return result
 
@@ -87,13 +97,15 @@ def _convert_time_columns_in_df(df: pd.DataFrame) -> pd.DataFrame:
     new_df = df.copy()
     for c in new_df.columns:
         if c.startswith("time_") and c.endswith("_msc"):
-            new_df[c] = pd.to_datetime(new_df[c], unit="ms")
+            new_df[c] = pd.to_datetime(new_df[c], unit="ms").astype("datetime64[ns]")
         elif c == "time" or c.startswith("time_"):
-            new_df[c] = pd.to_datetime(new_df[c], unit="s")
+            new_df[c] = pd.to_datetime(new_df[c], unit="s").astype("datetime64[ns]")
     return new_df
 
 
-def set_index_if_possible(index_parameters: str | None = None) -> Callable[..., Any]:
+def set_index_if_possible(
+    index_parameters: str | None = None,
+) -> Callable[[Callable[P, pd.DataFrame]], Callable[P, pd.DataFrame]]:
     """Decorator to set index on DataFrame results if not empty.
 
     Args:
@@ -103,11 +115,13 @@ def set_index_if_possible(index_parameters: str | None = None) -> Callable[...,
         Decorator function.
     """
 
-    def decorator(func: Callable[..., Any]) -> Callable[..., Any]:
+    def decorator(
+        func: Callable[P, pd.DataFrame],
+    ) -> Callable[P, pd.DataFrame]:
         @wraps(func)
-        def wrapper(*args: Any, **kwargs: Any) -> Any:  # noqa: ANN401
+        def wrapper(*args: P.args, **kwargs: P.kwargs) -> pd.DataFrame:
             result = func(*args, **kwargs)
-            if not isinstance(result, pd.DataFrame):
+            if not isinstance(result, pd.DataFrame):  # type: ignore[reportUnnecessaryIsInstance]
                 error_message = (
                     f"Function {func.__name__} returned non-DataFrame result: "
                     f"{type(result).__name__}. Expected DataFrame."

{pdmt5-0.2.1.dist-info → pdmt5-0.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.2.1
+Version: 0.2.3
 Summary: Pandas-based data handler for MetaTrader 5
 Project-URL: Repository, https://github.com/dceoy/pdmt5.git
 Author-email: dceoy <dceoy@users.noreply.github.com>
@@ -339,7 +339,7 @@ with Mt5TradingClient(config=config) as trader:
     sell_margin = trader.calculate_minimum_order_margin("EURUSD", "SELL")
     print(f"Minimum BUY margin: {buy_margin['margin']} (volume: {buy_margin['volume']})")
     print(f"Minimum SELL margin: {sell_margin['margin']} (volume: {sell_margin['volume']})")
-    
+
     # Calculate volume by margin
     available_margin = 1000.0
     max_buy_volume = trader.calculate_volume_by_margin("EURUSD", available_margin, "BUY")

pdmt5-0.2.3.dist-info/RECORD

@@ -0,0 +1,9 @@
+pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
+pdmt5/dataframe.py,sha256=ju0q8z_hsZeuDb4eWj1SFIzmp5fQDX6UfB57bX_kqsg,38975
+pdmt5/mt5.py,sha256=n_VpAC7CTTO0DcPVQ1sUhp2RfQVRsps8PuhEGY4f1Y0,32438
+pdmt5/trading.py,sha256=OFBkONLTrut9aWPvi0-JJMVdoaZBFEsVIC8ZrErqfY8,25576
+pdmt5/utils.py,sha256=8hSokAi8yJSmvOSMEAdgOKBazUpD_S7ui5chvc0RYp0,4438
+pdmt5-0.2.3.dist-info/METADATA,sha256=GPRkjCqVSEuW22FFrPcX-i3bTnD78oLMGbrPQtTL5E0,16096
+pdmt5-0.2.3.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pdmt5-0.2.3.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
+pdmt5-0.2.3.dist-info/RECORD,,

{pdmt5-0.2.1.dist-info → pdmt5-0.2.3.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any

pdmt5-0.2.1.dist-info/RECORD

@@ -1,9 +0,0 @@
-pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
-pdmt5/dataframe.py,sha256=rUWtR23hrXBdBqzJhbOlIemNy73RrjSTZZJUhwoL6io,38084
-pdmt5/mt5.py,sha256=KgxHapIrh5b4L0wIOAQIjfXNZafalihbFrh9fhYHmrI,32254
-pdmt5/trading.py,sha256=Qd4RhZprDcWTzT3JmKl8XGVq8i9hExNdPSJbCRdUx-s,25569
-pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
-pdmt5-0.2.1.dist-info/METADATA,sha256=OjDjumI_5kGHyEjpIg-xgZyGJSULRUJM_LQnv2IeJ-4,16100
-pdmt5-0.2.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pdmt5-0.2.1.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
-pdmt5-0.2.1.dist-info/RECORD,,