Merge branch 'hiyouga:main' into main

yuwangnexusera · Nov 11, 2024 · 705e183 · 705e183
2 parents e695325 + 3eebae8
commit 705e183
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/llamafactory/chat/vllm_engine.py b/src/llamafactory/chat/vllm_engine.py
@@ -83,7 +83,8 @@ def __init__(
             "enable_lora": model_args.adapter_name_or_path is not None,
             "max_lora_rank": model_args.vllm_max_lora_rank,
         }
-        engine_args.update(model_args.vllm_config)
+        if isinstance(model_args.vllm_config, dict):
+            engine_args.update(model_args.vllm_config)
 
         if getattr(config, "is_yi_vl_derived_model", None):
             import vllm.model_executor.models.llava