baalajimaestro/ollama
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
2925 commits 1 branch 0 tags 13 MiB
Commit graph

2925 commits

This branch
This branch
All branches
Author SHA1 Message Date
Bruce MacDonald
e3f925fc1b
fix: restore modelfile system in prompt template (#1425) 2023-12-08 14:20:19 -05:00
Jeffrey Morgan
2a2289fb6b
Update api.md 2023-12-08 09:36:45 -08:00
Matt Williams
dd427f499a
Merge pull request #1419 from jmorganca/mattw/typescript-simplechat 
Simple chat example for typescript
 2023-12-07 14:42:24 -08:00
Michael Yang
2ae573c7ed
Merge pull request #1421 from jmorganca/mxyng/fix-newline 
fix redundant newline
 2023-12-07 13:47:23 -08:00
Matt Williams
02fe26c44b update the readme as per bruce 
Signed-off-by: Matt Williams <m@technovangelist.com>
 2023-12-07 13:46:30 -08:00
Michael Yang
16c7548460 fix redundant newline 2023-12-07 13:44:45 -08:00
Matt Williams
fa75998c0d
Update examples/typescript-simplechat/readme.md 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-07 13:40:54 -08:00
Matt Williams
5344f886c8
Update examples/typescript-simplechat/client.ts 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-07 13:40:37 -08:00
Matt Williams
6cc823c9b5
Update examples/typescript-simplechat/client.ts 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-07 13:39:59 -08:00
Matt Williams
b84d34e632
Update examples/typescript-simplechat/readme.md 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-07 13:39:33 -08:00
Matt Williams
30229a913c
Update examples/typescript-simplechat/client.ts 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-07 13:39:24 -08:00
Matt Williams
1ade380bd7 Simple chat example for typescript 
Signed-off-by: Matt Williams <m@technovangelist.com>
 2023-12-07 11:48:25 -08:00
Jeffrey Morgan
ba264e9da8 add future version note to chat api docs 2023-12-07 09:42:15 -08:00
Matt Williams
a2405ec831
Merge pull request #1409 from jmorganca/mattw/python-simplechat 
Simple chat example
 2023-12-06 15:49:45 -08:00
Matt Williams
ce809bb529 Merge branch 'mattw/python-simplechat' of github.com:jmorganca/ollama into mattw/python-simplechat 2023-12-06 15:48:42 -08:00
Matt Williams
76bc4d0458 Cleanup as per Bruce 
Signed-off-by: Matt Williams <m@technovangelist.com>
 2023-12-06 15:44:40 -08:00
Bruce MacDonald
4a02945a15
Update examples/python-simplechat/client.py 2023-12-06 18:36:45 -05:00
Matt Williams
aec742b6d2
Update examples/python-simplechat/readme.md 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-06 15:30:45 -08:00
Matt Williams
f337642e94
Update examples/python-simplechat/readme.md 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-06 15:30:35 -08:00
Matt Williams
51131cc6e2
Update examples/python-simplechat/client.py 
Co-authored-by: Bruce MacDonald <brucewmacdonald@gmail.com>
 2023-12-06 15:30:10 -08:00
Matt Williams
43027789dc Simple chat example 
Signed-off-by: Matt Williams <m@technovangelist.com>
 2023-12-06 14:35:58 -08:00
Xe Iaso
f9b7d65e2b
docs/tutorials: add bit on how to use Fly GPUs on-demand with Ollama (#1406) 
Signed-off-by: Xe Iaso <xe@camellia.finch-kitefin.ts.net>
 2023-12-06 14:14:02 -08:00
Michael Yang
1f05d77110
Merge pull request #1244 from jmorganca/brucemacd/no-fail-template 
do not fail on unsupported template variables
 2023-12-06 13:23:04 -08:00
Michael Yang
c3ff36088b
Merge pull request #774 from jmorganca/mxyng/server-version 
add version api and show server version in cli
 2023-12-06 13:22:55 -08:00
Samuel Calderon
13524b5e72
List "Send chat messages" in table of contents (#1399) 
Thank you @calderonsamuel
 2023-12-06 12:34:27 -08:00
Michael Yang
f1b049fed8
Merge pull request #1377 from jmorganca/mxyng/qwen 
update for qwen
 2023-12-06 12:31:51 -08:00
Jeffrey Morgan
97c5696945 fix base urls in chat examples 2023-12-06 12:10:20 -08:00
Bruce MacDonald
47d4e22673 use missingkey in set empty interface when missing 2023-12-05 15:49:05 -08:00
Michael Yang
32f62fbb8e
Merge pull request #1334 from jmorganca/mxyng/load-projectors 
load projectors
 2023-12-05 14:40:53 -08:00
Michael Yang
5d75505ebd return model configuration in generate 2023-12-05 14:39:02 -08:00
Michael Yang
b9495ea162 load projectors 2023-12-05 14:36:12 -08:00
Michael Yang
409bb9674e
Merge pull request #1308 from jmorganca/mxyng/split-from 
split from into one or more models
 2023-12-05 14:33:03 -08:00
Michael Yang
d3479c07a1
Merge pull request #1250 from jmorganca/mxyng/create-layer 
refactor layer creation
 2023-12-05 14:32:52 -08:00
Michael Yang
b12f1b984f
Merge pull request #1393 from jmorganca/mxyng/fix-whitespace 
fix: trim space in modelfile fields
 2023-12-05 12:18:01 -08:00
Bruce MacDonald
195e3d9dbd
chat api endpoint (#1392) 2023-12-05 14:57:33 -05:00
Michael Yang
38fe1a368b fix: trim space in modelfile fields 2023-12-05 11:57:29 -08:00
Michael Yang
4b77fcb2b9 comments 2023-12-05 09:43:50 -08:00
Michael Yang
cde13bcdea cmd: only print server version when different 2023-12-05 09:36:01 -08:00
Michael Yang
0f0cd265a7 cmd: add server version 2023-12-05 09:36:01 -08:00
Michael Yang
0db4706ec2 api: add version api handler 2023-12-05 09:36:01 -08:00
Michael Yang
1ebdbd9694 server: add version handler 2023-12-05 09:36:01 -08:00
Michael Yang
5c59455b59 cmd: use existing cmd context 2023-12-05 09:36:01 -08:00
Jeffrey Morgan
00d06619a1 Revert "chat api (#991)" while context variable is fixed 
This reverts commit 7a0899d62d.
 2023-12-04 21:16:27 -08:00
Matt Williams
f1ef3f9947
remove mention of gpt-neox in import (#1381) 
Signed-off-by: Matt Williams <m@technovangelist.com>
 2023-12-04 20:58:10 -08:00
Michael Yang
5a5dca13b2 comments 2023-12-04 16:59:23 -08:00
Michael Yang
7232f1fa41 go mod tidy 2023-12-04 16:59:23 -08:00
Michael Yang
72e7a49aa9 seek instead of copyn 2023-12-04 16:59:23 -08:00
Michael Yang
a3737cbd33 use NewLayer for CreateBlobHandler 2023-12-04 16:59:23 -08:00
Michael Yang
998f1785b6 add modelfamilies 2023-12-04 16:59:23 -08:00
Michael Yang
70a93057cd refactor layer creation 
previous layer creation was not ideal because:

1. it required reading the input file multiple times, once to calculate
   the sha256 checksum, another to write it to disk, and potentially one
   more to decode the underlying gguf
2. used io.ReadSeeker which is prone to user error. if the file isn't
   reset correctly or in the right place, it could end up reading an
   empty file

there are also some brittleness when reading existing layers else
writing the inherited layers will error reading an already closed file

this commit aims to fix these issues by restructuring layer creation.

1. it will now write the layer to a temporary file as well as the hash
   function and move it to the final location on Commit
2. layers are read once once when copied to the destination. exception
   is raw model files which still requires a second read to decode the
   model metadata
 2023-12-04 16:59:23 -08:00