add new list command

app/forge.config.ts

@@ -1,4 +1,4 @@
-import type { ForgeConfig } from '@electron-forge/shared-types'
+import type { ForgeConfig, ResolvedForgeConfig, ForgeMakeResult } from '@electron-forge/shared-types'
 import { MakerSquirrel } from '@electron-forge/maker-squirrel'
 import { MakerZIP } from '@electron-forge/maker-zip'
 import { PublisherGithub } from '@electron-forge/publisher-github'

app/src/index.ts

@@ -162,6 +162,7 @@ app.on('ready', () => {
 
   // This is the first run or the CLI is no longer installed
   app.setLoginItemSettings({ openAtLogin: true })
+
   firstRunWindow()
 })
 

cmd/cmd.go

@@ -9,6 +9,7 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path/filepath"
 	"strings"
 	"time"
 
@@ -23,21 +24,22 @@ import (
 	"github.com/jmorganca/ollama/server"
 )
 
+func cacheDir() string {
+	home, err := os.UserHomeDir()
+	if err != nil {
+		panic(err)
+	}
+
+	return filepath.Join(home, ".ollama")
+}
+
 func create(cmd *cobra.Command, args []string) error {
 	filename, _ := cmd.Flags().GetString("file")
 	client := api.NewClient()
 
-	var spinner *Spinner
-
 	request := api.CreateRequest{Name: args[0], Path: filename}
 	fn := func(resp api.CreateProgress) error {
-		if spinner != nil {
-			spinner.Stop()
-		}
-
-		spinner = NewSpinner(resp.Status)
-		go spinner.Spin(100 * time.Millisecond)
-
+		fmt.Println(resp.Status)
 		return nil
 	}
 
@@ -45,10 +47,6 @@ func create(cmd *cobra.Command, args []string) error {
 		return err
 	}
 
-	if spinner != nil {
-		spinner.Stop()
-	}
-
 	return nil
 }
 
