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
0fea50cd
Unverified
Commit
0fea50cd
authored
Jul 07, 2023
by
Michael Yang
Committed by
GitHub
Jul 07, 2023
Browse files
Merge pull request #54 from jmorganca/empty-line
no prompt on empty line
parents
c3168935
053739d1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
27 deletions
+32
-27
cmd/cmd.go
cmd/cmd.go
+31
-27
server/templates/wizardlm.prompt
server/templates/wizardlm.prompt
+1
-0
No files found.
cmd/cmd.go
View file @
0fea50cd
...
@@ -9,6 +9,7 @@ import (
...
@@ -9,6 +9,7 @@ import (
"net"
"net"
"os"
"os"
"path"
"path"
"strings"
"time"
"time"
"github.com/schollz/progressbar/v3"
"github.com/schollz/progressbar/v3"
...
@@ -75,38 +76,41 @@ func RunGenerate(_ *cobra.Command, args []string) error {
...
@@ -75,38 +76,41 @@ func RunGenerate(_ *cobra.Command, args []string) error {
}
}
func
generate
(
model
,
prompt
string
)
error
{
func
generate
(
model
,
prompt
string
)
error
{
client
:=
api
.
NewClient
()
if
len
(
strings
.
TrimSpace
(
prompt
))
>
0
{
client
:=
api
.
NewClient
()
spinner
:=
progressbar
.
NewOptions
(
-
1
,
progressbar
.
OptionSetWriter
(
os
.
Stderr
),
spinner
:=
progressbar
.
NewOptions
(
-
1
,
progressbar
.
OptionThrottle
(
60
*
time
.
Millisecond
),
progressbar
.
OptionSetWriter
(
os
.
Stderr
),
progressbar
.
OptionSpinnerType
(
14
),
progressbar
.
OptionThrottle
(
60
*
time
.
Millisecond
),
progressbar
.
OptionSetRenderBlankState
(
true
),
progressbar
.
OptionSpinnerType
(
14
),
progressbar
.
OptionSetElapsedTime
(
false
),
progressbar
.
OptionSetRenderBlankState
(
true
),
progressbar
.
OptionClearOnFinish
(),
progressbar
.
OptionSetElapsedTime
(
false
),
)
progressbar
.
OptionClearOnFinish
(),
)
go
func
()
{
for
range
time
.
Tick
(
60
*
time
.
Millisecond
)
{
go
func
()
{
if
spinner
.
IsFinished
()
{
for
range
time
.
Tick
(
60
*
time
.
Millisecond
)
{
break
if
spinner
.
IsFinished
()
{
break
}
spinner
.
Add
(
1
)
}
}
}()
spinner
.
Add
(
1
)
client
.
Generate
(
context
.
Background
(),
&
api
.
GenerateRequest
{
Model
:
model
,
Prompt
:
prompt
},
func
(
resp
api
.
GenerateResponse
)
error
{
}
if
!
spinner
.
IsFinished
()
{
}()
spinner
.
Finish
()
}
client
.
Generate
(
context
.
Background
(),
&
api
.
GenerateRequest
{
Model
:
model
,
Prompt
:
prompt
},
func
(
resp
api
.
GenerateResponse
)
error
{
fmt
.
Print
(
resp
.
Response
)
if
!
spinner
.
IsFinished
()
{
return
nil
spinner
.
Finish
()
})
}
fmt
.
Print
(
resp
.
Response
)
fmt
.
Print
ln
(
)
return
nil
fmt
.
Println
()
}
)
}
fmt
.
Println
()
fmt
.
Println
()
return
nil
return
nil
}
}
...
...
server/templates/wizardlm.prompt
View file @
0fea50cd
{{ .Prompt }}
{{ .Prompt }}
### Response:
### Response:
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