fix: drop default task_logs; process in log, progress in task center (v1.0.81)

tests/test_video_service.py

@@ -1,9 +1,8 @@
 # -*- coding: utf-8 -*-
-"""RpaVideoSession 模板示范与 result_summary / CLI 输出测试。"""
+"""RpaVideoSession 模板示范与 finish() video 字段 / CLI 输出测试。"""
 from __future__ import annotations
 
 import io
-import json
 import os
 import re
 import unittest
@@ -131,7 +130,7 @@ class TestPrintVideoSummary(unittest.TestCase):
 
 
 class TestMergeVideoIntoResultSummary(unittest.TestCase):
-    def test_result_summary_includes_video_fields(self) -> None:
+    def test_finish_payload_includes_video_fields(self) -> None:
         from service.task_run_support import merge_video_into_result_summary
 
         video_info = {
@@ -202,9 +201,17 @@ class TestTemplateRunVideoSession(unittest.TestCase):
                     return None
 
             with patch.object(task_service, "RpaVideoSession", _CapturingFakeSession):
+                finish_kwargs: list[dict] = []
+                original_finish = task_service.finish
+
+                def _capture_finish(*args, **kwargs):
+                    finish_kwargs.append(kwargs)
+                    return original_finish(*args, **kwargs)
+
                 buf = io.StringIO()
-                with redirect_stdout(buf), redirect_stderr(io.StringIO()):
-                    rc = task_service.cmd_run(target="demo-target", input_id="42")
+                with patch.object(task_service, "finish", side_effect=_capture_finish):
+                    with redirect_stdout(buf), redirect_stderr(io.StringIO()):
+                        rc = task_service.cmd_run(target="demo-target", input_id="42")
 
             self.assertEqual(rc, 1)
             self.assertTrue(created, "RpaVideoSession should be constructed")
@@ -220,39 +227,39 @@ class TestTemplateRunVideoSession(unittest.TestCase):
             out = buf.getvalue()
             self.assertIn("模板", out)
 
-            from db import task_logs_repository as tlr
-
-            rows = tlr.list_task_logs(1)
-            self.assertTrue(rows)
-            summary = json.loads(rows[0][7])
+            self.assertTrue(finish_kwargs, "finish() should be called")
+            summary = finish_kwargs[-1]
             self.assertIn("video", summary)
             self.assertIn("video_path", summary)
 
 
-class TestCmdRunTaskLogCoverage(unittest.TestCase):
-    def test_cmd_run_entitlement_failure_writes_task_log(self) -> None:
+class TestCmdRunFinishCoverage(unittest.TestCase):
+    def test_cmd_run_entitlement_failure_calls_finish(self) -> None:
         with IsolatedDataRoot(user_id="_entitlement_fail"):
             from service import task_service
 
+            finish_kwargs: list[dict] = []
+            original_finish = task_service.finish
+
+            def _capture_finish(*args, **kwargs):
+                finish_kwargs.append(kwargs)
+                return original_finish(*args, **kwargs)
+
             with patch.object(task_service, "check_entitlement", return_value=(False, "mock denied")):
-                buf = io.StringIO()
-                with redirect_stdout(buf), redirect_stderr(io.StringIO()):
-                    rc = task_service.cmd_run(target="t1", input_id="99")
+                with patch.object(task_service, "finish", side_effect=_capture_finish):
+                    buf = io.StringIO()
+                    with redirect_stdout(buf), redirect_stderr(io.StringIO()):
+                        rc = task_service.cmd_run(target="t1", input_id="99")
 
             self.assertEqual(rc, 1)
-            from db import task_logs_repository as tlr
+            self.assertTrue(finish_kwargs)
+            payload = finish_kwargs[-1]
+            self.assertEqual(payload.get("status"), "failed")
+            self.assertEqual(payload.get("error_code"), "ENTITLEMENT_DENIED")
+            self.assertEqual(payload.get("stage"), "auth")
+            self.assertIn("mock denied", payload.get("message") or "")
 
-            rows = tlr.list_task_logs(1)
-            self.assertTrue(rows)
-            _rid, _ttype, tid, iid, _ititle, status, err, rsum, _cat, _uat = rows[0]
-            self.assertEqual(status, "failed")
-            self.assertEqual(tid, "t1")
-            self.assertEqual(iid, "99")
-            self.assertIn("mock denied", err or "")
-            summary = json.loads(rsum or "{}")
-            self.assertEqual(summary.get("stage"), "auth")
-
-    def test_cmd_run_exception_writes_task_log(self) -> None:
+    def test_cmd_run_exception_calls_finish(self) -> None:
         with IsolatedDataRoot(user_id="_exception_run"):
             os.environ["OPENCLAW_RECORD_VIDEO"] = "0"
             config.reset_cache()
@@ -262,25 +269,26 @@ class TestCmdRunTaskLogCoverage(unittest.TestCase):
             async def _boom(*_args, **_kwargs):
                 raise RuntimeError("boom")
 
+            finish_kwargs: list[dict] = []
+            original_finish = task_service.finish
+
+            def _capture_finish(*args, **kwargs):
+                finish_kwargs.append(kwargs)
+                return original_finish(*args, **kwargs)
+
             with patch.object(task_service, "check_entitlement", return_value=(True, "")):
                 with patch.object(task_service, "_run_template_demo", side_effect=_boom):
-                    buf = io.StringIO()
-                    with redirect_stdout(buf), redirect_stderr(io.StringIO()):
-                        rc = task_service.cmd_run(target="t2", input_id="88")
+                    with patch.object(task_service, "finish", side_effect=_capture_finish):
+                        buf = io.StringIO()
+                        with redirect_stdout(buf), redirect_stderr(io.StringIO()):
+                            rc = task_service.cmd_run(target="t2", input_id="88")
 
             self.assertEqual(rc, 1)
-            from db import task_logs_repository as tlr
-
-            rows = tlr.list_task_logs(1)
-            self.assertTrue(rows)
-            _rid, _ttype, tid, iid, _ititle, status, err, rsum, _cat, _uat = rows[0]
-            self.assertEqual(status, "failed")
-            self.assertEqual(tid, "t2")
-            self.assertEqual(iid, "88")
-            self.assertIn("任务执行异常", err or "")
-            summary = json.loads(rsum or "{}")
-            self.assertEqual(summary.get("stage"), "run")
-            self.assertEqual(summary.get("error"), "unexpected_exception")
+            self.assertTrue(finish_kwargs)
+            payload = finish_kwargs[-1]
+            self.assertEqual(payload.get("status"), "failed")
+            self.assertEqual(payload.get("stage"), "run")
+            self.assertIn("任务执行异常", payload.get("message") or "")
 
     def test_get_task_logger_fallback_when_not_initialized(self) -> None:
         from service import task_service