open-api-mt5 0.7.2__tar.gz → 0.7.4__tar.gz

{open_api_mt5-0.7.2 → open_api_mt5-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-api-mt5
-Version: 0.7.2
+Version: 0.7.4
 Summary: REST and WebSocket API project for MetaTrader 5
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{open_api_mt5-0.7.2 → open_api_mt5-0.7.4}/app/main.py

@@ -432,7 +432,7 @@ async def lifespan(_: FastAPI):
             await asyncio.gather(monitor_task, calendar_task, news_close_task)
         except asyncio.CancelledError:
             pass
-        mt5.shutdown()
+        shutdown_connection()
 
 app = FastAPI(
     title="MT5 API",

open_api_mt5-0.7.4/app/services/connection_service.py

@@ -0,0 +1,128 @@
+from __future__ import annotations
+
+from pathlib import PurePath, PureWindowsPath
+import subprocess
+from typing import Any
+
+import MetaTrader5 as mt5
+
+
+_launched_terminal_process: subprocess.Popen[Any] | None = None
+
+
+def _path_parts(value: str) -> PurePath:
+    if "\\" in value or ":" in value:
+        return PureWindowsPath(value)
+    return PurePath(value)
+
+
+def _normalize_terminal_dir(value: str | None) -> str | None:
+    if not value:
+        return None
+
+    cleaned = value.strip().strip('"')
+    if not cleaned:
+        return None
+
+    parsed = _path_parts(cleaned)
+    if parsed.name.lower() in {"terminal.exe", "terminal64.exe"}:
+        parsed = parsed.parent
+    return str(parsed).replace("/", "\\").rstrip("\\").casefold()
+
+
+def _connected_to_requested_terminal(path: str) -> bool:
+    terminal_info = mt5.terminal_info()
+    connected_path = _normalize_terminal_dir(getattr(terminal_info, "path", None))
+    requested_path = _normalize_terminal_dir(path)
+    return connected_path is None or requested_path is None or connected_path == requested_path
+
+
+def _launch_terminal(path: str, portable: bool) -> tuple[bool, str | None]:
+    global _launched_terminal_process
+
+    args = [path]
+    if portable:
+        args.append("/portable")
+
+    try:
+        _launched_terminal_process = subprocess.Popen(args)
+    except OSError as exc:
+        return False, str(exc)
+    return True, None
+
+
+def _close_launched_terminal() -> None:
+    global _launched_terminal_process
+
+    process = _launched_terminal_process
+    _launched_terminal_process = None
+    if process is None:
+        return
+
+    poll = getattr(process, "poll", None)
+    if callable(poll) and poll() is not None:
+        return
+
+    terminate = getattr(process, "terminate", None)
+    if callable(terminate):
+        terminate()
+
+    wait = getattr(process, "wait", None)
+    if not callable(wait):
+        return
+
+    try:
+        wait(timeout=5)
+    except subprocess.TimeoutExpired:
+        kill = getattr(process, "kill", None)
+        if callable(kill):
+            kill()
+            wait(timeout=5)
+
+
+def initialize_connection(
+    username: str | int | None,
+    password: str | None,
+    server: str | None,
+    path: str | None = None,
+    portable: bool | None = None,
+) -> tuple[bool, str]:
+    init_kwargs: dict[str, Any] = {}
+    if path:
+        init_kwargs["portable"] = True if portable is None else portable
+    elif portable is not None:
+        init_kwargs["portable"] = portable
+    if username not in (None, ""):
+        try:
+            init_kwargs["login"] = int(username)
+        except ValueError:
+            return False, "failed: username/login must be a number"
+    if password:
+        init_kwargs["password"] = password
+    if server:
+        init_kwargs["server"] = server
+
+    if path:
+        mt5.shutdown()
+        _close_launched_terminal()
+        launched, launch_error = _launch_terminal(path, bool(init_kwargs["portable"]))
+        if not launched:
+            return False, f"failed to launch terminal '{path}': {launch_error}"
+
+    initialized = mt5.initialize(path, **init_kwargs) if path else mt5.initialize(**init_kwargs)
+    if initialized:
+        if path and not _connected_to_requested_terminal(path):
+            connected_path = getattr(mt5.terminal_info(), "path", "unknown")
+            mt5.shutdown()
+            _close_launched_terminal()
+            return False, f"failed: connected to terminal at '{connected_path}' instead of requested path '{path}'"
+        return True, "connected"
+    return False, f"failed: {mt5.last_error()}"
+
+
+def shutdown_connection() -> tuple[bool, str]:
+    mt5.shutdown()
+    _close_launched_terminal()
+    if mt5.terminal_info() is None:
+        return True, "disconnected"
+    return False, "failed: terminal still connected"

{open_api_mt5-0.7.2 → open_api_mt5-0.7.4}/open_api_mt5.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: open-api-mt5
-Version: 0.7.2
+Version: 0.7.4
 Summary: REST and WebSocket API project for MetaTrader 5
 Requires-Python: >=3.11
 Description-Content-Type: text/markdown

{open_api_mt5-0.7.2 → open_api_mt5-0.7.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-api-mt5"
-version = "0.7.2"
+version = "0.7.4"
 description = "REST and WebSocket API project for MetaTrader 5"
 readme = "README.md"
 requires-python = ">=3.11"

open_api_mt5-0.7.4/tests/test_connection_service.py

@@ -0,0 +1,157 @@
+from __future__ import annotations
+
+from types import SimpleNamespace
+
+import pytest
+
+from app.services import connection_service
+
+
+@pytest.fixture(autouse=True)
+def reset_launched_terminal_process():
+    original = connection_service._launched_terminal_process
+    connection_service._launched_terminal_process = None
+    yield
+    connection_service._launched_terminal_process = original
+
+
+class FakeProcess:
+    def __init__(self) -> None:
+        self.terminated = False
+        self.killed = False
+        self.waited = False
+        self.returncode = None
+
+    def poll(self):
+        return self.returncode
+
+    def terminate(self):
+        self.terminated = True
+        self.returncode = 0
+
+    def kill(self):
+        self.killed = True
+        self.returncode = -9
+
+    def wait(self, timeout=None):
+        self.waited = True
+        return self.returncode
+
+
+def _capture_terminal_launch(monkeypatch):
+    launched = []
+    monkeypatch.setattr(connection_service.subprocess, "Popen", lambda args: launched.append(args) or FakeProcess())
+    return launched
+
+
+def test_initialize_connection_uses_portable_mode_with_terminal_path(monkeypatch):
+    captured = {"args": None, "kwargs": None}
+    launched = _capture_terminal_launch(monkeypatch)
+
+    def initialize(*args, **kwargs):
+        captured["args"] = args
+        captured["kwargs"] = kwargs
+        return True
+
+    monkeypatch.setattr(connection_service.mt5, "initialize", initialize, raising=False)
+    monkeypatch.setattr(
+        connection_service.mt5,
+        "terminal_info",
+        lambda: SimpleNamespace(path=r"C:\MT5-A"),
+        raising=False,
+    )
+
+    assert connection_service.initialize_connection(
+        username="123",
+        password="secret",
+        server="Broker-Server",
+        path=r"C:\MT5-A\terminal64.exe",
+    ) == (True, "connected")
+    assert launched == [[r"C:\MT5-A\terminal64.exe", "/portable"]]
+    assert captured["args"] == (r"C:\MT5-A\terminal64.exe",)
+    assert captured["kwargs"] == {
+        "portable": True,
+        "login": 123,
+        "password": "secret",
+        "server": "Broker-Server",
+    }
+
+
+def test_initialize_connection_allows_disabling_portable_mode(monkeypatch):
+    captured = {"args": None, "kwargs": None}
+    launched = _capture_terminal_launch(monkeypatch)
+
+    def initialize(*args, **kwargs):
+        captured["args"] = args
+        captured["kwargs"] = kwargs
+        return True
+
+    monkeypatch.setattr(
+        connection_service.mt5,
+        "initialize",
+        initialize,
+        raising=False,
+    )
+    monkeypatch.setattr(
+        connection_service.mt5,
+        "terminal_info",
+        lambda: SimpleNamespace(path=r"C:\MT5-A"),
+        raising=False,
+    )
+
+    assert connection_service.initialize_connection(
+        username="123",
+        password=None,
+        server=None,
+        path=r"C:\MT5-A\terminal64.exe",
+        portable=False,
+    ) == (True, "connected")
+    assert launched == [[r"C:\MT5-A\terminal64.exe"]]
+    assert captured["args"] == (r"C:\MT5-A\terminal64.exe",)
+    assert captured["kwargs"] == {
+        "portable": False,
+        "login": 123,
+    }
+
+
+def test_initialize_connection_rejects_wrong_running_terminal(monkeypatch):
+    shutdown_called = False
+    _capture_terminal_launch(monkeypatch)
+
+    monkeypatch.setattr(connection_service.mt5, "initialize", lambda *_args, **_kwargs: True, raising=False)
+    monkeypatch.setattr(
+        connection_service.mt5,
+        "terminal_info",
+        lambda: SimpleNamespace(path=r"C:\MT5-B"),
+        raising=False,
+    )
+
+    def shutdown():
+        nonlocal shutdown_called
+        shutdown_called = True
+
+    monkeypatch.setattr(connection_service.mt5, "shutdown", shutdown, raising=False)
+
+    ok, message = connection_service.initialize_connection(
+        username="123",
+        password=None,
+        server=None,
+        path=r"C:\MT5-A\terminal64.exe",
+    )
+
+    assert ok is False
+    assert "instead of requested path" in message
+    assert shutdown_called is True
+
+
+def test_shutdown_connection_closes_launched_terminal(monkeypatch):
+    process = FakeProcess()
+    monkeypatch.setattr(connection_service, "_launched_terminal_process", process)
+    monkeypatch.setattr(connection_service.mt5, "shutdown", lambda: None, raising=False)
+    monkeypatch.setattr(connection_service.mt5, "terminal_info", lambda: None, raising=False)
+
+    assert connection_service.shutdown_connection() == (True, "disconnected")
+    assert process.terminated is True
+    assert process.waited is True
+    assert process.killed is False
+    assert connection_service._launched_terminal_process is None

open_api_mt5-0.7.2/app/services/connection_service.py

@@ -1,41 +0,0 @@
-from __future__ import annotations
-
-from typing import Any
-
-import MetaTrader5 as mt5
-
-
-def initialize_connection(
-    username: str | int | None,
-    password: str | None,
-    server: str | None,
-    path: str | None = None,
-    portable: bool | None = None,
-) -> tuple[bool, str]:
-    init_kwargs: dict[str, Any] = {}
-    if path:
-        init_kwargs["path"] = path
-        init_kwargs["portable"] = True if portable is None else portable
-    elif portable is not None:
-        init_kwargs["portable"] = portable
-    if username not in (None, ""):
-        try:
-            init_kwargs["login"] = int(username)
-        except ValueError:
-            return False, "failed: username/login must be a number"
-    if password:
-        init_kwargs["password"] = password
-    if server:
-        init_kwargs["server"] = server
-
-    initialized = mt5.initialize(**init_kwargs)
-    if initialized:
-        return True, "connected"
-    return False, f"failed: {mt5.last_error()}"
-
-
-def shutdown_connection() -> tuple[bool, str]:
-    mt5.shutdown()
-    if mt5.terminal_info() is None:
-        return True, "disconnected"
-    return False, "failed: terminal still connected"

open_api_mt5-0.7.2/tests/test_connection_service.py

@@ -1,50 +0,0 @@
-from __future__ import annotations
-
-from app.services import connection_service
-
-
-def test_initialize_connection_uses_portable_mode_with_terminal_path(monkeypatch):
-    captured = {}
-
-    def initialize(**kwargs):
-        captured.update(kwargs)
-        return True
-
-    monkeypatch.setattr(connection_service.mt5, "initialize", initialize, raising=False)
-
-    assert connection_service.initialize_connection(
-        username="123",
-        password="secret",
-        server="Broker-Server",
-        path=r"C:\MT5-A\terminal64.exe",
-    ) == (True, "connected")
-    assert captured == {
-        "path": r"C:\MT5-A\terminal64.exe",
-        "portable": True,
-        "login": 123,
-        "password": "secret",
-        "server": "Broker-Server",
-    }
-
-
-def test_initialize_connection_allows_disabling_portable_mode(monkeypatch):
-    captured = {}
-    monkeypatch.setattr(
-        connection_service.mt5,
-        "initialize",
-        lambda **kwargs: captured.update(kwargs) or True,
-        raising=False,
-    )
-
-    assert connection_service.initialize_connection(
-        username="123",
-        password=None,
-        server=None,
-        path=r"C:\MT5-A\terminal64.exe",
-        portable=False,
-    ) == (True, "connected")
-    assert captured == {
-        "path": r"C:\MT5-A\terminal64.exe",
-        "portable": False,
-        "login": 123,
-    }