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
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
// SPDX-FileCopyrightText: Copyright (c) 2025-2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// SPDX-License-Identifier: Apache-2.0

//! Redis backend for P2P model metadata storage.
//!
//! Storage layout:
//!   `mx:source:{source_id}`               — Redis Hash; field `__attributes__` stores
//!                                            JSON-serialized SourceAttributesJson (once
//!                                            per source); each other field is an worker_id
//!                                            with an empty-string value (presence marker).
//!   `mx:source:{source_id}:{worker_id}` — Redis Hash; field = worker_rank (string),
//!                                            value = JSON-serialized WorkerRecordJson.
//!
//! Global listing uses SCAN with pattern `mx:source:????????????????` (16-char source IDs)
//! to enumerate source index keys without a separate secondary index.

use super::{MetadataBackend, MetadataResult, ModelMetadataRecord, TensorRecord, WorkerRecord};
use async_trait::async_trait;
use modelexpress_common::grpc::p2p::WorkerMetadata;
use modelexpress_common::grpc::p2p::{SourceIdentity, SourceStatus};
use redis::AsyncCommands;
use redis::aio::ConnectionManager;
use serde::{Deserialize, Serialize};
use std::sync::Arc;
use tokio::sync::RwLock;
use tracing::{debug, info};

/// Redis key prefixes and reserved field names
mod keys {
    pub const SOURCE_PREFIX: &str = "mx:source:";
    /// SCAN pattern matching source index keys: `mx:source:{16-char-id}`
    pub const SOURCE_SCAN_PATTERN: &str = "mx:source:????????????????";
    /// Reserved hash field in the source index key that stores SourceAttributesJson.
    pub const ATTRIBUTES_FIELD: &str = "__attributes__";
}

/// All fields of a SourceIdentity stored once per source in the index hash.
#[derive(Debug, Clone, Serialize, Deserialize, Default)]
struct SourceAttributesJson {
    pub model_name: String,
    #[serde(default)]
    pub mx_version: String,
    #[serde(default)]
    pub mx_source_type: i32,
    #[serde(default)]
    pub backend_framework: i32,
    #[serde(default)]
    pub tensor_parallel_size: u32,
    #[serde(default)]
    pub pipeline_parallel_size: u32,
    #[serde(default)]
    pub expert_parallel_size: u32,
    #[serde(default)]
    pub dtype: String,
    #[serde(default)]
    pub quantization: String,
}

impl From<&SourceIdentity> for SourceAttributesJson {
    fn from(id: &SourceIdentity) -> Self {
        Self {
            model_name: id.model_name.clone(),
            mx_version: id.mx_version.clone(),
            mx_source_type: id.mx_source_type,
            backend_framework: id.backend_framework,
            tensor_parallel_size: id.tensor_parallel_size,
            pipeline_parallel_size: id.pipeline_parallel_size,
            expert_parallel_size: id.expert_parallel_size,
            dtype: id.dtype.clone(),
            quantization: id.quantization.clone(),
        }
    }
}

/// Scan Redis for all keys matching `pattern`, iterating through all SCAN cursors.
async fn scan_keys(conn: &mut ConnectionManager, pattern: &str) -> MetadataResult<Vec<String>> {
    let mut all_keys = Vec::new();
    let mut cursor: u64 = 0;
    loop {
        let (next_cursor, batch): (u64, Vec<String>) = redis::cmd("SCAN")
            .arg(cursor)
            .arg("MATCH")
            .arg(pattern)
            .arg("COUNT")
            .arg(100)
            .query_async(conn)
            .await?;
        all_keys.extend(batch);
        cursor = next_cursor;
        if cursor == 0 {
            break;
        }
    }
    Ok(all_keys)
}

/// Serializable version of TensorRecord for Redis storage
/// NOTE: addr and size are serialized as strings to avoid Lua cjson precision issues
#[derive(Debug, Clone, Serialize, Deserialize)]
struct TensorRecordJson {
    pub name: String,
    #[serde(
        serialize_with = "serialize_u64_as_string",
        deserialize_with = "deserialize_u64_from_any"
    )]
    pub addr: u64,
    #[serde(
        serialize_with = "serialize_u64_as_string",
        deserialize_with = "deserialize_u64_from_any"
    )]
    pub size: u64,
    pub device_id: u32,
    pub dtype: String,
}

