Skip to content

GitLab

"...vllm_benchmark_throughput.git" did not exist on "3ea269e2f21e8e1c3743b81e2df7479d742f4015"
Commit df6dc4fd authored by Daniel Hiltgen's avatar Daniel Hiltgen
Browse files

Fix duplicate menus on update and exit on signals 

Also fixes a few fit-and-finish items for better developer experience
parent 88622847
Show whitespace changes
Inline Side-by-side
Showing with 52 additions and 36 deletions
app/lifecycle/lifecycle.go
View file @ df6dc4fd
...@@ -6,6 +6,8 @@ import ( ...@@ -6,6 +6,8 @@ import (
"log" "log"
"log/slog" "log/slog"
"os" "os"
"os/signal"
"syscall"
"github.com/jmorganca/ollama/app/store" "github.com/jmorganca/ollama/app/store"
"github.com/jmorganca/ollama/app/tray" "github.com/jmorganca/ollama/app/tray"
...@@ -23,12 +25,18 @@ func Run() { ...@@ -23,12 +25,18 @@ func Run() {
} }
callbacks := t.GetCallbacks() callbacks := t.GetCallbacks()
signals := make(chan os.Signal, 1)
signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
go func() { go func() {
slog.Debug("starting callback loop") slog.Debug("starting callback loop")
for { for {
select { select {
case <-callbacks.Quit: case <-callbacks.Quit:
slog.Debug("QUIT called") slog.Debug("quit called")
t.Quit()
case <-signals:
slog.Debug("shutting down due to signal")
t.Quit() t.Quit()
case <-callbacks.Update: case <-callbacks.Update:
err := DoUpgrade(cancel, done) err := DoUpgrade(cancel, done)
......
app/lifecycle/server.go
View file @ df6dc4fd
...@@ -31,11 +31,15 @@ func getCLIFullPath(command string) string { ...@@ -31,11 +31,15 @@ func getCLIFullPath(command string) string {
return cmdPath return cmdPath
} }
} }
cmdPath = filepath.Join(".", command) pwd, err := os.Getwd()
if err == nil {
cmdPath = filepath.Join(pwd, command)
_, err = os.Stat(cmdPath) _, err = os.Stat(cmdPath)
if err == nil { if err == nil {
return cmdPath return cmdPath
} }
}
return command return command
} }
......
app/lifecycle/updater.go
View file @ df6dc4fd
...@@ -25,6 +25,7 @@ import ( ...@@ -25,6 +25,7 @@ import (
var ( var (
UpdateCheckURLBase = "https://ollama.com/api/update" UpdateCheckURLBase = "https://ollama.com/api/update"
UpdateDownloaded = false UpdateDownloaded = false
UpdateCheckInterval = 60 * 60 * time.Second
) )
// TODO - maybe move up to the API package? // TODO - maybe move up to the API package?
...@@ -112,7 +113,6 @@ func IsNewReleaseAvailable(ctx context.Context) (bool, UpdateResponse) { ...@@ -112,7 +113,6 @@ func IsNewReleaseAvailable(ctx context.Context) (bool, UpdateResponse) {
return true, updateResp return true, updateResp
} }
// Returns true if we downloaded a new update, false if we already had it
func DownloadNewRelease(ctx context.Context, updateResp UpdateResponse) error { func DownloadNewRelease(ctx context.Context, updateResp UpdateResponse) error {
// Do a head first to check etag info // Do a head first to check etag info
req, err := http.NewRequestWithContext(ctx, http.MethodHead, updateResp.UpdateURL, nil) req, err := http.NewRequestWithContext(ctx, http.MethodHead, updateResp.UpdateURL, nil)
...@@ -144,7 +144,7 @@ func DownloadNewRelease(ctx context.Context, updateResp UpdateResponse) error { ...@@ -144,7 +144,7 @@ func DownloadNewRelease(ctx context.Context, updateResp UpdateResponse) error {
// Check to see if we already have it downloaded // Check to see if we already have it downloaded
_, err = os.Stat(stageFilename) _, err = os.Stat(stageFilename)
if err == nil { if err == nil {
slog.Debug("update already downloaded") slog.Info("update already downloaded")
return nil return nil
} }
...@@ -231,7 +231,7 @@ func StartBackgroundUpdaterChecker(ctx context.Context, cb func(string) error) { ...@@ -231,7 +231,7 @@ func StartBackgroundUpdaterChecker(ctx context.Context, cb func(string) error) {
slog.Debug("stopping background update checker") slog.Debug("stopping background update checker")
return return
default: default:
time.Sleep(60 * 60 * time.Second) time.Sleep(UpdateCheckInterval)
} }
} }
}() }()
......
app/tray/wintray/menus.go
View file @ df6dc4fd
...@@ -33,6 +33,7 @@ func (t *winTray) initMenus() error { ...@@ -33,6 +33,7 @@ func (t *winTray) initMenus() error {
} }
func (t *winTray) UpdateAvailable(ver string) error { func (t *winTray) UpdateAvailable(ver string) error {
if !t.updateNotified {
slog.Debug("updating menu and sending notification for new update") slog.Debug("updating menu and sending notification for new update")
if err := t.addOrUpdateMenuItem(updatAvailableMenuID, 0, updateAvailableMenuTitle, true); err != nil { if err := t.addOrUpdateMenuItem(updatAvailableMenuID, 0, updateAvailableMenuTitle, true); err != nil {
return fmt.Errorf("unable to create menu entries %w", err) return fmt.Errorf("unable to create menu entries %w", err)
...@@ -50,10 +51,10 @@ func (t *winTray) UpdateAvailable(ver string) error { ...@@ -50,10 +51,10 @@ func (t *winTray) UpdateAvailable(ver string) error {
if err := wt.setIcon(iconFilePath); err != nil { if err := wt.setIcon(iconFilePath); err != nil {
return fmt.Errorf("unable to set icon: %w", err) return fmt.Errorf("unable to set icon: %w", err)
} }
t.updateNotified = true
t.pendingUpdate = true t.pendingUpdate = true
// Now pop up the notification // Now pop up the notification
if !t.updateNotified {
t.muNID.Lock() t.muNID.Lock()
defer t.muNID.Unlock() defer t.muNID.Unlock()
copy(t.nid.InfoTitle[:], windows.StringToUTF16(updateTitle)) copy(t.nid.InfoTitle[:], windows.StringToUTF16(updateTitle))
...@@ -65,7 +66,6 @@ func (t *winTray) UpdateAvailable(ver string) error { ...@@ -65,7 +66,6 @@ func (t *winTray) UpdateAvailable(ver string) error {
if err != nil { if err != nil {
return err return err
} }
t.updateNotified = true
} }
return nil return nil
} }
llm/generate/gen_windows.ps1
View file @ df6dc4fd
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
$ErrorActionPreference = "Stop" $ErrorActionPreference = "Stop"
function init_vars { function init_vars {
$script:SRC_DIR = $(resolve-path "..\..\")
$script:llamacppDir = "../llama.cpp" $script:llamacppDir = "../llama.cpp"
$script:cmakeDefs = @("-DBUILD_SHARED_LIBS=on", "-DLLAMA_NATIVE=off", "-A", "x64") $script:cmakeDefs = @("-DBUILD_SHARED_LIBS=on", "-DLLAMA_NATIVE=off", "-A", "x64")
$script:cmakeTargets = @("ext_server") $script:cmakeTargets = @("ext_server")
...@@ -33,6 +34,9 @@ function init_vars { ...@@ -33,6 +34,9 @@ function init_vars {
} }
# Note: 10 Windows Kit signtool crashes with GCP's plugin # Note: 10 Windows Kit signtool crashes with GCP's plugin
${script:SignTool}="C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" ${script:SignTool}="C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe"
if ("${env:KEY_CONTAINER}") {
${script:OLLAMA_CERT}=$(resolve-path "${script:SRC_DIR}\ollama_inc.crt")
}
} }
function git_module_setup { function git_module_setup {
...@@ -102,7 +106,7 @@ function sign { ...@@ -102,7 +106,7 @@ function sign {
if ("${env:KEY_CONTAINER}") { if ("${env:KEY_CONTAINER}") {
write-host "Signing ${script:buildDir}/lib/*.dll" write-host "Signing ${script:buildDir}/lib/*.dll"
foreach ($file in (get-childitem "${script:buildDir}/lib/*.dll")){ foreach ($file in (get-childitem "${script:buildDir}/lib/*.dll")){
& "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${env:OLLAMA_CERT}" ` & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `
/csp "Google Cloud KMS Provider" /kc "${env:KEY_CONTAINER}" $file /csp "Google Cloud KMS Provider" /kc "${env:KEY_CONTAINER}" $file
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
} }
......
scripts/build_windows.ps1
View file @ df6dc4fd
...@@ -38,7 +38,7 @@ function checkEnv() { ...@@ -38,7 +38,7 @@ function checkEnv() {
# Check for signing key # Check for signing key
if ("${env:KEY_CONTAINER}") { if ("${env:KEY_CONTAINER}") {
${env:OLLAMA_CERT}=$(resolve-path "${script:SRC_DIR}\ollama_inc.crt") ${script:OLLAMA_CERT}=$(resolve-path "${script:SRC_DIR}\ollama_inc.crt")
Write-host "Code signing enabled" Write-host "Code signing enabled"
# Note: 10 Windows Kit signtool crashes with GCP's plugin # Note: 10 Windows Kit signtool crashes with GCP's plugin
${script:SignTool}="C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe" ${script:SignTool}="C:\Program Files (x86)\Windows Kits\8.1\bin\x64\signtool.exe"
...@@ -56,7 +56,7 @@ function buildOllama() { ...@@ -56,7 +56,7 @@ function buildOllama() {
& go build "-ldflags=-w -s ""-X=github.com/jmorganca/ollama/version.Version=$script:VERSION"" ""-X=github.com/jmorganca/ollama/server.mode=release""" . & go build "-ldflags=-w -s ""-X=github.com/jmorganca/ollama/version.Version=$script:VERSION"" ""-X=github.com/jmorganca/ollama/server.mode=release""" .
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
if ("${env:KEY_CONTAINER}") { if ("${env:KEY_CONTAINER}") {
& "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${env:OLLAMA_CERT}" ` & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `
/csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} ollama.exe /csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} ollama.exe
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
} }
...@@ -70,7 +70,7 @@ function buildApp() { ...@@ -70,7 +70,7 @@ function buildApp() {
& go build "-ldflags=-H windowsgui -w -s ""-X=github.com/jmorganca/ollama/version.Version=$script:VERSION"" ""-X=github.com/jmorganca/ollama/server.mode=release""" . & go build "-ldflags=-H windowsgui -w -s ""-X=github.com/jmorganca/ollama/version.Version=$script:VERSION"" ""-X=github.com/jmorganca/ollama/server.mode=release""" .
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
if ("${env:KEY_CONTAINER}") { if ("${env:KEY_CONTAINER}") {
& "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${env:OLLAMA_CERT}" ` & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `
/csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} app.exe /csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} app.exe
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
} }
...@@ -97,7 +97,7 @@ function gatherDependencies() { ...@@ -97,7 +97,7 @@ function gatherDependencies() {
write-host "about to sign" write-host "about to sign"
foreach ($file in (get-childitem "${script:DEPS_DIR}/cu*.dll") + @("${script:SRC_DIR}\dist\ollama_welcome.ps1")){ foreach ($file in (get-childitem "${script:DEPS_DIR}/cu*.dll") + @("${script:SRC_DIR}\dist\ollama_welcome.ps1")){
write-host "signing $file" write-host "signing $file"
& "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${env:OLLAMA_CERT}" ` & "${script:SignTool}" sign /v /fd sha256 /t http://timestamp.digicert.com /f "${script:OLLAMA_CERT}" `
/csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} $file /csp "Google Cloud KMS Provider" /kc ${env:KEY_CONTAINER} $file
if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)} if ($LASTEXITCODE -ne 0) { exit($LASTEXITCODE)}
} }
...@@ -110,7 +110,7 @@ function buildInstaller() { ...@@ -110,7 +110,7 @@ function buildInstaller() {
cd "${script:SRC_DIR}\app" cd "${script:SRC_DIR}\app"
$env:PKG_VERSION=$script:PKG_VERSION $env:PKG_VERSION=$script:PKG_VERSION
if ("${env:KEY_CONTAINER}") { if ("${env:KEY_CONTAINER}") {
& "${script:INNO_SETUP_DIR}\ISCC.exe" /SMySignTool="${script:SignTool} sign /fd sha256 /t http://timestamp.digicert.com /f ${env:OLLAMA_CERT} /csp `$qGoogle Cloud KMS Provider`$q /kc ${env:KEY_CONTAINER} `$f" .\ollama.iss & "${script:INNO_SETUP_DIR}\ISCC.exe" /SMySignTool="${script:SignTool} sign /fd sha256 /t http://timestamp.digicert.com /f ${script:OLLAMA_CERT} /csp `$qGoogle Cloud KMS Provider`$q /kc ${env:KEY_CONTAINER} `$f" .\ollama.iss
} else { } else {
& "${script:INNO_SETUP_DIR}\ISCC.exe" .\ollama.iss & "${script:INNO_SETUP_DIR}\ISCC.exe" .\ollama.iss
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment