model_manager.rs 24.3 KB
Newer Older
1
// SPDX-FileCopyrightText: Copyright (c) 2024-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
2
3
// SPDX-License-Identifier: Apache-2.0

4
5
use std::{
    collections::{HashMap, HashSet},
6
    sync::Arc,
7
8
};

9
use dashmap::{DashMap, mapref::entry::Entry};
10
use parking_lot::RwLock;
11
use tokio::sync::oneshot;
12

13
use super::worker_monitor::LoadThresholdConfig;
14
use super::{KvWorkerMonitor, RuntimeConfigWatch, runtime_config_watch};
15

16
use dynamo_runtime::{
17
    component::{Client, Endpoint, build_transport_type},
18
    discovery::DiscoverySpec,
19
20
21
    prelude::DistributedRuntimeProvider,
    protocols::EndpointId,
};
22
23

use crate::{
24
25
26
27
    kv_router::{
        KvRouter, KvRouterConfig, protocols::WorkerId, router_endpoint_id,
        scheduler::DefaultWorkerSelector,
    },
28
    local_model::runtime_config::DisaggregatedEndpoint,
29
    model_card::ModelDeploymentCard,
30
    model_type::ModelType,
31
32
33
34
35
    types::{
        generic::tensor::TensorStreamingEngine,
        openai::{
            chat_completions::OpenAIChatCompletionsStreamingEngine,
            completions::OpenAICompletionsStreamingEngine,
36
            embeddings::OpenAIEmbeddingsStreamingEngine, images::OpenAIImagesStreamingEngine,
37
38
        },
    },
39
};
40

41
42
43
44
45
46
47
48
/// State for prefill router activation rendezvous
enum PrefillActivationState {
    /// Decode model registered, waiting for prefill endpoint
    DecodeWaiting(oneshot::Sender<Endpoint>),
    /// Prefill endpoint arrived, waiting for decode model to register
    PrefillReady(oneshot::Receiver<Endpoint>),
}

49
50
51
52
53
54
55
56
57
#[derive(Debug, thiserror::Error)]
pub enum ModelManagerError {
    #[error("Model not found: {0}")]
    ModelNotFound(String),

    #[error("Model already exists: {0}")]
    ModelAlreadyExists(String),
}

58
59
60
61
62
63
/// Central manager for model engines, routing, and configuration.
///
/// Manages model lifecycle including engines, KV routers, prefill coordination,
/// and per-model busy thresholds for load-based request rejection.
///
/// Note: Don't implement Clone for this, put it in an Arc instead.
64
65
66
67
68
pub struct ModelManager {
    // We read a lot and write rarely, so these three are RwLock
    completion_engines: RwLock<ModelEngines<OpenAICompletionsStreamingEngine>>,
    chat_completion_engines: RwLock<ModelEngines<OpenAIChatCompletionsStreamingEngine>>,
    embeddings_engines: RwLock<ModelEngines<OpenAIEmbeddingsStreamingEngine>>,
69
    images_engines: RwLock<ModelEngines<OpenAIImagesStreamingEngine>>,
70
    tensor_engines: RwLock<ModelEngines<TensorStreamingEngine>>,
71
72
    // Prefill models don't have engines - they're only tracked for discovery/lifecycle
    prefill_engines: RwLock<ModelEngines<()>>,
73

74
75
76
    cards: DashMap<String, ModelDeploymentCard>,
    kv_choosers: DashMap<EndpointId, Arc<KvRouter>>,
    prefill_router_activators: DashMap<String, PrefillActivationState>,
77

78
79
    // Per-model monitoring: worker_monitors for load-based rejection, runtime_configs for KvScheduler
    worker_monitors: DashMap<String, KvWorkerMonitor>,
80
    runtime_configs: DashMap<EndpointId, RuntimeConfigWatch>,
81
82
83
84
85
86
87
88
89
90
91
92
93
94
}

impl Default for ModelManager {
    fn default() -> Self {
        Self::new()
    }
}

