modelexpress-server 0.4.0

High-performance gRPC server for model serving and management
Documentation
1
2
3
4
5
6
7
8
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
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
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
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
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
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
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
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
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
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
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

//! Redis backend for the model registry.
//!
//! One Redis Hash per cached model at `mx:model:{provider}:{model_name}`, fields
//! `provider`, `status`, `created_at`, `last_used_at`, optional `message`. The provider is
//! in the key so the same name under different providers stays distinct (a `gs://` GCS
//! object can't satisfy a HuggingFace claim). LRU/status tallies use `SCAN` + pipelined
//! reads.
//!
//! Pre-0.5.0 records live at the legacy name-only key `mx:model:{model_name}`; they are
//! migrated lazily on claim (see [`CLAIM_LUA`]) and read transparently meanwhile.
//!
//! Mutations run as single atomic EVALs. Multi-key EVALs (e.g. the claim's RENAME) assume
//! a single Redis instance (`ConnectionManager`, not a cluster) so all keys share a slot.

use super::{ClaimOutcome, ModelRecord, RegistryBackend, RegistryResult};
use async_trait::async_trait;
use chrono::{DateTime, Utc};
use modelexpress_common::models::{ModelProvider, ModelStatus};
use redis::AsyncCommands;
use redis::aio::ConnectionManager;
use std::sync::Arc;
use tokio::sync::RwLock;
use tracing::info;

const KEY_PREFIX: &str = "mx:model:";
const SCAN_PATTERN: &str = "mx:model:*";
const SCAN_BATCH: usize = 500;

/// Field names in the per-model hash.
mod fields {
    pub const STATUS: &str = "status";
    pub const PROVIDER: &str = "provider";
    pub const CREATED_AT: &str = "created_at";
    pub const LAST_USED_AT: &str = "last_used_at";
    pub const MESSAGE: &str = "message";
}

/// Every provider, for enumerating candidate keys in name-addressed lookups.
const ALL_PROVIDERS: [ModelProvider; 3] = [
    ModelProvider::HuggingFace,
    ModelProvider::Ngc,
    ModelProvider::Gcs,
];

/// Provider-scoped key: `mx:model:{Provider}:{model_name}`.
fn model_key(provider: ModelProvider, model_name: &str) -> String {
    format!("{KEY_PREFIX}{}:{model_name}", provider_str(provider))
}

/// Legacy name-only key, pre-provider-scoped keys.
/// TODO(0.5.0 migration): remove once no deployment has pre-0.5.0 keys; see [`CLAIM_LUA`].
fn legacy_model_key(model_name: &str) -> String {
    format!("{KEY_PREFIX}{model_name}")
}

/// Keys a record for `model_name` may live under when the provider isn't known up front
/// (status/eviction/deletion): one per provider plus the legacy key. Fixed fan-out, no SCAN.
fn candidate_keys(model_name: &str) -> Vec<String> {
    let mut keys: Vec<String> = ALL_PROVIDERS
        .iter()
        .map(|p| model_key(*p, model_name))
        .collect();
    keys.push(legacy_model_key(model_name));
    keys
}

fn provider_str(p: ModelProvider) -> &'static str {
    match p {
        ModelProvider::HuggingFace => "HuggingFace",
        ModelProvider::Ngc => "Ngc",
        ModelProvider::Gcs => "Gcs",
    }
}

fn provider_from_str(s: &str) -> RegistryResult<ModelProvider> {
    match s {
        "HuggingFace" => Ok(ModelProvider::HuggingFace),
        "Ngc" => Ok(ModelProvider::Ngc),
        "Gcs" => Ok(ModelProvider::Gcs),
        other => Err(format!("unknown provider in Redis record: {other:?}").into()),
    }
}

fn status_str(s: ModelStatus) -> &'static str {
    match s {
        ModelStatus::DOWNLOADING => "DOWNLOADING",
        ModelStatus::DOWNLOADED => "DOWNLOADED",
        ModelStatus::ERROR => "ERROR",
    }
}

fn status_from_str(s: &str) -> RegistryResult<ModelStatus> {
    match s {
        "DOWNLOADING" => Ok(ModelStatus::DOWNLOADING),
        "DOWNLOADED" => Ok(ModelStatus::DOWNLOADED),
        "ERROR" => Ok(ModelStatus::ERROR),
        other => Err(format!("unknown status in Redis record: {other:?}").into()),
    }
}

