pdmt5 0.1.9__tar.gz → 0.2.0__tar.gz

{pdmt5-0.1.9 → pdmt5-0.2.0}/.github/workflows/ci.yml

@@ -30,25 +30,16 @@ jobs:
     uses: dceoy/gh-actions-for-devops/.github/workflows/python-package-lint-and-scan.yml@main
     with:
       package-path: .
-      python-version: 3.x
       runs-on: windows-latest
   python-test:
     if: >
       github.event_name == 'push'
       || github.event_name == 'pull_request'
       || (github.event_name == 'workflow_dispatch' && inputs.workflow == 'lint-and-test')
-    runs-on: windows-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683  # v4.2.2
-      - name: Set up uv
-        uses: astral-sh/setup-uv@e92bafb6253dcd438e0484186d7669ea7a8ca1cc  # v6.4.3
-      - name: Install the package
-        run: >
-          uv sync
-      - name: Run unit tests with pytest
-        run: >
-          uv run pytest
+    uses: dceoy/gh-actions-for-devops/.github/workflows/python-package-test.yml@main
+    with:
+      package-path: .
+      runs-on: windows-latest
   dependabot-auto-merge:
     if: >
       github.event_name == 'pull_request' && github.actor == 'dependabot[bot]'

pdmt5-0.2.0/.github/workflows/pr-agent.yml

@@ -0,0 +1,34 @@
+---
+name: PR-agent
+on:
+  pull_request:
+    types:
+      - opened
+      - reopened
+      - ready_for_review
+  issue_comment:
+    types:
+      - created
+      - edited
+      - deleted
+jobs:
+  pr-agent:
+    if: >
+      github.event.sender.type != 'Bot'
+      && (
+        github.event_name == 'pull_request'
+        || github.event_name == 'issue_comment'
+      )
+    uses: dceoy/gh-actions-for-devops/.github/workflows/pr-agent.yml@main
+    permissions:
+      contents: write
+      pull-requests: write
+      issues: write
+      id-token: write
+    with:
+      auto-describe: true
+      auto-review: true
+      auto-improve: true
+    secrets:
+      GROQ_API_KEY: ${{ secrets.GROQ_API_KEY }}
+      GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

