feat: fallback del modelo via HuggingFace si el registry falla
Si el pull de Ollama agota 3 intentos (red sin salida al registry), el script descarga el mismo modelo (GGUF Q4_K_M, ~2 GB) desde HuggingFace con curl.exe --retry 3, lo copia al volumen y lo importa con ollama create. Probado e2e: cp + create + ollama list OK (2.0 GB). Sin -v en el down: el volumen (modelo cacheado) se conserva entre runs.
This commit is contained in:
hermes committed
1 parent
539cd4d181
commit
2fcb438d53
4 files changed
+80
-32
No files matched your search
+20
-8
@@ -134,15 +134,27 @@ foreach ($Attempt in 1..3) {
|
|||||||
Start-Sleep -Seconds 5
|
Start-Sleep -Seconds 5
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
Err 'Fallo la descarga del modelo tras 3 intentos.'
|
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
|
||||||
if (-not $env:HTTPS_PROXY) {
|
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
|
||||||
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
|
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
|
||||||
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
|
curl.exe -L -# --retry 3 --max-time 1800 -o "$Gguf" 'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
|
||||||
Write-Host ' .\deploy.ps1 vps'
|
if ($LASTEXITCODE -eq 0 -and (Get-Item $Gguf).Length -gt 1900000000) {
|
||||||
|
docker cp "$Gguf" d0a1-hermes-ollama:/root/.ollama/import.gguf
|
||||||
|
docker exec d0a1-hermes-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
|
||||||
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
|
docker exec d0a1-hermes-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
|
if ($CreateOk) { $PullOk = $true }
|
||||||
|
else { Err 'Fallo al importar el modelo desde el GGUF.' }
|
||||||
|
} else {
|
||||||
|
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
|
||||||
|
if (-not $env:HTTPS_PROXY) {
|
||||||
|
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
|
||||||
|
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
|
||||||
|
Write-Host ' .\deploy.ps1 vps'
|
||||||
|
}
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host ' O reintenta a mano:'
|
|
||||||
Write-Host ' docker exec d0a1-hermes-ollama ollama pull llama3.2:3b'
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
|
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
|
||||||
|
|
||||||
|
|||||||
+20
-8
@@ -134,15 +134,27 @@ foreach ($Attempt in 1..3) {
|
|||||||
Start-Sleep -Seconds 5
|
Start-Sleep -Seconds 5
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
Err 'Fallo la descarga del modelo tras 3 intentos.'
|
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
|
||||||
if (-not $env:HTTPS_PROXY) {
|
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
|
||||||
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
|
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
|
||||||
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
|
curl.exe -L -# --retry 3 --max-time 1800 -o "$Gguf" 'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
|
||||||
Write-Host ' .\deploy.ps1 vps'
|
if ($LASTEXITCODE -eq 0 -and (Get-Item $Gguf).Length -gt 1900000000) {
|
||||||
|
docker cp "$Gguf" d0a1-openclaw-ollama:/root/.ollama/import.gguf
|
||||||
|
docker exec d0a1-openclaw-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
|
||||||
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
|
docker exec d0a1-openclaw-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
|
if ($CreateOk) { $PullOk = $true }
|
||||||
|
else { Err 'Fallo al importar el modelo desde el GGUF.' }
|
||||||
|
} else {
|
||||||
|
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
|
||||||
|
if (-not $env:HTTPS_PROXY) {
|
||||||
|
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
|
||||||
|
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
|
||||||
|
Write-Host ' .\deploy.ps1 vps'
|
||||||
|
}
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host ' O reintenta a mano:'
|
|
||||||
Write-Host ' docker exec d0a1-openclaw-ollama ollama pull llama3.2:3b'
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
|
Ok "Ollama corriendo en http://localhost:${OllamaPort}"
|
||||||
|
|
||||||
|
|||||||
+20
-8
@@ -151,15 +151,27 @@ foreach ($Attempt in 1..3) {
|
|||||||
Start-Sleep -Seconds 5
|
Start-Sleep -Seconds 5
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
Err 'Fallo la descarga del modelo tras 3 intentos.'
|
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
|
||||||
if (-not $env:HTTPS_PROXY) {
|
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
|
||||||
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
|
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
|
||||||
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
|
curl.exe -L -# --retry 3 --max-time 1800 -o "$Gguf" 'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
|
||||||
Write-Host ' .\deploy.ps1 vps'
|
if ($LASTEXITCODE -eq 0 -and (Get-Item $Gguf).Length -gt 1900000000) {
|
||||||
|
docker cp "$Gguf" d0a1-ollama:/root/.ollama/import.gguf
|
||||||
|
docker exec d0a1-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
|
||||||
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
|
docker exec d0a1-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
|
if ($CreateOk) { $PullOk = $true }
|
||||||
|
else { Err 'Fallo al importar el modelo desde el GGUF.' }
|
||||||
|
} else {
|
||||||
|
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
|
||||||
|
if (-not $env:HTTPS_PROXY) {
|
||||||
|
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
|
||||||
|
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
|
||||||
|
Write-Host ' .\deploy.ps1 vps'
|
||||||
|
}
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host ' O reintenta a mano:'
|
|
||||||
Write-Host ' docker exec d0a1-ollama ollama pull llama3.2:3b'
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# --- Done -------------------------------------------------------------------
|
# --- Done -------------------------------------------------------------------
|
||||||
|
|||||||
+20
-8
@@ -187,15 +187,27 @@ foreach ($Attempt in 1..3) {
|
|||||||
Start-Sleep -Seconds 5
|
Start-Sleep -Seconds 5
|
||||||
}
|
}
|
||||||
if (-not $PullOk) {
|
if (-not $PullOk) {
|
||||||
Err 'Fallo la descarga del modelo tras 3 intentos.'
|
# --- Fallback: mismo modelo via HuggingFace (otro CDN, no el registry de Ollama) ---
|
||||||
if (-not $env:HTTPS_PROXY) {
|
Warn 'Registry de Ollama no accesible. Probando via HuggingFace (mismo modelo)...'
|
||||||
Write-Host ' Tu red no llega al registry de Ollama. Si tienes proxy/VPN, lanzalo y:'
|
$Gguf = Join-Path $ScriptDir 'llama3.2-3b-q4.gguf'
|
||||||
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (ajusta al puerto de tu proxy)'
|
curl.exe -L -# --retry 3 --max-time 1800 -o "$Gguf" 'https://huggingface.co/bartowski/Llama-3.2-3B-Instruct-GGUF/resolve/main/Llama-3.2-3B-Instruct-Q4_K_M.gguf'
|
||||||
Write-Host ' .\deploy.ps1 vps'
|
if ($LASTEXITCODE -eq 0 -and (Get-Item $Gguf).Length -gt 1900000000) {
|
||||||
|
docker cp "$Gguf" d0a1-wp-ollama:/root/.ollama/import.gguf
|
||||||
|
docker exec d0a1-wp-ollama sh -c 'echo FROM /root/.ollama/import.gguf > /tmp/mf && ollama create llama3.2:3b -f /tmp/mf'
|
||||||
|
$CreateOk = ($LASTEXITCODE -eq 0)
|
||||||
|
docker exec d0a1-wp-ollama rm -f /root/.ollama/import.gguf | Out-Null
|
||||||
|
Remove-Item "$Gguf" -Force -ErrorAction SilentlyContinue
|
||||||
|
if ($CreateOk) { $PullOk = $true }
|
||||||
|
else { Err 'Fallo al importar el modelo desde el GGUF.' }
|
||||||
|
} else {
|
||||||
|
Err 'No se pudo descargar el modelo (ni registry ni HuggingFace).'
|
||||||
|
if (-not $env:HTTPS_PROXY) {
|
||||||
|
Write-Host ' Tu red bloquea ambos. Si tienes proxy/VPN:'
|
||||||
|
Write-Host ' $env:HTTPS_PROXY = "http://127.0.0.1:7890" # (puerto de tu proxy)'
|
||||||
|
Write-Host ' .\deploy.ps1 vps'
|
||||||
|
}
|
||||||
|
exit 1
|
||||||
}
|
}
|
||||||
Write-Host ' O reintenta a mano:'
|
|
||||||
Write-Host ' docker exec d0a1-wp-ollama ollama pull llama3.2:3b'
|
|
||||||
exit 1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# --- Done -------------------------------------------------------------------
|
# --- Done -------------------------------------------------------------------
|
||||||
|
|||||||
Reference in new issue
Block a user