watcher.rs 26.8 KB
Newer Older
Ryan Olson's avatar
Ryan Olson committed
1
2
3
// SPDX-FileCopyrightText: Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

Ryan Olson's avatar
Ryan Olson committed
4
use std::sync::Arc;
5
use tokio::sync::mpsc::Sender;
6

7
use anyhow::Context as _;
8
use tokio::sync::{Notify, mpsc::Receiver};
Ryan Olson's avatar
Ryan Olson committed
9

Neelay Shah's avatar
Neelay Shah committed
10
use dynamo_runtime::{
11
    DistributedRuntime,
12
    pipeline::{
13
14
        ManyOut, Operator, RouterMode, SegmentSource, ServiceBackend, SingleIn, Source,
        network::egress::push_router::PushRouter,
15
    },
16
17
    protocols::{EndpointId, annotated::Annotated},
    transports::etcd::WatchEvent,
18
};
Ryan Olson's avatar
Ryan Olson committed
19

20
21
use crate::{
    backend::Backend,
22
    entrypoint,
23
    kv_router::{KvRouterConfig, PrefillRouter},
24
    model_card::{self, ModelDeploymentCard},
25
26
    model_type::{ModelInput, ModelType},
    preprocessor::{OpenAIPreprocessor, PreprocessedEmbeddingRequest, prompt::PromptFormatter},
27
28
29
30
31
32
33
34
35
    protocols::{
        common::llm_backend::EmbeddingsEngineOutput,
        openai::{
            chat_completions::{
                NvCreateChatCompletionRequest, NvCreateChatCompletionStreamResponse,
            },
            completions::{NvCreateCompletionRequest, NvCreateCompletionResponse},
            embeddings::{NvCreateEmbeddingRequest, NvCreateEmbeddingResponse},
        },
36
        tensor::{NvCreateTensorRequest, NvCreateTensorResponse},
37
38
    },
};
39

40
use super::ModelManager;
41
use crate::namespace::is_global_namespace;
42

43
#[derive(Debug, Clone)]
44
pub enum ModelUpdate {
45
46
    Added(ModelDeploymentCard),
    Removed(ModelDeploymentCard),
47
48
}

49
pub struct ModelWatcher {
50
    manager: Arc<ModelManager>,
51
    drt: DistributedRuntime,
52
    router_mode: RouterMode,
53
    notify_on_model: Notify,
54
    model_update_tx: Option<Sender<ModelUpdate>>,
55
    kv_router_config: Option<KvRouterConfig>,
56
    busy_threshold: Option<f64>,
Ryan Olson's avatar
Ryan Olson committed
57
58
}

59
60
61
62
const ALL_MODEL_TYPES: &[ModelType] = &[
    ModelType::Chat,
    ModelType::Completions,
    ModelType::Embedding,
63
    ModelType::TensorBased,
64
    ModelType::Prefill,
65
];
66