fn parse_rfc3339(s: &str, field: &str) -> RegistryResult<DateTime<Utc>> {
    DateTime::parse_from_rfc3339(s)
        .map(|dt| dt.with_timezone(&Utc))
        .map_err(|e| format!("invalid RFC3339 in field '{field}' ({s:?}): {e}").into())
}

/// Redaction helper for logging: strip userinfo (password, and user if present) from a
/// redis:// URL so secrets don't leak into logs.
fn redact_url(url: &str) -> String {
    let Some(scheme_end) = url.find("://") else {
        return url.to_string();
    };
    let head_end = scheme_end.saturating_add(3);
    let (head, rest) = url.split_at(head_end); // head = "redis://"
    let Some(at_pos) = rest.find('@') else {
        return url.to_string(); // no userinfo
    };
    let (userinfo, tail) = rest.split_at(at_pos); // tail starts with '@'
    match userinfo.split_once(':') {
        Some((user, _pw)) => format!("{head}{user}:***{tail}"),
        None => format!("{head}***{tail}"), // user only, no password
    }
}

pub struct RedisRegistryBackend {
    redis: Arc<RwLock<Option<ConnectionManager>>>,
    redis_url: String,
}

impl RedisRegistryBackend {
    pub fn new(redis_url: &str) -> Self {
        Self {
            redis: Arc::new(RwLock::new(None)),
            redis_url: redis_url.to_string(),
        }
    }

    async fn get_conn(&self) -> RegistryResult<ConnectionManager> {
        {
            let guard = self.redis.read().await;
            if let Some(conn) = guard.as_ref() {
                return Ok(conn.clone());
            }
        }
        let mut guard = self.redis.write().await;
        if let Some(conn) = guard.as_ref() {
            return Ok(conn.clone());
        }
        let client = redis::Client::open(self.redis_url.as_str())?;
        let conn = ConnectionManager::new(client).await?;
        *guard = Some(conn.clone());
        Ok(conn)
    }

    /// Collect every `mx:model:*` key with a paged SCAN, deduplicating as we go.
    ///
    /// Redis `SCAN` can legitimately return the same key twice across cursor pages (for
    /// example when the hash table is resized mid-iteration), so callers that use the
    /// result length as a count would double-count. The dedup set keeps this honest.
    async fn scan_all_keys(&self, conn: &mut ConnectionManager) -> RegistryResult<Vec<String>> {
        use std::collections::HashSet;
        let mut cursor: u64 = 0;
        let mut keys: Vec<String> = Vec::new();
        let mut seen: HashSet<String> = HashSet::new();
        loop {
            let (next, batch): (u64, Vec<String>) = redis::cmd("SCAN")
                .arg(cursor)
                .arg("MATCH")
                .arg(SCAN_PATTERN)
                .arg("COUNT")
                .arg(SCAN_BATCH)
                .query_async(conn)
                .await?;
            for k in batch {
                if seen.insert(k.clone()) {
                    keys.push(k);
                }
            }
            if next == 0 {
                break;
            }
            cursor = next;
        }
        Ok(keys)
    }

    /// Model name from a scanned key, for both `mx:model:{Provider}:{name}` and legacy
    /// `mx:model:{name}`. A leading known-provider token + `:` is the prefix; else the
    /// whole remainder is the name. Real names never collide (GCS is `gs://`, HF/NGC
    /// `org/...`), and the provider is read from the hash field regardless.
    fn model_name_from_key(key: &str) -> Option<&str> {
        let rest = key.strip_prefix(KEY_PREFIX)?;
        for p in ALL_PROVIDERS {
            if let Some(name) = rest
                .strip_prefix(provider_str(p))
                .and_then(|r| r.strip_prefix(':'))
            {
                return Some(name);
            }
        }
        Some(rest)
    }

