diff --git a/static/js/cookbook.js b/static/js/cookbook.js index 972f38014..d59b3adc0 100644 --- a/static/js/cookbook.js +++ b/static/js/cookbook.js @@ -2511,7 +2511,7 @@ function _wireTabEvents(body) { // (a new server's host is empty, which would otherwise read as "Local"). export function _serverEntryHtml(s, i, defaultServer, forceRemote, isNew) { const isLocal = (forceRemote || isNew) ? false : (!s.host || s.host === 'local'); - const envOpts = ['none', 'venv'].map(e => ``).join(''); + const envOpts = [['none', 'None'], ['venv', 'venv'], ['conda', 'conda']].map(([value, label]) => ``).join(''); let html = ''; html += `
`; const _srvTitle = s.name || (isLocal ? 'Local' : (s.host || `Server ${i + 1}`)); @@ -2537,7 +2537,7 @@ export function _serverEntryHtml(s, i, defaultServer, forceRemote, isNew) { html += ``; html += ``; html += ``; - html += ``; + html += ``; html += ``; html += ``; html += `
`; diff --git a/static/js/cookbookServe.js b/static/js/cookbookServe.js index dcb7cc854..5a5d6dfc1 100644 --- a/static/js/cookbookServe.js +++ b/static/js/cookbookServe.js @@ -1284,7 +1284,7 @@ function _rerenderCachedModels() { const _llamaMode = _savedUnified && _llamaModeRaw !== 'cpu' ? 'unified' : _llamaModeRaw; panelHtml += ``; } - panelHtml += ``; + panelHtml += ``; const defaultPort = defaultBackend === 'ollama' ? '11434' : _nextAvailablePort(); panelHtml += ``; const _activeGpus = (defaultGpus || '').split(',').map(s => s.trim()).filter(Boolean); @@ -3297,7 +3297,7 @@ function _rerenderCachedModels() { // The venv field wins; otherwise fall back to the env configured for the // selected server in Settings, so the activation isn't silently dropped // when the field is left blank (the per-server venv wasn't being applied). - if (venvVal) { _envState.env = 'venv'; _envState.envPath = venvVal; } + if (venvVal) { _envState.env = (_srvEnv === 'conda' ? 'conda' : 'venv'); _envState.envPath = venvVal; } else if (_srvEnvPath) { _envState.env = (_srvEnv === 'conda' ? 'conda' : 'venv'); _envState.envPath = _srvEnvPath; } if (gpusVal) _envState.gpus = gpusVal; // Preflight: launching a GPU engine (llama.cpp / vLLM / SGLang) diff --git a/static/style.css b/static/style.css index 98d048c96..7b6bdab0a 100644 --- a/static/style.css +++ b/static/style.css @@ -20145,7 +20145,7 @@ body.gallery-selecting .gallery-dl-btn, } .hwfit-serve-row-core label:has(.hwfit-sf[data-field="max_seqs"]) { position: relative; - left: -64px; + left: -68px; } .hwfit-serve-row-core label:has(.hwfit-sf[data-field="gpu_mem"]) { position: relative; @@ -22314,6 +22314,8 @@ body.gallery-selecting .gallery-dl-btn, font: inherit; cursor: pointer; text-align: left; + position: relative; + top: -2px; } .hwfit-engine-btn-icon, .hwfit-engine-item-icon {