diff --git a/python/sglang/srt/managers/openai_protocol.py b/python/sglang/srt/managers/openai_protocol.py index f4ef99dd9..320eab42b 100644 --- a/python/sglang/srt/managers/openai_protocol.py +++ b/python/sglang/srt/managers/openai_protocol.py @@ -1,8 +1,8 @@ import time from typing import Dict, List, Optional, Union -from typing_extensions import Literal from pydantic import BaseModel, Field +from typing_extensions import Literal class LogProbs(BaseModel): diff --git a/python/sglang/srt/server.py b/python/sglang/srt/server.py index d21ff7f73..30a182a3e 100644 --- a/python/sglang/srt/server.py +++ b/python/sglang/srt/server.py @@ -440,9 +440,7 @@ class Runtime: additional_ports: Optional[Union[List[int], int]] = None, ): host = "127.0.0.1" - port, additional_ports = handle_port_init( - port, additional_ports, tp_size - ) + port, additional_ports = handle_port_init(port, additional_ports, tp_size) self.server_args = ServerArgs( model_path=model_path, tokenizer_path=tokenizer_path, diff --git a/python/sglang/srt/utils.py b/python/sglang/srt/utils.py index 05e035a0a..9f10ef5ea 100644 --- a/python/sglang/srt/utils.py +++ b/python/sglang/srt/utils.py @@ -6,6 +6,7 @@ import sys import time import traceback from io import BytesIO +from typing import List, Optional import numpy as np import requests @@ -108,10 +109,16 @@ def check_port(port): return False -def handle_port_init(port: Optional[int] = None, additional_ports: Optional[List[int]] = None, tp_size: int = 1): +def handle_port_init( + port: Optional[int] = None, + additional_ports: Optional[List[int]] = None, + tp_size: int = 1, +): port = 30000 if port is None else port additional_ports = [] if additional_ports is None else additional_ports - additional_ports = [additional_ports] if isinstance(additional_ports, int) else additional_ports + additional_ports = ( + [additional_ports] if isinstance(additional_ports, int) else additional_ports + ) # first check on server port if not check_port(port): new_port = alloc_usable_network_port(1, used_list=[port])[0] @@ -129,10 +136,11 @@ def handle_port_init(port: Optional[int] = None, additional_ports: Optional[List num=4 + tp_size - num_specified_ports, used_list=can_use_ports + [port] ) can_use_ports.extend(addtional_can_use_ports) - - additional_ports = can_use_ports[:4 + tp_size] + + additional_ports = can_use_ports[: 4 + tp_size] return port, additional_ports + def get_exception_traceback(): etype, value, tb = sys.exc_info() err_str = "".join(traceback.format_exception(etype, value, tb)) diff --git a/python/sglang/test/test_conversation.py b/python/sglang/test/test_conversation.py index 4f4f956fe..11e837ddb 100644 --- a/python/sglang/test/test_conversation.py +++ b/python/sglang/test/test_conversation.py @@ -1,9 +1,9 @@ from sglang.srt.conversation import generate_chat_conv from sglang.srt.managers.openai_protocol import ( - ChatCompletionMessageGenericParam, ChatCompletionMessageContentImagePart, ChatCompletionMessageContentImageURL, ChatCompletionMessageContentTextPart, + ChatCompletionMessageGenericParam, ChatCompletionMessageUserParam, ChatCompletionRequest, ) diff --git a/python/sglang/test/test_openai_protocol.py b/python/sglang/test/test_openai_protocol.py index ed18e428a..99e7a8089 100644 --- a/python/sglang/test/test_openai_protocol.py +++ b/python/sglang/test/test_openai_protocol.py @@ -1,8 +1,8 @@ from sglang.srt.managers.openai_protocol import ( - ChatCompletionMessageGenericParam, ChatCompletionMessageContentImagePart, ChatCompletionMessageContentImageURL, ChatCompletionMessageContentTextPart, + ChatCompletionMessageGenericParam, ChatCompletionMessageUserParam, ChatCompletionRequest, )