    fn record_from_hash(
        model_name: &str,
        pairs: Vec<(String, String)>,
    ) -> RegistryResult<ModelRecord> {
        let mut map: std::collections::HashMap<String, String> = pairs.into_iter().collect();
        let take = |map: &mut std::collections::HashMap<String, String>, key: &str| {
            map.remove(key)
                .ok_or_else(|| format!("missing field '{key}' for {model_name}"))
        };
        Ok(ModelRecord {
            model_name: model_name.to_string(),
            provider: provider_from_str(&take(&mut map, fields::PROVIDER)?)?,
            status: status_from_str(&take(&mut map, fields::STATUS)?)?,
            created_at: parse_rfc3339(&take(&mut map, fields::CREATED_AT)?, fields::CREATED_AT)?,
            last_used_at: parse_rfc3339(
                &take(&mut map, fields::LAST_USED_AT)?,
                fields::LAST_USED_AT,
            )?,
            message: map.remove(fields::MESSAGE),
        })
    }
}

#[async_trait]
impl RegistryBackend for RedisRegistryBackend {
    async fn connect(&self) -> RegistryResult<()> {
        let client = redis::Client::open(self.redis_url.as_str())?;
        let conn = ConnectionManager::new(client).await?;
        let mut guard = self.redis.write().await;
        *guard = Some(conn);
        info!(
            "Registry: connected to Redis at {}",
            redact_url(&self.redis_url)
        );
        Ok(())
    }

    async fn get_status(&self, model_name: &str) -> RegistryResult<Option<ModelStatus>> {
        let mut conn = self.get_conn().await?;
        // Provider-agnostic: the caller may not know the provider, so HGET every candidate
        // key in one round-trip and take the first that exists (a name maps to one provider).
        let mut pipe = redis::pipe();
        for k in candidate_keys(model_name) {
            pipe.hget(k, fields::STATUS);
        }
        let values: Vec<Option<String>> = pipe.query_async(&mut conn).await?;
        match values.into_iter().flatten().next() {
            Some(s) => Ok(Some(status_from_str(&s)?)),
            None => Ok(None),
        }
    }

    async fn get_model_record(&self, model_name: &str) -> RegistryResult<Option<ModelRecord>> {
        let mut conn = self.get_conn().await?;
        // Provider-agnostic: how eviction discovers the provider from a bare name. First
        // non-empty hash wins; its `provider` field is authoritative.
        let mut pipe = redis::pipe();
        for k in candidate_keys(model_name) {
            pipe.hgetall(k);
        }
        let hashes: Vec<Vec<(String, String)>> = pipe.query_async(&mut conn).await?;
        for pairs in hashes {
            if !pairs.is_empty() {
                return Ok(Some(Self::record_from_hash(model_name, pairs)?));
            }
        }
        Ok(None)
    }

    async fn set_status(
        &self,
        model_name: &str,
        provider: ModelProvider,
        status: ModelStatus,
        message: Option<String>,
    ) -> RegistryResult<()> {
        let mut conn = self.get_conn().await?;
        let now = Utc::now().to_rfc3339();
        let key = model_key(provider, model_name);
        // A single EVAL so the status/provider/last_used_at/message/created_at updates
        // are atomic: concurrent get_model_record calls see either the pre- or post-
        // update record, never a half-written one (HGETALL never interleaves with the
        // script since Redis is single-threaded for scripts).
        let (msg_flag, msg_value) = match &message {
            Some(m) => ("1", m.as_str()),
            None => ("0", ""),
        };
        let _: () = redis::Script::new(SET_STATUS_LUA)
            .key(&key)
            .arg(status_str(status))
            .arg(provider_str(provider))
            .arg(&now)
            .arg(&now)
            .arg(msg_flag)
            .arg(msg_value)
            .invoke_async(&mut conn)
            .await?;
        Ok(())
    }

    async fn touch_model(&self, model_name: &str) -> RegistryResult<()> {
        let mut conn = self.get_conn().await?;
        let now = Utc::now().to_rfc3339();
        // Provider-agnostic: bump last_used_at on whichever candidate key exists. The EVAL
        // gates each HSET on EXISTS so touch never creates a (last_used_at-only) record.
        let keys = candidate_keys(model_name);
        let script = redis::Script::new(TOUCH_LUA);
        let mut invocation = script.prepare_invoke();
        for k in &keys {
            invocation.key(k);
        }
        let _: i32 = invocation.arg(&now).invoke_async(&mut conn).await?;
        Ok(())
    }

