feat: complete T-534 generated reset enhancements

tests/test_ai.py

@@ -802,6 +802,51 @@ class AITests(TempDirMixin, unittest.TestCase):
 
         self.assert_removed(temp_dir)
 
+    def test_generate_batch_fills_reset_cover_after_committed_history(self):
+        with self.make_temp_dir() as temp_dir:
+            cfg = self._config()
+            cfg["db_path"] = os.path.join(temp_dir, "cmshopee.db")
+            cfg["image_dir"] = os.path.join(temp_dir, "images")
+            cfg["ai"]["generate_cover"] = True
+            batch_id, tasks = self._collected_tasks(temp_dir, cfg, ["旧标题"])
+            db.set_generated(tasks[0].id, "手动标题", "old-new.jpg", path=cfg["db_path"])
+            db.set_applied(tasks[0].id, True, path=cfg["db_path"])
+            db.reset_generated(
+                tasks[0].id,
+                reset_title=False,
+                reset_cover=True,
+                path=cfg["db_path"],
+            )
+            cover_only_task = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])[0]
+
+            def fake_cover(cover_prompt, old_cover_path, out_path, **kwargs):
+                os.makedirs(os.path.dirname(out_path), exist_ok=True)
+                with open(out_path, "wb") as fh:
+                    fh.write(b"jpeg")
+                return out_path
+
+            with mock.patch("app.ai.gen_title") as gen_title, \
+                    mock.patch("app.ai.gen_cover", side_effect=fake_cover) as gen_cover:
+                summary = ai.generate_batch(
+                    [cover_only_task],
+                    {"title": "标题提示", "cover": "封面 {新标题}"},
+                    ai_cfg={"config": cfg, "db_path": cfg["db_path"]},
+                )
+
+            self.assertTrue(summary["ok"])
+            self.assertEqual(1, summary["total"])
+            self.assertEqual(0, summary["title_total"])
+            self.assertEqual(1, summary["cover_total"])
+            gen_title.assert_not_called()
+            gen_cover.assert_called_once()
+            updated = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])[0]
+            self.assertEqual("手动标题", updated.new_title)
+            self.assertTrue(os.path.exists(updated.new_cover_path))
+            self.assertEqual(1, updated.committed)
+            self.assertEqual(1, updated.apply_attempts)
+
+        self.assert_removed(temp_dir)
+
     def test_generate_batch_handles_mixed_title_and_cover_gaps(self):
         with self.make_temp_dir() as temp_dir:
             cfg = self._config()

tests/test_db.py

@@ -168,7 +168,7 @@ class DbTests(TempDirMixin, unittest.TestCase):
             self.assertEqual(new_cover, reset_generated["new_cover_path"])
             self.assertIsNone(reset_generated["deleted_file"])
             self.assertTrue(os.path.exists(new_cover))
-            self.assertEqual("collected", after_generated.stage)
+            self.assertEqual("generated", after_generated.stage)
             self.assertEqual("success", after_generated.status)
             self.assertIsNone(after_generated.new_title)
             self.assertIsNone(after_generated.new_cover_path)
@@ -177,6 +177,81 @@ class DbTests(TempDirMixin, unittest.TestCase):
 
         self.assert_removed(temp_dir)
 
+    def test_reset_generated_can_reset_title_or_cover_components(self):
+        with self.make_temp_dir() as temp_dir:
+            db_path = os.path.join(temp_dir, "cmshopee.db")
+            db.init_db(db_path)
+            batch_id = db.create_batch(["input.xlsx"], path=db_path)
+            db.insert_tasks(
+                batch_id,
+                [
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "Sheet1",
+                        "source_row": 2,
+                        "account_name": "shop",
+                        "alias": "alias",
+                        "item_id": "51100639510",
+                    },
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "Sheet1",
+                        "source_row": 3,
+                        "account_name": "shop",
+                        "alias": "alias",
+                        "item_id": "51100639511",
+                    },
+                ],
+                path=db_path,
+            )
+            first, second = db.list_tasks(batch_id=batch_id, path=db_path)
+            first_cover = os.path.join(temp_dir, "first_new.jpg")
+            second_cover = os.path.join(temp_dir, "second_new.jpg")
+            for cover in [first_cover, second_cover]:
+                with open(cover, "wb") as fh:
+                    fh.write(b"jpeg")
+            db.set_collected(first.id, "旧标题A", "old-a.jpg", path=db_path)
+            db.set_generated(first.id, "手动标题A", first_cover, path=db_path)
+            db.mark_failed(first.id, "generate", "图片不满意", path=db_path)
+            db.set_collected(second.id, "旧标题B", "old-b.jpg", path=db_path)
+            db.set_generated(second.id, "手动标题B", second_cover, path=db_path)
+
+            title_reset = db.reset_generated(
+                first.id,
+                reset_title=True,
+                reset_cover=False,
+                path=db_path,
+            )
+            after_title = title_reset["after"]
+            self.assertEqual("generated", after_title.stage)
+            self.assertEqual("success", after_title.status)
+            self.assertIsNone(after_title.new_title)
+            self.assertEqual(first_cover, after_title.new_cover_path)
+            self.assertIsNone(after_title.last_error)
+            self.assertTrue(os.path.exists(first_cover))
+
+            cover_reset = db.reset_generated(
+                second.id,
+                reset_title=False,
+                reset_cover=True,
+                delete_file=True,
+                path=db_path,
+            )
+            after_cover = cover_reset["after"]
+            self.assertEqual("generated", after_cover.stage)
+            self.assertEqual("success", after_cover.status)
+            self.assertEqual("手动标题B", after_cover.new_title)
+            self.assertIsNone(after_cover.new_cover_path)
+            self.assertEqual(second_cover, cover_reset["deleted_file"])
+            self.assertFalse(os.path.exists(second_cover))
+
+            with self.assertRaises(db.DbError):
+                db.reset_generated(first.id, reset_title=False, reset_cover=False, path=db_path)
+            with self.assertRaises(db.DbError):
+                db.reset_generated(first.id, reset_title=True, reset_cover=False, delete_file=True, path=db_path)
+
+        self.assert_removed(temp_dir)
+
 
     def test_delete_batch_soft_hides_batch_and_tasks(self):
         with self.make_temp_dir() as temp_dir:

