Moving files.

src/vllm_router/services/routing_service/affinity/base.py

@@ -3,7 +3,8 @@
 """
 
 import abc
-from typing import Set, Dict
+from typing import Set, Dict, Any
+from fastapi import Request
 from vllm_router.types import EngineStats, RequestStats
 
 class BaseAffinityMaintainer(metaclass=abc.ABCMeta):

src/vllm_router/services/routing_service/affinity/factory.py

@@ -1,15 +1,15 @@
 
-from vllm_router.routers.affinity.base import BaseAffinity
+from vllm_router.services.routing_service.affinity.base import BaseAffinity
 
 import json
 from logging import getLogger
 
 logger = getLogger(__name__)
 
-from vllm_router.affinity.round_robin_affinity import RoundRobinAffinity
-from vllm_router.affinity.session_based_affinity import SessionBasedAffinity
-from vllm_router.affinity.longest_prefix_affinity import LongestPrefixAffinity
-from vllm_router.affinity.simhash_affinity import SimhashAffinity
+from vllm_router.services.routing_service.affinity.round_robin_affinity import RoundRobinAffinity
+from vllm_router.services.routing_service.affinity.session_based_affinity import SessionBasedAffinity
+from vllm_router.services.routing_service.affinity.longest_prefix_affinity import LongestPrefixAffinity
+from vllm_router.services.routing_service.affinity.simhash_affinity import SimhashAffinity
 
 affinity_name_to_class = {
     "round_robin": RoundRobinAffinity,

src/vllm_router/services/routing_service/affinity/longest_prefix_affinity.py

@@ -1,6 +1,6 @@
 import xxhash
 
-from vllm_router.affinity.base import BaseAffinity
+from vllm_router.services.routing_service.affinity.base import BaseAffinity
 from collections import defaultdict
 from typing import Set, Generator, Tuple
 import logging

src/vllm_router/services/routing_service/affinity/round_robin_affinity.py

@@ -12,7 +12,7 @@
 from collections import defaultdict, Counter
 from fastapi import Request
 
-from vllm_router.affinity.base import BaseAffinity
+from vllm_router.services.routing_service.affinity.base import BaseAffinity
 
 
 class RoundRobinAffinity(BaseAffinity):

src/vllm_router/services/routing_service/affinity/session_affinity.py

@@ -1,5 +1,5 @@
 
-from vllm_router.affinity.base import BaseAffinity
+from vllm_router.services.routing_service.affinity.base import BaseAffinity
 from fastapi import Request
 from typing import Set
 

src/vllm_router/services/routing_service/affinity/simhash_affinity.py

@@ -11,7 +11,7 @@
 from collections import defaultdict, Counter
 from fastapi import Request
 
-from vllm_router.affinity.base import BaseAffinity
+from vllm_router.services.routing_service.affinity.base import BaseAffinity
 
 class HashType(str, enum.Enum):
     XXHASH = "xxhash"

src/vllm_router/services/routing_service/endpoint_filter/factory.py

@@ -1,12 +1,12 @@
 
-from vllm_router.routers.endpoint_filter.base import BaseEndpointFilter
+from vllm_router.services.routing_service.endpoint_filter.base import BaseEndpointFilter
 
 import json
 from logging import getLogger
 
 logger = getLogger(__name__)
 
-from vllm_router.routers.endpoint_filter.num_queueing_request_filter import NumQueueingRequestFilter
+from vllm_router.services.routing_service.endpoint_filter.num_queueing_request_filter import NumQueueingRequestFilter
 
 endpoint_filter_name_to_class = {
     "num_queueing_request_filter": NumQueueingRequestFilter,

src/vllm_router/services/routing_service/endpoint_filter/num_queueing_request_filter.py

@@ -1,5 +1,5 @@
 
-from vllm_router.routers.endpoint_filter.base import BaseEndpointFilter
+from vllm_router.services.routing_service.endpoint_filter.base import BaseEndpointFilter
 from vllm_router.types import RequestStats, EngineStats
 
 import logging