    async fn delete_model(&self, model_name: &str) -> RegistryResult<()> {
        let mut conn = self.get_conn().await?;
        // Delete every variant (all providers + legacy); DEL ignores absent keys.
        let _: () = conn.del(candidate_keys(model_name)).await?;
        Ok(())
    }

    async fn get_models_by_last_used(
        &self,
        limit: Option<u32>,
    ) -> RegistryResult<Vec<ModelRecord>> {
        let mut conn = self.get_conn().await?;
        let keys = self.scan_all_keys(&mut conn).await?;
        if keys.is_empty() {
            return Ok(Vec::new());
        }
        // Pipeline the HGETALLs so we pay one network round-trip for all models.
        let mut pipe = redis::pipe();
        for k in &keys {
            pipe.hgetall(k);
        }
        let hashes: Vec<Vec<(String, String)>> = pipe.query_async(&mut conn).await?;
        let mut records: Vec<ModelRecord> = Vec::with_capacity(keys.len());
        for (key, pairs) in keys.iter().zip(hashes.into_iter()) {
            if pairs.is_empty() {
                // Deleted between SCAN and HGETALL; skip defensively.
                continue;
            }
            let Some(name) = Self::model_name_from_key(key) else {
                continue;
            };
            match Self::record_from_hash(name, pairs) {
                Ok(r) => records.push(r),
                Err(e) => tracing::warn!("Skipping malformed registry record at {}: {}", key, e),
            }
        }
        records.sort_by_key(|r| r.last_used_at);
        if let Some(n) = limit {
            records.truncate(n as usize);
        }
        Ok(records)
    }

    async fn get_status_counts(&self) -> RegistryResult<(u32, u32, u32)> {
        let mut conn = self.get_conn().await?;
        let keys = self.scan_all_keys(&mut conn).await?;
        if keys.is_empty() {
            return Ok((0, 0, 0));
        }
        let mut pipe = redis::pipe();
        for k in &keys {
            pipe.hget(k, fields::STATUS);
        }
        let statuses: Vec<Option<String>> = pipe.query_async(&mut conn).await?;
        let mut downloading = 0u32;
        let mut downloaded = 0u32;
        let mut error = 0u32;
        for s in statuses.into_iter().flatten() {
            match s.as_str() {
                "DOWNLOADING" => downloading = downloading.saturating_add(1),
                "DOWNLOADED" => downloaded = downloaded.saturating_add(1),
                "ERROR" => error = error.saturating_add(1),
                _ => {}
            }
        }
        Ok((downloading, downloaded, error))
    }

    async fn try_claim_for_download(
        &self,
        model_name: &str,
        provider: ModelProvider,
    ) -> RegistryResult<ClaimOutcome> {
        let mut conn = self.get_conn().await?;
        let key = model_key(provider, model_name);
        let legacy = legacy_model_key(model_name);
        let now = Utc::now().to_rfc3339();
        // Single atomic EVAL: returns CLAIM_WON_SENTINEL if we created the record, else the
        // existing status, so callers know which replica owns the download (status alone
        // can't — both see DOWNLOADING). KEYS[2] is the legacy key for migration (see below).
        let result: String = redis::Script::new(CLAIM_LUA)
            .key(&key)
            .key(&legacy)
            .arg(CLAIM_WON_SENTINEL)
            .arg(status_str(ModelStatus::DOWNLOADING))
            .arg(provider_str(provider))
            .arg(&now)
            .arg("Starting download...")
            .invoke_async(&mut conn)
            .await?;
        if result == CLAIM_WON_SENTINEL {
            Ok(ClaimOutcome::Claimed)
        } else {
            Ok(ClaimOutcome::AlreadyExists(status_from_str(&result)?))
        }
    }

