Ran pyupgrade and pright to fix CI issues

2026-06-16 21:04:09 +08:00 · 2026-04-30 16:26:38 -07:00
parent ccf22ac963
commit 7999bf3c2d
4 changed files with 60 additions and 113 deletions
@@ -181,9 +181,7 @@ class TestResponseHeaders:

        handler = _make_handler(httpx.MockTransport(respond))
        try:
-            result = await handler.send(
-                HttpRequestInfo(method="GET", url="https://api.example.test/x")
-            )
+            result = await handler.send(HttpRequestInfo(method="GET", url="https://api.example.test/x"))
        finally:
            await handler.aclose()

@@ -199,9 +197,7 @@ class TestClientOwnership:
        handler = DefaultHttpRequestHandler()
        # Inject a MockTransport-backed client into the owned slot and verify
        # aclose() releases it. Avoids real network access.
-        owned = httpx.AsyncClient(
-            transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok"))
-        )
+        owned = httpx.AsyncClient(transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok")))
        handler._owned_client = owned
        assert not owned.is_closed
        await handler.aclose()
@@ -209,13 +205,9 @@ class TestClientOwnership:

    @pytest.mark.asyncio
    async def test_caller_owned_client_is_not_closed(self) -> None:
-        client = httpx.AsyncClient(
-            transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok"))
-        )
+        client = httpx.AsyncClient(transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok")))
        handler = DefaultHttpRequestHandler(client=client)
-        await handler.send(
-            HttpRequestInfo(method="GET", url="https://api.example.test/x")
-        )
+        await handler.send(HttpRequestInfo(method="GET", url="https://api.example.test/x"))
        await handler.aclose()
        assert not client.is_closed
        await client.aclose()  # cleanup
@@ -242,11 +234,7 @@ class TestClientOwnership:
            nonlocal construction_count
            if not args and not kwargs:
                construction_count += 1
-                return original_ctor(
-                    transport=httpx.MockTransport(
-                        lambda r: httpx.Response(200, text="ok")
-                    )
-                )
+                return original_ctor(transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok")))
            return original_ctor(*args, **kwargs)

        import agent_framework_declarative._workflows._http_handler as hh
@@ -256,10 +244,7 @@ class TestClientOwnership:
            handler = DefaultHttpRequestHandler()
            try:
                await asyncio.gather(*[
-                    handler.send(
-                        HttpRequestInfo(method="GET", url="https://api.example.test/x")
-                    )
-                    for _ in range(8)
+                    handler.send(HttpRequestInfo(method="GET", url="https://api.example.test/x")) for _ in range(8)
                ])
            finally:
                await handler.aclose()
@@ -292,9 +277,7 @@ class TestClientProvider:

        handler = DefaultHttpRequestHandler(client=primary_client, client_provider=provider)
        try:
-            result = await handler.send(
-                HttpRequestInfo(method="GET", url="https://api.example.test/x")
-            )
+            result = await handler.send(HttpRequestInfo(method="GET", url="https://api.example.test/x"))
            assert result.body == "provided"
            assert captured["transport"] == "provided"
        finally:
@@ -316,9 +299,7 @@ class TestClientProvider:
        primary_client = httpx.AsyncClient(transport=httpx.MockTransport(primary))
        handler = DefaultHttpRequestHandler(client=primary_client, client_provider=provider)
        try:
-            result = await handler.send(
-                HttpRequestInfo(method="GET", url="https://api.example.test/x")
-            )
+            result = await handler.send(HttpRequestInfo(method="GET", url="https://api.example.test/x"))
            assert result.body == "primary"
        finally:
            await handler.aclose()
@@ -343,8 +324,6 @@ class TestAsyncContextManager:
    @pytest.mark.asyncio
    async def test_context_manager_closes_owned_client(self) -> None:
        async with DefaultHttpRequestHandler() as handler:
-            owned = httpx.AsyncClient(
-                transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok"))
-            )
+            owned = httpx.AsyncClient(transport=httpx.MockTransport(lambda r: httpx.Response(200, text="ok")))
            handler._owned_client = owned
        assert owned.is_closed
@@ -72,9 +72,7 @@ def _ok(body: str = "", headers: dict[str, list[str]] | None = None) -> HttpRequ
    )


-def _err(
-    status: int = 500, body: str = "", headers: dict[str, list[str]] | None = None
-) -> HttpRequestResult:
+def _err(status: int = 500, body: str = "", headers: dict[str, list[str]] | None = None) -> HttpRequestResult:
    return HttpRequestResult(
        status_code=status,
        is_success_status_code=False,
@@ -150,9 +148,7 @@ class TestSuccessPath:
    async def test_get_parses_json_object(self) -> None:
        handler = StubHandler(_ok('{"key":"value","number":42}'))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(method="GET", response="Local.Result"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(method="GET", response="Local.Result")))
        await workflow.run({})

        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
@@ -165,9 +161,7 @@ class TestSuccessPath:
    async def test_get_parses_plain_string(self) -> None:
        handler = StubHandler(_ok("not-json content"))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response="Local.Result"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response="Local.Result")))
        await workflow.run({})

        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
