Update sync test to use indirection on top of 'client.models.generate_content' to simplify test reuse.

Author: michaelsafyan

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

@@ -54,17 +54,20 @@ def configure_valid_response(self, response_text='The model_response', input_tok
             input_tokens=input_tokens,
             output_tokens=output_tokens))
 
+    def generate_content(self, *args, **kwargs):
+        return self.client.models.generate_content(*args, **kwargs)
+
     def test_generates_span(self):
         self.configure_valid_response(response_text='Yep, it works!')
-        response = self.client.models.generate_content(
+        response = self.generate_content(
             model='gemini-2.0-flash',
             contents='Does this work?')
         self.assertEqual(response.text, 'Yep, it works!')
         self.otel.assert_has_span_named('google.genai.Models.generate_content')
 
     def test_generated_span_has_minimal_genai_attributes(self):
         self.configure_valid_response(response_text='Yep, it works!')
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Does this work?')
         self.otel.assert_has_span_named('google.genai.Models.generate_content')
@@ -74,7 +77,7 @@ def test_generated_span_has_minimal_genai_attributes(self):
 
     def test_generated_span_counts_tokens(self):
         self.configure_valid_response(input_tokens=123, output_tokens=456)
-        response = self.client.models.generate_content(
+        response = self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_has_span_named('google.genai.Models.generate_content')
@@ -88,7 +91,7 @@ def test_records_system_prompt_as_log(self):
             'system_instruction': 'foo'
         }
         self.configure_valid_response()
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input',
             config=config)
@@ -103,7 +106,7 @@ def test_does_not_record_system_prompt_as_log_if_disabled_by_env(self):
             'system_instruction': 'foo'
         }
         self.configure_valid_response()
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input',
             config=config)
@@ -112,15 +115,15 @@ def test_does_not_record_system_prompt_as_log_if_disabled_by_env(self):
     def test_does_not_record_system_prompt_as_log_if_no_system_prompt_present(self):
         os.environ['OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT'] = 'true'
         self.configure_valid_response()
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_does_not_have_event_named('gen_ai.system.message')
 
     def test_records_user_prompt_as_log(self):
         os.environ['OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT'] = 'true'
         self.configure_valid_response()
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_has_event_named('gen_ai.user.message')
@@ -131,15 +134,15 @@ def test_records_user_prompt_as_log(self):
     def test_does_not_record_user_prompt_as_log_if_disabled_by_env(self):
         os.environ['OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT'] = 'false'
         self.configure_valid_response()
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_does_not_have_event_named('gen_ai.user.message')
 
     def test_records_response_as_log(self):
         os.environ['OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT'] = 'true'
         self.configure_valid_response(response_text='Some response content')
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_has_event_named('gen_ai.assistant.message')
@@ -150,14 +153,14 @@ def test_records_response_as_log(self):
     def test_does_not_record_response_as_log_if_disabled_by_env(self):
         os.environ['OTEL_INSTRUMENTATION_GENAI_CAPTURE_MESSAGE_CONTENT'] = 'false'
         self.configure_valid_response(response_text='Some response content')
-        self.client.models.generate_content(
+        self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_does_not_have_event_named('gen_ai.assistant.message')
 
     def test_records_metrics_data(self):
         self.configure_valid_response()
-        response = self.client.models.generate_content(
+        response = self.generate_content(
             model='gemini-2.0-flash',
             contents='Some input')
         self.otel.assert_has_metrics_data_named('gen_ai.client.token.usage')