visionai-sdk-python 2.2.0.dev5__tar.gz → 2.2.0.dev6__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/PKG-INFO +10 -2
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/README.md +9 -1
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/_base.py +29 -2
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/async_client.py +35 -18
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/credentials.py +71 -17
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/client.py +35 -20
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/protocol.py +16 -8
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/PKG-INFO +10 -2
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/SOURCES.txt +1 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/scm_file_list.json +1 -0
- visionai_sdk_python-2.2.0.dev6/src/visionai_sdk_python.egg-info/scm_version.json +8 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/relay/test_protocol.py +7 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_credentials.py +82 -0
- visionai_sdk_python-2.2.0.dev6/tests/test_transport_options.py +57 -0
- visionai_sdk_python-2.2.0.dev5/src/visionai_sdk_python.egg-info/scm_version.json +0 -8
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/.github/dependabot.yml +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/.github/workflows/ci.yml +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/.github/workflows/publish.yml +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/.gitignore +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/pyproject.toml +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/setup.cfg +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/_jwt_verifier.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/_request_attribution.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/_source_header.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/_mixin.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/async_resource.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/models.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/auth/resource.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/constants.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/endpoints.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/exceptions.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/instrumentation.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/py.typed +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/error_connection.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/error_request.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/heartbeat.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/register.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/registered.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/request.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/response.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/relay/examples/response_text.json +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/_mixin.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/async_resource.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/models.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/preprocess.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/vlm/resource.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/dependency_links.txt +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/requires.txt +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python.egg-info/top_level.txt +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/constants.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/relay/__init__.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test__base.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_async_client.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_client.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_instrumentation.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_request.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_vlm_preprocess.py +0 -0
- {visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/uv.lock +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: visionai-sdk-python
|
|
3
|
-
Version: 2.2.0.
|
|
3
|
+
Version: 2.2.0.dev6
|
|
4
4
|
Summary: VisionAI SDK for Python
|
|
5
5
|
Author-email: Tony Yang <tonyyang@linkervision.com>
|
|
6
6
|
Requires-Python: >=3.11
|
|
@@ -153,6 +153,13 @@ token = cred.get_token().token # for a WebSocket upgrade or another lib
|
|
|
153
153
|
nodes = client.request("GET", "https://vs.example.com/mgmt/nodes").json()
|
|
154
154
|
```
|
|
155
155
|
|
|
156
|
+
`request()` raises on a non-2xx like the resource methods (`AuthenticationError`,
|
|
157
|
+
`ClientError`, `ServerError`, ...), unlike plain httpx, and sends the token to whatever
|
|
158
|
+
host `url` names, so `url` comes from configuration or code, never from a caller. A
|
|
159
|
+
client built with `http_client=` (or a credential with `http=`) uses that client's TLS,
|
|
160
|
+
timeout and limits; passing `verify_ssl` / `timeout` / `max_connections` /
|
|
161
|
+
`max_keepalive_connections` with it raises `ValueError`.
|
|
162
|
+
|
|
156
163
|
A mint is a Platform round trip and, on sites that cap client tokens, a scarce one:
|
|
157
164
|
concurrent callers share one mint, a refresh that fails keeps the current token while
|
|
158
165
|
Platform still accepts it, a 401 on a token minted more than 30 minutes ago buys a
|
|
@@ -169,7 +176,8 @@ authentication wins. `vlm_url` is optional for clients that only authenticate.
|
|
|
169
176
|
|
|
170
177
|
`visionai_sdk_python.relay` holds the wire format between platform-relay and
|
|
171
178
|
platform-edge-agent: the frame models, the constants and `parse_agent_frame()` /
|
|
172
|
-
`parse_relay_frame()`
|
|
179
|
+
`parse_relay_frame()` (text frames only: `bytes` or `None` is an `InvalidFrame`) /
|
|
180
|
+
`dump_frame()` (which refuses a frame over `MAX_FRAME_BYTES`). The spec is platform-service's
|
|
173
181
|
`docs/adr/0001-relay-protocol.md`; both sides import this module instead of keeping a
|
|
174
182
|
copy. The ADR's JSON examples ship with it (`visionai_sdk_python.relay.examples`:
|
|
175
183
|
`example(name)` / `example_text(name)`), so every implementation tests against the same
|
|
@@ -135,6 +135,13 @@ token = cred.get_token().token # for a WebSocket upgrade or another lib
|
|
|
135
135
|
nodes = client.request("GET", "https://vs.example.com/mgmt/nodes").json()
|
|
136
136
|
```
|
|
137
137
|
|
|
138
|
+
`request()` raises on a non-2xx like the resource methods (`AuthenticationError`,
|
|
139
|
+
`ClientError`, `ServerError`, ...), unlike plain httpx, and sends the token to whatever
|
|
140
|
+
host `url` names, so `url` comes from configuration or code, never from a caller. A
|
|
141
|
+
client built with `http_client=` (or a credential with `http=`) uses that client's TLS,
|
|
142
|
+
timeout and limits; passing `verify_ssl` / `timeout` / `max_connections` /
|
|
143
|
+
`max_keepalive_connections` with it raises `ValueError`.
|
|
144
|
+
|
|
138
145
|
A mint is a Platform round trip and, on sites that cap client tokens, a scarce one:
|
|
139
146
|
concurrent callers share one mint, a refresh that fails keeps the current token while
|
|
140
147
|
Platform still accepts it, a 401 on a token minted more than 30 minutes ago buys a
|
|
@@ -151,7 +158,8 @@ authentication wins. `vlm_url` is optional for clients that only authenticate.
|
|
|
151
158
|
|
|
152
159
|
`visionai_sdk_python.relay` holds the wire format between platform-relay and
|
|
153
160
|
platform-edge-agent: the frame models, the constants and `parse_agent_frame()` /
|
|
154
|
-
`parse_relay_frame()`
|
|
161
|
+
`parse_relay_frame()` (text frames only: `bytes` or `None` is an `InvalidFrame`) /
|
|
162
|
+
`dump_frame()` (which refuses a frame over `MAX_FRAME_BYTES`). The spec is platform-service's
|
|
155
163
|
`docs/adr/0001-relay-protocol.md`; both sides import this module instead of keeping a
|
|
156
164
|
copy. The ADR's JSON examples ship with it (`visionai_sdk_python.relay.examples`:
|
|
157
165
|
`example(name)` / `example_text(name)`), so every implementation tests against the same
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/_base.py
RENAMED
|
@@ -11,6 +11,29 @@ if TYPE_CHECKING:
|
|
|
11
11
|
from .auth.credentials import AsyncClientCredentials, ClientCredentials
|
|
12
12
|
|
|
13
13
|
|
|
14
|
+
_TRANSPORT_DEFAULTS = {
|
|
15
|
+
"verify_ssl": True,
|
|
16
|
+
"timeout": 10.0,
|
|
17
|
+
"max_connections": 100,
|
|
18
|
+
"max_keepalive_connections": 20,
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
|
|
22
|
+
def _transport_settings(injected: object | None, **given: object) -> dict:
|
|
23
|
+
"""The settings for the httpx client the SDK builds, or an error with an injected one.
|
|
24
|
+
|
|
25
|
+
An injected client brings its own TLS, timeout and limits, so none of these
|
|
26
|
+
may be given with it: silently ignoring ``verify_ssl=False`` would surprise.
|
|
27
|
+
"""
|
|
28
|
+
passed = {name: value for name, value in given.items() if value is not None}
|
|
29
|
+
if injected is not None and passed:
|
|
30
|
+
raise ValueError(
|
|
31
|
+
"the injected http client has its own verify, timeout and limits; "
|
|
32
|
+
f"do not pass {', '.join(passed)} with it"
|
|
33
|
+
)
|
|
34
|
+
return {**_TRANSPORT_DEFAULTS, **passed}
|
|
35
|
+
|
|
36
|
+
|
|
14
37
|
class _BaseClient:
|
|
15
38
|
"""Base class for VisionAI SDK clients.
|
|
16
39
|
|
|
@@ -79,8 +102,12 @@ class _BaseClient:
|
|
|
79
102
|
|
|
80
103
|
@property
|
|
81
104
|
def credential(self) -> "ClientCredentials | AsyncClientCredentials | None":
|
|
82
|
-
"""The credential
|
|
83
|
-
|
|
105
|
+
"""The credential currently in use, or None.
|
|
106
|
+
|
|
107
|
+
Set by ``credential=`` or by ``auth.get_access_token()``; dropped by
|
|
108
|
+
``login()`` / ``set_token()``, whose token then takes over. For callers
|
|
109
|
+
that need the raw token themselves (a WebSocket upgrade, another HTTP
|
|
110
|
+
library): ``credential.get_token()`` / ``credential.invalidate(token)``."""
|
|
84
111
|
return self._credential
|
|
85
112
|
|
|
86
113
|
@staticmethod
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import httpx
|
|
2
2
|
|
|
3
|
-
from ._base import _BaseClient
|
|
3
|
+
from ._base import _BaseClient, _transport_settings
|
|
4
4
|
from ._request_attribution import merge_request_attribution
|
|
5
5
|
from .auth.async_resource import AsyncAuthResource
|
|
6
6
|
from .auth.credentials import AsyncClientCredentials
|
|
@@ -14,32 +14,49 @@ class AsyncClient(_BaseClient):
|
|
|
14
14
|
auth_url: str,
|
|
15
15
|
vlm_url: str | None = None,
|
|
16
16
|
allowed_issuers: list[str] | None = None,
|
|
17
|
-
verify_ssl: bool =
|
|
18
|
-
timeout: float =
|
|
19
|
-
max_connections: int =
|
|
20
|
-
max_keepalive_connections: int =
|
|
17
|
+
verify_ssl: bool | None = None,
|
|
18
|
+
timeout: float | None = None,
|
|
19
|
+
max_connections: int | None = None,
|
|
20
|
+
max_keepalive_connections: int | None = None,
|
|
21
21
|
credential: AsyncClientCredentials | None = None,
|
|
22
22
|
http_client: httpx.AsyncClient | None = None,
|
|
23
23
|
) -> None:
|
|
24
|
-
"""See ``_BaseClient
|
|
25
|
-
(tests, shared pools)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
"""See ``_BaseClient``. ``http_client`` is an httpx.AsyncClient to send through
|
|
25
|
+
(tests, shared pools): its own TLS, timeout and limits apply, so
|
|
26
|
+
``verify_ssl`` / ``timeout`` / ``max_connections`` /
|
|
27
|
+
``max_keepalive_connections`` cannot be given with it (``ValueError``);
|
|
28
|
+
the client closes only the one it created."""
|
|
29
|
+
if credential is not None and not isinstance(
|
|
30
|
+
credential, AsyncClientCredentials
|
|
31
|
+
):
|
|
32
|
+
raise TypeError(
|
|
33
|
+
"AsyncClient takes an AsyncClientCredentials; Client takes a ClientCredentials"
|
|
34
|
+
)
|
|
35
|
+
settings = _transport_settings(
|
|
36
|
+
http_client,
|
|
30
37
|
verify_ssl=verify_ssl,
|
|
31
38
|
timeout=timeout,
|
|
32
39
|
max_connections=max_connections,
|
|
33
40
|
max_keepalive_connections=max_keepalive_connections,
|
|
41
|
+
)
|
|
42
|
+
super().__init__(
|
|
43
|
+
auth_url=auth_url,
|
|
44
|
+
vlm_url=vlm_url,
|
|
45
|
+
allowed_issuers=allowed_issuers,
|
|
34
46
|
credential=credential,
|
|
47
|
+
**settings,
|
|
35
48
|
)
|
|
36
|
-
self._client =
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
49
|
+
self._client = (
|
|
50
|
+
http_client
|
|
51
|
+
if http_client is not None
|
|
52
|
+
else httpx.AsyncClient(
|
|
53
|
+
verify=self.verify_ssl,
|
|
54
|
+
timeout=self.timeout,
|
|
55
|
+
limits=httpx.Limits(
|
|
56
|
+
max_connections=self.max_connections,
|
|
57
|
+
max_keepalive_connections=self.max_keepalive_connections,
|
|
58
|
+
),
|
|
59
|
+
)
|
|
43
60
|
)
|
|
44
61
|
self._http_owner = http_client is None # a client we built is ours to close
|
|
45
62
|
# Register the different function resource
|
|
@@ -19,10 +19,12 @@ from typing import Any
|
|
|
19
19
|
|
|
20
20
|
import httpx
|
|
21
21
|
|
|
22
|
-
from .._base import _BaseClient
|
|
22
|
+
from .._base import _BaseClient, _transport_settings
|
|
23
23
|
from .._request_attribution import merge_request_attribution
|
|
24
24
|
from ..endpoints import AuthEndpoint
|
|
25
25
|
from ..exceptions import (
|
|
26
|
+
AuthenticationError,
|
|
27
|
+
PermissionDeniedError,
|
|
26
28
|
RateLimitedError,
|
|
27
29
|
VisionaiSDKError,
|
|
28
30
|
from_transport_error,
|
|
@@ -37,6 +39,8 @@ logger = logging.getLogger(__name__)
|
|
|
37
39
|
REFRESH_BUFFER_S = 300
|
|
38
40
|
# After a 429 no mint is tried for this long.
|
|
39
41
|
RATE_LIMIT_COOLDOWN_S = 3600
|
|
42
|
+
# After a failed refresh the current token is served and no mint is tried for this long.
|
|
43
|
+
REFRESH_RETRY_S = 30
|
|
40
44
|
# A 401 on a token minted less than this long ago does not replace it.
|
|
41
45
|
REPLACE_COOLDOWN_S = 30 * 60
|
|
42
46
|
|
|
@@ -73,12 +77,13 @@ class _Credentials:
|
|
|
73
77
|
self._url = _BaseClient._build_url(self.auth_url, AuthEndpoint.CLIENT_TOKEN)
|
|
74
78
|
self._current: AccessToken | None = None # the token this credential holds
|
|
75
79
|
self._blocked_until = 0.0
|
|
80
|
+
self._retry_after = 0.0 # set by a failed refresh
|
|
76
81
|
self._minting = False # a mint is in flight (set under the lock)
|
|
77
82
|
|
|
78
83
|
def is_for(self, client_id: str, client_secret: str) -> bool:
|
|
79
84
|
"""True when this credential was built for exactly these client credentials."""
|
|
80
85
|
return self.client_id == client_id.strip() and hmac.compare_digest(
|
|
81
|
-
self._client_secret, client_secret
|
|
86
|
+
self._client_secret.encode(), client_secret.encode()
|
|
82
87
|
)
|
|
83
88
|
|
|
84
89
|
def _fresh(self) -> AccessToken | None:
|
|
@@ -129,12 +134,22 @@ class _Credentials:
|
|
|
129
134
|
return self._current
|
|
130
135
|
|
|
131
136
|
def _after_failed_refresh(self, error: VisionaiSDKError) -> AccessToken:
|
|
132
|
-
"""A refresh failed: keep serving the current token while it is valid, else raise.
|
|
137
|
+
"""A refresh failed: keep serving the current token while it is valid, else raise.
|
|
138
|
+
|
|
139
|
+
No mint is tried again for ``REFRESH_RETRY_S``. A refusal (401 / 403) is kept
|
|
140
|
+
too, because the issued token stays valid until it expires; it is logged as an
|
|
141
|
+
error since only the client credentials can be wrong.
|
|
142
|
+
"""
|
|
133
143
|
valid = self._valid()
|
|
134
144
|
if valid is None:
|
|
135
145
|
raise error
|
|
136
|
-
|
|
137
|
-
|
|
146
|
+
self._retry_after = _now() + REFRESH_RETRY_S
|
|
147
|
+
refused = isinstance(error, (AuthenticationError, PermissionDeniedError))
|
|
148
|
+
logger.log(
|
|
149
|
+
logging.ERROR if refused else logging.WARNING,
|
|
150
|
+
"token refresh refused; check the client credentials"
|
|
151
|
+
if refused
|
|
152
|
+
else "token refresh failed; using the current token until it expires",
|
|
138
153
|
extra={
|
|
139
154
|
"client_id": self.client_id,
|
|
140
155
|
"error": str(error),
|
|
@@ -143,8 +158,8 @@ class _Credentials:
|
|
|
143
158
|
)
|
|
144
159
|
return valid
|
|
145
160
|
|
|
146
|
-
def
|
|
147
|
-
"""
|
|
161
|
+
def _invalidate(self, token: str) -> bool:
|
|
162
|
+
"""Behind both ``invalidate()``; the sync class calls it under its lock.
|
|
148
163
|
|
|
149
164
|
A late report for a token no longer held changes nothing. A token minted
|
|
150
165
|
less than ``REPLACE_COOLDOWN_S`` ago is kept: a 401 that soon is a client or
|
|
@@ -152,14 +167,16 @@ class _Credentials:
|
|
|
152
167
|
often a persistent 401 can mint. While a mint is in flight the report is
|
|
153
168
|
already being acted on.
|
|
154
169
|
"""
|
|
155
|
-
|
|
170
|
+
current = self._current
|
|
171
|
+
if current is None or token != current.token:
|
|
156
172
|
return False
|
|
157
173
|
if self._minting:
|
|
158
174
|
return True
|
|
159
|
-
|
|
175
|
+
age = _now() - current.issued_at
|
|
176
|
+
if age < REPLACE_COOLDOWN_S:
|
|
160
177
|
logger.warning(
|
|
161
178
|
"401 on a token minted %d s ago; keeping it until the cooldown ends",
|
|
162
|
-
int(
|
|
179
|
+
int(age),
|
|
163
180
|
extra={"client_id": self.client_id},
|
|
164
181
|
)
|
|
165
182
|
return False
|
|
@@ -181,19 +198,35 @@ class ClientCredentials(_Credentials):
|
|
|
181
198
|
client_secret: str,
|
|
182
199
|
*,
|
|
183
200
|
http: httpx.Client | None = None,
|
|
184
|
-
verify_ssl: bool =
|
|
185
|
-
timeout: float =
|
|
201
|
+
verify_ssl: bool | None = None,
|
|
202
|
+
timeout: float | None = None,
|
|
186
203
|
) -> None:
|
|
187
204
|
super().__init__(auth_url, client_id, client_secret)
|
|
188
|
-
|
|
205
|
+
own = _transport_settings(http, verify_ssl=verify_ssl, timeout=timeout)
|
|
206
|
+
self._http = (
|
|
207
|
+
http
|
|
208
|
+
if http is not None
|
|
209
|
+
else httpx.Client(verify=own["verify_ssl"], timeout=own["timeout"])
|
|
210
|
+
)
|
|
189
211
|
self._http_owner = http is None # a client we built is ours to close
|
|
190
212
|
self._lock = threading.Lock()
|
|
191
213
|
|
|
214
|
+
def invalidate(self, token: str) -> bool:
|
|
215
|
+
"""Report a 401 for ``token``. True: dropped, so the next ``get_token()`` mints.
|
|
216
|
+
|
|
217
|
+
Under the credential's lock: a report that arrives while another thread
|
|
218
|
+
mints waits for it, then finds the fresh token and leaves it alone.
|
|
219
|
+
"""
|
|
220
|
+
with self._lock:
|
|
221
|
+
return self._invalidate(token)
|
|
222
|
+
|
|
192
223
|
def get_token(self, *, force_refresh: bool = False) -> AccessToken:
|
|
193
224
|
"""The cached token, refreshed shortly before it expires.
|
|
194
225
|
|
|
195
226
|
``force_refresh=True`` mints even while the cached token is fresh. A refresh
|
|
196
|
-
that fails keeps serving the current token while Platform still accepts it
|
|
227
|
+
that fails keeps serving the current token while Platform still accepts it
|
|
228
|
+
and is not retried for ``REFRESH_RETRY_S``; a refused one (401 / 403) is kept
|
|
229
|
+
too, logged as an error.
|
|
197
230
|
|
|
198
231
|
Raises:
|
|
199
232
|
AuthenticationError: Platform refused the client credentials (401).
|
|
@@ -206,6 +239,10 @@ class ClientCredentials(_Credentials):
|
|
|
206
239
|
fresh = self._fresh()
|
|
207
240
|
if fresh is not None:
|
|
208
241
|
return fresh
|
|
242
|
+
if _now() < self._retry_after:
|
|
243
|
+
valid = self._valid()
|
|
244
|
+
if valid is not None:
|
|
245
|
+
return valid # a refresh just failed; not again yet
|
|
209
246
|
self._minting = True
|
|
210
247
|
try:
|
|
211
248
|
kwargs = self._begin_mint()
|
|
@@ -248,14 +285,27 @@ class AsyncClientCredentials(_Credentials):
|
|
|
248
285
|
client_secret: str,
|
|
249
286
|
*,
|
|
250
287
|
http: httpx.AsyncClient | None = None,
|
|
251
|
-
verify_ssl: bool =
|
|
252
|
-
timeout: float =
|
|
288
|
+
verify_ssl: bool | None = None,
|
|
289
|
+
timeout: float | None = None,
|
|
253
290
|
) -> None:
|
|
254
291
|
super().__init__(auth_url, client_id, client_secret)
|
|
255
|
-
|
|
292
|
+
own = _transport_settings(http, verify_ssl=verify_ssl, timeout=timeout)
|
|
293
|
+
self._http = (
|
|
294
|
+
http
|
|
295
|
+
if http is not None
|
|
296
|
+
else httpx.AsyncClient(verify=own["verify_ssl"], timeout=own["timeout"])
|
|
297
|
+
)
|
|
256
298
|
self._http_owner = http is None # a client we built is ours to close
|
|
257
299
|
self._lock = asyncio.Lock()
|
|
258
300
|
|
|
301
|
+
def invalidate(self, token: str) -> bool:
|
|
302
|
+
"""Report a 401 for ``token``. True: dropped, so the next ``get_token()`` mints.
|
|
303
|
+
|
|
304
|
+
No lock: there is no ``await`` here, so the check and the drop are one step
|
|
305
|
+
on the event loop; a mint in flight shows through ``_minting``.
|
|
306
|
+
"""
|
|
307
|
+
return self._invalidate(token)
|
|
308
|
+
|
|
259
309
|
async def get_token(self, *, force_refresh: bool = False) -> AccessToken:
|
|
260
310
|
"""The cached token, refreshed shortly before it expires.
|
|
261
311
|
|
|
@@ -267,6 +317,10 @@ class AsyncClientCredentials(_Credentials):
|
|
|
267
317
|
fresh = self._fresh()
|
|
268
318
|
if fresh is not None:
|
|
269
319
|
return fresh
|
|
320
|
+
if _now() < self._retry_after:
|
|
321
|
+
valid = self._valid()
|
|
322
|
+
if valid is not None:
|
|
323
|
+
return valid # a refresh just failed; not again yet
|
|
270
324
|
self._minting = True
|
|
271
325
|
try:
|
|
272
326
|
kwargs = self._begin_mint()
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/client.py
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import httpx
|
|
2
2
|
|
|
3
|
-
from ._base import _BaseClient
|
|
3
|
+
from ._base import _BaseClient, _transport_settings
|
|
4
4
|
from ._request_attribution import merge_request_attribution
|
|
5
5
|
from .auth.credentials import ClientCredentials
|
|
6
6
|
from .auth.resource import AuthResource
|
|
@@ -14,32 +14,47 @@ class Client(_BaseClient):
|
|
|
14
14
|
auth_url: str,
|
|
15
15
|
vlm_url: str | None = None,
|
|
16
16
|
allowed_issuers: list[str] | None = None,
|
|
17
|
-
verify_ssl: bool =
|
|
18
|
-
timeout: float =
|
|
19
|
-
max_connections: int =
|
|
20
|
-
max_keepalive_connections: int =
|
|
17
|
+
verify_ssl: bool | None = None,
|
|
18
|
+
timeout: float | None = None,
|
|
19
|
+
max_connections: int | None = None,
|
|
20
|
+
max_keepalive_connections: int | None = None,
|
|
21
21
|
credential: ClientCredentials | None = None,
|
|
22
22
|
http_client: httpx.Client | None = None,
|
|
23
23
|
) -> None:
|
|
24
|
-
"""See ``_BaseClient
|
|
25
|
-
(tests, shared pools)
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
24
|
+
"""See ``_BaseClient``. ``http_client`` is an httpx.Client to send through
|
|
25
|
+
(tests, shared pools): its own TLS, timeout and limits apply, so
|
|
26
|
+
``verify_ssl`` / ``timeout`` / ``max_connections`` /
|
|
27
|
+
``max_keepalive_connections`` cannot be given with it (``ValueError``);
|
|
28
|
+
the client closes only the one it created."""
|
|
29
|
+
if credential is not None and not isinstance(credential, ClientCredentials):
|
|
30
|
+
raise TypeError(
|
|
31
|
+
"Client takes a ClientCredentials; AsyncClient takes an AsyncClientCredentials"
|
|
32
|
+
)
|
|
33
|
+
settings = _transport_settings(
|
|
34
|
+
http_client,
|
|
30
35
|
verify_ssl=verify_ssl,
|
|
31
36
|
timeout=timeout,
|
|
32
37
|
max_connections=max_connections,
|
|
33
38
|
max_keepalive_connections=max_keepalive_connections,
|
|
39
|
+
)
|
|
40
|
+
super().__init__(
|
|
41
|
+
auth_url=auth_url,
|
|
42
|
+
vlm_url=vlm_url,
|
|
43
|
+
allowed_issuers=allowed_issuers,
|
|
34
44
|
credential=credential,
|
|
45
|
+
**settings,
|
|
35
46
|
)
|
|
36
|
-
self._client =
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
47
|
+
self._client = (
|
|
48
|
+
http_client
|
|
49
|
+
if http_client is not None
|
|
50
|
+
else httpx.Client(
|
|
51
|
+
verify=self.verify_ssl,
|
|
52
|
+
timeout=self.timeout,
|
|
53
|
+
limits=httpx.Limits(
|
|
54
|
+
max_connections=self.max_connections,
|
|
55
|
+
max_keepalive_connections=self.max_keepalive_connections,
|
|
56
|
+
),
|
|
57
|
+
)
|
|
43
58
|
)
|
|
44
59
|
self._http_owner = http_client is None # a client we built is ours to close
|
|
45
60
|
# Register the different function resource
|
|
@@ -83,7 +98,7 @@ class Client(_BaseClient):
|
|
|
83
98
|
if self._credential is None or not self._resendable(kwargs):
|
|
84
99
|
raise
|
|
85
100
|
self._credential.invalidate(token)
|
|
86
|
-
replacement =
|
|
101
|
+
replacement = self._credential.get_token().token
|
|
87
102
|
if replacement == token:
|
|
88
103
|
raise
|
|
89
104
|
return self._request(method, url, **self._with_auth(kwargs, replacement))
|
|
@@ -124,7 +139,7 @@ class Client(_BaseClient):
|
|
|
124
139
|
AuthenticationError: If no token is available or token expired without credentials.
|
|
125
140
|
"""
|
|
126
141
|
if self._credential is not None:
|
|
127
|
-
return
|
|
142
|
+
return self._credential.get_token().token
|
|
128
143
|
if self._access_token is None:
|
|
129
144
|
raise AuthenticationError(
|
|
130
145
|
"Not authenticated. Call login() or get_access_token() first."
|
|
@@ -160,19 +160,27 @@ class FrameTooLarge(ValueError):
|
|
|
160
160
|
self.size = size
|
|
161
161
|
|
|
162
162
|
|
|
163
|
-
def parse_agent_frame(
|
|
164
|
-
"""A frame the relay received from an agent.
|
|
165
|
-
|
|
163
|
+
def parse_agent_frame(message: str | bytes | None) -> AgentFrame:
|
|
164
|
+
"""A frame the relay received from an agent.
|
|
165
|
+
|
|
166
|
+
``message`` is what the WebSocket library handed over: ``str`` for a text frame,
|
|
167
|
+
``bytes`` (or Starlette's ``None``) for a binary one, which the protocol does
|
|
168
|
+
not use and is an ``InvalidFrame`` like any other unreadable frame.
|
|
169
|
+
"""
|
|
170
|
+
return _parse(message, _agent_frame)
|
|
166
171
|
|
|
167
172
|
|
|
168
|
-
def parse_relay_frame(
|
|
169
|
-
"""A frame the agent received from the relay
|
|
170
|
-
return _parse(
|
|
173
|
+
def parse_relay_frame(message: str | bytes | None) -> RelayFrame:
|
|
174
|
+
"""A frame the agent received from the relay; see ``parse_agent_frame``."""
|
|
175
|
+
return _parse(message, _relay_frame)
|
|
171
176
|
|
|
172
177
|
|
|
173
|
-
def _parse(
|
|
178
|
+
def _parse(message: str | bytes | None, adapter: TypeAdapter):
|
|
179
|
+
if not isinstance(message, str):
|
|
180
|
+
# json.loads() would happily read JSON out of a binary frame; say no once here.
|
|
181
|
+
raise InvalidFrame("binary frames are not used")
|
|
174
182
|
try:
|
|
175
|
-
data = json.loads(
|
|
183
|
+
data = json.loads(message)
|
|
176
184
|
except ValueError:
|
|
177
185
|
raise InvalidFrame("frame is not JSON") from None
|
|
178
186
|
if not isinstance(data, dict):
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: visionai-sdk-python
|
|
3
|
-
Version: 2.2.0.
|
|
3
|
+
Version: 2.2.0.dev6
|
|
4
4
|
Summary: VisionAI SDK for Python
|
|
5
5
|
Author-email: Tony Yang <tonyyang@linkervision.com>
|
|
6
6
|
Requires-Python: >=3.11
|
|
@@ -153,6 +153,13 @@ token = cred.get_token().token # for a WebSocket upgrade or another lib
|
|
|
153
153
|
nodes = client.request("GET", "https://vs.example.com/mgmt/nodes").json()
|
|
154
154
|
```
|
|
155
155
|
|
|
156
|
+
`request()` raises on a non-2xx like the resource methods (`AuthenticationError`,
|
|
157
|
+
`ClientError`, `ServerError`, ...), unlike plain httpx, and sends the token to whatever
|
|
158
|
+
host `url` names, so `url` comes from configuration or code, never from a caller. A
|
|
159
|
+
client built with `http_client=` (or a credential with `http=`) uses that client's TLS,
|
|
160
|
+
timeout and limits; passing `verify_ssl` / `timeout` / `max_connections` /
|
|
161
|
+
`max_keepalive_connections` with it raises `ValueError`.
|
|
162
|
+
|
|
156
163
|
A mint is a Platform round trip and, on sites that cap client tokens, a scarce one:
|
|
157
164
|
concurrent callers share one mint, a refresh that fails keeps the current token while
|
|
158
165
|
Platform still accepts it, a 401 on a token minted more than 30 minutes ago buys a
|
|
@@ -169,7 +176,8 @@ authentication wins. `vlm_url` is optional for clients that only authenticate.
|
|
|
169
176
|
|
|
170
177
|
`visionai_sdk_python.relay` holds the wire format between platform-relay and
|
|
171
178
|
platform-edge-agent: the frame models, the constants and `parse_agent_frame()` /
|
|
172
|
-
`parse_relay_frame()`
|
|
179
|
+
`parse_relay_frame()` (text frames only: `bytes` or `None` is an `InvalidFrame`) /
|
|
180
|
+
`dump_frame()` (which refuses a frame over `MAX_FRAME_BYTES`). The spec is platform-service's
|
|
173
181
|
`docs/adr/0001-relay-protocol.md`; both sides import this module instead of keeping a
|
|
174
182
|
copy. The ADR's JSON examples ship with it (`visionai_sdk_python.relay.examples`:
|
|
175
183
|
`example(name)` / `example_text(name)`), so every implementation tests against the same
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/relay/test_protocol.py
RENAMED
|
@@ -104,6 +104,13 @@ def test_unknown_reasons_and_codes_are_accepted_as_strings():
|
|
|
104
104
|
@pytest.mark.parametrize(
|
|
105
105
|
("parse", "text", "message", "request_id"),
|
|
106
106
|
[
|
|
107
|
+
(
|
|
108
|
+
parse_agent_frame,
|
|
109
|
+
b'{"type": "heartbeat"}',
|
|
110
|
+
"binary frames are not used",
|
|
111
|
+
None,
|
|
112
|
+
),
|
|
113
|
+
(parse_relay_frame, None, "binary frames are not used", None),
|
|
107
114
|
(parse_agent_frame, "not json", "frame is not JSON", None),
|
|
108
115
|
(parse_agent_frame, "[1, 2]", "frame is not a JSON object", None),
|
|
109
116
|
(parse_agent_frame, '{"agent_id": "a"}', "frame has no type", None),
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import asyncio
|
|
2
|
+
import threading
|
|
2
3
|
|
|
3
4
|
import httpx
|
|
4
5
|
import pytest
|
|
@@ -22,6 +23,7 @@ from visionai_sdk_python.auth import credentials as credentials_module
|
|
|
22
23
|
from visionai_sdk_python.auth.credentials import (
|
|
23
24
|
RATE_LIMIT_COOLDOWN_S,
|
|
24
25
|
REFRESH_BUFFER_S,
|
|
26
|
+
REFRESH_RETRY_S,
|
|
25
27
|
REPLACE_COOLDOWN_S,
|
|
26
28
|
)
|
|
27
29
|
from visionai_sdk_python.exceptions import (
|
|
@@ -266,6 +268,12 @@ async def test_get_access_token_keeps_its_result_and_refreshes_through_a_credent
|
|
|
266
268
|
assert await client._ensure_token() == "tok-2"
|
|
267
269
|
|
|
268
270
|
|
|
271
|
+
def test_is_for_compares_non_ascii_secrets_too():
|
|
272
|
+
cred = ClientCredentials(AUTH_URL, "cid", "pässwörd")
|
|
273
|
+
assert cred.is_for("cid", "pässwörd")
|
|
274
|
+
assert not cred.is_for("cid", "pässword")
|
|
275
|
+
|
|
276
|
+
|
|
269
277
|
async def test_repeated_get_access_token_reuses_the_credential(platform, clock):
|
|
270
278
|
client = AsyncClient(AUTH_URL, VLM_URL)
|
|
271
279
|
client._client = httpx.AsyncClient(transport=httpx.MockTransport(platform.handler))
|
|
@@ -370,6 +378,42 @@ async def test_get_access_token_force_refresh_mints_again(platform, clock):
|
|
|
370
378
|
assert await client._ensure_token() == "tok-2"
|
|
371
379
|
|
|
372
380
|
|
|
381
|
+
async def test_a_failed_refresh_is_not_retried_for_a_while(platform, cred, clock):
|
|
382
|
+
assert (await cred.get_token()).token == "tok-1"
|
|
383
|
+
clock[0] += EXPIRES_IN - 100 # inside the refresh window, token still valid
|
|
384
|
+
platform.status = 503
|
|
385
|
+
|
|
386
|
+
assert (await cred.get_token()).token == "tok-1"
|
|
387
|
+
assert (await cred.get_token()).token == "tok-1" # inside the backoff: no attempt
|
|
388
|
+
assert len(platform.requests) == 2
|
|
389
|
+
|
|
390
|
+
clock[0] += REFRESH_RETRY_S + 1
|
|
391
|
+
platform.status = None
|
|
392
|
+
assert (await cred.get_token()).token == "tok-2"
|
|
393
|
+
assert len(platform.requests) == 3
|
|
394
|
+
|
|
395
|
+
|
|
396
|
+
async def test_a_refused_refresh_is_an_error_but_the_token_is_kept(
|
|
397
|
+
platform, cred, clock, caplog
|
|
398
|
+
):
|
|
399
|
+
assert (await cred.get_token()).token == "tok-1"
|
|
400
|
+
clock[0] += EXPIRES_IN - 100
|
|
401
|
+
platform.status = 401
|
|
402
|
+
|
|
403
|
+
with caplog.at_level("ERROR"):
|
|
404
|
+
assert (await cred.get_token()).token == "tok-1"
|
|
405
|
+
|
|
406
|
+
assert "token refresh refused" in caplog.text
|
|
407
|
+
assert caplog.records[-1].levelname == "ERROR"
|
|
408
|
+
|
|
409
|
+
|
|
410
|
+
def test_a_credential_of_the_other_flavour_is_rejected_at_construction():
|
|
411
|
+
with pytest.raises(TypeError):
|
|
412
|
+
Client(AUTH_URL, credential=AsyncClientCredentials(AUTH_URL, "id", "secret"))
|
|
413
|
+
with pytest.raises(TypeError):
|
|
414
|
+
AsyncClient(AUTH_URL, credential=ClientCredentials(AUTH_URL, "id", "secret"))
|
|
415
|
+
|
|
416
|
+
|
|
373
417
|
async def test_a_401_reported_during_a_refresh_leaves_the_refresh_alone(
|
|
374
418
|
platform, clock
|
|
375
419
|
):
|
|
@@ -400,3 +444,41 @@ async def test_a_401_reported_during_a_refresh_leaves_the_refresh_alone(
|
|
|
400
444
|
clock[0] += REPLACE_COOLDOWN_S + 1
|
|
401
445
|
assert cred.invalidate("tok-2") is True
|
|
402
446
|
assert platform.minted == 2
|
|
447
|
+
|
|
448
|
+
|
|
449
|
+
def test_sync_invalidate_waits_for_a_mint_in_another_thread():
|
|
450
|
+
"""Without the lock the report would drop the token the other thread just minted."""
|
|
451
|
+
entered, release = threading.Event(), threading.Event()
|
|
452
|
+
tokens = iter(["old", "new"])
|
|
453
|
+
|
|
454
|
+
def platform(request: httpx.Request) -> httpx.Response:
|
|
455
|
+
token = next(tokens)
|
|
456
|
+
if token == "new":
|
|
457
|
+
entered.set()
|
|
458
|
+
release.wait(5)
|
|
459
|
+
return httpx.Response(
|
|
460
|
+
200,
|
|
461
|
+
json={"access_token": token, "expires_in": 3600, "token_type": "Bearer"},
|
|
462
|
+
)
|
|
463
|
+
|
|
464
|
+
cred = ClientCredentials(
|
|
465
|
+
"http://platform.test",
|
|
466
|
+
"cid",
|
|
467
|
+
"secret",
|
|
468
|
+
http=httpx.Client(transport=httpx.MockTransport(platform)),
|
|
469
|
+
)
|
|
470
|
+
old = cred.get_token().token
|
|
471
|
+
minter = threading.Thread(target=cred.get_token, kwargs={"force_refresh": True})
|
|
472
|
+
minter.start()
|
|
473
|
+
assert entered.wait(5)
|
|
474
|
+
result: list[bool] = []
|
|
475
|
+
reporter = threading.Thread(target=lambda: result.append(cred.invalidate(old)))
|
|
476
|
+
reporter.start()
|
|
477
|
+
reporter.join(0.2)
|
|
478
|
+
|
|
479
|
+
assert reporter.is_alive() # blocked behind the mint, not racing it
|
|
480
|
+
release.set()
|
|
481
|
+
minter.join(5)
|
|
482
|
+
reporter.join(5)
|
|
483
|
+
assert result == [False]
|
|
484
|
+
assert cred.get_token().token == "new"
|
|
@@ -0,0 +1,57 @@
|
|
|
1
|
+
"""An injected http client brings its own transport settings; the SDK refuses to take more."""
|
|
2
|
+
|
|
3
|
+
import httpx
|
|
4
|
+
import pytest
|
|
5
|
+
|
|
6
|
+
from visionai_sdk_python import (
|
|
7
|
+
AsyncClient,
|
|
8
|
+
AsyncClientCredentials,
|
|
9
|
+
Client,
|
|
10
|
+
ClientCredentials,
|
|
11
|
+
)
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
def _sync_http() -> httpx.Client:
|
|
15
|
+
return httpx.Client(transport=httpx.MockTransport(lambda r: httpx.Response(200)))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
def _async_http() -> httpx.AsyncClient:
|
|
19
|
+
return httpx.AsyncClient(
|
|
20
|
+
transport=httpx.MockTransport(lambda r: httpx.Response(200))
|
|
21
|
+
)
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
@pytest.mark.parametrize(
|
|
25
|
+
"build",
|
|
26
|
+
[
|
|
27
|
+
lambda: Client("http://a", http_client=_sync_http(), timeout=1.0),
|
|
28
|
+
lambda: Client("http://a", http_client=_sync_http(), verify_ssl=False),
|
|
29
|
+
lambda: Client("http://a", http_client=_sync_http(), max_connections=5),
|
|
30
|
+
lambda: AsyncClient(
|
|
31
|
+
"http://a", http_client=_async_http(), max_keepalive_connections=5
|
|
32
|
+
),
|
|
33
|
+
lambda: ClientCredentials(
|
|
34
|
+
"http://a", "id", "s", http=_sync_http(), timeout=1.0
|
|
35
|
+
),
|
|
36
|
+
lambda: AsyncClientCredentials(
|
|
37
|
+
"http://a", "id", "s", http=_async_http(), verify_ssl=False
|
|
38
|
+
),
|
|
39
|
+
],
|
|
40
|
+
)
|
|
41
|
+
def test_transport_options_are_refused_with_an_injected_client(build):
|
|
42
|
+
with pytest.raises(ValueError, match="has its own verify, timeout and limits"):
|
|
43
|
+
build()
|
|
44
|
+
|
|
45
|
+
|
|
46
|
+
def test_defaults_apply_when_the_sdk_builds_the_client():
|
|
47
|
+
client = Client("http://a")
|
|
48
|
+
|
|
49
|
+
assert (client.verify_ssl, client.timeout) == (True, 10.0)
|
|
50
|
+
assert (client.max_connections, client.max_keepalive_connections) == (100, 20)
|
|
51
|
+
assert Client("http://a", timeout=3.0, verify_ssl=False).timeout == 3.0
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
def test_an_injected_client_is_used_as_is():
|
|
55
|
+
http = _sync_http()
|
|
56
|
+
|
|
57
|
+
assert Client("http://a", http_client=http)._client is http
|
|
File without changes
|
|
File without changes
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/.github/workflows/publish.yml
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/src/visionai_sdk_python/py.typed
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_async_client.py
RENAMED
|
File without changes
|
|
File without changes
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_instrumentation.py
RENAMED
|
File without changes
|
|
File without changes
|
{visionai_sdk_python-2.2.0.dev5 → visionai_sdk_python-2.2.0.dev6}/tests/test_vlm_preprocess.py
RENAMED
|
File without changes
|
|
File without changes
|