mirror of
https://github.com/ollama/ollama.git
synced 2025-11-10 21:27:47 +01:00
removed redundancy
This commit is contained in:
@@ -621,34 +621,6 @@ func (s *Server) EmbedHandler(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
truncate := true
|
||||
if req.Truncate != nil && !*req.Truncate {
|
||||
truncate = false
|
||||
}
|
||||
|
||||
// Basic server-side guard: if truncation is enabled and num_ctx <= 1, return an error
|
||||
if truncate && req.Options != nil {
|
||||
if v, ok := req.Options["num_ctx"]; ok {
|
||||
var numCtx int
|
||||
switch t := v.(type) {
|
||||
case float64:
|
||||
numCtx = int(t)
|
||||
case int:
|
||||
numCtx = t
|
||||
case int64:
|
||||
numCtx = int(t)
|
||||
case json.Number:
|
||||
if i, err := t.Int64(); err == nil {
|
||||
numCtx = int(i)
|
||||
}
|
||||
}
|
||||
if numCtx <= 1 {
|
||||
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "input after truncation exceeds maximum context length"})
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var input []string
|
||||
|
||||
switch i := req.Input.(type) {
|
||||
@@ -683,13 +655,6 @@ func (s *Server) EmbedHandler(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
// Model KV metadata for server-side truncation decisions
|
||||
kvData, _, err := getModelData(m.ModelPath, false)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
checkpointLoaded := time.Now()
|
||||
|
||||
if len(input) == 0 {
|
||||
@@ -697,6 +662,12 @@ func (s *Server) EmbedHandler(c *gin.Context) {
|
||||
return
|
||||
}
|
||||
|
||||
kvData, _, err := getModelData(m.ModelPath, false)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
|
||||
return
|
||||
}
|
||||
|
||||
ctx := c.Request.Context()
|
||||
|
||||
embedWithRetry := func(text string) ([]float32, int, error) {
|
||||
|
||||
Reference in New Issue
Block a user