diff --git a/src/dx_productivity/dsh/execution_runs.py b/src/dx_productivity/dsh/execution_runs.py index 9f05a39..d400543 100644 --- a/src/dx_productivity/dsh/execution_runs.py +++ b/src/dx_productivity/dsh/execution_runs.py @@ -157,7 +157,12 @@ def _finish_execution_run(service, root, task_ids, stop, run_id, result, *, base try: verification = getattr(service, 'verification', None) if verification is not None: - verification.receive_successful_results(receipt, submission_id='run:' + run_id) + from ..trial_task_center.verification.contracts import digest + delivery = verification.receive_successful_results( + receipt, submission_id=f'run:{run_id}:{digest(receipt)}') + if delivery['rejected']: + receipt['reporting_errors'].append({'code': 'verification_delivery_pending', + 'rejected': delivery['rejected']}) except Exception as error: receipt['reporting_errors'].append({'code': 'verification_delivery_pending', 'error': type(error).__name__}) diff --git a/src/dx_productivity/trial_task_center/ui/verification_inspector.py b/src/dx_productivity/trial_task_center/ui/verification_inspector.py index d618955..3284208 100644 --- a/src/dx_productivity/trial_task_center/ui/verification_inspector.py +++ b/src/dx_productivity/trial_task_center/ui/verification_inspector.py @@ -5,7 +5,7 @@ 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) -from ..verification.evidence import verify_evidence +from ..verification.evidence import PIN_FACT_COLORS,pin_fact,verify_evidence ATTEMPTS={'queued':'排队中','running':'执行中','publishing':'保存结果中','stopping':'安全收尾中', 'succeeded':'执行完成','failed':'执行失败','cancelled':'已停止','interrupted':'已中断'} @@ -28,10 +28,10 @@ def pin_text(pin): class ConnectionDiagram(QWidget): def __init__(self,parent=None): - super().__init__(parent);self.pins=[];self.setMinimumSize(320,220) + super().__init__(parent);self.pins=[];self.facts=[];self.setMinimumSize(320,220) - def set_pins(self,pins): - self.pins=pins;self.setMinimumHeight(max(220,100+len(pins)*100));self.update() + def set_pins(self,pins,facts): + self.pins=pins;self.facts=facts;self.setMinimumHeight(max(220,100+len(pins)*100));self.update() def paintEvent(self,event): painter=QPainter(self);painter.setRenderHint(QPainter.RenderHint.Antialiasing) @@ -42,9 +42,12 @@ class ConnectionDiagram(QWidget): 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') + label,state=self.facts[n] + color=QColor(PIN_FACT_COLORS[state]) + name=pin['logical_name'] if pin else ('不存在' if label.startswith('器件') else '未覆盖') + change=f' · {label}' if state!='equal' else '' 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 '未覆盖'}") + f"脚 {row['endpoint'][2]} {name}{change}") 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) @@ -69,7 +72,7 @@ class VerificationInspector(QWidget): 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=QTableWidget(0,6);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,'逐脚事实') @@ -130,10 +133,17 @@ class VerificationInspector(QWidget): 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)) + evidence=self.evidence or {} + pins=[p for p in evidence.get('pins',[]) if tuple(p['endpoint'][:2])==key] + issues={issue['issue_id']:issue for issue in evidence.get('issues',())} + facts=[pin_fact(pin,issues) for pin in pins] + self.diagram.set_pins(pins,facts);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)) + label,state=facts[n] + cell=QTableWidgetItem(label) + cell.setForeground(QColor(PIN_FACT_COLORS[state])) + self.pin_table.setItem(n,5,cell) self.pin_table.resizeRowsToContents() diff --git a/src/dx_productivity/trial_task_center/ui/verification_workspace.py b/src/dx_productivity/trial_task_center/ui/verification_workspace.py index c4c76ad..ef336bd 100644 --- a/src/dx_productivity/trial_task_center/ui/verification_workspace.py +++ b/src/dx_productivity/trial_task_center/ui/verification_workspace.py @@ -22,6 +22,9 @@ class VerificationWorkspace(QWidget): 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._page_cursor=None + self._task_list_cursor=None + self._next_tasks_cursor=None + self._previous_tasks_cursors=[] self.new_button=QPushButton('新建校验',objectName='verificationNew');self.import_button=QPushButton('添加工程对') self.batch_button=QPushButton('批量添加',objectName='verificationBatchImport');self._batch_dialog=None head.addWidget(self.import_button);head.addWidget(self.batch_button);head.addWidget(self.new_button);layout.addLayout(head) @@ -29,6 +32,14 @@ class VerificationWorkspace(QWidget): 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) + task_paging=QHBoxLayout() + self.previous_tasks_button=QPushButton('上一页') + self.next_tasks_button=QPushButton('下一页') + self.previous_tasks_button.setAccessibleName('校验任务上一页') + self.next_tasks_button.setAccessibleName('校验任务下一页') + task_paging.addWidget(self.previous_tasks_button) + task_paging.addWidget(self.next_tasks_button) + ll.addLayout(task_paging) 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) @@ -49,6 +60,8 @@ class VerificationWorkspace(QWidget): self.new_button.clicked.connect(self._new);self.import_button.clicked.connect(self._import) self.batch_button.clicked.connect(self._batch_import) self.tasks.currentItemChanged.connect(self._task_selected);self.table.itemSelectionChanged.connect(self._item_selected) + self.previous_tasks_button.clicked.connect(lambda:self._turn_tasks_page(False)) + self.next_tasks_button.clicked.connect(lambda:self._turn_tasks_page(True)) 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) @@ -71,6 +84,9 @@ class VerificationWorkspace(QWidget): self.batch_button.setEnabled(has) self.rerun_button.setEnabled(item);self.export_button.setEnabled(has) self.stop_button.setEnabled(bool(self._run_id)) + can_page=not self.controller.tasks_query.current_busy + self.previous_tasks_button.setEnabled(can_page and bool(self._previous_tasks_cursors)) + self.next_tasks_button.setEnabled(can_page and self._next_tasks_cursor is not None) self.busy_changed.emit() def set_active(self,active): @@ -81,16 +97,42 @@ class VerificationWorkspace(QWidget): 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) + self._refresh_tasks() if self.controller.task_id:self.refresh_task() self._gates() + def _refresh_tasks(self): + cursor=self._task_list_cursor + self.controller.tasks_query.request( + lambda control:self.service.list_tasks(cursor=cursor,read_control=control), + self._tasks_received,self._tasks_failed,cancellable=True) + + def _turn_tasks_page(self,forward): + if forward and self._next_tasks_cursor is not None: + self._previous_tasks_cursors.append(self._task_list_cursor) + self._task_list_cursor=self._next_tasks_cursor + elif not forward and self._previous_tasks_cursors: + self._task_list_cursor=self._previous_tasks_cursors.pop() + else: + return + self._refresh_tasks() + self._gates() + + def _tasks_failed(self,error): + if self._task_list_cursor is not None and getattr(error,'code',None)=='verification_cursor': + self._task_list_cursor=None + self._previous_tasks_cursors.clear() + self._refresh_tasks() + else: + self._error(error) + 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): + self._next_tasks_cursor=result['cursor'] with QSignalBlocker(self.tasks): self.tasks.clear() for row in result['tasks']: @@ -176,7 +218,13 @@ class VerificationWorkspace(QWidget): 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'])) + if ok and name.strip(): + self.controller.command(lambda:self.service.create_task(name.strip(),request_id=uuid4().hex),self._open_new_task) + + def _open_new_task(self,row): + self._task_list_cursor=None + self._previous_tasks_cursors.clear() + self.open_task(row['task_id']) def _import(self): task=self.controller.task_id diff --git a/src/dx_productivity/trial_task_center/verification/contracts.py b/src/dx_productivity/trial_task_center/verification/contracts.py index 9a6dc66..1767f4a 100644 --- a/src/dx_productivity/trial_task_center/verification/contracts.py +++ b/src/dx_productivity/trial_task_center/verification/contracts.py @@ -61,7 +61,7 @@ def validate_plan(plan): def validate_input(value): allowed = {'item_key','project_key','input_version','before_ref','after_ref','expectation_ref', - 'check_plan','display_name','unavailable_reason'} + 'check_plan','display_name','unavailable_reason','handoff_saved_items'} required = {'item_key','project_key','input_version','before_ref','after_ref','expectation_ref','check_plan'} if not isinstance(value,dict) or set(value) - allowed or not required <= set(value): fail('校验输入字段不完整或包含不支持字段。') @@ -70,6 +70,9 @@ def validate_input(value): identifier(result[key]) if type(result['input_version']) is not int or not 1 <= result['input_version'] <= 2**31-1: fail('输入版本必须为正整数。') + if 'handoff_saved_items' in result: + count=result['handoff_saved_items'] + if type(count) is not int or count<1:fail('交接回执的已保存数量无效。') for key in ('before_ref','after_ref','expectation_ref'): result[key] = artifact_ref(result[key]) result['check_plan'] = validate_plan(result['check_plan']) diff --git a/src/dx_productivity/trial_task_center/verification/control.py b/src/dx_productivity/trial_task_center/verification/control.py index 0d4217e..09172a7 100644 --- a/src/dx_productivity/trial_task_center/verification/control.py +++ b/src/dx_productivity/trial_task_center/verification/control.py @@ -27,6 +27,9 @@ class VerificationControl: active=self.repo.connection.execute("SELECT * FROM verification_runs WHERE task_id=? AND state IN ('queued','running','stopping') ORDER BY created LIMIT 1",(task_id,)).fetchone() if active: result={'run_id':active['run_id'],'members':json.loads(active['members_json'])} + members={(row['item_id'],row['input_version']) for row in result['members']} + if selection is not None and not all(tuple(value) in members for value in selection): + fail('当前校验正在运行,未包含所选工程或版本。请等本次运行结束后再启动。','verification_run_active') else: rows=self.service.queries._rows(task_id) wanted=set(tuple(v) for v in selection) if selection is not None else None diff --git a/src/dx_productivity/trial_task_center/verification/evidence.py b/src/dx_productivity/trial_task_center/verification/evidence.py index a66ab64..b483137 100644 --- a/src/dx_productivity/trial_task_center/verification/evidence.py +++ b/src/dx_productivity/trial_task_center/verification/evidence.py @@ -34,6 +34,31 @@ def verify_evidence(evidence): fail('证据包摘要不符。','verification_evidence') +def pin_fact(pin, issues_by_id): + """Interpret stored issues without changing the historical evidence digest.""" + checks={issue['check_id'] for identity in pin['issue_ids'] + if (issue:=issues_by_id.get(identity)) and issue['state']=='error'} + labels=[] + if 'components' in checks: + labels.append('器件新增' if pin['before'] is None else '器件删除') + if 'physical_pins' in checks: + labels.append('物理脚变化') + if 'connections' in checks: + labels.append('连接变化') + if 'net_names' in checks: + labels.append('网名变化') + if pin['text_changed']: + labels.append('引脚名称变化') + if labels: + return '、'.join(labels),'error' if checks else 'warning' + if pin['before'] is None or pin['after'] is None: + return '无法确认','unknown' + return '未发现变化','equal' + + +PIN_FACT_COLORS={'error':'#b83d4a','warning':'#9c6b1e','unknown':'#61758e','equal':'#39817d'} + + def connection_view(evidence,issue_id): verify_evidence(evidence) issue=next((i for i in evidence['issues'] if i['issue_id']==issue_id),None) diff --git a/src/dx_productivity/trial_task_center/verification/intake.py b/src/dx_productivity/trial_task_center/verification/intake.py index cc4922e..be396e7 100644 --- a/src/dx_productivity/trial_task_center/verification/intake.py +++ b/src/dx_productivity/trial_task_center/verification/intake.py @@ -1,5 +1,6 @@ """Managed immutable inputs; native tools never receive arbitrary live paths.""" import json +import logging from pathlib import Path import shutil from uuid import uuid4 @@ -8,6 +9,7 @@ from .. import native_netlist from ..batch_resources import write_record from ..operation_control import check_cancelled from ..native_inventory import _project_options +from ..path_access import internal_path from .contracts import artifact_ref, fail @@ -52,18 +54,28 @@ class ArtifactStore: except (OSError,ValueError,KeyError,TypeError) as error: fail(f'校验证据不可用:{error}', 'verification_evidence') - def capture(self, project, *, stop_event): + def discard(self, identity): + """Remove a directory allocated by this operation before publication.""" + directory=internal_path(self.directory(identity)) + try: + shutil.rmtree(directory) + except FileNotFoundError: + pass + except OSError: + logging.getLogger(__name__).warning('Cannot remove unpublished verification artifact %s',identity,exc_info=True) + + def capture(self, project, *, stop_event, identity=None): check_cancelled(stop_event) - identity = uuid4().hex + identity = identity or uuid4().hex capture = native_netlist.capture_project(Path(project),self.directory(identity)/'capture') check_cancelled(stop_event) return self.put('snapshot',capture,identity=identity) - def adopt(self, capture): + def adopt(self, capture, *, identity=None): root = Path(capture['root']).resolve() if not root.is_relative_to(self.data_root): fail('交接副本不属于当前任务库。') native_netlist._check_capture(capture) - identity = uuid4().hex + identity = identity or uuid4().hex destination = self.directory(identity)/'capture' destination.mkdir(parents=True) for relative, sha in capture['capture_hashes'].items(): diff --git a/src/dx_productivity/trial_task_center/verification/queries.py b/src/dx_productivity/trial_task_center/verification/queries.py index 57d6fbe..d396a63 100644 --- a/src/dx_productivity/trial_task_center/verification/queries.py +++ b/src/dx_productivity/trial_task_center/verification/queries.py @@ -84,9 +84,11 @@ class VerificationQueries: checkpoint(read_control) row=dict(row) if query.casefold() in row['name'].casefold(): - row['_rows']=self._rows(row['task_id'],read_control);tasks.append(row) - binding=digest([query,[(r['task_id'],r['view_revision']) for r in tasks]]) + tasks.append(row) + binding=digest([query,[r['task_id'] for r in tasks]]) page,next_cursor=paginate(tasks,cursor,limit,binding,50) + for row in page: + row['_rows']=self._rows(row['task_id'],read_control) for row in page:row['summary']=summarize_items(self.validate_rows(row.pop('_rows'),read_control)) return {'tasks':page,'cursor':next_cursor} diff --git a/src/dx_productivity/trial_task_center/verification/report.py b/src/dx_productivity/trial_task_center/verification/report.py index cb89ec1..9c8f9a0 100644 --- a/src/dx_productivity/trial_task_center/verification/report.py +++ b/src/dx_productivity/trial_task_center/verification/report.py @@ -1,13 +1,13 @@ """HTML and JSON views of the exact immutable evidence shown in the workspace.""" from html import escape import json -import os from pathlib import Path from uuid import uuid4 from ..native_netlist import _hash from ..batch_resources import write_record +from ..path_access import internal_path from .contracts import fail,digest -from .evidence import verify_evidence +from .evidence import PIN_FACT_COLORS,pin_fact,verify_evidence def validate_result(result,root=None): @@ -30,23 +30,26 @@ def text(value): STYLE='body{font:14px "Segoe UI","Microsoft YaHei",sans-serif;color:#34445b;background:#f5f7fa;margin:24px}main{background:white;padding:24px;border-radius:12px}table{border-collapse:collapse;width:100%;margin:16px 0}td,th{border:1px solid #dae2eb;padding:9px;text-align:left;vertical-align:top}pre{white-space:pre-wrap;overflow-wrap:anywhere}.error{color:#b83d4a}.warning{color:#9c6b1e}svg{max-width:100%;height:auto}' -def diagram(pins): +def diagram(pins,issues): height=max(100,70+len(pins)*90);out=[f''] for col,phase,title in ((0,'before','修改前'),(1,'after','修改后')): x=col*450+16;out.append(f'{title}') for n,pin in enumerate(pins): - y=60+n*90;row=pin[phase];color='#b83d4a' if pin['connection_changed'] else '#9c6b1e' if pin['text_changed'] else '#39817d' - out.append(f'脚 {text(pin["endpoint"][2])} · {text(row["logical_name"] if row else None)}') + y=60+n*90;row=pin[phase];fact,state=pin_fact(pin,issues);color=PIN_FACT_COLORS[state] + out.append(f'{text(fact)}') + name=row['logical_name'] if row else ('不存在' if fact.startswith('器件') else '未知') + out.append(f'脚 {text(pin["endpoint"][2])} · {text(name)}') out.append(f'') nets=row['nets'] if row else [] - label=';'.join(net['name']+' · '+', '.join(e[1]+'.'+e[2] for e in net['endpoints']) for net in nets) or ('明确未连接' if row else '未知') - out.append(f'{text(label)}') + label=';'.join(net['name']+' · '+', '.join(e[1]+'.'+e[2] for e in net['endpoints']) for net in nets) or ('明确未连接' if row else name) + out.append(f'{text(label)}') return ''.join(out)+'' def item_html(result): validate_result(result) evidence=result.get('evidence') or {};pins=evidence.get('pins',[]) + issues={issue['issue_id']:issue for issue in evidence.get('issues',())} verdict=result.get('verdict','未完成') label={'CONSISTENT':'一致','WARNING':'需关注','DIFFERENT':'异常','INCOMPLETE':'无法完整校验'}.get(verdict,'未完成') out=[f'

{text(result.get("display_name","工程校验"))}

',f'

{label} · {text(verdict)}

', @@ -54,14 +57,15 @@ def item_html(result): keys=sorted({tuple(p['endpoint'][:2]) for p in pins}) for key in keys: subset=[p for p in pins if tuple(p['endpoint'][:2])==key] - out.append(f'

{text(key[1])} · {text(key[0])}

');out.append(diagram(subset)) + out.append(f'

{text(key[1])} · {text(key[0])}

');out.append(diagram(subset,issues)) out.append('') for pin in subset: def description(row): if row is None:return '不存在/未覆盖' nets=';'.join(n['name']+' → '+', '.join(e[1]+'.'+e[2] for e in n['endpoints'] if e!=pin['endpoint']) for n in row['nets']) return '名称:'+row['logical_name']+'\n'+(nets or '明确未连接') - out.append(f'') + label,_=pin_fact(pin,issues) + out.append(f'') out.append('
物理脚修改前修改后事实
{text(pin["endpoint"][2])}
{text(description(pin["before"]))}
{text(description(pin["after"]))}
{"连接变化" if pin["connection_changed"] else "文字变化" if pin["text_changed"] else "未发现变化"}
{text(pin["endpoint"][2])}
{text(description(pin["before"]))}
{text(description(pin["after"]))}
{text(label)}
') out.append('

判断依据