impl ModelManager {
    pub fn new() -> Self {
        Self {
            completion_engines: RwLock::new(ModelEngines::default()),
            chat_completion_engines: RwLock::new(ModelEngines::default()),
            embeddings_engines: RwLock::new(ModelEngines::default()),
95
            images_engines: RwLock::new(ModelEngines::default()),
96
            tensor_engines: RwLock::new(ModelEngines::default()),
97
            prefill_engines: RwLock::new(ModelEngines::default()),
98
99
100
            cards: DashMap::new(),
            kv_choosers: DashMap::new(),
            prefill_router_activators: DashMap::new(),
101
            worker_monitors: DashMap::new(),
102
            runtime_configs: DashMap::new(),
103
104
105
        }
    }

106
107
108
109
110
111
112
113
114
115
116
117
118
    pub fn is_valid_checksum(
        &self,
        model_type: ModelType,
        model_name: &str,
        candidate_checksum: &str,
    ) -> Option<bool> {
        let mut results = vec![];
        for unit in model_type.units() {
            let maybe_valid_checksum = match unit {
                ModelType::Chat => self.chat_completion_engines.read().checksum(model_name),
                ModelType::Completions => self.completion_engines.read().checksum(model_name),
                ModelType::Embedding => self.embeddings_engines.read().checksum(model_name),
                ModelType::TensorBased => self.tensor_engines.read().checksum(model_name),
119
                ModelType::Images => self.images_engines.read().checksum(model_name),
120
                ModelType::Prefill => self.prefill_engines.read().checksum(model_name),
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
                _ => {
                    continue;
                }
            };
            if let Some(is_valid) = maybe_valid_checksum.map(|valid_checksum| {
                tracing::debug!(
                    model_name,
                    valid_checksum,
                    candidate_checksum,
                    "is_valid_checksum: check case"
                );
                valid_checksum == candidate_checksum
            }) {
                results.push(is_valid)
            }
        }
        if results.is_empty() {
            None
        } else {
            // The checksum is valid if it is correct for all the ModelType in the bitflag.
            Some(results.into_iter().all(|x| x))
        }
    }

145
    pub fn get_model_cards(&self) -> Vec<ModelDeploymentCard> {
146
        self.cards.iter().map(|r| r.value().clone()).collect()
147
148
    }

149
150
    /// Check if a decode model (chat or completions) is registered
    pub fn has_decode_model(&self, model: &str) -> bool {
151
152
        self.chat_completion_engines.read().contains(model)
            || self.completion_engines.read().contains(model)
153
154
155
156
157
158
159
160
161
162
163
    }

    /// Check if a prefill model is registered
    pub fn has_prefill_model(&self, model: &str) -> bool {
        self.prefill_engines.read().contains(model)
    }

    /// Check if any model (decode or prefill) is registered.
    /// Note: For registration skip-checks, use has_decode_model() or has_prefill_model() instead.
    pub fn has_model_any(&self, model: &str) -> bool {
        self.has_decode_model(model) || self.has_prefill_model(model)
164
165
    }

166
167
168
169
170
    pub fn model_display_names(&self) -> HashSet<String> {
        self.list_chat_completions_models()
            .into_iter()
            .chain(self.list_completions_models())
            .chain(self.list_embeddings_models())
171
            .chain(self.list_tensor_models())
172
            .chain(self.list_images_models())
173
            .chain(self.list_prefill_models())
174
175
176
            .collect()
    }

177
    pub fn list_chat_completions_models(&self) -> Vec<String> {
178
        self.chat_completion_engines.read().list()
179
180
181
    }

    pub fn list_completions_models(&self) -> Vec<String> {
182
        self.completion_engines.read().list()
183
184
185
    }

    pub fn list_embeddings_models(&self) -> Vec<String> {
186
        self.embeddings_engines.read().list()
187
188
    }

189
190
191
192
    pub fn list_tensor_models(&self) -> Vec<String> {
        self.tensor_engines.read().list()
    }

193
194
195
196
    pub fn list_prefill_models(&self) -> Vec<String> {
        self.prefill_engines.read().list()
    }

197
198
199
200
    pub fn list_images_models(&self) -> Vec<String> {
        self.images_engines.read().list()
    }

201
202
203
    pub fn add_completions_model(
        &self,
        model: &str,
204
        card_checksum: &str,
205
206
        engine: OpenAICompletionsStreamingEngine,
    ) -> Result<(), ModelManagerError> {
207
        let mut clients = self.completion_engines.write();
208
        clients.add(model, card_checksum, engine)
209
210
211
212
213
    }

    pub fn add_chat_completions_model(
        &self,
        model: &str,
214
        card_checksum: &str,
215
216
        engine: OpenAIChatCompletionsStreamingEngine,
    ) -> Result<(), ModelManagerError> {
217
        let mut clients = self.chat_completion_engines.write();
218
        clients.add(model, card_checksum, engine)
219
220
221
222
223
    }

