From 34838be3b69afd6df51abfec6b20b7d23ffba878 Mon Sep 17 00:00:00 2001 From: tang-ontheway Date: Mon, 9 Nov 2026 19:43:08 +0800 Subject: [PATCH 1/2] fix(devui): read context providers from the agent's provider list extract_agent_metadata() read the singular `context_provider` attribute, but `Agent` stores its providers in the `context_providers` list. The `hasattr` check therefore never matched, so `EntityInfo.context_provider` stayed None even when providers were configured, and the DevUI Context Provider card was never rendered. Read `context_providers` first and keep the singular attribute as a fallback for custom agent objects that still expose it. --- .../devui/agent_framework_devui/_utils.py | 23 +++++--- .../devui/tests/devui/test_agent_metadata.py | 53 +++++++++++++++++++ 2 files changed, 69 insertions(+), 7 deletions(-) create mode 100644 python/packages/devui/tests/devui/test_agent_metadata.py diff --git a/python/packages/devui/agent_framework_devui/_utils.py b/python/packages/devui/agent_framework_devui/_utils.py index 2165a9592c7..ce9dc13b6ce 100644 --- a/python/packages/devui/agent_framework_devui/_utils.py +++ b/python/packages/devui/agent_framework_devui/_utils.py @@ -100,13 +100,22 @@ def extract_agent_metadata(entity_object: Any) -> dict[str, Any]: if hasattr(entity_object, "client"): metadata["chat_client_type"] = entity_object.client.__class__.__name__ - # Try to get context providers - if ( - hasattr(entity_object, "context_provider") - and entity_object.context_provider - and hasattr(entity_object.context_provider, "__class__") - ): - metadata["context_provider"] = [entity_object.context_provider.__class__.__name__] # type: ignore + # Try to get context providers. + # ``Agent`` exposes a ``context_providers`` list; the singular + # ``context_provider`` attribute only exists on older/custom agent + # objects, so fall back to it when the list is absent. + context_provider_names: list[str] = [] + providers = getattr(entity_object, "context_providers", None) + if providers: + for provider in providers: + if provider is not None and hasattr(provider, "__class__"): + context_provider_names.append(type(provider).__name__) + if not context_provider_names: + single_provider = getattr(entity_object, "context_provider", None) + if single_provider is not None and hasattr(single_provider, "__class__"): + context_provider_names = [type(single_provider).__name__] + if context_provider_names: + metadata["context_provider"] = context_provider_names # type: ignore # Try to get middleware if hasattr(entity_object, "middleware") and entity_object.middleware: diff --git a/python/packages/devui/tests/devui/test_agent_metadata.py b/python/packages/devui/tests/devui/test_agent_metadata.py new file mode 100644 index 00000000000..febd7bb65dc --- /dev/null +++ b/python/packages/devui/tests/devui/test_agent_metadata.py @@ -0,0 +1,53 @@ +# Copyright (c) Microsoft. All rights reserved. + +"""Tests for agent metadata extraction used by DevUI discovery.""" + +from unittest.mock import Mock + +from agent_framework import Agent, InMemoryHistoryProvider + +from agent_framework_devui._utils import extract_agent_metadata + + +def test_extract_agent_metadata_reports_configured_context_providers() -> None: + """A configured context provider must show up in the agent metadata.""" + agent = Agent( + client=Mock(model=None), + context_providers=[InMemoryHistoryProvider()], + ) + + metadata = extract_agent_metadata(agent) + + assert metadata["context_provider"] == ["InMemoryHistoryProvider"] + + +def test_extract_agent_metadata_preserves_provider_order() -> None: + """Multiple providers are listed in their configured order.""" + agent = Agent( + client=Mock(model=None), + context_providers=[InMemoryHistoryProvider(), InMemoryHistoryProvider()], + ) + + metadata = extract_agent_metadata(agent) + + assert metadata["context_provider"] == ["InMemoryHistoryProvider", "InMemoryHistoryProvider"] + + +def test_extract_agent_metadata_without_context_providers() -> None: + """An agent without providers reports no context provider.""" + agent = Agent(client=Mock(model=None)) + + metadata = extract_agent_metadata(agent) + + assert metadata["context_provider"] is None + + +def test_extract_agent_metadata_falls_back_to_single_context_provider() -> None: + """Older agent objects exposing a single ``context_provider`` still work.""" + + class LegacyAgent: + context_provider = InMemoryHistoryProvider() + + metadata = extract_agent_metadata(LegacyAgent()) + + assert metadata["context_provider"] == ["InMemoryHistoryProvider"] From 950528bb6d450b170932feec23d8c17e39f4536a Mon Sep 17 00:00:00 2001 From: yifei tang Date: Fri, 13 Nov 2026 10:40:18 +0800 Subject: [PATCH 2/2] fix(devui): harden context provider extraction Address the review feedback on the DevUI context provider fix: - Drop the always-true ``hasattr(provider, "__class__")`` checks. - Only iterate ``context_providers`` when it is a list or tuple, so a truthy but non-iterable value no longer raises ``TypeError`` during entity discovery. - Use two distinct provider classes in the order test and assert the exact name sequence, so reversed or sorted extraction is detected. - Cover the non-iterable ``context_providers`` case with a regression test. --- .../devui/agent_framework_devui/_utils.py | 8 +++--- .../devui/tests/devui/test_agent_metadata.py | 28 +++++++++++++++++-- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/python/packages/devui/agent_framework_devui/_utils.py b/python/packages/devui/agent_framework_devui/_utils.py index ce9dc13b6ce..3c9778de08c 100644 --- a/python/packages/devui/agent_framework_devui/_utils.py +++ b/python/packages/devui/agent_framework_devui/_utils.py @@ -106,13 +106,13 @@ def extract_agent_metadata(entity_object: Any) -> dict[str, Any]: # objects, so fall back to it when the list is absent. context_provider_names: list[str] = [] providers = getattr(entity_object, "context_providers", None) - if providers: - for provider in providers: - if provider is not None and hasattr(provider, "__class__"): + if isinstance(providers, (list, tuple)): + for provider in cast("list[Any]", providers): + if provider is not None: context_provider_names.append(type(provider).__name__) if not context_provider_names: single_provider = getattr(entity_object, "context_provider", None) - if single_provider is not None and hasattr(single_provider, "__class__"): + if single_provider is not None: context_provider_names = [type(single_provider).__name__] if context_provider_names: metadata["context_provider"] = context_provider_names # type: ignore diff --git a/python/packages/devui/tests/devui/test_agent_metadata.py b/python/packages/devui/tests/devui/test_agent_metadata.py index febd7bb65dc..5b8d6ba390e 100644 --- a/python/packages/devui/tests/devui/test_agent_metadata.py +++ b/python/packages/devui/tests/devui/test_agent_metadata.py @@ -4,11 +4,19 @@ from unittest.mock import Mock -from agent_framework import Agent, InMemoryHistoryProvider +from agent_framework import Agent, ContextProvider, InMemoryHistoryProvider from agent_framework_devui._utils import extract_agent_metadata +class _ZebraProvider(ContextProvider): + """Provider whose class name sorts after the other one used in the order test.""" + + +class _AardvarkProvider(ContextProvider): + """Provider whose class name sorts before the other one used in the order test.""" + + def test_extract_agent_metadata_reports_configured_context_providers() -> None: """A configured context provider must show up in the agent metadata.""" agent = Agent( @@ -25,12 +33,15 @@ def test_extract_agent_metadata_preserves_provider_order() -> None: """Multiple providers are listed in their configured order.""" agent = Agent( client=Mock(model=None), - context_providers=[InMemoryHistoryProvider(), InMemoryHistoryProvider()], + context_providers=[ + _ZebraProvider(source_id="zebra"), + _AardvarkProvider(source_id="aardvark"), + ], ) metadata = extract_agent_metadata(agent) - assert metadata["context_provider"] == ["InMemoryHistoryProvider", "InMemoryHistoryProvider"] + assert metadata["context_provider"] == ["_ZebraProvider", "_AardvarkProvider"] def test_extract_agent_metadata_without_context_providers() -> None: @@ -51,3 +62,14 @@ class LegacyAgent: metadata = extract_agent_metadata(LegacyAgent()) assert metadata["context_provider"] == ["InMemoryHistoryProvider"] + + +def test_extract_agent_metadata_ignores_non_iterable_context_providers() -> None: + """A truthy but non-iterable ``context_providers`` value must not break discovery.""" + + class OddAgent: + context_providers = Mock() + + metadata = extract_agent_metadata(OddAgent()) + + assert metadata["context_provider"] is None