{pdmt5-0.1.9 → pdmt5-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.1.9
+Version: 0.2.0
 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>
@@ -56,8 +56,7 @@ Pandas-based data handler for MetaTrader 5
 ### Using pip
 
 ```bash
-pip install -U pdmt5
-pip install -U MetaTrader5
+pip install -U pdmt5 MetaTrader5
 ```
 
 ### Using uv

{pdmt5-0.1.9 → pdmt5-0.2.0}/README.md

@@ -33,8 +33,7 @@ Pandas-based data handler for MetaTrader 5
 ### Using pip
 
 ```bash
-pip install -U pdmt5
-pip install -U MetaTrader5
+pip install -U pdmt5 MetaTrader5
 ```
 
 ### Using uv

{pdmt5-0.1.9 → pdmt5-0.2.0}/pdmt5/trading.py

@@ -243,6 +243,7 @@ class Mt5TradingClient(Mt5DataClient):
         Returns:
             Dictionary with operation result.
         """
+        self.logger.info("Placing market order: %s %s %s", order_side, volume, symbol)
         return self._send_or_check_order(
             request={
                 "action": self.mt5.TRADE_ACTION_DEAL,
@@ -315,6 +316,13 @@ class Mt5TradingClient(Mt5DataClient):
                 if sl != p["sl"] or tp != p["tp"]
             ]
             if order_requests:
+                self.logger.info(
+                    "Updating SL/TP for %d positions for %s: %s/%s",
+                    len(order_requests),
+                    symbol,
+                    sl,
+                    tp,
+                )
                 return [
                     self._send_or_check_order(request=r, dry_run=dry_run)
                     for r in order_requests
@@ -354,15 +362,22 @@ class Mt5TradingClient(Mt5DataClient):
                 else symbol_info_tick["ask"]
             ),
         )
+        result = {"volume": symbol_info["volume_min"], "margin": margin}
         if margin:
-            return {"volume": symbol_info["volume_min"], "margin": margin}
+            self.logger.info(
+                "Calculated minimum %s order margin for %s: %s",
+                order_side,
+                symbol,
+                result,
+            )
         else:
             self.logger.warning(
-                "No margin available for symbol: %s with order side: %s",
-                symbol,
+                "Calculated minimum order margin to %s %s: %s",
                 order_side,
+                symbol,
+                result,
             )
-            return {"volume": symbol_info["volume_min"], "margin": 0.0}
+        return result
 
     def calculate_volume_by_margin(
         self,
@@ -385,12 +400,19 @@ class Mt5TradingClient(Mt5DataClient):
             order_side=order_side,
         )
         if min_order_margin_dict["margin"]:
-            return (
+            result = (
                 floor(margin / min_order_margin_dict["margin"])
                 * min_order_margin_dict["volume"]
             )
         else:
-            return 0.0
+            result = 0.0
+        self.logger.info(
+            "Calculated volume by margin to %s %s: %s",
+            order_side,
+            symbol,
+            result,
+        )
+        return result
 
     def calculate_spread_ratio(
         self,
@@ -405,11 +427,13 @@ class Mt5TradingClient(Mt5DataClient):
             Spread ratio as a float.
         """
         symbol_info_tick = self.symbol_info_tick_as_dict(symbol=symbol)
-        return (
+        result = (
             (symbol_info_tick["ask"] - symbol_info_tick["bid"])
             / (symbol_info_tick["ask"] + symbol_info_tick["bid"])
             * 2
         )
+        self.logger.info("Calculated spread ratio for %s: %s", symbol, result)
+        return result
 
     def fetch_latest_rates_as_df(
         self,
@@ -440,13 +464,20 @@ class Mt5TradingClient(Mt5DataClient):
             )
             raise Mt5TradingError(error_message) from e
         else:
-            return self.copy_rates_from_pos_as_df(
+            result = self.copy_rates_from_pos_as_df(
                 symbol=symbol,
                 timeframe=timeframe,
                 start_pos=0,
                 count=count,
                 index_keys=index_keys,
             )
+            self.logger.info(
+                "Fetched latest %s rates for %s: %d rows",
+                granularity,
+                symbol,
+                result.shape[0],
+            )
+            return result
 
     def fetch_latest_ticks_as_df(
         self,
@@ -465,13 +496,19 @@ class Mt5TradingClient(Mt5DataClient):
             pd.DataFrame: Tick data with time index.
         """
         last_tick_time = self.symbol_info_tick_as_dict(symbol=symbol)["time"]
-        return self.copy_ticks_range_as_df(
+        result = self.copy_ticks_range_as_df(
             symbol=symbol,
             date_from=(last_tick_time - timedelta(seconds=seconds)),
             date_to=(last_tick_time + timedelta(seconds=seconds)),
             flags=self.mt5.COPY_TICKS_ALL,
             index_keys=index_keys,
         )
+        self.logger.info(
+            "Fetched latest ticks for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def collect_entry_deals_as_df(
         self,
@@ -497,14 +534,20 @@ class Mt5TradingClient(Mt5DataClient):
             index_keys=index_keys,
         )
         if deals_df.empty:
-            return deals_df
+            result = deals_df
         else:
-            return deals_df.pipe(
+            result = deals_df.pipe(
                 lambda d: d[
                     d["entry"]
                     & d["type"].isin({self.mt5.DEAL_TYPE_BUY, self.mt5.DEAL_TYPE_SELL})
                 ]
             )
+        self.logger.info(
+            "Collected entry deals for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def fetch_positions_with_metrics_as_df(
         self,
@@ -520,7 +563,7 @@ class Mt5TradingClient(Mt5DataClient):
         """
         positions_df = self.positions_get_as_df(symbol=symbol)
         if positions_df.empty:
-            return positions_df
+            result = positions_df
         else:
             symbol_info_tick = self.symbol_info_tick_as_dict(symbol=symbol)
             ask_margin = self.order_calc_margin(
@@ -535,7 +578,7 @@ class Mt5TradingClient(Mt5DataClient):
                 volume=1,
                 price=symbol_info_tick["bid"],
             )
-            return (
+            result = (
                 positions_df.assign(
                     elapsed_seconds=lambda d: (
                         symbol_info_tick["time"] - d["time"]
@@ -566,6 +609,12 @@ class Mt5TradingClient(Mt5DataClient):
                 )
                 .drop(columns=["buy_i", "sell_i", "sign", "underlier_increase_ratio"])
             )
+        self.logger.info(
+            "Fetched positions with metrics for %s: %d rows",
+            symbol,
+            result.shape[0],
+        )
+        return result
 
     def calculate_new_position_margin_ratio(
         self,
@@ -585,7 +634,7 @@ class Mt5TradingClient(Mt5DataClient):
         """
         account_info = self.account_info_as_dict()
         if not account_info["equity"]:
-            return 0.0
+            result = 0.0
         else:
             positions_df = self.fetch_positions_with_metrics_as_df(symbol=symbol)
             current_signed_margin = (
@@ -610,6 +659,12 @@ class Mt5TradingClient(Mt5DataClient):
                 )
             else:
                 new_signed_margin = 0
-            return abs(
+            result = abs(
                 (new_signed_margin + current_signed_margin) / account_info["equity"]
             )
+        self.logger.info(
+            "Calculated new position margin ratio for %s: %s",
+            symbol,
+            result,
+        )
+        return result

{pdmt5-0.1.9 → pdmt5-0.2.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pdmt5"
-version = "0.1.9"
+version = "0.2.0"
 description = "Pandas-based data handler for MetaTrader 5"
 authors = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]
 maintainers = [{name = "dceoy", email = "dceoy@users.noreply.github.com"}]

{pdmt5-0.1.9 → pdmt5-0.2.0}/uv.lock

@@ -1,5 +1,5 @@
 version = 1
-revision = 2
+revision = 3
 requires-python = ">=3.11"
 resolution-markers = [
     "python_full_version >= '3.12'",
@@ -613,7 +613,7 @@ wheels = [
 
 [[package]]
 name = "pdmt5"
-version = "0.1.9"
+version = "0.2.0"
 source = { editable = "." }
 dependencies = [
     { name = "metatrader5", marker = "sys_platform == 'win32'" },