tests/test_gui.py

@@ -17,6 +17,7 @@ from app import accounts, ai, appconfig, db, prompts
 if gui.QT_IMPORT_ERROR is not None:
     raise unittest.SkipTest("PySide6 未安装")
 
+from PySide6.QtCore import QItemSelectionModel
 from PySide6.QtGui import QTextCursor
 from PySide6.QtWidgets import QApplication, QCheckBox, QLineEdit, QPlainTextEdit, QProgressBar, QTableView
 
@@ -1540,14 +1541,15 @@ class GuiTests(TempDirMixin, unittest.TestCase):
             self.addCleanup(tab.close)
             tab.task_table.selectRow(0)
 
-            with mock.patch("app.gui.QMessageBox.question", return_value=gui.QMessageBox.Yes) as question:
+            message_box, boxes = self.make_fake_message_box("重置全部")
+            with mock.patch("app.gui.tabs.generate.QMessageBox", message_box):
                 tab.reset_generated_result()
 
-            message = question.call_args[0][2]
+            message = boxes[0].text
             self.assertIn("默认不删除本地新封面文件", message)
-            self.assertIn(new_cover, message)
+            self.assertIn("重置全部", message)
             updated = db.get_task(task.id, path=cfg["db_path"])
-            self.assertEqual("collected", updated.stage)
+            self.assertEqual("generated", updated.stage)
             self.assertEqual("success", updated.status)
             self.assertIsNone(updated.new_title)
             self.assertIsNone(updated.new_cover_path)
@@ -1555,12 +1557,147 @@ class GuiTests(TempDirMixin, unittest.TestCase):
             run_log = db.list_run_logs(limit=1, run_type="reset", path=cfg["db_path"])[0]
             self.assertEqual("done", run_log.status)
             self.assertEqual("reset_generated", run_log.options["action"])
+            self.assertEqual("all", run_log.options["mode"])
             events = db.list_run_log_events(run_log.id, path=cfg["db_path"])
             self.assertTrue(any("action=reset_generated" in event.message for event in events))
             self.assertIn("已重置生成结果", statuses[-1])
 
         self.assert_removed(temp_dir)
 
