Revert "deduplicate"

This reverts commit 01d0619.

Author: alexander-alderman-webb

tests/conftest.py

@@ -592,30 +592,6 @@ def suppress_deprecation_warnings():
         yield
 
 
-@pytest.fixture(
-    params=[
-        pytest.param(
-            ({"role": "system", "content": "You are helpful."}, "system"),
-            id="system",
-        ),
-        pytest.param(
-            ({"role": "user", "content": "Hello"}, "user"),
-            id="user",
-        ),
-        pytest.param(
-            ({"role": "ai", "content": "Hi there!"}, "assistant"),
-            id="ai",
-        ),
-        pytest.param(
-            ({"role": "assistant", "content": "How can I help?"}, "assistant"),
-            id="assistant",
-        ),
-    ]
-)
-def input_ai_message_and_expected_role(request):
-    return request.param
-
-
 class MockServerRequestHandler(BaseHTTPRequestHandler):
     def do_GET(self):  # noqa: N802
         # Process an HTTP GET request and return a response.

tests/integrations/anthropic/test_anthropic.py

@@ -899,14 +899,26 @@ def test_set_output_data_with_input_json_delta(sentry_init):
         assert span._data.get(SPANDATA.GEN_AI_USAGE_TOTAL_TOKENS) == 30
 
 
+# Test messages with mixed roles including "ai" that should be mapped to "assistant"
+@pytest.mark.parametrize(
+    "test_message,expected_role",
+    [
+        ({"role": "system", "content": "You are helpful."}, "system"),
+        ({"role": "user", "content": "Hello"}, "user"),
+        (
+            {"role": "ai", "content": "Hi there!"},
+            "assistant",
+        ),  # Should be mapped to "assistant"
+        (
+            {"role": "assistant", "content": "How can I help?"},
+            "assistant",
+        ),  # Should stay "assistant"
+    ],
+)
 def test_anthropic_message_role_mapping(
-    sentry_init,
-    capture_events,
-    input_ai_message_and_expected_role,
+    sentry_init, capture_events, test_message, expected_role
 ):
     """Test that Anthropic integration properly maps message roles like 'ai' to 'assistant'"""
-    test_message, expected_role = input_ai_message_and_expected_role
-
     sentry_init(
         integrations=[AnthropicIntegration(include_prompts=True)],
         traces_sample_rate=1.0,

tests/integrations/openai/test_openai.py

@@ -1457,11 +1457,26 @@ def test_empty_tools_in_chat_completion(sentry_init, capture_events, tools):
     assert "gen_ai.request.available_tools" not in span["data"]
 
 
+# Test messages with mixed roles including "ai" that should be mapped to "assistant"
+@pytest.mark.parametrize(
+    "test_message,expected_role",
+    [
+        ({"role": "system", "content": "You are helpful."}, "system"),
+        ({"role": "user", "content": "Hello"}, "user"),
+        (
+            {"role": "ai", "content": "Hi there!"},
+            "assistant",
+        ),  # Should be mapped to "assistant"
+        (
+            {"role": "assistant", "content": "How can I help?"},
+            "assistant",
+        ),  # Should stay "assistant"
+    ],
+)
 def test_openai_message_role_mapping(
-    sentry_init, capture_events, input_ai_message_and_expected_role
+    sentry_init, capture_events, test_message, expected_role
 ):
     """Test that OpenAI integration properly maps message roles like 'ai' to 'assistant'"""
-    test_message, expected_role = input_ai_message_and_expected_role
 
     sentry_init(
         integrations=[OpenAIIntegration(include_prompts=True)],

tests/integrations/openai_agents/test_openai_agents.py

@@ -1324,12 +1324,26 @@ async def run():
     assert txn3["transaction"] == "test_agent workflow"
 
 
+# Test input messages with mixed roles including "ai"
+@pytest.mark.parametrize(
+    "test_message,expected_role",
+    [
+        ({"role": "system", "content": "You are helpful."}, "system"),
+        ({"role": "user", "content": "Hello"}, "user"),
+        (
+            {"role": "ai", "content": "Hi there!"},
+            "assistant",
+        ),  # Should be mapped to "assistant"
+        (
+            {"role": "assistant", "content": "How can I help?"},
+            "assistant",
+        ),  # Should stay "assistant"
+    ],
+)
 def test_openai_agents_message_role_mapping(
-    sentry_init, capture_events, input_ai_message_and_expected_role
+    sentry_init, capture_events, test_message, expected_role
 ):
     """Test that OpenAI Agents integration properly maps message roles like 'ai' to 'assistant'"""
-    test_message, expected_role = input_ai_message_and_expected_role
-
     sentry_init(
         integrations=[OpenAIAgentsIntegration()],
         traces_sample_rate=1.0,