Commit Graph

307 Commits

Author SHA1 Message Date
56497663c8 relay model runner error message to client (#720)
* give direction to user when runner fails
* also relay errors from timeout
* increase timeout to 3 minutes
2023-10-12 11:16:37 -04:00
2cfffea02e handle client proxy 2023-10-09 12:33:47 -07:00
61ff1946e6 revise help text (#706) 2023-10-05 11:36:07 -07:00
d104b7e997 Fix go test./... issue: fmt.Println arg list ends with redundant newline (#705) 2023-10-05 11:11:04 -04:00
1852755154 show a default message when license/parameters/system prompt/template aren't specified (#681) 2023-10-02 14:34:52 -07:00
99d5161e8a don't wordwrap when stdout is redirected or piped (#662) 2023-10-02 11:50:55 -07:00
9333b0cc82 Merge pull request #612 from jmorganca/mxyng/prune-empty-directories
prune empty directories
2023-09-29 11:23:39 -07:00
76db4a49cf allow the user to cancel generating with ctrl-C (#641) 2023-09-28 17:13:01 -07:00
4aa0976a2e Added missing return preventing SIGSEGV because of missing resp (#621)
Co-authored-by: Luc Stepniewski <luc@eclipse-fr.com>
2023-09-28 14:25:22 -07:00
92c20fdae6 fix error messages for unknown commands in the repl (#611) 2023-09-28 14:19:45 -07:00
f40b3de758 use int64 consistently 2023-09-28 11:07:24 -07:00
8608eb4760 prune empty directories 2023-09-27 10:58:09 -07:00
0625e805f0 fix model name not matching 2023-09-26 19:50:04 -07:00
93d887e4bc add painter message for exit 2023-09-25 16:30:22 -07:00
b5614f3ebc fix end-of-line issue with the new prompt (#582) 2023-09-23 17:20:30 -07:00
01c44d687e add multi line strings to final prompt 2023-09-23 00:27:24 -04:00
e20362e0d5 fix multi line input in ollama run 2023-09-22 23:49:35 -04:00
c928ceb927 add word wrapping for lines which are longer than the terminal width (#553) 2023-09-22 13:36:08 -07:00
87d9efb364 switch to forked readline lib which doesn't wreck the repl prompt (#578) 2023-09-22 12:17:45 -07:00
88897a90e4 fix ipv6 parse ip 2023-09-22 10:41:32 -07:00
6137b12799 validate existence and pull model using api 2023-09-21 09:55:34 -07:00
9297ff8330 fix OLLAMA_HOST parsing for ip6 2023-09-20 18:52:57 -07:00
58ffa03d8b fix impossible condition 2023-09-20 11:27:44 -07:00
a5520bfb42 fix build 2023-09-19 10:42:24 -07:00
b58d5d16b0 fix mkdir on windows 2023-09-19 09:41:13 -07:00
80dd44e80a Cmd changes (#541) 2023-09-18 12:26:56 -07:00
e7e91cd71c add autoprune to remove unused layers (#491) 2023-09-11 11:46:35 -07:00
1adfa67589 tighten up the error string for ollama show flags (#476) 2023-09-06 13:38:49 -07:00
790d24eb7b add show command (#474) 2023-09-06 11:04:17 -07:00
8bbff2df98 add model IDs (#439) 2023-08-28 20:50:24 -07:00
2ecc3a33c3 delete all models (not just 1st) in ollama rm (#415)
Previously, `ollama rm model1 model2 modelN` would only delete `model1`. The other model command-line arguments would be silently ignored. Now, all models mentioned are deleted.
2023-08-26 00:47:56 -07:00
9ec7e37534 Merge pull request #392 from jmorganca/mxyng/version
add version
2023-08-22 09:50:25 -07:00
2c7f956b38 add version 2023-08-22 09:40:58 -07:00
a9f6c56652 fix FROM instruction erroring when referring to a file 2023-08-22 09:39:42 -07:00
0a892419ad Strip protocol from model path (#377) 2023-08-21 21:56:56 -07:00
0ebec07569 Merge pull request #345 from jmorganca/exit-non-zero
set non-zero error code on error
2023-08-16 09:20:28 -07:00
67e593e355 cmd: support OLLAMA_CLIENT_HOST environment variable (#262)
* cmd: support OLLAMA_HOST environment variable

This commit adds support for the OLLAMA_HOST environment
variable. This variable can be used to specify the host to which
the client should connect. This is useful when the client is
running somewhere other than the host where the server is running.

The new api.FromEnv function is used to read configure clients from the
environment. Clients wishing to use the environment variable being
consistent with the Ollama CLI can use this new function.

* Update api/client.go

Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>

* Update api/client.go

Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>

---------

Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
2023-08-16 11:03:48 -04:00
76b85bc0e9 set non-zero error code on error 2023-08-14 14:09:58 -07:00
1556162c90 create .ollama directory if it doesnt exist 2023-08-11 15:35:55 -07:00
9770e3b325 Generate private/public keypair for use w/ auth (#324) 2023-08-11 10:58:23 -07:00
7e26a8df31 cmd: use environment variables for server options 2023-08-10 14:17:53 -07:00
bea683e3bf cmd: check GetBlobsPath error (#317)
The error returned by `server.GetBlobsPath` in `showLayer` was never
checked. Check the error and return if not nil. Also, make newlines at
the end of error messages consistent and fix a typo.
2023-08-10 09:57:49 -07:00
f65169b13e clean up cli flags 2023-08-10 09:28:56 -07:00
040a5b9750 clean up cli flags 2023-08-10 09:27:03 -07:00
a6f6d18f83 embed text document in modelfile 2023-08-08 11:27:17 -04:00
93492f1e18 correct precedence of serve params (args over env over default) 2023-08-07 19:55:20 +00:00
fb593b7bfc pass flags to serve to allow setting allowed-origins + host and port
* resolves: https://github.com/jmorganca/ollama/issues/300 and
https://github.com/jmorganca/ollama/issues/282

* example usage:
```
ollama serve --port 9999 --allowed-origins "http://foo.example.com,http://192.0.0.1"
```
2023-08-07 03:34:37 +00:00
bd6d741d87 tell users to check the server error logs 2023-08-02 17:08:11 -04:00
8f8b6288ac check server is running before running command 2023-08-02 10:51:23 -04:00
50e87c6691 read from os executable 2023-08-01 16:01:55 -04:00