From 44b44774c3b53d502cb38ecc646cd82ec75b6f02 Mon Sep 17 00:00:00 2001 From: Jin <134120444+jinwukong@users.noreply.github.com> Date: Wed, 14 Oct 2026 10:16:35 +0800 Subject: [PATCH] [Bugfix] Keep rope_theta when --json-model-override-args overrides rope_scaling (#43067) Co-authored-by: Xinyuan Tong --- .../srt/utils/hf_transformers/config.py | 8 +++ .../utils/test_hf_transformers_loading.py | 49 +++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/python/sglang/srt/utils/hf_transformers/config.py b/python/sglang/srt/utils/hf_transformers/config.py index b5a2386518..899dd065a5 100644 --- a/python/sglang/srt/utils/hf_transformers/config.py +++ b/python/sglang/srt/utils/hf_transformers/config.py @@ -384,6 +384,14 @@ def get_config( current = getattr(config, key, None) if isinstance(value, dict) and isinstance(current, PretrainedConfig): current.update(value) + elif ( + key in ("rope_scaling", "rope_parameters") + and isinstance(value, dict) + and isinstance(current, dict) + ): + # v5's rope_scaling setter replaces rope_parameters wholesale; + # merge so partial overrides keep rope_theta (#41227). + setattr(config, key, {**current, **value}) else: setattr(config, key, value) diff --git a/test/registered/unit/utils/test_hf_transformers_loading.py b/test/registered/unit/utils/test_hf_transformers_loading.py index d41e047c70..49019dc489 100644 --- a/test/registered/unit/utils/test_hf_transformers_loading.py +++ b/test/registered/unit/utils/test_hf_transformers_loading.py @@ -129,6 +129,55 @@ class TestHFTransformersLoading(unittest.TestCase): self.assertEqual(get_context_length(text), 1024) self.assertEqual(config.vision_config.patch_size, 14) + def llama3_rope_config(self): + config = self.text_config() + config["rope_parameters"] = { + "rope_type": "llama3", + "rope_theta": 500000.0, + "factor": 8.0, + "low_freq_factor": 1.0, + "high_freq_factor": 4.0, + "original_max_position_embeddings": 128, + } + return config + + def test_rope_scaling_override_merges_with_checkpoint(self): + # Regression for #41227: v5's rope_scaling setter replaces + # rope_parameters wholesale, dropping an unmentioned rope_theta. + self.write_config(self.llama3_rope_config()) + restated = { + "rope_type": "llama3", + "factor": 32.0, + "low_freq_factor": 1.0, + "high_freq_factor": 4.0, + "original_max_position_embeddings": 128, + } + + for key in ("rope_scaling", "rope_parameters"): + with self.subTest(key=key): + config = get_config( + self.model_path, + trust_remote_code=False, + local_files_only=True, + model_override_args={key: restated}, + ) + theta, rope = get_rope_config(get_hf_text_config(config)) + + self.assertEqual(theta, 500000.0) + self.assertEqual(rope["factor"], 32.0) + self.assertEqual(rope["rope_type"], "llama3") + + config = get_config( + self.model_path, + trust_remote_code=False, + local_files_only=True, + model_override_args={"rope_scaling": {"rope_theta": 1000000.0}}, + ) + theta, rope = get_rope_config(get_hf_text_config(config)) + + self.assertEqual(theta, 1000000.0) + self.assertEqual(rope["factor"], 8.0) + def test_tokenizer_loading_preserves_batch_special_tokens_and_chat(self): self.write_config(self.text_config()) self.make_tokenizer().save_pretrained(self.model_path)