format code

This commit is contained in:
Lianmin Zheng
2024-01-30 16:36:10 +00:00
parent 4a634cf646
commit 74b3bfaaf8
5 changed files with 16 additions and 10 deletions

View File

@@ -1,8 +1,8 @@
import time import time
from typing import Dict, List, Optional, Union from typing import Dict, List, Optional, Union
from typing_extensions import Literal
from pydantic import BaseModel, Field from pydantic import BaseModel, Field
from typing_extensions import Literal
class LogProbs(BaseModel): class LogProbs(BaseModel):

View File

@@ -440,9 +440,7 @@ class Runtime:
additional_ports: Optional[Union[List[int], int]] = None, additional_ports: Optional[Union[List[int], int]] = None,
): ):
host = "127.0.0.1" host = "127.0.0.1"
port, additional_ports = handle_port_init( port, additional_ports = handle_port_init(port, additional_ports, tp_size)
port, additional_ports, tp_size
)
self.server_args = ServerArgs( self.server_args = ServerArgs(
model_path=model_path, model_path=model_path,
tokenizer_path=tokenizer_path, tokenizer_path=tokenizer_path,

View File

@@ -6,6 +6,7 @@ import sys
import time import time
import traceback import traceback
from io import BytesIO from io import BytesIO
from typing import List, Optional
import numpy as np import numpy as np
import requests import requests
@@ -108,10 +109,16 @@ def check_port(port):
return False 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 port = 30000 if port is None else port
additional_ports = [] if additional_ports is None else additional_ports 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 # first check on server port
if not check_port(port): if not check_port(port):
new_port = alloc_usable_network_port(1, used_list=[port])[0] new_port = alloc_usable_network_port(1, used_list=[port])[0]
@@ -130,9 +137,10 @@ def handle_port_init(port: Optional[int] = None, additional_ports: Optional[List
) )
can_use_ports.extend(addtional_can_use_ports) 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 return port, additional_ports
def get_exception_traceback(): def get_exception_traceback():
etype, value, tb = sys.exc_info() etype, value, tb = sys.exc_info()
err_str = "".join(traceback.format_exception(etype, value, tb)) err_str = "".join(traceback.format_exception(etype, value, tb))

View File

@@ -1,9 +1,9 @@
from sglang.srt.conversation import generate_chat_conv from sglang.srt.conversation import generate_chat_conv
from sglang.srt.managers.openai_protocol import ( from sglang.srt.managers.openai_protocol import (
ChatCompletionMessageGenericParam,
ChatCompletionMessageContentImagePart, ChatCompletionMessageContentImagePart,
ChatCompletionMessageContentImageURL, ChatCompletionMessageContentImageURL,
ChatCompletionMessageContentTextPart, ChatCompletionMessageContentTextPart,
ChatCompletionMessageGenericParam,
ChatCompletionMessageUserParam, ChatCompletionMessageUserParam,
ChatCompletionRequest, ChatCompletionRequest,
) )

View File

@@ -1,8 +1,8 @@
from sglang.srt.managers.openai_protocol import ( from sglang.srt.managers.openai_protocol import (
ChatCompletionMessageGenericParam,
ChatCompletionMessageContentImagePart, ChatCompletionMessageContentImagePart,
ChatCompletionMessageContentImageURL, ChatCompletionMessageContentImageURL,
ChatCompletionMessageContentTextPart, ChatCompletionMessageContentTextPart,
ChatCompletionMessageGenericParam,
ChatCompletionMessageUserParam, ChatCompletionMessageUserParam,
ChatCompletionRequest, ChatCompletionRequest,
) )