fn serialize_u64_as_string<S>(value: &u64, serializer: S) -> Result<S::Ok, S::Error>
where
    S: serde::Serializer,
{
    serializer.serialize_str(&value.to_string())
}

fn deserialize_u64_from_any<'de, D>(deserializer: D) -> Result<u64, D::Error>
where
    D: serde::Deserializer<'de>,
{
    use serde::de::{self, Visitor};

    struct U64Visitor;

    impl<'de> Visitor<'de> for U64Visitor {
        type Value = u64;

        fn expecting(&self, formatter: &mut std::fmt::Formatter) -> std::fmt::Result {
            formatter.write_str("a u64 as string or number")
        }

        fn visit_u64<E>(self, value: u64) -> Result<Self::Value, E> {
            Ok(value)
        }

        fn visit_i64<E>(self, value: i64) -> Result<Self::Value, E>
        where
            E: de::Error,
        {
            u64::try_from(value).map_err(|_| E::custom("negative value"))
        }

        fn visit_f64<E>(self, value: f64) -> Result<Self::Value, E>
        where
            E: de::Error,
        {
            // Handle floats from cjson (the problematic case)
            Ok(value as u64)
        }

        fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
        where
            E: de::Error,
        {
            value.parse::<u64>().map_err(de::Error::custom)
        }
    }

    deserializer.deserialize_any(U64Visitor)
}

impl From<TensorRecord> for TensorRecordJson {
    fn from(record: TensorRecord) -> Self {
        Self {
            name: record.name,
            addr: record.addr,
            size: record.size,
            device_id: record.device_id,
            dtype: record.dtype,
        }
    }
}

impl From<TensorRecordJson> for TensorRecord {
    fn from(json: TensorRecordJson) -> Self {
        Self {
            name: json.name,
            addr: json.addr,
            size: json.size,
            device_id: json.device_id,
            dtype: json.dtype,
        }
    }
}

/// Serializable version of WorkerRecord stored as a hash field value
#[derive(Debug, Clone, Serialize, Deserialize)]
struct WorkerRecordJson {
    pub worker_rank: u32,
    /// Explicit backend type discriminator ("nixl", "transfer_engine", "none").
    #[serde(default)]
    pub backend_type: Option<String>,
    #[serde(default)]
    pub nixl_metadata: Vec<u8>,
    #[serde(default)]
    pub transfer_engine_session_id: Option<String>,
    pub tensors: Vec<TensorRecordJson>,
    #[serde(default)]
    pub status: i32,
    #[serde(default)]
    pub updated_at: i64,
    /// P2P: NIXL listen thread endpoint
    #[serde(default)]
    pub metadata_endpoint: String,
    /// P2P: NIXL agent name
    #[serde(default)]
    pub agent_name: String,
    /// P2P: Worker gRPC endpoint for tensor manifest
    #[serde(default)]
    pub worker_grpc_endpoint: String,
}

impl WorkerRecordJson {
    fn from_worker_record(record: WorkerRecord) -> Self {
        let backend_type = record.backend_metadata.backend_type_str().to_string();
        let (nixl_metadata, transfer_engine_session_id) = match record.backend_metadata {
            super::BackendMetadataRecord::Nixl(data) => (data, None),
            super::BackendMetadataRecord::TransferEngine(sid) => (Vec::new(), Some(sid)),
            super::BackendMetadataRecord::None => (Vec::new(), None),
        };
        Self {
            worker_rank: record.worker_rank,
            backend_type: Some(backend_type),
            nixl_metadata,
            transfer_engine_session_id,
            tensors: record
                .tensors
                .into_iter()
                .map(TensorRecordJson::from)
                .collect(),
            status: record.status,
            updated_at: record.updated_at,
            metadata_endpoint: record.metadata_endpoint,
            agent_name: record.agent_name,
            worker_grpc_endpoint: record.worker_grpc_endpoint,
        }
    }
}

impl From<WorkerRecordJson> for WorkerRecord {
    fn from(json: WorkerRecordJson) -> Self {
        Self {
            worker_rank: json.worker_rank,
            backend_metadata: super::BackendMetadataRecord::from_flat(
                json.nixl_metadata,
                json.transfer_engine_session_id,
                json.backend_type.as_deref(),
            ),
            tensors: json.tensors.into_iter().map(TensorRecord::from).collect(),
            status: json.status,
            updated_at: json.updated_at,
            metadata_endpoint: json.metadata_endpoint,
            agent_name: json.agent_name,
            worker_grpc_endpoint: json.worker_grpc_endpoint,
        }
    }
}

