AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
fix: Include graph schemas for marketplace agents in Agent Generator (#11920)
Otto7e37de8e3052
diff --git a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.pyindex 466f6438a3..0ddd2aa86b 100644--- a/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py+++ b/autogpt_platform/backend/backend/api/features/chat/tools/agent_generator/core.py@@ -14,6 +14,7 @@ from backend.data.graph import (create_graph,get_graph,get_graph_all_versions,+ get_store_listed_graphs,)from backend.util.exceptions import DatabaseError, NotFoundError@@ -266,18 +267,18 @@ async def get_library_agents_for_generation(async def search_marketplace_agents_for_generation(search_query: str,max_results: int = 10,-) -> list[MarketplaceAgentSummary]:+) -> list[LibraryAgentSummary]:"""Search marketplace agents formatted for Agent Generator.- Note: This returns basic agent info. Full input/output schemas would require- additional graph fetches and is a potential future enhancement.+ Fetches marketplace agents and their full schemas so they can be used+ as sub-agents in generated workflows.Args:search_query: Search term to find relevant public agentsmax_results: Maximum number of agents to return (default 10)Returns:- List of MarketplaceAgentSummary (without detailed schemas for now)+ List of LibraryAgentSummary with full input/output schemas"""try:response = await store_db.get_store_agents(@@ -286,17 +287,31 @@ async def search_marketplace_agents_for_generation(page_size=max_results,)- results: list[MarketplaceAgentSummary] = []- for agent in response.agents:- results.append(- MarketplaceAgentSummary(- name=agent.agent_name,- description=agent.description,- sub_heading=agent.sub_heading,- creator=agent.creator,- is_marketplace_agent=True,+ agents_with_graphs = [+ agent for agent in response.agents if agent.agent_graph_id+ ]++ if not agents_with_graphs:+ return []++ graph_ids = [agent.agent_graph_id for agent in agents_with_graphs]+ graphs = await get_store_listed_graphs(*graph_ids)++ results: list[LibraryAgentSummary] = []+ for agent in agents_with_graphs:+ graph_id = agent.agent_graph_id+ if graph_id and graph_id in graphs:+ graph = graphs[graph_id]+ results.append(+ LibraryAgentSummary(+ graph_id=graph.id,+ graph_version=graph.version,+ name=agent.agent_name,+ description=agent.description,+ input_schema=graph.input_schema,+ output_schema=graph.output_schema,+ ))- )return resultsexcept Exception as e:logger.warning(f"Failed to search marketplace agents: {e}")@@ -327,8 +342,7 @@ async def get_all_relevant_agents_for_generation(max_marketplace_results: Max marketplace agents to return (default 10)Returns:- List of AgentSummary, library agents first (with full schemas),- then marketplace agents (basic info only)+ List of AgentSummary with full schemas (both library and marketplace agents)"""agents: list[AgentSummary] = []seen_graph_ids: set[str] = set()@@ -365,16 +379,11 @@ async def get_all_relevant_agents_for_generation(search_query=search_query,max_results=max_marketplace_results,)- library_names: set[str] = set()- for a in agents:- name = a.get("name")- if name and isinstance(name, str):- library_names.add(name.lower())for agent in marketplace_agents:- agent_name = agent.get("name")- if agent_name and isinstance(agent_name, str):- if agent_name.lower() not in library_names:- agents.append(agent)+ graph_id = agent.get("graph_id")+ if graph_id and graph_id not in seen_graph_ids:+ agents.append(agent)+ seen_graph_ids.add(graph_id)return agentsdiff --git a/autogpt_platform/backend/backend/api/features/store/db.py b/autogpt_platform/backend/backend/api/features/store/db.pyindex 956fdfa7da..850a2bc3e9 100644--- a/autogpt_platform/backend/backend/api/features/store/db.py+++ b/autogpt_platform/backend/backend/api/features/store/db.py@@ -112,6 +112,7 @@ async def get_store_agents(description=agent["description"],runs=agent["runs"],rating=agent["rating"],+ agent_graph_id=agent.get("agentGraphId", ""),)store_agents.append(store_agent)except Exception as e:@@ -170,6 +171,7 @@ async def get_store_agents(description=agent.description,runs=agent.runs,rating=agent.rating,+ agent_graph_id=agent.agentGraphId,)# Add to the list only if creation was successfulstore_agents.append(store_agent)diff --git a/autogpt_platform/backend/backend/api/features/store/hybrid_search.py b/autogpt_platform/backend/backend/api/features/store/hybrid_search.pyindex 8b0884bb24..e1b8f402c8 100644--- a/autogpt_platform/backend/backend/api/features/store/hybrid_search.py+++ b/autogpt_platform/backend/backend/api/features/store/hybrid_search.py@@ -600,6 +600,7 @@ async def hybrid_search(sa.featured,sa.is_available,sa.updated_at,+ sa."agentGraphId",-- Searchable text for BM25 rerankingCOALESCE(sa.agent_name, '') || ' ' || COALESCE(sa.sub_heading, '') || ' ' || COALESCE(sa.description, '') as searchable_text,-- Semantic score@@ -659,6 +660,7 @@ async def hybrid_search(featured,is_available,updated_at,+ "agentGraphId",searchable_text,semantic_score,lexical_score,diff --git a/autogpt_platform/backend/backend/api/features/store/model.py b/autogpt_platform/backend/backend/api/features/store/model.pyindex a3310b96fc..d66b91807d 100644--- a/autogpt_platform/backend/backend/api/features/store/model.py+++ b/autogpt_platform/backend/backend/api/features/store/model.py@@ -38,6 +38,7 @@ class StoreAgent(pydantic.BaseModel):description: strruns: intrating: float+ agent_graph_id: strclass StoreAgentsResponse(pydantic.BaseModel):diff --git a/autogpt_platform/backend/backend/api/features/store/model_test.py b/autogpt_platform/backend/backend/api/features/store/model_test.pyindex fd09a0cf77..c4109f4603 100644--- a/autogpt_platform/backend/backend/api/features/store/model_test.py+++ b/autogpt_platform/backend/backend/api/features/store/model_test.py@@ -26,11 +26,13 @@ def test_store_agent():description="Test description",runs=50,rating=4.5,+ agent_graph_id="test-graph-id",)assert agent.slug == "test-agent"assert agent.agent_name == "Test Agent"assert agent.runs == 50assert agent.rating == 4.5+ assert agent.agent_graph_id == "test-graph-id"def test_store_agents_response():@@ -46,6 +48,7 @@ def test_store_agents_response():description="Test description",runs=50,rating=4.5,+ agent_graph_id="test-graph-id",)],pagination=store_model.Pagination(diff --git a/autogpt_platform/backend/backend/api/features/store/routes_test.py b/autogpt_platform/backend/backend/api/features/store/routes_test.pyindex 36431c20ec..fcef3f845a 100644--- a/autogpt_platform/backend/backend/api/features/store/routes_test.py+++ b/autogpt_platform/backend/backend/api/features/store/routes_test.py@@ -82,6 +82,7 @@ def test_get_agents_featured(description="Featured agent description",runs=100,rating=4.5,+ agent_graph_id="test-graph-1",)],pagination=store_model.Pagination(@@ -127,6 +128,7 @@ def test_get_agents_by_creator(description="Creator agent description",runs=50,rating=4.0,+ agent_graph_id="test-graph-2",)],pagination=store_model.Pagination(@@ -172,6 +174,7 @@ def test_get_agents_sorted(description="Top agent description",runs=1000,rating=5.0,+ agent_graph_id="test-graph-3",)],pagination=store_model.Pagination(@@ -217,6 +220,7 @@ def test_get_agents_search(description="Specific search term description",runs=75,rating=4.2,+ agent_graph_id="test-graph-search",)],pagination=store_model.Pagination(@@ -262,6 +266,7 @@ def test_get_agents_category(description="Category agent description",runs=60,rating=4.1,+ agent_graph_id="test-graph-category",)],pagination=store_model.Pagination(@@ -306,6 +311,7 @@ def test_get_agents_pagination(description=f"Agent {i} description",runs=i * 10,rating=4.0,+ agent_graph_id="test-graph-2",)for i in range(5)],diff --git a/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py b/autogpt_platform/backend/backend/api/features/store/test_cache_delete.pyindex dd9be1f4ab..298c51d47c 100644--- a/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py+++ b/autogpt_platform/backend/backend/api/features/store/test_cache_delete.py@@ -33,6 +33,7 @@ class TestCacheDeletion:description="Test description",runs=100,rating=4.5,+ agent_graph_id="test-graph-id",)],pagination=Pagination(diff --git a/autogpt_platform/backend/backend/data/graph.py b/autogpt_platform/backend/backend/data/graph.pyindex c1f38f81d5..ee6cd2e4b0 100644--- a/autogpt_platform/backend/backend/data/graph.py+++ b/autogpt_platform/backend/backend/data/graph.py@@ -1028,6 +1028,39 @@ async def get_graph(return GraphModel.from_db(graph, for_export)+async def get_store_listed_graphs(*graph_ids: str) -> dict[str, GraphModel]:+ """Batch-fetch multiple store-listed graphs by their IDs.++ Only returns graphs that have approved store listings (publicly available).+ Does not require permission checks since store-listed graphs are public.++ Args:+ *graph_ids: Variable number of graph IDs to fetch++ Returns:+ Dict mapping graph_id to GraphModel for graphs with approved store listings+ """+ if not graph_ids:+ return {}++ store_listings = await StoreListingVersion.prisma().find_many(+ where={+ "agentGraphId": {"in": list(graph_ids)},+ "submissionStatus": SubmissionStatus.APPROVED,+ "isDeleted": False,+ },+ include={"AgentGraph": {"include": AGENT_GRAPH_INCLUDE}},+ distinct=["agentGraphId"],+ order={"agentGraphVersion": "desc"},+ )++ return {+ listing.agentGraphId: GraphModel.from_db(listing.AgentGraph)+ for listing in store_listings+ if listing.AgentGraph+ }++async def get_graph_as_admin(graph_id: str,version: int | None = None,diff --git a/autogpt_platform/backend/snapshots/agts_by_creator b/autogpt_platform/backend/snapshots/agts_by_creatorindex 4d6dd12920..3f2e128a0d 100644--- a/autogpt_platform/backend/snapshots/agts_by_creator+++ b/autogpt_platform/backend/snapshots/agts_by_creator@@ -9,7 +9,8 @@"sub_heading": "Creator agent subheading","description": "Creator agent description","runs": 50,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"}],"pagination": {diff --git a/autogpt_platform/backend/snapshots/agts_category b/autogpt_platform/backend/snapshots/agts_categoryindex f65925ead3..4d0531763c 100644--- a/autogpt_platform/backend/snapshots/agts_category+++ b/autogpt_platform/backend/snapshots/agts_category@@ -9,7 +9,8 @@"sub_heading": "Category agent subheading","description": "Category agent description","runs": 60,- "rating": 4.1+ "rating": 4.1,+ "agent_graph_id": "test-graph-category"}],"pagination": {diff --git a/autogpt_platform/backend/snapshots/agts_pagination b/autogpt_platform/backend/snapshots/agts_paginationindex 82e7f5f9bf..7b946157fb 100644--- a/autogpt_platform/backend/snapshots/agts_pagination+++ b/autogpt_platform/backend/snapshots/agts_pagination@@ -9,7 +9,8 @@"sub_heading": "Agent 0 subheading","description": "Agent 0 description","runs": 0,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"},{"slug": "agent-1",@@ -20,7 +21,8 @@"sub_heading": "Agent 1 subheading","description": "Agent 1 description","runs": 10,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"},{"slug": "agent-2",@@ -31,7 +33,8 @@"sub_heading": "Agent 2 subheading","description": "Agent 2 description","runs": 20,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"},{"slug": "agent-3",@@ -42,7 +45,8 @@"sub_heading": "Agent 3 subheading","description": "Agent 3 description","runs": 30,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"},{"slug": "agent-4",@@ -53,7 +57,8 @@"sub_heading": "Agent 4 subheading","description": "Agent 4 description","runs": 40,- "rating": 4.0+ "rating": 4.0,+ "agent_graph_id": "test-graph-2"}],"pagination": {diff --git a/autogpt_platform/backend/snapshots/agts_search b/autogpt_platform/backend/snapshots/agts_searchindex ca3f504584..ae9cc116bc 100644--- a/autogpt_platform/backend/snapshots/agts_search+++ b/autogpt_platform/backend/snapshots/agts_search@@ -9,7 +9,8 @@"sub_heading": "Search agent subheading","description": "Specific search term description","runs": 75,- "rating": 4.2+ "rating": 4.2,+ "agent_graph_id": "test-graph-search"}],"pagination": {diff --git a/autogpt_platform/backend/snapshots/agts_sorted b/autogpt_platform/backend/snapshots/agts_sortedindex cddead76a5..b182256b2c 100644--- a/autogpt_platform/backend/snapshots/agts_sorted+++ b/autogpt_platform/backend/snapshots/agts_sorted@@ -9,7 +9,8 @@"sub_heading": "Top agent subheading","description": "Top agent description","runs": 1000,- "rating": 5.0+ "rating": 5.0,+ "agent_graph_id": "test-graph-3"}],"pagination": {diff --git a/autogpt_platform/backend/snapshots/feat_agts b/autogpt_platform/backend/snapshots/feat_agtsindex d57996a768..4f85786434 100644--- a/autogpt_platform/backend/snapshots/feat_agts+++ b/autogpt_platform/backend/snapshots/feat_agts@@ -9,7 +9,8 @@"sub_heading": "Featured agent subheading","description": "Featured agent description","runs": 100,- "rating": 4.5+ "rating": 4.5,+ "agent_graph_id": "test-graph-1"}],"pagination": {diff --git a/autogpt_platform/backend/test/agent_generator/test_library_agents.py b/autogpt_platform/backend/test/agent_generator/test_library_agents.pyindex e62b0746e7..8387339582 100644--- a/autogpt_platform/backend/test/agent_generator/test_library_agents.py+++ b/autogpt_platform/backend/test/agent_generator/test_library_agents.py@@ -134,15 +134,28 @@ class TestSearchMarketplaceAgentsForGeneration:description="A public agent",sub_heading="Does something useful",creator="creator-1",+ agent_graph_id="graph-123",)]- # The store_db is dynamically imported, so patch the import path- with patch(- "backend.api.features.store.db.get_store_agents",- new_callable=AsyncMock,- return_value=mock_response,- ) as mock_search:+ mock_graph = MagicMock()+ mock_graph.id = "graph-123"+ mock_graph.version = 1+ mock_graph.input_schema = {"type": "object"}+ mock_graph.output_schema = {"type": "object"}++ with (+ patch(+ "backend.api.features.store.db.get_store_agents",+ new_callable=AsyncMock,+ return_value=mock_response,+ ) as mock_search,+ patch(+ "backend.api.features.chat.tools.agent_generator.core.get_store_listed_graphs",+ new_callable=AsyncMock,+ return_value={"graph-123": mock_graph},+ ),+ ):result = await core.search_marketplace_agents_for_generation(search_query="automation",max_results=10,@@ -156,7 +169,7 @@ class TestSearchMarketplaceAgentsForGeneration:assert len(result) == 1assert result[0]["name"] == "Public Agent"- assert result[0]["is_marketplace_agent"] is True+ assert result[0]["graph_id"] == "graph-123"@pytest.mark.asyncioasync def test_handles_marketplace_error_gracefully(self):@@ -193,11 +206,12 @@ class TestGetAllRelevantAgentsForGeneration:marketplace_agents = [{+ "graph_id": "market-456",+ "graph_version": 1,"name": "Market Agent","description": "From marketplace",- "sub_heading": "Sub heading",- "creator": "creator-1",- "is_marketplace_agent": True,+ "input_schema": {},+ "output_schema": {},}]@@ -225,11 +239,11 @@ class TestGetAllRelevantAgentsForGeneration:assert result[1]["name"] == "Market Agent"@pytest.mark.asyncio- async def test_deduplicates_by_name(self):- """Test that marketplace agents with same name as library are excluded."""+ async def test_deduplicates_by_graph_id(self):+ """Test that marketplace agents with same graph_id as library are excluded."""library_agents = [{- "graph_id": "lib-123",+ "graph_id": "shared-123","graph_version": 1,"name": "Shared Agent","description": "From library",@@ -240,18 +254,20 @@ class TestGetAllRelevantAgentsForGeneration:marketplace_agents = [{- "name": "Shared Agent", # Same name, should be deduplicated+ "graph_id": "shared-123", # Same graph_id, should be deduplicated+ "graph_version": 1,+ "name": "Shared Agent","description": "From marketplace",- "sub_heading": "Sub heading",- "creator": "creator-1",- "is_marketplace_agent": True,+ "input_schema": {},+ "output_schema": {},},{+ "graph_id": "unique-456",+ "graph_version": 1,"name": "Unique Agent","description": "Only in marketplace",- "sub_heading": "Sub heading",- "creator": "creator-2",- "is_marketplace_agent": True,+ "input_schema": {},+ "output_schema": {},},]@@ -273,7 +289,7 @@ class TestGetAllRelevantAgentsForGeneration:include_marketplace=True,)- # Shared Agent from marketplace should be excluded+ # Shared Agent from marketplace should be excluded by graph_idassert len(result) == 2names = [a["name"] for a in result]assert "Shared Agent" in namesdiff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.jsonindex a44ceb8388..aa4c49b1a2 100644--- a/autogpt_platform/frontend/src/app/api/openapi.json+++ b/autogpt_platform/frontend/src/app/api/openapi.json@@ -9833,7 +9833,8 @@"sub_heading": { "type": "string", "title": "Sub Heading" },"description": { "type": "string", "title": "Description" },"runs": { "type": "integer", "title": "Runs" },- "rating": { "type": "number", "title": "Rating" }+ "rating": { "type": "number", "title": "Rating" },+ "agent_graph_id": { "type": "string", "title": "Agent Graph Id" }},"type": "object","required": [@@ -9845,7 +9846,8 @@"sub_heading","description","runs",- "rating"+ "rating",+ "agent_graph_id"],"title": "StoreAgent"},