fix parts of broken part

Author: Joaopeuko

.github/workflows/test-pytest.yaml

@@ -0,0 +1,36 @@
+name: Test | Pytest
+
+on:
+  pull_request:
+  push:
+    branches: ['*']
+
+jobs:
+  pytest:
+    runs-on: windows-latest
+    
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        
+      - name: Install uv and set the python version
+        uses: astral-sh/setup-uv@v5
+        with:
+          python-version: "3.11"
+
+      - name: Install the project
+        run: uv sync --locked --group dev
+
+      - name: Run tests with coverage
+        run: |
+          pytest \
+            -k . \
+            --cov=mqpy \
+            --cov-append \
+            --cov-report=term-missing:skip-covered \
+            --junitxml=pytest.xml \
+            -x | tee pytest-coverage.txt
+
+      - name: Add coverage summary to GitHub summary
+        run: |
+          cat summary.md >> $GITHUB_STEP_SUMMARY

example.py

@@ -3,9 +3,9 @@
 This example demonstrates a Moving Average Crossover strategy.
 """
 
-from mqpy.src.rates import Rates
-from mqpy.src.tick import Tick
-from mqpy.src.trade import Trade
+from mqpy.rates import Rates
+from mqpy.tick import Tick
+from mqpy.trade import Trade
 
 # Initialize the trading strategy
 trade = Trade(
@@ -45,7 +45,7 @@
         is_cross_below = short_ma < long_ma and current_tick.last < short_ma
 
         # Execute trading positions based on signals
-        trade.open_position(is_cross_above, is_cross_below, "Moving Average Crossover Strategy")
+        trade.open_position(should_buy=is_cross_above, should_sell=is_cross_below, comment="Moving Average Crossover Strategy")
 
     prev_tick_time = current_tick.time_msc
 

mqpy/trade.py

@@ -113,7 +113,7 @@ def select_symbol(self) -> None:
         Returns:
             None
         """
-        Mt5.symbol_select(self.symbol, enable=True)
+        Mt5.symbol_select(self.symbol, True)
 
     def prepare_symbol(self) -> None:
         """Prepare the trading symbol for opening positions.
@@ -130,7 +130,7 @@ def prepare_symbol(self) -> None:
 
         if not symbol_info.visible:
             logger.warning(f"The {self.symbol} is not visible, needed to be switched on.")
-            if not Mt5.symbol_select(self.symbol, enable=True):
+            if not Mt5.symbol_select(self.symbol, True):
                 logger.error(
                     f"The expert advisor {self.expert_name} failed in select the symbol {self.symbol}, turning off."
                 )
@@ -240,7 +240,7 @@ def open_sell_position(self, comment: str = "") -> None:
         result = Mt5.order_send(request)
         self.request_result(price, result)
 
-    def request_result(self, price: float, result: Mt5.TradeResult) -> None:
+    def request_result(self, price: float, result: int) -> None:
         """Process the result of a trading request.
 
         Args:

pyproject.toml

@@ -1,38 +1,27 @@
 [build-system]
 requires = [
-  "setuptools",
+  "setuptools>=61.0",
   "wheel",
 ]
 build-backend = "setuptools.build_meta"
 
 [project]
 name = "mqpy"
 authors = [
-  {name = "Joao Euko"}
+  {email = "joao@example.com", name = "Joao Euko"},
 ]
 version = "v0.6.9"
 description = "I developed this library to simplify the process of creating an Expert Advisor in MQL5. While developing in MQL5 can be complex, the same task is more streamlined in Python."
-requires-python = ">=3.9"
+requires-python = ">=3.8"
 dependencies = []
 
 readme = "README.md"
-license = "MIT"
+license = {text = "MIT"}
 
-[tool.setuptools.packages.find]
-where = []
+[project.scripts]
+mqpy = "mqpy.__main__:main"
 