/// Redis backend for metadata storage
pub struct RedisBackend {
    redis: Arc<RwLock<Option<ConnectionManager>>>,
    redis_url: String,
}

impl RedisBackend {
    /// Create a new Redis backend
    pub fn new(redis_url: &str) -> Self {
        Self {
            redis: Arc::new(RwLock::new(None)),
            redis_url: redis_url.to_string(),
        }
    }

    /// Get a Redis connection, reconnecting if necessary
    async fn get_conn(&self) -> MetadataResult<ConnectionManager> {
        // Fast path: read lock
        {
            let guard = self.redis.read().await;
            if let Some(conn) = guard.as_ref() {
                return Ok(conn.clone());
            }
        }

        // Slow path: write lock with double-check
        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)
    }
}

#[async_trait]
impl MetadataBackend for RedisBackend {
    async fn connect(&self) -> MetadataResult<()> {
        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);

        // Redact credentials from URL before logging
        let safe_url = if self.redis_url.contains('@') {
            if let Some(at_pos) = self.redis_url.rfind('@') {
                let prefix = &self.redis_url[..at_pos];
                let suffix = &self.redis_url[at_pos..];
                if let Some(colon_pos) = prefix.rfind(':') {
                    format!("{}:***{}", &prefix[..colon_pos], suffix)
                } else {
                    self.redis_url.clone()
                }
            } else {
                self.redis_url.clone()
            }
        } else {
            self.redis_url.clone()
        };
        info!("Connected to Redis at {}", safe_url);
        Ok(())
    }

    async fn publish_metadata(
        &self,
        identity: &SourceIdentity,
        worker_id: &str,
        worker: WorkerMetadata,
    ) -> MetadataResult<()> {
        let source_id = crate::p2p::source_identity::compute_mx_source_id(identity);
        let mut conn = self.get_conn().await?;
        let worker_key = format!("{}{}:{}", keys::SOURCE_PREFIX, source_id, worker_id);
        let source_key = format!("{}{}", keys::SOURCE_PREFIX, source_id);

        let worker_record = WorkerRecord::from(worker);
        let attr_json = serde_json::to_string(&SourceAttributesJson::from(identity))?;
        let json = WorkerRecordJson::from_worker_record(worker_record.clone());
        let value = serde_json::to_string(&json)?;

        let mut pipe = redis::pipe();
        pipe.hset(&worker_key, worker_record.worker_rank.to_string(), &value);
        pipe.hset(&source_key, keys::ATTRIBUTES_FIELD, &attr_json);
        pipe.hset(
            &source_key,
            worker_id,
            worker_record.worker_rank.to_string(),
        );
        pipe.exec_async(&mut conn).await?;

        info!(
            "Published metadata for '{}' (source_id={source_id}, worker_id={}): rank {} ({} tensors)",
            identity.model_name,
            worker_id,
            worker_record.worker_rank,
            worker_record.tensors.len(),
        );
        Ok(())
    }

    async fn get_metadata(
        &self,
        source_id: &str,
        worker_id: &str,
    ) -> MetadataResult<Option<ModelMetadataRecord>> {
        let mut conn = self.get_conn().await?;
        let key = format!("{}{}:{}", keys::SOURCE_PREFIX, source_id, worker_id);

        let fields: std::collections::HashMap<String, String> = conn.hgetall(&key).await?;
        if fields.is_empty() {
            debug!(
                "No metadata found for source_id={} worker_id={}",
                source_id, worker_id
            );
            return Ok(None);
        }

        // Fetch model_name from the source index key's __attributes__ field.
        let source_key = format!("{}{}", keys::SOURCE_PREFIX, source_id);
        let attr_json: Option<String> = conn.hget(&source_key, keys::ATTRIBUTES_FIELD).await?;
        let model_name = attr_json
            .and_then(|v| serde_json::from_str::<SourceAttributesJson>(&v).ok())
            .map(|a| a.model_name)
            .unwrap_or_default();

        let mut workers: Vec<WorkerRecord> = Vec::with_capacity(fields.len());
        for value in fields.values() {
            let json: WorkerRecordJson = serde_json::from_str(value)?;
            workers.push(WorkerRecord::from(json));
        }
        workers.sort_by_key(|w| w.worker_rank);

        debug!(
            "Retrieved metadata for source_id={} worker_id={}: {} workers",
            source_id,
            worker_id,
            workers.len()
        );

        Ok(Some(ModelMetadataRecord {
            source_id: source_id.to_string(),
            worker_id: worker_id.to_string(),
            model_name,
            workers,
            published_at: 0,
        }))
    }

    async fn list_workers(
        &self,
        source_id: Option<String>,
        status_filter: Option<SourceStatus>,
    ) -> MetadataResult<Vec<super::SourceInstanceInfo>> {
        let mut conn = self.get_conn().await?;

        // Collect source_ids to query
        let source_ids: Vec<String> = if let Some(sid) = source_id {
            vec![sid]
        } else {
            scan_keys(&mut conn, keys::SOURCE_SCAN_PATTERN)
                .await?
                .into_iter()
                .map(|k| k[keys::SOURCE_PREFIX.len()..].to_string())
                .collect()
        };

        let mut result = Vec::new();

        for sid in &source_ids {
            let source_key = format!("{}{}", keys::SOURCE_PREFIX, sid);
            let instance_map: std::collections::HashMap<String, String> =
                conn.hgetall(&source_key).await?;

            let model_name = instance_map
                .get(keys::ATTRIBUTES_FIELD)
                .and_then(|v| serde_json::from_str::<SourceAttributesJson>(v).ok())
                .map(|a| a.model_name)
                .unwrap_or_default();

            for (iid, rank_str) in instance_map
                .iter()
                .filter(|(k, _)| k.as_str() != keys::ATTRIBUTES_FIELD)
            {
                let worker_rank: u32 = rank_str.parse().unwrap_or(0);
                let worker_key = format!("{}{}:{}", keys::SOURCE_PREFIX, sid, iid);
                let fields: std::collections::HashMap<String, String> =
                    conn.hgetall(&worker_key).await?;
                if fields.is_empty() {
                    continue;
                }

                if let Some(required_status) = status_filter {
                    let matches = fields.values().any(|v| {
                        serde_json::from_str::<WorkerRecordJson>(v)
                            .map(|j| j.status == required_status as i32)
                            .unwrap_or(false)
                    });
                    if !matches {
                        continue;
                    }
                }

                let (status, updated_at) = fields
                    .get(&worker_rank.to_string())
                    .and_then(|v| serde_json::from_str::<WorkerRecordJson>(v).ok())
                    .map(|j| (j.status, j.updated_at))
                    .unwrap_or((0, 0));

                result.push(super::SourceInstanceInfo {
                    source_id: sid.clone(),
                    worker_id: iid.to_string(),
                    model_name: model_name.clone(),
                    worker_rank,
                    status,
                    updated_at,
                });
            }
        }

        Ok(result)
    }

    async fn remove_metadata(&self, source_id: &str) -> MetadataResult<()> {
        let mut conn = self.get_conn().await?;
        let source_key = format!("{}{}", keys::SOURCE_PREFIX, source_id);

        let instance_map: std::collections::HashMap<String, String> =
            conn.hgetall(&source_key).await?;

        let mut pipe = redis::pipe();
        for iid in instance_map
            .keys()
            .filter(|k| k.as_str() != keys::ATTRIBUTES_FIELD)
        {
            let worker_key = format!("{}{}:{}", keys::SOURCE_PREFIX, source_id, iid);
            pipe.del(worker_key);
        }
        pipe.del(&source_key);

        pipe.exec_async(&mut conn).await?;
        info!("Removed metadata for source_id={}", source_id);
        Ok(())
    }

    async fn remove_worker(&self, source_id: &str, worker_id: &str) -> MetadataResult<()> {
        let mut conn = self.get_conn().await?;
        let source_key = format!("{}{}", keys::SOURCE_PREFIX, source_id);
        let worker_key = format!("{}{}:{}", keys::SOURCE_PREFIX, source_id, worker_id);

        let mut pipe = redis::pipe();
        pipe.del(&worker_key);
        pipe.hdel(&source_key, worker_id);
        pipe.exec_async(&mut conn).await?;

        info!(
            "Removed worker '{}' from source_id={}",
            worker_id, source_id
        );
        Ok(())
    }

    async fn list_sources(&self) -> MetadataResult<Vec<(String, String)>> {
        let mut conn = self.get_conn().await?;
        let source_keys = scan_keys(&mut conn, keys::SOURCE_SCAN_PATTERN).await?;

        let mut sources = Vec::new();
        for key in source_keys {
            let source_id = key[keys::SOURCE_PREFIX.len()..].to_string();
            let attr_json: Option<String> = conn.hget(&key, keys::ATTRIBUTES_FIELD).await?;
            if let Some(json) = attr_json {
                let model_name = serde_json::from_str::<SourceAttributesJson>(&json)
                    .map(|a| a.model_name)
                    .unwrap_or_default();
                sources.push((source_id, model_name));
            }
        }
        Ok(sources)
    }

    async fn update_status(
        &self,
        source_id: &str,
        worker_id: &str,
        worker_rank: u32,
        status: SourceStatus,
        updated_at: i64,
    ) -> MetadataResult<()> {
        let mut conn = self.get_conn().await?;
        let key = format!("{}{}:{}", keys::SOURCE_PREFIX, source_id, worker_id);
        let field = worker_rank.to_string();

        let value: Option<String> = conn.hget(&key, &field).await?;
        let json_str = value.ok_or_else(|| {
            format!(
                "update_status: rank {} not found in source '{}' worker '{}'",
                worker_rank, source_id, worker_id
            )
        })?;

        let mut record: WorkerRecordJson = serde_json::from_str(&json_str)?;
        record.status = status as i32;
        record.updated_at = updated_at;

        let updated = serde_json::to_string(&record)?;
        conn.hset::<_, _, _, ()>(&key, &field, &updated).await?;

        debug!(
            "Updated status for source '{}' worker '{}' rank {} -> {}",
            source_id, worker_id, worker_rank, status as i32
        );
        Ok(())
    }
}

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

    // ── TensorRecordJson serialization ──────────────────────────────────────

    #[test]
    fn test_tensor_record_json_roundtrip() {
        let record = TensorRecord {
            name: "model.layers.0.weight".to_string(),
            addr: 0x7f00_0000_0000,
            size: 1_073_741_824,
            device_id: 3,
            dtype: "bfloat16".to_string(),
        };
        let json_record = TensorRecordJson::from(record.clone());
        let json = serde_json::to_string(&json_record).expect("serialize");

        // addr and size must be serialized as strings
        assert!(json.contains(r#""addr":"#));
        let parsed: TensorRecordJson = serde_json::from_str(&json).expect("deserialize");
        let back = TensorRecord::from(parsed);

        assert_eq!(back.name, record.name);
        assert_eq!(back.addr, record.addr);
        assert_eq!(back.size, record.size);
        assert_eq!(back.device_id, record.device_id);
        assert_eq!(back.dtype, record.dtype);
    }

    #[test]
    fn test_deserialize_u64_from_string() {
        let json = r#"{"name":"w","addr":"139948187451390","size":"134217728","device_id":0,"dtype":"f16"}"#;
        let t: TensorRecordJson = serde_json::from_str(json).expect("parse string");
        assert_eq!(t.addr, 139948187451390);
        assert_eq!(t.size, 134217728);
    }

    #[test]
    fn test_deserialize_u64_from_number() {
        let json = r#"{"name":"w","addr":1234567890,"size":4096,"device_id":0,"dtype":"f16"}"#;
        let t: TensorRecordJson = serde_json::from_str(json).expect("parse number");
        assert_eq!(t.addr, 1234567890);
    }

    #[test]
    fn test_deserialize_u64_from_float() {
        // cjson can emit floats for large integers
        let json = r#"{"name":"w","addr":1048576.0,"size":4096.0,"device_id":0,"dtype":"f16"}"#;
        let t: TensorRecordJson = serde_json::from_str(json).expect("parse float");
        assert_eq!(t.addr, 1048576);
    }

    // ── WorkerRecordJson serialization ──────────────────────────────────────

    #[test]
    fn test_worker_record_json_roundtrip_with_status() {
        let record = WorkerRecord {
            worker_rank: 2,
            backend_metadata: super::super::BackendMetadataRecord::Nixl(vec![
                0xde, 0xad, 0xbe, 0xef,
            ]),
            tensors: vec![TensorRecord {
                name: "t".to_string(),
                addr: 0x1000,
                size: 512,
                device_id: 2,
                dtype: "float16".to_string(),
            }],
            status: 2, // SOURCE_STATUS_READY
            updated_at: 1_700_000_000_000,
            metadata_endpoint: String::new(),
            agent_name: String::new(),
            worker_grpc_endpoint: String::new(),
        };

        let json_record = WorkerRecordJson::from_worker_record(record.clone());
        let json = serde_json::to_string(&json_record).expect("serialize");
        let parsed: WorkerRecordJson = serde_json::from_str(&json).expect("deserialize");
        let back = WorkerRecord::from(parsed);

        assert_eq!(back.worker_rank, record.worker_rank);
        assert_eq!(back.backend_metadata, record.backend_metadata);
        assert_eq!(back.status, record.status);
        assert_eq!(back.updated_at, record.updated_at);
        assert_eq!(back.tensors.len(), 1);
    }

    #[test]
    fn test_worker_record_json_backward_compat_missing_status() {
        // Records written before status/updated_at fields existed must default to 0.
        // model_name field (removed) is silently ignored by serde.
        let json = r#"{"worker_rank":0,"model_name":"m","nixl_metadata":[],"tensors":[]}"#;
        let parsed: WorkerRecordJson = serde_json::from_str(json).expect("parse legacy");
        assert_eq!(parsed.status, 0);
        assert_eq!(parsed.updated_at, 0);
    }

    // ── SourceAttributesJson ────────────────────────────────────────────────

    fn test_identity() -> modelexpress_common::grpc::p2p::SourceIdentity {
        modelexpress_common::grpc::p2p::SourceIdentity {
            mx_version: "0.4.0".to_string(),
            mx_source_type: 0,
            model_name: "deepseek-ai/DeepSeek-V3".to_string(),
            backend_framework: 1,
            tensor_parallel_size: 8,
            pipeline_parallel_size: 2,
            expert_parallel_size: 4,
            dtype: "bfloat16".to_string(),
            quantization: "fp8".to_string(),
            extra_parameters: Default::default(),
            revision: String::new(),
        }
    }

    #[test]
    fn test_source_attributes_from_identity() {
        let id = test_identity();
        let attr = SourceAttributesJson::from(&id);

        assert_eq!(attr.model_name, "deepseek-ai/DeepSeek-V3");
        assert_eq!(attr.mx_version, "0.4.0");
        assert_eq!(attr.tensor_parallel_size, 8);
        assert_eq!(attr.pipeline_parallel_size, 2);
        assert_eq!(attr.expert_parallel_size, 4);
        assert_eq!(attr.dtype, "bfloat16");
        assert_eq!(attr.quantization, "fp8");
        assert_eq!(attr.backend_framework, 1);
    }

    #[test]
    fn test_source_attributes_json_roundtrip() {
        let id = test_identity();
        let attr = SourceAttributesJson::from(&id);
        let json = serde_json::to_string(&attr).expect("serialize");
        let back: SourceAttributesJson = serde_json::from_str(&json).expect("deserialize");

        assert_eq!(back.model_name, attr.model_name);
        assert_eq!(back.tensor_parallel_size, attr.tensor_parallel_size);
        assert_eq!(back.pipeline_parallel_size, attr.pipeline_parallel_size);
        assert_eq!(back.expert_parallel_size, attr.expert_parallel_size);
        assert_eq!(back.dtype, attr.dtype);
        assert_eq!(back.quantization, attr.quantization);
    }

    #[test]
    fn test_source_attributes_defaults_for_missing_fields() {
        // Old records that only stored model_name should deserialize with zero defaults.
        let json = r#"{"model_name":"my-model"}"#;
        let attr: SourceAttributesJson = serde_json::from_str(json).expect("deserialize");

        assert_eq!(attr.model_name, "my-model");
        assert_eq!(attr.tensor_parallel_size, 0);
        assert_eq!(attr.pipeline_parallel_size, 0);
        assert_eq!(attr.expert_parallel_size, 0);
        assert_eq!(attr.dtype, "");
        assert_eq!(attr.quantization, "");
    }
}