67
impl ModelWatcher {
68
    pub fn new(
69
        runtime: DistributedRuntime,
70
        model_manager: Arc<ModelManager>,
71
        router_mode: RouterMode,
72
        kv_router_config: Option<KvRouterConfig>,
73
        busy_threshold: Option<f64>,
74
75
    ) -> ModelWatcher {
        Self {
76
            manager: model_manager,
77
            drt: runtime,
78
            router_mode,
79
            notify_on_model: Notify::new(),
80
            model_update_tx: None,
81
            kv_router_config,
82
            busy_threshold,
83
        }
84
    }
Ryan Olson's avatar
Ryan Olson committed
85

86
87
88
89
    pub fn set_notify_on_model_update(&mut self, tx: Sender<ModelUpdate>) {
        self.model_update_tx = Some(tx);
    }

90
91
92
93
94
95
96
97
98
99
100
    /// Wait until we have at least one chat completions model and return it's name.
    pub async fn wait_for_chat_model(&self) -> String {
        // Loop in case it gets added and immediately deleted
        loop {
            if let Some(model_name) = self.manager.list_chat_completions_models().first() {
                return model_name.to_owned();
            }
            self.notify_on_model.notified().await
        }
    }

101
102
103
    /// Common watch logic with optional namespace filtering
    pub async fn watch(&self, mut events_rx: Receiver<WatchEvent>, target_namespace: Option<&str>) {
        let global_namespace = target_namespace.is_none_or(is_global_namespace);
104
105
106
107

        while let Some(event) = events_rx.recv().await {
            match event {
                WatchEvent::Put(kv) => {
108
109
                    let mut card = match serde_json::from_slice::<ModelDeploymentCard>(kv.value()) {
                        Ok(card) => card,
110
                        Err(err) => {
111
112
                            match kv.value_str() {
                                Ok(value) => {
113
                                    tracing::error!(%err, value, "Invalid JSON in model card")
114
115
                                }
                                Err(value_str_err) => {
116
                                    tracing::error!(original_error = %err, %value_str_err, "Invalid UTF-8 string in model card, expected JSON")
117
118
                                }
                            }
119
120
121
                            continue;
                        }
                    };
122
123
124
125
126
127
128
129
130
131
132
133
134
135
                    let key = match kv.key_str() {
                        Ok(k) => k,
                        Err(err) => {
                            tracing::error!(%err, ?kv, "Invalid UTF-8 string in model card key, skipping");
                            continue;
                        }
                    };
                    let endpoint_id = match etcd_key_extract(key) {
                        Ok((eid, _)) => eid,
                        Err(err) => {
                            tracing::error!(%key, model_name = card.name(), %err, "Failed extracting EndpointId from key. Ignoring instance.");
                            continue;
                        }
                    };
136
137
138
139

                    // Filter by namespace if target_namespace is specified
                    if !global_namespace
                        && let Some(target_ns) = target_namespace
140
                        && endpoint_id.namespace != target_ns
141
142
                    {
                        tracing::debug!(
143
                            model_namespace = endpoint_id.namespace,
144
                            target_namespace = target_ns,
145
                            model_name = card.name(),
146
147
148
149
150
                            "Skipping model from different namespace"
                        );
                        continue;
                    }

151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
                    // If we already have a worker for this model, and the ModelDeploymentCard
                    // cards don't match, alert, and don't add the new instance
                    let can_add =
                        self.manager
                            .is_valid_checksum(card.model_type, card.name(), card.mdcsum());
                    if can_add.is_some_and(|is_valid| !is_valid) {
                        tracing::error!(
                            model_name = card.name(),
                            "Checksum for new model does not match existing model."
                        );

                        // TODO: mark that instance down in clients
                        // Not obvious how to do that given the current design
                        // Instances come from an `InstanceSource` in a `Client` in a `PushRouter`.
                        // Calling `report_instance_down` on the Client should do it (although
                        // needs more testing).
                        // The `PushRouter` is in `ModelMananger` (`self.manager` here), but inside
                        // interface `AsyncEngine` which only has a `generate` method.

                        continue;
                    }
172

173
                    match self.handle_put(key, &endpoint_id, &mut card).await {
174
                        Ok(()) => {
175
                            tracing::info!(
176
177
                                model_name = card.name(),
                                namespace = endpoint_id.namespace,
178
179
                                "added model"
                            );
180
                            self.notify_on_model.notify_waiters();
181
                        }
182
183
                        Err(err) => {
                            tracing::error!(
184
185
                                model_name = card.name(),
                                namespace = endpoint_id.namespace,
186
                                error = format!("{err:#}"),
187
                                "Error adding model from discovery",
188
                            );
189
190
191
                        }
                    }
                }
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
                WatchEvent::Delete(kv) => {
                    let Ok(deleted_key) = kv.key_str() else {
                        tracing::warn!("Invalid UTF-8 in etcd delete notification key: {kv:?}");
                        continue;
                    };
                    match self
                        .handle_delete(deleted_key, target_namespace, global_namespace)
                        .await
                    {
                        Ok(Some(model_name)) => {
                            tracing::info!(model_name, "removed model");
                        }
                        Ok(None) => {
                            // There are other instances running this model, nothing to do
                        }
                        Err(e) => {
                            tracing::error!(error = %e, "error removing model");
                        }
210
                    }
211
                }
212
            }
Ryan Olson's avatar
Ryan Olson committed
213
214
215
        }
    }

216
217
    /// If the last instance running this model has gone delete it.
    /// Returns the name of the model we just deleted, if any.
218
219
    async fn handle_delete(
        &self,
220
        key: &str,
221
222
223
        target_namespace: Option<&str>,
        is_global_namespace: bool,
    ) -> anyhow::Result<Option<String>> {
224
225
        let card = match self.manager.remove_model_card(key) {
            Some(card) => card,
226
            None => {
227
                anyhow::bail!("Missing ModelDeploymentCard for {key}");
228
229
            }
        };
230
        let model_name = card.name().to_string();
231
        let active_instances = self
232
            .cards_for_model(&model_name, target_namespace, is_global_namespace)
233
234
235
            .await
            .with_context(|| model_name.clone())?;
        if !active_instances.is_empty() {
236
237
238
239
240
241
            tracing::debug!(
                model_name,
                target_namespace = ?target_namespace,
                active_instance_count = active_instances.len(),
                "Model has other active instances, not removing"
            );
242
243
            return Ok(None);
        }
244

245
        // Ignore the errors because model could be either type
246
247
248
        let chat_model_remove_err = self.manager.remove_chat_completions_model(&model_name);
        let completions_model_remove_err = self.manager.remove_completions_model(&model_name);
        let embeddings_model_remove_err = self.manager.remove_embeddings_model(&model_name);
249
        let tensor_model_remove_err = self.manager.remove_tensor_model(&model_name);
250
        let prefill_model_remove_err = self.manager.remove_prefill_model(&model_name);
251
252
253
254

        let mut chat_model_removed = false;
        let mut completions_model_removed = false;
        let mut embeddings_model_removed = false;
255
        let mut tensor_model_removed = false;
256
        let mut prefill_model_removed = false;
257
258
259
260
261
262
263
264
265
266
267

        if chat_model_remove_err.is_ok() && self.manager.list_chat_completions_models().is_empty() {
            chat_model_removed = true;
        }
        if completions_model_remove_err.is_ok() && self.manager.list_completions_models().is_empty()
        {
            completions_model_removed = true;
        }
        if embeddings_model_remove_err.is_ok() && self.manager.list_embeddings_models().is_empty() {
            embeddings_model_removed = true;
        }
268
269
270
        if tensor_model_remove_err.is_ok() && self.manager.list_tensor_models().is_empty() {
            tensor_model_removed = true;
        }
271
272
273
        if prefill_model_remove_err.is_ok() && self.manager.list_prefill_models().is_empty() {
            prefill_model_removed = true;
        }
274

275
276
277
278
        if !chat_model_removed
            && !completions_model_removed
            && !embeddings_model_removed
            && !tensor_model_removed
279
            && !prefill_model_removed
280
        {
281
            tracing::debug!(
282
                "No updates to send for model {}: chat_model_removed: {}, completions_model_removed: {}, embeddings_model_removed: {}, tensor_model_removed: {}, prefill_model_removed: {}",
283
284
285
                model_name,
                chat_model_removed,
                completions_model_removed,
286
                embeddings_model_removed,
287
288
                tensor_model_removed,
                prefill_model_removed
289
290
291
            );
        } else {
            for model_type in ALL_MODEL_TYPES {
292
                if ((chat_model_removed && *model_type == ModelType::Chat)
293
                    || (completions_model_removed && *model_type == ModelType::Completions)
294
                    || (embeddings_model_removed && *model_type == ModelType::Embedding)
295
296
                    || (tensor_model_removed && *model_type == ModelType::TensorBased)
                    || (prefill_model_removed && *model_type == ModelType::Prefill))
297
                    && let Some(tx) = &self.model_update_tx
298
                {
299
                    tx.send(ModelUpdate::Removed(card.clone())).await.ok();
300
301
302
                }
            }
        }
303

304
        Ok(Some(model_name))
305
    }
Ryan Olson's avatar
Ryan Olson committed
306

307
308
    // Handles a PUT event from etcd, this usually means adding a new model to the list of served
    // models.
309
310
311
312
313
314
    async fn handle_put(
        &self,
        key: &str,
        endpoint_id: &EndpointId,
        card: &mut ModelDeploymentCard,
    ) -> anyhow::Result<()> {
315
316
        card.download_config().await?;

317
        let component = self
318
319
            .drt
            .namespace(&endpoint_id.namespace)?
320
            .component(&endpoint_id.component)?;
321
322
        let endpoint = component.endpoint(&endpoint_id.name);
        let client = endpoint.client().await?;
323
324
        tracing::debug!(model_name = card.name(), "adding model");
        self.manager.save_model_card(key, card.clone())?;
325

326
327
328
329
330
331
332
333
334
335
        // Check if we should skip registration:
        // - Skip if a model with this name already exists
        // - UNLESS this is a prefill model and no prefill model exists yet for this name
        let is_new_prefill = card.model_type.supports_prefill()
            && !self
                .manager
                .list_prefill_models()
                .contains(&card.name().to_string());

        if self.manager.has_model_any(card.name()) && !is_new_prefill {
336
337
338
            tracing::debug!(
                model_name = card.name(),
                namespace = endpoint_id.namespace,
339
340
                model_type = %card.model_type,
                "New endpoint for existing model, skipping"
341
342
343
344
345
346
347
            );
            return Ok(());
        }

        if let Some(tx) = &self.model_update_tx {
            tx.send(ModelUpdate::Added(card.clone())).await.ok();
        }
348
        let checksum = card.mdcsum();
349
350
351

        if card.model_input == ModelInput::Tokens
            && (card.model_type.supports_chat() || card.model_type.supports_completions())
352
353
354
355
356
357
358
359
        {
            // Case 1: Tokens + (Chat OR Completions OR Both)
            // A model that expects pre-processed requests meaning it's up to us whether we
            // handle Chat or Completions requests, so handle whatever the model supports.

            let kv_chooser = if self.router_mode == RouterMode::KV {
                Some(
                    self.manager
360
                        .kv_chooser_for(&component, card.kv_cache_block_size, self.kv_router_config)
361
362
363
364
365
                        .await?,
                )
            } else {
                None
            };
366

367
            // This is expensive, we are loading ~10MiB JSON, so only do it once
368
            let tokenizer_hf = card.tokenizer_hf().context("tokenizer_hf")?;
369

370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
            // Create prefill chooser once if we're building pipelines
            // Both chat and completions will share the same prefill chooser instance
            let prefill_chooser = self
                .manager
                .register_prefill_router(card.name().to_string())
                .map(|rx| {
                    // Create prefill-specific config with track_active_blocks disabled
                    let mut prefill_config = self.kv_router_config.unwrap_or_default();
                    prefill_config.router_track_active_blocks = false;

                    PrefillRouter::new(
                        rx,
                        self.manager.clone(),
                        self.router_mode,
                        card.kv_cache_block_size,
                        Some(prefill_config),
                    )
                });

389
            // Add chat engine only if the model supports chat
390
            if card.model_type.supports_chat() {
391
392
393
394
                let chat_engine = entrypoint::build_routed_pipeline::<
                    NvCreateChatCompletionRequest,
                    NvCreateChatCompletionStreamResponse,
                >(
395
                    card,
396
397
398
399
                    &client,
                    self.router_mode,
                    self.busy_threshold,
                    kv_chooser.clone(),
400
                    tokenizer_hf.clone(),
401
                    prefill_chooser.clone(),
402
                )
403
404
                .await
                .context("build_routed_pipeline")?;
405
                self.manager
406
                    .add_chat_completions_model(card.name(), checksum, chat_engine)
407
                    .context("add_chat_completions_model")?;
408
                tracing::info!("Chat completions is ready");
409
            }
410

411
            // Add completions engine only if the model supports completions
412
            if card.model_type.supports_completions() {
413
414
                let formatter = PromptFormatter::no_op();
                let PromptFormatter::OAI(formatter) = formatter;
415
416
417
418
                let preprocessor = OpenAIPreprocessor::new_with_parts(
                    card.clone(),
                    formatter,
                    tokenizer_hf.clone(),
419
420
                )
                .context("OpenAIPreprocessor::new_with_parts")?;
421
                let completions_engine = entrypoint::build_routed_pipeline_with_preprocessor::<
422
423
424
                    NvCreateCompletionRequest,
                    NvCreateCompletionResponse,
                >(
425
                    card,
426
427
428
429
                    &client,
                    self.router_mode,
                    self.busy_threshold,
                    kv_chooser,
430
                    preprocessor,
431
                    tokenizer_hf,
432
                    prefill_chooser,
433
                )
434
435
                .await
                .context("build_routed_pipeline_with_preprocessor")?;
436
                self.manager
437
                    .add_completions_model(card.name(), checksum, completions_engine)
438
                    .context("add_completions_model")?;
439
                tracing::info!("Completions is ready");
440
            }
441
442
443
444
445
446
        } else if card.model_input == ModelInput::Text && card.model_type.supports_embedding() {
            // Case: Text + Embeddings
            let push_router = PushRouter::<
                NvCreateEmbeddingRequest,
                Annotated<NvCreateEmbeddingResponse>,
            >::from_client_with_threshold(
447
                client, self.router_mode, None, None
448
449
450
451
            )
            .await?;
            let engine = Arc::new(push_router);
            self.manager
452
                .add_embeddings_model(card.name(), checksum, engine)?;
453
        } else if card.model_input == ModelInput::Text && card.model_type.supports_chat() {
454
            // Case 3: Text + Chat
455
456
457
458
459
460
            let push_router =
                PushRouter::<
                    NvCreateChatCompletionRequest,
                    Annotated<NvCreateChatCompletionStreamResponse>,
                >::from_client_with_threshold(client, self.router_mode, None, None)
                .await?;
461
462
            let engine = Arc::new(push_router);
            self.manager
463
                .add_chat_completions_model(card.name(), checksum, engine)?;
464
        } else if card.model_input == ModelInput::Text && card.model_type.supports_completions() {
465
466
467
468
469
            // Case 2: Text + Completions
            let push_router = PushRouter::<
                NvCreateCompletionRequest,
                Annotated<NvCreateCompletionResponse>,
            >::from_client_with_threshold(
470
                client, self.router_mode, None, None
471
472
473
474
            )
            .await?;
            let engine = Arc::new(push_router);
            self.manager
475
                .add_completions_model(card.name(), checksum, engine)?;
476
        } else if card.model_input == ModelInput::Tokens && card.model_type.supports_embedding() {
477
478
479
480
481
482
483
484
            // Case 4: Tokens + Embeddings

            // Create preprocessing pipeline similar to Backend
            let frontend = SegmentSource::<
                SingleIn<NvCreateEmbeddingRequest>,
                ManyOut<Annotated<NvCreateEmbeddingResponse>>,
            >::new();

485
            let preprocessor = OpenAIPreprocessor::new(card.clone())?.into_operator();
486
            let backend = Backend::from_mdc(card).into_operator();
487
488
489
490
491

            let router = PushRouter::<
                PreprocessedEmbeddingRequest,
                Annotated<EmbeddingsEngineOutput>,
            >::from_client_with_threshold(
492
                client, self.router_mode, None, None
493
494
495
            )
            .await?;

496
            // Note: Embeddings don't need KV routing complexity or load monitoring
497
498
499
500
501
502
503
504
505
506
507
508
            let service_backend = ServiceBackend::from_engine(Arc::new(router));

            // Link the pipeline: frontend -> preprocessor -> backend -> service_backend -> backend -> preprocessor -> frontend
            let embedding_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
509
                .add_embeddings_model(card.name(), checksum, embedding_engine)?;
510
        } else if card.model_input == ModelInput::Tensor && card.model_type.supports_tensor() {
511
            // Case 5: Tensor + Tensor (non-LLM)
512
            // No KV cache concepts - not an LLM model
513
514
515
516
            let push_router = PushRouter::<
                NvCreateTensorRequest,
                Annotated<NvCreateTensorResponse>,
            >::from_client_with_threshold(
517
                client, self.router_mode, None, None
518
519
520
            )
            .await?;
            let engine = Arc::new(push_router);
521
522
            self.manager
                .add_tensor_model(card.name(), checksum, engine)?;
523
524
525
526
527
528
529
530
531
532
533
534
        } else if card.model_type.supports_prefill() {
            // Case 6: Prefill
            // Guardrail: Verify model_input is Tokens
            if card.model_input != ModelInput::Tokens {
                anyhow::bail!(
                    "Prefill models must use ModelInput::Tokens, got {}",
                    card.model_input.as_str()
                );
            }

            tracing::info!(
                model_name = card.name(),
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
                "Prefill model detected, registering and activating prefill router"
            );

            // Register prefill model for tracking (no engine needed, just lifecycle)
            self.manager
                .add_prefill_model(card.name(), checksum)
                .context("add_prefill_model")?;

            // Activate the prefill router with the endpoint for this prefill model
            let Ok(()) = self.manager.activate_prefill_router(card.name(), endpoint) else {
                tracing::warn!(
                    model_name = card.name(),
                    "Failed to activate prefill router - prefill model may already be activated"
                );
                return Ok(());
            };

            tracing::info!(
                model_name = card.name(),
                "Prefill model registered and router activated successfully"
555
            );
556
557
558
559
        } else {
            // Reject unsupported combinations
            anyhow::bail!(
                "Unsupported model configuration: {} with {} input. Supported combinations: \
560
                Tokens+(Chat|Completions|Prefill), Text+Chat, Text+Completions, Tokens+Embeddings, Tensor+TensorBased",
561
562
                card.model_type,
                card.model_input.as_str()
563
            );
564
        }
Ryan Olson's avatar
Ryan Olson committed
565

566
567
        Ok(())
    }
568

569
    /// All the registered ModelDeploymentCard with the EndpointId they are attached to, one per instance
570
571
572
573
574
575
576
    async fn all_cards(&self) -> anyhow::Result<Vec<(EndpointId, ModelDeploymentCard)>> {
        let store = self.drt.store();

        //let kvs = etcd_client.kv_get_prefix(model_card::ROOT_PATH).await?;
        let Some(card_bucket) = store.get_bucket(model_card::ROOT_PATH).await? else {
            // no cards
            return Ok(vec![]);
577
        };
578
579
580
581
582
        let entries = card_bucket.entries().await?;

        let mut results = Vec::with_capacity(entries.len());
        for (key, card_bytes) in entries {
            let r = match serde_json::from_slice::<ModelDeploymentCard>(&card_bytes) {
583
                Ok(card) => {
584
585
                    let maybe_endpoint_id =
                        etcd_key_extract(&key).map(|(endpoint_id, _instance_id)| endpoint_id);
586
587
588
589
590
591
592
593
594
                    let endpoint_id = match maybe_endpoint_id {
                        Ok(eid) => eid,
                        Err(err) => {
                            tracing::error!(%err, "Skipping invalid etcd key, not string or not EndpointId");
                            continue;
                        }
                    };
                    (endpoint_id, card)
                }
595
                Err(err) => {
596
597
                    let value = String::from_utf8_lossy(&card_bytes);
                    tracing::error!(%err, %value, "Invalid JSON in model card");
598
599
600
                    continue;
                }
            };
601
            results.push(r);
602
        }
603
        Ok(results)
604
605
    }

606
    pub async fn cards_for_model(
607
608
609
610
        &self,
        model_name: &str,
        target_namespace: Option<&str>,
        is_global_namespace: bool,
611
612
613
614
    ) -> anyhow::Result<Vec<ModelDeploymentCard>> {
        let mut all = self.all_cards().await?;
        all.retain(|(endpoint_id, card)| {
            let matches_name = card.name() == model_name;
615
616
617
            let matches_namespace = match (is_global_namespace, target_namespace) {
                (true, _) => true,
                (false, None) => true,
618
                (false, Some(target_ns)) => endpoint_id.namespace == target_ns,
619
620
621
            };
            matches_name && matches_namespace
        });
622
623
624
625
626
627
628
        Ok(all.into_iter().map(|(_eid, card)| card).collect())
    }
}