    pub fn add_embeddings_model(
        &self,
        model: &str,
224
        card_checksum: &str,
225
226
        engine: OpenAIEmbeddingsStreamingEngine,
    ) -> Result<(), ModelManagerError> {
227
        let mut clients = self.embeddings_engines.write();
228
        clients.add(model, card_checksum, engine)
229
230
    }

231
232
233
    pub fn add_tensor_model(
        &self,
        model: &str,
234
        card_checksum: &str,
235
236
237
        engine: TensorStreamingEngine,
    ) -> Result<(), ModelManagerError> {
        let mut clients = self.tensor_engines.write();
238
        clients.add(model, card_checksum, engine)
239
240
    }

241
242
243
244
245
246
247
248
249
250
    pub fn add_images_model(
        &self,
        model: &str,
        card_checksum: &str,
        engine: OpenAIImagesStreamingEngine,
    ) -> Result<(), ModelManagerError> {
        let mut clients = self.images_engines.write();
        clients.add(model, card_checksum, engine)
    }

251
252
253
254
255
256
    pub fn add_prefill_model(
        &self,
        model: &str,
        card_checksum: &str,
    ) -> Result<(), ModelManagerError> {
        let mut clients = self.prefill_engines.write();
257
        clients.add(model, card_checksum, ())
258
259
    }

260
    pub fn remove_completions_model(&self, model: &str) -> Result<(), ModelManagerError> {
261
        let mut clients = self.completion_engines.write();
262
263
264
265
        clients.remove(model)
    }

    pub fn remove_chat_completions_model(&self, model: &str) -> Result<(), ModelManagerError> {
266
        let mut clients = self.chat_completion_engines.write();
267
268
269
270
        clients.remove(model)
    }

    pub fn remove_embeddings_model(&self, model: &str) -> Result<(), ModelManagerError> {
271
        let mut clients = self.embeddings_engines.write();
272
273
274
        clients.remove(model)
    }

275
276
277
278
279
    pub fn remove_tensor_model(&self, model: &str) -> Result<(), ModelManagerError> {
        let mut clients = self.tensor_engines.write();
        clients.remove(model)
    }

280
281
282
283
284
    pub fn remove_images_model(&self, model: &str) -> Result<(), ModelManagerError> {
        let mut clients = self.images_engines.write();
        clients.remove(model)
    }

285
286
287
288
289
    pub fn remove_prefill_model(&self, model: &str) -> Result<(), ModelManagerError> {
        let mut clients = self.prefill_engines.write();
        clients.remove(model)
    }

290
    pub fn get_embeddings_engine(
291
292
293
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
        &self,
        model: &str,
    ) -> Result<OpenAIEmbeddingsStreamingEngine, ModelManagerError> {
        self.embeddings_engines
            .read()
            .get(model)
            .cloned()
            .ok_or(ModelManagerError::ModelNotFound(model.to_string()))
    }

    pub fn get_completions_engine(
        &self,
        model: &str,
    ) -> Result<OpenAICompletionsStreamingEngine, ModelManagerError> {
        self.completion_engines
            .read()
            .get(model)
            .cloned()
            .ok_or(ModelManagerError::ModelNotFound(model.to_string()))
    }

    pub fn get_chat_completions_engine(
        &self,
        model: &str,
    ) -> Result<OpenAIChatCompletionsStreamingEngine, ModelManagerError> {
        self.chat_completion_engines
            .read()
            .get(model)
            .cloned()
            .ok_or(ModelManagerError::ModelNotFound(model.to_string()))
    }

323
324
325
326
327
328
329
330
331
332
333
    pub fn get_tensor_engine(
        &self,
        model: &str,
    ) -> Result<TensorStreamingEngine, ModelManagerError> {
        self.tensor_engines
            .read()
            .get(model)
            .cloned()
            .ok_or(ModelManagerError::ModelNotFound(model.to_string()))
    }

334
335
336
337
338
339
340
341
342
343
344
    pub fn get_images_engine(
        &self,
        model: &str,
    ) -> Result<OpenAIImagesStreamingEngine, ModelManagerError> {
        self.images_engines
            .read()
            .get(model)
            .cloned()
            .ok_or(ModelManagerError::ModelNotFound(model.to_string()))
    }

345
    /// Save a ModelDeploymentCard from an instance's key so we can fetch it later when the key is
346
347
    /// deleted.
    pub fn save_model_card(&self, key: &str, card: ModelDeploymentCard) -> anyhow::Result<()> {
348
        self.cards.insert(key.to_string(), card);
349
        Ok(())
350
351
    }

352
    /// Remove and return model card for this instance's key. We do this when the instance stops.
353
    pub fn remove_model_card(&self, key: &str) -> Option<ModelDeploymentCard> {
354
        self.cards.remove(key).map(|(_, v)| v)
355
356
357
358
    }

