Skip to content

Commit 0c45e22

Browse files
ltd0924yuanlehome
andauthored
mv connection_manager init (#3901)
Co-authored-by: Yuanle Liu <yuanlehome@163.com>
1 parent f6f726c commit 0c45e22

3 files changed

Lines changed: 1 addition & 16 deletions

File tree

fastdeploy/entrypoints/openai/api_server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,7 @@ async def lifespan(app: FastAPI):
185185
workers=args.workers,
186186
tool_parser=args.tool_call_parser,
187187
)
188+
await engine_client.connection_manager.initialize()
188189
app.state.dynamic_load_weight = args.dynamic_load_weight
189190
model_handler = OpenAIServingModels(
190191
model_paths,

fastdeploy/entrypoints/openai/serving_chat.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,6 @@ def __init__(
7474
self.master_ip = "0.0.0.0"
7575
api_server_logger.info(f"master ip: {self.master_ip}")
7676

77-
async def _ensure_connection_manager(self):
78-
"""ensure connection manager initialized"""
79-
if not self.engine_client.connection_initialized:
80-
await self.engine_client.connection_manager.initialize()
81-
self.engine_client.connection_initialized = True
82-
8377
def _check_master(self):
8478
return self.engine_client.is_master
8579

@@ -208,7 +202,6 @@ async def chat_completion_stream_generator(
208202
api_server_logger.info(f"create chat completion request: {request_id}")
209203

210204
try:
211-
await self._ensure_connection_manager()
212205
dealer, response_queue = await self.engine_client.connection_manager.get_connection(request_id)
213206
dealer.write([b"", request_id.encode("utf-8")])
214207
choices = []
@@ -421,7 +414,6 @@ async def chat_completion_full_generator(
421414

422415
include_stop_str_in_output = request.include_stop_str_in_output
423416
try:
424-
await self._ensure_connection_manager()
425417
dealer, response_queue = await self.engine_client.connection_manager.get_connection(request_id)
426418
dealer.write([b"", request_id.encode("utf-8")])
427419
final_res = None

fastdeploy/entrypoints/openai/serving_completion.py

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,6 @@ def __init__(self, engine_client, models, pid, ips, max_waiting_time):
5151
else:
5252
self.master_ip = "0.0.0.0"
5353

54-
async def _ensure_connection_manager(self):
55-
"""ensure connection manager initialized"""
56-
if not self.engine_client.connection_initialized:
57-
await self.engine_client.connection_manager.initialize()
58-
self.engine_client.connection_initialized = True
59-
6054
def _check_master(self):
6155
return self.engine_client.is_master
6256

@@ -208,7 +202,6 @@ async def completion_full_generator(
208202
try:
209203
request_ids = [f"{request_id}-{i}" for i in range(num_choices)]
210204
# create dealer
211-
await self._ensure_connection_manager()
212205
dealer, response_queue = await self.engine_client.connection_manager.get_connection(
213206
request_id, num_choices
214207
)
@@ -314,7 +307,6 @@ async def completion_stream_generator(
314307
Process the stream completion request.
315308
"""
316309
try:
317-
await self._ensure_connection_manager()
318310
dealer, response_queue = await self.engine_client.connection_manager.get_connection(
319311
request_id, num_choices
320312
)

0 commit comments

Comments
 (0)