From 085f4d618de503abfef67182ee318d54552c8599 Mon Sep 17 00:00:00 2001 From: Aidan Timson Date: Sat, 18 Nov 2023 12:16:11 +0000 Subject: [PATCH] Upgrade python syntax (#19) * Upgrade python syntax * Update to use new syntax --- scripts/generate_models.py | 32 ++++++++- setup.py | 6 +- systembridgemodels/action.py | 6 +- systembridgemodels/battery.py | 14 ++-- systembridgemodels/cpu.py | 98 +++++++++++++-------------- systembridgemodels/data.py | 4 +- systembridgemodels/disk.py | 30 ++++---- systembridgemodels/display.py | 10 ++- systembridgemodels/gpu.py | 10 ++- systembridgemodels/media.py | 46 ++++++------- systembridgemodels/media_control.py | 4 +- systembridgemodels/media_files.py | 4 +- systembridgemodels/media_get_files.py | 4 +- systembridgemodels/media_play.py | 14 ++-- systembridgemodels/memory.py | 50 +++++++------- systembridgemodels/network.py | 38 +++++------ systembridgemodels/notification.py | 18 ++--- systembridgemodels/processes.py | 20 +++--- systembridgemodels/request.py | 6 +- systembridgemodels/response.py | 12 ++-- systembridgemodels/sensors.py | 6 +- systembridgemodels/system.py | 30 ++++---- 22 files changed, 228 insertions(+), 234 deletions(-) diff --git a/scripts/generate_models.py b/scripts/generate_models.py index 153abcc..f6ffc29 100644 --- a/scripts/generate_models.py +++ b/scripts/generate_models.py @@ -12,6 +12,8 @@ "install", "--upgrade", "datamodel-code-generator", + "pyupgrade", + "isort", "black", ] print(" ".join(command)) @@ -63,6 +65,34 @@ print(" ".join(command)) + with subprocess.Popen(command) as process: + process.wait() + + command = [ + "pyupgrade", + path_to, + ] + + print(" ".join(command)) + + with subprocess.Popen(command) as process: + process.wait() + + command = [ + "isort", + "--rm", + "from typing import Dict", + "--rm", + "from typing import List", + "--rm", + "from typing import Optional", + "--rm", + "from typing import Union", + path_to, + ] + + print(" ".join(command)) + with subprocess.Popen(command) as process: process.wait() @@ -70,8 +100,6 @@ sys.executable, "-m", "black", - "-t", - "py39", path_to, ] diff --git a/setup.py b/setup.py index e5f5da9..b33d001 100644 --- a/setup.py +++ b/setup.py @@ -1,14 +1,12 @@ """Setup""" -import io - from setuptools import find_packages, setup # Get setup packages from requirements.txt -with io.open("requirements_setup.txt", encoding="utf-8") as f: +with open("requirements_setup.txt", encoding="utf-8") as f: requirements_setup = f.read().splitlines() # Get packages from requirements.txt -with io.open("requirements.txt", encoding="utf-8") as f: +with open("requirements.txt", encoding="utf-8") as f: requirements = f.read().splitlines() setup( diff --git a/systembridgemodels/action.py b/systembridgemodels/action.py index 4892e48..6cd4204 100644 --- a/systembridgemodels/action.py +++ b/systembridgemodels/action.py @@ -3,7 +3,7 @@ from __future__ import annotations -from typing import Any, Optional +from typing import Any from pydantic import BaseModel @@ -14,5 +14,5 @@ class Action(BaseModel): """ command: str - data: Optional[dict[str, Any]] = None - label: Optional[str] = None + data: dict[str, Any] | None = None + label: str | None = None diff --git a/systembridgemodels/battery.py b/systembridgemodels/battery.py index 82c6695..23aa212 100644 --- a/systembridgemodels/battery.py +++ b/systembridgemodels/battery.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,8 +11,8 @@ class LastUpdated(BaseModel): Last updated """ - is_charging: Optional[float] = None - percentage: Optional[float] = None + is_charging: float | None = None + percentage: float | None = None class Battery(BaseModel): @@ -25,7 +23,7 @@ class Battery(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - is_charging: Optional[bool] = None - percentage: Optional[float] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + is_charging: bool | None = None + percentage: float | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/cpu.py b/systembridgemodels/cpu.py index 641b30f..be91215 100644 --- a/systembridgemodels/cpu.py +++ b/systembridgemodels/cpu.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,29 +11,29 @@ class LastUpdated(BaseModel): Last updated """ - count: Optional[float] = None - frequency_current: Optional[float] = None - frequency_min: Optional[float] = None - frequency_max: Optional[float] = None - load_average: Optional[float] = None - power_package: Optional[float] = None - stats_ctx_switches: Optional[float] = None - stats_interrupts: Optional[float] = None - stats_soft_interrupts: Optional[float] = None - stats_syscalls: Optional[float] = None - temperature: Optional[float] = None - times_user: Optional[float] = None - times_system: Optional[float] = None - times_idle: Optional[float] = None - times_interrupt: Optional[float] = None - times_dpc: Optional[float] = None - times_percent_user: Optional[float] = None - times_percent_system: Optional[float] = None - times_percent_idle: Optional[float] = None - times_percent_interrupt: Optional[float] = None - times_percent_dpc: Optional[float] = None - usage: Optional[float] = None - voltage: Optional[float] = None + count: float | None = None + frequency_current: float | None = None + frequency_min: float | None = None + frequency_max: float | None = None + load_average: float | None = None + power_package: float | None = None + stats_ctx_switches: float | None = None + stats_interrupts: float | None = None + stats_soft_interrupts: float | None = None + stats_syscalls: float | None = None + temperature: float | None = None + times_user: float | None = None + times_system: float | None = None + times_idle: float | None = None + times_interrupt: float | None = None + times_dpc: float | None = None + times_percent_user: float | None = None + times_percent_system: float | None = None + times_percent_idle: float | None = None + times_percent_interrupt: float | None = None + times_percent_dpc: float | None = None + usage: float | None = None + voltage: float | None = None class Cpu(BaseModel): @@ -46,28 +44,28 @@ class Cpu(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - count: Optional[int] = None - frequency_current: Optional[float] = None - frequency_min: Optional[float] = None - frequency_max: Optional[float] = None - load_average: Optional[float] = None - power_package: Optional[float] = None - stats_ctx_switches: Optional[int] = None - stats_interrupts: Optional[int] = None - stats_soft_interrupts: Optional[int] = None - stats_syscalls: Optional[int] = None - temperature: Optional[float] = None - times_user: Optional[float] = None - times_system: Optional[float] = None - times_idle: Optional[float] = None - times_interrupt: Optional[float] = None - times_dpc: Optional[float] = None - times_percent_user: Optional[float] = None - times_percent_system: Optional[float] = None - times_percent_idle: Optional[float] = None - times_percent_interrupt: Optional[float] = None - times_percent_dpc: Optional[float] = None - usage: Optional[float] = None - voltage: Optional[float] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + count: int | None = None + frequency_current: float | None = None + frequency_min: float | None = None + frequency_max: float | None = None + load_average: float | None = None + power_package: float | None = None + stats_ctx_switches: int | None = None + stats_interrupts: int | None = None + stats_soft_interrupts: int | None = None + stats_syscalls: int | None = None + temperature: float | None = None + times_user: float | None = None + times_system: float | None = None + times_idle: float | None = None + times_interrupt: float | None = None + times_dpc: float | None = None + times_percent_user: float | None = None + times_percent_system: float | None = None + times_percent_idle: float | None = None + times_percent_interrupt: float | None = None + times_percent_dpc: float | None = None + usage: float | None = None + voltage: float | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/data.py b/systembridgemodels/data.py index 6aebb33..cf4fee4 100644 --- a/systembridgemodels/data.py +++ b/systembridgemodels/data.py @@ -2,8 +2,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field from .battery import Battery @@ -35,4 +33,4 @@ class DataDict(BaseModel): class Config: extra = Extra.allow - last_updated: dict[str, Optional[float]] = Field(..., description="Last updated") + last_updated: dict[str, float | None] = Field(..., description="Last updated") diff --git a/systembridgemodels/disk.py b/systembridgemodels/disk.py index e805091..22c15e1 100644 --- a/systembridgemodels/disk.py +++ b/systembridgemodels/disk.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -14,12 +12,12 @@ class LastUpdated(BaseModel): """ devices: float - io_counters_read_count: Optional[float] = None - io_counters_write_count: Optional[float] = None - io_counters_read_bytes: Optional[float] = None - io_counters_write_bytes: Optional[float] = None - io_counters_read_time: Optional[float] = None - io_counters_write_time: Optional[float] = None + io_counters_read_count: float | None = None + io_counters_write_count: float | None = None + io_counters_read_bytes: float | None = None + io_counters_write_bytes: float | None = None + io_counters_read_time: float | None = None + io_counters_write_time: float | None = None partitions: float @@ -31,13 +29,13 @@ class Disk(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") + id: str | None = Field(None, description="Event ID") devices: list - io_counters_read_count: Optional[int] = None - io_counters_write_count: Optional[int] = None - io_counters_read_bytes: Optional[int] = None - io_counters_write_bytes: Optional[int] = None - io_counters_read_time: Optional[int] = None - io_counters_write_time: Optional[int] = None + io_counters_read_count: int | None = None + io_counters_write_count: int | None = None + io_counters_read_bytes: int | None = None + io_counters_write_bytes: int | None = None + io_counters_read_time: int | None = None + io_counters_write_time: int | None = None partitions: list - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/display.py b/systembridgemodels/display.py index df5f0d8..3268464 100644 --- a/systembridgemodels/display.py +++ b/systembridgemodels/display.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,7 +11,7 @@ class LastUpdated(BaseModel): Last updated """ - displays: Optional[float] = None + displays: float | None = None class Display(BaseModel): @@ -24,6 +22,6 @@ class Display(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - displays: Optional[list] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + displays: list | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/gpu.py b/systembridgemodels/gpu.py index f66a58c..dca8f77 100644 --- a/systembridgemodels/gpu.py +++ b/systembridgemodels/gpu.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,7 +11,7 @@ class LastUpdated(BaseModel): Last updated """ - gpus: Optional[float] = None + gpus: float | None = None class Gpu(BaseModel): @@ -24,6 +22,6 @@ class Gpu(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - gpus: Optional[list] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + gpus: list | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/media.py b/systembridgemodels/media.py index 8fb9308..73b49cf 100644 --- a/systembridgemodels/media.py +++ b/systembridgemodels/media.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra @@ -16,25 +14,25 @@ class Media(BaseModel): class Config: extra = Extra.allow - album_artist: Optional[str] = None - album_title: Optional[str] = None - artist: Optional[str] = None - duration: Optional[float] = None - is_fast_forward_enabled: Optional[bool] = None - is_next_enabled: Optional[bool] = None - is_pause_enabled: Optional[bool] = None - is_play_enabled: Optional[bool] = None - is_previous_enabled: Optional[bool] = None - is_rewind_enabled: Optional[bool] = None - is_stop_enabled: Optional[bool] = None - playback_rate: Optional[float] = None - position: Optional[float] = None - repeat: Optional[str] = None - shuffle: Optional[bool] = None - status: Optional[str] = None - subtitle: Optional[str] = None - thumbnail: Optional[str] = None - title: Optional[str] = None - track_number: Optional[int] = None - type: Optional[str] = None - updated_at: Optional[float] = None + album_artist: str | None = None + album_title: str | None = None + artist: str | None = None + duration: float | None = None + is_fast_forward_enabled: bool | None = None + is_next_enabled: bool | None = None + is_pause_enabled: bool | None = None + is_play_enabled: bool | None = None + is_previous_enabled: bool | None = None + is_rewind_enabled: bool | None = None + is_stop_enabled: bool | None = None + playback_rate: float | None = None + position: float | None = None + repeat: str | None = None + shuffle: bool | None = None + status: str | None = None + subtitle: str | None = None + thumbnail: str | None = None + title: str | None = None + track_number: int | None = None + type: str | None = None + updated_at: float | None = None diff --git a/systembridgemodels/media_control.py b/systembridgemodels/media_control.py index b2f2f92..9e889c7 100644 --- a/systembridgemodels/media_control.py +++ b/systembridgemodels/media_control.py @@ -4,7 +4,7 @@ from __future__ import annotations from enum import Enum -from typing import Any, Optional +from typing import Any from pydantic import BaseModel @@ -31,4 +31,4 @@ class MediaControl(BaseModel): """ action: Action - value: Optional[Any] = None + value: Any | None = None diff --git a/systembridgemodels/media_files.py b/systembridgemodels/media_files.py index 6b4ce1f..516f2c0 100644 --- a/systembridgemodels/media_files.py +++ b/systembridgemodels/media_files.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel @@ -23,7 +21,7 @@ class File(BaseModel): is_directory: bool is_file: bool is_link: bool - mime_type: Optional[str] = None + mime_type: str | None = None class MediaFiles(BaseModel): diff --git a/systembridgemodels/media_get_files.py b/systembridgemodels/media_get_files.py index f97b8c9..1cb6bc7 100644 --- a/systembridgemodels/media_get_files.py +++ b/systembridgemodels/media_get_files.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel @@ -14,4 +12,4 @@ class MediaGetFiles(BaseModel): """ base: str - path: Optional[str] = None + path: str | None = None diff --git a/systembridgemodels/media_play.py b/systembridgemodels/media_play.py index bd08fcb..e63a831 100644 --- a/systembridgemodels/media_play.py +++ b/systembridgemodels/media_play.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel @@ -13,10 +11,10 @@ class MediaPlay(BaseModel): Media Play """ - album: Optional[str] = None - artist: Optional[str] = None - autoplay: Optional[bool] = False - cover: Optional[str] = None - title: Optional[str] = None + album: str | None = None + artist: str | None = None + autoplay: bool | None = False + cover: str | None = None + title: str | None = None url: str - volume: Optional[float] = 40 + volume: float | None = 40 diff --git a/systembridgemodels/memory.py b/systembridgemodels/memory.py index 7fc4e3b..6b6eeac 100644 --- a/systembridgemodels/memory.py +++ b/systembridgemodels/memory.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,17 +11,17 @@ class LastUpdated(BaseModel): Last updated """ - swap_total: Optional[float] = None - swap_used: Optional[float] = None - swap_free: Optional[float] = None - swap_percent: Optional[float] = None - swap_sin: Optional[float] = None - swap_sout: Optional[float] = None - virtual_total: Optional[float] = None - virtual_available: Optional[float] = None - virtual_percent: Optional[float] = None - virtual_used: Optional[float] = None - virtual_free: Optional[float] = None + swap_total: float | None = None + swap_used: float | None = None + swap_free: float | None = None + swap_percent: float | None = None + swap_sin: float | None = None + swap_sout: float | None = None + virtual_total: float | None = None + virtual_available: float | None = None + virtual_percent: float | None = None + virtual_used: float | None = None + virtual_free: float | None = None class Memory(BaseModel): @@ -34,16 +32,16 @@ class Memory(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - swap_total: Optional[int] = None - swap_used: Optional[int] = None - swap_free: Optional[float] = None - swap_percent: Optional[float] = None - swap_sin: Optional[int] = None - swap_sout: Optional[int] = None - virtual_total: Optional[int] = None - virtual_available: Optional[int] = None - virtual_percent: Optional[float] = None - virtual_used: Optional[int] = None - virtual_free: Optional[int] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + swap_total: int | None = None + swap_used: int | None = None + swap_free: float | None = None + swap_percent: float | None = None + swap_sin: int | None = None + swap_sout: int | None = None + virtual_total: int | None = None + virtual_available: int | None = None + virtual_percent: float | None = None + virtual_used: int | None = None + virtual_free: int | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/network.py b/systembridgemodels/network.py index 0e32e87..224b747 100644 --- a/systembridgemodels/network.py +++ b/systembridgemodels/network.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -13,14 +11,14 @@ class LastUpdated(BaseModel): Last updated """ - io_counters_bytes_sent: Optional[float] = None - io_counters_bytes_recv: Optional[float] = None - io_counters_packets_sent: Optional[float] = None - io_counters_packets_recv: Optional[float] = None - io_counters_errin: Optional[float] = None - io_counters_errout: Optional[float] = None - io_counters_dropin: Optional[float] = None - io_counters_dropout: Optional[float] = None + io_counters_bytes_sent: float | None = None + io_counters_bytes_recv: float | None = None + io_counters_packets_sent: float | None = None + io_counters_packets_recv: float | None = None + io_counters_errin: float | None = None + io_counters_errout: float | None = None + io_counters_dropin: float | None = None + io_counters_dropout: float | None = None class Network(BaseModel): @@ -31,13 +29,13 @@ class Network(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - io_counters_bytes_sent: Optional[int] = None - io_counters_bytes_recv: Optional[int] = None - io_counters_packets_sent: Optional[int] = None - io_counters_packets_recv: Optional[int] = None - io_counters_errin: Optional[int] = None - io_counters_errout: Optional[int] = None - io_counters_dropin: Optional[int] = None - io_counters_dropout: Optional[int] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + io_counters_bytes_sent: int | None = None + io_counters_bytes_recv: int | None = None + io_counters_packets_sent: int | None = None + io_counters_packets_recv: int | None = None + io_counters_errin: int | None = None + io_counters_errout: int | None = None + io_counters_dropin: int | None = None + io_counters_dropout: int | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/notification.py b/systembridgemodels/notification.py index 879533b..4751383 100644 --- a/systembridgemodels/notification.py +++ b/systembridgemodels/notification.py @@ -3,7 +3,7 @@ from __future__ import annotations -from typing import Any, Optional +from typing import Any from pydantic import BaseModel, confloat @@ -14,13 +14,13 @@ class Action(BaseModel): """ command: str - data: Optional[dict[str, Any]] = None + data: dict[str, Any] | None = None label: str class Audio(BaseModel): source: str - volume: Optional[confloat(ge=0.0, le=100.0)] = None + volume: confloat(ge=0.0, le=100.0) | None = None class Notification(BaseModel): @@ -29,9 +29,9 @@ class Notification(BaseModel): """ title: str - message: Optional[str] = None - icon: Optional[str] = None - image: Optional[str] = None - actions: Optional[list[Action]] = None - timeout: Optional[float] = None - audio: Optional[Audio] = None + message: str | None = None + icon: str | None = None + image: str | None = None + actions: list[Action] | None = None + timeout: float | None = None + audio: Audio | None = None diff --git a/systembridgemodels/processes.py b/systembridgemodels/processes.py index 5a4c971..e8ac12d 100644 --- a/systembridgemodels/processes.py +++ b/systembridgemodels/processes.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -18,13 +16,13 @@ class Config: id: float = Field(..., description="ID") name: str = Field(..., description="Name") - cpu_usage: Optional[float] = Field(None, description="CPU usage percentage") - created: Optional[float] = Field(None, description="Created time (epoch)") - memory_usage: Optional[float] = Field(None, description="Memory usage percentage") - path: Optional[str] = Field(None, description="Path") - status: Optional[str] = Field(None, description="Status") - username: Optional[str] = Field(None, description="Username") - working_directory: Optional[str] = Field(None, description="Working directory") + cpu_usage: float | None = Field(None, description="CPU usage percentage") + created: float | None = Field(None, description="Created time (epoch)") + memory_usage: float | None = Field(None, description="Memory usage percentage") + path: str | None = Field(None, description="Path") + status: str | None = Field(None, description="Status") + username: str | None = Field(None, description="Username") + working_directory: str | None = Field(None, description="Working directory") class LastUpdated(BaseModel): @@ -41,7 +39,7 @@ class Processes(BaseModel): Processes """ - id: Optional[str] = Field(None, description="Event ID") + id: str | None = Field(None, description="Event ID") count: float processes: list[Process] = Field(..., description="Processes") - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + last_updated: LastUpdated | None = Field(None, description="Last updated") diff --git a/systembridgemodels/request.py b/systembridgemodels/request.py index f25070d..529938b 100644 --- a/systembridgemodels/request.py +++ b/systembridgemodels/request.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -16,6 +14,6 @@ class Request(BaseModel): class Config: extra = Extra.allow - api_key: Optional[str] = Field(None, description="API Key") - id: Optional[str] = Field(None, description="Message ID") + api_key: str | None = Field(None, description="API Key") + id: str | None = Field(None, description="Message ID") event: str = Field(..., description="Event") diff --git a/systembridgemodels/response.py b/systembridgemodels/response.py index 5ed66ca..f456baf 100644 --- a/systembridgemodels/response.py +++ b/systembridgemodels/response.py @@ -3,7 +3,7 @@ from __future__ import annotations -from typing import Any, Optional +from typing import Any from pydantic import BaseModel, Extra, Field @@ -16,9 +16,9 @@ class Response(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Message ID") + id: str | None = Field(None, description="Message ID") type: str = Field(..., description="Type") - subtype: Optional[str] = Field(None, description="Subtype") - message: Optional[str] = Field(None, description="Message") - module: Optional[str] = Field(None, description="Module") - data: Optional[Any] = Field(None, description="Data") + subtype: str | None = Field(None, description="Subtype") + message: str | None = Field(None, description="Message") + module: str | None = Field(None, description="Module") + data: Any | None = Field(None, description="Data") diff --git a/systembridgemodels/sensors.py b/systembridgemodels/sensors.py index 3bc5c94..41d6989 100644 --- a/systembridgemodels/sensors.py +++ b/systembridgemodels/sensors.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Extra, Field @@ -16,5 +14,5 @@ class Sensors(BaseModel): class Config: extra = Extra.allow - id: Optional[str] = Field(None, description="Event ID") - last_updated: Optional[dict[str, float]] = Field(None, description="Last updated") + id: str | None = Field(None, description="Event ID") + last_updated: dict[str, float] | None = Field(None, description="Last updated") diff --git a/systembridgemodels/system.py b/systembridgemodels/system.py index 8dd480e..d340eac 100644 --- a/systembridgemodels/system.py +++ b/systembridgemodels/system.py @@ -3,8 +3,6 @@ from __future__ import annotations -from typing import Optional - from pydantic import BaseModel, Field @@ -13,22 +11,22 @@ class LastUpdated(BaseModel): Last updated """ - active_user_id: Optional[float] = None - active_user_name: Optional[float] = None + active_user_id: float | None = None + active_user_name: float | None = None boot_time: float - camera_usage: Optional[float] = None + camera_usage: float | None = None fqdn: float hostname: float ip_address_4: float mac_address: float - pending_reboot: Optional[float] = None + pending_reboot: float | None = None platform: float platform_version: float uptime: float uuid: float version: float - version_latest: Optional[float] = None - version_newer_available: Optional[float] = None + version_latest: float | None = None + version_newer_available: float | None = None class System(BaseModel): @@ -36,21 +34,21 @@ class System(BaseModel): System """ - id: Optional[str] = Field(None, description="Event ID") - active_user_id: Optional[float] = None - active_user_name: Optional[str] = None + id: str | None = Field(None, description="Event ID") + active_user_id: float | None = None + active_user_name: str | None = None boot_time: float - camera_usage: Optional[list[str]] = None + camera_usage: list[str] | None = None fqdn: str hostname: str ip_address_4: str mac_address: str - pending_reboot: Optional[bool] = None + pending_reboot: bool | None = None platform: str platform_version: str uptime: float uuid: str version: str - version_latest: Optional[str] = None - version_newer_available: Optional[bool] = None - last_updated: Optional[LastUpdated] = Field(None, description="Last updated") + version_latest: str | None = None + version_newer_available: bool | None = None + last_updated: LastUpdated | None = Field(None, description="Last updated")