    pub async fn kv_chooser_for(
        &self,
359
        endpoint: &Endpoint,
360
        kv_cache_block_size: u32,
361
        kv_router_config: Option<KvRouterConfig>,
362
        worker_type: &'static str,
363
    ) -> anyhow::Result<Arc<KvRouter>> {
364
        let endpoint_id = endpoint.id();
365

366
        if let Some(kv_chooser) = self.get_kv_chooser(&endpoint_id) {
367
368
369
            // Check if the existing router has a different block size
            if kv_chooser.block_size() != kv_cache_block_size {
                tracing::warn!(
370
                    endpoint = %endpoint_id,
371
372
                    existing_block_size = %kv_chooser.block_size(),
                    requested_block_size = %kv_cache_block_size,
373
                    "KV Router block size mismatch! Endpoint is requesting a different kv_cache_block_size than the existing router. \
374
375
376
                     This will cause routing to fail silently. Consider using the same block size or restarting the router."
                );
            }
377
378
379
            return Ok(kv_chooser);
        }

380
        let client = endpoint.client().await?;
381
382
383
384
385

        // Register router via discovery mechanism
        let discovery = endpoint.component().drt().discovery();
        let instance_id = discovery.instance_id();

386
        // Build transport for router endpoint based on request plane mode
387
388
        // Use KV_ROUTER_COMPONENT as the component name to distinguish from the generate endpoint's component
        let router_endpoint_id = router_endpoint_id(endpoint.id().namespace);
389
        let transport = build_transport_type(endpoint, &router_endpoint_id, instance_id).await?;
390
391
392
393
394

        let discovery_spec = DiscoverySpec::Endpoint {
            namespace: router_endpoint_id.namespace.clone(),
            component: router_endpoint_id.component.clone(),
            endpoint: router_endpoint_id.name.clone(),
395
            transport,
396
397
398
399
        };

        discovery.register(discovery_spec).await?;

400
401
402
        // Get or create runtime config watcher for this endpoint
        let workers_with_configs = self.get_or_create_runtime_config_watcher(endpoint).await?;

403
        let selector = Box::new(DefaultWorkerSelector::new(kv_router_config));
404
        let chooser = KvRouter::new(
405
406
            endpoint.clone(),
            client,
407
            workers_with_configs,
408
409
            kv_cache_block_size,
            Some(selector),
410
            kv_router_config,
411
            instance_id,
412
            worker_type,
413
414
        )
        .await?;
415
        let new_kv_chooser = Arc::new(chooser);
416
        self.kv_choosers.insert(endpoint_id, new_kv_chooser.clone());
417
418
        Ok(new_kv_chooser)
    }
419

420
    fn get_kv_chooser(&self, id: &EndpointId) -> Option<Arc<KvRouter>> {
421
        self.kv_choosers.get(id).map(|r| r.value().clone())
422
423
424
425
426
427
428
429
430
    }

    /// Register a prefill router for a decode model. Returns a receiver that will be
    /// activated when the corresponding prefill model is discovered.
    /// Returns None if the decode model was already registered.
    pub fn register_prefill_router(
        &self,
        model_name: String,
    ) -> Option<oneshot::Receiver<Endpoint>> {
431
432
        match self.prefill_router_activators.remove(&model_name) {
            Some((_, PrefillActivationState::PrefillReady(rx))) => {
433
434
435
436
437
438
439
                // Prefill endpoint already arrived - rx will immediately resolve
                tracing::debug!(
                    model_name = %model_name,
                    "Prefill endpoint already available, returning receiver with endpoint"
                );
                Some(rx)
            }
440
            Some((key, PrefillActivationState::DecodeWaiting(tx))) => {
441
442
443
444
445
                // Decode already registered - this shouldn't happen, restore state and return None
                tracing::error!(
                    model_name = %model_name,
                    "Decode model already registered for this prefill router"
                );
446
447
                self.prefill_router_activators
                    .insert(key, PrefillActivationState::DecodeWaiting(tx));
448
449
450
451
452
                None
            }
            None => {
                // New registration: create tx/rx pair, store sender and return receiver
                let (tx, rx) = oneshot::channel();
453
                self.prefill_router_activators.insert(
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
                    model_name.clone(),
                    PrefillActivationState::DecodeWaiting(tx),
                );
                tracing::debug!(
                    model_name = %model_name,
                    "No prefill endpoint available yet, storing sender for future activation"
                );
                Some(rx)
            }
        }
    }

