-
Notifications
You must be signed in to change notification settings - Fork 63
feat: update algolia-search plugin #301
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
Merged
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
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
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -22,11 +22,13 @@ package algolia | |||||||||||
| import ( | ||||||||||||
| "context" | ||||||||||||
| "embed" | ||||||||||||
| "encoding/json" | ||||||||||||
| "github.com/segmentfault/pacman/log" | ||||||||||||
| "strconv" | ||||||||||||
| "strings" | ||||||||||||
| "sync" | ||||||||||||
|
|
||||||||||||
| "github.com/algolia/algoliasearch-client-go/v3/algolia/opt" | ||||||||||||
| "github.com/algolia/algoliasearch-client-go/v3/algolia/search" | ||||||||||||
| "github.com/algolia/algoliasearch-client-go/v4/algolia/search" | ||||||||||||
| "github.com/apache/answer-plugins/search-algolia/i18n" | ||||||||||||
| "github.com/apache/answer-plugins/util" | ||||||||||||
| "github.com/apache/answer/plugin" | ||||||||||||
|
|
@@ -37,8 +39,9 @@ var Info embed.FS | |||||||||||
|
|
||||||||||||
| type SearchAlgolia struct { | ||||||||||||
| Config *AlgoliaSearchConfig | ||||||||||||
| client *search.Client | ||||||||||||
| client *search.APIClient | ||||||||||||
| syncer plugin.SearchSyncer | ||||||||||||
| once sync.Once | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
| func init() { | ||||||||||||
|
|
@@ -109,23 +112,36 @@ func (s *SearchAlgolia) SearchContents(ctx context.Context, cond *plugin.SearchB | |||||||||||
|
|
||||||||||||
| var ( | ||||||||||||
| query = strings.TrimSpace(strings.Join(cond.Words, " ")) | ||||||||||||
| opts = []interface{}{ | ||||||||||||
| opt.AttributesToRetrieve("objectID", "type"), | ||||||||||||
| opt.Filters(filters), | ||||||||||||
| opt.Page(cond.Page - 1), | ||||||||||||
| opt.HitsPerPage(cond.PageSize), | ||||||||||||
| } | ||||||||||||
| qres search.QueryRes | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| qres, err = s.getIndex(string(cond.Order)).Search(query, opts...) | ||||||||||||
| qres *search.SearchResponse | ||||||||||||
| ) | ||||||||||||
| qres, err = s.client.SearchSingleIndex( | ||||||||||||
| s.client.NewApiSearchSingleIndexRequest( | ||||||||||||
| s.getIndexName(string(cond.Order))). | ||||||||||||
| WithSearchParams( | ||||||||||||
| search.SearchParamsObjectAsSearchParams( | ||||||||||||
| search.NewEmptySearchParamsObject(). | ||||||||||||
| SetQuery(query). | ||||||||||||
| SetAttributesToRetrieve([]string{"objectID", "type"}). | ||||||||||||
| SetFilters(filters). | ||||||||||||
| SetPage(int32(cond.Page - 1)). | ||||||||||||
| SetHitsPerPage(int32(cond.PageSize)), | ||||||||||||
| ), | ||||||||||||
| ), | ||||||||||||
| ) | ||||||||||||
| if err != nil { | ||||||||||||
| return | ||||||||||||
| } | ||||||||||||
| if qres == nil { | ||||||||||||
| return | ||||||||||||
| } | ||||||||||||
| for _, hit := range qres.Hits { | ||||||||||||
| res = append(res, plugin.SearchResult{ | ||||||||||||
| ID: hit["objectID"].(string), | ||||||||||||
| Type: hit["type"].(string), | ||||||||||||
| ID: hit.ObjectID, | ||||||||||||
| Type: "question", | ||||||||||||
| }) | ||||||||||||
| } | ||||||||||||
| total = int64(qres.NbHits) | ||||||||||||
| total = int64(*qres.NbHits) | ||||||||||||
| return res, total, err | ||||||||||||
| } | ||||||||||||
|
|
||||||||||||
|
|
@@ -172,24 +188,37 @@ func (s *SearchAlgolia) SearchQuestions(ctx context.Context, cond *plugin.Search | |||||||||||
|
|
||||||||||||
| var ( | ||||||||||||
| query = strings.TrimSpace(strings.Join(cond.Words, " ")) | ||||||||||||
| opts = []interface{}{ | ||||||||||||
| opt.AttributesToRetrieve("objectID", "type"), | ||||||||||||
| opt.Filters(filters), | ||||||||||||
| opt.Page(cond.Page - 1), | ||||||||||||
| opt.HitsPerPage(cond.PageSize), | ||||||||||||
| } | ||||||||||||
| qres search.QueryRes | ||||||||||||
| qres *search.SearchResponse | ||||||||||||
| ) | ||||||||||||
|
|
||||||||||||
| qres, err = s.getIndex(string(cond.Order)).Search(query, opts...) | ||||||||||||
| qres, err = s.client.SearchSingleIndex( | ||||||||||||
| s.client.NewApiSearchSingleIndexRequest( | ||||||||||||
| s.getIndexName(string(cond.Order))). | ||||||||||||
| WithSearchParams( | ||||||||||||
| search.SearchParamsObjectAsSearchParams( | ||||||||||||
| search.NewEmptySearchParamsObject(). | ||||||||||||
| SetQuery(query). | ||||||||||||
| SetAttributesToRetrieve([]string{"objectID", "type"}). | ||||||||||||
| SetFilters(filters). | ||||||||||||
| SetPage(int32(cond.Page - 1)). | ||||||||||||
| SetHitsPerPage(int32(cond.PageSize)), | ||||||||||||
| ), | ||||||||||||
| ), | ||||||||||||
| ) | ||||||||||||
| if err != nil { | ||||||||||||
| return | ||||||||||||
| } | ||||||||||||
| if qres == nil { | ||||||||||||
| return | ||||||||||||
| } | ||||||||||||
| for _, hit := range qres.Hits { | ||||||||||||
| res = append(res, plugin.SearchResult{ | ||||||||||||
| ID: hit["objectID"].(string), | ||||||||||||
| Type: hit["type"].(string), | ||||||||||||
| ID: hit.ObjectID, | ||||||||||||
| Type: "question", | ||||||||||||
|
||||||||||||
| Type: "question", | |
| Type: hit.Type, |
Copilot
AI
Oct 11, 2025
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.
Missing error check after the SearchSingleIndex call. The code should verify that err is nil before proceeding to iterate over hits.
Suggested change
| ) | |
| ) | |
| if err != nil { | |
| return nil, 0, err | |
| } |
Outdated
Copilot
AI
Oct 11, 2025
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 type is being hardcoded to 'question' in the SearchAnswers method, but this should reflect the actual content type from the search results.
Outdated
Copilot
AI
Oct 11, 2025
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.
This marshal-unmarshal pattern is inefficient. Consider using a more direct type conversion to convert *plugin.SearchContent to map[string]any without the JSON roundtrip.
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
Oops, something went wrong.
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 type is being hardcoded to 'question' instead of using the actual type from the hit. This will cause incorrect type classification for non-question content like answers.