fix: preserve verification pagination and evidence during refresh
This commit is contained in:
1 parent
fe8765beec
commit
f91b4deb5e
5 files changed
+129
-40
No files matched your search
@@ -4,6 +4,8 @@
|
||||
|
||||
“开始全部”处理当前任务中当时待校验/中断的工程;筛选不会缩小这个范围。“校验所选”和“重校验”明确处理所选工程当前版本。运行期间后到的新项或新版本留待下次开始。校验只读副本,不会重新换料或自动换脚。
|
||||
|
||||
工程表每页最多显示 100 项,点击“下一页”继续查看;自动刷新保留当前页,修改搜索或筛选后回到第一页。分页和筛选都不影响“开始全部”的范围。
|
||||
|
||||
一致表示已覆盖的必查项未发现差异;需关注表示有文字或属性变化需要人工判断;异常表示已证明位号、物理脚号、连接或声明目标等不符合;无法校验表示证据不足。没有固定换料清单时始终显示“未核对换料规则”。执行结束不等于工程一致。
|
||||
|
||||
选择工程,在右侧选择位号查看固定脚号的前后接线图和逐脚事实。红线对应连接变化;纯名称变化以关注提示。图由网表生成,不是原理图截图。原始证据入口会核对摘要;历史版本仅供查看,不改变当前结论。导出报告包含同一份图表、检查范围、输入和尝试摘要,不复制整个工程。
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
"""Deterministic before/after netlist drawing and matching facts."""
|
||||
import json
|
||||
from PySide6.QtCore import QRectF,Qt,Signal
|
||||
from PySide6.QtCore import QSignalBlocker
|
||||
from PySide6.QtGui import QColor,QPainter,QPen
|
||||
from PySide6.QtWidgets import (QWidget,QLabel,QVBoxLayout,QHBoxLayout,QComboBox,QTableWidget,
|
||||
QTableWidgetItem,QHeaderView,QTabWidget,QScrollArea,QPlainTextEdit,QPushButton)
|
||||
@@ -10,6 +11,15 @@ ATTEMPTS={'queued':'排队中','running':'执行中','publishing':'保存结果
|
||||
'succeeded':'执行完成','failed':'执行失败','cancelled':'已停止','interrupted':'已中断'}
|
||||
|
||||
|
||||
def _choices(combo,rows,selected):
|
||||
current=[(combo.itemText(n),combo.itemData(n)) for n in range(combo.count())]
|
||||
with QSignalBlocker(combo):
|
||||
if current!=rows:
|
||||
combo.clear()
|
||||
for label,value in rows:combo.addItem(label,value)
|
||||
combo.setCurrentIndex(combo.findData(selected))
|
||||
|
||||
|
||||
def pin_text(pin):
|
||||
if pin is None:return '不存在/未覆盖'
|
||||
if not pin['nets']:return '明确未连接'
|
||||
@@ -73,24 +83,25 @@ class VerificationInspector(QWidget):
|
||||
self.attempts.activated.connect(lambda _:self.select_attempt.emit(self.attempts.currentData()) if self.attempts.currentData() else None)
|
||||
|
||||
def set_record(self,record):
|
||||
self.versions.blockSignals(True);self.versions.clear()
|
||||
for version in record.get('versions',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)
|
||||
self.attempts.clear()
|
||||
for entry in record['history']:
|
||||
if entry['input_version']==record['input_version']:
|
||||
self.attempts.addItem(f"第 {entry['generation']} 次校验 · {ATTEMPTS.get(entry['state'],'未完成')}",entry['attempt_id'])
|
||||
self.attempts.setCurrentIndex(self.attempts.findData(record.get('attempt_id')))
|
||||
versions=record.get('versions',sorted({record['current_version'],*(h['input_version'] for h in record['history'])},reverse=True))
|
||||
_choices(self.versions,[(f'输入 v{v}',v) for v in versions],record['input_version'])
|
||||
attempts=[(f"第 {e['generation']} 次校验 · {ATTEMPTS.get(e['state'],'未完成')}",e['attempt_id'])
|
||||
for e in record['history'] if e['input_version']==record['input_version']]
|
||||
_choices(self.attempts,attempts,record.get('attempt_id'))
|
||||
result=((record.get('attempt') or {}).get('result') or {})
|
||||
if record.get('evidence_error'):
|
||||
self.set_evidence(None);self.heading.setText(record['display_name']+' · 证据不可用')
|
||||
self.facts.setPlainText(record['evidence_error']);return
|
||||
self.set_evidence(result.get('evidence'))
|
||||
evidence=result.get('evidence')
|
||||
if (evidence or {}).get('digest')!=(self.evidence or {}).get('digest'):self.set_evidence(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',[]),
|
||||
details=json.dumps({'范围':result.get('scope',record['scope']),'检查':result.get('checks',[]),
|
||||
'问题':result.get('issues',[]),'执行原因':result.get('reason') or record.get('reason') or record.get('unavailable_reason'),
|
||||
'输入摘要':record['payload']['payload_digest'],'尝试':record.get('attempt_id')},ensure_ascii=False,indent=2))
|
||||
'输入摘要':record['payload']['payload_digest'],'尝试':record.get('attempt_id')},ensure_ascii=False,indent=2)
|
||||
if self.facts.toPlainText()!=details:self.facts.setPlainText(details)
|
||||
|
||||
def clear(self):
|
||||
self.heading.setText('选择工程查看证据');self.facts.clear();self.versions.clear();self.attempts.clear();self.set_evidence(None)
|
||||
|
||||
def set_evidence(self,evidence):
|
||||
if evidence:verify_evidence(evidence)
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
"""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.QtCore import Qt,QTimer,Signal,QSignalBlocker,QItemSelectionModel
|
||||
from PySide6.QtGui import QColor
|
||||
from PySide6.QtWidgets import (QWidget,QVBoxLayout,QHBoxLayout,QLabel,QPushButton,QListWidget,QListWidgetItem,
|
||||
QTableWidget,QTableWidgetItem,QSplitter,QLineEdit,QComboBox,QInputDialog,QFileDialog,QHeaderView)
|
||||
@@ -21,7 +21,7 @@ class VerificationWorkspace(QWidget):
|
||||
head=QHBoxLayout();self.title=QLabel('工程校验',objectName='verificationTitle');head.addWidget(self.title);head.addStretch()
|
||||
self.title.setStyleSheet('font-size:20px;font-weight:600;color:#34445b')
|
||||
self._scroll_to_selection=False;self._view_version=None;self._view_attempt=None;self._selected_attempt=None
|
||||
self._last_revision=None
|
||||
self._page_cursor=None
|
||||
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)
|
||||
@@ -39,7 +39,7 @@ class VerificationWorkspace(QWidget):
|
||||
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('导出报告')
|
||||
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])
|
||||
@@ -47,15 +47,15 @@ class VerificationWorkspace(QWidget):
|
||||
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.state_filter.currentIndexChanged.connect(self._filters_changed);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.inspector.select_attempt.connect(self._attempt)
|
||||
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._timer=QTimer(self);self._timer.setInterval(1500);self._timer.timeout.connect(self._poll)
|
||||
self._debounce=QTimer(self);self._debounce.setSingleShot(True);self._debounce.setInterval(250);self._debounce.timeout.connect(self._filters_changed)
|
||||
self._gates()
|
||||
|
||||
@property
|
||||
@@ -64,8 +64,8 @@ class VerificationWorkspace(QWidget):
|
||||
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)
|
||||
has=bool(self.controller.task_id);item=any(r['item_id']==self.controller.item_id for r in self._rows)
|
||||
self.import_button.setEnabled(has);self.start_button.setEnabled(has);self.selected_button.setEnabled(has and bool(self.table.selectionModel().selectedRows()))
|
||||
self.rerun_button.setEnabled(item);self.export_button.setEnabled(has)
|
||||
self.stop_button.setEnabled(bool(self._run_id))
|
||||
self.busy_changed.emit()
|
||||
@@ -82,6 +82,11 @@ class VerificationWorkspace(QWidget):
|
||||
if self.controller.task_id:self.refresh_task()
|
||||
self._gates()
|
||||
|
||||
def _poll(self):
|
||||
# Let a slow current read finish; periodic ticks must not keep cancelling it.
|
||||
queries=(self.controller.tasks_query,self.controller.task_query,self.controller.item_query)
|
||||
if not self._debounce.isActive() and not any(q.current_busy for q in queries):self.refresh()
|
||||
|
||||
def _tasks_received(self,result):
|
||||
with QSignalBlocker(self.tasks):
|
||||
self.tasks.clear()
|
||||
@@ -93,38 +98,52 @@ class VerificationWorkspace(QWidget):
|
||||
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.task_id=task_id;self.controller.item_id=item_id;self._cursor=None;self._run_id=None;self.notice.clear()
|
||||
self._scroll_to_selection=True;self._view_version=None;self._view_attempt=None;self._selected_attempt=None
|
||||
self._rows=[];self._last_revision=None
|
||||
self.controller.item_query.invalidate();self.inspector.set_evidence(None);self.refresh();self._gates()
|
||||
self._rows=[];self._page_cursor=None
|
||||
with QSignalBlocker(self.table):self.table.setRowCount(0)
|
||||
self.controller.item_query.invalidate();self.inspector.clear();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 _search_changed(self):
|
||||
self._page_cursor=None;self._cursor=None;self._debounce.start()
|
||||
|
||||
def _filters_changed(self,*_):
|
||||
self._page_cursor=None;self._cursor=None;self.refresh_task()
|
||||
|
||||
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)
|
||||
cursor=self._cursor if append else self._page_cursor
|
||||
state,query=self.state_filter.currentData(),self.search.text()
|
||||
self.controller.task_query.request(lambda control:self.service.read_task(task,state=state,
|
||||
query=query,cursor=cursor,read_control=control),lambda result:self._task_received(result,cursor),
|
||||
lambda error:self._task_failed(error,cursor),cancellable=True)
|
||||
|
||||
def _task_received(self,result,append):
|
||||
def _task_failed(self,error,cursor):
|
||||
if getattr(error,'code',None)=='verification_cursor' and cursor is not None:
|
||||
self._page_cursor=None;self._cursor=None;self.refresh_task()
|
||||
else:self._error(error)
|
||||
|
||||
def _task_received(self,result,cursor):
|
||||
self._run_id=(result.get('run') or {}).get('run_id')
|
||||
if not append and result['view_revision']==self._last_revision and len(self._rows)>100:
|
||||
self._gates();return
|
||||
self._last_revision=result['view_revision']
|
||||
self._rows=self._rows+result['items'] if append else result['items'];self._cursor=result['cursor']
|
||||
selected_ids={self._rows[i.row()]['item_id'] for i in self.table.selectionModel().selectedRows() if i.row()<len(self._rows)}
|
||||
previous=self._rows;self._rows=result['items'];self._page_cursor=cursor;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)
|
||||
cell.setToolTip(value)
|
||||
if col==2:cell.setForeground(QColor({'different':'#b83d4a','warning':'#9c6b1e','consistent':'#39817d'}.get(row['status'],'#61758e')))
|
||||
if row['item_id']==selected:self.table.selectRow(n)
|
||||
if selected and not selected_ids:selected_ids.add(selected)
|
||||
if previous!=self._rows:
|
||||
with QSignalBlocker(self.table):
|
||||
self.table.setRowCount(len(self._rows));self.table.clearSelection();self.table.setCurrentCell(-1,-1)
|
||||
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)
|
||||
cell.setToolTip(value)
|
||||
if col==2:cell.setForeground(QColor({'different':'#b83d4a','warning':'#9c6b1e','consistent':'#39817d'}.get(row['status'],'#61758e')))
|
||||
if row['item_id'] in selected_ids:
|
||||
self.table.selectionModel().select(self.table.model().index(n,0),QItemSelectionModel.SelectionFlag.Select|QItemSelectionModel.SelectionFlag.Rows)
|
||||
if row['item_id']==selected:self.table.setCurrentCell(n,0,QItemSelectionModel.SelectionFlag.NoUpdate)
|
||||
if self._scroll_to_selection and self.table.currentRow()>=0:
|
||||
self.table.scrollToItem(self.table.item(self.table.currentRow(),0));self._scroll_to_selection=False
|
||||
self.more_button.setEnabled(bool(self._cursor))
|
||||
@@ -190,6 +209,7 @@ class VerificationWorkspace(QWidget):
|
||||
|
||||
def begin_shutdown(self):
|
||||
self._timer.stop();self._intake_stop.set()
|
||||
for query in (self.controller.tasks_query,self.controller.task_query,self.controller.item_query):query.invalidate()
|
||||
if hasattr(self.service,'begin_shutdown'):self.service.begin_shutdown()
|
||||
|
||||
def shutdown(self):
|
||||
|
||||
@@ -14,3 +14,21 @@ def test_inspector_uses_evidence_pin_table_and_explicit_coverage(qtbot):
|
||||
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]]
|
||||
|
||||
|
||||
def test_same_result_refresh_keeps_the_chosen_issue(qtbot):
|
||||
from dx_productivity.trial_task_center.ui.verification_inspector import VerificationInspector
|
||||
from pathlib import Path
|
||||
import sys,copy
|
||||
sys.path.insert(0,str(Path(__file__).parents[1]/'v1_1'))
|
||||
from test_independent_verification_rules import export,evaluate
|
||||
a=export();b=copy.deepcopy(a)
|
||||
b['graph']['components']['a']['pins']['outloop']=b['graph']['components']['a']['pins'].pop('loop')
|
||||
b['graph']['nets'][0]['endpoints'][0][1]='outloop'
|
||||
result=evaluate(a,b);result['evidence']=build_evidence(a['graph'],b['graph'],result['issues'],binding={})
|
||||
record={'current_version':1,'input_version':1,'attempt_id':'attempt','display_name':'board','scope':'未核对换料规则',
|
||||
'payload':{'payload_digest':'0'*64},'history':[{'input_version':1,'generation':1,'attempt_id':'attempt','state':'succeeded'}],
|
||||
'attempt':{'result':result}}
|
||||
widget=VerificationInspector();qtbot.addWidget(widget);widget.set_record(record)
|
||||
widget.issues.setCurrentIndex(1);widget.set_record(record)
|
||||
assert widget.issues.currentIndex()==1
|
||||
@@ -24,3 +24,41 @@ def test_page_keeps_selected_task_when_refreshed(ui,qtbot):
|
||||
page.refresh()
|
||||
qtbot.waitUntil(lambda:not page.controller.tasks_query.busy)
|
||||
assert page.controller.task_id==task
|
||||
|
||||
|
||||
def test_periodic_refresh_does_not_starve_a_slow_read(ui,qtbot,monkeypatch):
|
||||
from threading import Event
|
||||
from pathlib import Path
|
||||
import sys
|
||||
sys.path.insert(0,str(Path(__file__).parents[1]/'v1_1'))
|
||||
from test_independent_verification_contracts import payload
|
||||
page=ui.window.verification_panel;v=page.service
|
||||
task=v.create_task('慢查询',request_id='slow')['task_id'];row=payload();row['before_ref']=None
|
||||
v.repo.publish(task,(row,),submission_id='row')
|
||||
original=v.read_task
|
||||
def slow(*args,**kwargs):Event().wait(.15);return original(*args,**kwargs)
|
||||
monkeypatch.setattr(v,'read_task',slow)
|
||||
page.open_task(task);page._timer.setInterval(20);page._timer.start()
|
||||
try:qtbot.waitUntil(lambda:page.table.rowCount()==1,timeout=1500)
|
||||
finally:page._timer.stop()
|
||||
|
||||
|
||||
def test_engineering_pages_remain_bounded_and_keep_the_current_page(ui,qtbot):
|
||||
from pathlib import Path
|
||||
import sys
|
||||
sys.path.insert(0,str(Path(__file__).parents[1]/'v1_1'))
|
||||
from test_independent_verification_contracts import payload
|
||||
page=ui.window.verification_panel;v=page.service
|
||||
task=v.create_task('分页',request_id='pages')['task_id'];rows=[]
|
||||
for n in range(201):
|
||||
row=payload();row.update(item_key=str(n),display_name=f'Board{n:03}',before_ref=None);rows.append(row)
|
||||
v.repo.publish(task,rows,submission_id='rows');page.open_task(task)
|
||||
qtbot.waitUntil(lambda:page.table.rowCount()==100)
|
||||
page.more_button.click()
|
||||
qtbot.waitUntil(lambda:not page.controller.task_query.busy)
|
||||
assert page.table.rowCount()==100 and page.table.item(0,0).text()=='Board100'
|
||||
page.refresh_task();qtbot.waitUntil(lambda:not page.controller.task_query.busy)
|
||||
assert page.table.item(0,0).text()=='Board100'
|
||||
page.search.setText('Board000')
|
||||
qtbot.waitUntil(lambda:page.table.rowCount()==1)
|
||||
assert page.table.item(0,0).text()=='Board000'
|
||||
Reference in new issue
Block a user