architect-py 5.1.0__tar.gz → 5.1.1__tar.gz

{architect_py-5.1.0 → architect_py-5.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: architect-py
-Version: 5.1.0
+Version: 5.1.1
 Summary: Python SDK for the Architect trading platform and brokerage.
 Author-email: "Architect Financial Technologies, Inc." <hello@architect.co>
 License-Expression: Apache-2.0

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/__init__.py

@@ -1,6 +1,6 @@
 # ruff: noqa:I001
 
-__version__ = "5.1.0"
+__version__ = "5.1.1"
 
 from .utils.nearest_tick import TickRoundMethod
 from .async_client import AsyncClient

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/async_client.py

@@ -102,7 +102,9 @@ class AsyncClient:
             )
             endpoint = kwargs["endpoint"]
 
-        grpc_host, grpc_port, use_ssl = await resolve_endpoint(endpoint)
+        grpc_host, grpc_port, use_ssl = await resolve_endpoint(
+            endpoint, paper_trading=paper_trading
+        )
         logging.info(
             f"Resolved endpoint {endpoint}: {grpc_host}:{grpc_port} use_ssl={use_ssl}"
         )
@@ -179,6 +181,22 @@ class AsyncClient:
         )
         self.grpc_core = GrpcClient(host=grpc_host, port=grpc_port, use_ssl=use_ssl)
 
+    async def close(self):
+        """
+        Close the gRPC channel and GraphQL client.
+        """
+        if self.grpc_core is not None:
+            await self.grpc_core.close()
+
+        for grpc_client in self.grpc_marketdata.values():
+            await grpc_client.close()
+
+        self.grpc_marketdata.clear()
+        # NB: this line removes the "Error in sys.excepthook:" on close
+
+        if self.graphql_client is not None:
+            await self.graphql_client.close()
+
     async def refresh_jwt(self, force: bool = False):
         """
         Refresh the JWT for the gRPC channel if it's nearing expiration (within 1 minute).
@@ -259,6 +277,9 @@ class AsyncClient:
             self.grpc_marketdata[venue] = GrpcClient(
                 host=grpc_host, port=grpc_port, use_ssl=use_ssl
             )
+            logging.debug(
+                f"Setting marketdata endpoint for {venue}: {grpc_host}:{grpc_port} use_ssl={use_ssl}"
+            )
         except Exception as e:
             logging.error("Failed to set marketdata endpoint: %s", e)
 
@@ -1448,7 +1469,7 @@ class AsyncClient:
             )
             if execution_info is None:
                 raise ValueError(
-                    "Could not find execution information for {symbol} for rounding price for limit order. Please round price manually."
+                    f"Could not find execution information for {symbol} for rounding price for limit order. Please round price manually."
                 )
             if (tick_size := execution_info.tick_size) is not None:
                 if tick_size:

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/client.py

@@ -2,13 +2,12 @@ import asyncio
 import sys
 import threading
 from asyncio import AbstractEventLoop
+from collections.abc import Callable
 from functools import partial
-from typing import Any, Awaitable, Callable, Coroutine, Optional, TypeVar
+from typing import Any, Concatenate, Coroutine, Optional, ParamSpec, TypeVar
 
 from .async_client import AsyncClient
 
-T = TypeVar("T")
-
 
 def is_async_function(obj):
     # can be converted to C function for faster performance
@@ -16,24 +15,30 @@ def is_async_function(obj):
     return callable(obj) and hasattr(obj, "__code__") and obj.__code__.co_flags & 0x80
 
 
+P = ParamSpec("P")
+T = TypeVar("T")
+
+
 class Client:
     """
+    One can find the function definition in the AsyncClient class and in the pyi file.
+
     This class is a wrapper around the AsyncClient class that allows you to call async methods synchronously.
     This does not work for subscription based methods.
 
     This Client takes control of the event loop, which you can pass in.
 
-    One can find the function definition in the AsyncClient class.
 
     The AsyncClient is more performant and powerful, so it is recommended to use that class if possible.
