From 2d5d926ce0752f2e8e67daa69da01e612e4d2c0d Mon Sep 17 00:00:00 2001
From: Bruce MacDonald <brucewmacdonald@gmail.com>
Date: Wed, 15 Nov 2023 16:48:31 -0500
Subject: [PATCH] clean up

---
 api/types.go     | 12 ++++++------
 cmd/cmd.go       |  7 +++----
 server/routes.go |  1 -
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/api/types.go b/api/types.go
index 9ce0049d..e6a427c7 100644
--- a/api/types.go
+++ b/api/types.go
@@ -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"`
diff --git a/cmd/cmd.go b/cmd/cmd.go
index 0de0e1ab..32f4c88b 100644
--- a/cmd/cmd.go
+++ b/cmd/cmd.go
@@ -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 {
diff --git a/server/routes.go b/server/routes.go
index 603389cc..fdb7da13 100644
--- a/server/routes.go
+++ b/server/routes.go
@@ -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