ollama: implement ollama with llama3 command

.vscode/launch.json

@@ -286,5 +286,19 @@
         "updatemodel",
       ],
     },
+    {
+      "name": "ollama",
+      "type": "go",
+      "request": "launch",
+      "mode": "auto",
+      "program": "${workspaceFolder}/main.go",
+      //   "envFile": "${workspaceFolder}/prod_lite.env",
+      // "envFile": "${workspaceFolder}/local.env",
+      "args": [
+        "ollama",
+        "--model",
+        "llama2",
+      ],
+    }
   ]
 }

Makefile

@@ -7,13 +7,17 @@ fast-build: ## go build -o brev
 	echo ${VERSION}
 	CGO_ENABLED=0 go build -o brev -ldflags "-X github.com/brevdev/brev-cli/pkg/cmd/version.Version=${VERSION}"
 
+.PHONY: install-dev
+install-dev: fast-build ## go install
+	cp brev $(shell go env GOPATH)/bin/
+
 .PHONY: version
 version:
 	echo ${VERSION}
 
 .PHONY: dev
 dev: ## dev build
-dev: clean install generate vet fmt lint test mod-tidy
+dev: clean install-tools generate vet fmt lint test mod-tidy
 
 .PHONY: ci
 ci: ## CI build
@@ -25,10 +29,10 @@ clean: ## remove files created during build pipeline
 	rm -rf dist
 	rm -f coverage.*
 
-.PHONY: install
-install: ## go install tools
+.PHONY: install-tools
+install-tools: ## go install tools
 	$(call print-target)
-	cd tools && go install $(shell cd tools && go list -f '{{ join .Imports " " }}' -tags=tools)
+	cd tools && go install $(shell cd tools && go list -e -f '{{ join .Imports " " }}' -tags=tools)
 
 .PHONY: generate
 generate: ## go generate
@@ -80,13 +84,13 @@ diff: ## git diff
 
 .PHONY: build
 build: ## goreleaser --snapshot --skip-publish --rm-dist
-build: install
+build: install-tools
 	$(call print-target)
 	goreleaser --snapshot --skip-publish --rm-dist
 
 .PHONY: release
 release: ## goreleaser --rm-dist
-release: install
+release: install-tools
 	$(call print-target)
 	goreleaser --rm-dist
 
@@ -273,4 +277,4 @@ new-cmd:
 
 .PHONY: develop-with-nix
 develop-with-nix:
-	nix develop .
+	nix develop .

pkg/cmd/cmd.go

