feat: add filterQuery support to mcp catalog by Al-Pragliola · Pull Request #2283 · kubeflow/model-registry

Al-Pragliola · 2026-02-26T14:24:16Z

Description

depends on #2278

This PR introduces enhanced filtering capabilities to the MCP catalog service, allowing users to search and filter catalog items more effectively.

Key Changes:

Added filterquery functionality to the MCP catalog service
Implemented new database models and API endpoints for MCP server tools
Added comprehensive unit tests to ensure reliability

How Has This Been Tested?

  🔧 Basic Server Listings

  # List all MCP servers
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers" | jq .

  # Get specific server details
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers/3" | jq .

  🔍 Working Filter Examples

  1. Filter by Provider:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers?filterQuery=provider%20%3D%20%27OpenAI%27" | jq .
  # Returns: openai-assistant

  2. Filter by License:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers?filterQuery=license%20%3D%20%27MIT%27" | jq '.items[].name'
  # Returns: "openai-assistant", "file-manager"

  3. LIKE Pattern Matching:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers?filterQuery=description%20LIKE%20%27%25SQL%25%27" | jq '.items[].name'
  # Returns: "database-connector"

  4. Complex OR Query:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers?filterQuery=(license%20%3D%20%27MIT%27%20OR%20license%20%3D%20%27Apache-2.0%27)" | jq '.items | length'
  # Returns: 3 servers

  5. Sorting and Ordering:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers?orderBy=name&sortOrder=ASC" | jq '.items[].name'
  # Returns: names in alphabetical order

  🛠️  Tool Filtering Examples

  6. List Tools for Server:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers/3/tools" | jq .
  # Returns: chat_completion, embeddings tools

  7. Filter Tools by Description:
  curl -s "http://localhost:8081/api/mcp_catalog/v1alpha1/mcp_servers/3/tools?filterQuery=description%20LIKE%20%27%25chat%25%27" | jq '.items[].name'
  # Returns: "openai-assistant@1.2.0:chat_completion"

test data

mcp_servers:
  - name: openai-assistant
    description: "OpenAI Assistant MCP server for AI-powered conversations"
    provider: "OpenAI"
    version: "1.2.0"
    license: "MIT"
    tags: ["ai", "assistant", "openai", "gpt"]
    tools:
      - name: chat_completion
        description: "Generate chat completions using OpenAI models"
      - name: embeddings
        description: "Generate embeddings for text"

  - name: github-integration
    description: "GitHub MCP server for repository management"
    provider: "GitHub Inc"
    version: "2.1.3"
    license: "Apache-2.0"
    tags: ["git", "github", "repository", "version-control"]
    tools:
      - name: create_issue
        description: "Create a new GitHub issue"
      - name: list_repositories
        description: "List user repositories"
      - name: create_pull_request
        description: "Create a new pull request"

  - name: database-connector
    description: "Database MCP server for SQL operations"
    provider: "DB Corp"
    version: "3.0.1"
    license: "GPL-3.0"
    tags: ["database", "sql", "postgres", "mysql"]
    tools:
      - name: execute_query
        description: "Execute SQL queries"
      - name: list_tables
        description: "List database tables"

  - name: file-manager
    description: "File system operations MCP server"
    provider: "Local Systems Inc"
    version: "1.0.0"
    license: "MIT"
    tags: ["filesystem", "files", "local"]
    tools:
      - name: read_file
        description: "Read contents of a file"
      - name: write_file
        description: "Write content to a file"
      - name: list_directory
        description: "List directory contents"

Merge criteria:

All the commits have been signed-off (To pass the DCO check)

The commits have meaningful messages
Automated tests are provided as part of the PR for major new functionalities; testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
The developer has manually tested the changes and verified that the changes work.
Code changes follow the kubeflow contribution guidelines.
For first time contributors: Please reach out to the Reviewers to ensure all tests are being run, ensuring the label ok-to-test has been added to the PR.

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

pboyd

A few nits, but this looks really good.

/lgtm

pboyd · 2026-02-27T18:01:40Z

catalog/internal/db/filter/entity_mappings.go

+	RestEntityCatalogModel    CatalogRestEntityType = "CatalogModel"
+	RestEntityCatalogArtifact CatalogRestEntityType = "CatalogArtifact"
+	RestEntityMCPServer       CatalogRestEntityType = "MCPServer"
+	RestEntityMCPServerTool   CatalogRestEntityType = "MCPServerTool"


Should these replace the versions in models?

the other way around 😁

pboyd · 2026-02-27T18:03:32Z

catalog/internal/db/service/mcp_server_tool.go

+		ApplyListFilters:    applyMCPServerToolListFilters,
+		IsNewEntity:         func(entity models.MCPServerTool) bool { return entity.GetID() == nil },
+		HasCustomProperties: func(entity models.MCPServerTool) bool { return entity.GetCustomProperties() != nil },
+		EntityMappingFuncs:  filter.NewCatalogEntityMappings(),


