More updates for linter

cmd/list/list.go

@@ -43,7 +43,7 @@ func NewListCommand() *cobra.Command {
 
 			// For now, filter to just chat models.
 			// Once other tasks are supported (like embeddings), update the list to show all models, with the task as a column.
-			models = ux.FilterToChatModels(models)
+			models = filterToChatModels(models)
 			ux.SortModels(models)
 
 			isTTY := terminal.IsTerminalOutput()
@@ -77,3 +77,13 @@ func NewListCommand() *cobra.Command {
 
 	return cmd
 }
+
+func filterToChatModels(models []*azuremodels.ModelSummary) []*azuremodels.ModelSummary {
+	var chatModels []*azuremodels.ModelSummary
+	for _, model := range models {
+		if ux.IsChatModel(model) {
+			chatModels = append(chatModels, model)
+		}
+	}
+	return chatModels
+}

cmd/run/run.go

@@ -437,7 +437,10 @@ func NewRunCommand() *cobra.Command {
 				}
 
 				util.WriteToOut(out, "\n")
-				messageBuilder.WriteString("\n")
+				_, err = messageBuilder.WriteString("\n")
+				if err != nil {
+					return err
+				}
 
 				conversation.AddMessage(azuremodels.ChatMessageRoleAssistant, messageBuilder.String())
 

internal/azuremodels/client.go

@@ -16,6 +16,7 @@ import (
 	"golang.org/x/text/language/display"
 )
 
+// Client provides a client for interacting with the Azure models API.
 type Client struct {
 	client *http.Client
 	token  string
@@ -93,7 +94,7 @@ func (c *Client) GetChatCompletionStream(req ChatCompletionOptions) (*ChatComple
 // GetModelDetails returns the details of the specified model in a prticular registry.
 func (c *Client) GetModelDetails(registry, modelName, version string) (*ModelDetails, error) {
 	url := fmt.Sprintf("%s/asset-gallery/v1.0/%s/models/%s/version/%s", azureAiStudioURL, registry, modelName, version)
-	httpReq, err := http.NewRequest("GET", url, nil)
+	httpReq, err := http.NewRequest("GET", url, http.NoBody)
 	if err != nil {
 		return nil, err
 	}
@@ -105,6 +106,8 @@ func (c *Client) GetModelDetails(registry, modelName, version string) (*ModelDet
 		return nil, err
 	}
 
+	defer resp.Body.Close()
+
 	if resp.StatusCode != http.StatusOK {
 		return nil, c.handleHTTPError(resp)
 	}
@@ -192,6 +195,8 @@ func (c *Client) ListModels() ([]*ModelSummary, error) {
 		return nil, err
 	}
 
+	defer resp.Body.Close()
+
 	if resp.StatusCode != http.StatusOK {
 		return nil, c.handleHTTPError(resp)
 	}

internal/azuremodels/types.go

@@ -78,6 +78,7 @@ type modelCatalogSearchSummary struct {
 	Summary        string      `json:"summary"`
 }
 
+// ModelSummary includes basic information about a model.
 type ModelSummary struct {
 	ID           string `json:"id"`
 	Name         string `json:"name"`
@@ -127,6 +128,7 @@ type modelCatalogDetailsResponse struct {
 	} `json:"modelLimits"`
 }
 
+// ModelDetails includes detailed information about a model.
 type ModelDetails struct {
 	Description               string   `json:"description"`
 	Evaluation                string   `json:"evaluation"`

internal/sse/eventreader.go

@@ -1,5 +1,6 @@
 // Forked from https://github.com/Azure/azure-sdk-for-go/blob/4661007ca1fd68b2e31f3502d4282904014fd731/sdk/ai/azopenai/event_reader.go#L18
 
+// Package sse provides a reader for Server-Sent Events (SSE) streams.
 package sse
 
 import (

internal/ux/filtering.go

@@ -2,16 +2,7 @@ package ux
 
 import "github.com/github/gh-models/internal/azuremodels"
 
+// IsChatModel returns true if the given model is for chat completions.
 func IsChatModel(model *azuremodels.ModelSummary) bool {
 	return model.Task == "chat-completion"
 }
-
-func FilterToChatModels(models []*azuremodels.ModelSummary) []*azuremodels.ModelSummary {
-	var chatModels []*azuremodels.ModelSummary
-	for _, model := range models {
-		if IsChatModel(model) {
-			chatModels = append(chatModels, model)
-		}
-	}
-	return chatModels
-}

internal/ux/sorting.go

@@ -12,6 +12,7 @@ var (
 	featuredModelNames = []string{}
 )
 
+// SortModels sorts the given models in place, with featured models first, and then by friendly name.
 func SortModels(models []*azuremodels.ModelSummary) {
 	sort.Slice(models, func(i, j int) bool {
 		// Sort featured models first, by name
@@ -20,15 +21,17 @@ func SortModels(models []*azuremodels.ModelSummary) {
 
 		if isFeaturedI && !isFeaturedJ {
 			return true
-		} else if !isFeaturedI && isFeaturedJ {
-			return false
-		} else {
-			// Otherwise, sort by friendly name
-			// Note: sometimes the casing returned by the API is inconsistent, so sort using lowercase values.
-			friendlyNameI := strings.ToLower(models[i].FriendlyName)
-			friendlyNameJ := strings.ToLower(models[j].FriendlyName)
+		}
 
-			return friendlyNameI < friendlyNameJ
+		if !isFeaturedI && isFeaturedJ {
+			return false
 		}
+
+		// Otherwise, sort by friendly name
+		// Note: sometimes the casing returned by the API is inconsistent, so sort using lowercase values.
+		friendlyNameI := strings.ToLower(models[i].FriendlyName)
+		friendlyNameJ := strings.ToLower(models[j].FriendlyName)
+
+		return friendlyNameI < friendlyNameJ
 	})
 }

main.go

@@ -1,3 +1,4 @@
+// Package main provides the entry point for the gh-models extension.
 package main
 
 import (
@@ -20,12 +21,12 @@ func main() {
 }
 
 func mainRun() exitCode {
-	cmd := cmd.NewRootCommand()
+	rootCmd := cmd.NewRootCommand()
 	exitCode := exitOK
 
 	ctx := context.Background()
 
-	if _, err := cmd.ExecuteContextC(ctx); err != nil {
+	if _, err := rootCmd.ExecuteContextC(ctx); err != nil {
 		exitCode = exitError
 	}