flyteplugins-vllm 2.0.0b43__py3-none-any.whl → 2.0.0b45__py3-none-any.whl

flyteplugins/vllm/_app_environment.py

@@ -11,13 +11,17 @@ from flyte.app import Parameter, RunOutput
 from flyte.app._types import Port
 from flyte.models import SerializationContext
 
+from flyteplugins.vllm._constants import VLLM_MIN_VERSION_STR
+
 DEFAULT_VLLM_IMAGE = (
-    flyte.Image.from_debian_base(name="vllm-app-image", python_version=(3, 12))
+    flyte.Image.from_debian_base(name="vllm-app-image")
     # install flashinfer and vllm
     .with_pip_packages("flashinfer-python", "flashinfer-cubin")
     .with_pip_packages("flashinfer-jit-cache", index_url="https://flashinfer.ai/whl/cu129")
     # install the vllm flyte plugin
     .with_pip_packages("flyteplugins-vllm", pre=True)
+    # install vllm in a separate layer due to dependency conflict with flyte (protovalidate)
+    .with_pip_packages(f"vllm>={VLLM_MIN_VERSION_STR}")
 )
 
 

flyteplugins/vllm/_constants.py

@@ -0,0 +1,2 @@
+VLLM_MIN_VERSION = (0, 11, 0)
+VLLM_MIN_VERSION_STR = ".".join(map(str, VLLM_MIN_VERSION))

flyteplugins/vllm/_model_loader/shim.py

@@ -2,14 +2,26 @@ import logging
 from typing import Generator
 
 import torch
-import vllm
-import vllm.entrypoints.cli.main
 from flyte.app.extras._model_loader.config import (
     LOCAL_MODEL_PATH,
     REMOTE_MODEL_PATH,
     STREAM_SAFETENSORS,
 )
 from flyte.app.extras._model_loader.loader import SafeTensorsStreamer, prefetch
+
+from flyteplugins.vllm._constants import VLLM_MIN_VERSION, VLLM_MIN_VERSION_STR
+
+try:
+    import vllm
+except ImportError:
+    raise ImportError(f"vllm is not installed. Please install 'vllm>={VLLM_MIN_VERSION_STR}', to use the model loader.")
+
+if tuple([int(part) for part in vllm.__version__.split(".") if part.isdigit()]) < VLLM_MIN_VERSION:
+    raise ImportError(
+        f"vllm version >={VLLM_MIN_VERSION_STR} required, but found {vllm.__version__}. Please upgrade vllm."
+    )
+
+import vllm.entrypoints.cli.main
 from vllm.config import ModelConfig, VllmConfig
 from vllm.distributed import get_tensor_model_parallel_rank
 from vllm.model_executor.model_loader import register_model_loader

{flyteplugins_vllm-2.0.0b43.dist-info → flyteplugins_vllm-2.0.0b45.dist-info}/METADATA

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: flyteplugins-vllm
-Version: 2.0.0b43
+Version: 2.0.0b45
 Summary: vLLM plugin for flyte
 Author-email: Niels Bantilan <cosmicbboy@users.noreply.github.com>
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
-Requires-Dist: vllm>=0.11.0
+Requires-Dist: flyte>=2.0.0b43
 
 # Union vLLM Plugin
 

flyteplugins_vllm-2.0.0b45.dist-info/RECORD

@@ -0,0 +1,11 @@
+flyteplugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flyteplugins/vllm/__init__.py,sha256=FhdW2e_f6PsGo4wyV07jradAFbg7WmB0Luz3zHIDd7A,100
+flyteplugins/vllm/_app_environment.py,sha256=4cfbX9ZCXMDjAk2PSWZRkSqZLTrMZJteK_nBN1MDoe0,8263
+flyteplugins/vllm/_constants.py,sha256=I8suY7mz05kyvaW0Zskv_Zw0y7Gf0E4wjWm88cdjttU,90
+flyteplugins/vllm/_model_loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+flyteplugins/vllm/_model_loader/shim.py,sha256=ANgEgTTLOhrCd0xIePsjah__gWcPQawLS_oq7RWa0X4,5825
+flyteplugins_vllm-2.0.0b45.dist-info/METADATA,sha256=YIKWiM7Go4RuqldcESslLFMvNqQib1aWQsDD3rglTfM,1580
+flyteplugins_vllm-2.0.0b45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+flyteplugins_vllm-2.0.0b45.dist-info/entry_points.txt,sha256=lC-uwvkaytwtzbkJWdS69np63yLAakaDpI4mV1Yp9l8,74
+flyteplugins_vllm-2.0.0b45.dist-info/top_level.txt,sha256=cgd779rPu9EsvdtuYgUxNHHgElaQvPn74KhB5XSeMBE,13
+flyteplugins_vllm-2.0.0b45.dist-info/RECORD,,

flyteplugins_vllm-2.0.0b43.dist-info/RECORD

@@ -1,10 +0,0 @@
-flyteplugins/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flyteplugins/vllm/__init__.py,sha256=FhdW2e_f6PsGo4wyV07jradAFbg7WmB0Luz3zHIDd7A,100
-flyteplugins/vllm/_app_environment.py,sha256=-luoJak9FC4K8vs5JB34kXRnu3ms_ou2whQi64uCNrk,8075
-flyteplugins/vllm/_model_loader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-flyteplugins/vllm/_model_loader/shim.py,sha256=tQAyA7bwuR98fs4eLFiqOmIUGrVrbf5pfbPGmljWeDo,5352
-flyteplugins_vllm-2.0.0b43.dist-info/METADATA,sha256=fPWhq_-KsLCH62UKYo_7zVCdq6t_bvELpU5f4CtIAdg,1577
-flyteplugins_vllm-2.0.0b43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-flyteplugins_vllm-2.0.0b43.dist-info/entry_points.txt,sha256=lC-uwvkaytwtzbkJWdS69np63yLAakaDpI4mV1Yp9l8,74
-flyteplugins_vllm-2.0.0b43.dist-info/top_level.txt,sha256=cgd779rPu9EsvdtuYgUxNHHgElaQvPn74KhB5XSeMBE,13
-flyteplugins_vllm-2.0.0b43.dist-info/RECORD,,