    /// Activate a prefill router by sending the endpoint through the oneshot channel.
    /// If no decode model has registered yet, stores the endpoint for future retrieval.
    pub fn activate_prefill_router(
        &self,
        model_name: &str,
        endpoint: Endpoint,
    ) -> anyhow::Result<()> {
473
474
        match self.prefill_router_activators.remove(model_name) {
            Some((_, PrefillActivationState::DecodeWaiting(sender))) => {
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
                // Decode model already registered
                sender.send(endpoint).map_err(|_| {
                    anyhow::anyhow!(
                        "Failed to send endpoint to prefill router activator for model: {}",
                        model_name
                    )
                })?;

                tracing::info!(
                    model_name = %model_name,
                    "Activated prefill router for already-registered decode model"
                );

                Ok(())
            }
490
            Some((_, PrefillActivationState::PrefillReady(_))) => {
491
492
493
494
495
496
497
498
499
500
501
502
                // Prefill already activated - this shouldn't happen
                anyhow::bail!("Prefill router for model {} already activated", model_name);
            }
            None => {
                // Decode model not registered yet - create pair and immediately send endpoint
                let (tx, rx) = oneshot::channel();

                tx.send(endpoint).map_err(|_| {
                    anyhow::anyhow!("Failed to send endpoint for prefill model: {}", model_name)
                })?;

                // Store the receiver for when decode model registers
503
                self.prefill_router_activators.insert(
504
505
506
507
508
509
510
511
512
513
514
515
                    model_name.to_string(),
                    PrefillActivationState::PrefillReady(rx),
                );

                tracing::info!(
                    model_name = %model_name,
                    "Stored prefill endpoint for future decode model registration"
                );

                Ok(())
            }
        }
516
517
    }

518
    pub fn get_model_tool_call_parser(&self, model: &str) -> Option<String> {
519
        self.cards
520
521
522
            .iter()
            .find(|r| r.value().display_name == model)
            .and_then(|r| r.value().runtime_config.tool_call_parser.clone())
523
    }
524
525
526
527
528
529
530
531
532

    /// Creates parsing options with tool call parser and reasoning parser for the specified model.
    /// Currently reasoning parser is not implemented (returns None).
    pub fn get_parsing_options(&self, model: &str) -> crate::protocols::openai::ParsingOptions {
        let tool_call_parser = self.get_model_tool_call_parser(model);
        let reasoning_parser = None; // TODO: Implement reasoning parser

        crate::protocols::openai::ParsingOptions::new(tool_call_parser, reasoning_parser)
    }
533

534
535
536
    /// Gets or sets the load threshold config for a model's worker monitor.
    /// Pass `Some(config)` to update, `None` to get. Returns `None` if no monitor exists.
    pub fn load_threshold_config(
537
538
        &self,
        model: &str,
539
540
541
542
543
        config: Option<&LoadThresholdConfig>,
    ) -> Option<LoadThresholdConfig> {
        let monitor = self.worker_monitors.get(model)?;
        if let Some(cfg) = config {
            monitor.set_load_threshold_config(cfg);
544
        }
545
        Some(monitor.load_threshold_config())
546
547
    }

548
549
550
551
552
    /// Gets an existing worker monitor for a model, if one exists.
    pub fn get_worker_monitor(&self, model: &str) -> Option<KvWorkerMonitor> {
        self.worker_monitors.get(model).map(|m| m.clone())
    }

553
    /// Gets or creates a worker monitor for a model. Updates thresholds if monitor exists.
554
555
556
    pub fn get_or_create_worker_monitor(
        &self,
        model: &str,
557
        client: Client,
558
        config: LoadThresholdConfig,
559
    ) -> KvWorkerMonitor {
560
561
562
        if let Some(existing) = self.worker_monitors.get(model) {
            existing.set_load_threshold_config(&config);
            return existing.clone();
563
        }
564
565
566
567
        let monitor = KvWorkerMonitor::new(client, config);
        self.worker_monitors
            .insert(model.to_string(), monitor.clone());
        monitor
568
569
    }

570
    /// Get or create a runtime config watcher for an endpoint.
571
572
    /// Spawns a background task that joins instance availability and config discovery.
    /// Returns a `watch::Receiver` with the latest `HashMap<WorkerId, ModelRuntimeConfig>`.
573
574
575
    pub async fn get_or_create_runtime_config_watcher(
        &self,
        endpoint: &Endpoint,
576
    ) -> anyhow::Result<RuntimeConfigWatch> {
577
578
579
580
581
582
583
        let endpoint_id = endpoint.id();

        // Fast path: return existing if present
        if let Some(existing) = self.runtime_configs.get(&endpoint_id) {
            return Ok(existing.clone());
        }

584
585
586
587
588
589
        // Slow path: create the watch (spawns a background task).
        // If another caller raced us, the entry() below picks up the winner;
        // the loser's background task stops once its receivers are dropped.
        let rx = runtime_config_watch(endpoint).await?;
        let result = match self.runtime_configs.entry(endpoint_id) {
            Entry::Occupied(e) => e.get().clone(),
590
            Entry::Vacant(e) => {
591
592
                e.insert(rx.clone());
                rx
593
594
595
            }
        };

596
        Ok(result)
597
598
599
600
601
602
603
604
605
    }

