Skip to content

Commit 173e4df

Browse files
ltd0924yuanlehome
andauthored
[Fix] mv connection_manager init (#3902)
* Update serving_chat.py * Update serving_completion.py * Update serving_completion.py * mv connection_manager init --------- Co-authored-by: Yuanle Liu <[email protected]>
1 parent 199f88c commit 173e4df

File tree

3 files changed

+1
-16
lines changed

3 files changed

+1
-16
lines changed

fastdeploy/entrypoints/openai/api_server.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ async def lifespan(app: FastAPI):
182182
workers=args.workers,
183183
tool_parser=args.tool_call_parser,
184184
)
185+
await engine_client.connection_manager.initialize()
185186
app.state.dynamic_load_weight = args.dynamic_load_weight
186187
model_handler = OpenAIServingModels(
187188
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

@@ -206,7 +200,6 @@ async def chat_completion_stream_generator(
206200
api_server_logger.info(f"create chat completion request: {request_id}")
207201

208202
try:
209-
await self._ensure_connection_manager()
210203
dealer, response_queue = await self.engine_client.connection_manager.get_connection(request_id)
211204
dealer.write([b"", request_id.encode("utf-8")])
212205
choices = []
@@ -419,7 +412,6 @@ async def chat_completion_full_generator(
419412

420413
include_stop_str_in_output = request.include_stop_str_in_output
421414
try:
422-
await self._ensure_connection_manager()
423415
dealer, response_queue = await self.engine_client.connection_manager.get_connection(request_id)
424416
dealer.write([b"", request_id.encode("utf-8")])
425417
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)