@@ -26,8 +26,8 @@ import (
 	"github.com/brevdev/brev-cli/pkg/cmd/logout"
 	"github.com/brevdev/brev-cli/pkg/cmd/ls"
 	"github.com/brevdev/brev-cli/pkg/cmd/notebook"
+	"github.com/brevdev/brev-cli/pkg/cmd/ollama"
 	"github.com/brevdev/brev-cli/pkg/cmd/open"
-	"github.com/brevdev/brev-cli/pkg/cmd/optimizeinstances"
 	"github.com/brevdev/brev-cli/pkg/cmd/org"
 	"github.com/brevdev/brev-cli/pkg/cmd/portforward"
 	"github.com/brevdev/brev-cli/pkg/cmd/postinstall"
@@ -97,7 +97,7 @@ func NewBrevCommand() *cobra.Command { //nolint:funlen,gocognit,gocyclo // defin
 	loginCmdStore := fsStore.WithNoAuthHTTPClient(
 		store.NewNoAuthHTTPClient(conf.GetBrevAPIURl()),
 	).
-		WithAuth(loginAuth)
+		WithAuth(loginAuth, store.WithDebug(conf.GetDebugHTTP()))
 
 	err := loginCmdStore.SetForbiddenStatusRetryHandler(func() error {
 		_, err1 := loginAuth.GetAccessToken()
@@ -207,19 +207,18 @@ func NewBrevCommand() *cobra.Command { //nolint:funlen,gocognit,gocyclo // defin
 		},
 	}
 	cobra.AddTemplateFunc("hasContextCommands", hasContextCommands)
-	cobra.AddTemplateFunc("isContextCommand", isContextCommand)
 	cobra.AddTemplateFunc("contextCommands", contextCommands)
 	cobra.AddTemplateFunc("hasSSHCommands", hasSSHCommands)
-	cobra.AddTemplateFunc("isSSHCommand", isSSHCommand)
 	cobra.AddTemplateFunc("sshCommands", sshCommands)
 	cobra.AddTemplateFunc("hasWorkspaceCommands", hasWorkspaceCommands)
-	cobra.AddTemplateFunc("isWorkspaceCommand", isWorkspaceCommand)
 	cobra.AddTemplateFunc("workspaceCommands", workspaceCommands)
 	cobra.AddTemplateFunc("hasHousekeepingCommands", hasHousekeepingCommands)
 	cobra.AddTemplateFunc("hasDebugCommands", hasDebugCommands)
+	cobra.AddTemplateFunc("debugCommands", debugCommands)
 	cobra.AddTemplateFunc("printCautiousMetaCmdMessage", printCautiousMetaCmdMessage)
-	cobra.AddTemplateFunc("isHousekeepingCommand", isHousekeepingCommand)
 	cobra.AddTemplateFunc("housekeepingCommands", housekeepingCommands)
+	cobra.AddTemplateFunc("hasQuickstartCommands", hasQuickstartCommands)
+	cobra.AddTemplateFunc("quickstartCommands", quickstartCommands)
 
 	cmds.SetUsageTemplate(usageTemplate)
 
@@ -263,14 +262,13 @@ func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *stor
 	cmd.AddCommand(importideconfig.NewCmdImportIDEConfig(t, noLoginCmdStore))
 	cmd.AddCommand(shell.NewCmdShell(t, loginCmdStore, noLoginCmdStore))
 	cmd.AddCommand(open.NewCmdOpen(t, loginCmdStore, noLoginCmdStore))
-	cmd.AddCommand(optimizeinstances.NewCmdOptimizeInstances(t, loginCmdStore))
-	cmd.AddCommand(optimizeinstances.NewCmdOptimize(t, loginCmdStore))
-
+	cmd.AddCommand(ollama.NewCmdOllama(t, loginCmdStore))
 	cmd.AddCommand(background.NewCmdBackground(t, loginCmdStore))
 	cmd.AddCommand(status.NewCmdStatus(t, loginCmdStore))
 	cmd.AddCommand(secret.NewCmdSecret(loginCmdStore, t))
 	cmd.AddCommand(sshkeys.NewCmdSSHKeys(t, loginCmdStore))
 	cmd.AddCommand(start.NewCmdStart(t, loginCmdStore, noLoginCmdStore))
+	cmd.AddCommand(start.NewCmdStart(t, loginCmdStore, noLoginCmdStore))
 	cmd.AddCommand(create.NewCmdCreate(t, loginCmdStore))
 	cmd.AddCommand(stop.NewCmdStop(t, loginCmdStore, noLoginCmdStore))
 	cmd.AddCommand(delete.NewCmdDelete(t, loginCmdStore, noLoginCmdStore))
@@ -293,12 +291,16 @@ func createCmdTree(cmd *cobra.Command, t *terminal.Terminal, loginCmdStore *stor
 	cmd.AddCommand(updatemodel.NewCmdupdatemodel(t, loginCmdStore))
 }
 
+func hasQuickstartCommands(cmd *cobra.Command) bool {
+	return len(quickstartCommands(cmd)) > 0
+}
+
 func hasHousekeepingCommands(cmd *cobra.Command) bool {
 	return len(housekeepingCommands(cmd)) > 0
 }
 
 func hasDebugCommands(cmd *cobra.Command) bool {
-	return len(debugsCommands(cmd)) > 0
+	return len(debugCommands(cmd)) > 0
 }
 
 func printCautiousMetaCmdMessage() string {
@@ -318,6 +320,16 @@ func hasContextCommands(cmd *cobra.Command) bool {
 	return len(contextCommands(cmd)) > 0
 }
 
+func quickstartCommands(cmd *cobra.Command) []*cobra.Command {
+	cmds := []*cobra.Command{}
+	for _, sub := range cmd.Commands() {
+		if isQuickstartCommand(sub) {
+			cmds = append(cmds, sub)
+		}
+	}
+	return cmds
+}
+
 func housekeepingCommands(cmd *cobra.Command) []*cobra.Command {
 	cmds := []*cobra.Command{}
 	for _, sub := range cmd.Commands() {
@@ -328,7 +340,7 @@ func housekeepingCommands(cmd *cobra.Command) []*cobra.Command {
 	return cmds
 }
 
-func debugsCommands(cmd *cobra.Command) []*cobra.Command {
+func debugCommands(cmd *cobra.Command) []*cobra.Command {
 	cmds := []*cobra.Command{}
 	for _, sub := range cmd.Commands() {
 		if isDebugCommand(sub) {
@@ -368,44 +380,34 @@ func contextCommands(cmd *cobra.Command) []*cobra.Command {
 	return cmds
 }
 
+func isQuickstartCommand(cmd *cobra.Command) bool {
+	_, ok := cmd.Annotations["quickstart"]
+	return ok
+}
+
 func isHousekeepingCommand(cmd *cobra.Command) bool {
-	if _, ok := cmd.Annotations["housekeeping"]; ok {
-		return true
-	} else {
-		return false
-	}
+	_, ok := cmd.Annotations["housekeeping"]
+	return ok
 }
 
 func isDebugCommand(cmd *cobra.Command) bool {
-	if _, ok := cmd.Annotations["debug"]; ok {
-		return true
-	} else {
-		return false
-	}
+	_, ok := cmd.Annotations["debug"]
+	return ok
 }
 
 func isSSHCommand(cmd *cobra.Command) bool {
-	if _, ok := cmd.Annotations["ssh"]; ok {
-		return true
-	} else {
-		return false
-	}
+	_, ok := cmd.Annotations["ssh"]
+	return ok
 }
 
 func isWorkspaceCommand(cmd *cobra.Command) bool {
-	if _, ok := cmd.Annotations["workspace"]; ok {
-		return true
-	} else {
-		return false
-	}
+	_, ok := cmd.Annotations["workspace"]
+	return ok
 }
 
 func isContextCommand(cmd *cobra.Command) bool {
-	if _, ok := cmd.Annotations["context"]; ok {
-		return true
-	} else {
-		return false
-	}
+	_, ok := cmd.Annotations["context"]
+	return ok
 }
 
 var usageTemplate = `Usage:{{if .Runnable}}
@@ -439,6 +441,13 @@ SSH Commands:
   {{rpad .Name .NamePadding }} {{.Short}}
 {{- end}}{{- end}}
 
+{{- if hasQuickstartCommands . }}
+
+Quickstart Commands:
+{{- range quickstartCommands . }}
+  {{rpad .Name .NamePadding }} {{.Short}}
+{{- end}}{{- end}}
+
 {{- if hasHousekeepingCommands . }}
 
 Housekeeping Commands:
@@ -448,8 +457,8 @@ Housekeeping Commands:
 
 {{- if hasDebugCommands . }}
 
-Housekeeping Commands:
-{{- range housekeepingCommands . }}
+Debug Commands:
+{{- range debugCommands . }}
   {{rpad .Name .NamePadding }} {{.Short}}
 {{- end}}{{- end}}
 

pkg/cmd/envsetup/envsetup.go

@@ -452,7 +452,6 @@ logs:
 	stringToAppend := fmt.Sprintf("\nlogs_enabled: true\nhostname: %s\n", hostname)
 	// add logs_enabled: true to /etc/datadog-agent/datadog.yaml
 	err = e.store.AppendString("/etc/datadog-agent/datadog.yaml", stringToAppend)
-
 	if err != nil {
 		return breverrors.WrapAndTrace(err)
 	}