    async fn try_reset_error_for_retry(
        &self,
        model_name: &str,
        provider: ModelProvider,
    ) -> RegistryResult<bool> {
        let mut conn = self.get_conn().await?;
        // Retry only runs after a claim observed AlreadyExists (which already migrated any
        // legacy record), so the CAS targets the provider-scoped key directly.
        let key = model_key(provider, model_name);
        let now = Utc::now().to_rfc3339();
        // Atomic CAS: flip status from ERROR to DOWNLOADING. Returns 1 on win, 0 on
        // miss. Only the winner spawns the retry download.
        let won: i32 = redis::Script::new(RETRY_CAS_LUA)
            .key(&key)
            .arg(status_str(ModelStatus::ERROR))
            .arg(status_str(ModelStatus::DOWNLOADING))
            .arg(provider_str(provider))
            .arg(&now)
            .arg("Retrying download...")
            .invoke_async(&mut conn)
            .await?;
        Ok(won == 1)
    }
}

/// Sentinel string returned by [`CLAIM_LUA`] when the caller won the claim. Picked so
/// it cannot be confused with any real `ModelStatus` string.
const CLAIM_WON_SENTINEL: &str = "__MX_CLAIM_WON__";

/// Atomic claim against the provider-scoped key, lazily migrating legacy records:
///   1. provider-scoped key exists -> return its status (normal hit);
///   2. matching-provider legacy record -> RENAME onto the new key, adopt it. A
///      different-provider legacy record is left alone and does NOT satisfy the claim
///      (the fix: a GCS record can't answer a HuggingFace claim);
///   3. else populate fields, return the win sentinel.
///
/// TODO(0.5.0 migration): drop the KEYS[2] arm once all deployments have drained legacy keys.
///
/// KEYS = [provider-scoped, legacy]; ARGV = [win_sentinel, status, provider, now, message]
const CLAIM_LUA: &str = r#"
local existing = redis.call("HGET", KEYS[1], "status")
if existing then return existing end
local legacy_status = redis.call("HGET", KEYS[2], "status")
if legacy_status then
    if redis.call("HGET", KEYS[2], "provider") == ARGV[3] then
        redis.call("RENAME", KEYS[2], KEYS[1])
        return legacy_status
    end
end
redis.call("HSET", KEYS[1],
    "status", ARGV[2],
    "provider", ARGV[3],
    "created_at", ARGV[4],
    "last_used_at", ARGV[4],
    "message", ARGV[5])
return ARGV[1]
"#;

/// Bump `last_used_at` on the first existing candidate key. KEYS = candidate keys,
/// ARGV[1] = now. Returns 1 if a record was touched, 0 if none existed.
const TOUCH_LUA: &str = r#"
for i = 1, #KEYS do
    if redis.call("EXISTS", KEYS[i]) == 1 then
        redis.call("HSET", KEYS[i], "last_used_at", ARGV[1])
        return 1
    end
end
return 0
"#;

/// Atomic CAS: flip status from `from_status` to `to_status` (also refreshing
/// provider, last_used_at, message). Returns 1 on win, 0 on miss.
///
/// KEYS[1] = model key
/// ARGV    = [from_status, to_status, provider, last_used_at, message]
const RETRY_CAS_LUA: &str = r#"
local cur = redis.call("HGET", KEYS[1], "status")
if cur ~= ARGV[1] then return 0 end
redis.call("HSET", KEYS[1],
    "status", ARGV[2],
    "provider", ARGV[3],
    "last_used_at", ARGV[4],
    "message", ARGV[5])
return 1
"#;

/// Atomic `set_status`: overwrite status/provider/last_used_at, either set or clear
/// `message`, and only stamp `created_at` if it isn't already there (preserves the
/// original timestamp across status transitions).
///
/// KEYS[1] = model key
/// ARGV    = [status, provider, last_used_at, created_at_if_new, msg_flag, msg_value]
///    msg_flag = "1" → HSET message = msg_value
///    msg_flag = "0" → HDEL message (msg_value ignored)
const SET_STATUS_LUA: &str = r#"
redis.call("HSET", KEYS[1],
    "status", ARGV[1],
    "provider", ARGV[2],
    "last_used_at", ARGV[3])
if ARGV[5] == "1" then
    redis.call("HSET", KEYS[1], "message", ARGV[6])
else
    redis.call("HDEL", KEYS[1], "message")
