Model rebuild for openai plugin predicate context.

python/samples/concepts/auto_function_calling/chat_completion_with_manual_function_calling.py

@@ -65,7 +65,7 @@
 # - Services.ONNX
 # - Services.VERTEX_AI
 # Please make sure you have configured your environment correctly for the selected chat completion service.
-chat_completion_service, request_settings = get_chat_completion_service_and_request_settings(Services.OPENAI)
+chat_completion_service, request_settings = get_chat_completion_service_and_request_settings(Services.AZURE_OPENAI)
 
 # Configure the function choice behavior. Here, we set it to Auto, where auto_invoke=False.
 # With `FunctionChoiceBehavior(auto_invoke=False)`, the model may return tool call instructions

python/tests/conftest.py

@@ -15,6 +15,9 @@
 from semantic_kernel.connectors.ai.open_ai.prompt_execution_settings.open_ai_prompt_execution_settings import (
     OpenAIEmbeddingPromptExecutionSettings,
 )
+from semantic_kernel.connectors.openai_plugin.openai_function_execution_parameters import (
+    OpenAIFunctionExecutionParameters,
+)
 from semantic_kernel.data.record_definition.vector_store_model_decorator import vectorstoremodel
 from semantic_kernel.data.record_definition.vector_store_model_definition import VectorStoreRecordDefinition
 from semantic_kernel.data.record_definition.vector_store_record_fields import (
@@ -686,3 +689,10 @@ class DataModelClass(BaseModel):
         key: Annotated[str, VectorStoreRecordKeyField()]
 
     return DataModelClass
+
+
+@fixture
+def define_openai_predicate_context():
+    from semantic_kernel.connectors.openapi_plugin import OperationSelectionPredicateContext  # noqa: F401
+
+    OpenAIFunctionExecutionParameters.model_rebuild()

python/tests/samples/test_concepts.py

@@ -8,7 +8,7 @@
 import pytest
 from pytest import mark, param
 
-from samples.concepts.auto_function_calling.chat_completion_with_function_calling import (
+from samples.concepts.auto_function_calling.chat_completion_with_auto_function_calling import (
     main as chat_completion_with_function_calling,
 )
 from samples.concepts.auto_function_calling.functions_defined_in_json_prompt import (

python/tests/unit/connectors/openapi_plugin/test_sk_openapi.py

@@ -749,7 +749,7 @@ def predicate_callback(context):
     return runner, operations, exec_settings
 
 
-def test_predicate_callback_applied(openapi_runner_with_predicate_callback):
+def test_predicate_callback_applied(openapi_runner_with_predicate_callback, define_openai_predicate_context):
     _, operations, exec_settings = openapi_runner_with_predicate_callback
 
     skipped_operations = []

python/tests/unit/functions/test_kernel_plugins.py

@@ -498,7 +498,7 @@ def test_from_object_class(custom_plugin_class):
 
 
 @patch("semantic_kernel.connectors.openai_plugin.openai_utils.OpenAIUtils.parse_openai_manifest_for_openapi_spec_url")
-async def test_from_openai_from_file(mock_parse_openai_manifest):
+async def test_from_openai_from_file(mock_parse_openai_manifest, define_openai_predicate_context):
     openai_spec_file = os.path.join(os.path.dirname(__file__), "../../assets/test_plugins")
     with open(os.path.join(openai_spec_file, "TestOpenAIPlugin", "akv-openai.json")) as file:
         openai_spec = file.read()
@@ -526,7 +526,7 @@ async def test_from_openai_from_file(mock_parse_openai_manifest):
 
 @patch("httpx.AsyncClient.get")
 @patch("semantic_kernel.connectors.openai_plugin.openai_utils.OpenAIUtils.parse_openai_manifest_for_openapi_spec_url")
-async def test_from_openai_plugin_from_url(mock_parse_openai_manifest, mock_get):
+async def test_from_openai_plugin_from_url(mock_parse_openai_manifest, mock_get, define_openai_predicate_context):
     openai_spec_file_path = os.path.join(
         os.path.dirname(__file__), "../../assets/test_plugins", "TestOpenAIPlugin", "akv-openai.json"
     )
@@ -561,12 +561,12 @@ async def test_from_openai_plugin_from_url(mock_parse_openai_manifest, mock_get)
     mock_get.assert_awaited_once_with(fake_plugin_url, headers={"User-Agent": HTTP_USER_AGENT})
 
 
-async def test_from_openai_fail():
+async def test_from_openai_fail(define_openai_predicate_context):
     with raises(PluginInitializationError):
         await KernelPlugin.from_openai(plugin_name="TestOpenAIPlugin")
 
 
-async def test_from_openai_fail_json_parsing():
+async def test_from_openai_fail_json_parsing(define_openai_predicate_context):
     with raises(PluginInitializationError):
         await KernelPlugin.from_openai(plugin_name="TestOpenAIPlugin", plugin_str="test")
 

python/tests/unit/kernel/test_kernel.py

@@ -589,7 +589,7 @@ def func2(arg1: str) -> str:
 
 
 @patch("semantic_kernel.connectors.openai_plugin.openai_utils.OpenAIUtils.parse_openai_manifest_for_openapi_spec_url")
-async def test_add_plugin_from_openai(mock_parse_openai_manifest, kernel: Kernel):
+async def test_add_plugin_from_openai(mock_parse_openai_manifest, kernel: Kernel, define_openai_predicate_context):
     base_folder = os.path.join(os.path.dirname(__file__), "../../assets/test_plugins")
     with open(os.path.join(base_folder, "TestOpenAIPlugin", "akv-openai.json")) as file:
         openai_spec = file.read()