discovery.rs 16 KB
Newer Older
Ryan Olson's avatar
Ryan Olson committed
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
// SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

Ryan Olson's avatar
Ryan Olson committed
16
use std::sync::Arc;
17

18
use anyhow::Context as _;
Ryan Olson's avatar
Ryan Olson committed
19
use serde::{Deserialize, Serialize};
20
use tokio::sync::mpsc::Receiver;
Ryan Olson's avatar
Ryan Olson committed
21

Neelay Shah's avatar
Neelay Shah committed
22
use dynamo_runtime::{
23
    component::{self, Component, ComponentEndpointInfo},
24
    pipeline::{
25
26
        network::egress::push_router::PushRouter, ManyOut, Operator,
        RouterMode as RuntimeRouterMode, SegmentSource, ServiceBackend, SingleIn, Source,
27
    },
Ryan Olson's avatar
Ryan Olson committed
28
    protocols::{self, annotated::Annotated},
29
    slug::Slug,
30
    traits::DistributedRuntimeProvider as _,
31
    transports::etcd::{self, KeyValue, WatchEvent},
32
    DistributedRuntime,
33
};
Ryan Olson's avatar
Ryan Olson committed
34
35

use super::ModelManager;
36
use crate::protocols::openai::completions::{CompletionRequest, CompletionResponse};
37
38
39
40
41
42
use crate::{
    backend::Backend,
    model_type::ModelType,
    preprocessor::{BackendInput, OpenAIPreprocessor},
    protocols::common::llm_backend::LLMEngineOutput,
};
43
44
45
46
use crate::{
    key_value_store::{EtcdStorage, KeyValueStore, KeyValueStoreManager},
    model_card::{self, ModelDeploymentCard},
};
47
48
49
50
51
52
use crate::{
    kv_router::{scheduler::DefaultWorkerSelector, KvPushRouter, KvRouter},
    protocols::openai::chat_completions::{
        NvCreateChatCompletionRequest, NvCreateChatCompletionStreamResponse,
    },
};
53
use tracing;
54

Ryan Olson's avatar
Ryan Olson committed
55
56
57
58
59
60
/// [ModelEntry] is a struct that contains the information for the HTTP service to discover models
/// from the etcd cluster.
#[derive(Debug, Clone, Serialize, Deserialize, Eq, PartialEq)]
pub struct ModelEntry {
    /// Public name of the model
    /// This will be used to identify the model in the HTTP service and the value used in an
61
    /// an [OAI ChatRequest][crate::protocols::openai::chat_completions::NvCreateChatCompletionRequest].
Ryan Olson's avatar
Ryan Olson committed
62
63
64
65
    pub name: String,

    /// Component of the endpoint.
    pub endpoint: protocols::Endpoint,
66
67
68

    /// Specifies whether the model is a chat or completion model.s
    pub model_type: ModelType,
Ryan Olson's avatar
Ryan Olson committed
69
70
}

71
impl ModelEntry {
72
73
74
75
76
77
    pub fn requires_preprocessing(&self) -> bool {
        matches!(self.model_type, ModelType::Backend)
    }

    /// Fetch the ModelDeploymentCard from NATS.
    /// This does not touch it's fields so you may need to call move_from_nats on it.
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
    pub async fn load_mdc(
        &self,
        endpoint_id: protocols::Endpoint,
        etcd_client: etcd::Client,
    ) -> anyhow::Result<ModelDeploymentCard> {
        let kvstore: Box<dyn KeyValueStore> =
            Box::new(EtcdStorage::new(etcd_client.clone(), endpoint_id));
        let card_store = Arc::new(KeyValueStoreManager::new(kvstore));
        let card_key = ModelDeploymentCard::service_name_slug(&self.name);
        match card_store
            .load::<ModelDeploymentCard>(model_card::BUCKET_NAME, &card_key)
            .await
        {
            Ok(Some(mdc)) => Ok(mdc),
            Ok(None) => {
                anyhow::bail!("Missing ModelDeploymentCard in etcd under key {card_key}");
            }
            Err(err) => {
                anyhow::bail!(
                    "Error fetching ModelDeploymentCard from etcd under key {card_key}. {err}"
                );
            }
        }
    }
}

