feat: support return raw prompt and input ids by parameters

Author: soaringk

rtp_llm/openai/renderers/sglang_helpers/function_call/deepseekv32_detector.py

@@ -65,11 +65,8 @@ def detect_and_parse(self, text: str, tools: List[Tool]) -> StreamingParseResult
         Returns:
             StreamingParseResult with parsed tool calls
         """
-        idx = text.find(self.bot_token)
-        normal_text = text[:idx].strip() if idx != -1 else text
-
         if self.bot_token not in text:
-            return StreamingParseResult(normal_text=normal_text, calls=[])
+            return StreamingParseResult(normal_text=text, calls=[])
 
         # Try to use official parser if available
         if self.encoding_module and hasattr(self.encoding_module, "parse_tool_calls"):
@@ -81,10 +78,25 @@ def detect_and_parse(self, text: str, tools: List[Tool]) -> StreamingParseResult
                     # - index: position after <｜DSML｜function_calls> opening tag
                     # - text: the FULL original text (not substring)
                     # It will parse from index position until </｜DSML｜function_calls>
+                    # Returns: (final_index, stop_token, tool_calls)
+                    #   - final_index: position after </｜DSML｜function_calls> closing tag
                     parse_start_idx = start_idx + len(self.bot_token)
 
                     # Call official parser with correct parameters
-                    _, _, tool_calls = self.encoding_module.parse_tool_calls(parse_start_idx, text)
+                    final_index, stop_token, tool_calls = self.encoding_module.parse_tool_calls(parse_start_idx, text)
+
+                    # Construct normal_text from content before and after tool calls
+                    # This preserves any text after the tool calls section
+                    text_before = text[:start_idx].strip()
+                    text_after = text[final_index:].strip() if final_index < len(text) else ""
+
+                    # Combine before and after text
+                    normal_text_parts = []
+                    if text_before:
+                        normal_text_parts.append(text_before)
+                    if text_after:
+                        normal_text_parts.append(text_after)
+                    normal_text = "\n\n".join(normal_text_parts)
 
                     # Convert to ToolCallItem format
                     calls = []
@@ -100,6 +112,8 @@ def detect_and_parse(self, text: str, tools: List[Tool]) -> StreamingParseResult
                 logger.warning(f"Official parser failed, falling back to regex: {e}")
 
         # Fallback to regex-based parsing
+        idx = text.find(self.bot_token)
+        normal_text = text[:idx].strip() if idx != -1 else text
         return self._parse_with_regex(text, tools, normal_text)
 
     def _parse_with_regex(self, text: str, tools: List[Tool], normal_text: str) -> StreamingParseResult: