merge

Author: alexander-alderman-webb

tests/integrations/openai/test_openai.py

@@ -2035,28 +2035,6 @@ async def test_streaming_chat_completion_async(
                     "content": "You are a helpful assistant.",
                 }
             ]
-
-            assert (
-                "Message demonstrating the absence of truncation."
-                in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
-            )
-            assert "hello" in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
-            assert "hello world" in span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
-
-            try:
-                import tiktoken  # type: ignore # noqa # pylint: disable=unused-import
-
-                if "blocks" in param_id:
-                    assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
-                    assert span["attributes"]["gen_ai.usage.input_tokens"] == 15
-                    assert span["attributes"]["gen_ai.usage.total_tokens"] == 17
-                else:
-                    assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
-                    assert span["attributes"]["gen_ai.usage.input_tokens"] == 20
-                    assert span["attributes"]["gen_ai.usage.total_tokens"] == 22
-
-            except ImportError:
-                pass  # if tiktoken is not installed, we can't guarantee token usage will be calculated properly
         else:
             assert json.loads(
                 span["attributes"][SPANDATA.GEN_AI_SYSTEM_INSTRUCTIONS]
@@ -2071,27 +2049,27 @@ async def test_streaming_chat_completion_async(
                 },
             ]
 
-            assert (
-                "Message demonstrating the absence of truncation."
-                in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
-            )
-            assert "hello" in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
-            assert "hello world" in span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
+        assert (
+            "Message demonstrating the absence of truncation."
+            in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
+        )
+        assert "hello" in span["attributes"][SPANDATA.GEN_AI_REQUEST_MESSAGES]
+        assert "hello world" in span["attributes"][SPANDATA.GEN_AI_RESPONSE_TEXT]
 
-            try:
-                import tiktoken  # type: ignore # noqa # pylint: disable=unused-import
+        try:
+            import tiktoken  # type: ignore # noqa # pylint: disable=unused-import
 
-                if "blocks" in param_id:
-                    assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
-                    assert span["attributes"]["gen_ai.usage.input_tokens"] == 15
-                    assert span["attributes"]["gen_ai.usage.total_tokens"] == 17
-                else:
-                    assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
-                    assert span["attributes"]["gen_ai.usage.input_tokens"] == 20
-                    assert span["attributes"]["gen_ai.usage.total_tokens"] == 22
+            if "blocks" in param_id:
+                assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
+                assert span["attributes"]["gen_ai.usage.input_tokens"] == 15
+                assert span["attributes"]["gen_ai.usage.total_tokens"] == 17
+            else:
+                assert span["attributes"]["gen_ai.usage.output_tokens"] == 2
+                assert span["attributes"]["gen_ai.usage.input_tokens"] == 20
+                assert span["attributes"]["gen_ai.usage.total_tokens"] == 22
 
-            except ImportError:
-                pass  # if tiktoken is not installed, we can't guarantee token usage will be calculated properly
+        except ImportError:
+            pass  # if tiktoken is not installed, we can't guarantee token usage will be calculated properly
     else:
         events = capture_events()