Skip to content

Fix the issue of semaphore unreleased due to internal exception #3405

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
StephenZKCurry wants to merge 2 commits into from
+10 −2
Closed

Fix the issue of semaphore unreleased due to internal exception #3405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb7bd11
Fix semaphore release issue in api_generate_stream and api_generate f…
StephenZKCurry Jun 14, 2024
770244a
Merge branch 'lm-sys:main' into main
StephenZKCurry Jun 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions fastchat/serve/base_model_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,8 +206,10 @@ async def api_generate_stream(request: Request):
async def api_generate(request: Request):
params = await request.json()
await acquire_worker_semaphore()
output = await asyncio.to_thread(worker.generate_gate, params)
release_worker_semaphore()
try:
output = await asyncio.to_thread(worker.generate_gate, params)
finally:
release_worker_semaphore()
return JSONResponse(output)


Expand Down
6 changes: 6 additions & 0 deletions fastchat/serve/model_worker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,12 @@ def generate_stream_gate(self, params):
"error_code": ErrorCode.INTERNAL_ERROR,
}
yield json.dumps(ret).encode() + b"\0"
except Exception as e:
ret = {
"text": f"{SERVER_ERROR_MSG}\n\n({e})",
"error_code": ErrorCode.INTERNAL_ERROR,
}
yield json.dumps(ret).encode() + b"\0"

def generate_gate(self, params):
for x in self.generate_stream_gate(params):
Expand Down