Is PreserveHistoricalTimes still needed?

I think it is, forgot to add it to the server tool. If you mean in general if we need it, I think we do so that if a timestamp is present in the yaml data we keep it

I just meant for MCPServerToolRepository specifically.

pboyd · 2026-02-27T18:06:54Z

catalog/internal/server/openapi/api_mcp_catalog_service_service.go

+	if err != nil {
+		statusCode := http.StatusInternalServerError
+		if strings.Contains(fmt.Sprintf("%v", err), "not found") {
+			statusCode = http.StatusNotFound
+		} else if strings.Contains(fmt.Sprintf("%v", err), "invalid") {
+			statusCode = http.StatusBadRequest
+		}
+		return ErrorResponse(statusCode, err), err
+	}


Would ErrorToStatus (pkg/api/error.go) help here?

pboyd · 2026-02-27T18:10:52Z

catalog/internal/server/openapi/api_mcp_catalog_service_service.go

+
+// FindMCPServers - List MCP servers.
+func (m *MCPCatalogServiceAPIService) FindMCPServers(ctx context.Context, name string, q string, sourceLabel []string, filterQuery string, namedQuery string, includeTools bool, toolLimit int32, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string) (ImplResponse, error) {
+	var err error


It's not hurting anything, but this doesn't seem to be needed.

Suggested change

var err error

pboyd · 2026-02-27T18:11:16Z

catalog/internal/server/openapi/api_mcp_catalog_service_service.go

+
+// FindMCPServerTools - List MCP server tools.
+func (m *MCPCatalogServiceAPIService) FindMCPServerTools(ctx context.Context, serverID string, filterQuery string, pageSize string, orderBy model.OrderByField, sortOrder model.SortOrder, nextPageToken string) (ImplResponse, error) {
+	var err error


This one too.

Suggested change

var err error

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

pboyd

/lgtm

chambridge

lgtm

pboyd · 2026-03-02T15:06:21Z

/approve

google-oss-prow · 2026-03-02T15:06:29Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pboyd

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [pboyd]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

google-oss-prow bot added do-not-merge/work-in-progress size/XXL labels Feb 26, 2026

google-oss-prow bot requested review from ederign, fege and jonburdo February 26, 2026 14:24

github-actions bot added the Area/Model Catalog label Feb 26, 2026

Al-Pragliola force-pushed the al-pragliola-filterquery-mcp branch from 3df3e4c to bbdbd79 Compare February 26, 2026 14:48

Al-Pragliola added 4 commits February 27, 2026 11:28

feat: add filterQuery support to mcp catalog

9e73cb8

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

feat: add unit tests for mcp catalog service

6807a06

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

fix: test errors

b66999b

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

fix: missing NL

e1a7c7b

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

Al-Pragliola force-pushed the al-pragliola-filterquery-mcp branch from f9d6ac5 to e1a7c7b Compare February 27, 2026 10:28

Al-Pragliola marked this pull request as ready for review February 27, 2026 14:26

google-oss-prow bot removed the do-not-merge/work-in-progress label Feb 27, 2026

google-oss-prow bot requested a review from tarilabs February 27, 2026 14:26

Al-Pragliola requested review from pboyd and removed request for tarilabs February 27, 2026 14:26

Al-Pragliola mentioned this pull request Feb 27, 2026

refactor: Reorganize Catalog Services and Models Structure #2289

Merged

8 tasks

pboyd reviewed Feb 27, 2026

View reviewed changes

google-oss-prow bot assigned pboyd Feb 27, 2026

google-oss-prow bot added the lgtm label Feb 27, 2026

fix: address code review comments

fe85ea8

Signed-off-by: Alessio Pragliola <seth.pro@gmail.com>

google-oss-prow bot removed the lgtm label Mar 2, 2026

Al-Pragliola requested a review from pboyd March 2, 2026 10:31

pboyd reviewed Mar 2, 2026

View reviewed changes

google-oss-prow bot added the lgtm label Mar 2, 2026

chambridge approved these changes Mar 2, 2026

View reviewed changes

google-oss-prow bot assigned chambridge Mar 2, 2026

google-oss-prow bot added the approved label Mar 2, 2026

google-oss-prow bot merged commit e8537d3 into kubeflow:main Mar 2, 2026
23 checks passed

This was referenced Mar 3, 2026

[pull] main from kubeflow:main opendatahub-io/model-registry#1536

Merged

sync: main to stable opendatahub-io/model-registry#1545

Merged

Conversation

Al-Pragliola commented Feb 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

How Has This Been Tested?

Merge criteria:

Uh oh!

pboyd left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pboyd left a comment

Choose a reason for hiding this comment

Uh oh!

chambridge left a comment

Choose a reason for hiding this comment

Uh oh!

pboyd commented Mar 2, 2026

Uh oh!

google-oss-prow bot commented Mar 2, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Al-Pragliola commented Feb 26, 2026 •

edited

Loading