Skip to content

Commit ad7cb7a

Browse files
committed
fix unit test
1 parent 71b99d3 commit ad7cb7a

5 files changed

Lines changed: 8 additions & 109 deletions

File tree

fastdeploy/input/ernie4_5_vl_processor/ernie4_5_vl_processor.py

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -246,15 +246,6 @@ def process_request_dict(self, request, max_model_len=None):
246246
request[k] = v
247247
else:
248248
raise ValueError("Invalid input: chat_template_kwargs must be a dict")
249-
options = chat_template_kwargs.get("options")
250-
if options:
251-
thinking_mode = options.get("thinking_mode")
252-
if thinking_mode:
253-
if thinking_mode == "close" or thinking_mode == "false":
254-
request["enable_thinking"] = False
255-
else:
256-
request["enable_thinking"] = True
257-
request.setdefault("enable_thinking", True)
258249
outputs = self.ernie4_5_processor.request2ids(request)
259250
else:
260251
raise ValueError(f"Request must contain 'prompt', or 'messages': {request}")

tests/entrypoints/openai/test_serving_chat.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -41,35 +41,6 @@ def setUp(self):
4141
chat_template=None,
4242
)
4343

44-
def test_enable_thinking(self):
45-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={})
46-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
47-
self.assertEqual(enable_thinking, None)
48-
49-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"enable_thinking": True})
50-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
51-
self.assertEqual(enable_thinking, True)
52-
53-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"enable_thinking": False})
54-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
55-
self.assertEqual(enable_thinking, False)
56-
57-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"options": {"thinking_mode": "close"}})
58-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
59-
self.assertEqual(enable_thinking, False)
60-
61-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"options": {"thinking_mode": "false"}})
62-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
63-
self.assertEqual(enable_thinking, False)
64-
65-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"options": {"thinking_mode": "open"}})
66-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
67-
self.assertEqual(enable_thinking, True)
68-
69-
request = ChatCompletionRequest(messages=[], chat_template_kwargs={"options": {"thinking_mode": "123"}})
70-
enable_thinking = self.chat_completion_handler._get_thinking_status(request)
71-
self.assertEqual(enable_thinking, True)
72-
7344
def test_build_prompt_logprobs_basic(self):
7445
"""Test basic functionality of _build_prompt_logprobs"""
7546
# Create mock data

tests/input/test_ernie_vl_processor.py

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -71,73 +71,6 @@ def mock_pack_outputs(outputs):
7171
self.mock_tool_parser_obj.return_value = self.mock_tool_parser
7272
self.processor.tool_parser_obj = self.mock_tool_parser_obj
7373

74-
def test_process_response_dict_streaming_normal_case(self):
75-
"""测试正常情况下的流式响应处理"""
76-
request_dict = {
77-
"messages": [{"role": "user", "content": "Hello"}],
78-
"chat_template_kwargs": {"enable_thinking": False},
79-
"prompt_token_ids": [1, 1, 1],
80-
}
81-
self.processor.process_request_dict(request_dict, 100)
82-
self.assertEqual(request_dict["enable_thinking"], True)
83-
84-
def test_process_request_dict(self):
85-
request_dict = {
86-
"request_id": "123",
87-
"messages": [{"role": "user", "content": "Hello!"}],
88-
"chat_template_kwargs": {"chat_template": "Hello!"},
89-
"eos_token_ids": [1],
90-
"temperature": 1,
91-
"top_p": 1,
92-
}
93-
self.processor.process_request_dict(request_dict, 100)
94-
self.assertEqual(request_dict["enable_thinking"], True)
95-
96-
request_dict = {
97-
"messages": [{"role": "user", "content": "Hello"}],
98-
"chat_template_kwargs": {"options": {"thinking_mode": "close"}},
99-
"prompt_token_ids": [1, 1, 1],
100-
}
101-
self.processor.process_request_dict(request_dict, 100)
102-
self.assertEqual(request_dict["enable_thinking"], True)
103-
104-
request_dict = {
105-
"messages": [{"role": "user", "content": "Hello"}],
106-
"chat_template_kwargs": {"options": {"thinking_mode": "false"}},
107-
"prompt_token_ids": [1, 1, 1],
108-
}
109-
self.processor.process_request_dict(request_dict, 100)
110-
self.assertEqual(request_dict["enable_thinking"], True)
111-
112-
request_dict = {
113-
"messages": [{"role": "user", "content": "Hello"}],
114-
"chat_template_kwargs": {"options": {"thinking_mode": "123"}},
115-
"prompt_token_ids": [1, 1, 1],
116-
}
117-
self.processor.process_request_dict(request_dict, 100)
118-
self.assertEqual(request_dict["enable_thinking"], True)
119-
120-
request_dict = {
121-
"messages": [{"role": "user", "content": "Hello"}],
122-
"chat_template_kwargs": {"options": {"thinking_mode": "close"}},
123-
}
124-
self.processor.process_request_dict(request_dict, 100)
125-
self.assertEqual(request_dict["enable_thinking"], False)
126-
127-
request_dict = {
128-
"messages": [{"role": "user", "content": "Hello"}],
129-
"chat_template_kwargs": {"options": {"thinking_mode": "false"}},
130-
}
131-
self.processor.process_request_dict(request_dict, 100)
132-
self.assertEqual(request_dict["enable_thinking"], False)
133-
134-
request_dict = {
135-
"messages": [{"role": "user", "content": "Hello"}],
136-
"chat_template_kwargs": {"enable_thinking": False},
137-
}
138-
self.processor.process_request_dict(request_dict, 100)
139-
self.assertEqual(request_dict["enable_thinking"], False)
140-
14174

