cleanup fixture spaghetti

Author: donald-pinckney

tests/conftest.py

@@ -37,15 +37,8 @@ def event_loop():
     loop.close()
 
 
-@pytest.fixture
-def plugins():
-    # By default, no plugins.
-    # Other tests can override this fixture, such as in tests/openai_agents/conftest.py
-    return []
-
-
-@pytest_asyncio.fixture
-async def env(request, plugins) -> AsyncGenerator[WorkflowEnvironment, None]:
+@pytest_asyncio.fixture(scope="session")
+async def env(request) -> AsyncGenerator[WorkflowEnvironment, None]:
     env_type = request.config.getoption("--workflow-environment")
     if env_type == "local":
         env = await WorkflowEnvironment.start_local(
@@ -54,15 +47,12 @@ async def env(request, plugins) -> AsyncGenerator[WorkflowEnvironment, None]:
                 "frontend.enableExecuteMultiOperation=true",
                 "--dynamic-config-value",
                 "system.enableEagerWorkflowStart=true",
-            ],
-            plugins=plugins,
+            ]
         )
     elif env_type == "time-skipping":
         env = await WorkflowEnvironment.start_time_skipping()
     else:
-        env = WorkflowEnvironment.from_client(
-            await Client.connect(env_type, plugins=plugins)
-        )
+        env = WorkflowEnvironment.from_client(await Client.connect(env_type))
     yield env
     await env.shutdown()
 

tests/openai_agents/basic/test_hello_world_workflow.py

@@ -1,47 +1,18 @@
 import uuid
 from concurrent.futures import ThreadPoolExecutor
 
-import pytest
-from agents import ModelResponse, Usage
-from openai.types.responses import ResponseOutputMessage, ResponseOutputText
 from temporalio.client import Client
 from temporalio.worker import Worker
+from temporalio.contrib.openai_agents.testing import (
+    AgentEnvironment,
+    ResponseBuilders,
+    TestModel,
+)
 
 from openai_agents.basic.workflows.hello_world_workflow import HelloWorldAgent
-from tests.openai_agents.conftest import sequential_test_model
 
 
-@pytest.fixture
-def test_model():
-    return sequential_test_model(
-        [
-            ModelResponse(
-                output=[
-                    ResponseOutputMessage(
-                        id="1",
-                        content=[
-                            ResponseOutputText(
-                                annotations=[],
-                                text="This is a haiku (not really)",
-                                type="output_text",
-                            )
-                        ],
-                        role="assistant",
-                        status="completed",
-                        type="message",
-                    )
-                ],
-                usage=Usage(
-                    requests=1, input_tokens=1, output_tokens=1, total_tokens=1
-                ),
-                response_id="1",
-            )
-        ]
-    )
-
-
-@pytest.fixture
-def test_model():
+def haiku_test_model():
     return TestModel.returning_responses(
         [ResponseBuilders.output_message("This is a haiku (not really)")]
     )
@@ -50,17 +21,19 @@ def test_model():
 async def test_execute_workflow(client: Client):
     task_queue_name = str(uuid.uuid4())
 
-    async with Worker(
-        client,
-        task_queue=task_queue_name,
-        workflows=[HelloWorldAgent],
-        activity_executor=ThreadPoolExecutor(5),
-    ):
-        result = await client.execute_workflow(
-            HelloWorldAgent.run,
-            "Write a recursive haiku about recursive haikus.",
-            id=str(uuid.uuid4()),
+    async with AgentEnvironment(model=haiku_test_model()) as agent_env:
+        client = agent_env.applied_on_client(client)
+        async with Worker(
+            client,
             task_queue=task_queue_name,
-        )
-        assert isinstance(result, str)
-        assert len(result) > 0
+            workflows=[HelloWorldAgent],
+            activity_executor=ThreadPoolExecutor(5),
+        ):
+            result = await client.execute_workflow(
+                HelloWorldAgent.run,
+                "Write a recursive haiku about recursive haikus.",
+                id=str(uuid.uuid4()),
+                task_queue=task_queue_name,
+            )
+            assert isinstance(result, str)
+            assert len(result) > 0