Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
3b4bab3d
"examples/base-modelfile-devopsengineer/Modelfile" did not exist on "ba8df10a43501245e6f19a7538cc40290d6bc934"
Unverified
Commit
3b4bab3d
authored
Feb 29, 2024
by
Jeffrey Morgan
Committed by
GitHub
Feb 29, 2024
Browse files
Fix embeddings load model behavior (#2848)
parent
cbd6e3b3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
api/types.go
api/types.go
+0
-2
docs/api.md
docs/api.md
+0
-1
server/routes.go
server/routes.go
+5
-4
No files found.
api/types.go
View file @
3b4bab3d
...
...
@@ -121,7 +121,6 @@ type Runner struct {
VocabOnly
bool
`json:"vocab_only,omitempty"`
UseMMap
bool
`json:"use_mmap,omitempty"`
UseMLock
bool
`json:"use_mlock,omitempty"`
EmbeddingOnly
bool
`json:"embedding_only,omitempty"`
RopeFrequencyBase
float32
`json:"rope_frequency_base,omitempty"`
RopeFrequencyScale
float32
`json:"rope_frequency_scale,omitempty"`
NumThread
int
`json:"num_thread,omitempty"`
...
...
@@ -395,7 +394,6 @@ func DefaultOptions() Options {
UseMLock
:
false
,
UseMMap
:
true
,
UseNUMA
:
false
,
EmbeddingOnly
:
true
,
},
}
}
...
...
docs/api.md
View file @
3b4bab3d
...
...
@@ -321,7 +321,6 @@ curl http://localhost:11434/api/generate -d '{
"vocab_only": false,
"use_mmap": true,
"use_mlock": false,
"embedding_only": false,
"rope_frequency_base": 1.1,
"rope_frequency_scale": 0.8,
"num_thread": 8
...
...
server/routes.go
View file @
3b4bab3d
...
...
@@ -385,7 +385,7 @@ func GenerateHandler(c *gin.Context) {
streamResponse
(
c
,
ch
)
}
func
EmbeddingHandler
(
c
*
gin
.
Context
)
{
func
Embedding
s
Handler
(
c
*
gin
.
Context
)
{
loaded
.
mu
.
Lock
()
defer
loaded
.
mu
.
Unlock
()
...
...
@@ -438,8 +438,9 @@ func EmbeddingHandler(c *gin.Context) {
return
}
if
!
loaded
.
Options
.
EmbeddingOnly
{
c
.
JSON
(
http
.
StatusBadRequest
,
gin
.
H
{
"error"
:
"embedding option must be set to true"
})
// an empty request loads the model
if
req
.
Prompt
==
""
{
c
.
JSON
(
http
.
StatusOK
,
api
.
EmbeddingResponse
{
Embedding
:
[]
float64
{}})
return
}
...
...
@@ -948,7 +949,7 @@ func (s *Server) GenerateRoutes() http.Handler {
r
.
POST
(
"/api/pull"
,
PullModelHandler
)
r
.
POST
(
"/api/generate"
,
GenerateHandler
)
r
.
POST
(
"/api/chat"
,
ChatHandler
)
r
.
POST
(
"/api/embeddings"
,
EmbeddingHandler
)
r
.
POST
(
"/api/embeddings"
,
Embedding
s
Handler
)
r
.
POST
(
"/api/create"
,
CreateModelHandler
)
r
.
POST
(
"/api/push"
,
PushModelHandler
)
r
.
POST
(
"/api/copy"
,
CopyModelHandler
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment