Commit Graph

271 Commits

Author SHA1 Message Date
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
40a25bf8c3 pr comments 2023-08-01 13:48:48 -04:00
528bafa585 cache loaded model 2023-08-01 11:24:18 -04:00
36d6081ed1 find symlink of mac app 2023-07-31 17:38:10 -04:00
e72fe7945f check server is running before running command 2023-07-31 16:25:57 -04:00
d1c098b038 tell users to check the server error logs 2023-07-31 11:49:33 -04:00
39bb25d5f6 allow multiline text using three double-quotes (#239) 2023-07-29 13:35:23 -07:00
01d155c969 show system/template/license layers from cmd prompt (#223) 2023-07-27 16:58:40 -07:00
35af37a2cb session id 2023-07-27 09:31:44 -07:00
4c1caa3733 download models when creating from modelfile 2023-07-25 14:25:13 -04:00
12ab8f8f5f Revert "pull model on make if not present locally"
This reverts commit 360a10ace391a674de60aa7b9b8cb65e8074027c.
2023-07-25 14:18:46 -04:00
8ebbd12f21 pull model on make if not present locally 2023-07-25 14:18:46 -04:00
4cb42ca55e add copy command (#191) 2023-07-24 11:27:28 -04:00
88c55199f8 change push to chunked uploads from monolithic (#179) 2023-07-22 17:31:26 -07:00
6d6b0d3321 change error handler behavior and fix error when a model isn't found (#173) 2023-07-21 23:02:12 -07:00
9f6e97865c allow pushing/pulling to insecure registries (#157) 2023-07-21 15:42:19 -07:00
e7a393de54 add rm command for models (#151) 2023-07-20 16:09:23 -07:00
a3badaf103 add ls alias (#152) 2023-07-20 15:28:27 -07:00
55b5f5dc34 ctrl+c on empty line exits (#135) 2023-07-20 00:53:08 -07:00
e4d7f3e287 vendor in progress bar and change to bytes instead of bibytes (#130) 2023-07-19 17:24:03 -07:00
dbc90576b8 add verbose/quiet commands 2023-07-19 13:34:56 -07:00
84200dcde6 use readline 2023-07-19 13:34:56 -07:00
a6d03dd510 Merge pull request #110 from jmorganca/fix-pull-0-bytes
fix pull 0 bytes on completed layer
2023-07-18 19:38:59 -07:00
68df36ae50 fix pull 0 bytes on completed layer 2023-07-18 19:38:11 -07:00
d4cfee79d5 resolve modelfile before passing to server 2023-07-18 19:34:05 -07:00
885f67a471 Merge pull request #92 from jmorganca/create-model-spinner
Create model spinner
2023-07-18 11:15:45 -07:00
5bea29f610 add new list command (#97) 2023-07-18 09:09:45 -07:00
4a28a2f093 add modelpaths (#96) 2023-07-17 22:44:21 -07:00
e4300e1eb7 add spinner to create 2023-07-17 14:15:42 -07:00
aba706ea2d remove unused persistent pre run 2023-07-17 14:14:57 -07:00
2fb52261ad basic distribution w/ push/pull (#78)
* basic distribution w/ push/pull

* add the parser

* add create, pull, and push

* changes to the parser, FROM line, and fix commands

* mkdirp new manifest directories

* make `blobs` directory if it does not exist

* fix go warnings

* add progressbar for model pulls

* move model struct

---------

Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
2023-07-16 17:02:22 -07:00
743e957d88 use filepath for os compat 2023-07-14 17:27:14 -07:00
1775647f76 continue conversation
feed responses back into the llm
2023-07-13 17:13:00 -07:00
05e08d2310 return more info in generate response 2023-07-13 09:37:32 -07:00
0944b01e7d pull fixes 2023-07-12 09:55:07 -07:00
e243329e2e check api status 2023-07-11 13:42:05 -07:00
edba935d67 return error in generate response 2023-07-10 13:30:10 -07:00