-
Notifications
You must be signed in to change notification settings - Fork 3.8k
feat: add get_user tool to fetch user by username (#1970) #2246
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
sierikov
wants to merge
1
commit into
github:main
Choose a base branch
from
sierikov:feat/1970-add-get-user-tool
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+285
−8
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| { | ||
| "annotations": { | ||
| "readOnlyHint": true, | ||
| "title": "Get a user by username" | ||
| }, | ||
| "description": "Get a user by username. Use this when you need information about a specific GitHub user.", | ||
| "inputSchema": { | ||
| "properties": { | ||
| "username": { | ||
| "description": "Username of the user", | ||
| "type": "string" | ||
| } | ||
| }, | ||
| "required": [ | ||
| "username" | ||
| ], | ||
| "type": "object" | ||
| }, | ||
| "name": "get_user" | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| package github | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/google/jsonschema-go/jsonschema" | ||
| "github.com/modelcontextprotocol/go-sdk/mcp" | ||
|
|
||
| ghErrors "github.com/github/github-mcp-server/pkg/errors" | ||
| "github.com/github/github-mcp-server/pkg/inventory" | ||
| "github.com/github/github-mcp-server/pkg/translations" | ||
| "github.com/github/github-mcp-server/pkg/utils" | ||
| ) | ||
|
|
||
| // GetUser creates a tool to get a user by username. | ||
| func GetUser(t translations.TranslationHelperFunc) inventory.ServerTool { | ||
| return NewTool( | ||
| ToolsetMetadataUsers, | ||
| mcp.Tool{ | ||
| Name: "get_user", | ||
| Description: t("TOOL_GET_USER_DESCRIPTION", "Get a user by username. Use this when you need information about a specific GitHub user."), | ||
| Annotations: &mcp.ToolAnnotations{ | ||
| Title: t("TOOL_GET_USER_TITLE", "Get a user by username"), | ||
| ReadOnlyHint: true, | ||
| }, | ||
| InputSchema: &jsonschema.Schema{ | ||
| Type: "object", | ||
| Properties: map[string]*jsonschema.Schema{ | ||
| "username": { | ||
| Type: "string", | ||
| Description: t("TOOL_GET_USER_USERNAME_DESCRIPTION", "Username of the user"), | ||
| }, | ||
| }, | ||
| Required: []string{"username"}, | ||
| }, | ||
| }, | ||
| nil, | ||
| func(ctx context.Context, deps ToolDependencies, _ *mcp.CallToolRequest, args map[string]any) (*mcp.CallToolResult, any, error) { | ||
| return getUserHandler(ctx, deps, args) | ||
| }, | ||
| ) | ||
| } | ||
|
|
||
| func getUserHandler(ctx context.Context, deps ToolDependencies, args map[string]any) (*mcp.CallToolResult, any, error) { | ||
| username, err := RequiredParam[string](args, "username") | ||
| if err != nil { | ||
| return utils.NewToolResultError(err.Error()), nil, nil | ||
| } | ||
|
|
||
| client, err := deps.GetClient(ctx) | ||
| if err != nil { | ||
| return utils.NewToolResultErrorFromErr("failed to get GitHub client", err), nil, nil | ||
| } | ||
|
|
||
| user, resp, err := client.Users.Get(ctx, username) | ||
| if err != nil { | ||
| return ghErrors.NewGitHubAPIErrorResponse(ctx, | ||
| "failed to get user", | ||
| resp, | ||
| err, | ||
| ), nil, nil | ||
| } | ||
|
|
||
| minimalUser := MinimalUser{ | ||
| Login: user.GetLogin(), | ||
| ID: user.GetID(), | ||
| ProfileURL: user.GetHTMLURL(), | ||
| AvatarURL: user.GetAvatarURL(), | ||
| Details: &UserDetails{ | ||
| Name: user.GetName(), | ||
| Company: user.GetCompany(), | ||
| Blog: user.GetBlog(), | ||
| Location: user.GetLocation(), | ||
| Email: user.GetEmail(), | ||
| Hireable: user.GetHireable(), | ||
| Bio: user.GetBio(), | ||
| TwitterUsername: user.GetTwitterUsername(), | ||
| PublicRepos: user.GetPublicRepos(), | ||
| PublicGists: user.GetPublicGists(), | ||
| Followers: user.GetFollowers(), | ||
| Following: user.GetFollowing(), | ||
| CreatedAt: user.GetCreatedAt().Time, | ||
| UpdatedAt: user.GetUpdatedAt().Time, | ||
| PrivateGists: user.GetPrivateGists(), | ||
| TotalPrivateRepos: user.GetTotalPrivateRepos(), | ||
| OwnedPrivateRepos: user.GetOwnedPrivateRepos(), | ||
| }, | ||
| } | ||
|
|
||
| return MarshalledTextResult(minimalUser), nil, nil | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,160 @@ | ||
| package github | ||
|
|
||
| import ( | ||
| "context" | ||
| "encoding/json" | ||
| "net/http" | ||
| "testing" | ||
| "time" | ||
|
|
||
| "github.com/google/go-github/v82/github" | ||
| "github.com/google/jsonschema-go/jsonschema" | ||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/github/github-mcp-server/internal/toolsnaps" | ||
| "github.com/github/github-mcp-server/pkg/translations" | ||
| ) | ||
|
|
||
| func Test_GetUser(t *testing.T) { | ||
| // Verify tool definition once | ||
| serverTool := GetUser(translations.NullTranslationHelper) | ||
| tool := serverTool.Tool | ||
| require.NoError(t, toolsnaps.Test(tool.Name, tool)) | ||
|
|
||
| schema, ok := tool.InputSchema.(*jsonschema.Schema) | ||
| require.True(t, ok, "InputSchema should be *jsonschema.Schema") | ||
|
|
||
| assert.Equal(t, "get_user", tool.Name) | ||
| assert.NotEmpty(t, tool.Description) | ||
| assert.Contains(t, schema.Properties, "username") | ||
| assert.ElementsMatch(t, schema.Required, []string{"username"}) | ||
|
|
||
| mockUser := &github.User{ | ||
| Login: github.Ptr("google?"), | ||
| ID: github.Ptr(int64(1234)), | ||
| HTMLURL: github.Ptr("https://github.com/non-existent-john-doe"), | ||
| AvatarURL: github.Ptr("https://github.com/avatar-url/avatar.png"), | ||
| Name: github.Ptr("John Doe"), | ||
| Company: github.Ptr("Gophers"), | ||
| Blog: github.Ptr("https://blog.golang.org"), | ||
| Location: github.Ptr("Europe/Berlin"), | ||
| Email: github.Ptr("non-existent-john-doe@gmail.com"), | ||
| Hireable: github.Ptr(false), | ||
| Bio: github.Ptr("Just a test user"), | ||
| TwitterUsername: github.Ptr("non_existent_john_doe"), | ||
| PublicRepos: github.Ptr(42), | ||
| PublicGists: github.Ptr(11), | ||
| Followers: github.Ptr(10), | ||
| Following: github.Ptr(50), | ||
| CreatedAt: &github.Timestamp{Time: time.Now().Add(-365 * 24 * time.Hour)}, | ||
| UpdatedAt: &github.Timestamp{Time: time.Now()}, | ||
| PrivateGists: github.Ptr(11), | ||
| TotalPrivateRepos: github.Ptr(int64(5)), | ||
| OwnedPrivateRepos: github.Ptr(int64(3)), | ||
| } | ||
|
|
||
| tests := []struct { | ||
| name string | ||
| mockedClient *http.Client | ||
| requestArgs map[string]any | ||
| expectError bool | ||
| expectedUser *github.User | ||
| expectedErrMsg string | ||
| }{ | ||
| { | ||
| name: "successful user retrieval by username", | ||
| mockedClient: MockHTTPClientWithHandlers(map[string]http.HandlerFunc{ | ||
| GetUserByUsername: mockResponse(t, http.StatusOK, mockUser), | ||
| }), | ||
| requestArgs: map[string]any{ | ||
| "username": "non-existent-john-doe", | ||
| }, | ||
| expectError: false, | ||
| expectedUser: mockUser, | ||
| }, | ||
| { | ||
| name: "user not found", | ||
| mockedClient: MockHTTPClientWithHandler(mockResponse(t, http.StatusNotFound, `{"message":"user not found"}`)), | ||
| requestArgs: map[string]any{ | ||
| "username": "other-non-existent-john-doe", | ||
| }, | ||
| expectError: true, | ||
| expectedErrMsg: "failed to get user", | ||
| }, | ||
| { | ||
| name: "error getting user", | ||
| mockedClient: MockHTTPClientWithHandler(badRequestHandler("some other error")), | ||
| requestArgs: map[string]any{ | ||
| "username": "non-existent-john-doe", | ||
| }, | ||
| expectError: true, | ||
| expectedErrMsg: "failed to get user", | ||
| }, | ||
| { | ||
| name: "missing username parameter", | ||
| mockedClient: MockHTTPClientWithHandler(badRequestHandler("missing username parameter")), | ||
| requestArgs: map[string]any{}, | ||
| expectError: true, | ||
| expectedErrMsg: "missing required parameter", | ||
| }, | ||
| } | ||
|
|
||
| for _, tc := range tests { | ||
| t.Run(tc.name, func(t *testing.T) { | ||
| // Setup client with mock | ||
| client := github.NewClient(tc.mockedClient) | ||
| deps := BaseDeps{ | ||
| Client: client, | ||
| } | ||
| handler := serverTool.Handler(deps) | ||
|
|
||
| // Create call request | ||
| request := createMCPRequest(tc.requestArgs) | ||
|
|
||
| // Call handler | ||
| result, err := handler(ContextWithDeps(context.Background(), deps), &request) | ||
|
|
||
| // Verify results | ||
| if tc.expectError { | ||
| require.NoError(t, err) | ||
| require.True(t, result.IsError) | ||
| errorContent := getErrorResult(t, result) | ||
| assert.Contains(t, errorContent.Text, tc.expectedErrMsg) | ||
| return | ||
| } | ||
|
|
||
| require.NoError(t, err) | ||
| require.False(t, result.IsError) | ||
|
|
||
| // Parse the result and get the text content if no error | ||
| textContent := getTextResult(t, result) | ||
|
|
||
| // Parse and verify the result | ||
| var returnedUser MinimalUser | ||
| err = json.Unmarshal([]byte(textContent.Text), &returnedUser) | ||
| require.NoError(t, err) | ||
|
|
||
| assert.Equal(t, *tc.expectedUser.Login, returnedUser.Login) | ||
| assert.Equal(t, *tc.expectedUser.ID, returnedUser.ID) | ||
| assert.Equal(t, *tc.expectedUser.HTMLURL, returnedUser.ProfileURL) | ||
| assert.Equal(t, *tc.expectedUser.AvatarURL, returnedUser.AvatarURL) | ||
| // Details | ||
| assert.Equal(t, *tc.expectedUser.Name, returnedUser.Details.Name) | ||
| assert.Equal(t, *tc.expectedUser.Company, returnedUser.Details.Company) | ||
| assert.Equal(t, *tc.expectedUser.Blog, returnedUser.Details.Blog) | ||
| assert.Equal(t, *tc.expectedUser.Location, returnedUser.Details.Location) | ||
| assert.Equal(t, *tc.expectedUser.Email, returnedUser.Details.Email) | ||
| assert.Equal(t, *tc.expectedUser.Hireable, returnedUser.Details.Hireable) | ||
| assert.Equal(t, *tc.expectedUser.Bio, returnedUser.Details.Bio) | ||
| assert.Equal(t, *tc.expectedUser.TwitterUsername, returnedUser.Details.TwitterUsername) | ||
| assert.Equal(t, *tc.expectedUser.PublicRepos, returnedUser.Details.PublicRepos) | ||
| assert.Equal(t, *tc.expectedUser.PublicGists, returnedUser.Details.PublicGists) | ||
| assert.Equal(t, *tc.expectedUser.Followers, returnedUser.Details.Followers) | ||
| assert.Equal(t, *tc.expectedUser.Following, returnedUser.Details.Following) | ||
| assert.Equal(t, *tc.expectedUser.PrivateGists, returnedUser.Details.PrivateGists) | ||
| assert.Equal(t, *tc.expectedUser.TotalPrivateRepos, returnedUser.Details.TotalPrivateRepos) | ||
| assert.Equal(t, *tc.expectedUser.OwnedPrivateRepos, returnedUser.Details.OwnedPrivateRepos) | ||
| }) | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The MinimalUser/UserDetails mapping here duplicates the same field-by-field conversion logic in GetMe (context_tools.go). Since this is now shared behavior across multiple tools, consider extracting a small helper (e.g., buildMinimalUserWithDetails(*github.User)) to avoid future divergence when the shape changes.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fair point. But right now there are only two call sites (
GetMeandGetUser), and the conversion is straightforward field mapping. I'd prefer to wait for a third consumer before extracting a helper.