third-party-mirrors/ollama
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clean up

Browse Source
This commit is contained in:
Bruce MacDonald 2023-11-15 16:48:31 -05:00
parent 8c044c8dd2
commit 2d5d926ce0
3 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/types.go
View File

@ -32,11 +32,11 @@ func (e StatusError) Error() string {
type GenerateRequest struct {
Model string `json:"model"`
Prompt string `json:"prompt"` // prompt sends a message as the user
Prompt string `json:"prompt"`
System string `json:"system"`
Template string `json:"template"`
Context []int `json:"context,omitempty"` // DEPRECATED: context is deprecated, use messages instead
Messages []Message `json:"messages,omitempty"` // messages sent in the conversation so far
Context []int `json:"context,omitempty"` // DEPRECATED: context is deprecated, use messages instead
Messages []Message `json:"messages,omitempty"`
Stream *bool `json:"stream,omitempty"`
Raw bool `json:"raw,omitempty"`
Format string `json:"format"`
@ -45,7 +45,7 @@ type GenerateRequest struct {
}
type Message struct {
Role string `json:"role"`
Role string `json:"role"` // one of ["system", "user", "assistant"]
Content string `json:"content"`
}
@ -96,8 +96,8 @@ type Runner struct {
type GenerateResponse struct {
Model string `json:"model"`
CreatedAt time.Time `json:"created_at"`
Response string `json:"response,omitempty"` // the last response chunk when streaming
Message *Message `json:"message,omitempty"`
Response string `json:"response,omitempty"` // the latest response chunk when streaming
Message *Message `json:"message,omitempty"` // the latest message chunk when streaming
Done bool `json:"done"`
Context []int `json:"context,omitempty"`

7
cmd/cmd.go
View File

@ -549,10 +549,9 @@ func generate(cmd *cobra.Command, model, prompt string, messages []api.Message,
return nil, err
}
if prompt != "" || len(messages) > 0 {
fmt.Println()
fmt.Println()
}
// spacing for readability
fmt.Println()
fmt.Println()
if !latest.Done {
if abort {

1
server/routes.go
View File

@ -307,7 +307,6 @@ func promptFromRequestParams(c *gin.Context, model *Model, req api.GenerateReque
var prompt strings.Builder
if req.Context != nil {
// TODO: context is deprecated, at some point the context logic within this conditional should be removed
// if the request has a context rather than messages, decode it and add it to the prompt
prevCtx, err := loaded.runner.Decode(c.Request.Context(), req.Context)
if err != nil {
return "", err