- Notifications
You must be signed in to change notification settings - Fork1k
Separate org and user search#486
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Open
SamMorrowDrums wants to merge3 commits intomainChoose a base branch
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.
Uh oh!
There was an error while loading.Please reload this page.
Open
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -146,79 +146,148 @@ func SearchCode(getClient GetClientFn, t translations.TranslationHelperFunc) (to | ||
| } | ||
| } | ||
| type MinimalUser struct { | ||
| Login string `json:"login"` | ||
| ID int64 `json:"id,omitempty"` | ||
| ProfileURL string `json:"profile_url,omitempty"` | ||
| AvatarURL string `json:"avatar_url,omitempty"` | ||
| } | ||
| type MinimalSearchUsersResult struct { | ||
| TotalCount int `json:"total_count"` | ||
| IncompleteResults bool `json:"incomplete_results"` | ||
| Items []MinimalUser `json:"items"` | ||
| } | ||
| func userOrOrgHandler(accountType string, getClient GetClientFn) server.ToolHandlerFunc { | ||
SamMorrowDrums marked this conversation as resolved. Show resolvedHide resolvedUh oh!There was an error while loading.Please reload this page. | ||
| return func(ctx context.Context, request mcp.CallToolRequest) (*mcp.CallToolResult, error) { | ||
| query, err := requiredParam[string](request, "q") | ||
| if err != nil { | ||
| return mcp.NewToolResultError(err.Error()), nil | ||
| } | ||
| sort, err := OptionalParam[string](request, "sort") | ||
| if err != nil { | ||
| return mcp.NewToolResultError(err.Error()), nil | ||
| } | ||
| order, err := OptionalParam[string](request, "order") | ||
| if err != nil { | ||
| return mcp.NewToolResultError(err.Error()), nil | ||
| } | ||
| pagination, err := OptionalPaginationParams(request) | ||
| if err != nil { | ||
| return mcp.NewToolResultError(err.Error()), nil | ||
| } | ||
| opts := &github.SearchOptions{ | ||
| Sort: sort, | ||
| Order: order, | ||
| ListOptions: github.ListOptions{ | ||
| PerPage: pagination.perPage, | ||
| Page: pagination.page, | ||
| }, | ||
| } | ||
| client, err := getClient(ctx) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to get GitHub client: %w", err) | ||
| } | ||
| searchQuery := "type:" + accountType + " " + query | ||
| result, resp, err := client.Search.Users(ctx, searchQuery, opts) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to search %ss: %w", accountType, err) | ||
| } | ||
| defer func() { _ = resp.Body.Close() }() | ||
| if resp.StatusCode != 200 { | ||
| body, err := io.ReadAll(resp.Body) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed toread response body: %w", err) | ||
| } | ||
| return mcp.NewToolResultError(fmt.Sprintf("failed to search %ss: %s", accountType, string(body))), nil | ||
| } | ||
| minimalUsers := make([]MinimalUser, 0, len(result.Users)) | ||
| for _, user := range result.Users { | ||
| if user.Login != nil { | ||
| mu := MinimalUser{Login: *user.Login} | ||
| if user.ID != nil { | ||
| mu.ID = *user.ID | ||
| } | ||
| if user.HTMLURL != nil { | ||
| mu.ProfileURL = *user.HTMLURL | ||
| } | ||
| if user.AvatarURL != nil { | ||
| mu.AvatarURL = *user.AvatarURL | ||
| } | ||
| minimalUsers = append(minimalUsers, mu) | ||
| } | ||
| } | ||
| minimalResp := &MinimalSearchUsersResult{ | ||
| TotalCount: result.GetTotal(), | ||
| IncompleteResults: result.GetIncompleteResults(), | ||
| Items: minimalUsers, | ||
| } | ||
| if result.Total != nil { | ||
| minimalResp.TotalCount = *result.Total | ||
| } | ||
| if result.IncompleteResults != nil { | ||
| minimalResp.IncompleteResults = *result.IncompleteResults | ||
| } | ||
| r, err := json.Marshal(minimalResp) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("failed to marshal response: %w", err) | ||
| } | ||
| return mcp.NewToolResultText(string(r)), nil | ||
| } | ||
| } | ||
| // SearchUsers creates a tool to search for GitHub users. | ||
| func SearchUsers(getClient GetClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) { | ||
| return mcp.NewTool("search_users", | ||
| mcp.WithDescription(t("TOOL_SEARCH_USERS_DESCRIPTION", "Search for GitHub users exclusively")), | ||
| mcp.WithToolAnnotation(mcp.ToolAnnotation{ | ||
| Title: t("TOOL_SEARCH_USERS_USER_TITLE", "Search users"), | ||
| ReadOnlyHint: toBoolPtr(true), | ||
| }), | ||
| mcp.WithString("q", | ||
| mcp.Required(), | ||
| mcp.Description("Search query using GitHub users search syntax scoped to type:user"), | ||
| ), | ||
| mcp.WithString("sort", | ||
| mcp.Description("Sort field by category"), | ||
| mcp.Enum("followers", "repositories", "joined"), | ||
| ), | ||
| mcp.WithString("order", | ||
| mcp.Description("Sort order"), | ||
| mcp.Enum("asc", "desc"), | ||
| ), | ||
| WithPagination(), | ||
| ), userOrOrgHandler("user", getClient) | ||
| } | ||
| // SearchOrgs creates a tool to search for GitHub organizations. | ||
| func SearchOrgs(getClient GetClientFn, t translations.TranslationHelperFunc) (tool mcp.Tool, handler server.ToolHandlerFunc) { | ||
| return mcp.NewTool("search_orgs", | ||
| mcp.WithDescription(t("TOOL_SEARCH_ORGS_DESCRIPTION", "Search for GitHub organizations exclusively")), | ||
| mcp.WithToolAnnotation(mcp.ToolAnnotation{ | ||
| Title: t("TOOL_SEARCH_ORGS_USER_TITLE", "Search organizations"), | ||
| ReadOnlyHint: toBoolPtr(true), | ||
| }), | ||
| mcp.WithString("q", | ||
| mcp.Required(), | ||
| mcp.Description("Search query using GitHub organizations search syntax scoped to type:org"), | ||
| ), | ||
| mcp.WithString("sort", | ||
| mcp.Description("Sort field by category"), | ||
| mcp.Enum("followers", "repositories", "joined"), | ||
| ), | ||
| mcp.WithString("order", | ||
| mcp.Description("Sort order"), | ||
| mcp.Enum("asc", "desc"), | ||
| ), | ||
| WithPagination(), | ||
| ), userOrOrgHandler("org", getClient) | ||
| } | ||
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
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.