From f1e5b2c9aa3ac03aa8407bfd99fece986e8751a0 Mon Sep 17 00:00:00 2001 From: liunux4odoo Date: Sun, 14 Apr 2024 21:20:45 +0800 Subject: [PATCH] =?UTF-8?q?/v1/models=20=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E5=80=BC=E7=94=B1=20List[Model]=20=E6=94=B9=E4=B8=BA?= =?UTF-8?q?=20{'data':=20List[Model]}=EF=BC=8C=E5=85=BC=E5=AE=B9=E6=9C=80?= =?UTF-8?q?=E6=96=B0=E7=89=88=20xinference?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../chatchat/server/api_server/openai_routes.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/chatchat-server/chatchat/server/api_server/openai_routes.py b/chatchat-server/chatchat/server/api_server/openai_routes.py index c9e616e2..bde5b04c 100644 --- a/chatchat-server/chatchat/server/api_server/openai_routes.py +++ b/chatchat-server/chatchat/server/api_server/openai_routes.py @@ -100,7 +100,7 @@ async def openai_request(method, body, extra_json: Dict={}, header: Iterable=[], @openai_router.get("/models") -async def list_models() -> List: +async def list_models() -> Dict: ''' 整合所有平台的模型列表。 ''' @@ -108,23 +108,17 @@ async def list_models() -> List: try: client = get_OpenAIClient(name, is_async=True) models = await client.models.list() - if config.get("platform_type") == "xinference": - models = models.model_dump(exclude={"data":..., "object":...}) - for x in models: - models[x]["platform_name"] = name - return [{**v, "id": k} for k, v in models.items()] - elif config.get("platform_type") == "oneapi": - return [{**x.model_dump(), "platform_name": name} for x in models.data] + return [{**x.model_dump(), "platform_name": name} for x in models.data] except Exception: logger.error(f"failed request to platform: {name}", exc_info=True) - return {} + return [] result = [] tasks = [asyncio.create_task(task(name, config)) for name, config in get_config_platforms().items()] for t in asyncio.as_completed(tasks): result += (await t) - return result + return {"object": "list", "data": result} @openai_router.post("/chat/completions")