Merge branch 'main' into upgrade-aoai-api-version

microsoft · Jan 9, 2025 · ca318bd · ca318bd
2 parents 42b072e + dcad32e
commit ca318bd
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 4 deletions.
diff --git a/python/tests/integration/completions/test_chat_completion_with_function_calling.py b/python/tests/integration/completions/test_chat_completion_with_function_calling.py
@@ -503,7 +503,13 @@ class FunctionChoiceTestTypes(str, Enum):
                 ]
             ],
             {"test_type": FunctionChoiceTestTypes.AUTO},
-            marks=pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+            marks=[
+                pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+                pytest.mark.xfail(
+                    reason="Temporarily failing due to Google AI API issue on streaming only: "
+                    "400 Function calling is not enabled for models/gemini-1.5-flash"
+                ),
+            ],
             id="google_ai_tool_call_auto",
         ),
         pytest.param(
@@ -523,7 +529,13 @@ class FunctionChoiceTestTypes(str, Enum):
                 ]
             ],
             {"test_type": FunctionChoiceTestTypes.NON_AUTO},
-            marks=pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+            marks=[
+                pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+                pytest.mark.xfail(
+                    reason="Temporarily failing due to Google AI API issue on streaming only: "
+                    "400 Function calling is not enabled for models/gemini-1.5-flash"
+                ),
+            ],
             id="google_ai_tool_call_non_auto",
         ),
         pytest.param(
@@ -569,7 +581,13 @@ class FunctionChoiceTestTypes(str, Enum):
                 ]
             ],
             {"test_type": FunctionChoiceTestTypes.AUTO},
-            marks=pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+            marks=[
+                pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+                pytest.mark.xfail(
+                    reason="Temporarily failing due to Google AI API issue on streaming only: "
+                    "400 Function calling is not enabled for models/gemini-1.5-flash"
+                ),
+            ],
             id="google_ai_tool_call_auto_complex_return_type",
         ),
         # endregion

diff --git a/python/tests/integration/completions/test_chat_completion_with_image_input_text_output.py b/python/tests/integration/completions/test_chat_completion_with_image_input_text_output.py
@@ -183,7 +183,13 @@
                 ),
             ],
             {},
-            marks=pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+            marks=[
+                pytest.mark.skipif(not google_ai_setup, reason="Google AI Environment Variables not set"),
+                pytest.mark.xfail(
+                    reason="Temporarily failing due to Google AI API issue on streaming only: "
+                    "400 Image input modality is not enabled for models/gemini-1.5-flash"
+                ),
+            ],
             id="google_ai_image_input_file",
         ),
         pytest.param(