Reformat with ruff.

Author: michaelsafyan

instrumentation-genai/opentelemetry-instrumentation-google-genai/src/opentelemetry/instrumentation/google_genai/generate_content.py

@@ -24,10 +24,10 @@
     BlockedReason,
     Candidate,
     Content,
-    ContentUnion,
-    ContentUnionDict,
     ContentListUnion,
     ContentListUnionDict,
+    ContentUnion,
+    ContentUnionDict,
     GenerateContentConfigOrDict,
     GenerateContentResponse,
 )
@@ -539,6 +539,7 @@ def _create_instrumented_generate_content_stream(
     snapshot: _MethodsSnapshot, otel_wrapper: OTelWrapper
 ):
     wrapped_func = snapshot.generate_content_stream
+
     @functools.wraps(wrapped_func)
     def instrumented_generate_content_stream(
         self: Models,
@@ -578,6 +579,7 @@ def _create_instrumented_async_generate_content(
     snapshot: _MethodsSnapshot, otel_wrapper: OTelWrapper
 ):
     wrapped_func = snapshot.async_generate_content
+
     @functools.wraps(wrapped_func)
     async def instrumented_generate_content(
         self: AsyncModels,
@@ -618,6 +620,7 @@ def _create_instrumented_async_generate_content_stream(  # pyright: ignore
     snapshot: _MethodsSnapshot, otel_wrapper: OTelWrapper
 ):
     wrapped_func = snapshot.async_generate_content_stream
+
     @functools.wraps(wrapped_func)
     async def instrumented_generate_content_stream(
         self: AsyncModels,
@@ -630,6 +633,7 @@ async def instrumented_generate_content_stream(
         helper = _GenerateContentInstrumentationHelper(
             self, otel_wrapper, model
         )
+
         async def _internal_generator():
             with helper.start_span_as_current_span(
                 model, "google.genai.AsyncModels.generate_content_stream"
@@ -650,9 +654,11 @@ async def _internal_generator():
                     raise
                 finally:
                     helper.finalize_processing()
+
         class _GeneratorProvider:
             def __aiter__(self):
                 return _internal_generator()
+
         return _GeneratorProvider()
 
     return instrumented_generate_content_stream

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/common/requests_mocker.py

@@ -32,12 +32,12 @@
 # Because they APIs that need to be mocked are simple enough and well documented
 # enough, it seems approachable to mock the requests library, instead.
 
-from typing import Optional
 import copy
 import functools
 import http.client
 import io
 import json
+from typing import Optional
 
 import requests
 import requests.sessions
@@ -127,27 +127,29 @@ def generate_response_from_dict(args):
 def _to_stream_response_generator(response_generators):
     if len(response_generators) == 1:
         return response_generators[0]
+
     def combined_generator(args):
         first_response = response_generators[0](args)
         if first_response.status_code != 200:
             return first_response
         result = requests.Response()
         result.status_code = 200
-        result.headers['content-type'] = 'application/json'
-        result.encoding = 'utf-8'
-        result.headers['transfer-encoding'] = 'chunked'
+        result.headers["content-type"] = "application/json"
+        result.encoding = "utf-8"
+        result.headers["transfer-encoding"] = "chunked"
         contents = []
         for generator in response_generators:
             response = generator(args)
             if response.status_code != 200:
                 continue
             response_json = response.json()
             response_json_str = json.dumps(response_json)
-            contents.append(f'data: {response_json_str}')
-        contents_str = '\r\n'.join(contents)
-        full_contents = f'{contents_str}\r\n\r\n'
+            contents.append(f"data: {response_json_str}")
+        contents_str = "\r\n".join(contents)
+        full_contents = f"{contents_str}\r\n\r\n"
         result.raw = io.BytesIO(full_contents.encode())
         return result
+
     return combined_generator
 
 
@@ -188,7 +190,7 @@ def _do_send(
         request: requests.PreparedRequest,
         **kwargs,
     ):
-        stream=kwargs.get('stream', False)
+        stream = kwargs.get("stream", False)
         if not stream:
             return self._do_send_non_streaming(session, request, **kwargs)
         return self._do_send_streaming(session, request, **kwargs)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/nonstreaming_base.py

@@ -36,13 +36,8 @@ def generate_content(self, *args, **kwargs):
     def expected_function_name(self):
         raise NotImplementedError("Must implement 'expected_function_name'.")
 
-    def configure_valid_response(
-        self,
-        *args,
-        **kwargs
-    ):
-        self.requests.add_response(
-            create_valid_response(*args, **kwargs))
+    def configure_valid_response(self, *args, **kwargs):
+        self.requests.add_response(create_valid_response(*args, **kwargs))
 
     def test_instrumentation_does_not_break_core_functionality(self):
         self.configure_valid_response(response_text="Yep, it works!")

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/streaming_base.py

@@ -12,7 +12,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import os
 import unittest
 
 from ..common.base import TestCase
@@ -35,13 +34,8 @@ def generate_content(self, *args, **kwargs):
     def expected_function_name(self):
         raise NotImplementedError("Must implement 'expected_function_name'.")
 
-    def configure_valid_response(
-        self,
-        *args,
-        **kwargs
-    ):
-        self.requests.add_response(
-            create_valid_response(*args, **kwargs))
+    def configure_valid_response(self, *args, **kwargs):
+        self.requests.add_response(create_valid_response(*args, **kwargs))
 
     def test_instrumentation_does_not_break_core_functionality(self):
         self.configure_valid_response(response_text="Yep, it works!")
@@ -79,4 +73,4 @@ def test_includes_token_counts_in_span_aggregated_from_responses(self):
         self.otel.assert_has_span_named("generate_content gemini-2.0-flash")
         span = self.otel.get_span_named("generate_content gemini-2.0-flash")
         self.assertEqual(span.attributes["gen_ai.usage.input_tokens"], 9)
-        self.assertEqual(span.attributes["gen_ai.usage.output_tokens"], 12)
+        self.assertEqual(span.attributes["gen_ai.usage.output_tokens"], 12)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_async_nonstreaming.py

@@ -18,12 +18,11 @@
 
 
 class TestGenerateContentAsyncNonstreaming(NonStreamingTestCase):
-    
     def generate_content(self, *args, **kwargs):
         return asyncio.run(
             self.client.aio.models.generate_content(*args, **kwargs)  # pylint: disable=missing-kwoa
         )
 
     @property
     def expected_function_name(self):
-        return 'google.genai.AsyncModels.generate_content'
+        return "google.genai.AsyncModels.generate_content"

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_async_streaming.py

@@ -19,7 +19,6 @@
 
 
 class AsyncStreamingMixin:
-
     @property
     def expected_function_name(self):
         return "google.genai.AsyncModels.generate_content_stream"
@@ -35,18 +34,22 @@ async def _generate_content_stream_helper(self, *args, **kwargs):
         return result
 
     def generate_content_stream(self, *args, **kwargs):
-        return asyncio.run(self._generate_content_stream_helper(*args, **kwargs))
-
+        return asyncio.run(
+            self._generate_content_stream_helper(*args, **kwargs)
+        )
 
-class TestGenerateContentAsyncStreamingWithSingleResult(AsyncStreamingMixin, NonStreamingTestCase):
 
+class TestGenerateContentAsyncStreamingWithSingleResult(
+    AsyncStreamingMixin, NonStreamingTestCase
+):
     def generate_content(self, *args, **kwargs):
         responses = self.generate_content_stream(*args, **kwargs)
         self.assertEqual(len(responses), 1)
         return responses[0]
 
 
-class TestGenerateContentAsyncStreamingWithStreamedResults(AsyncStreamingMixin, StreamingTestCase):
-
+class TestGenerateContentAsyncStreamingWithStreamedResults(
+    AsyncStreamingMixin, StreamingTestCase
+):
     def generate_content(self, *args, **kwargs):
         return self.generate_content_stream(*args, **kwargs)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/test_sync_streaming.py

@@ -18,28 +18,30 @@
 
 
 class StreamingMixin:
-
     @property
     def expected_function_name(self):
         return "google.genai.Models.generate_content_stream"
 
     def generate_content_stream(self, *args, **kwargs):
         result = []
         for response in self.client.models.generate_content_stream(  # pylint: disable=missing-kwoa
-            *args, **kwargs):
+            *args, **kwargs
+        ):
             result.append(response)
         return result
 
 
-class TestGenerateContentStreamingWithSingleResult(StreamingMixin, NonStreamingTestCase):
-
+class TestGenerateContentStreamingWithSingleResult(
+    StreamingMixin, NonStreamingTestCase
+):
     def generate_content(self, *args, **kwargs):
         responses = self.generate_content_stream(*args, **kwargs)
         self.assertEqual(len(responses), 1)
         return responses[0]
 
 
-class TestGenerateContentStreamingWithStreamedResults(StreamingMixin, StreamingTestCase):
-
+class TestGenerateContentStreamingWithStreamedResults(
+    StreamingMixin, StreamingTestCase
+):
     def generate_content(self, *args, **kwargs):
         return self.generate_content_stream(*args, **kwargs)

instrumentation-genai/opentelemetry-instrumentation-google-genai/tests/generate_content/util.py

@@ -35,4 +35,4 @@ def create_valid_response(
                 }
             }
         ],
-    }
+    }