Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
OpenDAS
ollama
Commits
abaf7d3b
Unverified
Commit
abaf7d3b
authored
Jul 11, 2023
by
hoyyeva
Committed by
GitHub
Jul 11, 2023
Browse files
Merge pull request #67 from jmorganca/log
writing logs to `./ollama/logs`
parents
317615fd
7762584f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
261 additions
and
24 deletions
+261
-24
app/package-lock.json
app/package-lock.json
+232
-11
app/package.json
app/package.json
+3
-1
app/src/index.ts
app/src/index.ts
+26
-12
No files found.
app/package-lock.json
View file @
abaf7d3b
...
...
@@ -15,7 +15,9 @@
"electron-store"
:
"^8.1.0"
,
"react"
:
"^18.2.0"
,
"react-dom"
:
"^18.2.0"
,
"uuid"
:
"^9.0.0"
"uuid"
:
"^9.0.0"
,
"winston"
:
"^3.10.0"
,
"winston-daily-rotate-file"
:
"^4.7.1"
},
"devDependencies"
:
{
"@babel/core"
:
"^7.22.5"
,
...
...
@@ -610,6 +612,14 @@
"node"
:
">=6.9.0"
}
},
"node_modules/@colors/colors"
:
{
"version"
:
"1.5.0"
,
"resolved"
:
"https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz"
,
"integrity"
:
"sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ=="
,
"engines"
:
{
"node"
:
">=0.1.90"
}
},
"node_modules/@cspotcode/source-map-support"
:
{
"version"
:
"0.8.1"
,
"resolved"
:
"https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz"
,
...
...
@@ -1319,6 +1329,16 @@
"postcss-selector-parser"
:
"^6.0.10"
}
},
"node_modules/@dabh/diagnostics"
:
{
"version"
:
"2.0.3"
,
"resolved"
:
"https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.3.tgz"
,
"integrity"
:
"sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="
,
"dependencies"
:
{
"colorspace"
:
"1.1.x"
,
"enabled"
:
"2.0.x"
,
"kuler"
:
"^2.0.0"
}
},
"node_modules/@discoveryjs/json-ext"
:
{
"version"
:
"0.5.7"
,
"resolved"
:
"https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz"
,
...
...
@@ -2825,6 +2845,11 @@
"@types/node"
:
"*"
}
},
"node_modules/@types/triple-beam"
:
{
"version"
:
"1.3.2"
,
"resolved"
:
"https://registry.npmjs.org/@types/triple-beam/-/triple-beam-1.3.2.tgz"
,
"integrity"
:
"sha512-txGIh+0eDFzKGC25zORnswy+br1Ha7hj5cMVwKIU7+s0U2AxxJru/jZSMU6OC9MJWP6+pc/hc6ZjyZShpsyY2g=="
},
"node_modules/@types/uuid"
:
{
"version"
:
"9.0.2"
,
"resolved"
:
"https://registry.npmjs.org/@types/uuid/-/uuid-9.0.2.tgz"
,
...
...
@@ -3634,6 +3659,11 @@
"node"
:
">=8"
}
},
"node_modules/async"
:
{
"version"
:
"3.2.4"
,
"resolved"
:
"https://registry.npmjs.org/async/-/async-3.2.4.tgz"
,
"integrity"
:
"sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
},
"node_modules/at-least-node"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz"
,
...
...
@@ -4394,6 +4424,15 @@
"url"
:
"https://github.com/sponsors/sindresorhus"
}
},
"node_modules/color"
:
{
"version"
:
"3.2.1"
,
"resolved"
:
"https://registry.npmjs.org/color/-/color-3.2.1.tgz"
,
"integrity"
:
"sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA=="
,
"dependencies"
:
{
"color-convert"
:
"^1.9.3"
,
"color-string"
:
"^1.6.0"
}
},
"node_modules/color-convert"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz"
,
...
...
@@ -4409,8 +4448,16 @@
"node_modules/color-name"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz"
,
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
,
"dev"
:
true
"integrity"
:
"sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
},
"node_modules/color-string"
:
{
"version"
:
"1.9.1"
,
"resolved"
:
"https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"
,
"integrity"
:
"sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="
,
"dependencies"
:
{
"color-name"
:
"^1.0.0"
,
"simple-swizzle"
:
"^0.2.2"
}
},
"node_modules/color-support"
:
{
"version"
:
"1.1.3"
,
...
...
@@ -4421,12 +4468,34 @@
"color-support"
:
"bin.js"
}
},
"node_modules/color/node_modules/color-convert"
:
{
"version"
:
"1.9.3"
,
"resolved"
:
"https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz"
,
"integrity"
:
"sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg=="
,
"dependencies"
:
{
"color-name"
:
"1.1.3"
}
},
"node_modules/color/node_modules/color-name"
:
{
"version"
:
"1.1.3"
,
"resolved"
:
"https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz"
,
"integrity"
:
"sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
},
"node_modules/colorette"
:
{
"version"
:
"2.0.20"
,
"resolved"
:
"https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz"
,
"integrity"
:
"sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
,
"dev"
:
true
},
"node_modules/colorspace"
:
{
"version"
:
"1.1.4"
,
"resolved"
:
"https://registry.npmjs.org/colorspace/-/colorspace-1.1.4.tgz"
,
"integrity"
:
"sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w=="
,
"dependencies"
:
{
"color"
:
"^3.1.3"
,
"text-hex"
:
"1.0.x"
}
},
"node_modules/commander"
:
{
"version"
:
"5.1.0"
,
"resolved"
:
"https://registry.npmjs.org/commander/-/commander-5.1.0.tgz"
,
...
...
@@ -5893,6 +5962,11 @@
"node"
:
">= 4"
}
},
"node_modules/enabled"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/enabled/-/enabled-2.0.0.tgz"
,
"integrity"
:
"sha512-AKrN98kuwOzMIdAizXGI86UFBoo26CL21UM763y1h/GMSJ4/OHU9k2YlsmBpyScFo/wbLzWQJBMCW4+IO3/+OQ=="
},
"node_modules/encodeurl"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"
,
...
...
@@ -6654,6 +6728,11 @@
"pend"
:
"~1.2.0"
}
},
"node_modules/fecha"
:
{
"version"
:
"4.2.3"
,
"resolved"
:
"https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"
,
"integrity"
:
"sha512-OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="
},
"node_modules/file-entry-cache"
:
{
"version"
:
"6.0.1"
,
"resolved"
:
"https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz"
,
...
...
@@ -6666,6 +6745,14 @@
"node"
:
"^10.12.0 || >=12.0.0"
}
},
"node_modules/file-stream-rotator"
:
{
"version"
:
"0.6.1"
,
"resolved"
:
"https://registry.npmjs.org/file-stream-rotator/-/file-stream-rotator-0.6.1.tgz"
,
"integrity"
:
"sha512-u+dBid4PvZw17PmDeRcNOtCP9CCK/9lRN2w+r1xIS7yOL9JFrIBKTvrYsxT4P0pGtThYTn++QS5ChHaUov3+zQ=="
,
"dependencies"
:
{
"moment"
:
"^2.29.1"
}
},
"node_modules/filename-reserved-regex"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz"
,
...
...
@@ -6834,6 +6921,11 @@
"node"
:
">= 4.0.0"
}
},
"node_modules/fn.name"
:
{
"version"
:
"1.1.0"
,
"resolved"
:
"https://registry.npmjs.org/fn.name/-/fn.name-1.1.0.tgz"
,
"integrity"
:
"sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="
},
"node_modules/follow-redirects"
:
{
"version"
:
"1.15.2"
,
"resolved"
:
"https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz"
,
...
...
@@ -7928,8 +8020,7 @@
"node_modules/inherits"
:
{
"version"
:
"2.0.4"
,
"resolved"
:
"https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"
,
"integrity"
:
"sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
,
"dev"
:
true
"integrity"
:
"sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
},
"node_modules/ini"
:
{
"version"
:
"1.3.8"
,
...
...
@@ -8243,7 +8334,6 @@
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz"
,
"integrity"
:
"sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg=="
,
"dev"
:
true
,
"engines"
:
{
"node"
:
">=8"
},
...
...
@@ -8547,6 +8637,11 @@
"node"
:
">=0.10.0"
}
},
"node_modules/kuler"
:
{
"version"
:
"2.0.0"
,
"resolved"
:
"https://registry.npmjs.org/kuler/-/kuler-2.0.0.tgz"
,
"integrity"
:
"sha512-Xq9nH7KlWZmXAtodXDDRE7vs6DU1gTU8zYDHDiWLSip45Egwq3plLHzPn27NgvzL2r1LMPC1vdqh98sQxtqj4A=="
},
"node_modules/launch-editor"
:
{
"version"
:
"2.6.0"
,
"resolved"
:
"https://registry.npmjs.org/launch-editor/-/launch-editor-2.6.0.tgz"
,
...
...
@@ -8788,6 +8883,19 @@
"node"
:
">=8"
}
},
"node_modules/logform"
:
{
"version"
:
"2.5.1"
,
"resolved"
:
"https://registry.npmjs.org/logform/-/logform-2.5.1.tgz"
,
"integrity"
:
"sha512-9FyqAm9o9NKKfiAKfZoYo9bGXXuwMkxQiQttkT4YjjVtQVIQtK6LmVtlxmCaFswo6N4AfEkHqZTV0taDtPotNg=="
,
"dependencies"
:
{
"@colors/colors"
:
"1.5.0"
,
"@types/triple-beam"
:
"^1.3.2"
,
"fecha"
:
"^4.2.0"
,
"ms"
:
"^2.1.1"
,
"safe-stable-stringify"
:
"^2.3.1"
,
"triple-beam"
:
"^1.3.0"
}
},
"node_modules/loose-envify"
:
{
"version"
:
"1.4.0"
,
"resolved"
:
"https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz"
,
...
...
@@ -9218,6 +9326,14 @@
"node"
:
">=10"
}
},
"node_modules/moment"
:
{
"version"
:
"2.29.4"
,
"resolved"
:
"https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"
,
"integrity"
:
"sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
,
"engines"
:
{
"node"
:
"*"
}
},
"node_modules/ms"
:
{
"version"
:
"2.1.2"
,
"resolved"
:
"https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"
,
...
...
@@ -9623,6 +9739,14 @@
"wrappy"
:
"1"
}
},
"node_modules/one-time"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/one-time/-/one-time-1.0.0.tgz"
,
"integrity"
:
"sha512-5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g=="
,
"dependencies"
:
{
"fn.name"
:
"1.x.x"
}
},
"node_modules/onetime"
:
{
"version"
:
"5.1.2"
,
"resolved"
:
"https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz"
,
...
...
@@ -11366,7 +11490,6 @@
"version"
:
"3.6.2"
,
"resolved"
:
"https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz"
,
"integrity"
:
"sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="
,
"dev"
:
true
,
"dependencies"
:
{
"inherits"
:
"^2.0.3"
,
"string_decoder"
:
"^1.1.1"
,
...
...
@@ -11664,7 +11787,6 @@
"version"
:
"5.2.1"
,
"resolved"
:
"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz"
,
"integrity"
:
"sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
,
"dev"
:
true
,
"funding"
:
[
{
"type"
:
"github"
,
...
...
@@ -11694,6 +11816,14 @@
"url"
:
"https://github.com/sponsors/ljharb"
}
},
"node_modules/safe-stable-stringify"
:
{
"version"
:
"2.4.3"
,
"resolved"
:
"https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.4.3.tgz"
,
"integrity"
:
"sha512-e2bDA2WJT0wxseVd4lsDP4+3ONX6HpMXQa1ZhFQ7SU+GjvORCmShbCMltrtIDfkYhVHrOcPtj+KhmDBdPdZD1g=="
,
"engines"
:
{
"node"
:
">=10"
}
},
"node_modules/safer-buffer"
:
{
"version"
:
"2.1.2"
,
"resolved"
:
"https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"
,
...
...
@@ -12023,6 +12153,19 @@
"integrity"
:
"sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
,
"dev"
:
true
},
"node_modules/simple-swizzle"
:
{
"version"
:
"0.2.2"
,
"resolved"
:
"https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"
,
"integrity"
:
"sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="
,
"dependencies"
:
{
"is-arrayish"
:
"^0.3.1"
}
},
"node_modules/simple-swizzle/node_modules/is-arrayish"
:
{
"version"
:
"0.3.2"
,
"resolved"
:
"https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.3.2.tgz"
,
"integrity"
:
"sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="
},
"node_modules/slash"
:
{
"version"
:
"3.0.0"
,
"resolved"
:
"https://registry.npmjs.org/slash/-/slash-3.0.0.tgz"
,
...
...
@@ -12212,6 +12355,14 @@
"node"
:
"^14.17.0 || ^16.13.0 || >=18.0.0"
}
},
"node_modules/stack-trace"
:
{
"version"
:
"0.0.10"
,
"resolved"
:
"https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"
,
"integrity"
:
"sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="
,
"engines"
:
{
"node"
:
"*"
}
},
"node_modules/statuses"
:
{
"version"
:
"2.0.1"
,
"resolved"
:
"https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"
,
...
...
@@ -12225,7 +12376,6 @@
"version"
:
"1.3.0"
,
"resolved"
:
"https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz"
,
"integrity"
:
"sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA=="
,
"dev"
:
true
,
"dependencies"
:
{
"safe-buffer"
:
"~5.2.0"
}
...
...
@@ -12689,6 +12839,11 @@
"integrity"
:
"sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="
,
"dev"
:
true
},
"node_modules/text-hex"
:
{
"version"
:
"1.0.0"
,
"resolved"
:
"https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz"
,
"integrity"
:
"sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg=="
},
"node_modules/text-table"
:
{
"version"
:
"0.2.0"
,
"resolved"
:
"https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"
,
...
...
@@ -12814,6 +12969,14 @@
"node"
:
">=0.8.0"
}
},
"node_modules/triple-beam"
:
{
"version"
:
"1.4.1"
,
"resolved"
:
"https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz"
,
"integrity"
:
"sha512-aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg=="
,
"engines"
:
{
"node"
:
">= 14.0.0"
}
},
"node_modules/ts-interface-checker"
:
{
"version"
:
"0.1.13"
,
"resolved"
:
"https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz"
,
...
...
@@ -13231,8 +13394,7 @@
"node_modules/util-deprecate"
:
{
"version"
:
"1.0.2"
,
"resolved"
:
"https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"
,
"integrity"
:
"sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
,
"dev"
:
true
"integrity"
:
"sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
},
"node_modules/utila"
:
{
"version"
:
"0.4.0"
,
...
...
@@ -13764,6 +13926,65 @@
"integrity"
:
"sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ=="
,
"dev"
:
true
},
"node_modules/winston"
:
{
"version"
:
"3.10.0"
,
"resolved"
:
"https://registry.npmjs.org/winston/-/winston-3.10.0.tgz"
,
"integrity"
:
"sha512-nT6SIDaE9B7ZRO0u3UvdrimG0HkB7dSTAgInQnNR2SOPJ4bvq5q79+pXLftKmP52lJGW15+H5MCK0nM9D3KB/g=="
,
"dependencies"
:
{
"@colors/colors"
:
"1.5.0"
,
"@dabh/diagnostics"
:
"^2.0.2"
,
"async"
:
"^3.2.3"
,
"is-stream"
:
"^2.0.0"
,
"logform"
:
"^2.4.0"
,
"one-time"
:
"^1.0.0"
,
"readable-stream"
:
"^3.4.0"
,
"safe-stable-stringify"
:
"^2.3.1"
,
"stack-trace"
:
"0.0.x"
,
"triple-beam"
:
"^1.3.0"
,
"winston-transport"
:
"^4.5.0"
},
"engines"
:
{
"node"
:
">= 12.0.0"
}
},
"node_modules/winston-daily-rotate-file"
:
{
"version"
:
"4.7.1"
,
"resolved"
:
"https://registry.npmjs.org/winston-daily-rotate-file/-/winston-daily-rotate-file-4.7.1.tgz"
,
"integrity"
:
"sha512-7LGPiYGBPNyGHLn9z33i96zx/bd71pjBn9tqQzO3I4Tayv94WPmBNwKC7CO1wPHdP9uvu+Md/1nr6VSH9h0iaA=="
,
"dependencies"
:
{
"file-stream-rotator"
:
"^0.6.1"
,
"object-hash"
:
"^2.0.1"
,
"triple-beam"
:
"^1.3.0"
,
"winston-transport"
:
"^4.4.0"
},
"engines"
:
{
"node"
:
">=8"
},
"peerDependencies"
:
{
"winston"
:
"^3"
}
},
"node_modules/winston-daily-rotate-file/node_modules/object-hash"
:
{
"version"
:
"2.2.0"
,
"resolved"
:
"https://registry.npmjs.org/object-hash/-/object-hash-2.2.0.tgz"
,
"integrity"
:
"sha512-gScRMn0bS5fH+IuwyIFgnh9zBdo4DV+6GhygmWM9HyNJSgS0hScp1f5vjtm7oIIOiT9trXrShAkLFSc2IqKNgw=="
,
"engines"
:
{
"node"
:
">= 6"
}
},
"node_modules/winston-transport"
:
{
"version"
:
"4.5.0"
,
"resolved"
:
"https://registry.npmjs.org/winston-transport/-/winston-transport-4.5.0.tgz"
,
"integrity"
:
"sha512-YpZzcUzBedhlTAfJg6vJDlyEai/IFMIVcaEZZyl3UXIl4gmqRpU7AE89AHLkbzLUsv0NVmw7ts+iztqKxxPW1Q=="
,
"dependencies"
:
{
"logform"
:
"^2.3.2"
,
"readable-stream"
:
"^3.6.0"
,
"triple-beam"
:
"^1.3.0"
},
"engines"
:
{
"node"
:
">= 6.4.0"
}
},
"node_modules/word-wrap"
:
{
"version"
:
"1.2.3"
,
"resolved"
:
"https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz"
,
...
...
app/package.json
View file @
abaf7d3b
...
...
@@ -69,6 +69,8 @@
"electron-store"
:
"^8.1.0"
,
"react"
:
"^18.2.0"
,
"react-dom"
:
"^18.2.0"
,
"uuid"
:
"^9.0.0"
"uuid"
:
"^9.0.0"
,
"winston"
:
"^3.10.0"
,
"winston-daily-rotate-file"
:
"^4.7.1"
}
}
app/src/index.ts
View file @
abaf7d3b
import
{
spawn
,
exec
}
from
'
child_process
'
import
{
app
,
autoUpdater
,
dialog
,
Tray
,
Menu
}
from
'
electron
'
import
Store
from
'
electron-store
'
import
winston
from
'
winston
'
import
'
winston-daily-rotate-file
'
import
*
as
path
from
'
path
'
import
*
as
fs
from
'
fs
'
...
...
@@ -11,6 +13,20 @@ require('@electron/remote/main').initialize()
const
store
=
new
Store
()
let
tray
:
Tray
|
null
=
null
const
logFile
=
new
winston
.
transports
.
File
({
filename
:
path
.
join
(
app
.
getPath
(
'
home
'
),
'
.ollama
'
,
'
logs
'
,
'
server.log
'
),
maxsize
:
1024
*
1024
*
20
,
maxFiles
:
5
,
});
const
logger
=
winston
.
createLogger
({
transports
:
[
logFile
],
format
:
winston
.
format
.
combine
(
winston
.
format
.
timestamp
(),
winston
.
format
.
printf
(
info
=>
`
${
info
.
timestamp
}
${
info
.
level
}
:
${
info
.
message
}
`
)
)
})
const
SingleInstanceLock
=
app
.
requestSingleInstanceLock
()
if
(
!
SingleInstanceLock
)
{
app
.
quit
()
...
...
@@ -43,22 +59,21 @@ function server() {
?
path
.
join
(
process
.
resourcesPath
,
'
ollama
'
)
:
path
.
resolve
(
process
.
cwd
(),
'
..
'
,
'
ollama
'
)
console
.
log
(
`Starting server`
)
const
proc
=
spawn
(
binary
,
[
'
serve
'
])
proc
.
stdout
.
on
(
'
data
'
,
data
=>
{
console
.
log
(
`server:
${
data
}
`
)
logger
.
info
(
`server:
${
data
.
toString
()
}
`
)
})
proc
.
stderr
.
on
(
'
data
'
,
data
=>
{
console
.
error
(
`server:
${
data
}
`
)
logger
.
error
(
`server:
${
data
.
toString
()
}
`
)
})
proc
.
on
(
'
exit
'
,
()
=>
{
console
.
log
(
'
Restarting...
'
);
logger
.
info
(
'
Restarting
the server
...
'
);
server
();
})
proc
.
on
(
'
disconnect
'
,
()
=>
{
console
.
log
(
'
Restar
ting...
'
);
logger
.
info
(
'
Server disconnected. Reconnec
ting...
'
);
server
();
})
...
...
@@ -89,11 +104,12 @@ function installCLI() {
`
exec
(
`osascript -e '
${
command
}
'`
,
(
error
:
Error
|
null
,
stdout
:
string
,
stderr
:
string
)
=>
{
if
(
error
)
{
console
.
error
(
`
exec error:
${
error
}
`
)
logger
.
error
(
`
CLI: Failed to install CLI -
${
error
.
message
}
`
)
return
}
console
.
log
(
`stdout:
${
stdout
}
`
)
console
.
error
(
`stderr:
${
stderr
}
`
)
logger
.
info
(
`CLI:
${
stdout
}
}`
)
logger
.
error
(
`CLI:
${
stderr
}
`
)
})
}
})
...
...
@@ -139,8 +155,7 @@ app.on('ready', () => {
})
return
}
catch
(
e
)
{
console
.
error
(
'
Failed to move to applications folder
'
)
console
.
error
(
e
)
logger
.
error
(
`[Move to Applications] Failed to move to applications folder -
${
e
.
message
}
}`
)
}
}
}
...
...
@@ -150,7 +165,6 @@ app.on('ready', () => {
}
createSystemtray
()
server
()
})
...
...
@@ -189,7 +203,7 @@ if (app.isPackaged) {
}
autoUpdater
.
on
(
'
error
'
,
e
=>
{
console
.
error
(
'
update check failed
'
,
e
)
logger
.
error
(
`auto updater:
update check failed
-
${
e
.
message
}
`
)
})
autoUpdater
.
on
(
'
update-downloaded
'
,
(
event
,
releaseNotes
,
releaseName
)
=>
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment