root
/
ollama
mirror of https://github.com/ollama/ollama.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity
4,227 Commits 291 Branches 349 Tags 291 MiB
Commit Graph

149 Commits

Author SHA1 Message Date
Daniel Hiltgen 117369aa73 Exit if we detect another copy of Ollama running 2024-02-15 14:58:29 -08:00
Daniel Hiltgen 5208cf09b1 clean up some logging 2024-02-15 14:56:55 -08:00
Daniel Hiltgen bb9de6037c Prevent multiple installers running concurrently 2024-02-15 14:56:55 -08:00
Michael Yang 86808f80a8 remove unused import 2024-02-15 12:09:11 -08:00
Michael Yang 4240b045e6 always enable view logs 2024-02-15 12:08:27 -08:00
Michael Yang e547378893 disable default debug 2024-02-15 12:05:13 -08:00
Michael Yang fd77dbec4d do not print update request headers 2024-02-15 11:36:35 -08:00
Jeffrey Morgan ed5489a96e higher resolution tray icons 2024-02-14 22:55:03 -08:00
jmorganca 76113742cf update installer title 2024-02-15 05:56:45 +00:00
Jeffrey Morgan 57e60c836f better windows app and tray icons 2024-02-15 05:56:45 +00:00
jmorganca 622b1f3e67 update installer and app.exe metadata 2024-02-15 05:56:45 +00:00
jmorganca 7ad9844ac0 set exe metadata using resource files 2024-02-15 05:56:45 +00:00
Michael Yang e43648afe5 rerefactor 2024-02-15 05:56:45 +00:00
Daniel Hiltgen 29e90cc13b Implement new Go based Desktop app 
This focuses on Windows first, but coudl be used for Mac
and possibly linux in the future.
 2024-02-15 05:56:45 +00:00
