Fix filter by name

Author: NicoleMGomes

src/sap_cloud_sdk/agentgateway/_lob.py

@@ -478,27 +478,29 @@ async def get_agent_cards_lob(
     tenant_subdomain: str,
     system_token: str,
     timeout: float,
-    names: list[str] | None = None,
+    agent_names: list[str] | None = None,
     ord_ids: list[str] | None = None,
 ) -> list[Agent]:
     """List A2A agents and their agent cards using LoB flow.
 
-    Discovers A2A fragments (label agw.a2a.server), optionally filters them,
-    then fetches the agent card for each from the fragment's URL property.
+    Discovers A2A fragments (label agw.a2a.server), optionally filters by
+    ORD ID before fetching, fetches each agent card, then optionally filters
+    by agent card name.
 
     Fragment properties used:
         URL: Base URL of the A2A agent (required).
             The agent card is fetched at {URL}/.well-known/agent-card.json.
-        ordId: ORD ID of the A2A agent (required).
+            The ORD ID is extracted from the second-to-last URL path segment.
 
     Args:
         tenant_subdomain: Tenant subdomain for multi-tenant lookup.
         system_token: Pre-fetched raw system token for authentication.
         timeout: HTTP timeout in seconds.
-        names: Optional list of fragment names to include. If empty or None,
-            all fragments are included.
-        ord_ids: Optional list of ORD IDs to include. If empty or None,
-            all fragments are included.
+        agent_names: Optional list of agent card names to include (matched
+            against the `name` field in the fetched agent card JSON).
+            Applied after fetching. If empty or None, all are included.
+        ord_ids: Optional list of ORD IDs to include (extracted from URL).
+            Applied before fetching. If empty or None, all are included.
 
     Returns:
         List of Agent objects, each containing ORD ID and fetched AgentCard.
@@ -514,10 +516,7 @@ async def get_agent_cards_lob(
         )
         return []
 
-    # Apply optional filters
-    if names:
-        names_set = set(names)
-        fragments = [f for f in fragments if f.name in names_set]
+    # Pre-fetch filter: ORD ID is extractable from the URL without fetching the card
     if ord_ids:
         ord_ids_set = set(ord_ids)
         fragments = [
@@ -562,6 +561,11 @@ async def get_agent_cards_lob(
                 "Failed to fetch agent card for fragment '%s' — skipping", fragment_name
             )
 
+    # Post-fetch filter: agent card name is only known after fetching
+    if agent_names:
+        agent_names_set = set(agent_names)
+        agents = [a for a in agents if a.agent_card.raw.get("name") in agent_names_set]
+
     logger.info(
         "Fetched %d agent card(s) from %d A2A fragment(s)", len(agents), len(fragments)
     )

src/sap_cloud_sdk/agentgateway/_models.py

@@ -130,21 +130,23 @@ class AgentCardFilter:
     filtering on that field).
 
     Attributes:
-        names: Fragment names to include.
-        ord_ids: ORD IDs to include.
+        agent_names: Agent card names to include (matched against the `name`
+            field in the agent card JSON). Applied after fetching all cards.
+        ord_ids: ORD IDs to include (extracted from the fragment URL).
+            Applied before fetching, skipping non-matching fragments.
 
     Example:
         ```python
         from sap_cloud_sdk.agentgateway import AgentCardFilter
 
         agents = await agw_client.list_agent_cards(
             filter=AgentCardFilter(
-                names=["my-fragment"],
+                agent_names=["Billing Assistant Agent"],
                 ord_ids=["sap.s4:apiAccess:agent:v1"],
             )
         )
         ```
     """
 
-    names: list[str] = field(default_factory=list)
+    agent_names: list[str] = field(default_factory=list)
     ord_ids: list[str] = field(default_factory=list)

src/sap_cloud_sdk/agentgateway/agw_client.py

@@ -431,7 +431,7 @@ async def list_agent_cards(
                 tenant,
                 auth.access_token,
                 self._config.timeout,
-                names=f.names or None,
+                agent_names=f.agent_names or None,
                 ord_ids=f.ord_ids or None,
             )
         except AgentGatewaySDKError:

tests/agentgateway/unit/test_agw_client.py

@@ -877,7 +877,7 @@ async def test_returns_agents_from_lob_flow(self):
             "my-tenant",
             "system-token",
             60.0,
-            names=None,
+            agent_names=None,
             ord_ids=None,
         )
 
@@ -902,14 +902,14 @@ async def test_passes_filter_arguments(self):
         ):
             agw_client = create_client(tenant_subdomain="my-tenant")
             await agw_client.list_agent_cards(
-                filter=AgentCardFilter(names=["frag-1"], ord_ids=["sap.s4:agent:v1"])
+                filter=AgentCardFilter(agent_names=["Billing Agent"], ord_ids=["sap.s4:agent:v1"])
             )
 
         mock_lob.assert_called_once_with(
             "my-tenant",
             "token",
             60.0,
-            names=["frag-1"],
+            agent_names=["Billing Agent"],
             ord_ids=["sap.s4:agent:v1"],
         )
 

tests/agentgateway/unit/test_lob.py

@@ -899,29 +899,33 @@ async def test_returns_empty_list_when_no_fragments(self):
         assert result == []
 
     @pytest.mark.asyncio
-    async def test_filters_by_names(self):
-        """Only include fragments whose name is in the names filter."""
+    async def test_filters_by_agent_names(self):
+        """Fetch all cards then keep only those whose agent card name matches."""
         frag_1 = self._make_fragment("frag-1", "https://agw.example.com/v1/a2a/ord-1/t1")
         frag_2 = self._make_fragment("frag-2", "https://agw.example.com/v1/a2a/ord-2/t2")
 
+        async def _cards_by_ord(fragment_url, token, timeout):
+            if "ord-1" in fragment_url:
+                return AgentCard(raw={"name": "Billing Agent"})
+            return AgentCard(raw={"name": "Other Agent"})
+
         with (
             patch(
                 "sap_cloud_sdk.agentgateway._lob.list_a2a_fragments",
                 return_value=[frag_1, frag_2],
             ),
             patch(
                 "sap_cloud_sdk.agentgateway._lob._fetch_agent_card",
-                new_callable=AsyncMock,
-                return_value=AgentCard(raw={}),
-            ) as mock_fetch,
+                side_effect=_cards_by_ord,
+            ),
         ):
             result = await get_agent_cards_lob(
-                "tenant-sub", "token", 60.0, names=["frag-1"]
+                "tenant-sub", "token", 60.0, agent_names=["Billing Agent"]
             )
 
         assert len(result) == 1
         assert result[0].ord_id == "ord-1"
-        assert mock_fetch.call_count == 1
+        assert result[0].agent_card.raw["name"] == "Billing Agent"
 
     @pytest.mark.asyncio
     async def test_filters_by_ord_ids(self):