fix merge

Author: alexander-alderman-webb

tests/integrations/litellm/test_litellm.py

@@ -187,7 +187,7 @@ def test_nonstreaming_chat_completion(
 
     messages = [{"role": "user", "content": "Hello!"}]
 
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -270,7 +270,7 @@ def test_streaming_chat_completion(
 
     messages = [{"role": "user", "content": "Hello!"}]
 
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         server_side_event_chunks(
@@ -499,7 +499,7 @@ def test_span_origin(
 
     messages = [{"role": "user", "content": "Hello!"}]
 
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -545,7 +545,7 @@ def test_multiple_providers(
 
     messages = [{"role": "user", "content": "Hello!"}]
 
-    openai_client = OpenAI(api_key="z")
+    openai_client = OpenAI(api_key="test-key")
     openai_model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
         serialize_pydantic=True,
@@ -585,7 +585,7 @@ def test_multiple_providers(
                 model="claude-3-opus-20240229",
                 messages=messages,
                 client=anthropic_client,
-                api_key="z",
+                api_key="test-key",
             )
 
             litellm_utils.executor.shutdown(wait=True)
@@ -608,7 +608,7 @@ def test_multiple_providers(
                 model="gemini/gemini-pro",
                 messages=messages,
                 client=gemini_client,
-                api_key="z",
+                api_key="test-key",
             )
 
             litellm_utils.executor.shutdown(wait=True)
@@ -636,7 +636,7 @@ def test_additional_parameters(
     events = capture_events()
 
     messages = [{"role": "user", "content": "Hello!"}]
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -679,15 +679,15 @@ def test_additional_parameters(
     assert span["data"][SPANDATA.GEN_AI_REQUEST_PRESENCE_PENALTY] == 0.5
 
 
-def test_no_integration(sentry_init, capture_events):
+def test_no_integration(sentry_init, capture_events, get_model_response, nonstreaming_chat_completions_model_response):
     """Test that when integration is not enabled, callbacks don't break."""
     sentry_init(
         traces_sample_rate=1.0,
     )
     events = capture_events()
 
     messages = [{"role": "user", "content": "Hello!"}]
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -863,7 +863,7 @@ def test_binary_content_encoding_image_url(
             ],
         }
     ]
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -942,7 +942,7 @@ def test_binary_content_encoding_mixed_content(
             ],
         }
     ]
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,
@@ -1007,7 +1007,7 @@ def test_binary_content_encoding_uri_type(
             ],
         }
     ]
-    client = OpenAI(api_key="z")
+    client = OpenAI(api_key="test-key")
 
     model_response = get_model_response(
         nonstreaming_chat_completions_model_response,