Skip to content

Conversation

@rafaeljusto
Copy link
Contributor

@rafaeljusto rafaeljusto commented Jul 9, 2025

Description

Following the same pattern from tools, prompts and resources, this patch allows adding multiple resource templates at once.

Type of Change

  • Bug fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • MCP spec compatibility implementation
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation update
  • Code refactoring (no functional changes)
  • Performance improvement
  • Tests only (no functional changes)
  • Other (please describe):

Checklist

  • My code follows the code style of this project
  • I have performed a self-review of my own code
  • I have added tests that prove my fix is effective or that my feature works
  • I have updated the documentation accordingly

MCP Spec Compliance

  • This PR implements a feature defined in the MCP specification
  • Link to relevant spec section: Link text
  • Implementation follows the specification exactly

Additional Information

The tests were already added by #449 .

Summary by CodeRabbit

  • New Features

    • Added support for batch registration of resource templates, allowing multiple templates to be registered at once.
  • Refactor

    • Unified the resource template type across modules for improved consistency.
    • Updated methods to use the new unified resource template type for clearer and more maintainable code.

Following the same pattern from tools, prompts and resources, this patch allows
adding multiple resource templates at once.
@coderabbitai
Copy link
Contributor

coderabbitai bot commented Jul 9, 2025

"""

Walkthrough

This change removes the local definition of the ServerResourceTemplate struct from the mcptest package and replaces all its usages with the ServerResourceTemplate type imported from the server package. The relevant methods and fields are updated accordingly to use the unified type, centralizing resource template handling. Additionally, the server package introduces bulk registration of resource templates, and tests are extended to verify this functionality.

Changes

Files Change Summary
mcptest/mcptest.go Removed local ServerResourceTemplate struct; replaced all usages with server.ServerResourceTemplate; updated methods and struct fields to use the imported type; simplified resource template addition in Start method.
server/server.go Added ServerResourceTemplate struct; introduced variadic AddResourceTemplates method; redefined AddResourceTemplate as a wrapper for single entries; centralized resource template registration.
server/server_test.go Extended TestMCPServer_ResourceTemplates to test bulk addition of resource templates; added subtests validating count and presence of all templates; imported slices package for membership checks.

Possibly related PRs


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between c5dc25f and 8aa68fd.

📒 Files selected for processing (1)
  • server/server_test.go (2 hunks)
🧰 Additional context used
🧠 Learnings (2)
📓 Common learnings
Learnt from: octo
PR: mark3labs/mcp-go#149
File: mcptest/mcptest.go:0-0
Timestamp: 2025-04-21T21:26:32.945Z
Learning: In the mcptest package, prefer returning errors from helper functions rather than calling t.Fatalf() directly, giving callers flexibility in how to handle errors.
Learnt from: ezynda3
PR: mark3labs/mcp-go#461
File: server/sampling.go:22-26
Timestamp: 2025-06-30T07:13:17.052Z
Learning: In the mark3labs/mcp-go project, the MCPServer.capabilities field is a struct value (serverCapabilities), not a pointer, so it cannot be nil and doesn't require nil checking. Only pointer fields within the capabilities struct should be checked for nil.
server/server_test.go (2)
Learnt from: octo
PR: mark3labs/mcp-go#149
File: mcptest/mcptest.go:0-0
Timestamp: 2025-04-21T21:26:32.945Z
Learning: In the mcptest package, prefer returning errors from helper functions rather than calling t.Fatalf() directly, giving callers flexibility in how to handle errors.
Learnt from: ezynda3
PR: mark3labs/mcp-go#461
File: server/sampling.go:22-26
Timestamp: 2025-06-30T07:13:17.052Z
Learning: In the mark3labs/mcp-go project, the MCPServer.capabilities field is a struct value (serverCapabilities), not a pointer, so it cannot be nil and doesn't require nil checking. Only pointer fields within the capabilities struct should be checked for nil.
🔇 Additional comments (2)
server/server_test.go (2)

10-10: LGTM: Appropriate import addition.

The slices package import is correctly added to support the new test functionality that uses slices.Contains for order-independent membership checking.


461-507: Excellent test coverage for bulk resource template addition.

This test code effectively addresses the reviewer's request for testing the new AddResourceTemplates function. The implementation:

  • Tests bulk addition of multiple resource templates
  • Verifies correct total count after addition
  • Uses order-independent verification with slices.Contains (appropriate since templates are stored in a map)
  • Follows existing test patterns and good practices
  • Provides clear subtest organization

The test comprehensively validates the new bulk functionality while maintaining good testing standards.

✨ Finishing Touches
  • 📝 Generate Docstrings

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Create a ticket on our support page for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2d479bb and 1f36ff8.

📒 Files selected for processing (2)
  • mcptest/mcptest.go (3 hunks)
  • server/server.go (3 hunks)
🧰 Additional context used
🧠 Learnings (3)
📓 Common learnings
Learnt from: octo
PR: mark3labs/mcp-go#149
File: mcptest/mcptest.go:0-0
Timestamp: 2025-04-21T21:26:32.945Z
Learning: In the mcptest package, prefer returning errors from helper functions rather than calling t.Fatalf() directly, giving callers flexibility in how to handle errors.
Learnt from: ezynda3
PR: mark3labs/mcp-go#461
File: server/sampling.go:22-26
Timestamp: 2025-06-30T07:13:17.052Z
Learning: In the mark3labs/mcp-go project, the MCPServer.capabilities field is a struct value (serverCapabilities), not a pointer, so it cannot be nil and doesn't require nil checking. Only pointer fields within the capabilities struct should be checked for nil.
server/server.go (1)
Learnt from: ezynda3
PR: mark3labs/mcp-go#461
File: server/sampling.go:22-26
Timestamp: 2025-06-30T07:13:17.052Z
Learning: In the mark3labs/mcp-go project, the MCPServer.capabilities field is a struct value (serverCapabilities), not a pointer, so it cannot be nil and doesn't require nil checking. Only pointer fields within the capabilities struct should be checked for nil.
mcptest/mcptest.go (4)
Learnt from: octo
PR: mark3labs/mcp-go#149
File: mcptest/mcptest.go:0-0
Timestamp: 2025-04-21T21:26:32.945Z
Learning: In the mcptest package, prefer returning errors from helper functions rather than calling t.Fatalf() directly, giving callers flexibility in how to handle errors.
Learnt from: ezynda3
PR: mark3labs/mcp-go#461
File: server/sampling.go:22-26
Timestamp: 2025-06-30T07:13:17.052Z
Learning: In the mark3labs/mcp-go project, the MCPServer.capabilities field is a struct value (serverCapabilities), not a pointer, so it cannot be nil and doesn't require nil checking. Only pointer fields within the capabilities struct should be checked for nil.
Learnt from: floatingIce91
PR: mark3labs/mcp-go#401
File: server/server.go:1082-1092
Timestamp: 2025-06-23T11:10:42.948Z
Learning: In Go MCP server, ServerTool.Tool field is only used for tool listing and indexing, not for tool execution or middleware. During handleToolCall, only the Handler field is used, so dynamic tools don't need the Tool field populated.
Learnt from: xinwo
PR: mark3labs/mcp-go#35
File: mcp/tools.go:107-137
Timestamp: 2025-03-04T06:59:43.882Z
Learning: Tool responses from the MCP server shouldn't contain RawInputSchema, which is why the UnmarshalJSON method for the Tool struct is implemented to handle only the structured InputSchema format.
🧬 Code Graph Analysis (1)
mcptest/mcptest.go (1)
server/server.go (1)
  • ServerResourceTemplate (68-71)
🔇 Additional comments (6)
server/server.go (3)

67-71: Well-designed struct following established patterns.

The ServerResourceTemplate struct correctly follows the same pattern as other Server* types (ServerTool, ServerPrompt, ServerResource) by combining the MCP type with its handler function.


369-387: Excellent implementation of batch resource template registration.

The AddResourceTemplates method correctly follows the established pattern from other batch operations:

  • Proper capability registration
  • Thread-safe locking
  • Notification sending when listChanged is enabled
  • Consistent with AddResources and AddTools implementations

389-395: Good refactoring to use the batch method.

Converting AddResourceTemplate to use AddResourceTemplates as a convenience wrapper maintains API compatibility while leveraging the new batch functionality. This pattern is consistent with other single-item methods in the codebase.

mcptest/mcptest.go (3)

26-26: Correct usage of the centralized ServerResourceTemplate type.

The field type has been properly updated to use server.ServerResourceTemplate, aligning with the centralized resource template handling.


112-116: Proper construction of the server type.

The method correctly constructs a server.ServerResourceTemplate struct with the appropriate field mapping (Template and Handler).


119-119: Signature correctly updated for the centralized type.

The method signature now properly uses server.ServerResourceTemplate parameter, maintaining consistency with the centralized approach.

@ezynda3
Copy link
Contributor

ezynda3 commented Jul 15, 2025

@rafaeljusto can you add 1 or 2 tests for the new functions you added? After that should be gtg

@ezynda3 ezynda3 added the status: needs submitter response Waiting for feedback from issue opener label Jul 15, 2025
Add a test case to cover the new function.

mark3labs#483 (comment)
@rafaeljusto
Copy link
Contributor Author

@ezynda3 Sorry for the delay, added the tests now. 🙂

@ezynda3 ezynda3 merged commit 722d954 into mark3labs:main Jul 23, 2025
4 checks passed
@rafaeljusto rafaeljusto deleted the bulk-resource-templates branch July 23, 2025 10:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

status: needs submitter response Waiting for feedback from issue opener

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants