-
Notifications
You must be signed in to change notification settings - Fork 3k
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
feat: Add openai embedding #36366
Open
junjiejiangjjj
wants to merge
18
commits into
milvus-io:master
Choose a base branch
from
junjiejiangjjj:embedding
base: master
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.
Open
feat: Add openai embedding #36366
Changes from 17 commits
Commits
Show all changes
18 commits
Select commit
Hold shift + click to select a range
9705f0c
Add openai embedding client
junjiejiangjjj b117d64
Add embedding runner
junjiejiangjjj 4c2baae
Add function executor
junjiejiangjjj 542c249
Insert & Upsert support functions
junjiejiangjjj 4587572
Search supports embedding function
junjiejiangjjj c01d61c
Add search embedding test
junjiejiangjjj a5776f3
Support bulkinsert
junjiejiangjjj 5eea78f
Use TextEmbedding function
junjiejiangjjj df07a06
update
junjiejiangjjj ecc4ad8
Add bedrock, azure, ali text embedding
junjiejiangjjj c459d41
Update go mod
junjiejiangjjj 9ff9419
Polish error infos
junjiejiangjjj 0bcc13a
Reuse http client
junjiejiangjjj 2692fea
Add vertexai
junjiejiangjjj 5c0f58b
Add function check
junjiejiangjjj 8c62771
Adjust dashscope model batch
junjiejiangjjj b482b3c
Fix confict
junjiejiangjjj 0e9e9ca
Polish code
junjiejiangjjj 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 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 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 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 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 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 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 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,155 @@ | ||
| // Licensed to the LF AI & Data foundation under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package ali | ||
|
|
||
| import ( | ||
| "bytes" | ||
| "context" | ||
| "encoding/json" | ||
| "fmt" | ||
| "net/http" | ||
| "sort" | ||
| "time" | ||
|
|
||
| "github.com/milvus-io/milvus/internal/models/utils" | ||
| ) | ||
|
|
||
| type Input struct { | ||
| Texts []string `json:"texts"` | ||
| } | ||
|
|
||
| type Parameters struct { | ||
| TextType string `json:"text_type,omitempty"` | ||
| Dimension int `json:"dimension,omitempty"` | ||
| OutputType string `json:"output_type,omitempty"` | ||
| } | ||
|
|
||
| type EmbeddingRequest struct { | ||
| // ID of the model to use. | ||
| Model string `json:"model"` | ||
|
|
||
| // Input text to embed, encoded as a string. | ||
| Input Input `json:"input"` | ||
|
|
||
| Parameters Parameters `json:"parameters,omitempty"` | ||
| } | ||
|
|
||
| type Usage struct { | ||
| // The total number of tokens used by the request. | ||
| TotalTokens int `json:"total_tokens"` | ||
| } | ||
|
|
||
| type SparseEmbedding struct { | ||
| Index int `json:"index"` | ||
| Value float32 `json:"value"` | ||
| Token string `json:"token"` | ||
| } | ||
|
|
||
| type Embeddings struct { | ||
| TextIndex int `json:"text_index"` | ||
| Embedding []float32 `json:"embedding,omitempty"` | ||
| SparseEmbedding []SparseEmbedding `json:"sparse_embedding,omitempty"` | ||
| } | ||
|
|
||
| type Output struct { | ||
| Embeddings []Embeddings `json:"embeddings"` | ||
| } | ||
|
|
||
| type EmbeddingResponse struct { | ||
| Output Output `json:"output"` | ||
| Usage Usage `json:"usage"` | ||
| RequestID string `json:"request_id"` | ||
| } | ||
|
|
||
| type ByIndex struct { | ||
| resp *EmbeddingResponse | ||
| } | ||
|
|
||
| func (eb *ByIndex) Len() int { return len(eb.resp.Output.Embeddings) } | ||
| func (eb *ByIndex) Swap(i, j int) { | ||
| eb.resp.Output.Embeddings[i], eb.resp.Output.Embeddings[j] = eb.resp.Output.Embeddings[j], eb.resp.Output.Embeddings[i] | ||
| } | ||
| func (eb *ByIndex) Less(i, j int) bool { | ||
| return eb.resp.Output.Embeddings[i].TextIndex < eb.resp.Output.Embeddings[j].TextIndex | ||
| } | ||
|
|
||
| type ErrorInfo struct { | ||
| Code string `json:"code"` | ||
| Message string `json:"message"` | ||
| RequestID string `json:"request_id"` | ||
| } | ||
|
|
||
| type AliDashScopeEmbedding struct { | ||
| apiKey string | ||
| url string | ||
| } | ||
|
|
||
| func NewAliDashScopeEmbeddingClient(apiKey string, url string) *AliDashScopeEmbedding { | ||
| return &AliDashScopeEmbedding{ | ||
| apiKey: apiKey, | ||
| url: url, | ||
| } | ||
| } | ||
|
|
||
| func (c *AliDashScopeEmbedding) Check() error { | ||
| if c.apiKey == "" { | ||
| return fmt.Errorf("api key is empty") | ||
| } | ||
|
|
||
| if c.url == "" { | ||
| return fmt.Errorf("url is empty") | ||
| } | ||
| return nil | ||
| } | ||
|
|
||
| func (c *AliDashScopeEmbedding) Embedding(modelName string, texts []string, dim int, text_type string, output_type string, timeoutSec time.Duration) (*EmbeddingResponse, error) { | ||
| var r EmbeddingRequest | ||
| r.Model = modelName | ||
| r.Input = Input{texts} | ||
| r.Parameters.Dimension = dim | ||
| r.Parameters.TextType = text_type | ||
| r.Parameters.OutputType = output_type | ||
| data, err := json.Marshal(r) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if timeoutSec <= 0 { | ||
| timeoutSec = 30 | ||
| } | ||
|
|
||
| ctx, cancel := context.WithTimeout(context.Background(), timeoutSec*time.Second) | ||
| defer cancel() | ||
| req, err := http.NewRequestWithContext(ctx, http.MethodPost, c.url, bytes.NewBuffer(data)) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| req.Header.Set("Content-Type", "application/json") | ||
| req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", c.apiKey)) | ||
| body, err := utils.RetrySend(req, 3) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| var res EmbeddingResponse | ||
| err = json.Unmarshal(body, &res) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| sort.Sort(&ByIndex{&res}) | ||
| return &res, err | ||
| } | ||
Oops, something went wrong.
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.
EmbeddingRequest can be private? by lowercase the first letter
embeddingRequest. I did a quick search and find no usage of this class outside this file. correct me IIW. This comment applies to many other structs in this and other files.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.
Only used in test files under
milvus/internal/util/function/