@@ -177,9 +171,7 @@ class TestSuccessPath:
    async def test_get_empty_body_yields_none(self) -> None:
        handler = StubHandler(_ok(""))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response="Local.Result"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response="Local.Result")))
        await workflow.run({})

        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
@@ -189,9 +181,7 @@ class TestSuccessPath:
    async def test_response_object_form_path(self) -> None:
        handler = StubHandler(_ok('{"x":1}'))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response={"path": "Local.Result"}))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response={"path": "Local.Result"})))
        await workflow.run({})

        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
@@ -376,9 +366,7 @@ class TestBody:
    async def test_unknown_body_kind_raises(self) -> None:
        handler = StubHandler(_ok())
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(body={"kind": "weirdform", "content": "x"}))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(body={"kind": "weirdform", "content": "x"})))
        with pytest.raises(Exception) as excinfo:
            await workflow.run({})
        # Should surface as ValueError (potentially wrapped by runner)
@@ -527,9 +515,7 @@ class TestResponseHeaders:
            )
        )
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response_headers="Local.H"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response_headers="Local.H")))
        await workflow.run({})
        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
        h = decl["Local"]["H"]
@@ -540,9 +526,7 @@ class TestResponseHeaders:
    async def test_response_headers_empty_assigned_none(self) -> None:
        handler = StubHandler(_ok("ok", headers={}))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response_headers="Local.H"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response_headers="Local.H")))
        await workflow.run({})
        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
        assert decl["Local"]["H"] is None
@@ -551,9 +535,7 @@ class TestResponseHeaders:
    async def test_non_2xx_still_publishes_headers(self) -> None:
        handler = StubHandler(_err(status=500, body="boom", headers={"X-Trace": ["abc"]}))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response_headers="Local.H"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response_headers="Local.H")))
        with pytest.raises(DeclarativeActionError):
            await workflow.run({})
        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
@@ -586,9 +568,7 @@ class TestConversationAppend:
    async def test_empty_conversation_id_does_not_append(self) -> None:
        handler = StubHandler(_ok('{"answer":"hello"}'))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(response="Local.Result", conversation_id=""))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(response="Local.Result", conversation_id="")))
        await workflow.run({})
        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
        # Auto-init creates an entry for the System.ConversationId conversation,
@@ -600,9 +580,7 @@ class TestConversationAppend:
    async def test_empty_body_skips_conversation_append(self) -> None:
        handler = StubHandler(_ok(""))
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(conversation_id="conv-test-1"))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(conversation_id="conv-test-1")))
        await workflow.run({})
        decl = workflow._state.get(DECLARATIVE_STATE_KEY)
        # No conversation entry should have been created either.
@@ -617,9 +595,7 @@ class TestConnection:
    async def test_connection_name_forwarded(self) -> None:
        handler = StubHandler(_ok())
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(connection={"name": "my-connection"}))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(connection={"name": "my-connection"})))
        await workflow.run({})
        assert handler.last_info is not None
        assert handler.last_info.connection_name == "my-connection"
@@ -654,9 +630,7 @@ class TestTimeout:
    async def test_timeout_ms_forwarded(self) -> None:
        handler = StubHandler(_ok())
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(request_timeout_ms=2500))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(request_timeout_ms=2500)))
        await workflow.run({})
        assert handler.last_info is not None
        assert handler.last_info.timeout_ms == 2500
@@ -665,9 +639,7 @@ class TestTimeout:
    async def test_timeout_ms_zero_treated_as_unset(self) -> None:
        handler = StubHandler(_ok())
        factory = WorkflowFactory(http_request_handler=handler)
-        workflow = factory.create_workflow_from_definition(
-            _yaml(_action(request_timeout_ms=0))
-        )
+        workflow = factory.create_workflow_from_definition(_yaml(_action(request_timeout_ms=0)))
        await workflow.run({})
        assert handler.last_info is not None
        assert handler.last_info.timeout_ms is None