    /// Get disaggregated endpoint for a specific worker.
    /// Used by PrefillRouter for bootstrap info - works for ANY routing mode.
    pub fn get_disaggregated_endpoint(
        &self,
        endpoint_id: &EndpointId,
        worker_id: WorkerId,
    ) -> Option<DisaggregatedEndpoint> {
606
607
608
        let rx = self.runtime_configs.get(endpoint_id)?;
        let configs = rx.borrow();
        configs.get(&worker_id)?.disaggregated_endpoint.clone()
609
610
    }

611
612
    /// Lists all models with worker monitors configured.
    pub fn list_busy_thresholds(&self) -> Vec<(String, LoadThresholdConfig)> {
613
614
        self.worker_monitors
            .iter()
615
            .map(|entry| (entry.key().clone(), entry.value().load_threshold_config()))
616
617
            .collect()
    }
618
619
620
621
622
623
}

pub struct ModelEngines<E> {
    /// Optional default model name
    default: Option<String>,
    engines: HashMap<String, E>,
624
625
626
    /// Key: Model name, value: Checksum of the ModelDeploymentCard. New instances must have the
    /// same card.
    checksums: HashMap<String, String>,
627
628
629
630
631
632
633
}

impl<E> Default for ModelEngines<E> {
    fn default() -> Self {
        Self {
            default: None,
            engines: HashMap::new(),
634
            checksums: HashMap::new(),
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
        }
    }
}

impl<E> ModelEngines<E> {
    #[allow(dead_code)]
    fn set_default(&mut self, model: &str) {
        self.default = Some(model.to_string());
    }

    #[allow(dead_code)]
    fn clear_default(&mut self) {
        self.default = None;
    }

650
    fn add(&mut self, model: &str, checksum: &str, engine: E) -> Result<(), ModelManagerError> {
651
652
653
654
        if self.engines.contains_key(model) {
            return Err(ModelManagerError::ModelAlreadyExists(model.to_string()));
        }
        self.engines.insert(model.to_string(), engine);
655
656
        self.checksums
            .insert(model.to_string(), checksum.to_string());
657
658
659
660
661
662
663
        Ok(())
    }

    fn remove(&mut self, model: &str) -> Result<(), ModelManagerError> {
        if self.engines.remove(model).is_none() {
            return Err(ModelManagerError::ModelNotFound(model.to_string()));
        }
664
        let _ = self.checksums.remove(model);
665
666
667
668
669
670
671
672
673
674
675
676
677
678
        Ok(())
    }

    fn get(&self, model: &str) -> Option<&E> {
        self.engines.get(model)
    }

    fn contains(&self, model: &str) -> bool {
        self.engines.contains_key(model)
    }

    pub fn list(&self) -> Vec<String> {
        self.engines.keys().map(|k| k.to_owned()).collect()
    }
679
680
681
682
683
684

    /// Returns a newly allocated String for called convenience. All the places I use
    /// this I need a String.
    pub fn checksum(&self, model: &str) -> Option<String> {
        self.checksums.get(model).map(|s| s.to_string())
    }
685
}