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

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

@@ -87,9 +87,9 @@ 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
 
 

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.2.1
+Version: 0.2.2
 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.2.dist-info/RECORD

@@ -0,0 +1,9 @@
+pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
+pdmt5/dataframe.py,sha256=rUWtR23hrXBdBqzJhbOlIemNy73RrjSTZZJUhwoL6io,38084
+pdmt5/mt5.py,sha256=KgxHapIrh5b4L0wIOAQIjfXNZafalihbFrh9fhYHmrI,32254
+pdmt5/trading.py,sha256=OFBkONLTrut9aWPvi0-JJMVdoaZBFEsVIC8ZrErqfY8,25576
+pdmt5/utils.py,sha256=1-NDVVLSkwgPWfGhwWMeYphnFwi8vCLo_UCL5KAO-uQ,3963
+pdmt5-0.2.2.dist-info/METADATA,sha256=VO8I_fkEFjpzo_TL8sQVHqgGhm9le3cA9KHcDyPwHxM,16096
+pdmt5-0.2.2.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+pdmt5-0.2.2.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
+pdmt5-0.2.2.dist-info/RECORD,,

{pdmt5-0.2.1.dist-info → pdmt5-0.2.2.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,,