pdmt5 0.1.0__py3-none-any.whl → 0.1.2__py3-none-any.whl

pdmt5/dataframe.py

@@ -29,7 +29,6 @@ class Mt5Config(BaseModel):
     timeout: int | None = Field(
         default=None, description="Connection timeout in milliseconds"
     )
-    portable: bool | None = Field(default=None, description="Use portable mode")
 
 
 class Mt5DataClient(Mt5Client):
@@ -51,14 +50,13 @@ class Mt5DataClient(Mt5Client):
         description="Number of retry attempts for connection initialization",
     )
 
-    def initialize_mt5(
+    def initialize_and_login_mt5(
         self,
         path: str | None = None,
         login: int | None = None,
         password: str | None = None,
         server: str | None = None,
         timeout: int | None = None,
-        portable: bool | None = None,
     ) -> None:
         """Initialize MetaTrader5 connection with retry logic.
 
@@ -70,18 +68,16 @@ class Mt5DataClient(Mt5Client):
             password: Account password (overrides config).
             server: Server name (overrides config).
             timeout: Connection timeout (overrides config).
-            portable: Use portable mode (overrides config).
 
         Raises:
             Mt5RuntimeError: If initialization fails after retries.
         """
-        initialize_kwargs = {
-            "path": path or self.config.path,
+        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,
-            "portable": portable if portable is not None else self.config.portable,
         }
         for i in range(1 + max(0, self.retry_count)):
             if i:
@@ -91,11 +87,12 @@ class Mt5DataClient(Mt5Client):
                     self.retry_count,
                 )
                 time.sleep(i)
-            if self.initialize(**initialize_kwargs):  # type: ignore[reportArgumentType]
-                self.logger.info("MT5 initialization successful.")
+            if self.initialize(path=path, **login_kwargs) and (
+                (not login_kwargs["login"]) or self.login(**login_kwargs)
+            ):
                 return
         error_message = (
-            f"MT5 initialization failed after {self.retry_count} retries:"
+            f"MT5 initialize and login failed after {self.retry_count} retries:"
             f" {self.last_error()}"
         )
         raise Mt5RuntimeError(error_message)

pdmt5/mt5.py

@@ -106,7 +106,6 @@ class Mt5Client(BaseModel):
         password: str | None = None,
         server: str | None = None,
         timeout: int | None = None,
-        portable: bool | None = None,
     ) -> bool:
         """Establish a connection with the MetaTrader 5 terminal.
 
@@ -116,7 +115,6 @@ class Mt5Client(BaseModel):
             password: Trading account password.
             server: Trade server address.
             timeout: Connection timeout in milliseconds.
-            portable: Use portable mode.
 
         Returns:
             True if successful, False otherwise.
@@ -135,7 +133,6 @@ class Mt5Client(BaseModel):
                         "password": password,
                         "server": server,
                         "timeout": timeout,
-                        "portable": portable,
                     }.items()
                     if v is not None
                 },

pdmt5/trading.py

@@ -32,6 +32,7 @@ class Mt5TradingClient(Mt5DataClient):
     def close_open_positions(
         self,
         symbols: str | list[str] | tuple[str, ...] | None = None,
+        dry_run: bool | None = None,
         **kwargs: Any,  # noqa: ANN401
     ) -> dict[str, list[dict[str, Any]]]:
         """Close all open positions for specified symbols.
@@ -39,6 +40,8 @@ class Mt5TradingClient(Mt5DataClient):
         Args:
             symbols: Optional symbol or list of symbols to filter positions.
                 If None, all symbols will be considered.
+            dry_run: Optional flag to enable dry run mode. If None, uses the instance's
+                `dry_run` attribute.
             **kwargs: Additional keyword arguments for request parameters.
 
         Returns:
@@ -53,18 +56,22 @@ class Mt5TradingClient(Mt5DataClient):
             symbol_list = self.symbols_get()
         self.logger.info("Fetching and closing positions for symbols: %s", symbol_list)
         return {
-            s: self._fetch_and_close_position(symbol=s, **kwargs) for s in symbol_list
+            s: self._fetch_and_close_position(symbol=s, dry_run=dry_run, **kwargs)
+            for s in symbol_list
         }
 
     def _fetch_and_close_position(
         self,
         symbol: str | None = None,
+        dry_run: bool | None = None,
         **kwargs: Any,  # noqa: ANN401
     ) -> list[dict[str, Any]]:
         """Close all open positions for a specific symbol.
 
         Args:
             symbol: Optional symbol filter.
+            dry_run: Optional flag to enable dry run mode. If None, uses the instance's
+                `dry_run` attribute.
             **kwargs: Additional keyword arguments for request parameters.
 
         Returns:
@@ -96,6 +103,7 @@ class Mt5TradingClient(Mt5DataClient):
                         "position": p["ticket"],
                         **kwargs,
                     },
+                    dry_run=dry_run,
                 )
                 for p in positions_dict
             ]

{pdmt5-0.1.0.dist-info → pdmt5-0.1.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pdmt5
-Version: 0.1.0
+Version: 0.1.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>

pdmt5-0.1.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=aa4eqRl-xrYqMTdgKgdLJuvg2GIoziE5wA3SRPn0jMs,7377
+pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
+pdmt5-0.1.2.dist-info/METADATA,sha256=0PTSBNZFHetz9WJZLndgNGUSoxFNXFy18rpNJZK05s4,9029
+pdmt5-0.1.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+pdmt5-0.1.2.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
+pdmt5-0.1.2.dist-info/RECORD,,

pdmt5-0.1.0.dist-info/RECORD

@@ -1,9 +0,0 @@
-pdmt5/__init__.py,sha256=QbSFrsi7_bgFzb-ma4DmmUjR90UvrqKMnRZq1wPRmoI,446
-pdmt5/dataframe.py,sha256=MumdFp72ZN_394X_viMkovfyb1c8C-LxLFTdymLEMYM,38345
-pdmt5/mt5.py,sha256=rAY7MQalobUWZtMfC_xyTFCDTuU3EkFAyY_geBl6cyg,32379
-pdmt5/trading.py,sha256=4rT0WgK0JyLMv8XatXur8-NWqG6gh_8XQ-g5sVX9xq0,6987
-pdmt5/utils.py,sha256=Ll5Q3OE5h1A_sZ_qVEnOPGniFlT6_MmHfuu0zqeLdeU,3913
-pdmt5-0.1.0.dist-info/METADATA,sha256=MJKmvQctS6kaU_OhqtXOYJNNa1uUutr2smvmUfnUD5g,9029
-pdmt5-0.1.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-pdmt5-0.1.0.dist-info/licenses/LICENSE,sha256=iABrdaUGOBWLYotFupB_PGe8arV5o7rVhn-_vK6P704,1073
-pdmt5-0.1.0.dist-info/RECORD,,