padronize get_agent to receive filter as an argument

Author: jplbrun

src/sap_cloud_sdk/agentgateway/_lob.py

@@ -27,7 +27,13 @@
     list_mcp_fragments,
     list_a2a_fragments,
 )
-from sap_cloud_sdk.agentgateway._models import Agent, AgentCard, MCPTool, MCPToolFilter
+from sap_cloud_sdk.agentgateway._models import (
+    Agent,
+    AgentCard,
+    AgentCardFilter,
+    MCPTool,
+    MCPToolFilter,
+)
 from sap_cloud_sdk.agentgateway._token_cache import _GatewayUrlCache, _TokenCache
 from sap_cloud_sdk.agentgateway.exceptions import (
     AgentGatewaySDKError,
@@ -499,8 +505,7 @@ async def get_agent_cards_lob(
     tenant_subdomain: str,
     system_token: str,
     timeout: float,
-    agent_names: list[str] | None = None,
-    ord_ids: list[str] | None = None,
+    filter: AgentCardFilter | None = None,
 ) -> list[Agent]:
     """List A2A agents and their agent cards using LoB flow.
 
@@ -517,15 +522,13 @@ async def get_agent_cards_lob(
         tenant_subdomain: Tenant subdomain for multi-tenant lookup.
         system_token: Pre-fetched raw system token for authentication.
         timeout: HTTP timeout in seconds.
-        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.
+        filter: Optional AgentCardFilter narrowing results by agent card name
+            or ORD ID. If None or empty, all A2A fragments are included.
 
     Returns:
         List of Agent objects, each containing ORD ID and fetched AgentCard.
     """
+    f = filter or AgentCardFilter()
     loop = asyncio.get_running_loop()
 
     logger.info("Listing A2A fragments for tenant '%s'", tenant_subdomain)
@@ -538,13 +541,13 @@ async def get_agent_cards_lob(
         return []
 
     # Pre-fetch filter: ORD ID is extractable from the URL without fetching the card
-    if ord_ids:
-        ord_ids_set = set(ord_ids)
+    if f.ord_ids:
+        ord_ids_set = set(f.ord_ids)
         fragments = [
-            f
-            for f in fragments
+            fr
+            for fr in fragments
             if _ord_id_from_url(
-                {k.lower(): v for k, v in f.properties.items()}.get("url", "")
+                {k.lower(): v for k, v in fr.properties.items()}.get("url", "")
             )
             in ord_ids_set
         ]
@@ -583,8 +586,8 @@ async def get_agent_cards_lob(
             )
 
     # Post-fetch filter: agent card name is only known after fetching
-    if agent_names:
-        agent_names_set = set(agent_names)
+    if f.agent_names:
+        agent_names_set = set(f.agent_names)
         agents = [a for a in agents if a.agent_card.raw.get("name") in agent_names_set]
 
     logger.info(

src/sap_cloud_sdk/agentgateway/agw_client.py

@@ -445,13 +445,11 @@ async def list_agent_cards(
 
             tenant = self._resolve_tenant_subdomain()
             auth = await self.get_system_auth()
-            f = filter or AgentCardFilter()
             return await get_agent_cards_lob(
                 tenant,
                 auth.access_token,
                 self._config.timeout,
-                agent_names=f.agent_names or None,
-                ord_ids=f.ord_ids or None,
+                filter=filter,
             )
         except AgentGatewaySDKError:
             raise

tests/agentgateway/unit/test_agw_client.py

@@ -983,8 +983,7 @@ async def test_returns_agents_from_lob_flow(self):
             "my-tenant",
             "system-token",
             60.0,
-            agent_names=None,
-            ord_ids=None,
+            filter=None,
         )
 
     @pytest.mark.asyncio
@@ -1015,8 +1014,9 @@ async def test_passes_filter_arguments(self):
             "my-tenant",
             "token",
             60.0,
-            agent_names=["Billing Agent"],
-            ord_ids=["sap.s4:agent:v1"],
+            filter=AgentCardFilter(
+                agent_names=["Billing Agent"], ord_ids=["sap.s4:agent:v1"]
+            ),
         )
 
     @pytest.mark.asyncio

tests/agentgateway/unit/test_lob.py

@@ -24,7 +24,13 @@
     _fetch_agent_card,
     call_mcp_tool_lob,
 )
-from sap_cloud_sdk.agentgateway._models import Agent, AgentCard, MCPTool, MCPToolFilter
+from sap_cloud_sdk.agentgateway._models import (
+    Agent,
+    AgentCard,
+    AgentCardFilter,
+    MCPTool,
+    MCPToolFilter,
+)
 from sap_cloud_sdk.agentgateway._token_cache import _GatewayUrlCache, _TokenCache
 from sap_cloud_sdk.agentgateway.config import ClientConfig
 from sap_cloud_sdk.agentgateway.exceptions import AgentGatewaySDKError, MCPServerNotFoundError
@@ -1107,7 +1113,10 @@ async def _cards_by_ord(fragment_url, token, timeout):
             ),
         ):
             result = await get_agent_cards_lob(
-                "tenant-sub", "token", 60.0, agent_names=["Billing Agent"]
+                "tenant-sub",
+                "token",
+                60.0,
+                filter=AgentCardFilter(agent_names=["Billing Agent"]),
             )
 
         assert len(result) == 1
@@ -1132,7 +1141,10 @@ async def test_filters_by_ord_ids(self):
             ) as mock_fetch,
         ):
             result = await get_agent_cards_lob(
-                "tenant-sub", "token", 60.0, ord_ids=["ord-2"]
+                "tenant-sub",
+                "token",
+                60.0,
+                filter=AgentCardFilter(ord_ids=["ord-2"]),
             )
 
         assert len(result) == 1