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
12ab8f8f
Commit
12ab8f8f
authored
Jul 25, 2023
by
Bruce MacDonald
Browse files
Revert "pull model on make if not present locally"
This reverts commit 360a10ace391a674de60aa7b9b8cb65e8074027c.
parent
8ebbd12f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
29 deletions
+3
-29
cmd/cmd.go
cmd/cmd.go
+3
-29
No files found.
cmd/cmd.go
View file @
12ab8f8f
...
...
@@ -21,7 +21,6 @@ import (
"github.com/jmorganca/ollama/api"
"github.com/jmorganca/ollama/format"
"github.com/jmorganca/ollama/parser"
"github.com/jmorganca/ollama/progressbar"
"github.com/jmorganca/ollama/server"
)
...
...
@@ -37,24 +36,6 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
var
spinner
*
Spinner
// pull the model file if needed
mf
,
err
:=
os
.
Open
(
filename
)
defer
mf
.
Close
()
cmds
,
err
:=
parser
.
Parse
(
mf
)
if
err
!=
nil
{
return
err
}
mf
.
Close
()
for
_
,
c
:=
range
cmds
{
if
c
.
Name
==
"model"
{
// check if the model file needs to be pulled
checkPull
(
c
.
Args
)
}
}
if
err
!=
nil
{
return
err
}
request
:=
api
.
CreateRequest
{
Name
:
args
[
0
],
Path
:
filename
}
fn
:=
func
(
resp
api
.
CreateProgress
)
error
{
if
spinner
!=
nil
{
...
...
@@ -78,8 +59,8 @@ func CreateHandler(cmd *cobra.Command, args []string) error {
return
nil
}
func
checkPull
(
model
string
)
error
{
mp
:=
server
.
ParseModelPath
(
model
)
func
RunHandler
(
cmd
*
cobra
.
Command
,
args
[]
string
)
error
{
mp
:=
server
.
ParseModelPath
(
args
[
0
]
)
fp
,
err
:=
mp
.
GetManifestPath
(
false
)
if
err
!=
nil
{
return
err
...
...
@@ -88,7 +69,7 @@ func checkPull(model string) error {
_
,
err
=
os
.
Stat
(
fp
)
switch
{
case
errors
.
Is
(
err
,
os
.
ErrNotExist
)
:
if
err
:=
pull
(
model
,
false
);
err
!=
nil
{
if
err
:=
pull
(
args
[
0
]
,
false
);
err
!=
nil
{
var
apiStatusError
api
.
StatusError
if
!
errors
.
As
(
err
,
&
apiStatusError
)
{
return
err
...
...
@@ -102,13 +83,6 @@ func checkPull(model string) error {
return
err
}
return
nil
}
func
RunHandler
(
cmd
*
cobra
.
Command
,
args
[]
string
)
error
{
if
err
:=
checkPull
(
args
[
0
]);
err
!=
nil
{
return
err
}
return
RunGenerate
(
cmd
,
args
)
}
...
...
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