diff --git a/Version.toml b/Version.toml index fbe88bb..f398acf 100644 --- a/Version.toml +++ b/Version.toml @@ -1,8 +1,8 @@ [version] major = 1 minor = 5 -patch = 3 +patch = 4 [build] date = "2026-09-27" -time = "21:35:33" +time = "21:55:47" diff --git a/app/api.py b/app/api.py index 6636560..e1e6b17 100644 --- a/app/api.py +++ b/app/api.py @@ -362,20 +362,32 @@ def get_status() -> dict: auto_controller .manual_target_temperature ) - elif ( - tion_status is not None - and schedule_service is not None - ): - resolution = schedule_service.resolve() + elif tion_status is not None: + schedule = schedule_service - if ( - resolution.enabled - and resolution.auto_active - and resolution.auto_target_temp is not None - ): - tion_status["target_temp"] = ( - resolution.auto_target_temp - ) + if schedule is not None: + # Ручной override имеет приоритет над AUTO. + if ( + schedule.override_active + and schedule.override_settings.target_temp + is not None + ): + tion_status["target_temp"] = ( + schedule.override_settings.target_temp + ) + + else: + resolution = schedule.resolve() + + if ( + resolution.enabled + and resolution.auto_active + and resolution.auto_target_temp + is not None + ): + tion_status["target_temp"] = ( + resolution.auto_target_temp + )