A programming framework for agentic AI
SK KernelFunction from ToolSchemas (#6637)
peterychang8a2582c541f4
diff --git a/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py b/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.pyindex 78f0aa5a2..4c42fd23d 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py@@ -31,7 +31,7 @@ from semantic_kernel.functions.kernel_plugin import KernelPluginfrom semantic_kernel.kernel import Kernelfrom typing_extensions import AsyncGenerator, Union-from autogen_ext.tools.semantic_kernel import KernelFunctionFromTool+from autogen_ext.tools.semantic_kernel import KernelFunctionFromTool, KernelFunctionFromToolSchemafrom .._utils.parse_r1_content import parse_r1_content@@ -396,6 +396,9 @@ class SKChatCompletionAdapter(ChatCompletionClient):# Convert Tool to KernelFunction using KernelFunctionFromToolkernel_function = KernelFunctionFromTool(tool) # type: ignoreself._tools_plugin.functions[tool.schema["name"]] = kernel_function+ else:+ kernel_function = KernelFunctionFromToolSchema(tool) # type: ignore+ self._tools_plugin.functions[tool.get("name")] = kernel_function # type: ignorekernel.add_plugin(self._tools_plugin)diff --git a/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/__init__.py b/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/__init__.pyindex eed454771..358a71743 100644--- a/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/__init__.py+++ b/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/__init__.py@@ -1,5 +1,6 @@-from ._kernel_function_from_tool import KernelFunctionFromTool+from ._kernel_function_from_tool import KernelFunctionFromTool, KernelFunctionFromToolSchema__all__ = ["KernelFunctionFromTool",+ "KernelFunctionFromToolSchema",]diff --git a/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/_kernel_function_from_tool.py b/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/_kernel_function_from_tool.pyindex 0f3f93e2e..ff506c930 100644--- a/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/_kernel_function_from_tool.py+++ b/python/packages/autogen-ext/src/autogen_ext/tools/semantic_kernel/_kernel_function_from_tool.py@@ -1,10 +1,12 @@from typing import Any, TypeVarfrom autogen_core import CancellationToken-from autogen_core.tools import BaseTool+from autogen_core.tools import BaseTool, ToolSchemafrom pydantic import BaseModel-from semantic_kernel.functions import KernelFunctionFromMethod, kernel_function+from semantic_kernel.functions import KernelFunctionFromMethod, KernelFunctionFromPrompt, kernel_functionfrom semantic_kernel.functions.kernel_parameter_metadata import KernelParameterMetadata+from semantic_kernel.prompt_template.input_variable import InputVariable+from semantic_kernel.prompt_template.prompt_template_config import PromptTemplateConfigInputT = TypeVar("InputT", bound=BaseModel)OutputT = TypeVar("OutputT", bound=BaseModel)@@ -65,3 +67,27 @@ class KernelFunctionFromTool(KernelFunctionFromMethod):)self._tool = tool+++class KernelFunctionFromToolSchema(KernelFunctionFromPrompt):+ def __init__(self, tool_schema: ToolSchema, plugin_name: str | None = None):+ properties = tool_schema.get("parameters", {}).get("properties", {})+ required = properties.get("required", [])++ prompt_template_config = PromptTemplateConfig(+ name=tool_schema.get("name", ""),+ description=tool_schema.get("description", ""),+ input_variables=[+ InputVariable(+ name=prop_name, description=prop_info.get("description", ""), is_required=prop_name in required+ )+ for prop_name, prop_info in properties.items()+ ],+ )++ super().__init__(+ function_name=tool_schema.get("name", ""),+ plugin_name=plugin_name,+ description=tool_schema.get("description", ""),+ prompt_template_config=prompt_template_config,+ )diff --git a/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py b/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.pyindex 0f694b849..300ae0982 100644--- a/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py+++ b/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py@@ -16,7 +16,7 @@ from autogen_core.models import (SystemMessage,UserMessage,)-from autogen_core.tools import BaseTool+from autogen_core.tools import BaseTool, ParametersSchema, ToolSchemafrom autogen_ext.models.semantic_kernel import SKChatCompletionAdapterfrom openai.types.chat.chat_completion_chunk import (ChatCompletionChunk,@@ -335,6 +335,45 @@ async def test_sk_chat_completion_with_tools(sk_client: AzureChatCompletion) ->assert not result.cached+async def test_sk_chat_completion_with_prompt_tools(sk_client: AzureChatCompletion) -> None:+ # Create adapter+ adapter = SKChatCompletionAdapter(sk_client)++ # Create kernel+ kernel = Kernel(memory=NullMemory())++ # Create calculator tool instance+ tool: ToolSchema = ToolSchema(+ name="calculator",+ description="Add two numbers together",+ parameters=ParametersSchema(+ type="object",+ properties={+ "a": {"type": "number", "description": "First number"},+ "b": {"type": "number", "description": "Second number"},+ },+ required=["a", "b"],+ ),+ )++ # Test messages+ messages: list[LLMMessage] = [+ SystemMessage(content="You are a helpful assistant."),+ UserMessage(content="What is 2 + 2?", source="user"),+ ]++ # Call create with tool+ result = await adapter.create(messages=messages, tools=[tool], extra_create_args={"kernel": kernel})++ # Verify response+ assert isinstance(result.content, list)+ assert result.finish_reason == "function_calls"+ assert result.usage.prompt_tokens >= 0+ assert result.usage.completion_tokens >= 0+ assert not result.cached++@pytest.mark.asyncioasync def test_sk_chat_completion_without_tools(sk_client: AzureChatCompletion, caplog: pytest.LogCaptureFixture