fix: proxyllm do not need controller_addr

This commit is contained in:
yihong0618
2023-09-22 16:47:34 +08:00
parent 9979b6aa80
commit 24e6d16a09

View File

@@ -1,17 +1,18 @@
import asyncio
import itertools
import json
import os
import sys
import random
import time
import logging
import os
import random
import sys
import time
from concurrent.futures import ThreadPoolExecutor
from dataclasses import asdict
from typing import Awaitable, Callable, Dict, Iterator, List, Optional
from fastapi import APIRouter, FastAPI
from fastapi.responses import StreamingResponse
from pilot.component import SystemApp
from pilot.model.base import (
ModelInstance,
@@ -20,16 +21,16 @@ from pilot.model.base import (
WorkerApplyType,
WorkerSupportedModel,
)
from pilot.model.cluster.registry import ModelRegistry
from pilot.model.llm_utils import list_supported_models
from pilot.model.parameter import ModelParameters, ModelWorkerParameters, WorkerType
from pilot.model.cluster.worker_base import ModelWorker
from pilot.model.cluster.base import *
from pilot.model.cluster.manager_base import (
WorkerManager,
WorkerRunData,
WorkerManagerFactory,
WorkerRunData,
)
from pilot.model.cluster.base import *
from pilot.model.cluster.registry import ModelRegistry
from pilot.model.cluster.worker_base import ModelWorker
from pilot.model.llm_utils import list_supported_models
from pilot.model.parameter import ModelParameters, ModelWorkerParameters, WorkerType
from pilot.utils.parameter_utils import (
EnvArgumentParser,
ParameterDescription,
@@ -638,7 +639,7 @@ def _setup_fastapi(worker_params: ModelWorkerParameters, app=None):
router as controller_router,
)
if not worker_params.controller_addr:
if not worker_params.controller_addr and worker_params.model_name != "proxyllm":
worker_params.controller_addr = f"http://127.0.0.1:{worker_params.port}"
logger.info(
f"Run WorkerManager with standalone mode, controller_addr: {worker_params.controller_addr}"