feat: add the independent verification workspace and evidence inspector

This commit is contained in:
阿白叔 committed 2026-11-17 15:52:25 +08:00
1 parent f25dd228fd
commit e6e9b6906d
7 files changed
+370 -2

No files matched your search

@@ -30,6 +30,7 @@ def icon(name: str, primary: bool = False) -> QIcon:
BUTTON_ICONS = {
'task_center_navigation': 'grid', 'dsh_navigation': 'chat',
'history_navigation': 'clock',
'verification_navigation': 'check', 'verificationNew': 'plus',
'newTaskButton': 'plus', 'editTaskButton': 'sliders', 'deleteTaskButton': 'trash',
'selectAllTasks': 'check', 'clearTaskSelection': 'close',
'restoreTaskButton': 'refresh', 'taskRecycleBin': 'trash',
@@ -60,6 +60,8 @@ class TrialTaskCenterWindow(MaterialMainWindow):
self.dsh_action = QAction('DSH助手', self)
self.dsh_action.setShortcut('Ctrl+Shift+D')
self.dsh_action.triggered.connect(self._open_dsh)
self.verification_action = QAction('工程校验', self)
self.verification_action.triggered.connect(lambda: self.content_stack.setCurrentWidget(self.verification_panel))
self._navigation_actions = QActionGroup(self)
self._navigation_actions.setExclusive(True)
navigation = QWidget(objectName='toolNavigation')
@@ -70,7 +72,8 @@ class TrialTaskCenterWindow(MaterialMainWindow):
navigation_layout.addWidget(brand)
navigation_layout.addSpacing(24)
for name, action in (('task_center_navigation', self.task_center_action),
('history_navigation', self.history_action), ('dsh_navigation', self.dsh_action)):
('history_navigation', self.history_action), ('dsh_navigation', self.dsh_action),
('verification_navigation', self.verification_action)):
action.setCheckable(True)
self._navigation_actions.addAction(action)
self.addAction(action)
@@ -292,14 +295,20 @@ class TrialTaskCenterWindow(MaterialMainWindow):
self.history_panel = OperationHistoryPage(self.service, self)
self.history_panel.busy_changed.connect(self._history_activity_changed)
self.content_stack.addWidget(self.history_panel)
from .verification_workspace import VerificationWorkspace
self.verification_panel = VerificationWorkspace(self.service, self)
self.content_stack.addWidget(self.verification_panel)
self.content_stack.currentChanged.connect(self._workspace_changed)
self.setCentralWidget(self.content_stack)
self._reset_layout()
def _workspace_changed(self, index):
history = self.content_stack.widget(index) is self.history_panel
(self.task_center_action if index == 0 else self.history_action if history else self.dsh_action).setChecked(True)
verification = self.content_stack.widget(index) is self.verification_panel
action = self.task_center_action if index == 0 else self.history_action if history else self.verification_action if verification else self.dsh_action
action.setChecked(True)
self.history_panel.set_active(history)
self.verification_panel.set_active(verification)
def _history_activity_changed(self):
self._update_gates()
@@ -408,6 +417,7 @@ class TrialTaskCenterWindow(MaterialMainWindow):
self._dsh_status.close()
self._dsh_stall_timer.stop()
self.history_panel.shutdown()
self.verification_panel.shutdown()
if self._dsh_operations:
self._dsh_operations.close()
self._context_query.close()
@@ -0,0 +1,36 @@
"""Asynchronous verification reads; each selection owns its own query generation."""
from PySide6.QtCore import QObject,QThreadPool,Signal,Slot
from .queries import LatestQuery
from .workers import ServiceWorker
class VerificationController(QObject):
changed=Signal()
failed=Signal(object)
def __init__(self,service,parent=None):
super().__init__(parent);self.service=service;self.task_id=None;self.item_id=None
self.tasks_query=LatestQuery(self);self.task_query=LatestQuery(self);self.item_query=LatestQuery(self)
self.workers={};self.closed=False
for query in (self.tasks_query,self.task_query,self.item_query):query.settled.connect(self.changed)
@property
def busy(self):
return bool(self.workers) or any(q.busy for q in (self.tasks_query,self.task_query,self.item_query)) or getattr(self.service,'busy',False)
def command(self,action,received):
if self.closed:return
worker=ServiceWorker(action);self.workers[worker.signals]=(worker,received)
worker.signals.succeeded.connect(self._received);worker.signals.failed.connect(self.failed)
worker.signals.finished.connect(self._finished);QThreadPool.globalInstance().start(worker);self.changed.emit()
@Slot(object)
def _received(self,result):
entry=self.workers.get(self.sender())
if entry and not self.closed:entry[1](result)
@Slot()
def _finished(self):self.workers.pop(self.sender(),None);self.changed.emit()
def close(self):
self.closed=True
for q in (self.tasks_query,self.task_query,self.item_query):q.close()
@@ -0,0 +1,107 @@
"""Deterministic before/after netlist drawing and matching facts."""
import json
from PySide6.QtCore import QRectF,Qt,Signal
from PySide6.QtGui import QColor,QPainter,QPen
from PySide6.QtWidgets import (QWidget,QLabel,QVBoxLayout,QHBoxLayout,QComboBox,QTableWidget,
QTableWidgetItem,QHeaderView,QTabWidget,QScrollArea,QPlainTextEdit,QPushButton)
from ..verification.evidence import verify_evidence
def pin_text(pin):
if pin is None:return '不存在/未覆盖'
if not pin['nets']:return '明确未连接'
return '\n'.join(n['name']+' · '+', '.join(f'{e[1]}.{e[2]}' for e in n['endpoints'] if e!=[None]) for n in pin['nets'])
class ConnectionDiagram(QWidget):
def __init__(self,parent=None):
super().__init__(parent);self.pins=[];self.setMinimumSize(320,220)
def set_pins(self,pins):
self.pins=pins;self.setMinimumHeight(max(220,100+len(pins)*100));self.update()
def paintEvent(self,event):
painter=QPainter(self);painter.setRenderHint(QPainter.RenderHint.Antialiasing)
painter.fillRect(self.rect(),QColor('#ffffff'));w=self.width()/2
for column,phase,title in ((0,'before','修改前'),(1,'after','修改后')):
x=column*w+12
painter.setPen(QColor('#34445b'));painter.drawText(QRectF(x,8,w-24,26),Qt.AlignmentFlag.AlignLeft,title)
painter.setPen(QPen(QColor('#dfe6ef'),1));painter.drawRoundedRect(QRectF(x,40,w-24,self.height()-55),9,9)
for n,row in enumerate(self.pins):
y=64+n*100;pin=row[phase]
color=QColor('#bf3f4a' if row['connection_changed'] else '#b37925' if row['text_changed'] else '#438a89')
painter.setPen(color);painter.drawText(QRectF(x+12,y,w-46,24),Qt.AlignmentFlag.AlignLeft,
f"脚 {row['endpoint'][2]} {pin['logical_name'] if pin else '未覆盖'}")
painter.drawLine(int(x+18),int(y+37),int(x+40),int(y+37))
painter.setPen(QColor('#516078'))
font=painter.font();font.setPointSizeF(8.5);painter.setFont(font)
painter.drawText(QRectF(x+44,y+24,w-78,64),Qt.TextFlag.TextWordWrap,pin_text(pin))
painter.end()
class VerificationInspector(QWidget):
open_raw=Signal(str)
select_version=Signal(int)
def __init__(self,parent=None):
super().__init__(parent);self.evidence=None
layout=QVBoxLayout(self);layout.setContentsMargins(12,8,12,8)
self.heading=QLabel('选择工程查看证据',objectName='projectTitle');layout.addWidget(self.heading)
self.coverage=QLabel('未覆盖:封装库内部映射');self.coverage.setWordWrap(True);layout.addWidget(self.coverage)
row=QHBoxLayout();self.components=QComboBox();self.components.setMinimumWidth(100)
self.versions=QComboBox();self.versions.setToolTip('查看历史输入版本,不改变当前输入')
row.addWidget(self.components,1);row.addWidget(self.versions);layout.addLayout(row)
self.issues=QComboBox();layout.addWidget(self.issues)
self.tabs=QTabWidget();layout.addWidget(self.tabs,1)
self.diagram=ConnectionDiagram();scroll=QScrollArea();scroll.setWidgetResizable(True);scroll.setWidget(self.diagram)
self.tabs.addTab(scroll,'前后接线图')
self.pin_table=QTableWidget(0,5);self.pin_table.setHorizontalHeaderLabels(['脚号','前名称','后名称','前连接','后连接'])
self.pin_table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
self.pin_table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.ResizeToContents)
self.tabs.addTab(self.pin_table,'逐脚事实')
self.facts=QPlainTextEdit();self.facts.setReadOnly(True);self.tabs.addTab(self.facts,'检查与范围')
self.raw=QComboBox();self.raw_button=QPushButton('打开原始证据')
rawrow=QHBoxLayout();rawrow.addWidget(self.raw,1);rawrow.addWidget(self.raw_button);layout.addLayout(rawrow)
self.raw_button.clicked.connect(lambda:self.open_raw.emit(self.raw.currentData()) if self.raw.currentData() else None)
self.components.currentIndexChanged.connect(self._component)
self.issues.currentIndexChanged.connect(self._issue)
self.versions.activated.connect(lambda _:self.select_version.emit(self.versions.currentData()))
def set_record(self,record):
self.versions.blockSignals(True);self.versions.clear()
for version in sorted({record['current_version'],*(h['input_version'] for h in record['history'])},reverse=True):
self.versions.addItem(f'输入 v{version}',version)
self.versions.setCurrentIndex(self.versions.findData(record['input_version']));self.versions.blockSignals(False)
result=((record.get('attempt') or {}).get('result') or {})
self.set_evidence(result.get('evidence'))
self.heading.setText(record['display_name']+' · '+{'CONSISTENT':'一致','WARNING':'需关注','DIFFERENT':'异常','INCOMPLETE':'无法完整校验'}.get(result.get('verdict'),'待校验'))
self.facts.setPlainText(json.dumps({'范围':result.get('scope',record['scope']),'检查':result.get('checks',[]),
'问题':result.get('issues',[]),'执行原因':result.get('reason') or record.get('unavailable_reason'),
'输入摘要':record['payload']['payload_digest'],'尝试':record.get('attempt_id')},ensure_ascii=False,indent=2))
def set_evidence(self,evidence):
if evidence:verify_evidence(evidence)
self.evidence=evidence;self.components.blockSignals(True);self.components.clear();self.issues.blockSignals(True);self.issues.clear();self.raw.clear()
if evidence:
for key in sorted({tuple(p['endpoint'][:2]) for p in evidence['pins']}):self.components.addItem(f'{key[1]} · {key[0]}',key)
self.issues.addItem('全部问题',None)
for issue in evidence['issues']:self.issues.addItem(f"{issue.get('refdes','工程')} · {issue['reason']}",issue)
for raw in evidence['binding'].get('raw',[]):self.raw.addItem(raw['artifact_id'],raw['artifact_id'])
self.coverage.setText('由网表生成 · 图页未定位\n未覆盖:封装库内部映射、引脚级 Value')
self.components.blockSignals(False);self.issues.blockSignals(False);self._component()
def _issue(self):
issue=self.issues.currentData()
if issue:
key=(issue.get('instance_path'),issue.get('refdes'))
index=self.components.findData(key)
if index>=0:self.components.setCurrentIndex(index)
def _component(self):
key=self.components.currentData()
pins=[p for p in (self.evidence or {}).get('pins',[]) if tuple(p['endpoint'][:2])==key]
self.diagram.set_pins(pins);self.pin_table.setRowCount(len(pins))
for n,row in enumerate(pins):
l,r=row['before'],row['after']
for col,value in enumerate((row['endpoint'][2],l['logical_name'] if l else '未知',r['logical_name'] if r else '未知',pin_text(l),pin_text(r))):
self.pin_table.setItem(n,col,QTableWidgetItem(value))
self.pin_table.resizeRowsToContents()
@@ -0,0 +1,172 @@
"""The fourth workspace: independently creatable tasks and continuous handoff."""
from threading import Event
from uuid import uuid4
from PySide6.QtCore import Qt,QTimer,Signal,QSignalBlocker
from PySide6.QtWidgets import (QWidget,QVBoxLayout,QHBoxLayout,QLabel,QPushButton,QListWidget,QListWidgetItem,
QTableWidget,QTableWidgetItem,QSplitter,QLineEdit,QComboBox,QInputDialog,QFileDialog,QHeaderView)
from .verification_controller import VerificationController
from .verification_inspector import VerificationInspector
LABELS={'consistent':'一致','warning':'需关注','different':'异常','unavailable':'无法校验',
'waiting':'待校验','running':'校验中','stopped':'已停止','interrupted':'已中断'}
class VerificationWorkspace(QWidget):
busy_changed=Signal()
def __init__(self,service,parent=None):
super().__init__(parent);self.service=service.verification;self.controller=VerificationController(self.service,self)
self._active=False;self._closed=False;self._run_id=None;self._rows=[];self._cursor=None;self._intake_stop=Event()
layout=QVBoxLayout(self);layout.setContentsMargins(16,12,16,12)
head=QHBoxLayout();self.title=QLabel('工程校验',objectName='verificationTitle');head.addWidget(self.title);head.addStretch()
self.new_button=QPushButton('新建校验',objectName='verificationNew');self.import_button=QPushButton('添加工程对')
head.addWidget(self.import_button);head.addWidget(self.new_button);layout.addLayout(head)
description=QLabel('替换完成后接续核对,也可随时添加两份工程独立校验。');description.setWordWrap(True);layout.addWidget(description)
self.splitter=QSplitter();layout.addWidget(self.splitter,1)
left=QWidget();ll=QVBoxLayout(left);ll.setContentsMargins(0,0,8,0);ll.addWidget(QLabel('校验任务'))
self.tasks=QListWidget();ll.addWidget(self.tasks,1)
self.state_filter=QComboBox();self.state_filter.addItem('全部工程','')
for key,value in LABELS.items():self.state_filter.addItem(value,key)
ll.addWidget(self.state_filter);self.splitter.addWidget(left)
middle=QWidget();ml=QVBoxLayout(middle);ml.setContentsMargins(4,0,4,0)
self.search=QLineEdit();self.search.setPlaceholderText('搜索工程、位号、料号');self.search.setClearButtonEnabled(True);ml.addWidget(self.search)
controls=QHBoxLayout();self.start_button=QPushButton('开始全部');self.selected_button=QPushButton('校验所选');self.stop_button=QPushButton('停止')
for button in (self.start_button,self.selected_button,self.stop_button):controls.addWidget(button)
ml.addLayout(controls)
self.table=QTableWidget(0,4);self.table.setHorizontalHeaderLabels(['工程','版本','结果','范围'])
self.table.setSelectionBehavior(QTableWidget.SelectionBehavior.SelectRows);self.table.setEditTriggers(QTableWidget.EditTrigger.NoEditTriggers)
self.table.horizontalHeader().setSectionResizeMode(QHeaderView.ResizeMode.Stretch);ml.addWidget(self.table,1)
bottom=QHBoxLayout();self.more_button=QPushButton('加载更多');self.rerun_button=QPushButton('重校验');self.export_button=QPushButton('导出报告')
for button in (self.more_button,self.rerun_button,self.export_button):bottom.addWidget(button)
ml.addLayout(bottom);self.splitter.addWidget(middle)
self.inspector=VerificationInspector();self.splitter.addWidget(self.inspector);self.splitter.setSizes([180,430,570])
self.footer=QLabel('新建一个校验任务开始。');self.footer.setWordWrap(True);layout.addWidget(self.footer)
self.notice=QLabel('');self.notice.setWordWrap(True);layout.addWidget(self.notice)
self.new_button.clicked.connect(self._new);self.import_button.clicked.connect(self._import)
self.tasks.currentItemChanged.connect(self._task_selected);self.table.itemSelectionChanged.connect(self._item_selected)
self.state_filter.currentIndexChanged.connect(self.refresh_task);self.search.textChanged.connect(self._search_changed)
self.more_button.clicked.connect(lambda:self.refresh_task(append=True));self.start_button.clicked.connect(lambda:self._start(False))
self.selected_button.clicked.connect(lambda:self._start(True));self.stop_button.clicked.connect(self._stop)
self.rerun_button.clicked.connect(self._rerun);self.export_button.clicked.connect(self._export)
self.inspector.open_raw.connect(self._open_raw);self.inspector.select_version.connect(self._version)
self.controller.failed.connect(self._error);self.controller.changed.connect(self._gates)
self._timer=QTimer(self);self._timer.setInterval(1500);self._timer.timeout.connect(self.refresh)
self._debounce=QTimer(self);self._debounce.setSingleShot(True);self._debounce.setInterval(250);self._debounce.timeout.connect(self.refresh_task)
self._gates()
@property
def busy(self):return self.controller.busy
def _error(self,error):self.notice.setText(str(error))
def _gates(self):
has=bool(self.controller.task_id);item=bool(self.controller.item_id)
self.import_button.setEnabled(has);self.start_button.setEnabled(has);self.selected_button.setEnabled(has and item)
self.rerun_button.setEnabled(item);self.export_button.setEnabled(has)
self.stop_button.setEnabled(bool(self._run_id) or getattr(self.service,'busy',False))
self.busy_changed.emit()
def set_active(self,active):
self._active=active
if active:
self._timer.start();self.controller.command(self.service.reconcile_deliveries,lambda _:self.refresh())
else:self._timer.stop()
def refresh(self):
if self._closed:return
self.controller.tasks_query.request(lambda control:self.service.list_tasks(read_control=control),self._tasks_received,self._error,cancellable=True)
if self.controller.task_id:self.refresh_task()
self._gates()
def _tasks_received(self,result):
with QSignalBlocker(self.tasks):
self.tasks.clear()
for row in result['tasks']:
item=QListWidgetItem(row['name']+f" {row['summary']['processed']}/{row['summary']['total']}")
item.setData(Qt.ItemDataRole.UserRole,row['task_id']);self.tasks.addItem(item)
if row['task_id']==self.controller.task_id:self.tasks.setCurrentItem(item)
if not self.controller.task_id and self.tasks.count():self.open_task(self.tasks.item(0).data(Qt.ItemDataRole.UserRole))
def open_task(self,task_id,item_id=None):
self.controller.task_id=task_id;self.controller.item_id=item_id;self._cursor=None
self.controller.item_query.invalidate();self.inspector.set_evidence(None);self.refresh();self._gates()
def _task_selected(self,item,previous):
if item:self.open_task(item.data(Qt.ItemDataRole.UserRole))
def _search_changed(self):self._debounce.start()
def refresh_task(self,*_,append=False):
task=self.controller.task_id
if not task or self._closed:return
cursor=self._cursor if append else None
self.controller.task_query.request(lambda control:self.service.read_task(task,state=self.state_filter.currentData(),
query=self.search.text(),cursor=cursor,read_control=control),lambda result:self._task_received(result,append),self._error,cancellable=True)
def _task_received(self,result,append):
self._rows=self._rows+result['items'] if append else result['items'];self._cursor=result['cursor']
selected=self.controller.item_id
with QSignalBlocker(self.table):
self.table.setRowCount(len(self._rows))
for n,row in enumerate(self._rows):
for col,value in enumerate((row['display_name'],str(row['input_version']),LABELS[row['status']],row['scope'])):
cell=QTableWidgetItem(value);cell.setData(Qt.ItemDataRole.UserRole,row['item_id']);self.table.setItem(n,col,cell)
if row['item_id']==selected:self.table.selectRow(n)
self.more_button.setEnabled(bool(self._cursor))
s=result['summary'];self.footer.setText(f"已处理 {s['processed']}/{s['total']} · 一致 {s['consistent']} · 关注 {s['warning']} · 异常 {s['different']} · 无法校验 {s['unavailable']} · 待校验 {s['waiting']}")
if selected:self._load_item(selected)
self._gates()
def _item_selected(self):
row=self.table.currentRow()
if 0<=row<len(self._rows):self.controller.item_id=self._rows[row]['item_id'];self._load_item(self.controller.item_id);self._gates()
def _load_item(self,item,version=None):
self.controller.item_query.request(lambda control:self.service.read_item(item,version=version,read_control=control),self.inspector.set_record,self._error,cancellable=True)
def _version(self,version):
if self.controller.item_id:self._load_item(self.controller.item_id,version)
def _new(self):
name,ok=QInputDialog.getText(self,'新建校验','任务名称',text='校验任务')
if ok and name.strip():self.controller.command(lambda:self.service.create_task(name.strip(),request_id=uuid4().hex),lambda row:self.open_task(row['task_id']))
def _import(self):
task=self.controller.task_id
before,_=QFileDialog.getOpenFileName(self,'选择修改前工程','','DxDesigner (*.prj)')
if not before:return
after,_=QFileDialog.getOpenFileName(self,'选择修改后工程','','DxDesigner (*.prj)')
if after:
self.controller.command(lambda:self.service.import_pair(task,before,after,request_id=uuid4().hex,stop_event=self._intake_stop),lambda _:self.refresh())
def _start(self,selected):
task=self.controller.task_id
selection=tuple((self._rows[i.row()]['item_id'],self._rows[i.row()]['input_version']) for i in self.table.selectionModel().selectedRows()) if selected else None
if task:self.controller.command(lambda:self.service.start(task,selection=selection,request_id=uuid4().hex),self._started)
def _started(self,result):self._run_id=result['run_id'];self.refresh()
def _stop(self):
if self._run_id:self.controller.command(lambda:self.service.stop(self._run_id,request_id=uuid4().hex),lambda _:self.refresh())
def _rerun(self):
item=self.controller.item_id
row=next((r for r in self._rows if r['item_id']==item),None)
if row:self.controller.command(lambda:self.service.rerun(item,row['input_version'],request_id=uuid4().hex),self._started)
def _export(self):
task=self.controller.task_id;folder=QFileDialog.getExistingDirectory(self,'选择报告保存位置')
if folder:self.controller.command(lambda:self.service.export_task(task,folder,request_id=uuid4().hex),lambda result:self.notice.setText('报告已保存:'+str(result)))
def _open_raw(self,artifact):
item=self.controller.item_id
if item:
def action():
record=self.service.read_item(item);return self.service.open_evidence(record['attempt_id'],artifact)
self.controller.command(action,lambda _:None)
def begin_shutdown(self):
self._timer.stop();self._intake_stop.set()
if hasattr(self.service,'begin_shutdown'):self.service.begin_shutdown()
def shutdown(self):
self._closed=True;self.begin_shutdown();self.controller.close()
+16
View File
@@ -0,0 +1,16 @@
from dx_productivity.trial_task_center.verification.evidence import build_evidence
def test_inspector_uses_evidence_pin_table_and_explicit_coverage(qtbot):
from dx_productivity.trial_task_center.ui.verification_inspector import VerificationInspector
from pathlib import Path
import sys
sys.path.insert(0,str(Path(__file__).parents[1]/'v1_1'))
from test_independent_verification_rules import export,evaluate
a=export();result=evaluate(a,a)
evidence=build_evidence(a['graph'],a['graph'],result['issues'],binding={})
widget=VerificationInspector();qtbot.addWidget(widget)
widget.set_evidence(evidence)
assert widget.pin_table.rowCount()>=1
assert '未覆盖' in widget.coverage.text()
assert widget.diagram.pins==[p for p in evidence['pins'] if p['endpoint'][:2]==widget.diagram.pins[0]['endpoint'][:2]]
+26
View File
@@ -0,0 +1,26 @@
from PySide6.QtCore import Qt
def test_fourth_navigation_is_independent_and_does_not_open_dsh(ui,qtbot):
window=ui.window
window.verification_action.trigger()
qtbot.waitUntil(lambda:window.content_stack.currentWidget() is window.verification_panel)
page=window.verification_panel
assert window.verification_action.isChecked() and not window.dsh_action.isChecked()
assert window._dsh_view is None and page.new_button.isEnabled()
task=ui.service.verification.create_task('独立校验',request_id='one')['task_id']
page.open_task(task)
qtbot.waitUntil(lambda:page.controller.task_id==task and not page.controller.task_query.busy)
assert page.new_button.isEnabled()
assert page.table.rowCount()==0
assert '来源' not in page.findChild(type(page.title),'verificationTitle').text()
def test_page_keeps_selected_task_when_refreshed(ui,qtbot):
page=ui.window.verification_panel
task=ui.service.verification.create_task('任务',request_id='one')['task_id']
page.open_task(task);page.set_active(True)
qtbot.waitUntil(lambda:page.tasks.count()==1)
page.refresh()
qtbot.waitUntil(lambda:not page.controller.tasks_query.busy)
assert page.controller.task_id==task