xinference 1.1.1__py3-none-any.whl → 1.2.0__py3-none-any.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of xinference might be problematic. Click here for more details.
- xinference/_version.py +3 -3
- xinference/api/restful_api.py +49 -65
- xinference/core/model.py +77 -19
- xinference/core/supervisor.py +81 -10
- xinference/core/utils.py +2 -2
- xinference/core/worker.py +32 -0
- xinference/model/image/model_spec.json +18 -0
- xinference/model/image/model_spec_modelscope.json +20 -0
- xinference/model/llm/__init__.py +2 -0
- xinference/model/llm/llm_family.json +96 -0
- xinference/model/llm/llm_family_modelscope.json +99 -0
- xinference/model/llm/mlx/core.py +23 -73
- xinference/model/llm/transformers/cogagent.py +272 -0
- xinference/model/llm/transformers/core.py +1 -0
- xinference/model/llm/transformers/qwen2_vl.py +10 -1
- xinference/model/llm/utils.py +27 -3
- xinference/model/llm/vllm/core.py +37 -7
- xinference/model/llm/vllm/xavier/__init__.py +13 -0
- xinference/model/llm/vllm/xavier/allocator.py +74 -0
- xinference/model/llm/vllm/xavier/block.py +112 -0
- xinference/model/llm/vllm/xavier/block_manager.py +71 -0
- xinference/model/llm/vllm/xavier/block_tracker.py +116 -0
- xinference/model/llm/vllm/xavier/engine.py +247 -0
- xinference/model/llm/vllm/xavier/executor.py +132 -0
- xinference/model/llm/vllm/xavier/scheduler.py +422 -0
- xinference/model/llm/vllm/xavier/test/__init__.py +13 -0
- xinference/model/llm/vllm/xavier/test/test_xavier.py +122 -0
- xinference/model/llm/vllm/xavier/transfer.py +298 -0
- xinference/model/video/diffusers.py +14 -0
- xinference/model/video/model_spec.json +15 -0
- xinference/model/video/model_spec_modelscope.json +16 -0
- xinference/types.py +13 -0
- xinference/web/ui/build/asset-manifest.json +6 -6
- xinference/web/ui/build/index.html +1 -1
- xinference/web/ui/build/static/css/main.51a587ff.css +2 -0
- xinference/web/ui/build/static/css/main.51a587ff.css.map +1 -0
- xinference/web/ui/build/static/js/main.1eb206d1.js +3 -0
- xinference/web/ui/build/static/js/main.1eb206d1.js.map +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/03c4052f1b91f6ba0c5389bdcf49c43319b4076c08e4b8585dab312538ae290a.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/1786b83003b8e9605a0f5f855a185d4d16e38fc893dfb326a2a9cca206b4240a.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/17cbc181dd674b9150b80c73ed6a82656de0082d857f6e5f66d9716129ac0b38.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/185ceb8872d562e032b47e79df6a45670e06345b8ed70aad1a131e0476783c5c.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/2213d49de260e1f67c888081b18f120f5225462b829ae57c9e05a05cec83689d.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/26b8c9f34b0bed789b3a833767672e39302d1e0c09b4276f4d58d1df7b6bd93b.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/2b484da66c724d0d56a40849c109327408796a668b1381511b6e9e03baa48658.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/2cbbbce9b84df73330d4c42b82436ed881b3847628f2fbc346aa62e2859fd88c.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/2ec9b14431ed33ce6901bf9f27007be4e6e472709c99d6e22b50ce528e4b78ee.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/3b966db018f96be4a055d6ca205f0990d4d0b370e2980c17d8bca2c9a021819c.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/3eefb411b24c2b3ce053570ef50daccf154022f0e168be5ed0fec21394baf9f4.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/522b229e3cac219123f0d69673f5570e191c2d2a505dc65b312d336eae2279c0.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/52e45f17ba300580ea3fcc9f9228ccba194bb092b76f25e9255af311f8b05aab.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/5a0bc4631f936459afc1a3b1d3ec2420118b1f00e11f60ccac3e08088f3f27a8.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/611fa2c6c53b66039991d06dfb0473b5ab37fc63b4564e0f6e1718523768a045.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/6329bc76c406fe5eb305412383fbde5950f847bb5e43261f73f37622c365acb4.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/63c8e07687ea53a4f8a910ee5e42e0eb26cd1acbfbe820f3e3248a786ee51401.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/69b2d5001684174ec9da57e07914eed3eac4960018bceb6cbfa801d861301d7c.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/710c1acda69e561e30a933b98c6a56d50197868b15c21e2aad55ab6d46649eb6.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/720deca1fce5a1dc5056048fa8258fd138a82ea855f350b6613f104a73fb761f.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/76a23b92d26a499c57e61eea2b895fbc9771bd0849a72e66f8e633192017978b.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/858063f23b34dfe600254eb5afd85518b0002ec4b30b7386616c45600826e3b2.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/920b82c1c89124cf217109eeedbfcd3aae3b917be50c9dfb6bbb4ce26bdfd2e7.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/94d8b7aeb0076f2ce07db598cea0e87b13bc8d5614eb530b8d6e696c2daf6f88.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/9e917fe7022d01b2ccbe5cc0ce73d70bb72bee584ff293bad71bdff6695dee28.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/9f28fdb8399f1d0474f0aca86f1658dc94f5bf0c90f6146352de150692de8862.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/a0dfafa06b2bb7cba8cad41c482503f61944f759f4318139362602ef5cc47ccb.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/afb8084f539534cd594755ea2205ecd5bd1f62dddcfdf75a2eace59a28131278.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/b57b1438b77294c1f3f6cfce12ac487d8106c6f016975ba0aec94d98997e2e1e.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/b9917b0bf8e4d55ccbac1c334aa04d6ff3c5b6ed9e5d38b9ea2c687fa7d3f5a9.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/bbcc94b0149963d1d6f267ee1f4f03d3925b758392ce2f516c3fe8af0e0169fc.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/bdee44abeadc4abc17d41c52eb49c6e19a4b1a267b6e16876ce91bdeeebfc52d.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/beb112b70f4a56db95920a9e20efb6c97c37b68450716730217a9ee1a9ae92be.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/c88db97be0cdf440193b3995996e83510a04cb00048135485fc0e26d197e80b5.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/d49e5314d34310a62d01a03067ce1bec5da00abce84c5196aa9c6842fa79a430.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/d7664d18c4ddbad9c3a6a31b91f7c00fb0dde804608674a9860ee50f33e54708.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/d9072c318b819b7c90a0f7e9cc0b6413b4dbeb8e9859898e53d75ea882fcde99.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/db16a983bc08a05f0439cc61ca0840e49e1d8400eef678909f16c032a418a3d6.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/dc249829767b8abcbc3677e0b07b6d3ecbfdfe6d08cfe23a665eb33373a9aa9d.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/e242c583c2dbc2784f0fcf513523975f7d5df447e106c1c17e49e8578a6fc3ed.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/eac5f1296513e69e4b96f750ddccd4d0264e2bae4e4c449144e83274a48698d9.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/ed57202cb79649bb716400436590245547df241988fc7c8e1d85d132299542d2.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/f125bf72e773a14cdaebd0c343e80adb909d12e317ee5c00cd4a57442fbe2c62.json +1 -0
- xinference/web/ui/node_modules/.cache/babel-loader/f91af913d7f91c410719ab13136aaed3aaf0f8dda06652f25c42cb5231587398.json +1 -0
- xinference/web/ui/node_modules/.package-lock.json +67 -3
- xinference/web/ui/node_modules/@babel/runtime/package.json +592 -538
- xinference/web/ui/node_modules/html-parse-stringify/package.json +50 -0
- xinference/web/ui/node_modules/i18next/dist/esm/package.json +1 -0
- xinference/web/ui/node_modules/i18next/package.json +129 -0
- xinference/web/ui/node_modules/react-i18next/.eslintrc.json +74 -0
- xinference/web/ui/node_modules/react-i18next/dist/es/package.json +1 -0
- xinference/web/ui/node_modules/react-i18next/package.json +162 -0
- xinference/web/ui/node_modules/void-elements/package.json +34 -0
- xinference/web/ui/package-lock.json +69 -3
- xinference/web/ui/package.json +2 -0
- xinference/web/ui/src/locales/en.json +186 -0
- xinference/web/ui/src/locales/zh.json +186 -0
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/METADATA +9 -6
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/RECORD +102 -56
- xinference/web/ui/build/static/css/main.5061c4c3.css +0 -2
- xinference/web/ui/build/static/css/main.5061c4c3.css.map +0 -1
- xinference/web/ui/build/static/js/main.4eb4ee80.js +0 -3
- xinference/web/ui/build/static/js/main.4eb4ee80.js.map +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/07ce9e632e6aff24d7aa3ad8e48224433bbfeb0d633fca723453f1fcae0c9f1c.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/1130403f9e46f5738a23b45ac59b57de8f360c908c713e2c0670c2cce9bd367a.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/131091b25d26b17cdca187d7542a21475c211138d900cf667682260e76ef9463.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/1f269fb2a368363c1cb2237825f1dba093b6bdd8c44cc05954fd19ec2c1fff03.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/331312668fa8bd3d7401818f4a25fa98135d7f61371cd6bfff78b18cf4fbdd92.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/40f17338fc75ae095de7d2b4d8eae0d5ca0193a7e2bcece4ee745b22a7a2f4b7.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/4de9a6942c5f1749d6cbfdd54279699975f16016b182848bc253886f52ec2ec3.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/822586ed1077201b64b954f12f25e3f9b45678c1acbabe53d8af3ca82ca71f33.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/8c5eeb02f772d02cbe8b89c05428d0dd41a97866f75f7dc1c2164a67f5a1cf98.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/8d33354bd2100c8602afc3341f131a88cc36aaeecd5a4b365ed038514708e350.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/9375a35b05d56989b2755bf72161fa707c92f28569d33765a75f91a568fda6e9.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/a158a9ffa0c9b169aee53dd4a0c44501a596755b4e4f6ede7746d65a72e2a71f.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/c7bf40bab396765f67d0fed627ed3665890608b2d0edaa3e8cb7cfc96310db45.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/d6c643278a0b28320e6f33a60f5fb64c053997cbdc39a60e53ccc574688ade9e.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/e42b72d4cc1ea412ebecbb8d040dc6c6bfee462c33903c2f1f3facb602ad742e.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/e64b7e8cedcf43d4c95deba60ec1341855c887705805bb62431693118b870c69.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/f5039ddbeb815c51491a1989532006b96fc3ae49c6c60e3c097f875b4ae915ae.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/f72f011744c4649fabddca6f7a9327861ac0a315a89b1a2e62a39774e7863845.json +0 -1
- xinference/web/ui/node_modules/.cache/babel-loader/feabb04b4aa507102da0a64398a40818e878fd1df9b75dda8461b3e1e7ff3f11.json +0 -1
- /xinference/web/ui/build/static/js/{main.4eb4ee80.js.LICENSE.txt → main.1eb206d1.js.LICENSE.txt} +0 -0
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/LICENSE +0 -0
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/WHEEL +0 -0
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/entry_points.txt +0 -0
- {xinference-1.1.1.dist-info → xinference-1.2.0.dist-info}/top_level.txt +0 -0
xinference/_version.py
CHANGED
|
@@ -8,11 +8,11 @@ import json
|
|
|
8
8
|
|
|
9
9
|
version_json = '''
|
|
10
10
|
{
|
|
11
|
-
"date": "
|
|
11
|
+
"date": "2025-01-10T17:24:10+0800",
|
|
12
12
|
"dirty": false,
|
|
13
13
|
"error": null,
|
|
14
|
-
"full-revisionid": "
|
|
15
|
-
"version": "1.
|
|
14
|
+
"full-revisionid": "df45f11115051929d6296a0c138b99472abf497f",
|
|
15
|
+
"version": "1.2.0"
|
|
16
16
|
}
|
|
17
17
|
''' # END VERSION_JSON
|
|
18
18
|
|
xinference/api/restful_api.py
CHANGED
|
@@ -1214,6 +1214,19 @@ class RESTfulAPI(CancelMixin):
|
|
|
1214
1214
|
async def get_address(self) -> JSONResponse:
|
|
1215
1215
|
return JSONResponse(content=self._supervisor_address)
|
|
1216
1216
|
|
|
1217
|
+
async def _get_model_last_error(self, replica_model_uid: bytes, e: Exception):
|
|
1218
|
+
if not isinstance(e, xo.ServerClosed):
|
|
1219
|
+
return e
|
|
1220
|
+
try:
|
|
1221
|
+
model_status = await (await self._get_supervisor_ref()).get_model_status(
|
|
1222
|
+
replica_model_uid.decode("utf-8")
|
|
1223
|
+
)
|
|
1224
|
+
if model_status is not None and model_status.last_error:
|
|
1225
|
+
return Exception(model_status.last_error)
|
|
1226
|
+
except Exception as ex:
|
|
1227
|
+
return ex
|
|
1228
|
+
return e
|
|
1229
|
+
|
|
1217
1230
|
async def create_completion(self, request: Request) -> Response:
|
|
1218
1231
|
raw_body = await request.json()
|
|
1219
1232
|
body = CreateCompletionRequest.parse_obj(raw_body)
|
|
@@ -1272,6 +1285,7 @@ class RESTfulAPI(CancelMixin):
|
|
|
1272
1285
|
)
|
|
1273
1286
|
return
|
|
1274
1287
|
except Exception as ex:
|
|
1288
|
+
ex = await self._get_model_last_error(model.uid, ex)
|
|
1275
1289
|
logger.exception("Completion stream got an error: %s", ex)
|
|
1276
1290
|
await self._report_error_event(model_uid, str(ex))
|
|
1277
1291
|
# https://github.com/openai/openai-python/blob/e0aafc6c1a45334ac889fe3e54957d309c3af93f/src/openai/_streaming.py#L107
|
|
@@ -1286,6 +1300,7 @@ class RESTfulAPI(CancelMixin):
|
|
|
1286
1300
|
data = await model.generate(body.prompt, kwargs, raw_params=raw_kwargs)
|
|
1287
1301
|
return Response(data, media_type="application/json")
|
|
1288
1302
|
except Exception as e:
|
|
1303
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1289
1304
|
logger.error(e, exc_info=True)
|
|
1290
1305
|
await self._report_error_event(model_uid, str(e))
|
|
1291
1306
|
self.handle_request_limit_error(e)
|
|
@@ -1317,14 +1332,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1317
1332
|
try:
|
|
1318
1333
|
embedding = await model.create_embedding(body.input, **kwargs)
|
|
1319
1334
|
return Response(embedding, media_type="application/json")
|
|
1320
|
-
except RuntimeError as re:
|
|
1321
|
-
logger.error(re, exc_info=True)
|
|
1322
|
-
await self._report_error_event(model_uid, str(re))
|
|
1323
|
-
self.handle_request_limit_error(re)
|
|
1324
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1325
1335
|
except Exception as e:
|
|
1336
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1326
1337
|
logger.error(e, exc_info=True)
|
|
1327
1338
|
await self._report_error_event(model_uid, str(e))
|
|
1339
|
+
self.handle_request_limit_error(e)
|
|
1328
1340
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1329
1341
|
|
|
1330
1342
|
async def convert_ids_to_tokens(self, request: Request) -> Response:
|
|
@@ -1352,14 +1364,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1352
1364
|
try:
|
|
1353
1365
|
decoded_texts = await model.convert_ids_to_tokens(body.input, **kwargs)
|
|
1354
1366
|
return Response(decoded_texts, media_type="application/json")
|
|
1355
|
-
except RuntimeError as re:
|
|
1356
|
-
logger.error(re, exc_info=True)
|
|
1357
|
-
await self._report_error_event(model_uid, str(re))
|
|
1358
|
-
self.handle_request_limit_error(re)
|
|
1359
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1360
1367
|
except Exception as e:
|
|
1368
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1361
1369
|
logger.error(e, exc_info=True)
|
|
1362
1370
|
await self._report_error_event(model_uid, str(e))
|
|
1371
|
+
self.handle_request_limit_error(e)
|
|
1363
1372
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1364
1373
|
|
|
1365
1374
|
async def rerank(self, request: Request) -> Response:
|
|
@@ -1393,14 +1402,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1393
1402
|
**parsed_kwargs,
|
|
1394
1403
|
)
|
|
1395
1404
|
return Response(scores, media_type="application/json")
|
|
1396
|
-
except RuntimeError as re:
|
|
1397
|
-
logger.error(re, exc_info=True)
|
|
1398
|
-
await self._report_error_event(model_uid, str(re))
|
|
1399
|
-
self.handle_request_limit_error(re)
|
|
1400
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1401
1405
|
except Exception as e:
|
|
1406
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1402
1407
|
logger.error(e, exc_info=True)
|
|
1403
1408
|
await self._report_error_event(model_uid, str(e))
|
|
1409
|
+
self.handle_request_limit_error(e)
|
|
1404
1410
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1405
1411
|
|
|
1406
1412
|
async def create_transcriptions(
|
|
@@ -1445,13 +1451,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1445
1451
|
**parsed_kwargs,
|
|
1446
1452
|
)
|
|
1447
1453
|
return Response(content=transcription, media_type="application/json")
|
|
1448
|
-
except RuntimeError as re:
|
|
1449
|
-
logger.error(re, exc_info=True)
|
|
1450
|
-
await self._report_error_event(model_uid, str(re))
|
|
1451
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1452
1454
|
except Exception as e:
|
|
1455
|
+
e = await self._get_model_last_error(model_ref.uid, e)
|
|
1453
1456
|
logger.error(e, exc_info=True)
|
|
1454
1457
|
await self._report_error_event(model_uid, str(e))
|
|
1458
|
+
self.handle_request_limit_error(e)
|
|
1455
1459
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1456
1460
|
|
|
1457
1461
|
async def create_translations(
|
|
@@ -1496,13 +1500,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1496
1500
|
**parsed_kwargs,
|
|
1497
1501
|
)
|
|
1498
1502
|
return Response(content=translation, media_type="application/json")
|
|
1499
|
-
except RuntimeError as re:
|
|
1500
|
-
logger.error(re, exc_info=True)
|
|
1501
|
-
await self._report_error_event(model_uid, str(re))
|
|
1502
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1503
1503
|
except Exception as e:
|
|
1504
|
+
e = await self._get_model_last_error(model_ref.uid, e)
|
|
1504
1505
|
logger.error(e, exc_info=True)
|
|
1505
1506
|
await self._report_error_event(model_uid, str(e))
|
|
1507
|
+
self.handle_request_limit_error(e)
|
|
1506
1508
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1507
1509
|
|
|
1508
1510
|
async def create_speech(
|
|
@@ -1558,14 +1560,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1558
1560
|
)
|
|
1559
1561
|
else:
|
|
1560
1562
|
return Response(media_type="application/octet-stream", content=out)
|
|
1561
|
-
except RuntimeError as re:
|
|
1562
|
-
logger.error(re, exc_info=True)
|
|
1563
|
-
await self._report_error_event(model_uid, str(re))
|
|
1564
|
-
self.handle_request_limit_error(re)
|
|
1565
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1566
1563
|
except Exception as e:
|
|
1564
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1567
1565
|
logger.error(e, exc_info=True)
|
|
1568
1566
|
await self._report_error_event(model_uid, str(e))
|
|
1567
|
+
self.handle_request_limit_error(e)
|
|
1569
1568
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1570
1569
|
|
|
1571
1570
|
async def get_progress(self, request_id: str) -> JSONResponse:
|
|
@@ -1611,14 +1610,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1611
1610
|
logger.error(err_str)
|
|
1612
1611
|
await self._report_error_event(model_uid, err_str)
|
|
1613
1612
|
raise HTTPException(status_code=409, detail=err_str)
|
|
1614
|
-
except RuntimeError as re:
|
|
1615
|
-
logger.error(re, exc_info=True)
|
|
1616
|
-
await self._report_error_event(model_uid, str(re))
|
|
1617
|
-
self.handle_request_limit_error(re)
|
|
1618
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1619
1613
|
except Exception as e:
|
|
1614
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1620
1615
|
logger.error(e, exc_info=True)
|
|
1621
1616
|
await self._report_error_event(model_uid, str(e))
|
|
1617
|
+
self.handle_request_limit_error(e)
|
|
1622
1618
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1623
1619
|
|
|
1624
1620
|
async def sdapi_options(self, request: Request) -> Response:
|
|
@@ -1689,14 +1685,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1689
1685
|
**kwargs,
|
|
1690
1686
|
)
|
|
1691
1687
|
return Response(content=image_list, media_type="application/json")
|
|
1692
|
-
except RuntimeError as re:
|
|
1693
|
-
logger.error(re, exc_info=True)
|
|
1694
|
-
await self._report_error_event(model_uid, str(re))
|
|
1695
|
-
self.handle_request_limit_error(re)
|
|
1696
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1697
1688
|
except Exception as e:
|
|
1689
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1698
1690
|
logger.error(e, exc_info=True)
|
|
1699
1691
|
await self._report_error_event(model_uid, str(e))
|
|
1692
|
+
self.handle_request_limit_error(e)
|
|
1700
1693
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1701
1694
|
|
|
1702
1695
|
async def sdapi_img2img(self, request: Request) -> Response:
|
|
@@ -1723,14 +1716,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1723
1716
|
**kwargs,
|
|
1724
1717
|
)
|
|
1725
1718
|
return Response(content=image_list, media_type="application/json")
|
|
1726
|
-
except RuntimeError as re:
|
|
1727
|
-
logger.error(re, exc_info=True)
|
|
1728
|
-
await self._report_error_event(model_uid, str(re))
|
|
1729
|
-
self.handle_request_limit_error(re)
|
|
1730
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1731
1719
|
except Exception as e:
|
|
1720
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1732
1721
|
logger.error(e, exc_info=True)
|
|
1733
1722
|
await self._report_error_event(model_uid, str(e))
|
|
1723
|
+
self.handle_request_limit_error(e)
|
|
1734
1724
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1735
1725
|
|
|
1736
1726
|
async def create_variations(
|
|
@@ -1779,13 +1769,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1779
1769
|
logger.error(err_str)
|
|
1780
1770
|
await self._report_error_event(model_uid, err_str)
|
|
1781
1771
|
raise HTTPException(status_code=409, detail=err_str)
|
|
1782
|
-
except RuntimeError as re:
|
|
1783
|
-
logger.error(re, exc_info=True)
|
|
1784
|
-
await self._report_error_event(model_uid, str(re))
|
|
1785
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1786
1772
|
except Exception as e:
|
|
1773
|
+
e = await self._get_model_last_error(model_ref.uid, e)
|
|
1787
1774
|
logger.error(e, exc_info=True)
|
|
1788
1775
|
await self._report_error_event(model_uid, str(e))
|
|
1776
|
+
self.handle_request_limit_error(e)
|
|
1789
1777
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1790
1778
|
|
|
1791
1779
|
async def create_inpainting(
|
|
@@ -1841,13 +1829,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1841
1829
|
logger.error(err_str)
|
|
1842
1830
|
await self._report_error_event(model_uid, err_str)
|
|
1843
1831
|
raise HTTPException(status_code=409, detail=err_str)
|
|
1844
|
-
except RuntimeError as re:
|
|
1845
|
-
logger.error(re, exc_info=True)
|
|
1846
|
-
await self._report_error_event(model_uid, str(re))
|
|
1847
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1848
1832
|
except Exception as e:
|
|
1833
|
+
e = await self._get_model_last_error(model_ref.uid, e)
|
|
1849
1834
|
logger.error(e, exc_info=True)
|
|
1850
1835
|
await self._report_error_event(model_uid, str(e))
|
|
1836
|
+
self.handle_request_limit_error(e)
|
|
1851
1837
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1852
1838
|
|
|
1853
1839
|
async def create_ocr(
|
|
@@ -1887,13 +1873,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1887
1873
|
logger.error(err_str)
|
|
1888
1874
|
await self._report_error_event(model_uid, err_str)
|
|
1889
1875
|
raise HTTPException(status_code=409, detail=err_str)
|
|
1890
|
-
except RuntimeError as re:
|
|
1891
|
-
logger.error(re, exc_info=True)
|
|
1892
|
-
await self._report_error_event(model_uid, str(re))
|
|
1893
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1894
1876
|
except Exception as e:
|
|
1877
|
+
e = await self._get_model_last_error(model_ref.uid, e)
|
|
1895
1878
|
logger.error(e, exc_info=True)
|
|
1896
1879
|
await self._report_error_event(model_uid, str(e))
|
|
1880
|
+
self.handle_request_limit_error(e)
|
|
1897
1881
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1898
1882
|
|
|
1899
1883
|
async def create_flexible_infer(self, request: Request) -> Response:
|
|
@@ -1920,14 +1904,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1920
1904
|
try:
|
|
1921
1905
|
result = await model.infer(**kwargs)
|
|
1922
1906
|
return Response(result, media_type="application/json")
|
|
1923
|
-
except RuntimeError as re:
|
|
1924
|
-
logger.error(re, exc_info=True)
|
|
1925
|
-
await self._report_error_event(model_uid, str(re))
|
|
1926
|
-
self.handle_request_limit_error(re)
|
|
1927
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1928
1907
|
except Exception as e:
|
|
1908
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1929
1909
|
logger.error(e, exc_info=True)
|
|
1930
1910
|
await self._report_error_event(model_uid, str(e))
|
|
1911
|
+
self.handle_request_limit_error(e)
|
|
1931
1912
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1932
1913
|
|
|
1933
1914
|
async def create_videos(self, request: Request) -> Response:
|
|
@@ -1952,14 +1933,11 @@ class RESTfulAPI(CancelMixin):
|
|
|
1952
1933
|
**kwargs,
|
|
1953
1934
|
)
|
|
1954
1935
|
return Response(content=video_list, media_type="application/json")
|
|
1955
|
-
except RuntimeError as re:
|
|
1956
|
-
logger.error(re, exc_info=True)
|
|
1957
|
-
await self._report_error_event(model_uid, str(re))
|
|
1958
|
-
self.handle_request_limit_error(re)
|
|
1959
|
-
raise HTTPException(status_code=400, detail=str(re))
|
|
1960
1936
|
except Exception as e:
|
|
1937
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
1961
1938
|
logger.error(e, exc_info=True)
|
|
1962
1939
|
await self._report_error_event(model_uid, str(e))
|
|
1940
|
+
self.handle_request_limit_error(e)
|
|
1963
1941
|
raise HTTPException(status_code=500, detail=str(e))
|
|
1964
1942
|
|
|
1965
1943
|
async def create_chat_completion(self, request: Request) -> Response:
|
|
@@ -2084,6 +2062,7 @@ class RESTfulAPI(CancelMixin):
|
|
|
2084
2062
|
# TODO: Cannot yield here. Yield here would leads to error for the next streaming request.
|
|
2085
2063
|
return
|
|
2086
2064
|
except Exception as ex:
|
|
2065
|
+
ex = await self._get_model_last_error(model.uid, ex)
|
|
2087
2066
|
logger.exception("Chat completion stream got an error: %s", ex)
|
|
2088
2067
|
await self._report_error_event(model_uid, str(ex))
|
|
2089
2068
|
# https://github.com/openai/openai-python/blob/e0aafc6c1a45334ac889fe3e54957d309c3af93f/src/openai/_streaming.py#L107
|
|
@@ -2102,6 +2081,7 @@ class RESTfulAPI(CancelMixin):
|
|
|
2102
2081
|
)
|
|
2103
2082
|
return Response(content=data, media_type="application/json")
|
|
2104
2083
|
except Exception as e:
|
|
2084
|
+
e = await self._get_model_last_error(model.uid, e)
|
|
2105
2085
|
logger.error(e, exc_info=True)
|
|
2106
2086
|
await self._report_error_event(model_uid, str(e))
|
|
2107
2087
|
self.handle_request_limit_error(e)
|
|
@@ -2383,6 +2363,10 @@ class RESTfulAPI(CancelMixin):
|
|
|
2383
2363
|
kwargs["guided_whitespace_pattern"] = raw_extra_body.get(
|
|
2384
2364
|
"guided_whitespace_pattern"
|
|
2385
2365
|
)
|
|
2366
|
+
if raw_extra_body.get("platform") is not None:
|
|
2367
|
+
kwargs["platform"] = raw_extra_body.get("platform")
|
|
2368
|
+
if raw_extra_body.get("format") is not None:
|
|
2369
|
+
kwargs["format"] = raw_extra_body.get("format")
|
|
2386
2370
|
|
|
2387
2371
|
return kwargs
|
|
2388
2372
|
|
xinference/core/model.py
CHANGED
|
@@ -78,6 +78,9 @@ XINFERENCE_BATCHING_ALLOWED_VISION_MODELS = [
|
|
|
78
78
|
]
|
|
79
79
|
|
|
80
80
|
XINFERENCE_TEXT_TO_IMAGE_BATCHING_ALLOWED_MODELS = ["FLUX.1-dev", "FLUX.1-schnell"]
|
|
81
|
+
XINFERENCE_TEST_OUT_OF_MEMORY_ERROR = bool(
|
|
82
|
+
os.getenv("XINFERENCE_TEST_OUT_OF_MEMORY_ERROR", False)
|
|
83
|
+
)
|
|
81
84
|
|
|
82
85
|
|
|
83
86
|
def request_limit(fn):
|
|
@@ -118,20 +121,25 @@ def request_limit(fn):
|
|
|
118
121
|
|
|
119
122
|
def oom_check(fn):
|
|
120
123
|
@functools.wraps(fn)
|
|
121
|
-
def _wrapper(*args, **kwargs):
|
|
124
|
+
def _wrapper(self, *args, **kwargs):
|
|
122
125
|
try:
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
126
|
+
if XINFERENCE_TEST_OUT_OF_MEMORY_ERROR:
|
|
127
|
+
raise OutOfMemoryError("Test Out of Memory Error")
|
|
128
|
+
return fn(self, *args, **kwargs)
|
|
129
|
+
except OutOfMemoryError as ex:
|
|
130
|
+
assert self._loop is not None
|
|
131
|
+
asyncio.run_coroutine_threadsafe(
|
|
132
|
+
self._handle_oom_error(ex), loop=self._loop
|
|
133
|
+
)
|
|
127
134
|
|
|
128
135
|
@functools.wraps(fn)
|
|
129
|
-
async def _async_wrapper(*args, **kwargs):
|
|
136
|
+
async def _async_wrapper(self, *args, **kwargs):
|
|
130
137
|
try:
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
138
|
+
if XINFERENCE_TEST_OUT_OF_MEMORY_ERROR:
|
|
139
|
+
raise OutOfMemoryError("Test Out of Memory Error")
|
|
140
|
+
return await fn(self, *args, **kwargs)
|
|
141
|
+
except OutOfMemoryError as ex:
|
|
142
|
+
await self._handle_oom_error(ex)
|
|
135
143
|
|
|
136
144
|
assert not inspect.isasyncgen(fn)
|
|
137
145
|
assert not inspect.isgenerator(fn)
|
|
@@ -178,6 +186,16 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
178
186
|
if hasattr(self._model, "stop") and callable(self._model.stop):
|
|
179
187
|
self._model.stop()
|
|
180
188
|
|
|
189
|
+
if isinstance(self._model, LLMVLLMModel):
|
|
190
|
+
if self._transfer_ref is not None:
|
|
191
|
+
try:
|
|
192
|
+
await xo.destroy_actor(self._transfer_ref)
|
|
193
|
+
del self._transfer_ref
|
|
194
|
+
except Exception as e:
|
|
195
|
+
logger.debug(
|
|
196
|
+
f"Destroy transfer actor failed, address: {self.address}, error: {e}"
|
|
197
|
+
)
|
|
198
|
+
|
|
181
199
|
if (
|
|
182
200
|
isinstance(self._model, (LLMPytorchModel, LLMVLLMModel, SGLANGModel))
|
|
183
201
|
and self._model.model_spec.model_format == "pytorch"
|
|
@@ -206,6 +224,7 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
206
224
|
replica_model_uid: str,
|
|
207
225
|
model_description: Optional["ModelDescription"] = None,
|
|
208
226
|
request_limits: Optional[int] = None,
|
|
227
|
+
xavier_config: Optional[Dict] = None,
|
|
209
228
|
):
|
|
210
229
|
super().__init__()
|
|
211
230
|
from ..model.llm.lmdeploy.core import LMDeployModel
|
|
@@ -247,6 +266,11 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
247
266
|
self._scheduler_ref = None
|
|
248
267
|
self._text_to_image_scheduler_ref = None
|
|
249
268
|
|
|
269
|
+
if isinstance(self._model, VLLMModel):
|
|
270
|
+
self._xavier_config = xavier_config
|
|
271
|
+
self._model.set_xavier_config(xavier_config)
|
|
272
|
+
self._transfer_ref = None
|
|
273
|
+
|
|
250
274
|
async def __post_create__(self):
|
|
251
275
|
self._loop = asyncio.get_running_loop()
|
|
252
276
|
|
|
@@ -278,6 +302,28 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
278
302
|
def decrease_serve_count(self):
|
|
279
303
|
self._serve_count -= 1
|
|
280
304
|
|
|
305
|
+
async def start_transfer_for_vllm(self, rank_addresses: List[str]):
|
|
306
|
+
from ..model.llm.vllm.core import VLLMModel
|
|
307
|
+
from ..model.llm.vllm.xavier.transfer import TransferActor
|
|
308
|
+
|
|
309
|
+
assert isinstance(self._model, VLLMModel)
|
|
310
|
+
rank = self._xavier_config.get("rank") # type: ignore
|
|
311
|
+
self._transfer_ref = await xo.create_actor(
|
|
312
|
+
TransferActor,
|
|
313
|
+
address=self.address,
|
|
314
|
+
uid=f"{TransferActor.default_uid()}-{rank}",
|
|
315
|
+
rank=rank,
|
|
316
|
+
world_size=self._xavier_config.get("world_size"), # type: ignore
|
|
317
|
+
rank_address=self._xavier_config.get("rank_address"), # type: ignore
|
|
318
|
+
store_address=self._xavier_config.get("store_address"), # type: ignore
|
|
319
|
+
store_port=self._xavier_config.get("store_port"), # type: ignore
|
|
320
|
+
world_addresses=rank_addresses,
|
|
321
|
+
)
|
|
322
|
+
await self._model.init_xavier()
|
|
323
|
+
logger.debug(
|
|
324
|
+
f"Init transfer actor: {self._transfer_ref.address}, rank: {rank} done for vllm." # type: ignore
|
|
325
|
+
)
|
|
326
|
+
|
|
281
327
|
async def _record_completion_metrics(
|
|
282
328
|
self, duration, completion_tokens, prompt_tokens
|
|
283
329
|
):
|
|
@@ -440,11 +486,24 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
440
486
|
)
|
|
441
487
|
)
|
|
442
488
|
|
|
489
|
+
async def _handle_oom_error(self, ex):
|
|
490
|
+
error_message = (
|
|
491
|
+
f"Model actor is out of memory, model id: {self.model_uid()}, error: {ex}"
|
|
492
|
+
)
|
|
493
|
+
logger.exception(error_message)
|
|
494
|
+
worker_ref = await self._get_worker_ref()
|
|
495
|
+
await worker_ref.update_model_status(
|
|
496
|
+
self._replica_model_uid, last_error=error_message
|
|
497
|
+
)
|
|
498
|
+
os._exit(1)
|
|
499
|
+
|
|
443
500
|
def _to_generator(self, output_type: str, gen: types.GeneratorType):
|
|
444
501
|
start_time = time.time()
|
|
445
502
|
time_to_first_token = None
|
|
446
503
|
final_usage = None
|
|
447
504
|
try:
|
|
505
|
+
if XINFERENCE_TEST_OUT_OF_MEMORY_ERROR:
|
|
506
|
+
raise OutOfMemoryError("Test Out of Memory Error")
|
|
448
507
|
for v in gen:
|
|
449
508
|
if time_to_first_token is None:
|
|
450
509
|
time_to_first_token = (time.time() - start_time) * 1000
|
|
@@ -456,11 +515,11 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
456
515
|
output_type == "binary"
|
|
457
516
|
), f"Unknown output type '{output_type}'"
|
|
458
517
|
yield sse_starlette.sse.ensure_bytes(v, None)
|
|
459
|
-
except OutOfMemoryError:
|
|
460
|
-
|
|
461
|
-
|
|
518
|
+
except OutOfMemoryError as ex:
|
|
519
|
+
assert self._loop is not None
|
|
520
|
+
asyncio.run_coroutine_threadsafe(
|
|
521
|
+
self._handle_oom_error(ex), loop=self._loop
|
|
462
522
|
)
|
|
463
|
-
os._exit(1)
|
|
464
523
|
finally:
|
|
465
524
|
if self._loop is not None and time_to_first_token is not None:
|
|
466
525
|
coro = self.record_metrics(
|
|
@@ -482,6 +541,8 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
482
541
|
time_to_first_token = None
|
|
483
542
|
final_usage = None
|
|
484
543
|
try:
|
|
544
|
+
if XINFERENCE_TEST_OUT_OF_MEMORY_ERROR:
|
|
545
|
+
raise OutOfMemoryError("Test Out of Memory Error")
|
|
485
546
|
async for v in gen:
|
|
486
547
|
if time_to_first_token is None:
|
|
487
548
|
time_to_first_token = (time.time() - start_time) * 1000
|
|
@@ -494,11 +555,8 @@ class ModelActor(xo.StatelessActor, CancelMixin):
|
|
|
494
555
|
output_type == "binary"
|
|
495
556
|
), f"Unknown output type '{output_type}'"
|
|
496
557
|
yield await asyncio.to_thread(sse_starlette.sse.ensure_bytes, v, None)
|
|
497
|
-
except OutOfMemoryError:
|
|
498
|
-
|
|
499
|
-
"Model actor is out of memory, model id: %s", self.model_uid()
|
|
500
|
-
)
|
|
501
|
-
os._exit(1)
|
|
558
|
+
except OutOfMemoryError as ex:
|
|
559
|
+
await self._handle_oom_error(ex)
|
|
502
560
|
finally:
|
|
503
561
|
coros = []
|
|
504
562
|
if time_to_first_token is not None:
|
xinference/core/supervisor.py
CHANGED
|
@@ -267,6 +267,10 @@ class SupervisorActor(xo.StatelessActor):
|
|
|
267
267
|
signal.SIGTERM, lambda: asyncio.create_task(signal_handler())
|
|
268
268
|
)
|
|
269
269
|
|
|
270
|
+
from ..model.llm.vllm.xavier.block_tracker import VLLMBlockTracker
|
|
271
|
+
|
|
272
|
+
self._block_tracker: Optional[xo.ActorRefType[VLLMBlockTracker]] = None
|
|
273
|
+
|
|
270
274
|
@typing.no_type_check
|
|
271
275
|
async def get_cluster_device_info(self, detailed: bool = False) -> List:
|
|
272
276
|
import psutil
|
|
@@ -956,17 +960,37 @@ class SupervisorActor(xo.StatelessActor):
|
|
|
956
960
|
]:
|
|
957
961
|
raise ValueError("Tensorizer is not supported for %s." % model_name)
|
|
958
962
|
|
|
963
|
+
enable_xavier: bool = (
|
|
964
|
+
bool(kwargs.pop("enable_xavier", False))
|
|
965
|
+
and model_engine is not None
|
|
966
|
+
and model_engine.lower() == "vllm"
|
|
967
|
+
)
|
|
968
|
+
if enable_xavier:
|
|
969
|
+
if replica <= 1:
|
|
970
|
+
logger.warning(f"Enabling xavier when `replica<=1` is meaningless.")
|
|
971
|
+
enable_xavier = False
|
|
972
|
+
else:
|
|
973
|
+
from ..model.llm.vllm.xavier.block_tracker import VLLMBlockTracker
|
|
974
|
+
|
|
975
|
+
self._block_tracker = await xo.create_actor(
|
|
976
|
+
VLLMBlockTracker,
|
|
977
|
+
address=self.address,
|
|
978
|
+
uid=VLLMBlockTracker.default_uid(),
|
|
979
|
+
)
|
|
980
|
+
|
|
959
981
|
if model_uid is None:
|
|
960
982
|
model_uid = self._gen_model_uid(model_name)
|
|
961
983
|
|
|
962
984
|
model_size = str(model_size_in_billions) if model_size_in_billions else ""
|
|
963
985
|
logger.debug(
|
|
964
986
|
f"Enter launch_builtin_model, model_uid: {model_uid}, model_name: {model_name}, model_size: {model_size}, "
|
|
965
|
-
f"model_format: {model_format}, quantization: {quantization}, replica: {replica}, "
|
|
987
|
+
f"model_format: {model_format}, quantization: {quantization}, replica: {replica}, enable_xavier: {enable_xavier}, "
|
|
966
988
|
f"kwargs: {kwargs}"
|
|
967
989
|
)
|
|
968
990
|
|
|
969
|
-
async def _launch_one_model(
|
|
991
|
+
async def _launch_one_model(
|
|
992
|
+
worker_ref, _replica_model_uid, rank: int, store_port: int
|
|
993
|
+
):
|
|
970
994
|
if _replica_model_uid in self._replica_model_uid_to_worker:
|
|
971
995
|
raise ValueError(
|
|
972
996
|
f"Model is already in the model list, uid: {_replica_model_uid}"
|
|
@@ -974,14 +998,9 @@ class SupervisorActor(xo.StatelessActor):
|
|
|
974
998
|
replica_gpu_idx = assign_replica_gpu(_replica_model_uid, replica, gpu_idx)
|
|
975
999
|
nonlocal model_type
|
|
976
1000
|
|
|
977
|
-
worker_ref = (
|
|
978
|
-
target_ip_worker_ref
|
|
979
|
-
if target_ip_worker_ref is not None
|
|
980
|
-
else await self._choose_worker()
|
|
981
|
-
)
|
|
982
1001
|
# LLM as default for compatibility
|
|
983
1002
|
model_type = model_type or "LLM"
|
|
984
|
-
await worker_ref.launch_builtin_model(
|
|
1003
|
+
subpool_address = await worker_ref.launch_builtin_model(
|
|
985
1004
|
model_uid=_replica_model_uid,
|
|
986
1005
|
model_name=model_name,
|
|
987
1006
|
model_size_in_billions=model_size_in_billions,
|
|
@@ -995,14 +1014,57 @@ class SupervisorActor(xo.StatelessActor):
|
|
|
995
1014
|
gpu_idx=replica_gpu_idx,
|
|
996
1015
|
download_hub=download_hub,
|
|
997
1016
|
model_path=model_path,
|
|
1017
|
+
xavier_config={
|
|
1018
|
+
"block_tracker_address": self._block_tracker.address
|
|
1019
|
+
if self._block_tracker is not None
|
|
1020
|
+
else None,
|
|
1021
|
+
"rank": rank,
|
|
1022
|
+
"world_size": replica,
|
|
1023
|
+
"store_address": self.address.split(":")[0],
|
|
1024
|
+
"store_port": store_port,
|
|
1025
|
+
}
|
|
1026
|
+
if enable_xavier
|
|
1027
|
+
else None,
|
|
998
1028
|
**kwargs,
|
|
999
1029
|
)
|
|
1000
1030
|
self._replica_model_uid_to_worker[_replica_model_uid] = worker_ref
|
|
1031
|
+
return subpool_address
|
|
1001
1032
|
|
|
1002
1033
|
async def _launch_model():
|
|
1003
1034
|
try:
|
|
1004
|
-
|
|
1005
|
-
|
|
1035
|
+
store_port = xo.utils.get_next_port()
|
|
1036
|
+
worker_refs = []
|
|
1037
|
+
rank_addresses = []
|
|
1038
|
+
for rank, rep_model_uid in enumerate(
|
|
1039
|
+
iter_replica_model_uid(model_uid, replica)
|
|
1040
|
+
):
|
|
1041
|
+
worker_ref = (
|
|
1042
|
+
target_ip_worker_ref
|
|
1043
|
+
if target_ip_worker_ref is not None
|
|
1044
|
+
else await self._choose_worker()
|
|
1045
|
+
)
|
|
1046
|
+
subpool_address = await _launch_one_model(
|
|
1047
|
+
worker_ref, rep_model_uid, rank, store_port
|
|
1048
|
+
)
|
|
1049
|
+
worker_refs.append((worker_ref, rep_model_uid))
|
|
1050
|
+
rank_addresses.append(subpool_address)
|
|
1051
|
+
|
|
1052
|
+
# For xavier, start all the vllm instances first,
|
|
1053
|
+
# and then start the transfer component,
|
|
1054
|
+
# because the transfer actor needs all the rank addresses used for collective communication
|
|
1055
|
+
if enable_xavier:
|
|
1056
|
+
logger.debug(f"Init transfer component for xavier...")
|
|
1057
|
+
tasks = []
|
|
1058
|
+
for worker_ref, rep_model_uid in worker_refs:
|
|
1059
|
+
tasks.append(
|
|
1060
|
+
worker_ref.start_transfer_for_vllm(
|
|
1061
|
+
rep_model_uid, rank_addresses
|
|
1062
|
+
)
|
|
1063
|
+
)
|
|
1064
|
+
# Here you must use asyncio.gather, not a for loop,
|
|
1065
|
+
# or you will get stuck.
|
|
1066
|
+
await asyncio.gather(*tasks)
|
|
1067
|
+
logger.debug(f"Init transfer component for xavier done.")
|
|
1006
1068
|
except Exception:
|
|
1007
1069
|
# terminate_model will remove the replica info.
|
|
1008
1070
|
await self.terminate_model(model_uid, suppress_exception=True)
|
|
@@ -1148,6 +1210,15 @@ class SupervisorActor(xo.StatelessActor):
|
|
|
1148
1210
|
)
|
|
1149
1211
|
return await worker_ref.get_model(model_uid=replica_model_uid)
|
|
1150
1212
|
|
|
1213
|
+
@log_async(logger=logger)
|
|
1214
|
+
async def get_model_status(self, replica_model_uid: str):
|
|
1215
|
+
worker_ref = self._replica_model_uid_to_worker.get(replica_model_uid, None)
|
|
1216
|
+
if worker_ref is None:
|
|
1217
|
+
raise ValueError(
|
|
1218
|
+
f"Model not found in the model list, uid: {replica_model_uid}"
|
|
1219
|
+
)
|
|
1220
|
+
return await worker_ref.get_model_status(replica_model_uid)
|
|
1221
|
+
|
|
1151
1222
|
@log_async(logger=logger)
|
|
1152
1223
|
async def describe_model(self, model_uid: str) -> Dict[str, Any]:
|
|
1153
1224
|
replica_info = self._model_uid_to_replica_info.get(model_uid, None)
|
xinference/core/utils.py
CHANGED
|
@@ -276,8 +276,8 @@ def get_nvidia_gpu_info() -> Dict:
|
|
|
276
276
|
|
|
277
277
|
|
|
278
278
|
def assign_replica_gpu(
|
|
279
|
-
_replica_model_uid: str, replica: int, gpu_idx: Union[int, List[int]]
|
|
280
|
-
) -> List[int]:
|
|
279
|
+
_replica_model_uid: str, replica: int, gpu_idx: Optional[Union[int, List[int]]]
|
|
280
|
+
) -> Optional[List[int]]:
|
|
281
281
|
model_uid, rep_id = parse_replica_model_uid(_replica_model_uid)
|
|
282
282
|
rep_id, replica = int(rep_id), int(replica)
|
|
283
283
|
if isinstance(gpu_idx, int):
|