Skip to content

Commit fd7fa38

Browse files
allenporterallenporter
committed
chore: Use built-in as_dict method for creating diagnostic data
1 parent 751a2df commit fd7fa38

File tree

2 files changed

+14
-71
lines changed

2 files changed

+14
-71
lines changed

‎roborock/devices/device_manager.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ async def close(self) -> None:
138138
def diagnostic_data(self) -> Mapping[str, Any]:
139139
"""Return diagnostics information about the device manager."""
140140
return {
141-
"home_data": redact_device_data(asdict(self._home_data) if self._home_data else {}),
141+
"home_data": redact_device_data(self._home_data.as_dict()) if self._home_data else None,
142142
"devices": [device.diagnostic_data() for device in self._devices.values()],
143143
"diagnostics": self._diagnostics.as_dict(),
144144
}

‎tests/devices/__snapshots__/test_device_manager.ambr‎

Lines changed: 13 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -407,11 +407,8 @@
407407
'home_data': dict({
408408
'devices': list([
409409
dict({
410-
'active_time': 1672364449,
411-
'attribute': None,
412-
'cid': None,
413-
'create_time': None,
414-
'device_status': dict({
410+
'activeTime': 1672364449,
411+
'deviceStatus': dict({
415412
'120': 0,
416413
'121': 8,
417414
'122': 100,
@@ -425,212 +422,158 @@
425422
}),
426423
'duid': '******bc123',
427424
'extra': '{"RRPhotoPrivacyVersion": "1"}',
428-
'f': None,
429-
'feature_set': '2234201184108543',
425+
'featureSet': '2234201184108543',
430426
'fv': '02.56.02',
431-
'icon_url': 'no_url',
432-
'lat': '**REDACTED**',
433-
'local_key': 'key123key123key1',
434-
'lon': None,
427+
'iconUrl': 'no_url',
428+
'localKey': '**REDACTED**',
435429
'name': '**REDACTED**',
436-
'new_feature_set': '0000000000002041',
430+
'newFeatureSet': '0000000000002041',
437431
'online': True,
438-
'product_id': 'product-id-s7-maxv',
432+
'productId': '**REDACTED**',
439433
'pv': '1.0',
440-
'room_id': 2362003,
441-
'runtime_env': None,
442-
'setting': None,
434+
'roomId': 2362003,
443435
'share': False,
444-
'share_expired_time': None,
445-
'share_time': None,
446-
'share_type': None,
447-
'silent_ota_switch': True,
436+
'silentOtaSwitch': True,
448437
'sn': '**REDACTED**',
449-
'time_zone_id': 'America/Los_Angeles',
450-
'tuya_migrated': False,
451-
'tuya_uuid': None,
438+
'timeZoneId': 'America/Los_Angeles',
439+
'tuyaMigrated': False,
452440
}),
453441
]),
454-
'geo_name': None,
455442
'id': '**REDACTED**',
456-
'lat': '**REDACTED**',
457-
'lon': None,
458443
'name': '**REDACTED**',
459444
'products': list([
460445
dict({
461-
'attribute': None,
462446
'capability': 0,
463-
'category': <RoborockCategory.VACUUM: 'robot.vacuum.cleaner'>,
447+
'category': 'robot.vacuum.cleaner',
464448
'code': 'a27',
465-
'icon_url': None,
466449
'id': '**REDACTED**',
467450
'model': 'roborock.vacuum.a27',
468451
'name': '**REDACTED**',
469452
'schema': list([
470453
dict({
471454
'code': 'rpc_request_code',
472-
'desc': None,
473455
'id': '**REDACTED**',
474456
'mode': 'rw',
475457
'name': '**REDACTED**',
476-
'product_property': None,
477-
'property': None,
478458
'type': 'RAW',
479459
}),
480460
dict({
481461
'code': 'rpc_response',
482-
'desc': None,
483462
'id': '**REDACTED**',
484463
'mode': 'rw',
485464
'name': '**REDACTED**',
486-
'product_property': None,
487-
'property': None,
488465
'type': 'RAW',
489466
}),
490467
dict({
491468
'code': 'error_code',
492-
'desc': None,
493469
'id': '**REDACTED**',
494470
'mode': 'ro',
495471
'name': '**REDACTED**',
496-
'product_property': None,
497472
'property': '{"range": []}',
498473
'type': 'ENUM',
499474
}),
500475
dict({
501476
'code': 'state',
502-
'desc': None,
503477
'id': '**REDACTED**',
504478
'mode': 'ro',
505479
'name': '**REDACTED**',
506-
'product_property': None,
507480
'property': '{"range": []}',
508481
'type': 'ENUM',
509482
}),
510483
dict({
511484
'code': 'battery',
512-
'desc': None,
513485
'id': '**REDACTED**',
514486
'mode': 'ro',
515487
'name': '**REDACTED**',
516-
'product_property': None,
517488
'property': '{"range": []}',
518489
'type': 'ENUM',
519490
}),
520491
dict({
521492
'code': 'fan_power',
522-
'desc': None,
523493
'id': '**REDACTED**',
524494
'mode': 'rw',
525495
'name': '**REDACTED**',
526-
'product_property': None,
527496
'property': '{"range": []}',
528497
'type': 'ENUM',
529498
}),
530499
dict({
531500
'code': 'water_box_mode',
532-
'desc': None,
533501
'id': '**REDACTED**',
534502
'mode': 'rw',
535503
'name': '**REDACTED**',
536-
'product_property': None,
537504
'property': '{"range": []}',
538505
'type': 'ENUM',
539506
}),
540507
dict({
541508
'code': 'main_brush_life',
542-
'desc': None,
543509
'id': '**REDACTED**',
544510
'mode': 'rw',
545511
'name': '**REDACTED**',
546-
'product_property': None,
547512
'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
548513
'type': 'VALUE',
549514
}),
550515
dict({
551516
'code': 'side_brush_life',
552-
'desc': None,
553517
'id': '**REDACTED**',
554518
'mode': 'rw',
555519
'name': '**REDACTED**',
556-
'product_property': None,
557520
'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
558521
'type': 'VALUE',
559522
}),
560523
dict({
561524
'code': 'filter_life',
562-
'desc': None,
563525
'id': '**REDACTED**',
564526
'mode': 'rw',
565527
'name': '**REDACTED**',
566-
'product_property': None,
567528
'property': '{"max": 100, "min": 0, "step": 1, "unit": null, "scale": 1}',
568529
'type': 'VALUE',
569530
}),
570531
dict({
571532
'code': 'additional_props',
572-
'desc': None,
573533
'id': '**REDACTED**',
574534
'mode': 'ro',
575535
'name': '**REDACTED**',
576-
'product_property': None,
577-
'property': None,
578536
'type': 'RAW',
579537
}),
580538
dict({
581539
'code': 'task_complete',
582-
'desc': None,
583540
'id': '**REDACTED**',
584541
'mode': 'ro',
585542
'name': '**REDACTED**',
586-
'product_property': None,
587-
'property': None,
588543
'type': 'RAW',
589544
}),
590545
dict({
591546
'code': 'task_cancel_low_power',
592-
'desc': None,
593547
'id': '**REDACTED**',
594548
'mode': 'ro',
595549
'name': '**REDACTED**',
596-
'product_property': None,
597-
'property': None,
598550
'type': 'RAW',
599551
}),
600552
dict({
601553
'code': 'task_cancel_in_motion',
602-
'desc': None,
603554
'id': '**REDACTED**',
604555
'mode': 'ro',
605556
'name': '**REDACTED**',
606-
'product_property': None,
607-
'property': None,
608557
'type': 'RAW',
609558
}),
610559
dict({
611560
'code': 'charge_status',
612-
'desc': None,
613561
'id': '**REDACTED**',
614562
'mode': 'ro',
615563
'name': '**REDACTED**',
616-
'product_property': None,
617-
'property': None,
618564
'type': 'RAW',
619565
}),
620566
dict({
621567
'code': 'drying_status',
622-
'desc': None,
623568
'id': '**REDACTED**',
624569
'mode': 'ro',
625570
'name': '**REDACTED**',
626-
'product_property': None,
627-
'property': None,
628571
'type': 'RAW',
629572
}),
630573
]),
631574
}),
632575
]),
633-
'received_devices': list([
576+
'receivedDevices': list([
634577
]),
635578
'rooms': list([
636579
dict({

0 commit comments

Comments
 (0)