Skip to content

Commit b7db520

Browse files
xiaoajie738xiongjie
andauthored
style(types): fix return type annotation for get_all_requests (#3919)
* style(types): fix return type annotation for get_all_requests * fix: safely handle empty request lists in RequestManager.step --------- Co-authored-by: xiongjie <[email protected]>
1 parent aca2c15 commit b7db520

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

lmdeploy/pytorch/engine/request.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def has_requests(self):
225225
return False
226226
return not self.requests.empty()
227227

228-
async def get_all_requests(self) -> Dict[RequestType, Request]:
228+
async def get_all_requests(self) -> Dict[RequestType, List[Request]]:
229229
"""Get all requests in current queue."""
230230
num_reqs = self.requests.qsize()
231231
reqs: ReqList = []
@@ -247,7 +247,7 @@ def __proc_reqs(elem):
247247
__proc_reqs(elem)
248248

249249
# gather requests
250-
reqs_by_type: Dict[RequestType, Request] = dict((t, []) for t in RequestType)
250+
reqs_by_type: Dict[RequestType, List[Request]] = dict((t, []) for t in RequestType)
251251
for req in reqs:
252252
reqs_by_type[req.type].append(req)
253253
return reqs_by_type
@@ -300,11 +300,10 @@ def _log_reqs(reqs: ReqList):
300300

301301
# handle requests
302302
for req_type in self.request_priority:
303-
# request exists
304-
if req_type not in reqs_by_type or len(reqs_by_type) == 0:
303+
reqs: ReqList = reqs_by_type.get(req_type, [])
304+
if not reqs:
305305
continue
306306

307-
reqs: ReqList = reqs_by_type[req_type]
308307
_log_reqs(reqs)
309308
self.process_request(req_type, reqs, **kwargs)
310309

0 commit comments

Comments
 (0)