Daniel Hiltgen 9da9e8fb72 Move Mac App to a new dir 2024-02-15 05:56:45 +00:00
Jeffrey Morgan cbfff4f868 update dependencies in `app/` 2023-10-19 15:52:41 -04:00
Jeffrey Morgan 832b4db9d4 Use correct url for auto updates 2023-10-13 19:04:42 -04:00
Bruce MacDonald c43873f33b
check update response (#785) 2023-10-13 18:05:46 -04:00
Bruce MacDonald 3553d10769
check for newer updates (#784) 
Co-authored-by: Jeffrey Morgan <jmorganca@gmail.com>
 2023-10-13 17:29:46 -04:00
Bruce MacDonald 24d82a23a2
do not download updates multiple times (#633) 2023-09-28 15:29:17 -04:00
Jeffrey Morgan a5dbcf2e73 app: dont package `ggml-metal.metal` 2023-08-31 17:41:09 -04:00
Bruce MacDonald 42998d797d
subprocess llama.cpp server (#401) 
* remove c code
* pack llama.cpp
* use request context for llama_cpp
* let llama_cpp decide the number of threads to use
* stop llama runner when app stops
* remove sample count and duration metrics
* use go generate to get libraries
* tmp dir for running llm
 2023-08-30 16:35:03 -04:00
Jeffrey Morgan 3d79b414d3 app: package `ggml-metal.metal` from correct directory 2023-08-17 23:55:45 -04:00
Jeffrey Morgan 4ab1da38ba guard around `id()` 2023-08-10 14:11:54 -07:00
Jeffrey Morgan 76a678af34 app: dont always show installer window on top now that it lives in the dock 2023-08-10 09:53:46 -07:00
Jeffrey Morgan 6fbb380076 hide dock icon if window closes 2023-08-02 11:05:34 -04:00
Jeffrey Morgan c75cafdb58 build for `universal` architecture on macos 2023-07-28 12:18:11 -04:00
Jeffrey Morgan 18b6b601ad app: cleanup `README.md` 2023-07-28 10:51:41 -04:00
Jeffrey Morgan 0871083776 app: fix tray icon color scheme in dark mode 2023-07-28 07:03:46 -04:00
Jeffrey Morgan dbb3174cbc app: fix #218 and keep dock open on install 2023-07-27 10:53:38 -04:00
Jeffrey Morgan 31673d26d0 app: quit other instance when starting 2023-07-27 00:57:25 -04:00
Jeffrey Morgan d0e934b497 app: tray cleanup 2023-07-26 14:24:56 -04:00
Jeffrey Morgan e751e47d70 app: remove dialog, icons for updates 2023-07-26 14:04:36 -04:00
Jeffrey Morgan c48f07f821 app: dont advance on error 2023-07-26 10:46:43 -04:00
Jeffrey Morgan 3f2a100465 app: log app errors to `console` 2023-07-25 15:42:04 -04:00
Eva Ho 9657314ae2 address comment 2023-07-21 17:29:07 -04:00
Eva Ho 3f7d2336c7 add prettier and address comments 2023-07-21 17:10:05 -04:00
Eva Ho e0a73d7fbe address comment 2023-07-21 16:53:56 -04:00
hoyyeva b08c4ca2bd Update app/src/index.ts 
Co-authored-by: Jeffrey Morgan <251292+jmorganca@users.noreply.github.com>
 2023-07-21 16:53:56 -04:00
Eva Ho 734892f1e2 address comment 2023-07-21 16:53:56 -04:00
Eva Ho d2bfaeac63 format code 2023-07-21 16:53:56 -04:00
Eva Ho 0768b1b907 restart server with condition and timeout 2023-07-21 16:53:56 -04:00
Eva Ho dfceca48a7 update icons to have different images for bright and dark mode 2023-07-19 11:14:43 -04:00
Jeffrey Morgan 4c1dc52083 app: create `/usr/local/bin/` if it does not exist 2023-07-18 22:50:52 -07:00
Jeffrey Morgan 280fbe8019 app: use `llama2` instead of `orca` 2023-07-18 12:36:03 -07:00
Eva Ho a9cc270b4d icon update 2023-07-18 13:33:26 -04:00
Eva Ho aa281a30e5 updating icons 2023-07-18 13:33:26 -04:00
Eva Ho 508ffbbb15 improve the copy command experience 2023-07-17 13:17:52 -04:00
Jeffrey Morgan 59fa93cdd4 app: simpler winston settings 2023-07-16 20:26:12 -07:00
Jeffrey Morgan 952abe029b app: remove unused import 2023-07-16 20:25:50 -07:00
Jeffrey Morgan f923855906 app: keep installer in foreground 2023-07-16 20:25:11 -07:00
Jeffrey Morgan 9386073e96 app: dont listen for `disconnect` events 2023-07-16 19:21:50 -07:00
Jeffrey Morgan 52ea4d4bb2 app: use `app.on('before-quit')` to detect app closing 2023-07-16 19:18:12 -07:00
Jeffrey Morgan c4ba192187 app: use `enum` for steps 2023-07-16 18:47:23 -07:00
Jeffrey Morgan fe758ca319 app: do not restart the server if app is closing 2023-07-16 18:41:43 -07:00
Jeffrey Morgan 08b933cc10 app: use `async` and `await instead of callbacks 2023-07-16 18:38:37 -07:00
Jeffrey Morgan 6746a00af8 app: format `app.tsx` 2023-07-16 18:29:11 -07:00
Jeffrey Morgan 560f36e6c8 app: set `first-time-run` to `true` instead of `false` 2023-07-14 16:50:12 -07:00
hoyyeva e88dd25bab
ollama app welcome screen for first time run (#80) 2023-07-14 16:34:24 -07:00
Jeffrey Morgan dcb6ba389a app: trim server lines before logging 2023-07-11 16:43:19 -07:00
Jeffrey Morgan ed6abba75a app: bundle real `ggml-metal.metal` instead of symlink 2023-07-11 16:36:39 -07:00
Jeffrey Morgan 2ed26f0047 tweak logging 2023-07-11 16:16:38 -07:00
Jeffrey Morgan 3d0a9b477b log to console as well as file 2023-07-11 15:52:22 -07:00
Eva Ho 7762584fb1 address comments 2023-07-11 14:38:38 -04:00
Eva Ho acc31427dd add logs to ~/.ollama/logs folder 2023-07-11 13:33:32 -04:00
Eva Ho 407a5cabf4 when app is running, server restarts when it exits or disconnects 2023-07-10 17:14:25 -04:00
Jeffrey Morgan 66bbf05918 start server in both dev and when packaged 2023-07-10 13:46:31 -07:00
Jeffrey Morgan 840f87430a remove double `heartbeat` 2023-07-08 13:30:27 -04:00
Jeffrey Morgan 660dee7005 hourly heartbeat 2023-07-08 13:18:34 -04:00
Eva Ho bc54daf2bc add app to open at login by default 2023-07-07 13:49:42 -04:00
Jeffrey Morgan 8b57e715a7 add version 2023-07-07 13:44:36 -04:00
Jeffrey Morgan 7406881eeb write version at build time 2023-07-07 12:59:45 -04:00
Jeffrey Morgan 7974ad58ff fix env var loading 2023-07-07 10:27:33 -04:00
Eva Ho a88576e59a add Template to icon file name to handle bright and dark modes better on MacOS 2023-07-07 09:54:59 -04:00
Jeffrey Morgan 963c20254e quit sooner with single instance lock 2023-07-06 18:05:31 -04:00
Jeffrey Morgan f93ffb9695 fix missing string crash 2023-07-06 18:02:43 -04:00
Jeffrey Morgan 45bf83ff58 default write key to empty 2023-07-06 17:46:40 -04:00
Jeffrey Morgan b9a186c820 basic telemetry 2023-07-06 17:32:54 -04:00
Eva Ho 8681ba0ee2 clean up code 2023-07-06 17:03:14 -04:00
Eva Ho 6fbd96dab1 prevent more than one instance 2023-07-06 17:02:00 -04:00
Eva Ho 7c2bb76421 improve the first time installing experience 2023-07-06 17:02:00 -04:00
Jeffrey Morgan 7ee75e19ec only check for updates if packaged 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 90d4ea9d71 move dock hide to on ready 2023-07-06 16:34:44 -04:00
Jeffrey Morgan c90d1d8c89 always use `ollama` binary 2023-07-06 16:34:44 -04:00
Eva Ho 9952c39319 remove electron-builder 2023-07-06 16:34:44 -04:00
Eva Ho 5a3bd59fd3 rebase into go 2023-07-06 16:34:44 -04:00
Eva Ho bba1cc933d fix path for system tray 2023-07-06 16:34:44 -04:00
Eva Ho ea9f0e7dbf removing icon and electron-builder 2023-07-06 16:34:44 -04:00
Eva Ho 703e10ca68 convert the desktop app to system tray 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 39f4d8edaa always use `ollama` binary 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 3c3c09a523 set version at build time 2023-07-06 16:34:44 -04:00
Jeffrey Morgan f805a65c42 add `.metal` file to the app build 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 0833f5af3a tweak CLI install text 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 03eca6ea54 fix path to `ollama` 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 4f3cfea646 prompt to install the `ollama` cli on macOS 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 879e996ca4 update app to use go binary 2023-07-06 16:34:44 -04:00
Jeffrey Morgan 7bf3212c5b auto updater for macos 2023-07-06 00:04:06 -04:00
Jeffrey Morgan 8685a5ad18 move .prettierrc.json to root 2023-07-02 17:34:46 -04:00
Jeffrey Morgan 3cd59936a2 move `desktop` -> `app` 2023-07-02 17:26:55 -04:00