14275
class TestDataProcessorTargetMethods(unittest.TestCase):
14376
def setUp(self):

tests/input/test_paddleocr_vl_processor.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ def setUp(self):
777777
self.processor.processor = MagicMock()
778778
self.processor.limit_mm_per_prompt = {"image": 1, "video": 1, "audio": 1}
779779
self.processor.eos_token_ids = [1]
780+
self.processor.reasoning_parser = None
781+
self.processor.model_status_dict = {}
780782

781783
# 模拟 _apply_default_parameters
782784
def mock_apply_default_parameters(request_or_dict):
@@ -955,6 +957,7 @@ def test_process_request_wrapper(self):
955957
"prompt": "test prompt",
956958
"multimodal_data": {"image": ["image1"]},
957959
"metadata": {"generated_token_ids": []},
960+
"request_id": "test-request",
958961
}
959962
request_obj.to_dict.return_value = request_dict
960963

tests/input/test_text_processor.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ class DummyReasoning:
266266
def __init__(self, tokenizer):
267267
self.tokenizer = tokenizer
268268

269-
def extract_reasoning_content(self, full_text, response_dict):
269+
def extract_reasoning_content(self, full_text, response_dict, model_status):
270270
return reasoning_content, f"{full_text}!"
271271

272272
return DummyReasoning(tokenizer)
@@ -409,6 +409,7 @@ def test_data_processor_init_handles_missing_generation_config(self):
409409

410410
def test_process_response_with_reasoning_and_tools(self):
411411
processor = self.processor
412+
processor.model_status_dict = {"resp": "normal"}
412413

413414
processor.reasoning_parser = self.create_dummy_reasoning(processor.tokenizer)
414415
processor.tool_parser_obj = self.create_dummy_tool_parser(processor.tokenizer, content="tool-only")
@@ -435,7 +436,7 @@ def test_process_response_streaming_clears_state(self):
435436

436437
def test_process_response_dict_normal_with_reasoning(self):
437438
processor = self.processor
438-
439+
processor.model_status_dict = {"normal": "normal"}
439440
processor.reasoning_parser = self.create_dummy_reasoning(processor.tokenizer, reasoning_content="because")
440441
processor.tool_parser_obj = self.create_dummy_tool_parser(processor.tokenizer, content="tool-text")
441442

@@ -471,10 +472,10 @@ def fake_normal(response_dict, **kwargs):
471472
self.addCleanup(lambda: setattr(processor, "process_response_dict_normal", original_normal))
472473

473474
response = {"outputs": {}, "finished": False, "request_id": "req"}
474-
self.assertEqual(processor.process_response_dict(response), "stream")
475+
self.assertEqual(processor.process_response_dict(response, stream=True, enable_thinking=True), "stream")
475476
self.assertTrue(calls["stream"]["enable_thinking"])
476477
self.assertEqual(
477-
processor.process_response_dict(response, stream=False, enable_thinking=None),
478+
processor.process_response_dict(response, stream=False, enable_thinking=True),
478479
"normal",
479480
)
480481
self.assertTrue(calls["normal"]["enable_thinking"])

0 commit comments

Comments
 (0)