feat: re-add per-run sud log alongside the continuous server log
SudLogTask reuses ServerLogTask's sample format but only records while
a Sud run is active: starts on Play (fresh start only, not a Pause
resume) and writes logs/log_{date_time}_{sud_name}.log on Stop or
natural completion.
Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01TvgC7oy9MxaA4ZQxXqkNdS
This commit is contained in:
@@ -6,3 +6,4 @@ from tasks.pot import PotTask
|
||||
from tasks.tempctrl import TcTask
|
||||
from tasks.sud import SudTask
|
||||
from tasks.server_log import ServerLogTask
|
||||
from tasks.sud_log import SudLogTask
|
||||
|
||||
+22
-12
@@ -34,24 +34,34 @@ class ServerLogTask(ATask):
|
||||
|
||||
async def on_process(self):
|
||||
while True:
|
||||
power_set = max(self.heater_task.power_soll, self.heater_task.power_actor)
|
||||
self._samples.append({
|
||||
't': time.monotonic() - self._t0,
|
||||
'timestamp': time.time(),
|
||||
'temp_ist': self.tc.theta_ist,
|
||||
'temp_soll': self.tc.theta_soll_set,
|
||||
'rate_ist': self.tc.heatrate_ist,
|
||||
'rate_soll': self.tc.heatrate_soll,
|
||||
'power_set': power_set,
|
||||
'power_eff': self.heater.power_eff,
|
||||
})
|
||||
if self._should_sample():
|
||||
self._samples.append(self._take_sample())
|
||||
await asyncio.sleep(self.interval)
|
||||
|
||||
def _should_sample(self):
|
||||
return True
|
||||
|
||||
def _take_sample(self):
|
||||
power_set = max(self.heater_task.power_soll, self.heater_task.power_actor)
|
||||
return {
|
||||
't': time.monotonic() - self._t0,
|
||||
'timestamp': time.time(),
|
||||
'temp_ist': self.tc.theta_ist,
|
||||
'temp_soll': self.tc.theta_soll_set,
|
||||
'rate_ist': self.tc.heatrate_ist,
|
||||
'rate_soll': self.tc.heatrate_soll,
|
||||
'power_set': power_set,
|
||||
'power_eff': self.heater.power_eff,
|
||||
}
|
||||
|
||||
def _filename(self):
|
||||
return 'log_{}.json'.format(self._run_id)
|
||||
|
||||
def write(self):
|
||||
if not self._samples:
|
||||
return
|
||||
os.makedirs(self.path, exist_ok=True)
|
||||
filename = 'log_{}.json'.format(self._run_id)
|
||||
filename = self._filename()
|
||||
path = os.path.join(self.path, filename)
|
||||
log_data = {'Name': ''}
|
||||
if self.dt is not None:
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
import time
|
||||
from tasks.server_log import ServerLogTask
|
||||
from components import APid, AHeater
|
||||
|
||||
|
||||
def _safe_filename_part(text):
|
||||
return "".join(c if c.isalnum() or c in "-_" else "_" for c in text) or "Sud"
|
||||
|
||||
|
||||
class SudLogTask(ServerLogTask):
|
||||
"""Records temp/power samples for a single Sud run - same sample format
|
||||
as ServerLogTask, but only while a run is active: recording starts on
|
||||
Play and is written out on Stop (or natural completion), to
|
||||
logs/log_{date_time}_{sud_name}.log. A Pause/resume doesn't start a new
|
||||
file - only a fresh Play (from IDLE/DONE) does."""
|
||||
|
||||
def __init__(self, tc: APid, heater: AHeater, heater_task, sud, interval, path='./logs', config=None, dt=None):
|
||||
ServerLogTask.__init__(self, tc, heater, heater_task, interval, path, config, dt)
|
||||
self.sud = sud
|
||||
self._active = False
|
||||
|
||||
def _should_sample(self):
|
||||
return self._active
|
||||
|
||||
def _filename(self):
|
||||
name_part = _safe_filename_part(self.sud.name or 'Sud')
|
||||
return 'log_{}_{}.log'.format(self._run_id, name_part)
|
||||
|
||||
def start_run(self):
|
||||
if self._active:
|
||||
return
|
||||
self._samples = []
|
||||
self._t0 = time.monotonic()
|
||||
self._run_id = time.strftime("%Y%m%dT%H%M%S", time.localtime())
|
||||
self._active = True
|
||||
|
||||
def stop_run(self):
|
||||
if not self._active:
|
||||
return
|
||||
self._active = False
|
||||
self.write()
|
||||
self._param_events = []
|
||||
Reference in New Issue
Block a user