Skip to content

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.

feat(platform): Update new builder search (#11806)

Krzysztof Czerwinskic7cdb40c5bd8
diff --git a/autogpt_platform/backend/backend/api/features/builder/db.py b/autogpt_platform/backend/backend/api/features/builder/db.py
index e8d35b0bb5..d573b2e1b2 100644
--- a/autogpt_platform/backend/backend/api/features/builder/db.py
+++ b/autogpt_platform/backend/backend/api/features/builder/db.py
@@ -1,15 +1,17 @@
import logging
from dataclasses import dataclass
-from datetime import datetime, timedelta, timezone
from difflib import SequenceMatcher
-from typing import Sequence
+from typing import Any, Sequence, get_args, get_origin
import prisma
+from prisma.enums import ContentType
+from prisma.models import mv_suggested_blocks
import backend.api.features.library.db as library_db
import backend.api.features.library.model as library_model
import backend.api.features.store.db as store_db
import backend.api.features.store.model as store_model
+from backend.api.features.store.hybrid_search import unified_hybrid_search
from backend.blocks import load_all_blocks
from backend.blocks._base import (
AnyBlockSchema,
@@ -19,7 +21,6 @@ from backend.blocks._base import (
BlockType,
)
from backend.blocks.llm import LlmModel
-from backend.data.db import query_raw_with_schema
from backend.integrations.providers import ProviderName
from backend.util.cache import cached
from backend.util.models import Pagination
@@ -42,6 +43,16 @@ MAX_LIBRARY_AGENT_RESULTS = 100
MAX_MARKETPLACE_AGENT_RESULTS = 100
MIN_SCORE_FOR_FILTERED_RESULTS = 10.0
+# Boost blocks over marketplace agents in search results
+BLOCK_SCORE_BOOST = 50.0
+
+# Block IDs to exclude from search results
+EXCLUDED_BLOCK_IDS = frozenset(
+ {
+ "e189baac-8c20-45a1-94a7-55177ea42565", # AgentExecutorBlock
+ }
+)
+
SearchResultItem = BlockInfo | library_model.LibraryAgent | store_model.StoreAgent
@@ -64,8 +75,8 @@ def get_block_categories(category_blocks: int = 3) -> list[BlockCategoryResponse
for block_type in load_all_blocks().values():
block: AnyBlockSchema = block_type()
- # Skip disabled blocks
- if block.disabled:
+ # Skip disabled and excluded blocks
+ if block.disabled or block.id in EXCLUDED_BLOCK_IDS:
continue
# Skip blocks that don't have categories (all should have at least one)
if not block.categories:
@@ -116,6 +127,9 @@ def get_blocks(
# Skip disabled blocks
if block.disabled:
continue
+ # Skip excluded blocks
+ if block.id in EXCLUDED_BLOCK_IDS:
+ continue
# Skip blocks that don't match the category
if category and category not in {c.name.lower() for c in block.categories}:
continue
@@ -255,14 +269,25 @@ async def _build_cached_search_results(
"my_agents": 0,
}
- block_results, block_total, integration_total = _collect_block_results(
- normalized_query=normalized_query,
- include_blocks=include_blocks,
- include_integrations=include_integrations,
- )
- scored_items.extend(block_results)
- total_items["blocks"] = block_total
- total_items["integrations"] = integration_total
+ # Use hybrid search when query is present, otherwise list all blocks
+ if (include_blocks or include_integrations) and normalized_query:
+ block_results, block_total, integration_total = await _hybrid_search_blocks(
+ query=search_query,
+ include_blocks=include_blocks,
+ include_integrations=include_integrations,
+ )
+ scored_items.extend(block_results)
+ total_items["blocks"] = block_total
+ total_items["integrations"] = integration_total
+ elif include_blocks or include_integrations:
+ # No query - list all blocks using in-memory approach
+ block_results, block_total, integration_total = _collect_block_results(
+ include_blocks=include_blocks,
+ include_integrations=include_integrations,
+ )
+ scored_items.extend(block_results)
+ total_items["blocks"] = block_total
+ total_items["integrations"] = integration_total
if include_library_agents:
library_response = await library_db.list_library_agents(
@@ -307,10 +332,14 @@ async def _build_cached_search_results(
def _collect_block_results(
*,
- normalized_query: str,
include_blocks: bool,
include_integrations: bool,
) -> tuple[list[_ScoredItem], int, int]:
+ """
+ Collect all blocks for listing (no search query).
+
+ All blocks get BLOCK_SCORE_BOOST to prioritize them over marketplace agents.
+ """
results: list[_ScoredItem] = []
block_count = 0
integration_count = 0
@@ -323,6 +352,10 @@ def _collect_block_results(
if block.disabled:
continue
+ # Skip excluded blocks
+ if block.id in EXCLUDED_BLOCK_IDS:
+ continue
+
block_info = block.get_info()
credentials = list(block.input_schema.get_credentials_fields().values())
is_integration = len(credentials) > 0
@@ -332,10 +365,120 @@ def _collect_block_results(
if not is_integration and not include_blocks:
continue
- score = _score_block(block, block_info, normalized_query)
- if not _should_include_item(score, normalized_query):
+ filter_type: FilterType = "integrations" if is_integration else "blocks"
+ if is_integration:
+ integration_count += 1
+ else:
+ block_count += 1
+
+ results.append(
+ _ScoredItem(
+ item=block_info,
+ filter_type=filter_type,
+ score=BLOCK_SCORE_BOOST,
+ sort_key=block_info.name.lower(),
+ )
+ )
+
+ return results, block_count, integration_count
+
+
+async def _hybrid_search_blocks(
+ *,
+ query: str,
+ include_blocks: bool,
+ include_integrations: bool,
+) -> tuple[list[_ScoredItem], int, int]:
+ """
+ Search blocks using hybrid search with builder-specific filtering.
+
+ Uses unified_hybrid_search for semantic + lexical search, then applies
+ post-filtering for block/integration types and scoring adjustments.
+
+ Scoring:
+ - Base: hybrid relevance score (0-1) scaled to 0-100, plus BLOCK_SCORE_BOOST
+ to prioritize blocks over marketplace agents in combined results
+ - +30 for exact name match, +15 for prefix name match
+ - +20 if the block has an LlmModel field and the query matches an LLM model name
+
+ Args:
+ query: The search query string
+ include_blocks: Whether to include regular blocks
+ include_integrations: Whether to include integration blocks
+
+ Returns:
+ Tuple of (scored_items, block_count, integration_count)
+ """
+ results: list[_ScoredItem] = []
+ block_count = 0
+ integration_count = 0
+
+ if not include_blocks and not include_integrations:
+ return results, block_count, integration_count
+
+ normalized_query = query.strip().lower()
+
+ # Fetch more results to account for post-filtering
+ search_results, _ = await unified_hybrid_search(
+ query=query,
+ content_types=[ContentType.BLOCK],
+ page=1,
+ page_size=150,
+ min_score=0.10,
+ )
+
+ # Load all blocks for getting BlockInfo
+ all_blocks = load_all_blocks()
+
+ for result in search_results:
+ block_id = result["content_id"]
+
+ # Skip excluded blocks
+ if block_id in EXCLUDED_BLOCK_IDS:
+ continue
+
+ metadata = result.get("metadata", {})
+ hybrid_score = result.get("relevance", 0.0)
+
+ # Get the actual block class
+ if block_id not in all_blocks:
+ continue
+
+ block_cls = all_blocks[block_id]
+ block: AnyBlockSchema = block_cls()
+
+ if block.disabled:
continue
+ # Check block/integration filter using metadata
+ is_integration = metadata.get("is_integration", False)
+
+ if is_integration and not include_integrations:
+ continue
+ if not is_integration and not include_blocks:
+ continue
+
+ # Get block info
+ block_info = block.get_info()
+
+ # Calculate final score: scale hybrid score and add builder-specific bonuses
+ # Hybrid scores are 0-1, builder scores were 0-200+
+ # Add BLOCK_SCORE_BOOST to prioritize blocks over marketplace agents
+ final_score = hybrid_score * 100 + BLOCK_SCORE_BOOST
+
+ # Add LLM model match bonus
+ has_llm_field = metadata.get("has_llm_model_field", False)
+ if has_llm_field and _matches_llm_model(block.input_schema, normalized_query):
+ final_score += 20
+
+ # Add exact/prefix match bonus for deterministic tie-breaking
+ name = block_info.name.lower()
+ if name == normalized_query:
+ final_score += 30
+ elif name.startswith(normalized_query):
+ final_score += 15
+
+ # Track counts
filter_type: FilterType = "integrations" if is_integration else "blocks"
if is_integration:
integration_count += 1
@@ -346,8 +489,8 @@ def _collect_block_results(
_ScoredItem(
item=block_info,
filter_type=filter_type,
- score=score,
- sort_key=_get_item_name(block_info),
+ score=final_score,
+ sort_key=name,
)
)
@@ -472,6 +615,8 @@ async def _get_static_counts():
block: AnyBlockSchema = block_type()
if block.disabled:
continue
+ if block.id in EXCLUDED_BLOCK_IDS:
+ continue
all_blocks += 1
@@ -498,47 +643,25 @@ async def _get_static_counts():
}
+def _contains_type(annotation: Any, target: type) -> bool:
+ """Check if an annotation is or contains the target type (handles Optional/Union/Annotated)."""
+ if annotation is target:
+ return True
+ origin = get_origin(annotation)
+ if origin is None:
+ return False
+ return any(_contains_type(arg, target) for arg in get_args(annotation))
+
+
def _matches_llm_model(schema_cls: type[BlockSchema], query: str) -> bool:
for field in schema_cls.model_fields.values():
- if field.annotation == LlmModel:
+ if _contains_type(field.annotation, LlmModel):
# Check if query matches any value in llm_models
if any(query in name for name in llm_models):
return True
return False
-def _score_block(
- block: AnyBlockSchema,
- block_info: BlockInfo,
- normalized_query: str,
-) -> float:
- if not normalized_query:
- return 0.0
-
- name = block_info.name.lower()
- description = block_info.description.lower()
- score = _score_primary_fields(name, description, normalized_query)
-
- category_text = " ".join(
- category.get("category", "").lower() for category in block_info.categories
- )
- score += _score_additional_field(category_text, normalized_query, 12, 6)
-
- credentials_info = block.input_schema.get_credentials_fields_info().values()
- provider_names = [
- provider.value.lower()
- for info in credentials_info
- for provider in info.provider
- ]
- provider_text = " ".join(provider_names)
- score += _score_additional_field(provider_text, normalized_query, 15, 6)
-
- if _matches_llm_model(block.input_schema, normalized_query):
- score += 20
-
- return score
-
-
def _score_library_agent(
agent: library_model.LibraryAgent,
normalized_query: str,
@@ -645,31 +768,20 @@ def _get_all_providers() -> dict[ProviderName, Provider]:
return providers
-@cached(ttl_seconds=3600)
+@cached(ttl_seconds=3600, shared_cache=True)
async def get_suggested_blocks(count: int = 5) -> list[BlockInfo]:
- suggested_blocks = []
- # Sum the number of executions for each block type
- # Prisma cannot group by nested relations, so we do a raw query
- # Calculate the cutoff timestamp
- timestamp_threshold = datetime.now(timezone.utc) - timedelta(days=30)
-
- results = await query_raw_with_schema(
- """
- SELECT
- agent_node."agentBlockId" AS block_id,
- COUNT(execution.id) AS execution_count
- FROM {schema_prefix}"AgentNodeExecution" execution
- JOIN {schema_prefix}"AgentNode" agent_node ON execution."agentNodeId" = agent_node.id
- WHERE execution."endedTime" >= $1::timestamp
- GROUP BY agent_node."agentBlockId"
- ORDER BY execution_count DESC;
- """,
- timestamp_threshold,
- )
+ """Return the most-executed blocks from the last 14 days.
+
+ Queries the mv_suggested_blocks materialized view (refreshed hourly via pg_cron)
+ and returns the top `count` blocks sorted by execution count, excluding
+ Input/Output/Agent block types and blocks in EXCLUDED_BLOCK_IDS.
+ """
+ results = await mv_suggested_blocks.prisma().find_many()
# Get the top blocks based on execution count
- # But ignore Input and Output blocks
+ # But ignore Input, Output, Agent, and excluded blocks
blocks: list[tuple[BlockInfo, int]] = []
+ execution_counts = {row.block_id: row.execution_count for row in results}
for block_type in load_all_blocks().values():
block: AnyBlockSchema = block_type()
@@ -679,11 +791,9 @@ async def get_suggested_blocks(count: int = 5) -> list[BlockInfo]:
BlockType.AGENT,
):
continue
- # Find the execution count for this block
- execution_count = next(
- (row["execution_count"] for row in results if row["block_id"] == block.id),
- 0,
- )
+ if block.id in EXCLUDED_BLOCK_IDS:
+ continue
+ execution_count = execution_counts.get(block.id, 0)
blocks.append((block.get_info(), execution_count))
# Sort blocks by execution count
blocks.sort(key=lambda x: x[1], reverse=True)
diff --git a/autogpt_platform/backend/backend/api/features/builder/model.py b/autogpt_platform/backend/backend/api/features/builder/model.py
index 8aa8ed06ed..b3675bc222 100644
--- a/autogpt_platform/backend/backend/api/features/builder/model.py
+++ b/autogpt_platform/backend/backend/api/features/builder/model.py
@@ -27,7 +27,6 @@ class SearchEntry(BaseModel):
# Suggestions
class SuggestionsResponse(BaseModel):
- otto_suggestions: list[str]
recent_searches: list[SearchEntry]
providers: list[ProviderName]
top_blocks: list[BlockInfo]
diff --git a/autogpt_platform/backend/backend/api/features/builder/routes.py b/autogpt_platform/backend/backend/api/features/builder/routes.py
index 091f477178..0f7bd1663d 100644
--- a/autogpt_platform/backend/backend/api/features/builder/routes.py
+++ b/autogpt_platform/backend/backend/api/features/builder/routes.py
@@ -1,5 +1,5 @@
import logging
-from typing import Annotated, Sequence
+from typing import Annotated, Sequence, cast, get_args
import fastapi
from autogpt_libs.auth.dependencies import get_user_id, requires_user
@@ -10,6 +10,8 @@ from backend.util.models import Pagination
from . import db as builder_db
from . import model as builder_model
+VALID_FILTER_VALUES = get_args(builder_model.FilterType)
+
logger = logging.getLogger(__name__)
router = fastapi.APIRouter(
@@ -49,11 +51,6 @@ async def get_suggestions(
Get all suggestions for the Blocks Menu.
"""
return builder_model.SuggestionsResponse(
- otto_suggestions=[
- "What blocks do I need to get started?",
- "Help me create a list",
- "Help me feed my data to Google Maps",
- ],
recent_searches=await builder_db.get_recent_searches(user_id),
providers=[
ProviderName.TWITTER,
@@ -151,7 +148,7 @@ async def get_providers(
async def search(
user_id: Annotated[str, fastapi.Security(get_user_id)],
search_query: Annotated[str | None, fastapi.Query()] = None,
- filter: Annotated[list[builder_model.FilterType] | None, fastapi.Query()] = None,
+ filter: Annotated[str | None, fastapi.Query()] = None,
search_id: Annotated[str | None, fastapi.Query()] = None,
by_creator: Annotated[list[str] | None, fastapi.Query()] = None,
page: Annotated[int, fastapi.Query()] = 1,
@@ -160,9 +157,20 @@ async def search(
"""
Search for blocks (including integrations), marketplace agents, and user library agents.
"""
- # If no filters are provided, then we will return all types
- if not filter:
- filter = [
+ # Parse and validate filter parameter
+ filters: list[builder_model.FilterType]
+ if filter:
+ filter_values = [f.strip() for f in filter.split(",")]
+ invalid_filters = [f for f in filter_values if f not in VALID_FILTER_VALUES]
+ if invalid_filters:
+ raise fastapi.HTTPException(
+ status_code=400,
+ detail=f"Invalid filter value(s): {', '.join(invalid_filters)}. "
+ f"Valid values are: {', '.join(VALID_FILTER_VALUES)}",
+ )
+ filters = cast(list[builder_model.FilterType], filter_values)
+ else:
+ filters = [
"blocks",
"integrations",
"marketplace_agents",
@@ -174,7 +182,7 @@ async def search(
cached_results = await builder_db.get_sorted_search_results(
user_id=user_id,
search_query=search_query,
- filters=filter,
+ filters=filters,
by_creator=by_creator,
)
@@ -196,7 +204,7 @@ async def search(
user_id,
builder_model.SearchEntry(
search_query=search_query,
- filter=filter,
+ filter=filters,
by_creator=by_creator,
search_id=search_id,
),
diff --git a/autogpt_platform/backend/backend/api/features/store/content_handlers.py b/autogpt_platform/backend/backend/api/features/store/content_handlers.py
index 38fc1e27d0..d7a7e34044 100644
--- a/autogpt_platform/backend/backend/api/features/store/content_handlers.py
+++ b/autogpt_platform/backend/backend/api/features/store/content_handlers.py
@@ -9,15 +9,26 @@ import logging
from abc import ABC, abstractmethod
from dataclasses import dataclass
from pathlib import Path
-from typing import Any
+from typing import Any, get_args, get_origin
from prisma.enums import ContentType
+from backend.blocks.llm import LlmModel
from backend.data.db import query_raw_with_schema
logger = logging.getLogger(__name__)
+def _contains_type(annotation: Any, target: type) -> bool:
+ """Check if an annotation is or contains the target type (handles Optional/Union/Annotated)."""
+ if annotation is target:
+ return True
+ origin = get_origin(annotation)
+ if origin is None:
+ return False
+ return any(_contains_type(arg, target) for arg in get_args(annotation))
+
+
@dataclass
class ContentItem:
"""Represents a piece of content to be embedded."""
@@ -188,45 +199,51 @@ class BlockHandler(ContentHandler):
try:
block_instance = block_cls()
- # Skip disabled blocks - they shouldn't be indexed
if block_instance.disabled:
continue
# Build searchable text from block metadata
parts = []
- if hasattr(block_instance, "name") and block_instance.name:
+ if block_instance.name:
parts.append(block_instance.name)
- if (
- hasattr(block_instance, "description")
- and block_instance.description
- ):
+ if block_instance.description:
parts.append(block_instance.description)
- if hasattr(block_instance, "categories") and block_instance.categories:
- # Convert BlockCategory enum to strings
+ if block_instance.categories:
parts.append(
" ".join(str(cat.value) for cat in block_instance.categories)
)
- # Add input/output schema info
- if hasattr(block_instance, "input_schema"):
- schema = block_instance.input_schema
- if hasattr(schema, "model_json_schema"):
- schema_dict = schema.model_json_schema()
- if "properties" in schema_dict:
- for prop_name, prop_info in schema_dict[
- "properties"
- ].items():
- if "description" in prop_info:
- parts.append(
- f"{prop_name}: {prop_info['description']}"
- )
+ # Add input schema field descriptions
+ block_input_fields = block_instance.input_schema.model_fields
+ parts += [
+ f"{field_name}: {field_info.description}"
+ for field_name, field_info in block_input_fields.items()
+ if field_info.description
+ ]
searchable_text = " ".join(parts)
- # Convert categories set of enums to list of strings for JSON serialization
- categories = getattr(block_instance, "categories", set())
categories_list = (
- [cat.value for cat in categories] if categories else []
+ [cat.value for cat in block_instance.categories]
+ if block_instance.categories
+ else []
+ )
+
+ # Extract provider names from credentials fields
+ credentials_info = (
+ block_instance.input_schema.get_credentials_fields_info()
+ )
+ is_integration = len(credentials_info) > 0
+ provider_names = [
+ provider.value.lower()
+ for info in credentials_info.values()
+ for provider in info.provider
+ ]
+
+ # Check if block has LlmModel field in input schema
+ has_llm_model_field = any(
+ _contains_type(field.annotation, LlmModel)
+ for field in block_instance.input_schema.model_fields.values()
)
items.append(
@@ -235,8 +252,11 @@ class BlockHandler(ContentHandler):
content_type=ContentType.BLOCK,
searchable_text=searchable_text,
metadata={
- "name": getattr(block_instance, "name", ""),
+ "name": block_instance.name,
"categories": categories_list,
+ "providers": provider_names,
+ "has_llm_model_field": has_llm_model_field,
+ "is_integration": is_integration,
},
user_id=None, # Blocks are public
)
diff --git a/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py b/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py
index c552e44a9d..91cea0aa1f 100644
--- a/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py
+++ b/autogpt_platform/backend/backend/api/features/store/content_handlers_test.py
@@ -82,9 +82,10 @@ async def test_block_handler_get_missing_items(mocker):
mock_block_instance.description = "Performs calculations"
mock_block_instance.categories = [MagicMock(value="MATH")]
mock_block_instance.disabled = False
- mock_block_instance.input_schema.model_json_schema.return_value = {
- "properties": {"expression": {"description": "Math expression to evaluate"}}
- }
+ mock_field = MagicMock()
+ mock_field.description = "Math expression to evaluate"
+ mock_block_instance.input_schema.model_fields = {"expression": mock_field}
+ mock_block_instance.input_schema.get_credentials_fields_info.return_value = {}
mock_block_class.return_value = mock_block_instance
mock_blocks = {"block-uuid-1": mock_block_class}
@@ -309,19 +310,19 @@ async def test_content_handlers_registry():
@pytest.mark.asyncio(loop_scope="session")
-async def test_block_handler_handles_missing_attributes():
- """Test BlockHandler gracefully handles blocks with missing attributes."""
+async def test_block_handler_handles_empty_attributes():
+ """Test BlockHandler handles blocks with empty/falsy attribute values."""
handler = BlockHandler()
- # Mock block with minimal attributes
+ # Mock block with empty values (all attributes exist but are falsy)
mock_block_class = MagicMock()
mock_block_instance = MagicMock()
mock_block_instance.name = "Minimal Block"
mock_block_instance.disabled = False
- # No description, categories, or schema
- del mock_block_instance.description
- del mock_block_instance.categories
- del mock_block_instance.input_schema
+ mock_block_instance.description = ""
+ mock_block_instance.categories = set()
+ mock_block_instance.input_schema.model_fields = {}
+ mock_block_instance.input_schema.get_credentials_fields_info.return_value = {}
mock_block_class.return_value = mock_block_instance
mock_blocks = {"block-minimal": mock_block_class}
@@ -352,6 +353,8 @@ async def test_block_handler_skips_failed_blocks():
good_instance.description = "Works fine"
good_instance.categories = []
good_instance.disabled = False
+ good_instance.input_schema.model_fields = {}
+ good_instance.input_schema.get_credentials_fields_info.return_value = {}
good_block.return_value = good_instance
bad_block = MagicMock()
diff --git a/autogpt_platform/backend/migrations/20260129090000_add_suggested_blocks_materialized_view/migration.sql b/autogpt_platform/backend/migrations/20260129090000_add_suggested_blocks_materialized_view/migration.sql
new file mode 100644
index 0000000000..4e8df78ce1
--- /dev/null
+++ b/autogpt_platform/backend/migrations/20260129090000_add_suggested_blocks_materialized_view/migration.sql
@@ -0,0 +1,97 @@
+-- This migration creates a materialized view for suggested blocks based on execution counts
+-- The view aggregates execution counts per block for the last 14 days
+--
+-- IMPORTANT: For production environments, pg_cron is REQUIRED for automatic refresh
+-- Prerequisites for production:
+-- 1. pg_cron extension must be installed: CREATE EXTENSION pg_cron;
+-- 2. pg_cron must be configured in postgresql.conf:
+-- shared_preload_libraries = 'pg_cron'
+-- cron.database_name = 'your_database_name'
+--
+-- For development environments without pg_cron:
+-- The migration will succeed but you must manually refresh views with:
+-- SET search_path TO platform;
+-- SELECT refresh_suggested_blocks_view();
+
+-- Check if pg_cron extension is installed
+DO $$
+DECLARE
+ has_pg_cron BOOLEAN;
+BEGIN
+ SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'pg_cron') INTO has_pg_cron;
+
+ IF NOT has_pg_cron THEN
+ RAISE WARNING 'pg_cron is not installed. Materialized view will be created but will NOT refresh automatically. For production, install pg_cron. For development, manually refresh with: SELECT refresh_suggested_blocks_view();';
+ END IF;
+END
+$$;
+
+-- Create materialized view for suggested blocks based on execution counts in last 14 days
+-- The 14-day threshold is hardcoded to ensure consistent behavior
+CREATE MATERIALIZED VIEW IF NOT EXISTS "mv_suggested_blocks" AS
+SELECT
+ agent_node."agentBlockId" AS block_id,
+ COUNT(execution.id) AS execution_count
+FROM "AgentNodeExecution" execution
+JOIN "AgentNode" agent_node ON execution."agentNodeId" = agent_node.id
+WHERE execution."endedTime" >= (NOW() - INTERVAL '14 days')
+GROUP BY agent_node."agentBlockId"
+ORDER BY execution_count DESC;
+
+-- Create unique index for concurrent refresh support
+CREATE UNIQUE INDEX IF NOT EXISTS "idx_mv_suggested_blocks_block_id" ON "mv_suggested_blocks"("block_id");
+
+-- Create refresh function
+CREATE OR REPLACE FUNCTION refresh_suggested_blocks_view()
+RETURNS void
+LANGUAGE plpgsql
+AS $$
+DECLARE
+ target_schema text := current_schema();
+BEGIN
+ -- Use CONCURRENTLY for better performance during refresh
+ REFRESH MATERIALIZED VIEW CONCURRENTLY "mv_suggested_blocks";
+ RAISE NOTICE 'Suggested blocks materialized view refreshed in schema % at %', target_schema, NOW();
+EXCEPTION
+ WHEN OTHERS THEN
+ -- Fallback to non-concurrent refresh if concurrent fails
+ REFRESH MATERIALIZED VIEW "mv_suggested_blocks";
+ RAISE NOTICE 'Suggested blocks materialized view refreshed (non-concurrent) in schema % at %. Concurrent refresh failed due to: %', target_schema, NOW(), SQLERRM;
+END;
+$$;
+
+-- Initial refresh of the materialized view
+SELECT refresh_suggested_blocks_view();
+
+-- Schedule automatic refresh every hour (only if pg_cron is available)
+DO $$
+DECLARE
+ has_pg_cron BOOLEAN;
+ current_schema_name text := current_schema();
+ job_name text;
+BEGIN
+ -- Check if pg_cron extension exists
+ SELECT EXISTS (SELECT 1 FROM pg_extension WHERE extname = 'pg_cron') INTO has_pg_cron;
+
+ IF has_pg_cron THEN
+ job_name := format('refresh-suggested-blocks_%s', current_schema_name);
+
+ -- Try to unschedule existing job (ignore errors if it doesn't exist)
+ BEGIN
+ PERFORM cron.unschedule(job_name);
+ EXCEPTION WHEN OTHERS THEN
+ NULL;
+ END;
+
+ -- Schedule the new job to run every hour
+ PERFORM cron.schedule(
+ job_name,
+ '0 * * * *', -- Every hour at minute 0
+ format('SET search_path TO %I; SELECT refresh_suggested_blocks_view();', current_schema_name)
+ );
+ RAISE NOTICE 'Scheduled job %; runs every hour for schema %', job_name, current_schema_name;
+ ELSE
+ RAISE WARNING 'Automatic refresh NOT configured - pg_cron is not available. Manually refresh with: SELECT refresh_suggested_blocks_view();';
+ END IF;
+END;
+$$;
diff --git a/autogpt_platform/backend/schema.prisma b/autogpt_platform/backend/schema.prisma
index 5212ec0a3d..e22f22656e 100644
--- a/autogpt_platform/backend/schema.prisma
+++ b/autogpt_platform/backend/schema.prisma
@@ -948,6 +948,17 @@ view mv_review_stats {
// Refresh uses CONCURRENTLY to avoid blocking reads
}
+// Note: This is actually a MATERIALIZED VIEW in the database
+// Refreshed automatically every hour via pg_cron (with fallback to manual refresh)
+view mv_suggested_blocks {
+ block_id String @unique
+ execution_count Int
+
+ // Pre-aggregated execution counts per block for the last 14 days
+ // Used by builder suggestions for ordering blocks by popularity
+ // Refresh uses CONCURRENTLY to avoid blocking reads
+}
+
model StoreListing {
id String @id @default(uuid())
createdAt DateTime @default(now())
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
index 07c6795808..869af96aa9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/Block.tsx
@@ -127,7 +127,10 @@ export const Block: BlockComponent = ({
// preview when user drags it
const dragPreview = document.createElement("div");
dragPreview.style.cssText = blockDragPreviewStyle;
- dragPreview.textContent = beautifyString(title || "");
+ dragPreview.textContent = beautifyString(title || "").replace(
+ / Block$/,
+ "",
+ );
document.body.appendChild(dragPreview);
e.dataTransfer.setDragImage(dragPreview, 0, 0);
@@ -162,7 +165,10 @@ export const Block: BlockComponent = ({
"line-clamp-1 font-sans text-sm font-medium leading-[1.375rem] text-zinc-800 group-disabled:text-zinc-400",
)}
>
- {highlightText(beautifyString(title), highlightedText)}
+ {highlightText(
+ beautifyString(title).replace(/ Block$/, ""),
+ highlightedText,
+ )}
</span>
)}
{description && (
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx
index ebcea9eee6..7976832bb1 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/BlockMenuFilters.tsx
@@ -2,7 +2,7 @@ import { useBlockMenuStore } from "@/app/(platform)/build/stores/blockMenuStore"
import { FilterChip } from "../FilterChip";
import { categories } from "./constants";
import { FilterSheet } from "../FilterSheet/FilterSheet";
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { CategoryKey } from "./types";
export const BlockMenuFilters = () => {
const {
@@ -15,7 +15,7 @@ export const BlockMenuFilters = () => {
removeCreator,
} = useBlockMenuStore();
- const handleFilterClick = (filter: GetV2BuilderSearchFilterAnyOfItem) => {
+ const handleFilterClick = (filter: CategoryKey) => {
if (filters.includes(filter)) {
removeFilter(filter);
} else {
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts
index b438aae91b..cac836e33a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/constants.ts
@@ -1,15 +1,15 @@
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { SearchEntryFilterAnyOfItem } from "@/app/api/__generated__/models/searchEntryFilterAnyOfItem";
import { CategoryKey } from "./types";
export const categories: Array<{ key: CategoryKey; name: string }> = [
- { key: GetV2BuilderSearchFilterAnyOfItem.blocks, name: "Blocks" },
+ { key: SearchEntryFilterAnyOfItem.blocks, name: "Blocks" },
{
- key: GetV2BuilderSearchFilterAnyOfItem.integrations,
+ key: SearchEntryFilterAnyOfItem.integrations,
name: "Integrations",
},
{
- key: GetV2BuilderSearchFilterAnyOfItem.marketplace_agents,
+ key: SearchEntryFilterAnyOfItem.marketplace_agents,
name: "Marketplace agents",
},
- { key: GetV2BuilderSearchFilterAnyOfItem.my_agents, name: "My agents" },
+ { key: SearchEntryFilterAnyOfItem.my_agents, name: "My agents" },
];
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts
index 8fec9ef64d..43aacee787 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types.ts
@@ -1,4 +1,4 @@
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { SearchEntryFilterAnyOfItem } from "@/app/api/__generated__/models/searchEntryFilterAnyOfItem";
export type DefaultStateType =
| "suggestion"
@@ -10,7 +10,7 @@ export type DefaultStateType =
| "marketplace_agents"
| "my_agents";
-export type CategoryKey = GetV2BuilderSearchFilterAnyOfItem;
+export type CategoryKey = SearchEntryFilterAnyOfItem;
export interface Filters {
categories: {
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
index 9da9cb4cbc..a8ebdb754a 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/useBlockMenuSearchContent.tsx
@@ -23,7 +23,7 @@ import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";
import { getQueryClient } from "@/lib/react-query/queryClient";
import { useToast } from "@/components/molecules/Toast/use-toast";
import * as Sentry from "@sentry/nextjs";
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { CategoryCounts } from "../BlockMenuFilters/types";
export const useBlockMenuSearchContent = () => {
const {
@@ -67,7 +67,7 @@ export const useBlockMenuSearchContent = () => {
page_size: 8,
search_query: searchQuery,
search_id: searchId,
- filter: filters.length > 0 ? filters : undefined,
+ filter: filters.length > 0 ? filters.join(",") : undefined,
by_creator: creators.length > 0 ? creators : undefined,
},
{
@@ -117,10 +117,7 @@ export const useBlockMenuSearchContent = () => {
}
const latestData = okData(searchQueryData.pages.at(-1));
setCategoryCounts(
- (latestData?.total_items as Record<
- GetV2BuilderSearchFilterAnyOfItem,
- number
- >) || {
+ (latestData?.total_items as CategoryCounts) || {
blocks: 0,
integrations: 0,
marketplace_agents: 0,
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts
index 200671f4e7..63e19ade7c 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/FilterSheet/useFilterSheet.ts
@@ -1,7 +1,7 @@
import { useBlockMenuStore } from "@/app/(platform)/build/stores/blockMenuStore";
import { useState } from "react";
import { INITIAL_CREATORS_TO_SHOW } from "./constant";
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import { CategoryKey } from "../BlockMenuFilters/types";
export const useFilterSheet = () => {
const { filters, creators_list, creators, setFilters, setCreators } =
@@ -9,15 +9,13 @@ export const useFilterSheet = () => {
const [isOpen, setIsOpen] = useState(false);
const [localCategories, setLocalCategories] =
- useState<GetV2BuilderSearchFilterAnyOfItem[]>(filters);
+ useState<CategoryKey[]>(filters);
const [localCreators, setLocalCreators] = useState<string[]>(creators);
const [displayedCreatorsCount, setDisplayedCreatorsCount] = useState(
INITIAL_CREATORS_TO_SHOW,
);
- const handleLocalCategoryChange = (
- category: GetV2BuilderSearchFilterAnyOfItem,
- ) => {
+ const handleLocalCategoryChange = (category: CategoryKey) => {
setLocalCategories((prev) => {
if (prev.includes(category)) {
return prev.filter((c) => c !== category);
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/IntergrationBlock.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/IntergrationBlock.tsx
index 966bded009..79020ba0d9 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/IntergrationBlock.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/IntergrationBlock.tsx
@@ -61,7 +61,10 @@ export const IntegrationBlock: IntegrationBlockComponent = ({
// preview when user drags it
const dragPreview = document.createElement("div");
dragPreview.style.cssText = blockDragPreviewStyle;
- dragPreview.textContent = beautifyString(title || "");
+ dragPreview.textContent = beautifyString(title || "").replace(
+ / Block$/,
+ "",
+ );
document.body.appendChild(dragPreview);
e.dataTransfer.setDragImage(dragPreview, 0, 0);
@@ -100,7 +103,10 @@ export const IntegrationBlock: IntegrationBlockComponent = ({
"line-clamp-1 font-sans text-sm font-medium leading-[1.375rem] text-zinc-800 group-disabled:text-zinc-400",
)}
>
- {highlightText(beautifyString(title), highlightedText)}
+ {highlightText(
+ beautifyString(title).replace(/ Block$/, ""),
+ highlightedText,
+ )}
</span>
)}
{description && (
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/UGCAgentBlock.tsx b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/UGCAgentBlock.tsx
index c950411c93..320841980d 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/UGCAgentBlock.tsx
+++ b/autogpt_platform/frontend/src/app/(platform)/build/components/NewControlPanel/NewBlockMenu/UGCAgentBlock.tsx
@@ -81,6 +81,14 @@ export const UGCAgentBlock: UGCAgentBlockComponent = ({
>
Version {version}
</span>
+
+ <span
+ className={cn(
+ "rounded-[0.75rem] bg-zinc-200 px-[0.5rem] font-sans text-xs leading-[1.25rem] text-zinc-500",
+ )}
+ >
+ Your Agent
+ </span>
</div>
</div>
<div
diff --git a/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts b/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
index 31b9eda338..d48c3d2047 100644
--- a/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
+++ b/autogpt_platform/frontend/src/app/(platform)/build/stores/blockMenuStore.ts
@@ -3,28 +3,29 @@ import { DefaultStateType } from "../components/NewControlPanel/NewBlockMenu/typ
import { SearchResponseItemsItem } from "@/app/api/__generated__/models/searchResponseItemsItem";
import { getSearchItemType } from "../components/NewControlPanel/NewBlockMenu/BlockMenuSearchContent/helper";
import { StoreAgent } from "@/app/api/__generated__/models/storeAgent";
-import { GetV2BuilderSearchFilterAnyOfItem } from "@/app/api/__generated__/models/getV2BuilderSearchFilterAnyOfItem";
+import {
+ CategoryKey,
+ CategoryCounts,
+} from "../components/NewControlPanel/NewBlockMenu/BlockMenuFilters/types";
type BlockMenuStore = {
searchQuery: string;
searchId: string | undefined;
defaultState: DefaultStateType;
integration: string | undefined;
- filters: GetV2BuilderSearchFilterAnyOfItem[];
+ filters: CategoryKey[];
creators: string[];
creators_list: string[];
- categoryCounts: Record<GetV2BuilderSearchFilterAnyOfItem, number>;
+ categoryCounts: CategoryCounts;
- setCategoryCounts: (
- counts: Record<GetV2BuilderSearchFilterAnyOfItem, number>,
- ) => void;
+ setCategoryCounts: (counts: CategoryCounts) => void;
setCreatorsList: (searchData: SearchResponseItemsItem[]) => void;
addCreator: (creator: string) => void;
setCreators: (creators: string[]) => void;
removeCreator: (creator: string) => void;
- addFilter: (filter: GetV2BuilderSearchFilterAnyOfItem) => void;
- setFilters: (filters: GetV2BuilderSearchFilterAnyOfItem[]) => void;
- removeFilter: (filter: GetV2BuilderSearchFilterAnyOfItem) => void;
+ addFilter: (filter: CategoryKey) => void;
+ setFilters: (filters: CategoryKey[]) => void;
+ removeFilter: (filter: CategoryKey) => void;
setSearchQuery: (query: string) => void;
setSearchId: (id: string | undefined) => void;
setDefaultState: (state: DefaultStateType) => void;
diff --git a/autogpt_platform/frontend/src/app/api/openapi.json b/autogpt_platform/frontend/src/app/api/openapi.json
index dc1e24c13a..c4ac9fc399 100644
--- a/autogpt_platform/frontend/src/app/api/openapi.json
+++ b/autogpt_platform/frontend/src/app/api/openapi.json
@@ -820,21 +820,7 @@
"in": "query",
"required": false,
"schema": {
- "anyOf": [
- {
- "type": "array",
- "items": {
- "enum": [
- "blocks",
- "integrations",
- "marketplace_agents",
- "my_agents"
- ],
- "type": "string"
- }
- },
- { "type": "null" }
- ],
+ "anyOf": [{ "type": "string" }, { "type": "null" }],
"title": "Filter"
}
},
@@ -12106,11 +12092,6 @@
},
"SuggestionsResponse": {
"properties": {
- "otto_suggestions": {
- "items": { "type": "string" },
- "type": "array",
- "title": "Otto Suggestions"
- },
"recent_searches": {
"items": { "$ref": "#/components/schemas/SearchEntry" },
"type": "array",
@@ -12131,12 +12112,7 @@
}
},
"type": "object",
- "required": [
- "otto_suggestions",
- "recent_searches",
- "providers",
- "top_blocks"
- ],
+ "required": ["recent_searches", "providers", "top_blocks"],
"title": "SuggestionsResponse"
},
"TimezoneResponse": {