Fix Cookbook serve server selection

This commit is contained in:
pewdiepie-archdaemon
2026-06-09 14:45:22 +09:00
parent 8ef9b8b215
commit 75268e7f43
+9 -2
View File
@@ -15,6 +15,7 @@ let _envState;
let _sshCmd; let _sshCmd;
let _getPort; let _getPort;
let _sshPrefix; let _sshPrefix;
let _serverByVal;
let _getPlatform; let _getPlatform;
let _isWindows; let _isWindows;
let _isMetal; let _isMetal;
@@ -116,6 +117,7 @@ function _selectedServeTarget(panel) {
host, host,
port: host ? (_getPort(host) || server?.port || '') : '', port: host ? (_getPort(host) || server?.port || '') : '',
venv, venv,
platform: server?.platform || _envState.platform || '',
label, label,
}; };
} }
@@ -2040,8 +2042,12 @@ async function _deleteCachedModel(repo, itemEl, skipConfirm = false, model = nul
function _retryCachedModel(repo, m) { function _retryCachedModel(repo, m) {
const payload = { repo_id: repo }; const payload = { repo_id: repo };
if (_envState.hfToken) payload.hf_token = _envState.hfToken; if (_envState.hfToken) payload.hf_token = _envState.hfToken;
if (_envState.remoteHost) { payload.remote_host = _envState.remoteHost; const _sp2 = _getPort(_envState.remoteHost); if (_sp2) payload.ssh_port = _sp2; } const _target = _selectedServeTarget(document.getElementById('cookbook-modal') || document);
if (_envState.platform) payload.platform = _envState.platform; if (_target.host) {
payload.remote_host = _target.host;
if (_target.port) payload.ssh_port = _target.port;
}
if (_target.platform) payload.platform = _target.platform;
if (_isWindows()) { if (_isWindows()) {
if (_envState.env === 'venv' && _envState.envPath) { if (_envState.env === 'venv' && _envState.envPath) {
payload.env_prefix = '& ' + _psQuote(_envState.envPath.endsWith('\\Scripts\\Activate.ps1') ? _envState.envPath : _envState.envPath + '\\Scripts\\Activate.ps1'); payload.env_prefix = '& ' + _psQuote(_envState.envPath.endsWith('\\Scripts\\Activate.ps1') ? _envState.envPath : _envState.envPath + '\\Scripts\\Activate.ps1');
@@ -2306,6 +2312,7 @@ export function initServe(shared) {
_sshCmd = shared._sshCmd; _sshCmd = shared._sshCmd;
_getPort = shared._getPort; _getPort = shared._getPort;
_sshPrefix = shared._sshPrefix; _sshPrefix = shared._sshPrefix;
_serverByVal = shared._serverByVal;
_getPlatform = shared._getPlatform; _getPlatform = shared._getPlatform;
_isWindows = shared._isWindows; _isWindows = shared._isWindows;
_isMetal = shared._isMetal; _isMetal = shared._isMetal;