some refinement

Author: eavanvalkenburg

python/semantic_kernel/agents/agent.py

@@ -4,7 +4,7 @@
 import uuid
 from abc import ABC, abstractmethod
 from collections.abc import AsyncIterable, Iterable
-from typing import Annotated, Any, ClassVar
+from typing import TYPE_CHECKING, Annotated, Any, ClassVar
 
 from pydantic import Field, model_validator
 
@@ -14,7 +14,6 @@
 from semantic_kernel.contents.streaming_chat_message_content import StreamingChatMessageContent
 from semantic_kernel.functions.kernel_arguments import KernelArguments
 from semantic_kernel.functions.kernel_function_decorator import kernel_function
-from semantic_kernel.functions.kernel_plugin import KernelPlugin
 from semantic_kernel.kernel import Kernel
 from semantic_kernel.kernel_pydantic import KernelBaseModel
 from semantic_kernel.prompt_template.kernel_prompt_template import KernelPromptTemplate
@@ -23,6 +22,9 @@
 from semantic_kernel.utils.naming import generate_random_ascii_name
 from semantic_kernel.utils.validation import AGENT_NAME_REGEX
 
+if TYPE_CHECKING:
+    pass
+
 logger: logging.Logger = logging.getLogger(__name__)
 
 
@@ -55,11 +57,6 @@ class Agent(KernelBaseModel, ABC):
     name: str = Field(default_factory=lambda: f"agent_{generate_random_ascii_name()}", pattern=AGENT_NAME_REGEX)
     prompt_template: PromptTemplateBase | None = None
 
-    @staticmethod
-    def _get_plugin_name(plugin: KernelPlugin | object) -> str:
-        """Helper method to get the plugin name."""
-        return getattr(plugin, "name", plugin.__class__.__name__)
-
     @model_validator(mode="before")
     @classmethod
     def _configure_plugins(cls, data: Any) -> Any:
@@ -69,23 +66,22 @@ def _configure_plugins(cls, data: Any) -> Any:
             if not kernel:
                 kernel = Kernel()
             for plugin in plugins:
-                name = Agent._get_plugin_name(plugin)
-                kernel.add_plugin(plugin, plugin_name=name)
+                kernel.add_plugin(plugin)
             data["kernel"] = kernel
         return data
 
     def model_post_init(self, __context: Any) -> None:
         """Post initialization."""
 
         @kernel_function(name=self.name, description=self.description)
-        async def _invoke_agent_as_function_inner(
+        async def _as_function(
             task: Annotated[str, "The task to perform."],
         ) -> Annotated[str, "The response from the agent."]:
             history = ChatHistory()
             history.add_user_message(task)
             return (await self.get_response(history=history)).content
 
-        setattr(self, "_as_function", _invoke_agent_as_function_inner)
+        setattr(self, "_as_function", _as_function)
 
     @abstractmethod
     async def get_response(self, *args, **kwargs) -> ChatMessageContent:

python/semantic_kernel/functions/kernel_function_extension.py

@@ -85,7 +85,7 @@ def add_plugin(
             self.plugins[plugin.name] = plugin
             return self.plugins[plugin.name]
         if not plugin_name:
-            plugin_name = plugin.name if hasattr(plugin, "name") else plugin.__class__.__name__
+            plugin_name = getattr(plugin, "name", plugin.__class__.__name__)
         if not isinstance(plugin_name, str):
             raise TypeError("plugin_name must be a string.")
         if plugin:

python/tests/unit/agents/test_agent.py

@@ -7,6 +7,8 @@
 
 import pytest
 
+from semantic_kernel.kernel import Kernel
+
 if sys.version_info >= (3, 12):
     from typing import override  # pragma: no cover
 else:
@@ -33,7 +35,7 @@ class MockAgent(Agent):
 
     channel_type: ClassVar[type[AgentChannel]] = MockChannel
 
-    def __init__(self, name: str = "Test-Agent", description: str = "A test agent", id: str = None):
+    def __init__(self, name: str = "TestAgent", description: str = "A test agent", id: str = None):
         args = {
             "name": name,
             "description": description,
@@ -171,3 +173,21 @@ def test_merge_arguments_both_not_none():
 
     assert merged["param1"] == "baseVal", "Should retain base param from agent"
     assert merged["param2"] == "override_param", "Should include param from override"
+
+
+def test_function_from_agent():
+    agent = MockAgent()
+    assert hasattr(agent, "_as_function")
+    func = agent._as_function
+    assert hasattr(func, "__kernel_function__")
+    assert func.__kernel_function_description__ == agent.description
+    assert func.__kernel_function_name__ == agent.name
+    assert len(func.__kernel_function_parameters__) == 1
+
+
+def test_add_agent_as_plugin(kernel: Kernel):
+    agent = MockAgent()
+    kernel.add_plugin(agent)
+    assert len(kernel.plugins) == 1
+    assert len(kernel.plugins[agent.name].functions) == 1
+    assert kernel.plugins[agent.name].functions[agent.name].parameters[0].name == "task"

python/tests/unit/kernel/test_kernel.py

@@ -1,6 +1,7 @@
 # Copyright (c) Microsoft. All rights reserved.
 
 import os
+from dataclasses import dataclass
 from pathlib import Path
 from typing import Union
 from unittest.mock import AsyncMock, MagicMock, patch
@@ -479,9 +480,18 @@ def test_plugin_no_plugin(kernel: Kernel):
         kernel.add_plugin(plugin_name="test")
 
 
-def test_plugin_name_error(kernel: Kernel):
-    with pytest.raises(ValueError):
-        kernel.add_plugin(" ", None)
+def test_plugin_name_from_class_name(kernel: Kernel):
+    kernel.add_plugin(" ", None)
+    assert "str" in kernel.plugins
+
+
+def test_plugin_name_from_name_attribute(kernel: Kernel):
+    @dataclass
+    class TestPlugin:
+        name: str = "test_plugin"
+
+    kernel.add_plugin(TestPlugin(), None)
+    assert "test_plugin" in kernel.plugins
 
 
 def test_plugin_name_not_string_error(kernel: Kernel):