Refactor LLM configuration to remove llamacpp support
- Removed references to llamacpp from configuration files, scripts, and documentation, streamlining the LLM setup process to focus solely on Ollama. - Updated environment variables and paths to eliminate llamacpp-related entries, ensuring clarity in the configuration. - Adjusted CLI commands and help messages to reflect the removal of llamacpp, enhancing user experience and reducing confusion. - Revised documentation to provide clear guidance on using Ollama exclusively, including updates to setup instructions and runtime options.
This commit is contained in:
@@ -8,21 +8,16 @@ from pathlib import Path
|
||||
|
||||
from gpu_rent.llm_runtime import (
|
||||
append_vars_llm_runtime,
|
||||
ensure_llamacpp_manifest_from_example,
|
||||
ensure_ollama_manifest_from_example,
|
||||
llamacpp_preset_menu,
|
||||
llm_runtime_menu,
|
||||
normalize_runtime,
|
||||
ollama_preset_menu,
|
||||
write_llamacpp_models_preset,
|
||||
write_ollama_models_preset,
|
||||
)
|
||||
from gpu_rent.paths import (
|
||||
app_root,
|
||||
env_path,
|
||||
extensions_manifest_path,
|
||||
llamacpp_models_example_path,
|
||||
llamacpp_models_manifest_path,
|
||||
models_manifest_path,
|
||||
ollama_models_example_path,
|
||||
ollama_models_manifest_path,
|
||||
@@ -66,12 +61,6 @@ def run_setup(
|
||||
_copy_if_missing(
|
||||
ollama_models_example_path(), ollama_models_manifest_path(), "ollama-models.yaml", log
|
||||
)
|
||||
_copy_if_missing(
|
||||
llamacpp_models_example_path(),
|
||||
llamacpp_models_manifest_path(),
|
||||
"llamacpp-models.yaml",
|
||||
log,
|
||||
)
|
||||
|
||||
runtime = llm
|
||||
if runtime is None:
|
||||
@@ -107,24 +96,6 @@ def run_setup(
|
||||
else:
|
||||
write_ollama_models_preset(ollama_models_manifest_path(), preset)
|
||||
log(f"ollama-models.yaml пресет={preset}")
|
||||
elif runtime == "llamacpp":
|
||||
preset = ollama_preset
|
||||
if preset is None and ask:
|
||||
preset = prompt_menu(
|
||||
"llama.cpp GGUF",
|
||||
llamacpp_preset_menu(include_keep=False),
|
||||
default="recommended",
|
||||
ask=ask,
|
||||
show=log,
|
||||
)
|
||||
if preset is None:
|
||||
preset = "recommended"
|
||||
if preset.strip().lower() in {"keep", "example", ""}:
|
||||
ensure_llamacpp_manifest_from_example()
|
||||
log("llamacpp-models.yaml из example")
|
||||
else:
|
||||
write_llamacpp_models_preset(llamacpp_models_manifest_path(), preset)
|
||||
log(f"llamacpp-models.yaml пресет={preset}")
|
||||
|
||||
do_wd = install_watchdog
|
||||
if do_wd is None and confirm:
|
||||
|
||||
Reference in New Issue
Block a user