ray-embedding 0.12.3__tar.gz → 0.13.17__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of ray-embedding might be problematic. Click here for more details.
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/PKG-INFO +1 -1
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding/deploy.py +79 -54
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding/dto.py +59 -50
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding/embedding_model.py +112 -75
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding/model_router.py +24 -3
- ray_embedding-0.13.17/ray_embedding/node_reaper.py +129 -0
- ray_embedding-0.13.17/ray_embedding/utils.py +71 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding.egg-info/PKG-INFO +1 -1
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding.egg-info/SOURCES.txt +2 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/setup.cfg +1 -1
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/README.md +0 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/pyproject.toml +0 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding/__init__.py +0 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding.egg-info/dependency_links.txt +0 -0
- {ray_embedding-0.12.3 → ray_embedding-0.13.17}/ray_embedding.egg-info/top_level.txt +0 -0
|
@@ -1,54 +1,79 @@
|
|
|
1
|
-
import os
|
|
2
|
-
|
|
3
|
-
import torch
|
|
4
|
-
from ray.serve import Application
|
|
5
|
-
|
|
6
|
-
from ray_embedding.dto import AppConfig, ModelDeploymentConfig, DeployedModel
|
|
7
|
-
from ray_embedding.embedding_model import EmbeddingModel
|
|
8
|
-
from ray_embedding.
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
1
|
+
import os
|
|
2
|
+
|
|
3
|
+
import torch
|
|
4
|
+
from ray.serve import Application
|
|
5
|
+
|
|
6
|
+
from ray_embedding.dto import AppConfig, ModelDeploymentConfig, DeployedModel, NodeReaperConfig
|
|
7
|
+
from ray_embedding.embedding_model import EmbeddingModel
|
|
8
|
+
from ray_embedding.node_reaper import NodeReaper, NODE_REAPER_DEPLOYMENT_NAME
|
|
9
|
+
from ray_embedding.utils import node_affinity_for_head, node_affinity_for_worker
|
|
10
|
+
from ray_embedding.model_router import ModelRouter
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
def build_model(model_config: ModelDeploymentConfig, node_reaper):
|
|
14
|
+
deployment_name = model_config.deployment
|
|
15
|
+
model = model_config.model
|
|
16
|
+
served_model_name = model_config.served_model_name or os.path.basename(model)
|
|
17
|
+
device = model_config.device
|
|
18
|
+
backend = model_config.backend or "torch"
|
|
19
|
+
matryoshka_dim = model_config.matryoshka_dim
|
|
20
|
+
trust_remote_code = model_config.trust_remote_code or False
|
|
21
|
+
model_kwargs = model_config.model_kwargs or {}
|
|
22
|
+
cuda_memory_flush_threshold = model_config.cuda_memory_flush_threshold or 0.8
|
|
23
|
+
|
|
24
|
+
if "torch_dtype" in model_kwargs:
|
|
25
|
+
torch_dtype = model_kwargs["torch_dtype"].strip()
|
|
26
|
+
if torch_dtype == "float16":
|
|
27
|
+
model_kwargs["torch_dtype"] = torch.float16
|
|
28
|
+
elif torch_dtype == "bfloat16":
|
|
29
|
+
model_kwargs["torch_dtype"] = torch.bfloat16
|
|
30
|
+
elif torch_dtype == "float32":
|
|
31
|
+
model_kwargs["torch_dtype"] = torch.float32
|
|
32
|
+
else:
|
|
33
|
+
raise ValueError(f"Invalid torch_dtype: '{torch_dtype}'")
|
|
34
|
+
|
|
35
|
+
deployment = EmbeddingModel.options(name=deployment_name).bind(model=model,
|
|
36
|
+
served_model_name=served_model_name,
|
|
37
|
+
device=device,
|
|
38
|
+
backend=backend,
|
|
39
|
+
matryoshka_dim=matryoshka_dim,
|
|
40
|
+
trust_remote_code=trust_remote_code,
|
|
41
|
+
model_kwargs=model_kwargs,
|
|
42
|
+
cuda_memory_flush_threshold=cuda_memory_flush_threshold,
|
|
43
|
+
node_reaper=node_reaper,
|
|
44
|
+
)
|
|
45
|
+
return DeployedModel(model=served_model_name,
|
|
46
|
+
deployment_handle=deployment,
|
|
47
|
+
batch_size=model_config.batch_size,
|
|
48
|
+
num_retries=model_config.num_retries
|
|
49
|
+
)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def build_app(args: AppConfig) -> Application:
|
|
53
|
+
model_router, models = args.model_router, args.models
|
|
54
|
+
assert model_router and models
|
|
55
|
+
assert model_router.path_prefix
|
|
56
|
+
|
|
57
|
+
node_reaper_config = args.node_reaper or NodeReaperConfig()
|
|
58
|
+
|
|
59
|
+
node_reaper_kwargs = {
|
|
60
|
+
"ssh_user": node_reaper_config.ssh_user,
|
|
61
|
+
"ssh_private_key": node_reaper_config.ssh_private_key,
|
|
62
|
+
}
|
|
63
|
+
if node_reaper_config.retention_seconds is not None:
|
|
64
|
+
node_reaper_kwargs["retention_seconds"] = node_reaper_config.retention_seconds
|
|
65
|
+
if node_reaper_config.reap_interval_seconds is not None:
|
|
66
|
+
node_reaper_kwargs["reap_interval_seconds"] = node_reaper_config.reap_interval_seconds
|
|
67
|
+
|
|
68
|
+
node_reaper = NodeReaper.options(
|
|
69
|
+
name=NODE_REAPER_DEPLOYMENT_NAME,
|
|
70
|
+
ray_actor_options={"num_cpus": 0.25, f"node:{HEAD_NODE_IP}": 1},
|
|
71
|
+
autoscaling_config={"initial_replicas": 1, "min_replicas": 1, "max_replicas": 1}
|
|
72
|
+
).bind(**node_reaper_kwargs)
|
|
73
|
+
|
|
74
|
+
deployed_models = {model_config.served_model_name: build_model(model_config, node_reaper) for model_config in models}
|
|
75
|
+
router = ModelRouter.options(
|
|
76
|
+
name=model_router.deployment
|
|
77
|
+
).bind(deployed_models, model_router.path_prefix, node_reaper)
|
|
78
|
+
|
|
79
|
+
return router
|
|
@@ -1,50 +1,59 @@
|
|
|
1
|
-
import dataclasses
|
|
2
|
-
from typing import Union, List, Optional, Dict, Any
|
|
3
|
-
from pydantic import BaseModel
|
|
4
|
-
from ray.serve.handle import DeploymentHandle
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
class EmbeddingRequest(BaseModel):
|
|
8
|
-
"""Schema of embedding requests (compatible with OpenAI)"""
|
|
9
|
-
model: str # Model name (for compatibility; only one model is used here)
|
|
10
|
-
input: Union[str, List[str]] # List of strings to embed
|
|
11
|
-
dimensions: Optional[int] = None
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
class EmbeddingResponse(BaseModel):
|
|
15
|
-
"""Schema of embedding response (compatible with OpenAI)"""
|
|
16
|
-
object: str
|
|
17
|
-
data: List[dict] # Embedding data including index and vector
|
|
18
|
-
model: str # Model name used for embedding
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
class ModelRouterConfig(BaseModel):
|
|
22
|
-
deployment: str
|
|
23
|
-
path_prefix: List[str] = []
|
|
24
|
-
max_concurrency: int = 32
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
class ModelDeploymentConfig(BaseModel):
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
1
|
+
import dataclasses
|
|
2
|
+
from typing import Union, List, Optional, Dict, Any
|
|
3
|
+
from pydantic import BaseModel
|
|
4
|
+
from ray.serve.handle import DeploymentHandle
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
class EmbeddingRequest(BaseModel):
|
|
8
|
+
"""Schema of embedding requests (compatible with OpenAI)"""
|
|
9
|
+
model: str # Model name (for compatibility; only one model is used here)
|
|
10
|
+
input: Union[str, List[str]] # List of strings to embed
|
|
11
|
+
dimensions: Optional[int] = None
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
class EmbeddingResponse(BaseModel):
|
|
15
|
+
"""Schema of embedding response (compatible with OpenAI)"""
|
|
16
|
+
object: str
|
|
17
|
+
data: List[dict] # Embedding data including index and vector
|
|
18
|
+
model: str # Model name used for embedding
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
class ModelRouterConfig(BaseModel):
|
|
22
|
+
deployment: str
|
|
23
|
+
path_prefix: List[str] = []
|
|
24
|
+
max_concurrency: int = 32
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
class ModelDeploymentConfig(BaseModel):
|
|
28
|
+
model: str
|
|
29
|
+
served_model_name: str
|
|
30
|
+
batch_size: Optional[int] = 8
|
|
31
|
+
num_retries: Optional[int] = 2
|
|
32
|
+
device: Optional[str] = None
|
|
33
|
+
backend: Optional[str] = None
|
|
34
|
+
matryoshka_dim: Optional[int] = 768
|
|
35
|
+
trust_remote_code: Optional[bool] = False
|
|
36
|
+
model_kwargs: Optional[Dict[str, Any]] = {}
|
|
37
|
+
cuda_memory_flush_threshold: Optional[float] = 0.8
|
|
38
|
+
deployment: str
|
|
39
|
+
|
|
40
|
+
|
|
41
|
+
class NodeReaperConfig(BaseModel):
|
|
42
|
+
ssh_user: str = "ubuntu"
|
|
43
|
+
ssh_private_key: str = "/home/ray/ray_bootstrap_key.pem"
|
|
44
|
+
retention_seconds: Optional[int] = 900
|
|
45
|
+
reap_interval_seconds: Optional[int] = 60
|
|
46
|
+
|
|
47
|
+
|
|
48
|
+
class AppConfig(BaseModel):
|
|
49
|
+
model_router: ModelRouterConfig
|
|
50
|
+
node_reaper: Optional[NodeReaperConfig] = None
|
|
51
|
+
models: List[ModelDeploymentConfig]
|
|
52
|
+
|
|
53
|
+
|
|
54
|
+
@dataclasses.dataclass
|
|
55
|
+
class DeployedModel:
|
|
56
|
+
model: str
|
|
57
|
+
deployment_handle: DeploymentHandle
|
|
58
|
+
batch_size: int
|
|
59
|
+
num_retries: Optional[int] = 2
|
|
@@ -1,75 +1,112 @@
|
|
|
1
|
-
import logging
|
|
2
|
-
import os.path
|
|
3
|
-
import time
|
|
4
|
-
from typing import Optional, Dict, Any, List, Union
|
|
5
|
-
|
|
6
|
-
import torch
|
|
7
|
-
from pynvml import nvmlInit, nvmlDeviceGetCount
|
|
8
|
-
from ray import serve
|
|
9
|
-
from
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
self.
|
|
28
|
-
self.
|
|
29
|
-
|
|
30
|
-
self.
|
|
31
|
-
|
|
32
|
-
self.
|
|
33
|
-
self.
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
self.
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
text
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
1
|
+
import logging
|
|
2
|
+
import os.path
|
|
3
|
+
import time
|
|
4
|
+
from typing import Optional, Dict, Any, List, Union
|
|
5
|
+
|
|
6
|
+
import torch
|
|
7
|
+
from pynvml import nvmlInit, nvmlDeviceGetCount, nvmlDeviceGetHandleByIndex, nvmlDeviceGetMemoryInfo
|
|
8
|
+
from ray import serve
|
|
9
|
+
from ray.serve.handle import DeploymentHandle
|
|
10
|
+
from sentence_transformers import SentenceTransformer
|
|
11
|
+
|
|
12
|
+
from ray_embedding.utils import report_unhealthy_replica
|
|
13
|
+
|
|
14
|
+
|
|
15
|
+
@serve.deployment
|
|
16
|
+
class EmbeddingModel:
|
|
17
|
+
def __init__(self, model: str, served_model_name: Optional[str] = None,
|
|
18
|
+
device: Optional[str] = None, backend: Optional[str] = "torch",
|
|
19
|
+
matryoshka_dim: Optional[int] = None, trust_remote_code: Optional[bool] = False,
|
|
20
|
+
model_kwargs: Dict[str, Any] = None, cuda_memory_flush_threshold: Optional[float] = 0.8,
|
|
21
|
+
node_reaper: Optional[DeploymentHandle] = None):
|
|
22
|
+
logging.basicConfig(level=logging.INFO)
|
|
23
|
+
self.logger = logging.getLogger(self.__class__.__name__)
|
|
24
|
+
self.model = model
|
|
25
|
+
self.served_model_name = served_model_name or os.path.basename(self.model)
|
|
26
|
+
self.init_device = device
|
|
27
|
+
self.cuda_memory_flush_threshold = cuda_memory_flush_threshold
|
|
28
|
+
if self.init_device is None or self.init_device == "auto":
|
|
29
|
+
self.init_device = "cuda" if torch.cuda.is_available() else "cpu"
|
|
30
|
+
if self.init_device == "cuda":
|
|
31
|
+
self.wait_for_cuda()
|
|
32
|
+
self.torch_device = torch.device(self.init_device)
|
|
33
|
+
self.backend = backend or "torch"
|
|
34
|
+
self.matryoshka_dim = matryoshka_dim
|
|
35
|
+
self.trust_remote_code = trust_remote_code or False
|
|
36
|
+
self.model_kwargs = model_kwargs or {}
|
|
37
|
+
self.node_reaper = node_reaper
|
|
38
|
+
|
|
39
|
+
self.logger.info(f"Initializing embedding model: {self.model}")
|
|
40
|
+
self.embedding_model = SentenceTransformer(self.model, device=self.init_device, backend=self.backend,
|
|
41
|
+
trust_remote_code=self.trust_remote_code,
|
|
42
|
+
model_kwargs=self.model_kwargs)
|
|
43
|
+
|
|
44
|
+
self.logger.info(f"Successfully initialized model {self.model} using device {self.torch_device}")
|
|
45
|
+
|
|
46
|
+
async def __call__(self, text: Union[str, List[str]], dimensions: Optional[int] = None) -> List[List[float]]:
|
|
47
|
+
"""Compute embeddings for the input text using the current model."""
|
|
48
|
+
if not text or (isinstance(text, list) and not all(text)):
|
|
49
|
+
raise ValueError("Input text is empty or invalid")
|
|
50
|
+
|
|
51
|
+
text = [text] if isinstance(text, str) else text
|
|
52
|
+
truncate_dim = dimensions or self.matryoshka_dim
|
|
53
|
+
|
|
54
|
+
# Compute embeddings in PyTorch format
|
|
55
|
+
embeddings = self.embedding_model.encode(
|
|
56
|
+
text, convert_to_tensor=True, normalize_embeddings=True, show_progress_bar=False,
|
|
57
|
+
).to(self.torch_device)
|
|
58
|
+
|
|
59
|
+
if truncate_dim is not None:
|
|
60
|
+
# Truncate and re-normalize the embeddings
|
|
61
|
+
embeddings = embeddings[:, :truncate_dim]
|
|
62
|
+
embeddings = embeddings / torch.norm(embeddings, dim=1, keepdim=True)
|
|
63
|
+
|
|
64
|
+
# Move all embeddings to CPU at once before conversion
|
|
65
|
+
embeddings_list = embeddings.cpu().tolist()
|
|
66
|
+
|
|
67
|
+
# don't wait for GC
|
|
68
|
+
del embeddings
|
|
69
|
+
|
|
70
|
+
return embeddings_list
|
|
71
|
+
|
|
72
|
+
def wait_for_cuda(self, wait: int = 10):
|
|
73
|
+
if self.init_device == "cuda" and not torch.cuda.is_available():
|
|
74
|
+
time.sleep(wait)
|
|
75
|
+
self.check_health()
|
|
76
|
+
|
|
77
|
+
def check_health(self):
|
|
78
|
+
if self.init_device != "cuda":
|
|
79
|
+
return
|
|
80
|
+
|
|
81
|
+
try:
|
|
82
|
+
# Even though CUDA was available at init time,
|
|
83
|
+
# CUDA can become unavailable - this is a known problem in AWS EC2+Docker
|
|
84
|
+
# https://github.com/ray-project/ray/issues/49594
|
|
85
|
+
nvmlInit()
|
|
86
|
+
count = nvmlDeviceGetCount()
|
|
87
|
+
assert count >= 1, "No CUDA devices found"
|
|
88
|
+
|
|
89
|
+
# replicas only have access to GPU 0
|
|
90
|
+
handle = nvmlDeviceGetHandleByIndex(0)
|
|
91
|
+
mem_info = nvmlDeviceGetMemoryInfo(handle)
|
|
92
|
+
except Exception as e:
|
|
93
|
+
error_message = f"CUDA health check failed: {e}"
|
|
94
|
+
report_unhealthy_replica(error=error_message, node_reaper=self.node_reaper)
|
|
95
|
+
raise RuntimeError(error_message)
|
|
96
|
+
|
|
97
|
+
reserved = torch.cuda.memory_reserved() # bytes currently reserved by CUDA cache
|
|
98
|
+
threshold_bytes = self.cuda_memory_flush_threshold * mem_info.total
|
|
99
|
+
|
|
100
|
+
if reserved > threshold_bytes:
|
|
101
|
+
# flush only when cache exceeds the percentage threshold
|
|
102
|
+
torch.cuda.empty_cache()
|
|
103
|
+
|
|
104
|
+
def __del__(self):
|
|
105
|
+
# Clean up and free any remaining GPU memory
|
|
106
|
+
try:
|
|
107
|
+
if hasattr(self, 'embedding_model'):
|
|
108
|
+
del self.embedding_model
|
|
109
|
+
if torch.cuda.is_available():
|
|
110
|
+
torch.cuda.empty_cache()
|
|
111
|
+
except Exception as e:
|
|
112
|
+
self.logger.warning(f"Error during cleanup: {e}")
|
|
@@ -4,17 +4,20 @@ import time
|
|
|
4
4
|
from typing import Optional, Dict, List, Tuple
|
|
5
5
|
|
|
6
6
|
from fastapi import FastAPI, HTTPException
|
|
7
|
+
import ray
|
|
7
8
|
from ray import serve
|
|
8
9
|
from ray.serve.handle import DeploymentHandle
|
|
9
10
|
|
|
10
11
|
from ray_embedding.dto import DeployedModel, EmbeddingRequest, EmbeddingResponse
|
|
12
|
+
from ray_embedding.utils import get_current_node_ip
|
|
11
13
|
|
|
12
14
|
web_api = FastAPI(title="Ray Embeddings - OpenAI-compatible API")
|
|
13
15
|
|
|
14
16
|
@serve.deployment
|
|
15
17
|
@serve.ingress(web_api)
|
|
16
18
|
class ModelRouter:
|
|
17
|
-
def __init__(self, deployed_models: Dict[str, DeployedModel], path_prefix: List[str],
|
|
19
|
+
def __init__(self, deployed_models: Dict[str, DeployedModel], path_prefix: List[str],
|
|
20
|
+
max_concurrency: Optional[int] = 32, node_reaper: Optional[DeploymentHandle] = None):
|
|
18
21
|
assert deployed_models, "models cannot be empty"
|
|
19
22
|
assert path_prefix, "path_prefix cannot be empty"
|
|
20
23
|
|
|
@@ -32,6 +35,7 @@ class ModelRouter:
|
|
|
32
35
|
"permission": []} for item in self.deployed_models.keys()
|
|
33
36
|
]
|
|
34
37
|
self.logger.info(f"Successfully registered models: {self.available_models}")
|
|
38
|
+
self.node_reaper = node_reaper
|
|
35
39
|
|
|
36
40
|
async def _compute_embeddings_from_resized_batches(self, model: str, inputs: List[str], dimensions: Optional[int] = None):
|
|
37
41
|
deployed_model = self.deployed_models[model]
|
|
@@ -46,7 +50,7 @@ class ModelRouter:
|
|
|
46
50
|
f"to {len(batches)} mini-batches, each with max length {batch_size}.")
|
|
47
51
|
|
|
48
52
|
# Call embedding model replicas in parallel (rate-limited)
|
|
49
|
-
tasks = [self.
|
|
53
|
+
tasks = [self._compute_embeddings_rate_limited(model_handle, batch, dimensions) for batch in batches]
|
|
50
54
|
all_results = await asyncio.gather(*tasks, return_exceptions=True)
|
|
51
55
|
|
|
52
56
|
# Retry any failed model calls
|
|
@@ -64,7 +68,7 @@ class ModelRouter:
|
|
|
64
68
|
self.logger.info(f"Successfully computed embeddings from {len(batches)} mini-batches")
|
|
65
69
|
return [emb for result in all_results for emb in result]
|
|
66
70
|
|
|
67
|
-
async def
|
|
71
|
+
async def _compute_embeddings_rate_limited(self, model_handle: DeploymentHandle, batch: List[str], dimensions: int):
|
|
68
72
|
async with self.rate_limiter:
|
|
69
73
|
return await model_handle.remote(batch, dimensions)
|
|
70
74
|
|
|
@@ -111,3 +115,20 @@ class ModelRouter:
|
|
|
111
115
|
if path_prefix not in self.path_prefix:
|
|
112
116
|
raise HTTPException(status_code=400, detail=f"The API path prefix specified is invalid: '{path_prefix}'")
|
|
113
117
|
return {"object": "list", "data": self.available_models}
|
|
118
|
+
|
|
119
|
+
def check_health(self):
|
|
120
|
+
if not self.node_reaper:
|
|
121
|
+
return
|
|
122
|
+
|
|
123
|
+
try:
|
|
124
|
+
unhealthy_node_ips = ray.get(self.node_reaper.get_unhealthy_node_ips.remote())
|
|
125
|
+
except Exception as exc:
|
|
126
|
+
self.logger.warning(f"Unable to fetch node reaper data: {exc}")
|
|
127
|
+
return
|
|
128
|
+
|
|
129
|
+
if not unhealthy_node_ips:
|
|
130
|
+
return
|
|
131
|
+
|
|
132
|
+
node_ip = get_current_node_ip()
|
|
133
|
+
if node_ip and node_ip in unhealthy_node_ips:
|
|
134
|
+
raise RuntimeError("Model router replica is colocated with an unhealthy embedding replica node.")
|
|
@@ -0,0 +1,129 @@
|
|
|
1
|
+
import asyncio
|
|
2
|
+
import logging
|
|
3
|
+
import time
|
|
4
|
+
from pathlib import Path
|
|
5
|
+
from typing import Dict, Any, List, Optional, Set
|
|
6
|
+
|
|
7
|
+
from ray import serve
|
|
8
|
+
from ray_embedding.utils import HEAD_NODE_IP
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
NODE_REAPER_DEPLOYMENT_NAME = "NodeReaper"
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
@serve.deployment(
|
|
15
|
+
name=NODE_REAPER_DEPLOYMENT_NAME,
|
|
16
|
+
ray_actor_options={"num_cpus": 0.25, f"node:{HEAD_NODE_IP}": 1},
|
|
17
|
+
autoscaling_config={"initial_replicas": 1, "min_replicas": 1, "max_replicas": 1},
|
|
18
|
+
)
|
|
19
|
+
class NodeReaper:
|
|
20
|
+
def __init__(
|
|
21
|
+
self,
|
|
22
|
+
ssh_user: str,
|
|
23
|
+
ssh_private_key: str,
|
|
24
|
+
retention_seconds: int = 900,
|
|
25
|
+
reap_interval_seconds: int = 60,
|
|
26
|
+
):
|
|
27
|
+
logging.basicConfig(level=logging.INFO)
|
|
28
|
+
self.logger = logging.getLogger(self.__class__.__name__)
|
|
29
|
+
self.ssh_user = ssh_user
|
|
30
|
+
key_path = Path(ssh_private_key).expanduser()
|
|
31
|
+
if not key_path.exists():
|
|
32
|
+
raise FileNotFoundError(f"SSH private key not found: {key_path}")
|
|
33
|
+
self.ssh_private_key = key_path.as_posix()
|
|
34
|
+
self.retention_seconds = retention_seconds
|
|
35
|
+
self.reap_interval_seconds = max(30, reap_interval_seconds)
|
|
36
|
+
|
|
37
|
+
self._unhealthy_replicas: Dict[str, Dict[str, Any]] = {}
|
|
38
|
+
self._nodes_marked_for_reap: Dict[str, float] = {}
|
|
39
|
+
self._nodes_inflight: Set[str] = set()
|
|
40
|
+
|
|
41
|
+
loop = asyncio.get_event_loop()
|
|
42
|
+
self._reaper_task = loop.create_task(self._reap_loop())
|
|
43
|
+
self.logger.info("NodeReaper initialized; monitoring unhealthy nodes for recycling")
|
|
44
|
+
|
|
45
|
+
def __del__(self):
|
|
46
|
+
if hasattr(self, "_reaper_task") and self._reaper_task and not self._reaper_task.done():
|
|
47
|
+
self._reaper_task.cancel()
|
|
48
|
+
|
|
49
|
+
def report_failure(self, replica_id: str, node_ip: str, error: Optional[str] = None):
|
|
50
|
+
self._unhealthy_replicas[replica_id] = {
|
|
51
|
+
"node_ip": node_ip,
|
|
52
|
+
"error": error,
|
|
53
|
+
"timestamp": time.time(),
|
|
54
|
+
}
|
|
55
|
+
self._nodes_marked_for_reap[node_ip] = self._nodes_marked_for_reap.get(node_ip, time.time())
|
|
56
|
+
self.logger.warning(f"Replica {replica_id} on {node_ip} marked for reaping: {error}")
|
|
57
|
+
self._purge_stale()
|
|
58
|
+
|
|
59
|
+
def get_unhealthy_node_ips(self) -> List[str]:
|
|
60
|
+
self._purge_stale()
|
|
61
|
+
return list(self._nodes_marked_for_reap.keys())
|
|
62
|
+
|
|
63
|
+
async def _reap_loop(self):
|
|
64
|
+
while True:
|
|
65
|
+
try:
|
|
66
|
+
await asyncio.sleep(self.reap_interval_seconds)
|
|
67
|
+
await self._reap_pending_nodes()
|
|
68
|
+
except asyncio.CancelledError:
|
|
69
|
+
break
|
|
70
|
+
except Exception as exc:
|
|
71
|
+
self.logger.warning(f"Unexpected error in reap loop: {exc}")
|
|
72
|
+
|
|
73
|
+
async def _reap_pending_nodes(self):
|
|
74
|
+
nodes = self.get_unhealthy_node_ips()
|
|
75
|
+
for node_ip in nodes:
|
|
76
|
+
if node_ip in self._nodes_inflight:
|
|
77
|
+
continue
|
|
78
|
+
self._nodes_inflight.add(node_ip)
|
|
79
|
+
try:
|
|
80
|
+
await self._reap_node(node_ip)
|
|
81
|
+
self._clear_node(node_ip)
|
|
82
|
+
self.logger.info(f"Successfully reaped node {node_ip}")
|
|
83
|
+
except Exception as exc:
|
|
84
|
+
self.logger.error(f"Failed to reap node {node_ip}: {exc}")
|
|
85
|
+
finally:
|
|
86
|
+
self._nodes_inflight.discard(node_ip)
|
|
87
|
+
|
|
88
|
+
async def _reap_node(self, node_ip: str):
|
|
89
|
+
ssh_command = [
|
|
90
|
+
"ssh",
|
|
91
|
+
"-i",
|
|
92
|
+
self.ssh_private_key,
|
|
93
|
+
"-o",
|
|
94
|
+
"StrictHostKeyChecking=no",
|
|
95
|
+
f"{self.ssh_user}@{node_ip}",
|
|
96
|
+
"docker stop ray_container",
|
|
97
|
+
]
|
|
98
|
+
|
|
99
|
+
self.logger.info(f"Reaping node {node_ip} via SSH")
|
|
100
|
+
process = await asyncio.create_subprocess_exec(
|
|
101
|
+
*ssh_command,
|
|
102
|
+
stdout=asyncio.subprocess.PIPE,
|
|
103
|
+
stderr=asyncio.subprocess.PIPE,
|
|
104
|
+
)
|
|
105
|
+
stdout, stderr = await process.communicate()
|
|
106
|
+
if process.returncode != 0:
|
|
107
|
+
stdout_text = stdout.decode().strip()
|
|
108
|
+
stderr_text = stderr.decode().strip()
|
|
109
|
+
raise RuntimeError(
|
|
110
|
+
f"SSH command failed with code {process.returncode}. stdout={stdout_text} stderr={stderr_text}"
|
|
111
|
+
)
|
|
112
|
+
|
|
113
|
+
def _clear_node(self, node_ip: str):
|
|
114
|
+
to_delete = [replica for replica, data in self._unhealthy_replicas.items() if data.get("node_ip") == node_ip]
|
|
115
|
+
for replica in to_delete:
|
|
116
|
+
self._unhealthy_replicas.pop(replica, None)
|
|
117
|
+
self._nodes_marked_for_reap.pop(node_ip, None)
|
|
118
|
+
|
|
119
|
+
def _purge_stale(self):
|
|
120
|
+
if not self.retention_seconds:
|
|
121
|
+
return
|
|
122
|
+
cutoff = time.time() - self.retention_seconds
|
|
123
|
+
replica_ids = [replica_id for replica_id, data in self._unhealthy_replicas.items()
|
|
124
|
+
if data.get("timestamp", 0) < cutoff]
|
|
125
|
+
for replica_id in replica_ids:
|
|
126
|
+
node_ip = self._unhealthy_replicas[replica_id]["node_ip"]
|
|
127
|
+
self._unhealthy_replicas.pop(replica_id, None)
|
|
128
|
+
if node_ip in self._nodes_marked_for_reap and self._nodes_marked_for_reap[node_ip] < cutoff:
|
|
129
|
+
self._nodes_marked_for_reap.pop(node_ip, None)
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
from typing import Optional, Tuple
|
|
2
|
+
|
|
3
|
+
import ray
|
|
4
|
+
from ray import serve
|
|
5
|
+
from ray.serve.handle import DeploymentHandle
|
|
6
|
+
from ray.util import get_node_ip_address, state
|
|
7
|
+
from ray.util.scheduling_strategies import NodeAffinitySchedulingStrategy, NotIn
|
|
8
|
+
|
|
9
|
+
from ray_embedding.node_reaper import NODE_REAPER_DEPLOYMENT_NAME
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
def get_head_node_id() -> Tuple[str, str]:
|
|
14
|
+
try:
|
|
15
|
+
nodes = state.list_nodes(filters=[("is_head_node", "=", True)])
|
|
16
|
+
if not nodes:
|
|
17
|
+
raise RuntimeError("Unable to locate head node for NodeReaper deployment.")
|
|
18
|
+
head_node = nodes[0]
|
|
19
|
+
return head_node["node_id"], head_node["node_ip"]
|
|
20
|
+
except Exception as exc:
|
|
21
|
+
raise RuntimeError("Unable to locate the head node ID for NodeReaper deployment.") from exc
|
|
22
|
+
|
|
23
|
+
|
|
24
|
+
HEAD_NODE_ID, HEAD_NODE_IP = get_head_node_id()
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
def node_affinity_for_head() -> NodeAffinitySchedulingStrategy:
|
|
28
|
+
return NodeAffinitySchedulingStrategy(node_id=HEAD_NODE_ID, soft=False)
|
|
29
|
+
|
|
30
|
+
|
|
31
|
+
def node_affinity_for_worker() -> NodeAffinitySchedulingStrategy:
|
|
32
|
+
return NodeAffinitySchedulingStrategy(node_id=NotIn(HEAD_NODE_ID), soft=False)
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
def get_node_reaper_handle() -> DeploymentHandle:
|
|
36
|
+
try:
|
|
37
|
+
return serve.context.get_deployment_handle(NODE_REAPER_DEPLOYMENT_NAME)
|
|
38
|
+
except Exception:
|
|
39
|
+
return serve.get_deployment(NODE_REAPER_DEPLOYMENT_NAME).get_handle(sync=False)
|
|
40
|
+
|
|
41
|
+
|
|
42
|
+
def get_current_replica_tag() -> Optional[str]:
|
|
43
|
+
try:
|
|
44
|
+
context = serve.context.get_current_replica_context()
|
|
45
|
+
except Exception:
|
|
46
|
+
context = None
|
|
47
|
+
if context is None:
|
|
48
|
+
return None
|
|
49
|
+
return getattr(context, "replica_tag", None)
|
|
50
|
+
|
|
51
|
+
|
|
52
|
+
def get_current_node_ip() -> Optional[str]:
|
|
53
|
+
try:
|
|
54
|
+
return get_node_ip_address()
|
|
55
|
+
except Exception:
|
|
56
|
+
return None
|
|
57
|
+
|
|
58
|
+
|
|
59
|
+
def report_unhealthy_replica(error: Optional[str] = None,
|
|
60
|
+
node_reaper: Optional[DeploymentHandle] = None) -> None:
|
|
61
|
+
replica_id = get_current_replica_tag()
|
|
62
|
+
node_ip = get_current_node_ip()
|
|
63
|
+
if not (replica_id and node_ip):
|
|
64
|
+
return
|
|
65
|
+
handle = node_reaper
|
|
66
|
+
if handle is None:
|
|
67
|
+
try:
|
|
68
|
+
handle = get_node_reaper_handle()
|
|
69
|
+
except Exception:
|
|
70
|
+
return
|
|
71
|
+
handle.report_failure.remote(replica_id, node_ip, error)
|
|
@@ -6,6 +6,8 @@ ray_embedding/deploy.py
|
|
|
6
6
|
ray_embedding/dto.py
|
|
7
7
|
ray_embedding/embedding_model.py
|
|
8
8
|
ray_embedding/model_router.py
|
|
9
|
+
ray_embedding/node_reaper.py
|
|
10
|
+
ray_embedding/utils.py
|
|
9
11
|
ray_embedding.egg-info/PKG-INFO
|
|
10
12
|
ray_embedding.egg-info/SOURCES.txt
|
|
11
13
|
ray_embedding.egg-info/dependency_links.txt
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|