+    def test_generate_tab_resets_titles_for_current_filtered_tasks(self):
+        with self.make_temp_dir() as temp_dir:
+            cfg = self.make_config(temp_dir)
+            accounts.create_account("主店", "alias-a", debug_port=9222, config=cfg)
+            batch_id = db.create_batch(["input.xlsx"], path=cfg["db_path"])
+            db.insert_tasks(
+                batch_id,
+                [
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "商品",
+                        "source_row": 2,
+                        "account_name": "Excel主店",
+                        "alias": "alias-a",
+                        "item_id": "51100639510",
+                    },
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "商品",
+                        "source_row": 3,
+                        "account_name": "Excel主店",
+                        "alias": "alias-a",
+                        "item_id": "51100639511",
+                    },
+                ],
+                path=cfg["db_path"],
+            )
+            tasks = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])
+            for index, task in enumerate(tasks):
+                db.set_collected(task.id, f"旧标题{index}", f"old-{index}.jpg", path=cfg["db_path"])
+                db.set_generated(task.id, f"新标题{index}", f"new-{index}.jpg", path=cfg["db_path"])
+            statuses = []
+            tab = GenerateTab(config=cfg, status_callback=statuses.append)
+            self.addCleanup(tab.close)
+            tab.task_table.clearSelection()
+
+            message_box, boxes = self.make_fake_message_box("重置标题")
+            with mock.patch("app.gui.tabs.generate.QMessageBox", message_box):
+                tab.reset_generated_result()
+
+            self.assertIn("当前筛选结果 2 条", boxes[0].text)
+            updated = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])
+            self.assertEqual([None, None], [task.new_title for task in updated])
+            self.assertEqual(["new-0.jpg", "new-1.jpg"], [task.new_cover_path for task in updated])
+            self.assertTrue(all(task.stage == "generated" for task in updated))
+            run_log = db.list_run_logs(limit=1, run_type="reset", path=cfg["db_path"])[0]
+            self.assertEqual("filtered", run_log.options["scope"])
+            self.assertEqual("title", run_log.options["mode"])
+            self.assertTrue(run_log.options["reset_title"])
+            self.assertFalse(run_log.options["reset_cover"])
+            self.assertEqual(2, run_log.total)
+            self.assertIn("已重置生成结果：2 条，内容：标题", statuses[-1])
+
+        self.assert_removed(temp_dir)
+
+    def test_generate_tab_resets_selected_covers_and_keeps_manual_titles(self):
+        with self.make_temp_dir() as temp_dir:
+            cfg = self.make_config(temp_dir)
+            accounts.create_account("主店", "alias-a", debug_port=9222, config=cfg)
+            batch_id = db.create_batch(["input.xlsx"], path=cfg["db_path"])
+            db.insert_tasks(
+                batch_id,
+                [
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "商品",
+                        "source_row": 2,
+                        "account_name": "Excel主店",
+                        "alias": "alias-a",
+                        "item_id": "51100639510",
+                    },
+                    {
+                        "source_file_abs": os.path.join(temp_dir, "input.xlsx"),
+                        "source_sheet": "商品",
+                        "source_row": 3,
+                        "account_name": "Excel主店",
+                        "alias": "alias-a",
+                        "item_id": "51100639511",
+                    },
+                ],
+                path=cfg["db_path"],
+            )
+            tasks = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])
+            for index, task in enumerate(tasks):
+                db.set_collected(task.id, f"旧标题{index}", f"old-{index}.jpg", path=cfg["db_path"])
+                db.set_generated(task.id, f"手动标题{index}", f"new-{index}.jpg", path=cfg["db_path"])
+            db.set_applied(tasks[0].id, True, path=cfg["db_path"])
+            tab = GenerateTab(config=cfg)
+            self.addCleanup(tab.close)
+            selection = tab.task_table.selectionModel()
+            for row in [0, 1]:
+                selection.select(
+                    tab.model.index(row, 0),
+                    QItemSelectionModel.Select | QItemSelectionModel.Rows,
+                )
+
+            message_box, boxes = self.make_fake_message_box("重置封面")
+            with mock.patch("app.gui.tabs.generate.QMessageBox", message_box):
+                tab.reset_generated_result()
+
+            message = boxes[0].text
+            self.assertIn("选中任务 2 条", message)
+            self.assertIn("已经提交过线上", message)
+            self.assertIn("重生成后再更新会再次提交线上", message)
+            updated = db.list_tasks(batch_id=batch_id, path=cfg["db_path"])
+            self.assertEqual(["手动标题0", "手动标题1"], [task.new_title for task in updated])
+            self.assertEqual([None, None], [task.new_cover_path for task in updated])
+            self.assertEqual("generated", updated[0].stage)
+            self.assertEqual(1, updated[0].committed)
+            run_log = db.list_run_logs(limit=1, run_type="reset", path=cfg["db_path"])[0]
+            self.assertEqual("selected", run_log.options["scope"])
+            self.assertEqual("cover", run_log.options["mode"])
+            self.assertFalse(run_log.options["reset_title"])
+            self.assertTrue(run_log.options["reset_cover"])
+            self.assertEqual(1, run_log.options["committed_count"])
+
+        self.assert_removed(temp_dir)
+
+    def test_generate_tab_disables_reset_while_generation_running(self):
+        with self.make_temp_dir() as temp_dir:
+            cfg = self.make_config(temp_dir)
+            statuses = []
+            tab = GenerateTab(config=cfg, status_callback=statuses.append)
+            self.addCleanup(tab.close)
+
+            tab._set_generate_running(True)
+            self.assertFalse(tab.reset_generate_button.isEnabled())
+            tab.generate_thread = object()
+            tab.reset_generated_result()
+
+            self.assertIn("AI 生成正在进行，不能重置", statuses[-1])
+
+        self.assert_removed(temp_dir)
+
     def test_generate_worker_calls_generate_batch_and_emits_signals(self):
         with self.make_temp_dir() as temp_dir:
             cfg = self.make_config(temp_dir)