Fix unit tests

Change-Id: I7816571f221dbf8f20579236360ce38ef51aac1a
Co-developed-by: Cursor <[email protected]>

Author: Cirilla-zmh

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/examples/basic_example.py

@@ -12,6 +12,7 @@
 
 import os
 
+from dashscope import Generation, TextEmbedding
 from loongsuite.instrumentation.dashscope import DashScopeInstrumentor
 
 from opentelemetry import trace
@@ -45,8 +46,6 @@ def main():
     print("Example 1: Text Generation (non-streaming)")
     print("=" * 60)
 
-    from dashscope import Generation
-
     response = Generation.call(
         model="qwen-turbo",
         prompt="Hello! Please introduce yourself in one sentence.",
@@ -76,8 +75,6 @@ def main():
     print("Example 3: Text Embedding")
     print("=" * 60)
 
-    from dashscope import TextEmbedding
-
     response = TextEmbedding.call(
         model="text-embedding-v1", input="Hello, world!"
     )

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/loongsuite/instrumentation/dashscope/__init__.py

@@ -244,10 +244,10 @@ def _uninstrument(self, **kwargs):
             **kwargs: Optional configuration parameters.
         """
         # pylint: disable=import-outside-toplevel
-        import dashscope.aigc.generation
-        import dashscope.aigc.image_synthesis
-        import dashscope.embeddings.text_embedding
-        import dashscope.rerank.text_rerank
+        import dashscope.aigc.generation  # noqa: PLC0415
+        import dashscope.aigc.image_synthesis  # noqa: PLC0415
+        import dashscope.embeddings.text_embedding  # noqa: PLC0415
+        import dashscope.rerank.text_rerank  # noqa: PLC0415
 
         unwrap(dashscope.aigc.generation.Generation, "call")
         unwrap(dashscope.aigc.generation.AioGeneration, "call")

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/loongsuite/instrumentation/dashscope/patch.py

@@ -18,22 +18,22 @@
 import logging
 
 from opentelemetry import context
+from opentelemetry.util.genai._extended_semconv.gen_ai_extended_attributes import (
+    GenAiExtendedProviderNameValues as GenAI,
+)
 from opentelemetry.util.genai.extended_types import (
     EmbeddingInvocation,
     RerankInvocation,
 )
-from opentelemetry.util.genai._extended_semconv.gen_ai_extended_attributes import (
-    GenAiExtendedProviderNameValues as GenAI
-)
 from opentelemetry.util.genai.types import Error
 
 from .utils import (
+    _SKIP_INSTRUMENTATION_KEY,
     _create_accumulated_response,
     _create_invocation_from_generation,
     _create_invocation_from_image_synthesis,
     _extract_task_id,
     _get_parameter,
-    _SKIP_INSTRUMENTATION_KEY,
     _update_invocation_from_image_synthesis_async_response,
     _update_invocation_from_image_synthesis_response,
     _update_invocation_from_response,
@@ -108,7 +108,9 @@ def wrap_generation_call(wrapped, instance, args, kwargs, handler=None):
         return wrapped(*args, **kwargs)
 
 
-async def wrap_aio_generation_call(wrapped, instance, args, kwargs, handler=None):
+async def wrap_aio_generation_call(
+    wrapped, instance, args, kwargs, handler=None
+):
     """Wrapper for AioGeneration.call (async).
 
     Uses TelemetryHandler from opentelemetry-util-genai to manage span lifecycle.
@@ -123,9 +125,7 @@ async def wrap_aio_generation_call(wrapped, instance, args, kwargs, handler=None
     # Extract model from kwargs
     model = kwargs.get("model")
     if not model:
-        logger.warning(
-            "Model not found in kwargs, skipping instrumentation"
-        )
+        logger.warning("Model not found in kwargs, skipping instrumentation")
         return await wrapped(*args, **kwargs)
 
     if handler is None:
@@ -270,7 +270,9 @@ def wrap_text_rerank_call(wrapped, instance, args, kwargs, handler=None):
 
     try:
         # Create rerank invocation object
-        invocation = RerankInvocation(provider=GenAI.DASHSCOPE.value, request_model=model)
+        invocation = RerankInvocation(
+            provider=GenAI.DASHSCOPE.value, request_model=model
+        )
         invocation.provider = "dashscope"
 
         # Start rerank invocation (creates span)
@@ -437,7 +439,9 @@ def wrap_image_synthesis_call(wrapped, instance, args, kwargs, handler=None):
             result = wrapped(*args, **kwargs)
 
             # Update invocation with response data
-            _update_invocation_from_image_synthesis_response(invocation, result)
+            _update_invocation_from_image_synthesis_response(
+                invocation, result
+            )
             handler.stop_llm(invocation)
 
             return result
@@ -584,7 +588,9 @@ def wrap_image_synthesis_wait(wrapped, instance, args, kwargs, handler=None):
             result = wrapped(*args, **kwargs)
 
             # Update invocation with response data
-            _update_invocation_from_image_synthesis_response(invocation, result)
+            _update_invocation_from_image_synthesis_response(
+                invocation, result
+            )
             handler.stop_llm(invocation)
 
             return result

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/src/loongsuite/instrumentation/dashscope/utils.py

@@ -855,7 +855,9 @@ def _update_invocation_from_image_synthesis_response(
                     if image_urls:
                         # Store first image URL as attribute (or all if needed)
                         invocation.attributes["dashscope.image.url"] = (
-                            image_urls[0] if len(image_urls) == 1 else str(image_urls)
+                            image_urls[0]
+                            if len(image_urls) == 1
+                            else str(image_urls)
                         )
         except (KeyError, AttributeError):
             pass

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/tests/cassettes/test_image_synthesis_async_call_and_wait_separate_spans.yaml

@@ -1,5 +1,6 @@
 interactions:
-body: |-
+- request:
+    body: |-
       {
         "model": "wanx-v1",
         "parameters": {},

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/tests/cassettes/test_image_synthesis_call_with_parameters.yaml

@@ -1,5 +1,6 @@
 interactions:
-body: |-
+- request:
+    body: |-
       {
         "model": "wanx-v1",
         "parameters": {

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/tests/cassettes/test_image_synthesis_wait_basic.yaml

@@ -1,5 +1,6 @@
 interactions:
-body: |-
+- request:
+    body: |-
       {
         "model": "wanx-v1",
         "parameters": {},

instrumentation-loongsuite/loongsuite-instrumentation-dashscope/tests/test_embedding.py

@@ -3,6 +3,7 @@
 from typing import Optional
 
 import pytest
+from dashscope import TextEmbedding
 
 from opentelemetry.semconv._incubating.attributes import (
     gen_ai_attributes as GenAIAttributes,
@@ -37,31 +38,33 @@ def _assert_embedding_span_attributes(
     assert span.name == f"embeddings {request_model}"
 
     # Required attributes
-    assert (
-        GenAIAttributes.GEN_AI_OPERATION_NAME in span.attributes
-    ), f"Missing {GenAIAttributes.GEN_AI_OPERATION_NAME}"
+    assert GenAIAttributes.GEN_AI_OPERATION_NAME in span.attributes, (
+        f"Missing {GenAIAttributes.GEN_AI_OPERATION_NAME}"
+    )
     assert (
         span.attributes[GenAIAttributes.GEN_AI_OPERATION_NAME] == "embeddings"
-    ), f"Expected 'embeddings', got {span.attributes.get(GenAIAttributes.GEN_AI_OPERATION_NAME)}"
+    ), (
+        f"Expected 'embeddings', got {span.attributes.get(GenAIAttributes.GEN_AI_OPERATION_NAME)}"
+    )
 
-    assert (
-        GenAIAttributes.GEN_AI_PROVIDER_NAME in span.attributes
-    ), f"Missing {GenAIAttributes.GEN_AI_PROVIDER_NAME}"
+    assert GenAIAttributes.GEN_AI_PROVIDER_NAME in span.attributes, (
+        f"Missing {GenAIAttributes.GEN_AI_PROVIDER_NAME}"
+    )
     assert span.attributes[GenAIAttributes.GEN_AI_PROVIDER_NAME] == "dashscope"
 
     # Conditionally required attributes
-    assert (
-        GenAIAttributes.GEN_AI_REQUEST_MODEL in span.attributes
-    ), f"Missing {GenAIAttributes.GEN_AI_REQUEST_MODEL}"
+    assert GenAIAttributes.GEN_AI_REQUEST_MODEL in span.attributes, (
+        f"Missing {GenAIAttributes.GEN_AI_REQUEST_MODEL}"
+    )
     assert (
         span.attributes[GenAIAttributes.GEN_AI_REQUEST_MODEL] == request_model
     )
 
     # Recommended attributes - check if available
     if input_tokens is not None:
-        assert (
-            GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS in span.attributes
-        ), f"Missing {GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS}"
+        assert GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS in span.attributes, (
+            f"Missing {GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS}"
+        )
         assert (
             span.attributes[GenAIAttributes.GEN_AI_USAGE_INPUT_TOKENS]
             == input_tokens
@@ -91,38 +94,37 @@ def _assert_embedding_span_attributes(
     # Dimension count should only be set if it was specified in the request
     if dimension_count is not None:
         # If dimension_count was explicitly provided in the request, it must be set in span
-        assert (
-            "gen_ai.embeddings.dimension.count" in span.attributes
-        ), "Missing gen_ai.embeddings.dimension.count"
+        assert "gen_ai.embeddings.dimension.count" in span.attributes, (
+            "Missing gen_ai.embeddings.dimension.count"
+        )
         assert (
             span.attributes["gen_ai.embeddings.dimension.count"]
             == dimension_count
         )
     else:
         # If dimension_count was not provided in the request, it should not be set in span
-        assert (
-            "gen_ai.embeddings.dimension.count" not in span.attributes
-        ), "gen_ai.embeddings.dimension.count should not be set when not specified in request"
+        assert "gen_ai.embeddings.dimension.count" not in span.attributes, (
+            "gen_ai.embeddings.dimension.count should not be set when not specified in request"
+        )
 
     if server_address is not None:
-        assert (
-            ServerAttributes.SERVER_ADDRESS in span.attributes
-        ), f"Missing {ServerAttributes.SERVER_ADDRESS}"
+        assert ServerAttributes.SERVER_ADDRESS in span.attributes, (
+            f"Missing {ServerAttributes.SERVER_ADDRESS}"
+        )
         assert (
             span.attributes[ServerAttributes.SERVER_ADDRESS] == server_address
         )
 
     if server_port is not None:
-        assert (
-            ServerAttributes.SERVER_PORT in span.attributes
-        ), f"Missing {ServerAttributes.SERVER_PORT}"
+        assert ServerAttributes.SERVER_PORT in span.attributes, (
+            f"Missing {ServerAttributes.SERVER_PORT}"
+        )
         assert span.attributes[ServerAttributes.SERVER_PORT] == server_port
 
 
 @pytest.mark.vcr()
 def test_text_embedding_basic(instrument, span_exporter):
     """Test basic text embedding call."""
-    from dashscope import TextEmbedding
 
     response = TextEmbedding.call(
         model="text-embedding-v1", input="Hello, world!"
@@ -160,7 +162,6 @@ def test_text_embedding_basic(instrument, span_exporter):
 @pytest.mark.vcr()
 def test_text_embedding_batch(instrument, span_exporter):
     """Test text embedding with batch input."""
-    from dashscope import TextEmbedding
 
     response = TextEmbedding.call(
         model="text-embedding-v1", input=["Hello", "World"]
@@ -198,7 +199,6 @@ def test_text_embedding_batch(instrument, span_exporter):
 @pytest.mark.vcr()
 def test_text_embedding_with_text_type(instrument, span_exporter):
     """Test text embedding with text_type parameter."""
-    from dashscope import TextEmbedding
 
     response = TextEmbedding.call(
         model="text-embedding-v1",
@@ -238,7 +238,6 @@ def test_text_embedding_with_text_type(instrument, span_exporter):
 @pytest.mark.vcr()
 def test_text_embedding_with_dimension(instrument, span_exporter):
     """Test text embedding with dimension parameter."""
-    from dashscope import TextEmbedding
 
     response = TextEmbedding.call(
         model="text-embedding-v1",