#[derive(Debug, Clone)]
pub struct ModelNetworkName(String);

impl ModelNetworkName {
    /// Key to store this model entry in networked key-value store (etcd).
    ///
    /// It looks like this:
    /// ns.cp.ep-694d967ca5efd804
    fn from_parts(namespace: &str, component: &str, endpoint: &str, lease_id: i64) -> Self {
        ModelNetworkName(
            Slug::slugify(&format!("{namespace}.{component}.{endpoint}-{lease_id:x}")).to_string(),
        )
    }

    // We can't do From<&component::Endpoint> here because we also need the lease_id
    pub fn from_local(endpoint: &component::Endpoint, lease_id: i64) -> Self {
        Self::from_parts(
            &endpoint.component().namespace().to_string(),
            &endpoint.component().name(),
            endpoint.name(),
            lease_id,
        )
    }

128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
    /// Fetch the ModelEntry from etcd.
    pub async fn load_entry(&self, etcd_client: etcd::Client) -> anyhow::Result<ModelEntry> {
        let mut model_entries = etcd_client.kv_get(self.to_string(), None).await?;
        if model_entries.is_empty() {
            anyhow::bail!("No ModelEntry in etcd for key {self}");
        }
        let model_entry = model_entries.remove(0);
        serde_json::from_slice(model_entry.value()).with_context(|| {
            format!(
                "Error deserializing JSON. Key={self}. JSON={}",
                model_entry.value_str().unwrap_or("INVALID UTF-8")
            )
        })
    }

    /// Fetch the ModelDeploymentCard from NATS.
    /// This does not touch it's fields so you may need to call move_from_nats on it.
    /// TODO We have potentially two for each endpoint, one Chat and one Completion.
146
147
148
149
150
    pub async fn load_mdc(
        &self,
        endpoint_id: protocols::Endpoint,
        etcd_client: etcd::Client,
    ) -> anyhow::Result<ModelDeploymentCard> {
151
        let entry = self.load_entry(etcd_client.clone()).await?;
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
        entry.load_mdc(endpoint_id, etcd_client).await
    }
}

impl From<&ComponentEndpointInfo> for ModelNetworkName {
    fn from(cei: &ComponentEndpointInfo) -> Self {
        Self::from_parts(&cei.namespace, &cei.component, &cei.endpoint, cei.lease_id)
    }
}

impl std::fmt::Display for ModelNetworkName {
    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
        write!(f, "{}", self.0)
    }
}

168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
#[derive(Debug, Clone, Copy, PartialEq)]
pub enum LLMRouterMode {
    Random,
    RoundRobin,
    KV,
}

impl LLMRouterMode {
    pub fn is_kv_routing(&self) -> bool {
        *self == LLMRouterMode::KV
    }

    pub fn as_runtime(&self) -> Option<RuntimeRouterMode> {
        match self {
            LLMRouterMode::RoundRobin => Some(RuntimeRouterMode::RoundRobin),
            LLMRouterMode::Random => Some(RuntimeRouterMode::Random),
            // Runtime router does not have KV, it's a dynamo-llm thing, not dynamo-runtime
            LLMRouterMode::KV => None,
        }
    }
}

pub struct ModelWatcher {
    prefix: String,
    manager: ModelManager,
    drt: DistributedRuntime,
    router_mode: LLMRouterMode,
    kv_chooser: Option<Arc<KvRouter>>,
Ryan Olson's avatar
Ryan Olson committed
196
197
}