-[tool.semantic_release]
-version_variable = [
-  "mqpy/version.py:__version__",
-]
-version_toml = [
-  "pyproject.toml:project.version",
-]
-
-[tool.semantic_release.changelog]
-retain_old_entries = true
-
-[dependency-groups]
+[project.optional-dependencies]
 dev = [
   "pre-commit>=4.0.1",
   "pylint>=3.3.3",
@@ -49,6 +38,20 @@ docs = [
     "mkdocstrings[python]>=0.29.1",
 ]
 
+[tool.setuptools]
+packages = ["mqpy"]
+
+[tool.semantic_release]
+version_variable = [
+  "mqpy/version.py:__version__",
+]
+version_toml = [
+  "pyproject.toml:project.version",
+]
+
+[tool.semantic_release.changelog]
+retain_old_entries = true
+
 # pre-commit
 [tool.pytest.ini_options]
 markers = []

setup.py

@@ -1,34 +1,26 @@
-"""Setup script for the mqpy package.
+# """Setup script for the mqpy package.
 
-This module contains the setup configuration for the mqpy package, which provides a Python interface
-for creating Expert Advisors in MetaTrader 5.
-"""
+# This module contains the setup configuration for the mqpy package, which provides a Python interface
+# for creating Expert Advisors in MetaTrader 5.
+# """
 
-import pathlib
+from setuptools import setup, find_packages
 
-import setuptools
-
-long_description = (pathlib.Path(__file__).parent / "README.md").read_text()
-
-setuptools.setup(
+setup(
     name="mqpy",
-    version="v0.6.9",
-    description=(
-        "A library to simplify the process of creating an Expert Advisor in MQL5. "
-        "It makes Python development more streamlined than MQL5."
-    ),
-    author="Joao Paulo Euko",
-    license="MIT",
-    keywords=["metatrader5", "algotrading", "stock market"],
+    version="0.6.9",
+    packages=find_packages(),
+    install_requires=[],
+    author="Joao Euko",
+    author_email="",
+    description="A library to simplify creating Expert Advisors in MQL5",
+    long_description=open("README.md").read(),
     long_description_content_type="text/markdown",
-    packages=setuptools.find_packages(),
-    install_requires=[
-        "metatrader5 == 5.0.4874",
-        "setuptools == 78.1.0",
-    ],
+    license="MIT",
     entry_points={
         "console_scripts": [
-            "mqpy = __main__:main",
+            "mqpy=mqpy.__main__:main",
         ],
     },
+    python_requires=">=3.8",
 )

tests/conftest.py

@@ -0,0 +1,33 @@
+import pytest
+
+@pytest.fixture
+def test_symbols():
+    """Provides common test symbols that can be used across tests."""
+    return {
+        "forex": "EURUSD",
+        "indices": "US500",
+        "commodities": "XAUUSD",
+        "crypto": "BTCUSD",
+        "invalid": "INVALID"
+    }
+
+@pytest.fixture
+def configure_logging():
+    """Sets up logging configuration for tests."""
+    import logging
+    
+    root = logging.getLogger()
+    for handler in root.handlers[:]:
+        root.removeHandler(handler)
+    
+    handler = logging.StreamHandler()
+    formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
+    handler.setFormatter(formatter)
+    root.addHandler(handler)
+    
+    root.setLevel(logging.INFO)
+    
+    yield
+    
+    for handler in root.handlers[:]:
+        root.removeHandler(handler) 

tests/integration/test_mt5_connection.py

@@ -24,19 +24,23 @@
 
 success = False
 for attempt in range(10):
-    if mt5.initialize(
-        login=int(os.getenv("MT5_LOGIN")),  # type: ignore[arg-type]
-        password=os.getenv("MT5_PASSWORD"),
-        server=os.getenv("MT5_SERVER"),
-        path=os.getenv("MT5_PATH"),
-    ):
-        logger.info("MT5 initialized successfully")
-        mt5.shutdown()
-        success = True
-        break
-    else:
-        logger.info(f"Attempt {attempt+1}: Not ready yet, sleeping...")
-        time.sleep(5)
+    try:
+        if mt5.initialize(
+            login=int(os.getenv("MT5_LOGIN")),  # type: ignore[arg-type]
+            password=os.getenv("MT5_PASSWORD"),
+            server=os.getenv("MT5_SERVER"),
+            path=os.getenv("MT5_PATH"),
+             ):
+            logger.info("MT5 initialized successfully")
+            mt5.shutdown()
+            success = True
+            break
+    except Exception as e:
+        try:
+            mt5.initialize()
+        except Exception as e:
+            logger.info(f"Attempt {attempt+1}: Not ready yet, sleeping...")
+            time.sleep(5)
 
 if not success:
     logger.info("Failed to initialize MT5 after waiting.")