Skip to content

Commit c202bea

Browse files
authored
[Serve.llm] Remove ImageRetriever class and related tests from the LLM deployment module. (#53980)
Signed-off-by: Kourosh Hakhamaneshi <kourosh@anyscale.com>
1 parent bdd857c commit c202bea

File tree

6 files changed

+4
-163
lines changed

6 files changed

+4
-163
lines changed

ci/lint/pydoclint-baseline.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1612,8 +1612,6 @@ python/ray/llm/_internal/serve/configs/prompt_formats.py
16121612
DOC201: Method `Image.check_image_url` does not have a return section in docstring
16131613
--------------------
16141614
python/ray/llm/_internal/serve/deployments/llm/llm_server.py
1615-
DOC101: Method `LLMServer.__init__`: Docstring contains fewer arguments than in function signature.
1616-
DOC103: Method `LLMServer.__init__`: Docstring arguments are different from function arguments. (Or could be other formatting issues: https://jsh9.github.io/pydoclint/violation_codes.html#notes-on-doc103 ). Arguments in the function signature but not in the docstring: [engine_cls: Optional[Type[LLMEngine]], image_retriever_cls: Optional[Type[ImageRetriever]], model_downloader: Optional[LoraModelLoader]].
16171615
DOC402: Method `LLMServer.embeddings` has "yield" statements, but the docstring does not have a "Yields" section
16181616
DOC404: Method `LLMServer.embeddings` yield type(s) in docstring not consistent with the return annotation. Return annotation exists, but docstring "yields" section does not exist or has 0 type(s).
16191617
--------------------

python/ray/llm/_internal/serve/deployments/llm/image_retriever.py

Lines changed: 0 additions & 60 deletions
This file was deleted.

python/ray/llm/_internal/serve/deployments/llm/llm_server.py

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
LLMConfig,
4646
LLMRawResponse,
4747
)
48-
from ray.llm._internal.serve.deployments.llm.image_retriever import ImageRetriever
4948
from ray.llm._internal.serve.deployments.llm.llm_engine import LLMEngine
5049
from ray.llm._internal.serve.deployments.llm.multiplex.lora_model_loader import (
5150
LoraModelLoader,
@@ -409,14 +408,12 @@ async def process_completions(
409408

410409
class LLMServer(_LLMServerBase):
411410
_default_engine_cls = VLLMEngine
412-
_default_image_retriever_cls = ImageRetriever
413411

414412
async def __init__(
415413
self,
416414
llm_config: LLMConfig,
417415
*,
418416
engine_cls: Optional[Type[LLMEngine]] = None,
419-
image_retriever_cls: Optional[Type[ImageRetriever]] = None,
420417
model_downloader: Optional[LoraModelLoader] = None,
421418
):
422419
"""Constructor of LLMServer.
@@ -426,14 +423,10 @@ async def __init__(
426423
427424
Args:
428425
llm_config: LLMConfig for the model.
429-
430-
Keyword Args:
431-
engine_cls: Dependency injection for the vllm engine class. Defaults to
432-
`VLLMEngine`.
433-
image_retriever_cls: Dependency injection for the image retriever class.
434-
Defaults to `ImageRetriever`.
435-
model_downloader: Dependency injection for the model downloader object.
436-
Defaults to be initialized with `LoraModelLoader`.
426+
engine_cls: Dependency injection for the vllm engine class.
427+
Defaults to `VLLMEngine`.
428+
model_downloader: Dependency injection for the model downloader
429+
object. Defaults to be initialized with `LoraModelLoader`.
437430
"""
438431
await super().__init__(llm_config)
439432

@@ -443,14 +436,6 @@ async def __init__(
443436
self.engine = self._engine_cls(self._llm_config)
444437
await asyncio.wait_for(self._start_engine(), timeout=ENGINE_START_TIMEOUT_S)
445438

446-
# TODO (Kourosh): I think we can completely remove image retriever.
447-
# It was missed to get removed.
448-
self.image_retriever = (
449-
image_retriever_cls()
450-
if image_retriever_cls
451-
else self._default_image_retriever_cls()
452-
)
453-
454439
multiplex_config = self._llm_config.multiplex_config()
455440
if model_downloader:
456441
self.model_downloader = model_downloader

python/ray/llm/tests/serve/cpu/deployments/llm/multiplex/test_lora_deployment_base_client.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from ray.llm._internal.serve.deployments.routers.router import (
1616
LLMRouter,
1717
)
18-
from ray.llm.tests.serve.mocks.fake_image_retriever import FakeImageRetriever
1918
from ray.llm.tests.serve.mocks.mock_vllm_engine import MockEchoVLLMEngine
2019
from ray.serve.handle import DeploymentHandle
2120

@@ -68,7 +67,6 @@ def get_mocked_llm_deployments(llm_configs) -> List[DeploymentHandle]:
6867
deployment.bind(
6968
llm_config=llm_config,
7069
engine_cls=MockEchoVLLMEngine,
71-
image_retriever_cls=FakeImageRetriever,
7270
)
7371
)
7472
return llm_deployments

python/ray/llm/tests/serve/cpu/deployments/llm/test_image_retriever.py

Lines changed: 0 additions & 65 deletions
This file was deleted.

python/ray/llm/tests/serve/mocks/fake_image_retriever.py

Lines changed: 0 additions & 15 deletions
This file was deleted.

0 commit comments

Comments
 (0)