/// The ModelDeploymentCard is published in etcd with a key like "v1/mdc/dynamo/backend/generate/694d9981145a61ad".
/// Extract the EndpointId and instance_id from that.
fn etcd_key_extract(s: &str) -> anyhow::Result<(EndpointId, String)> {
629
630
631
    if !s.starts_with(model_card::ROOT_PATH) {
        anyhow::bail!("Invalid format: expected model card ROOT_PATH segment in {s}");
    }
632
633
    let parts: Vec<&str> = s.split('/').collect();

634
635
    // Need at least prefix model_card::ROOT_PATH (2 parts) + namespace, component, name (3 parts)
    if parts.len() <= 5 {
636
637
638
639
        anyhow::bail!("Invalid format: not enough path segments in {s}");
    }

    let endpoint_id = EndpointId {
640
641
642
        namespace: parts[2].to_string(),
        component: parts[3].to_string(),
        name: parts[4].to_string(),
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
    };
    Ok((endpoint_id, parts[parts.len() - 1].to_string()))
}

#[cfg(test)]
mod tests {
    use super::*;

    #[test]
    fn test_etcd_key_extract() {
        let input = format!(
            "{}/dynamo/backend/generate/694d9981145a61ad",
            model_card::ROOT_PATH
        );
        let (endpoint_id, _) = etcd_key_extract(&input).unwrap();
        assert_eq!(endpoint_id.namespace, "dynamo");
        assert_eq!(endpoint_id.component, "backend");
        assert_eq!(endpoint_id.name, "generate");
661
    }
Ryan Olson's avatar
Ryan Olson committed
662
}