Skip to content

Fix CLI output formatting #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eman merged 1 commit into from
Nov 21, 2025
Merged

Fix CLI output formatting #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions src/nwp500/cli/commands.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import asyncio
import json
import logging
from dataclasses import asdict
from typing import Any, Optional

from nwp500 import Device, DeviceFeature, DeviceStatus, NavienMqttClient
Expand Down Expand Up @@ -54,7 +53,9 @@ def on_status(status: DeviceStatus) -> None:
if not future.done():
print(
json.dumps(
asdict(status), indent=2, default=_json_default_serializer
status.model_dump(),
indent=2,
default=_json_default_serializer,
)
)
future.set_result(None)
Expand Down Expand Up @@ -126,7 +127,9 @@ def on_device_info(info: Any) -> None:
if not future.done():
print(
json.dumps(
asdict(info), indent=2, default=_json_default_serializer
info.model_dump(),
indent=2,
default=_json_default_serializer,
)
)
future.set_result(None)
Expand Down Expand Up @@ -225,7 +228,7 @@ def on_status_response(status: DeviceStatus) -> None:
status = responses[0]
print(
json.dumps(
asdict(status),
status.model_dump(),
indent=2,
default=_json_default_serializer,
)
Expand Down Expand Up @@ -301,7 +304,7 @@ def on_status_response(status: DeviceStatus) -> None:
status = responses[0]
print(
json.dumps(
asdict(status),
status.model_dump(),
indent=2,
default=_json_default_serializer,
)
Expand Down Expand Up @@ -601,7 +604,7 @@ def on_status_response(status: DeviceStatus) -> None:
status = responses[0]
print(
json.dumps(
asdict(status),
status.model_dump(),
indent=2,
default=_json_default_serializer,
)
Expand Down
3 changes: 1 addition & 2 deletions src/nwp500/cli/output_formatters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import csv
import json
import logging
from dataclasses import asdict
from datetime import datetime
from enum import Enum
from pathlib import Path
Expand Down Expand Up @@ -43,7 +42,7 @@ def write_status_to_csv(file_path: str, status: DeviceStatus) -> None:
"""
try:
# Convert the entire dataclass to a dictionary to capture all fields
status_dict = asdict(status)
status_dict = status.model_dump()

# Add a timestamp to the beginning of the data
status_dict["timestamp"] = datetime.now().isoformat()
Expand Down