fxsocket 0.7.0__tar.gz → 0.8.0__tar.gz

{fxsocket-0.7.0 → fxsocket-0.8.0}/.github/workflows/ci.yml

@@ -13,8 +13,8 @@ jobs:
       matrix:
         python-version: ["3.10", "3.11", "3.12", "3.13"]
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install

{fxsocket-0.7.0 → fxsocket-0.8.0}/.github/workflows/publish.yml

@@ -13,8 +13,8 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v7
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
       - name: Build sdist + wheel
@@ -22,7 +22,7 @@ jobs:
           python -m pip install --upgrade build twine
           python -m build
           twine check dist/*
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           name: dist
           path: dist/
@@ -36,7 +36,7 @@ jobs:
     permissions:
       id-token: write # required for trusted publishing
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: dist
           path: dist/
@@ -53,7 +53,7 @@ jobs:
     permissions:
       id-token: write # required for trusted publishing
     steps:
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v8
         with:
           name: dist
           path: dist/

fxsocket-0.8.0/CHANGELOG.md

@@ -0,0 +1,39 @@
+# Changelog
+
+All notable changes to this project are documented here. The format follows
+[Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Releases
+up to 0.7.0 are described in their tagged commits.
+
+## [0.8.0] - 2026-10-26
+
+### Removed
+
+- `Timeframe.M2`, `M3`, `H2`, `H6`, `H8` and `H12`, and the `2min`, `3min`,
+  `2h`, `6h`, `8h` and `12h` aliases. The SDK treated them as MT5-only, but
+  neither terminal API serves them: MT4 and MT5 both accept exactly `M1`, `M5`,
+  `M15`, `M30`, `H1`, `H4`, `D1`, `W1` and `MN1`, in REST `price_history` and on
+  the `bars` stream. On an MT5 account they passed the SDK and the terminal
+  refused them (HTTP 400 from `price_history`, an `error` frame and no bars
+  from the stream).
+
+  They are removed rather than kept and rejected on both platforms, so that
+  `Timeframe` lists exactly what the server accepts: iterating it gives the
+  usable set, and type checkers flag the removed names. The only code this
+  breaks is code that could never succeed.
+
+### Changed
+
+- A timeframe outside those nine now raises `ValidationError` on both
+  platforms before anything is sent, and the message lists the accepted
+  labels. On MT4 the six removed ones used to raise
+  `UnsupportedOnPlatformError`, so code that caught that for timeframes should
+  catch `ValidationError` instead. Nothing raises `UnsupportedOnPlatformError`
+  now; it stays exported.
+
+### Deprecated
+
+- `fxsocket.enums.MT5_ONLY_TIMEFRAMES` is always empty and will be removed in
+  1.0.
+
+[0.8.0]: https://github.com/fxsocket-com/FxSocket-Python-SDK/releases/tag/v0.8.0

{fxsocket-0.7.0 → fxsocket-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: fxsocket
-Version: 0.7.0
+Version: 0.8.0
 Summary: Python SDK for the FxSocket API — MT4/MT5 account management, trading, and real-time streaming.
 Project-URL: Homepage, https://fxsocket.com
 Project-URL: Documentation, https://api.fxsocket.com/v1/docs
@@ -232,8 +232,11 @@ in `order_modify`, a literal `stop_loss=0.0` would *remove* your stop-loss, so
 it's rejected — pass `clear_stop_loss=True` to remove one deliberately, while
 `None` (the default) keeps the current value.
 
-MT4 and MT5 share one interface. MT5-only timeframes (`M2`, `M3`, `H2`, `H6`,
-`H8`, `H12`) raise `UnsupportedOnPlatformError` on MT4 before any request.
+MT4 and MT5 share one interface, timeframes included. Both accept the same nine:
+`M1`, `M5`, `M15`, `M30`, `H1`, `H4`, `D1`, `W1`, `MN1` (or `1min`, `5min`,
+`15min`, `30min`, `1h`, `4h`, `1d`, `1w`, `1month`). MT5's other periods, such
+as `H2` or `H12`, aren't served by the terminal API, so anything else raises
+`ValidationError` before any request.
 
 > **MT4 history note:** on MT4, `price_history` with `from_`/`to` bounds (or the
 > `D1` timeframe) can fail server-side with `CopyRates failed` when the terminal

{fxsocket-0.7.0 → fxsocket-0.8.0}/README.md

@@ -205,8 +205,11 @@ in `order_modify`, a literal `stop_loss=0.0` would *remove* your stop-loss, so
 it's rejected — pass `clear_stop_loss=True` to remove one deliberately, while
 `None` (the default) keeps the current value.
 
-MT4 and MT5 share one interface. MT5-only timeframes (`M2`, `M3`, `H2`, `H6`,
-`H8`, `H12`) raise `UnsupportedOnPlatformError` on MT4 before any request.
+MT4 and MT5 share one interface, timeframes included. Both accept the same nine:
+`M1`, `M5`, `M15`, `M30`, `H1`, `H4`, `D1`, `W1`, `MN1` (or `1min`, `5min`,
+`15min`, `30min`, `1h`, `4h`, `1d`, `1w`, `1month`). MT5's other periods, such
+as `H2` or `H12`, aren't served by the terminal API, so anything else raises
+`ValidationError` before any request.
 
 > **MT4 history note:** on MT4, `price_history` with `from_`/`to` bounds (or the
 > `D1` timeframe) can fail server-side with `CopyRates failed` when the terminal

fxsocket-0.8.0/src/fxsocket/_version.py

@@ -0,0 +1 @@
+__version__ = "0.8.0"

{fxsocket-0.7.0 → fxsocket-0.8.0}/src/fxsocket/enums.py

@@ -229,35 +229,23 @@ class HealthStatus(str, Enum):
 class Timeframe(str, Enum):
     """Candle timeframes.
 
-    The MT5-only members (``M2``, ``M3``, ``H2``, ``H6``, ``H8``, ``H12``)
-    are rejected client-side for MT4 accounts.
+    Exactly the nine the terminal API accepts, on MT4 and MT5 alike (REST
+    ``price_history`` and the ``bars`` stream). MT5's other native periods
+    (``M2``, ``H2``, ``H12`` …) are not exposed by the terminal API, so they
+    are not members.
     """
 
     M1 = "M1"
-    M2 = "M2"
-    M3 = "M3"
     M5 = "M5"
     M15 = "M15"
     M30 = "M30"
     H1 = "H1"
-    H2 = "H2"
     H4 = "H4"
-    H6 = "H6"
-    H8 = "H8"
-    H12 = "H12"
     D1 = "D1"
     W1 = "W1"
     MN1 = "MN1"
 
 
-#: Timeframes that only MT5 supports.
-MT5_ONLY_TIMEFRAMES = frozenset(
-    {
-        Timeframe.M2,
-        Timeframe.M3,
-        Timeframe.H2,
-        Timeframe.H6,
-        Timeframe.H8,
-        Timeframe.H12,
-    }
-)
+#: Deprecated, always empty: both platforms accept every :class:`Timeframe`.
+#: Kept so existing imports don't break; will be removed in 1.0.
+MT5_ONLY_TIMEFRAMES: frozenset[Timeframe] = frozenset()

{fxsocket-0.7.0 → fxsocket-0.8.0}/src/fxsocket/errors.py

@@ -206,8 +206,9 @@ class TerminalTimeoutError(FxSocketError):
 class UnsupportedOnPlatformError(FxSocketError):
     """A requested feature doesn't exist on the account's platform.
 
-    Enforced client-side — e.g. stop-limit orders or MT5-only timeframes on
-    an MT4 account.
+    Nothing raises it at the moment: the MT4 and MT5 terminal APIs accept the
+    same timeframes and order operations. It stays exported for platform gaps
+    that need a client-side guard later.
     """
 
 

{fxsocket-0.7.0 → fxsocket-0.8.0}/src/fxsocket/terminal/client.py

@@ -4,11 +4,10 @@ One :class:`TerminalClient` (sync) / :class:`AsyncTerminalClient` (async) is
 bound to a single account's terminal endpoint (``Account.rest_url``). The two
 are method-for-method mirrors; only the awaiting differs.
 
-Platform awareness is enforced **client-side** before the request goes out:
-MT5-only timeframes (``M2``/``M3``/``H2``/``H6``/``H8``/``H12``) don't exist on
-MT4, so the SDK raises :class:`~fxsocket.UnsupportedOnPlatformError` rather than
-letting the terminal answer 400. (Order *operations*, including stop-limit, are
-accepted by both platforms' terminal APIs, so they are not gated.)
+MT4 and MT5 share one interface with nothing gated by platform: both terminal
+APIs accept the same nine timeframes (see :class:`~fxsocket.Timeframe`) and
+all eight order operations, stop-limit included. A timeframe outside that set
+raises :class:`~fxsocket.ValidationError` before the request goes out.
 
 Order inputs are validated client-side to fail fast and, above all, safely:
 the same constraints the terminal enforces (volume > 0, an entry price for
@@ -30,7 +29,6 @@ import httpx
 
 from .._http import AsyncHTTP, SyncHTTP, auth_headers
 from ..enums import (
-    MT5_ONLY_TIMEFRAMES,
     PENDING_OPERATIONS,
     STOP_LIMIT_OPERATIONS,
     OrderOperation,
@@ -38,7 +36,6 @@ from ..enums import (
     Timeframe,
 )
 from ..errors import (
-    UnsupportedOnPlatformError,
     ValidationError,
     error_from_response,
 )
@@ -68,17 +65,11 @@ _OP_BY_NORM = {op.value.lower(): op for op in OrderOperation}
 
 _TF_HUMAN = {
     "1min": Timeframe.M1,
-    "2min": Timeframe.M2,
-    "3min": Timeframe.M3,
     "5min": Timeframe.M5,
     "15min": Timeframe.M15,
     "30min": Timeframe.M30,
     "1h": Timeframe.H1,
-    "2h": Timeframe.H2,
     "4h": Timeframe.H4,
-    "6h": Timeframe.H6,
-    "8h": Timeframe.H8,
-    "12h": Timeframe.H12,
     "1d": Timeframe.D1,
     "1w": Timeframe.W1,
     "1month": Timeframe.MN1,
@@ -108,7 +99,10 @@ def coerce_timeframe(value: Timeframe | str) -> Timeframe:
         pass
     tf = _TF_HUMAN.get(raw.lower())
     if tf is None:
-        raise ValidationError(f"Unknown timeframe: {value!r}")
+        supported = ", ".join(t.value for t in Timeframe)
+        raise ValidationError(
+            f"Unknown timeframe: {value!r}; the terminal API accepts {supported}"
+        )
     return tf
 
 
@@ -184,13 +178,6 @@ def _resolve_modify_sl_tp(
     return sl, tp
 
 
-def _check_timeframe(tf: Timeframe, platform: Platform) -> None:
-    if platform is Platform.MT4 and tf in MT5_ONLY_TIMEFRAMES:
-        raise UnsupportedOnPlatformError(
-            f"{tf.value} is an MT5-only timeframe; not available on MT4."
-        )
-
-
 def _fmt_time(value: str | datetime | date | None) -> str | None:
     if value is None:
         return None
@@ -357,7 +344,6 @@ class TerminalClient:
         to: str | datetime | date | None = None,
     ) -> list[Candle]:
         tf = coerce_timeframe(timeframe)
-        _check_timeframe(tf, self.platform)
         params = _clean(
             {
                 "symbol": symbol,
@@ -638,7 +624,6 @@ class AsyncTerminalClient:
         to: str | datetime | date | None = None,
     ) -> list[Candle]:
         tf = coerce_timeframe(timeframe)
-        _check_timeframe(tf, self.platform)
         params = _clean(
             {
                 "symbol": symbol,

{fxsocket-0.7.0 → fxsocket-0.8.0}/src/fxsocket/terminal/stream.py

@@ -38,8 +38,8 @@ from urllib.parse import parse_qsl, urlencode, urlparse, urlunparse
 from websockets.asyncio.client import connect as _ws_connect
 from websockets.exceptions import ConnectionClosed
 
-from ..enums import MT5_ONLY_TIMEFRAMES, Platform, Timeframe
-from ..errors import StreamError, UnsupportedOnPlatformError, ValidationError
+from ..enums import Platform, Timeframe
+from ..errors import StreamError, ValidationError
 from ..models import (
     AccountSummary,
     Candle,
@@ -224,7 +224,6 @@ def _validate_sub(
     topic: str,
     symbol: str | None,
     timeframe: Timeframe | str | None,
-    platform: Platform,
 ) -> str | None:
     """Validate a subscription; returns the canonical timeframe label (or None)."""
     if topic not in _TOPICS:
@@ -236,12 +235,7 @@ def _validate_sub(
     if topic == "bars":
         if not timeframe:
             raise ValidationError("topic 'bars' requires a timeframe")
-        tf = coerce_timeframe(timeframe)
-        if platform is Platform.MT4 and tf in MT5_ONLY_TIMEFRAMES:
-            raise UnsupportedOnPlatformError(
-                f"{tf.value} is an MT5-only timeframe; not available on MT4."
-            )
-        return tf.value
+        return coerce_timeframe(timeframe).value
     return None
 
 
@@ -319,7 +313,7 @@ class AsyncStream:
         symbol: str | None = None,
         timeframe: Timeframe | str | None = None,
     ) -> None:
-        tf = _validate_sub(topic, symbol, timeframe, self.platform)
+        tf = _validate_sub(topic, symbol, timeframe)
         self._subs.add((topic, symbol, tf))
         await self._send(_sub_payload(topic, symbol, tf))
 
@@ -330,7 +324,7 @@ class AsyncStream:
         symbol: str | None = None,
         timeframe: Timeframe | str | None = None,
     ) -> None:
-        tf = _validate_sub(topic, symbol, timeframe, self.platform)
+        tf = _validate_sub(topic, symbol, timeframe)
         self._subs.discard((topic, symbol, tf))
         payload = _sub_payload(topic, symbol, tf)
         payload["action"] = "unsubscribe"

{fxsocket-0.7.0 → fxsocket-0.8.0}/tests/test_stream.py

@@ -21,7 +21,6 @@ from fxsocket import (
     TerminalUpdate,
     Tick,
     TradeUpdate,
-    UnsupportedOnPlatformError,
 )
 from fxsocket.terminal.stream import (
     StreamErrorEvent,
@@ -268,9 +267,12 @@ async def test_bars_requires_timeframe() -> None:
         await s.subscribe("bars", symbol="EURUSD")
 
 
-async def test_bars_mt5_only_timeframe_rejected_on_mt4() -> None:
-    s = AsyncStream(ws_url="ws://x/ws", api_key="k", platform="mt4")
-    with pytest.raises(UnsupportedOnPlatformError):
+@pytest.mark.parametrize("platform", ["mt4", "mt5"])
+async def test_bars_unsupported_timeframe_rejected(platform: str) -> None:
+    from fxsocket import ValidationError
+
+    s = AsyncStream(ws_url="ws://x/ws", api_key="k", platform=platform)
+    with pytest.raises(ValidationError):
         await s.subscribe_bars("EURUSD", "H6")
 
 

{fxsocket-0.7.0 → fxsocket-0.8.0}/tests/test_terminal.py

@@ -16,7 +16,6 @@ from fxsocket import (
     TerminalNotReadyError,
     TerminalTimeoutError,
     Timeframe,
-    UnsupportedOnPlatformError,
 )
 from fxsocket.models import Account
 from fxsocket.terminal.client import (
@@ -102,6 +101,21 @@ def test_coerce_timeframe(value: object, expected: Timeframe) -> None:
     assert coerce_timeframe(value) is expected  # type: ignore[arg-type]
 
 
+def test_timeframe_matches_terminal_api() -> None:
+    # The nine labels the MT4 and MT5 terminal APIs parse (REST + `bars`).
+    assert [tf.value for tf in Timeframe] == [
+        "M1", "M5", "M15", "M30", "H1", "H4", "D1", "W1", "MN1"
+    ]
+
+
+@pytest.mark.parametrize("value", ["H6", "M2", "h12", "2h", "3min", "7s"])
+def test_coerce_timeframe_unsupported(value: str) -> None:
+    from fxsocket import ValidationError
+
+    with pytest.raises(ValidationError, match="M1, M5, M15"):
+        coerce_timeframe(value)
+
+
 # --------------------------------------------------------------------------- #
 # Parsing — camelCase aliases, str timestamps
 # --------------------------------------------------------------------------- #
@@ -249,9 +263,17 @@ def test_price_history_sends_canonical_timeframe() -> None:
     assert "to" not in req.url.params  # None omitted
 
 
-def test_price_history_rejects_mt5_timeframe_on_mt4() -> None:
-    with _term(platform="mt4") as t, pytest.raises(UnsupportedOnPlatformError):
+@respx.mock
+@pytest.mark.parametrize("platform", ["mt4", "mt5"])
+def test_price_history_rejects_unsupported_timeframe(platform: str) -> None:
+    from fxsocket import ValidationError
+
+    route = respx.get(f"{TERM}/PriceHistory").mock(
+        return_value=httpx.Response(200, json=[])
+    )
+    with _term(platform=platform) as t, pytest.raises(ValidationError):
         t.price_history("EURUSD", "H6")
+    assert not route.called
 
 
 # --------------------------------------------------------------------------- #

fxsocket-0.7.0/src/fxsocket/_version.py

@@ -1 +0,0 @@
-__version__ = "0.7.0"