@@ -178,8 +176,24 @@ func generate(cmd *cobra.Command, model, prompt string) error {
 	if len(strings.TrimSpace(prompt)) > 0 {
 		client := api.NewClient()
 
-		spinner := NewSpinner("")
-		go spinner.Spin(60 * time.Millisecond)
+		spinner := progressbar.NewOptions(-1,
+			progressbar.OptionSetWriter(os.Stderr),
+			progressbar.OptionThrottle(60*time.Millisecond),
+			progressbar.OptionSpinnerType(14),
+			progressbar.OptionSetRenderBlankState(true),
+			progressbar.OptionSetElapsedTime(false),
+			progressbar.OptionClearOnFinish(),
+		)
+
+		go func() {
+			for range time.Tick(60 * time.Millisecond) {
+				if spinner.IsFinished() {
+					break
+				}
+
+				spinner.Add(1)
+			}
+		}()
 
 		var latest api.GenerateResponse
 
@@ -278,6 +292,10 @@ func NewCLI() *cobra.Command {
 		CompletionOptions: cobra.CompletionOptions{
 			DisableDefaultCmd: true,
 		},
+		PersistentPreRunE: func(_ *cobra.Command, args []string) error {
+			// create the models directory and it's parent
+			return os.MkdirAll(filepath.Join(cacheDir(), "models"), 0o700)
+		},
 	}
 
 	cobra.EnableCommandSorting = false

cmd/spinner.go

@@ -1,44 +0,0 @@
-package cmd
-
-import (
-	"fmt"
-	"os"
-	"time"
-
-	"github.com/schollz/progressbar/v3"
-)
-
-type Spinner struct {
-	description string
-	*progressbar.ProgressBar
-}
-
-func NewSpinner(description string) *Spinner {
-	return &Spinner{
-		description: description,
-		ProgressBar: progressbar.NewOptions(-1,
-			progressbar.OptionSetWriter(os.Stderr),
-			progressbar.OptionThrottle(60*time.Millisecond),
-			progressbar.OptionSpinnerType(14),
-			progressbar.OptionSetRenderBlankState(true),
-			progressbar.OptionSetElapsedTime(false),
-			progressbar.OptionClearOnFinish(),
-			progressbar.OptionSetDescription(description),
-		),
-	}
-}
-
-func (s *Spinner) Spin(tick time.Duration) {
-	for range time.Tick(tick) {
-		if s.IsFinished() {
-			break
-		}
-
-		s.Add(1)
-	}
-}
-
-func (s *Spinner) Stop() {
-	s.Finish()
-	fmt.Println(s.description)
-}

docs/development.md

@@ -3,13 +3,13 @@
 Install required tools:
 
 ```
-brew install go
+brew install cmake go node
 ```
 
-Then build ollama:
+Then run `make`:
 
 ```
-go build .
+make
 ```
 
 Now you can run `ollama`:

docs/modelfile.md

@@ -1,80 +0,0 @@
-# Ollama Model File Reference
-
-Ollama can build models automatically by reading the instructions from a Modelfile. A Modelfile is a text document that represents the complete configuration of the Model. You can see that a Modelfile is very similar to a Dockerfile.
-
-## Format
-
-Here is the format of the Modelfile:
-
-```modelfile
-# comment
-INSTRUCTION arguments
-```
-
-Nothing in the file is case-sensitive. However, the convention is for instructions to be uppercase to make it easier to distinguish from the arguments.
-
-A Modelfile can include instructions in any order. But the convention is to start the Modelfile with the FROM instruction.
-
-Although the example above shows a comment starting with a hash character, any instruction that is not recognized is seen as a comment. 
-
-## FROM
-
-```modelfile
-FROM <image>[:<tag>]
-```
-
-This defines the base model to be used. An image can be a known image on the Ollama Hub, or a fully-qualified path to a model file on your system
-
-## PARAMETER
-
-The PARAMETER instruction defines a parameter that can be set when the model is run. 
-
-```modelfile
-PARAMETER <parameter> <parametervalue>
-```
-
-### Valid Parameters and Values
-
-| Parameter        | Description                                                                                 | Value Type | Value Range |
-| ---------------- | ------------------------------------------------------------------------------------------- | ---------- | ----------- |
-| NumCtx           |                                                                                             | int        |             |
-| NumGPU           |                                                                                             | int        |             |
-| MainGPU          |                                                                                             | int        |             |
-| LowVRAM          |                                                                                             | bool       |             |
-| F16KV            |                                                                                             | bool       |             |
-| LogitsAll        |                                                                                             | bool       |             |
-| VocabOnly        |                                                                                             | bool       |             |
-| UseMMap          |                                                                                             | bool       |             |
-| EmbeddingOnly    |                                                                                             | bool       |             |
-| RepeatLastN      |                                                                                             | int        |             |
-| RepeatPenalty    |                                                                                             | float      |             |
-| FrequencyPenalty |                                                                                             | float      |             |
-| PresencePenalty  |                                                                                             | float      |             |
-| temperature      | The temperature of the model. Higher temperatures result in more creativity in the response | float      | 0 - 1       |
-| TopK             |                                                                                             | int        |             |
-| TopP             |                                                                                             | float      |             |
-| TFSZ             |                                                                                             | float      |             |
-| TypicalP         |                                                                                             | float      |             |
-| Mirostat         |                                                                                             | int        |             |
-| MirostatTau      |                                                                                             | float      |             |
-| MirostatEta      |                                                                                             | float      |             |
-| NumThread        |                                                                                             | int |             |
-
-
-## PROMPT
-
-Prompt is a multiline instruction that defines the prompt to be used when the model is run. Typically there are 3-4 components to a prompt: System, context, user, and response.
-
-```modelfile
-PROMPT """
-{{- if not .Context }}
-### System:
-You are a content marketer who needs to come up with a short but succinct tweet. Make sure to include the appropriate hashtags and links. Sometimes when appropriate, describe a meme that can be includes as well. All answers should be in the form of a tweet which has a max size of 280 characters. Every instruction will be the topic to create a tweet about.
-{{- end }}
-### Instruction:
-{{ .Prompt }}
-
-### Response:
-"""
-
-```

examples/modelfiles/midjourneyprompter

@@ -1,14 +0,0 @@
-# Modelfile for creating a Midjourney prompts from a topic
-# Run `ollama create mj -f pathtofile` and then `ollama run mj` and enter a topic
-
-FROM library/nous-hermes:latest
-PROMPT """
-{{- if not .Context }}
-### System:
-Embrace your role as an AI-powered creative assistant, employing Midjourney to manifest compelling AI-generated art. I will outline a specific image concept, and in response, you must produce an exhaustive, multifaceted prompt for Midjourney, ensuring every detail of the original concept is represented in your instructions. Midjourney doesn't do well with text, so after the prompt, give me instructions that I can use to create the titles in a image editor.
-{{- end }}
-### Instruction:
-{{ .Prompt }}
-
-### Response:
-"""

examples/modelfiles/recipemaker

@@ -1,13 +0,0 @@
-# Modelfile for creating a recipe from a list of ingredients
-# Run `ollama create recipemaker -f pathtofile` and then `ollama run recipemaker` and feed it lists of ingredients to create recipes around.
-FROM library/nous-hermes:latest
-PROMPT """
-{{- if not .Context }}
-### System:
-The instruction will be a list of ingredients. You should generate a recipe that can be made in less than an hour. You can also include ingredients that most people will find in their pantry every day. The recipe should be 4 people and you should include a description of what the meal will taste like
-{{- end }}
-### Instruction:
-{{ .Prompt }}
-
-### Response:
-"""

examples/modelfiles/tweetwriter

@@ -1,14 +0,0 @@
-# Modelfile for creating a tweet from a topic
-# Run `ollama create tweetwriter -f pathtofile` and then `ollama run tweetwriter` and enter a topic 
-
-FROM library/nous-hermes:latest
-PROMPT """
-{{- if not .Context }}
-### System:
-You are a content marketer who needs to come up with a short but succinct tweet. Make sure to include the appropriate hashtags and links. Sometimes when appropriate, describe a meme that can be includes as well. All answers should be in the form of a tweet which has a max size of 280 characters. Every instruction will be the topic to create a tweet about.
-{{- end }}
-### Instruction:
-{{ .Prompt }}
-
-### Response:
-"""

server/modelpath.go

@@ -106,10 +106,10 @@ func GetBlobsPath(digest string) (string, error) {
 		return "", err
 	}
 
-	path := filepath.Join(home, ".ollama", "models", "blobs", digest)
+	path := filepath.Join(home, ".ollama", "models", "blobs")
 	if err := os.MkdirAll(filepath.Dir(path), 0o755); err != nil {
 		return "", err
 	}
 
-	return path, nil
+	return filepath.Join(path, digest), nil
 }

server/routes.go

@@ -206,8 +206,8 @@ func list(c *gin.Context) {
 			mp := ParseModelPath(tag)
 			manifest, err := GetManifest(mp)
 			if err != nil {
-				log.Printf("skipping file: %s", fp)
-				return nil
+				log.Printf("couldn't get manifest: %v", err)
+				return err
 			}
 			model := api.ListResponseModel{
 				Name:       mp.GetShortTagname(),