-
-    Avoid adding functions or other attributes to this class unless you know what you are doing, because
-    the __getattribute__ method changes the behavior of the class in a way that is not intuitive.
-
-    Instead, add them to the AsyncClient class.
+    Avoid adding functions or other attributes to this class unless you know what you are doing.
     """
 
-    __slots__ = ("client", "_event_loop")
+    __slots__ = (
+        "client",
+        "_event_loop",
+        "_sync_call",
+        "__dict__",
+    )
     client: AsyncClient
     _event_loop: AbstractEventLoop
 
@@ -56,88 +61,69 @@ class Client:
         Pass in an `event_loop` if you want to use your own; otherwise, this class
         will use the default asyncio event loop.
         """
+        self._sync_call = self._pick_executor()
+
         if event_loop is None:
             try:
                 event_loop = asyncio.get_running_loop()
             except RuntimeError:
                 event_loop = asyncio.new_event_loop()
                 asyncio.set_event_loop(event_loop)
-        super().__setattr__("_event_loop", event_loop)
-
-        async_client = self._event_loop.run_until_complete(
-            AsyncClient.connect(
-                api_key=api_key,
-                api_secret=api_secret,
-                paper_trading=paper_trading,
-                endpoint=endpoint,
-                graphql_port=graphql_port,
-                **kwargs,
-            )
+        object.__setattr__(self, "_event_loop", event_loop)
+
+        async_client: AsyncClient = self._sync_call(
+            AsyncClient.connect,
+            api_key=api_key,
+            api_secret=api_secret,
+            paper_trading=paper_trading,
+            endpoint=endpoint,
+            graphql_port=graphql_port,
+            **kwargs,
         )
-        super().__setattr__(
+
+        object.__setattr__(
+            self,
             "client",
             async_client,
         )
+        self._promote_async_client_methods()
 
+    def _pick_executor(
+        self,
+    ) -> Callable[
+        Concatenate[Callable[P, Coroutine[Any, Any, T]], P],
+        T,
+    ]:
+        """Return a function that runs a coroutine and blocks."""
         if "ipykernel" in sys.modules:
-            # for jupyter notebooks
+            executor = AsyncExecutor()
             import atexit
 
-            executor = AsyncExecutor()
             atexit.register(executor.shutdown)
+            return lambda fn, *a, **kw: executor.submit(fn(*a, **kw))
 
-            def _sync_call_create_task(
-                async_method: Callable[..., Coroutine[Any, Any, T]],
-                *args,
-                **kwargs,
-            ) -> T:
-                """
-                Executes the given coroutine synchronously using the executor.
-                """
-                return executor.submit(async_method(*args, **kwargs))
+        return lambda fn, *a, **kw: self._event_loop.run_until_complete(fn(*a, **kw))
 
-            super().__setattr__("_sync_call", _sync_call_create_task)
+    def _promote_async_client_methods(self) -> None:
+        for name in dir(self.client):
+            if name.startswith("_"):
+                continue
 
-    def __getattribute__(self, name: str):
-        """
-        You may have been lead here looking for the definition of a method of the Client
-        It can be found if you look in the AsyncClient class, which this class is a wrapper for,
-        or GraphQLClient, which is a parent class of AsyncClient
+            if any(x in name for x in ("stream", "subscribe", "connect")):
+                continue
+            attr = getattr(self.client, name)
 
-        Explanation:
-        __getattribute__ is a magic method that is called when searching for any attribute
-        In this case, will look through self.client, which is an instance of the Client class
+            if is_async_function(attr):
+                attr = partial(self._sync_call, attr)
 
-        We do this because we want to be able to call the async methods of the Client in a synchronous way,
-        but otherwise pass through the other attributes normally
+            object.__setattr__(self, name, attr)
 
-        It must be getattribute and not getattr because of the AsyncClientProtocol class inheritance
-        We gain type hinting but lose the ability to call the methods of the Client class itself
-        in a normal way
-        """
-        attr = getattr(super().__getattribute__("client"), name)
-        if is_async_function(attr):
-            if "subscribe" in name:
-                raise AttributeError(
-                    f"Method {name} is an subscription based async method and cannot be called synchronously"
-                )
-            return partial(super().__getattribute__("_sync_call"), attr)
+    def __setattr__(self, name: str, value: Any) -> None:
+        # protect wrapper internals
+        if name in ("client", "_event_loop", "_sync_call"):
+            object.__setattr__(self, name, value)
         else:
-            return attr
-
-    def __setattr__(self, name: str, value: Any):
-        """primarily to prevent unintended shadowing"""
-        client = super().__getattribute__("client")
-        setattr(client, name, value)
-
-    def _sync_call(
-        self, async_method: Callable[..., Awaitable[T]], *args, **kwargs
-    ) -> T:
-        return (
-            super()
-            .__getattribute__("_event_loop")
-            .run_until_complete(async_method(*args, **kwargs))
-        )
+            setattr(self.client, name, value)
 
 
 class AsyncExecutor:

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/client.pyi

@@ -23,19 +23,16 @@ from typing import Any, AsyncGenerator, AsyncIterator, Literal, Sequence, overlo
 
 class Client:
     """
+    One can find the function definition in the AsyncClient class and in the pyi file.
+
     This class is a wrapper around the AsyncClient class that allows you to call async methods synchronously.
     This does not work for subscription based methods.
 
     This Client takes control of the event loop, which you can pass in.
 
-    One can find the function definition in the AsyncClient class.
 
     The AsyncClient is more performant and powerful, so it is recommended to use that class if possible.
-
-    Avoid adding functions or other attributes to this class unless you know what you are doing, because
-    the __getattribute__ method changes the behavior of the class in a way that is not intuitive.
-
-    Instead, add them to the AsyncClient class.
+    Avoid adding functions or other attributes to this class unless you know what you are doing.
     """
     api_key: str | None
     api_secret: str | None
@@ -57,6 +54,10 @@ class Client:
         will use the default asyncio event loop.
         """
     l2_books: dict[Venue, dict[TradableProduct, tuple[L2BookSnapshot, asyncio.Task]]]
+    def close(self) -> None:
+        """
+        Close the gRPC channel and GraphQL client.
+        """
     def refresh_jwt(self, force: bool = False):
         """
         Refresh the JWT for the gRPC channel if it's nearing expiration (within 1 minute).

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/common_types/time_in_force.py

@@ -65,6 +65,7 @@ class TimeInForce:
 
     @classmethod
     def GTD(cls, when: datetime) -> "TimeInForce":
+        assert when.tzinfo is not None, "GTD requires a timezone-aware datetime"
         return cls("GTD", when)
 
     def serialize(self) -> msgspec.Raw:

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/common_types/tradable_product.py

@@ -54,7 +54,7 @@ class TradableProduct(str):
         return self.split("/", 1)[1]
 
     def serialize(self) -> msgspec.Raw:
-        return msgspec.Raw(self.encode())
+        return msgspec.Raw(msgspec.json.encode(str(self)))
 
     @staticmethod
     def deserialize(s: str) -> "TradableProduct":

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/graphql_client/juniper_base_client.py

@@ -91,6 +91,10 @@ class JuniperBaseClient:
         exc_tb: object,
     ) -> None:
         await self.http_client.aclose()
+    
+    async def close(self) -> None:
+        """Close the HTTP client connection."""
+        await self.http_client.aclose()
 
     async def execute(
         self,

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/grpc/client.py

@@ -30,6 +30,9 @@ class GrpcClient:
     def set_jwt(self, jwt: str | None):
         self.jwt = jwt
 
+    async def close(self):
+        await self.channel.close()
+
     @staticmethod
     def encoder() -> msgspec.json.Encoder:
         return encoder

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/grpc/resolve_endpoint.py

@@ -8,7 +8,9 @@ import dns.resolver
 from dns.rdtypes.IN.SRV import SRV
 
 
-async def resolve_endpoint(endpoint: str) -> Tuple[str, int, bool]:
+async def resolve_endpoint(
+    endpoint: str, paper_trading: bool = True
+) -> Tuple[str, int, bool]:
     """
     From a gRPC endpoint, resolve the host, port and whether or not the endpoint
     should use SSL.  If the port is specified explicitly, it will be used.  Otherwise,
@@ -67,4 +69,9 @@ async def resolve_endpoint(endpoint: str) -> Tuple[str, int, bool]:
 
     host = str(record.target).rstrip(".")  # strips the period off of FQDNs
 
-    return host, record.port, use_ssl
+    port = record.port
+    if paper_trading:
+        if "app.architect.co" in host or "staging.architect.co" in host:
+            port = 10080
+
+    return host, port, use_ssl

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py/tests/conftest.py

@@ -119,6 +119,3 @@ async def front_ES_future_usd(async_client: AsyncClient) -> str:
     """
     future = await get_front_ES_future(async_client)
     return f"{future}/USD"
-
-
-# CR alee: add sync Client tests

architect_py-5.1.1/architect_py/tests/test_encoding.py

@@ -0,0 +1,37 @@
+from datetime import datetime, timezone
+
+from architect_py.common_types.time_in_force import TimeInForce
+from architect_py.common_types.tradable_product import TradableProduct
+from architect_py.grpc.utils import encoder
+
+
+def test_encoding():
+    product = TradableProduct("ES 20250321 CME Future", "USD")
+    encoded = encoder.encode(product)
+
+    assert encoded == b'"ES 20250321 CME Future/USD"', (
+        'Encoding of TradableProduct failed, expected "ES 20250321 CME Future/USD" but got '
+        + str(encoded)
+    )
+
+    now = datetime.now(timezone.utc)
+
+    encoded = encoder.encode(TimeInForce.GTD(now))
+
+    assert encoded == b'{"GTD": "' + now.isoformat().encode() + b'"}', (
+        'Encoding of TimeInForce.GTD failed, expected {"GTD": "'
+        + now.isoformat()
+        + '"} but got '
+        + str(encoded)
+    )
+
+    encoded = encoder.encode(TimeInForce.GTC)
+
+    assert encoded == b'"GTC"', (
+        'Encoding of TimeInForce.GTC failed, expected "GTC" but got ' + str(encoded)
+    )
+
+
+if __name__ == "__main__":
+    test_encoding()
+    print("All tests passed.")

architect_py-5.1.1/architect_py/tests/test_sync_client.py

@@ -0,0 +1,23 @@
+import pytest
+from dotenv import load_dotenv
+
+from architect_py import Client
+from architect_py.tests.conftest import TestEnvironment
+
+
+@pytest.mark.asyncio
+async def test_sync_client():
+    load_dotenv()
+    test_env = TestEnvironment.from_env()
+    client = Client(
+        api_key=test_env.api_key,
+        api_secret=test_env.api_secret,
+        paper_trading=test_env.paper_trading,
+        endpoint=test_env.endpoint,
+        graphql_port=test_env.graphql_port,
+    )
+
+    symbols = client.list_symbols(marketdata="CME")
+
+    assert symbols is not None
+    assert len(symbols) > 20

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: architect-py
-Version: 5.1.0
+Version: 5.1.1
 Summary: Python SDK for the Architect trading platform and brokerage.
 Author-email: "Architect Financial Technologies, Inc." <hello@architect.co>
 License-Expression: Apache-2.0

{architect_py-5.1.0 → architect_py-5.1.1}/architect_py.egg-info/SOURCES.txt

@@ -164,12 +164,14 @@ architect_py/grpc/models/Symbology/__init__.py
 architect_py/tests/__init__.py
 architect_py/tests/conftest.py
 architect_py/tests/test_book_building.py
+architect_py/tests/test_encoding.py
 architect_py/tests/test_marketdata.py
 architect_py/tests/test_order_entry.py
 architect_py/tests/test_orderflow.py
 architect_py/tests/test_portfolio_management.py
 architect_py/tests/test_rounding.py
 architect_py/tests/test_symbology.py
+architect_py/tests/test_sync_client.py
 architect_py/utils/nearest_tick.py
 architect_py/utils/nearest_tick_2.py
 architect_py/utils/orderbook.py

{architect_py-5.1.0 → architect_py-5.1.1}/pyproject.toml

@@ -22,7 +22,7 @@ license = "Apache-2.0"
 name = "architect-py"
 readme = "README.md"
 requires-python = ">=3.10,<4"
-version = "5.1.0"
+version = "5.1.1"
 
 [dependency-groups]
 dev = [

{architect_py-5.1.0 → architect_py-5.1.1}/templates/juniper_base_client.py

@@ -89,6 +89,10 @@ class JuniperBaseClient:
         exc_tb: object,
     ) -> None:
         await self.http_client.aclose()
+    
+    async def close(self) -> None:
+        """Close the HTTP client connection."""
+        await self.http_client.aclose()
 
     async def execute(
         self,