jeans/ollama
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

input

Browse Source
This commit is contained in:
Roy Han 2024-07-16 15:19:13 -07:00
parent eb7cc2d1ce
commit 23d5beeb9c
2 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
llm/ext_server/server.cpp vendored
View File

@ -1855,6 +1855,8 @@ struct llama_server_context
if (batch.n_tokens == 0)
{
// HANGING HERE
LOG_INFO("no tokens to process", {});
all_slots_are_idle = true;
return true;
}
@ -3200,7 +3202,6 @@ int main(int argc, char **argv) {
else {
image_data = "";
}
// TODO: prompt needs to represent the image data
// create and queue the task
json responses;

63
server/routes.go
View File

@ -265,38 +265,42 @@ func (s *Server) EmbedHandler(c *gin.Context) {
truncate = false
}
inputCheck := true
if req.Images != nil {
inputCheck = false
}
var input []string
if inputCheck {
images := make([]llm.ImageData, len(req.Images))
for i := range req.Images {
images[i] = llm.ImageData{ID: 0, Data: req.Images[i]}
}
switch i := req.Input.(type) {
case string:
if len(i) > 0 {
input = append(input, i)
}
case []any:
for _, v := range i {
if _, ok := v.(string); !ok {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid input type"})
return
}
input = append(input, v.(string))
}
default:
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid input type"})
return
}
if req.Images != nil {
// for _, _ := range images {
// input = append(input, fmt.Sprintf("[img-%d]", i.ID))
input = append(input, "[img-0]")
// }
req.Input = ""
}
if len(input) == 0 {
c.JSON(http.StatusOK, api.EmbedResponse{Model: req.Model, Embeddings: [][]float32{}})
return
switch i := req.Input.(type) {
case string:
if len(i) > 0 {
input = append(input, i)
}
case []any:
for _, v := range i {
if _, ok := v.(string); !ok {
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid input type"})
return
}
input = append(input, v.(string))
}
default:
c.AbortWithStatusJSON(http.StatusBadRequest, gin.H{"error": "invalid input type"})
return
}
if len(input) == 0 {
c.JSON(http.StatusOK, api.EmbedResponse{Model: req.Model, Embeddings: [][]float32{}})
return
}
r, m, opts, err := s.scheduleRunner(c.Request.Context(), req.Model, []Capability{}, req.Options, req.KeepAlive)
@ -336,11 +340,6 @@ func (s *Server) EmbedHandler(c *gin.Context) {
input[i] = s
}
images := make([]llm.ImageData, len(req.Images))
for i := range req.Images {
images[i] = llm.ImageData{ID: i, Data: req.Images[i]}
}
embeddings, err := r.Embed(c.Request.Context(), input, images)
if err != nil {