Skip to content

Commit f67e321

Browse files
author
Sigrid Jin (Sionic AI)
committed
fix: Resolve yapf/isort conflict with disable comments
As suggested by maintainer, use yapf: disable/enable comments around the pooling_metadata imports to prevent formatter conflicts. This allows isort to handle the import formatting while yapf skips these lines. Signed-off-by: Sigrid Jin (Sionic AI) <[email protected]>
1 parent 5d12bd4 commit f67e321

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

vllm/model_executor/models/jina_embeddings_v4.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,11 @@
1212
from vllm.logger import init_logger
1313
from vllm.model_executor.layers.pooler import (HAS_TRITON, Pooler, PoolingType,
1414
extract_vision_tokens_kernel)
15-
from vllm.model_executor.pooling_metadata import ( # fmt: skip
15+
# yapf: disable
16+
from vllm.model_executor.pooling_metadata import (
1617
PoolingMetadata as V0PoolingMetadata)
1718
from vllm.model_executor.pooling_metadata import PoolingTensors
19+
# yapf: enable
1820
from vllm.multimodal import MULTIMODAL_REGISTRY
1921
from vllm.sequence import PoolerOutput, PoolingSequenceGroupOutput
2022
from vllm.v1.pool.metadata import PoolingMetadata as V1PoolingMetadata

0 commit comments

Comments
 (0)