From 2a6b1fdcba676200d2e454534a91e1d334b60bdf Mon Sep 17 00:00:00 2001 From: oobabooga <112222186+oobabooga@users.noreply.github.com> Date: Tue, 17 Mar 2026 18:29:15 -0700 Subject: [PATCH] Fix `--extra-flags` breaking short long-form-only flags like `--rpc` Closes #7357 --- modules/llama_cpp_server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/modules/llama_cpp_server.py b/modules/llama_cpp_server.py index c3a8d105..321a6d75 100644 --- a/modules/llama_cpp_server.py +++ b/modules/llama_cpp_server.py @@ -446,18 +446,21 @@ class LlamaServer: elif extra_flags.startswith("'") and extra_flags.endswith("'"): extra_flags = extra_flags[1:-1].strip() + # llama.cpp flags that only have a long form (--) despite being short + long_form_only = {'rpc', 'fit', 'pos', 'ppl'} + for flag_item in extra_flags.split(','): flag_item = flag_item.strip() if '=' in flag_item: flag, value = flag_item.split('=', 1) flag = flag.strip() value = value.strip() - if len(flag) <= 3: + if len(flag) <= 3 and flag not in long_form_only: cmd += [f"-{flag}", value] else: cmd += [f"--{flag}", value] else: - if len(flag_item) <= 3: + if len(flag_item) <= 3 and flag_item not in long_form_only: cmd.append(f"-{flag_item}") else: cmd.append(f"--{flag_item}")