198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
impl ModelWatcher {
    pub async fn new(
        component: Component,
        model_manager: ModelManager,
        network_prefix: &str,
        router_mode: LLMRouterMode,
    ) -> anyhow::Result<ModelWatcher> {
        let kv_chooser = if router_mode.is_kv_routing() {
            let selector = Box::new(DefaultWorkerSelector {});
            let chooser = KvRouter::new(
                component.clone(),
                crate::DEFAULT_KV_BLOCK_SIZE,
                Some(selector),
            )
            .await?;
            Some(Arc::new(chooser))
        } else {
            None
        };
        Ok(Self {
            prefix: network_prefix.to_string(),
            manager: model_manager,
            drt: component.drt().clone(),
            router_mode,
            kv_chooser,
        })
    }
Ryan Olson's avatar
Ryan Olson committed
225

226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
    pub async fn watch(self: Arc<Self>, mut events_rx: Receiver<WatchEvent>) {
        tracing::debug!("model watcher started");

        while let Some(event) = events_rx.recv().await {
            match event {
                WatchEvent::Put(kv) => {
                    let model_entry = match serde_json::from_slice::<ModelEntry>(kv.value()) {
                        Ok(model_entry) => model_entry,
                        Err(err) => {
                            tracing::error!(%err, ?kv, "Invalid JSON in model entry");
                            continue;
                        }
                    };
                    if self.manager.has_model_any(&model_entry.name) {
                        tracing::trace!(
                            service_name = model_entry.name,
                            "New endpoint for existing model"
                        );
244
245
246
                        continue;
                    }

247
248
249
250
251
252
253
254
255
256
257
258
                    match self.clone().handle_put(&model_entry).await {
                        Ok(()) => {
                            tracing::info!(model_name = model_entry.name, "added model");
                        }
                        Err(e) => {
                            tracing::error!(%e, "error adding model {}", model_entry.name);
                        }
                    }
                }
                WatchEvent::Delete(kv) => match self.clone().handle_delete(&kv).await {
                    Ok(model_name) => {
                        tracing::info!("removed model {}", model_name);
259
260
                    }
                    Err(e) => {
261
                        tracing::error!("error removing model: {}", e);
262
                    }
263
                },
264
            }
Ryan Olson's avatar
Ryan Olson committed
265
266
267
        }
    }

268
269
270
    async fn handle_delete(self: Arc<Self>, kv: &KeyValue) -> anyhow::Result<&str> {
        let key = kv.key_str()?;
        tracing::debug!(key, "removing model");
Ryan Olson's avatar
Ryan Olson committed
271

272
        let model_name = key.trim_start_matches(&self.prefix);
273

274
275
276
        // Ignore the errors because model could be either type
        let _ = self.manager.remove_chat_completions_model(model_name);
        let _ = self.manager.remove_completions_model(model_name);
277

278
279
        Ok(model_name)
    }
Ryan Olson's avatar
Ryan Olson committed
280

281
282
283
284
285
286
287
288
289
290
291
292
    // Handles a PUT event from etcd, this usually means adding a new model to the list of served
    // models.
    //
    // If this method errors, for the near term, we will delete the offending key.
    async fn handle_put(self: Arc<ModelWatcher>, model_entry: &ModelEntry) -> anyhow::Result<()> {
        let endpoint_id = model_entry.endpoint.clone();
        let client = self
            .drt
            .namespace(&endpoint_id.namespace)?
            .component(&endpoint_id.component)?
            .endpoint(&endpoint_id.name)
            .client()
293
            .await?;
294

295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
        let Some(etcd_client) = self.drt.etcd_client() else {
            // Should be impossible because we only get here on an etcd event
            anyhow::bail!("Missing etcd_client");
        };
        let card = match model_entry.load_mdc(endpoint_id, etcd_client).await {
            Ok(card) => {
                tracing::debug!(card.display_name, "adding model");
                Some(card)
            }
            Err(err) => {
                // `dynamo serve` isn't using MDC yet so can't be an error
                tracing::info!(%err, "load_mdc did not complete");
                None
            }
        };
        match model_entry.model_type {
            ModelType::Backend => {
                // A Backend model expects pre-processed requests meaning it's up to us whether we
                // handle Chat or Completions requests, so handle both.

                let Some(mut card) = card else {
                    anyhow::bail!("Missing model deployment card");
                };
                // Download tokenizer.json etc to local disk
                // This cache_dir is a tempfile::TempDir will be deleted on drop. I _think_
                // OpenAIPreprocessor::new loads the files, so we can delete them after this
                // function. Needs checking carefully, possibly we need to store it in state.
                let _cache_dir = Some(card.move_from_nats(self.drt.nats_client()).await?);

                let frontend = SegmentSource::<
                    SingleIn<NvCreateChatCompletionRequest>,
                    ManyOut<Annotated<NvCreateChatCompletionStreamResponse>>,
                >::new();
                let preprocessor = OpenAIPreprocessor::new(card.clone()).await?.into_operator();
                let backend = Backend::from_mdc(card.clone()).await?.into_operator();
                let router = PushRouter::<BackendInput, Annotated<LLMEngineOutput>>::from_client(
                    client.clone(),
                    self.router_mode.as_runtime(),
                )
                .await?;
                let service_backend = match self.router_mode {
                    LLMRouterMode::Random | LLMRouterMode::RoundRobin => {
                        ServiceBackend::from_engine(Arc::new(router))
                    }
                    LLMRouterMode::KV => {
                        let Some(kv_chooser) = self.kv_chooser.clone() else {
                            anyhow::bail!("KV routing mode with no chooser, should be unreachable");
                        };
                        let kv_push_router = KvPushRouter::new(router, kv_chooser);
                        ServiceBackend::from_engine(Arc::new(kv_push_router))
                    }
                };
347

348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
                let chat_engine = frontend
                    .link(preprocessor.forward_edge())?
                    .link(backend.forward_edge())?
                    .link(service_backend)?
                    .link(backend.backward_edge())?
                    .link(preprocessor.backward_edge())?
                    .link(frontend)?;
                self.manager
                    .add_chat_completions_model(&model_entry.name, chat_engine)?;

                let frontend = SegmentSource::<
                    SingleIn<CompletionRequest>,
                    ManyOut<Annotated<CompletionResponse>>,
                >::new();
                let preprocessor = OpenAIPreprocessor::new(card.clone()).await?.into_operator();
                let backend = Backend::from_mdc(card.clone()).await?.into_operator();
                let router = PushRouter::<BackendInput, Annotated<LLMEngineOutput>>::from_client(
365
                    client,
366
                    self.router_mode.as_runtime(),
367
                )
368
                .await?;
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
                let service_backend = match self.router_mode {
                    LLMRouterMode::Random | LLMRouterMode::RoundRobin => {
                        ServiceBackend::from_engine(Arc::new(router))
                    }
                    LLMRouterMode::KV => {
                        let Some(kv_chooser) = self.kv_chooser.clone() else {
                            anyhow::bail!("KV routing mode with no chooser, should be unreachable");
                        };
                        let kv_push_router = KvPushRouter::new(router, kv_chooser);
                        ServiceBackend::from_engine(Arc::new(kv_push_router))
                    }
                };

                let completions_engine = frontend
                    .link(preprocessor.forward_edge())?
                    .link(backend.forward_edge())?
                    .link(service_backend)?
                    .link(backend.backward_edge())?
                    .link(preprocessor.backward_edge())?
                    .link(frontend)?;
                self.manager
                    .add_completions_model(&model_entry.name, completions_engine)?;
            }
            ModelType::Chat => {
                let push_router = PushRouter::<
                    NvCreateChatCompletionRequest,
                    Annotated<NvCreateChatCompletionStreamResponse>,
                >::from_client(client, Default::default())
                .await?;
                let engine = Arc::new(push_router);
                self.manager
                    .add_chat_completions_model(&model_entry.name, engine)?;
            }
            ModelType::Completion => {
                let push_router =
                    PushRouter::<CompletionRequest, Annotated<CompletionResponse>>::from_client(
                        client,
                        Default::default(),
                    )
                    .await?;
                let engine = Arc::new(push_router);
                self.manager
                    .add_completions_model(&model_entry.name, engine)?;
            }
413
        }
Ryan Olson's avatar
Ryan Olson committed
414

415
416
        Ok(())
    }
Ryan Olson's avatar
Ryan Olson committed
417
}