end
redis.call("HSETNX", KEYS[1], "created_at", ARGV[4])
return 1
"#;

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

    #[test]
    fn provider_roundtrip() {
        for p in [
            ModelProvider::HuggingFace,
            ModelProvider::Ngc,
            ModelProvider::Gcs,
        ] {
            let s = provider_str(p);
            assert_eq!(provider_from_str(s).expect("roundtrip"), p);
        }
        assert!(provider_from_str("bogus").is_err());
    }

    #[test]
    fn status_roundtrip() {
        for s in [
            ModelStatus::DOWNLOADING,
            ModelStatus::DOWNLOADED,
            ModelStatus::ERROR,
        ] {
            assert_eq!(status_from_str(status_str(s)).expect("roundtrip"), s);
        }
        assert!(status_from_str("UNKNOWN").is_err());
    }

    #[test]
    fn model_key_and_parse() {
        // Provider-scoped key round-trips through model_name_from_key.
        let k = model_key(ModelProvider::HuggingFace, "meta-llama/Llama-3.1-70B");
        assert_eq!(k, "mx:model:HuggingFace:meta-llama/Llama-3.1-70B");
        assert_eq!(
            RedisRegistryBackend::model_name_from_key(&k),
            Some("meta-llama/Llama-3.1-70B")
        );

        // A GCS gs:// name is not mistaken for the `Gcs` provider segment.
        let g = model_key(ModelProvider::Gcs, "gs://bucket/org/model/rev");
        assert_eq!(g, "mx:model:Gcs:gs://bucket/org/model/rev");
        assert_eq!(
            RedisRegistryBackend::model_name_from_key(&g),
            Some("gs://bucket/org/model/rev")
        );

        // Legacy name-only keys (no provider segment) parse to the whole remainder.
        let legacy = legacy_model_key("gs://bucket/org/model/rev");
        assert_eq!(legacy, "mx:model:gs://bucket/org/model/rev");
        assert_eq!(
            RedisRegistryBackend::model_name_from_key(&legacy),
            Some("gs://bucket/org/model/rev")
        );
        assert_eq!(
            RedisRegistryBackend::model_name_from_key("mx:model:meta-llama/Llama-3.1-70B"),
            Some("meta-llama/Llama-3.1-70B")
        );
    }

    #[test]
    fn candidate_keys_cover_all_providers_and_legacy() {
        let keys = candidate_keys("org/model");
        assert_eq!(keys.len(), 4);
        assert!(keys.contains(&"mx:model:HuggingFace:org/model".to_string()));
        assert!(keys.contains(&"mx:model:Ngc:org/model".to_string()));
        assert!(keys.contains(&"mx:model:Gcs:org/model".to_string()));
        assert!(keys.contains(&"mx:model:org/model".to_string())); // legacy
    }

    #[test]
    fn redact_url_strips_userinfo() {
        assert_eq!(
            redact_url("redis://user:secret@host:6379"),
            "redis://user:***@host:6379"
        );
        assert_eq!(redact_url("redis://host:6379"), "redis://host:6379");
        // User-only (no password): redact user too.
        assert_eq!(
            redact_url("redis://user@host:6379"),
            "redis://***@host:6379"
        );
        // Non-redis URL or malformed: pass through.
        assert_eq!(redact_url("not-a-url"), "not-a-url");
    }

    #[test]
    fn record_from_hash_builds_full_record() {
        let fields = vec![
            ("provider".to_string(), "HuggingFace".to_string()),
            ("status".to_string(), "DOWNLOADED".to_string()),
            (
                "created_at".to_string(),
                "2026-04-22T10:00:00+00:00".to_string(),
            ),
            (
                "last_used_at".to_string(),
                "2026-04-22T11:00:00+00:00".to_string(),
            ),
            ("message".to_string(), "ok".to_string()),
        ];
        let rec = RedisRegistryBackend::record_from_hash("foo/bar", fields).expect("parse");
        assert_eq!(rec.model_name, "foo/bar");
        assert_eq!(rec.provider, ModelProvider::HuggingFace);
        assert_eq!(rec.status, ModelStatus::DOWNLOADED);
        assert_eq!(rec.message.as_deref(), Some("ok"));
    }

    #[test]
    fn record_from_hash_rejects_missing_fields() {
        let fields = vec![("status".to_string(), "DOWNLOADED".to_string())];
        assert!(RedisRegistryBackend::record_from_hash("foo/bar", fields).is_err());
    }
}