Move template manager files under parser; update CODEOWNERS (#26052)
This commit is contained in:
@@ -52,8 +52,8 @@ from sglang.srt.entrypoints.openai.protocol import (
|
||||
ToolChoice,
|
||||
ToolChoiceFuncName,
|
||||
)
|
||||
from sglang.srt.managers.template_detection import detect_inline_system_support
|
||||
from sglang.srt.observability.req_time_stats import monotonic_time
|
||||
from sglang.srt.parser.template_detection import detect_inline_system_support
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.entrypoints.openai.serving_chat import OpenAIServingChat
|
||||
|
||||
@@ -88,10 +88,10 @@ from sglang.srt.managers.multi_tokenizer_mixin import (
|
||||
run_multi_detokenizer_router_process,
|
||||
)
|
||||
from sglang.srt.managers.scheduler import run_scheduler_process
|
||||
from sglang.srt.managers.template_detection import resolve_auto_parsers
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.observability.trace import process_tracing_init, trace_set_thread_info
|
||||
from sglang.srt.parser.template_detection import resolve_auto_parsers
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
from sglang.srt.plugins import load_plugins
|
||||
from sglang.srt.server_args import PortArgs, ServerArgs
|
||||
from sglang.srt.utils import (
|
||||
|
||||
@@ -149,7 +149,6 @@ from sglang.srt.managers.multi_tokenizer_mixin import (
|
||||
read_from_shared_memory,
|
||||
write_data_for_multi_tokenizer,
|
||||
)
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import ServerStatus, TokenizerManager
|
||||
from sglang.srt.observability.func_timer import enable_func_timer
|
||||
from sglang.srt.observability.trace import (
|
||||
@@ -158,6 +157,7 @@ from sglang.srt.observability.trace import (
|
||||
trace_set_thread_info,
|
||||
)
|
||||
from sglang.srt.parser.reasoning_parser import ReasoningParser
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
from sglang.srt.server_args import PortArgs, ServerArgs
|
||||
from sglang.srt.utils import (
|
||||
add_prometheus_middleware,
|
||||
|
||||
@@ -71,8 +71,8 @@ from sglang.srt.parser.jinja_template_utils import process_content_for_template_
|
||||
from sglang.srt.parser.reasoning_parser import ReasoningParser
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -19,8 +19,8 @@ from sglang.srt.entrypoints.openai.serving_base import OpenAIServingBase
|
||||
from sglang.srt.managers.io_struct import EmbeddingReqInput
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ from sglang.srt.parser.code_completion_parser import (
|
||||
from sglang.utils import convert_json_schema_to_str
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ from sglang.srt.parser.conversation import generate_embedding_convs
|
||||
from sglang.srt.parser.jinja_template_utils import process_content_for_template_format
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
|
||||
|
||||
class OpenAIServingEmbedding(OpenAIServingBase):
|
||||
|
||||
@@ -74,8 +74,8 @@ from sglang.srt.parser.reasoning_parser import ReasoningParser
|
||||
from sglang.srt.utils import random_uuid
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from sglang.srt.managers.template_manager import TemplateManager
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.template_manager import TemplateManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
||||
+8
-8
@@ -23,14 +23,6 @@ import logging
|
||||
import os
|
||||
from typing import Dict, Optional
|
||||
|
||||
from sglang.srt.managers.template_detection import (
|
||||
REASONING_PARSER_RULES,
|
||||
TOOL_CALL_PARSER_RULES,
|
||||
ReasoningToggleConfig,
|
||||
build_detection_context,
|
||||
detect_reasoning_pattern,
|
||||
match_rules,
|
||||
)
|
||||
from sglang.srt.managers.tokenizer_manager import TokenizerManager
|
||||
from sglang.srt.parser.code_completion_parser import (
|
||||
CompletionTemplate,
|
||||
@@ -47,6 +39,14 @@ from sglang.srt.parser.conversation import (
|
||||
register_conv_template,
|
||||
)
|
||||
from sglang.srt.parser.jinja_template_utils import detect_jinja_template_content_format
|
||||
from sglang.srt.parser.template_detection import (
|
||||
REASONING_PARSER_RULES,
|
||||
TOOL_CALL_PARSER_RULES,
|
||||
ReasoningToggleConfig,
|
||||
build_detection_context,
|
||||
detect_reasoning_pattern,
|
||||
match_rules,
|
||||
)
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
Reference in New Issue
Block a user