|
6 | 6 | import os |
7 | 7 | import sys |
8 | 8 | import json |
9 | | -import time |
10 | 9 | import asyncio |
11 | 10 | import inspect |
12 | | -import subprocess |
13 | 11 | import tracemalloc |
14 | 12 | from typing import Any, Union, cast |
15 | | -from textwrap import dedent |
16 | 13 | from unittest import mock |
17 | 14 | from typing_extensions import Literal |
18 | 15 |
|
|
23 | 20 |
|
24 | 21 | from zeroentropy import ZeroEntropy, AsyncZeroEntropy, APIResponseValidationError |
25 | 22 | from zeroentropy._types import Omit |
| 23 | +from zeroentropy._utils import asyncify |
26 | 24 | from zeroentropy._models import BaseModel, FinalRequestOptions |
27 | 25 | from zeroentropy._exceptions import APIStatusError, APITimeoutError, ZeroEntropyError, APIResponseValidationError |
28 | 26 | from zeroentropy._base_client import ( |
29 | 27 | DEFAULT_TIMEOUT, |
30 | 28 | HTTPX_DEFAULT_TIMEOUT, |
31 | 29 | BaseClient, |
| 30 | + OtherPlatform, |
32 | 31 | DefaultHttpxClient, |
33 | 32 | DefaultAsyncHttpxClient, |
| 33 | + get_platform, |
34 | 34 | make_request_options, |
35 | 35 | ) |
36 | 36 |
|
@@ -1639,50 +1639,9 @@ def retry_handler(_request: httpx.Request) -> httpx.Response: |
1639 | 1639 |
|
1640 | 1640 | assert response.http_request.headers.get("x-stainless-retry-count") == "42" |
1641 | 1641 |
|
1642 | | - def test_get_platform(self) -> None: |
1643 | | - # A previous implementation of asyncify could leave threads unterminated when |
1644 | | - # used with nest_asyncio. |
1645 | | - # |
1646 | | - # Since nest_asyncio.apply() is global and cannot be un-applied, this |
1647 | | - # test is run in a separate process to avoid affecting other tests. |
1648 | | - test_code = dedent(""" |
1649 | | - import asyncio |
1650 | | - import nest_asyncio |
1651 | | - import threading |
1652 | | -
|
1653 | | - from zeroentropy._utils import asyncify |
1654 | | - from zeroentropy._base_client import get_platform |
1655 | | -
|
1656 | | - async def test_main() -> None: |
1657 | | - result = await asyncify(get_platform)() |
1658 | | - print(result) |
1659 | | - for thread in threading.enumerate(): |
1660 | | - print(thread.name) |
1661 | | -
|
1662 | | - nest_asyncio.apply() |
1663 | | - asyncio.run(test_main()) |
1664 | | - """) |
1665 | | - with subprocess.Popen( |
1666 | | - [sys.executable, "-c", test_code], |
1667 | | - text=True, |
1668 | | - ) as process: |
1669 | | - timeout = 10 # seconds |
1670 | | - |
1671 | | - start_time = time.monotonic() |
1672 | | - while True: |
1673 | | - return_code = process.poll() |
1674 | | - if return_code is not None: |
1675 | | - if return_code != 0: |
1676 | | - raise AssertionError("calling get_platform using asyncify resulted in a non-zero exit code") |
1677 | | - |
1678 | | - # success |
1679 | | - break |
1680 | | - |
1681 | | - if time.monotonic() - start_time > timeout: |
1682 | | - process.kill() |
1683 | | - raise AssertionError("calling get_platform using asyncify resulted in a hung process") |
1684 | | - |
1685 | | - time.sleep(0.1) |
| 1642 | + async def test_get_platform(self) -> None: |
| 1643 | + platform = await asyncify(get_platform)() |
| 1644 | + assert isinstance(platform, (str, OtherPlatform)) |
1686 | 1645 |
|
1687 | 1646 | async def test_proxy_environment_variables(self, monkeypatch: pytest.MonkeyPatch) -> None: |
1688 | 1647 | # Test that the proxy environment variables are set correctly |
|
0 commit comments