iii-sdk 0.21.0.dev1__tar.gz → 0.21.1.dev1__tar.gz

{iii_sdk-0.21.0.dev1 → iii_sdk-0.21.1.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: iii-sdk
-Version: 0.21.0.dev1
+Version: 0.21.1.dev1
 Summary: III SDK for Python
 Project-URL: Homepage, https://github.com/iii-hq/iii
 Project-URL: Repository, https://github.com/iii-hq/iii
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: iii-helpers==0.21.0.dev1
+Requires-Dist: iii-helpers==0.21.1.dev1
 Requires-Dist: opentelemetry-api>=1.25
 Requires-Dist: pydantic>=2.0
 Requires-Dist: websockets>=12.0

{iii_sdk-0.21.0.dev1 → iii_sdk-0.21.1.dev1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "iii-sdk"
-version = "0.21.0.dev1"
+version = "0.21.1.dev1"
 description = "III SDK for Python"
 authors = [{ name = "III" }]
 license = { text = "Apache-2.0" }
@@ -23,7 +23,7 @@ dependencies = [
     "websockets>=12.0",
     "pydantic>=2.0",
     "opentelemetry-api>=1.25",
-    "iii-helpers==0.21.0.dev1",
+    "iii-helpers==0.21.1.dev1",
 ]
 
 [project.urls]

{iii_sdk-0.21.0.dev1 → iii_sdk-0.21.1.dev1}/tests/test_register_function_args.py

@@ -2,6 +2,7 @@
 
 import json
 import time
+from collections.abc import Callable
 from types import SimpleNamespace
 from typing import Any
 
@@ -17,6 +18,8 @@ from iii.iii_types import RegisterFunctionFormat
 # FakeWs helpers
 # ---------------------------------------------------------------------------
 
+_CREATED_CLIENTS: list[III] = []
+
 
 class FakeWebSocket:
     def __init__(self) -> None:
@@ -51,10 +54,38 @@ def _patch_ws(monkeypatch: pytest.MonkeyPatch) -> FakeWebSocket:
 
 def _make_client() -> III:
     client = III("ws://fake", InitOptions())
-    time.sleep(0.05)
+    _CREATED_CLIENTS.append(client)
+    _wait_for(lambda: client.get_connection_state() == "connected", "fake WebSocket client to connect")
     return client
 
 
+@pytest.fixture(autouse=True)
+def _shutdown_created_clients() -> None:
+    yield
+    while _CREATED_CLIENTS:
+        client = _CREATED_CLIENTS.pop()
+        if client._thread.is_alive():
+            client.shutdown()
+
+
+def _wait_for(predicate: Callable[[], bool], what: str, timeout: float = 2.0) -> None:
+    deadline = time.monotonic() + timeout
+    while time.monotonic() < deadline:
+        if predicate():
+            return
+        time.sleep(0.005)
+    pytest.fail(f"timed out waiting for {what}")
+
+
+def _registration_messages(ws: FakeWebSocket, function_id: str) -> list[dict[str, Any]]:
+    return [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == function_id]
+
+
+def _wait_for_registration(ws: FakeWebSocket, function_id: str) -> list[dict[str, Any]]:
+    _wait_for(lambda: bool(_registration_messages(ws, function_id)), f"registration for {function_id}")
+    return _registration_messages(ws, function_id)
+
+
 # ---------------------------------------------------------------------------
 # Two-arg register_function tests
 # ---------------------------------------------------------------------------
@@ -78,9 +109,8 @@ def test_register_function_str_with_request_format(monkeypatch: pytest.MonkeyPat
         return data
 
     client.register_function("demo.with_args", handler, request_format=req_fmt)
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.with_args"]
+    reg_msgs = _wait_for_registration(ws, "demo.with_args")
     assert len(reg_msgs) == 1
 
     sent_req_fmt = reg_msgs[0].get("request_format")
@@ -127,9 +157,8 @@ def test_register_function_str_with_both_formats(monkeypatch: pytest.MonkeyPatch
         response_format=res_fmt,
         metadata={"version": "1"},
     )
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.both_formats"]
+    reg_msgs = _wait_for_registration(ws, "demo.both_formats")
     assert len(reg_msgs) == 1
     assert reg_msgs[0].get("description") == "A search function"
     assert reg_msgs[0].get("request_format") is not None
@@ -149,9 +178,8 @@ def test_register_function_str_minimal(monkeypatch: pytest.MonkeyPatch) -> None:
         return data
 
     client.register_function("demo.minimal", handler)
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.minimal"]
+    reg_msgs = _wait_for_registration(ws, "demo.minimal")
     assert len(reg_msgs) == 1
     assert "request_format" not in reg_msgs[0]
     assert "response_format" not in reg_msgs[0]
@@ -179,9 +207,8 @@ def test_register_function_str_with_http_invocation_and_format(monkeypatch: pyte
         HttpInvocationConfig(url="https://example.com/fn", method="POST"),
         request_format=req_fmt,
     )
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "external::with_format"]
+    reg_msgs = _wait_for_registration(ws, "external::with_format")
     assert len(reg_msgs) == 1
     assert reg_msgs[0].get("invocation", {}).get("url") == "https://example.com/fn"
     assert reg_msgs[0].get("request_format") is not None
@@ -230,9 +257,8 @@ def test_register_function_str_id_auto_extracts_formats(monkeypatch: pytest.Monk
         return UserOutput(message=f"Hello {data.name}")
 
     client.register_function("demo.auto", handler, description="Auto-extract demo")
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.auto"]
+    reg_msgs = _wait_for_registration(ws, "demo.auto")
     assert len(reg_msgs) == 1
     msg = reg_msgs[0]
 
@@ -282,9 +308,8 @@ def test_register_function_str_id_explicit_formats_override(monkeypatch: pytest.
         request_format=explicit_req,
         response_format=explicit_res,
     )
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.explicit"]
+    reg_msgs = _wait_for_registration(ws, "demo.explicit")
     assert len(reg_msgs) == 1
     msg = reg_msgs[0]
 
@@ -306,9 +331,8 @@ def test_register_function_str_id_no_annotations(monkeypatch: pytest.MonkeyPatch
         return data
 
     client.register_function("demo.no_hints", handler)
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.no_hints"]
+    reg_msgs = _wait_for_registration(ws, "demo.no_hints")
     assert len(reg_msgs) == 1
     assert "request_format" not in reg_msgs[0]
     assert "response_format" not in reg_msgs[0]
@@ -325,9 +349,8 @@ def test_register_function_str_id_with_metadata(monkeypatch: pytest.MonkeyPatch)
         return data
 
     client.register_function("demo.meta", handler, metadata={"version": "2.0"})
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.meta"]
+    reg_msgs = _wait_for_registration(ws, "demo.meta")
     assert len(reg_msgs) == 1
     assert reg_msgs[0]["metadata"] == {"version": "2.0"}
 
@@ -352,9 +375,8 @@ def test_register_function_str_id_with_http_invocation(monkeypatch: pytest.Monke
         HttpInvocationConfig(url="https://example.com/fn", method="POST"),
         description="HTTP function",
     )
-    time.sleep(0.02)
 
-    reg_msgs = [m for m in ws.sent if m.get("type") == "registerfunction" and m.get("id") == "demo.http"]
+    reg_msgs = _wait_for_registration(ws, "demo.http")
     assert len(reg_msgs) == 1
     assert reg_msgs[0]["invocation"]["url"] == "https://example.com/fn"
     assert reg_msgs[0]["description"] == "HTTP function"