merge: preserve DSH lifecycle protocol with target validation fixes
This commit is contained in:
commit
ec7eab89fb
7 files changed
+219
-30
No files matched your search
@@ -0,0 +1,22 @@
|
||||
# PR #10 评论 #127 修复(2026-10-31)
|
||||
|
||||
对应[评论 #127](https://git.simgreek.com/Skyworth_Digital_Hardware/dxdesigner-part-replacement/pulls/10#issuecomment-127)提出的两项 P3。基于 `0bc1f64` 的独立检出修改,不包含主工作区未提交文件。
|
||||
|
||||
## 畸形协议行不再丢弃后续消息
|
||||
|
||||
原 `_stdout()` 已取出一批完整行,但其中一行 `json.loads` 异常会提前退出 Qt 槽,导致同批后续行丢失。现逐行解析并隔离 JSON、对象类型和 READY 地址字段的输入错误;坏行跳过后继续处理同批合法消息。增量 UTF-8 解码与原 task_id/revision、本机 URL 检查继续生效。
|
||||
|
||||
诊断信息仅追加固定协议前缀与异常类型,并沿用 12000 字符上限;不保存坏行原文或解析异常中的载荷,避免把用户数据或凭据带入错误日志。未知普通输出仍忽略。
|
||||
|
||||
## 模型元数据原子发布
|
||||
|
||||
`provider.json` 改为先写同目录唯一临时文件,写完整后 flush/fsync,再通过 `os.replace` 发布。受控的半途写入、刷盘和替换失败均保留旧的完整 JSON,并清理临时文件。元数据仍不包含 API 密钥,DPAPI 密钥存储与加载接口保持原状。
|
||||
|
||||
此处保证元数据单文件的原子发布,不把密钥与元数据两个文件表述为一个跨文件事务。
|
||||
|
||||
## 验证
|
||||
|
||||
- 修复前新增故障用例 25 项失败,复现协议 JSON/类型异常、同批消息丢失及元数据未使用原子发布。
|
||||
- 本轮新增 27 项回归:五类协议消息 × 非法 JSON/null/list/string、READY 字段错误、坏行后的正常本机握手,以及配置写入/刷盘/替换故障。
|
||||
- 与上一轮停止意图、UTF-8 和已有配置回归合计 43 项通过;独立复核同样通过 43 项,无阻塞或重要问题。
|
||||
- 完整 `tests/v1_1 tests/ui tests/dsh tests/packaging` 回归 **1128 项通过**,无忽略/跳过项,1 条已有 pywinauto COM 模式警告;结果见 `pr10-review-127-tests.json`。未使用真实用户模型配置、未启动 CAD、真实模型或远端工单传输,未重建 EXE。
|
||||
@@ -0,0 +1,15 @@
|
||||
{
|
||||
"command": "python -m pytest -q tests/v1_1 tests/ui tests/dsh tests/packaging --junitxml=build/pr10-review-127-tests.xml",
|
||||
"tests": 1128,
|
||||
"failures": 0,
|
||||
"errors": 0,
|
||||
"skipped": 0,
|
||||
"seconds": 534.309,
|
||||
"review_comment": 127,
|
||||
"main_base": "2cf526e1769f354cd7e57861c4b0df9f165565dd",
|
||||
"isolated_checkout": true,
|
||||
"test_exclusions": [],
|
||||
"warnings": [
|
||||
"pywinauto: Revert to STA COM threading mode"
|
||||
]
|
||||
}
|
||||
@@ -28,3 +28,7 @@
|
||||
前两次验收分别停于模型就可选基线提出澄清、排期点击遇到忙碌回执;均保留失败报告。验收脚本增加模拟用户自然语言回答及等待忙碌操作收尾后重新点击,不绕过原生确认或版本门禁。最终成功报告来自完整重新运行。
|
||||
|
||||
本轮 PR 增量及新文件的两份已知凭据逐字节扫描为 0 匹配;未输出凭据。未执行真实 CAD 写入、生产 broker 部署、EXE 构建或 PR 合并。
|
||||
|
||||
## 最后目标基线同步
|
||||
|
||||
功能修复推送为 282252a 后,目标基线并行推进至 dfbc14c。仅在 codex/dsh 同步,dsh_native._stdout 保留基线的坏协议行隔离,并把 PR #11 的生命周期请求/取消纳入相同解析和分发;原上下文、回执与增量 UTF-8 协议均保留。合并后 provider/协议/DSH 创建、生命周期及菜单回归 66 passed;新增生命周期坏行和分块中文 2 passed。两进程桌面报告对应此次最后协议合并之前,最终合并由这些定向测试验证。
|
||||
@@ -4,6 +4,7 @@ from __future__ import annotations
|
||||
import json
|
||||
import os
|
||||
from pathlib import Path
|
||||
from tempfile import NamedTemporaryFile
|
||||
|
||||
|
||||
def save_provider(directory: Path, *, base_url: str, models: list[str], default_model: str, api_key: str):
|
||||
@@ -17,7 +18,18 @@ def save_provider(directory: Path, *, base_url: str, models: list[str], default_
|
||||
temporary.write_bytes(encrypted)
|
||||
os.replace(temporary, key_file)
|
||||
metadata = {'base_url': base_url.rstrip('/'), 'models': models, 'default_model': default_model}
|
||||
(directory / 'provider.json').write_text(json.dumps(metadata, ensure_ascii=False, indent=2), encoding='utf8')
|
||||
temporary_metadata = None
|
||||
try:
|
||||
with NamedTemporaryFile(mode='w', encoding='utf8', dir=directory,
|
||||
prefix='provider.json.', suffix='.tmp', delete=False) as stream:
|
||||
temporary_metadata = Path(stream.name)
|
||||
json.dump(metadata, stream, ensure_ascii=False, indent=2)
|
||||
stream.flush()
|
||||
os.fsync(stream.fileno())
|
||||
os.replace(temporary_metadata, directory / 'provider.json')
|
||||
finally:
|
||||
if temporary_metadata is not None:
|
||||
temporary_metadata.unlink(missing_ok=True)
|
||||
|
||||
|
||||
def load_provider(directory: Path) -> dict[str, str]:
|
||||
|
||||
@@ -163,35 +163,48 @@ class NativeHarnessView(QWidget):
|
||||
lines = self._buffer.split('\n')
|
||||
self._buffer = lines.pop()
|
||||
for line in lines:
|
||||
if line.startswith('DX_DSH_READY '):
|
||||
data = json.loads(line[len('DX_DSH_READY '):])
|
||||
url = QUrl(data['url'])
|
||||
if url.host() != '127.0.0.1' or url.scheme() != 'http':
|
||||
self._failed('DSH 返回了无效的本机地址。')
|
||||
return
|
||||
self._started = True
|
||||
self.web.page().allowed_port = url.port()
|
||||
self.timeout.stop()
|
||||
self.status.hide()
|
||||
self.web.load(url)
|
||||
self.ready.emit()
|
||||
queued, self._diagnosis_queue = self._diagnosis_queue, []
|
||||
for request in queued:
|
||||
self.request_diagnosis(request)
|
||||
elif line.startswith('DX_DSH_DIAGNOSIS '):
|
||||
self.diagnosis_event.emit(json.loads(line[len('DX_DSH_DIAGNOSIS '):]))
|
||||
elif line.startswith('DX_DSH_CREATE_REQUEST '):
|
||||
self.task_creation_requested.emit(json.loads(line[len('DX_DSH_CREATE_REQUEST '):]))
|
||||
elif line.startswith('DX_DSH_CREATE_CANCEL '):
|
||||
self.task_creation_cancelled.emit(json.loads(line[len('DX_DSH_CREATE_CANCEL '):]))
|
||||
elif line.startswith('DX_DSH_LIFECYCLE_REQUEST '):
|
||||
self.lifecycle_requested.emit(json.loads(line[len('DX_DSH_LIFECYCLE_REQUEST '):]))
|
||||
elif line.startswith('DX_DSH_LIFECYCLE_CANCEL '):
|
||||
self.lifecycle_cancelled.emit(json.loads(line[len('DX_DSH_LIFECYCLE_CANCEL '):]))
|
||||
elif line.startswith('DX_DSH_ACTION '):
|
||||
request = json.loads(line[len('DX_DSH_ACTION '):])
|
||||
if self.context and request.get('task_id') == self.context['task_id'] and request.get('revision') == self.context['revision']:
|
||||
self.action_requested.emit(request)
|
||||
prefix, _, payload = line.partition(' ')
|
||||
if prefix not in {'DX_DSH_READY','DX_DSH_DIAGNOSIS','DX_DSH_CREATE_REQUEST',
|
||||
'DX_DSH_CREATE_CANCEL','DX_DSH_ACTION','DX_DSH_LIFECYCLE_REQUEST','DX_DSH_LIFECYCLE_CANCEL'}:
|
||||
continue
|
||||
try:
|
||||
data = json.loads(payload)
|
||||
if not isinstance(data, dict):
|
||||
raise ValueError('protocol_payload_must_be_object')
|
||||
if prefix == 'DX_DSH_READY':
|
||||
if not isinstance(data.get('url'), str):
|
||||
raise ValueError('protocol_url_must_be_string')
|
||||
url = QUrl(data['url'])
|
||||
if url.host() != '127.0.0.1' or url.scheme() != 'http':
|
||||
self._failed('DSH 返回了无效的本机地址。')
|
||||
continue
|
||||
self._started = True
|
||||
self.web.page().allowed_port = url.port()
|
||||
self.timeout.stop()
|
||||
self.status.hide()
|
||||
self.web.load(url)
|
||||
self.ready.emit()
|
||||
queued, self._diagnosis_queue = self._diagnosis_queue, []
|
||||
for request in queued:
|
||||
self.request_diagnosis(request)
|
||||
elif prefix == 'DX_DSH_DIAGNOSIS':
|
||||
self.diagnosis_event.emit(data)
|
||||
elif prefix == 'DX_DSH_CREATE_REQUEST':
|
||||
self.task_creation_requested.emit(data)
|
||||
elif prefix == 'DX_DSH_CREATE_CANCEL':
|
||||
self.task_creation_cancelled.emit(data)
|
||||
elif prefix == 'DX_DSH_LIFECYCLE_REQUEST':
|
||||
self.lifecycle_requested.emit(data)
|
||||
elif prefix == 'DX_DSH_LIFECYCLE_CANCEL':
|
||||
self.lifecycle_cancelled.emit(data)
|
||||
elif prefix == 'DX_DSH_ACTION':
|
||||
if self.context and data.get('task_id') == self.context['task_id'] and data.get('revision') == self.context['revision']:
|
||||
self.action_requested.emit(data)
|
||||
except (ValueError, KeyError, TypeError) as error:
|
||||
# Never retain raw protocol text: malformed lines may contain
|
||||
# credentials or user data. Keep subsequent complete lines.
|
||||
self.last_error = (self.last_error +
|
||||
f'\nInvalid DSH protocol line ({prefix}): {type(error).__name__}')[-12000:]
|
||||
|
||||
def _stderr(self):
|
||||
self.last_error = (self.last_error + self._stderr_decoder.decode(bytes(self.process.readAllStandardError())))[-12000:]
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
from dx_productivity.dsh.provider_config import load_provider, save_provider
|
||||
import json
|
||||
from pathlib import Path
|
||||
import pytest
|
||||
|
||||
|
||||
def test_provider_key_is_encrypted_and_models_survive_reload(tmp_path):
|
||||
@@ -10,3 +13,52 @@ def test_provider_key_is_encrypted_and_models_survive_reload(tmp_path):
|
||||
assert restored['DSH_API_KEY'] == key
|
||||
assert restored['DSH_MODEL'] == 'b'
|
||||
assert restored['DSH_API_BASE'] == 'https://example.test/v1'
|
||||
|
||||
|
||||
def test_metadata_replace_failure_preserves_existing_json(tmp_path,monkeypatch):
|
||||
from dx_productivity.dsh import provider_config
|
||||
values=dict(base_url='https://example.test/v1',models=['old'],default_model='old',api_key='local-test-key')
|
||||
save_provider(tmp_path,**values)
|
||||
metadata=tmp_path/'provider.json';original=metadata.read_bytes()
|
||||
replace=provider_config.os.replace
|
||||
def fail_metadata(source,target):
|
||||
if Path(target)==metadata:
|
||||
assert metadata.read_bytes()==original
|
||||
assert json.loads(Path(source).read_text(encoding='utf8'))['default_model']=='新模型'
|
||||
raise OSError('Controlled interruption before metadata publication')
|
||||
return replace(source,target)
|
||||
monkeypatch.setattr(provider_config.os,'replace',fail_metadata)
|
||||
with pytest.raises(OSError,match='Controlled interruption'):
|
||||
save_provider(tmp_path,**(values|{'models':['新模型'],'default_model':'新模型'}))
|
||||
assert metadata.read_bytes()==original
|
||||
assert load_provider(tmp_path)['DSH_MODEL']=='old'
|
||||
assert not list(tmp_path.glob('provider.json*.tmp'))
|
||||
|
||||
|
||||
def test_metadata_flush_failure_preserves_existing_json(tmp_path,monkeypatch):
|
||||
from dx_productivity.dsh import provider_config
|
||||
values=dict(base_url='https://example.test/v1',models=['old'],default_model='old',api_key='local-test-key')
|
||||
save_provider(tmp_path,**values)
|
||||
metadata=tmp_path/'provider.json';original=metadata.read_bytes()
|
||||
def fail_flush(fd):raise OSError('Controlled metadata flush failure')
|
||||
monkeypatch.setattr(provider_config.os,'fsync',fail_flush)
|
||||
with pytest.raises(OSError,match='Controlled metadata flush failure'):
|
||||
save_provider(tmp_path,**(values|{'models':['new'],'default_model':'new'}))
|
||||
assert metadata.read_bytes()==original
|
||||
assert not list(tmp_path.glob('provider.json*.tmp'))
|
||||
|
||||
|
||||
def test_partial_metadata_write_never_truncates_published_json(tmp_path,monkeypatch):
|
||||
from dx_productivity.dsh import provider_config
|
||||
values=dict(base_url='https://example.test/v1',models=['old'],default_model='old',api_key='local-test-key')
|
||||
save_provider(tmp_path,**values)
|
||||
metadata=tmp_path/'provider.json';original=metadata.read_bytes()
|
||||
def incomplete_dump(value,stream,**kwargs):
|
||||
stream.write('{"base_url":')
|
||||
raise OSError('Controlled partial metadata write')
|
||||
monkeypatch.setattr(provider_config.json,'dump',incomplete_dump)
|
||||
with pytest.raises(OSError,match='Controlled partial metadata write'):
|
||||
save_provider(tmp_path,**(values|{'models':['new'],'default_model':'new'}))
|
||||
assert metadata.read_bytes()==original
|
||||
assert load_provider(tmp_path)['DSH_MODEL']=='old'
|
||||
assert not list(tmp_path.glob('provider.json*.tmp'))
|
||||
@@ -80,10 +80,13 @@ def test_last_failed_item_keeps_stop_intent_in_automatic_diagnosis(ui,qtbot,monk
|
||||
|
||||
|
||||
class ProtocolSignals(QWidget):
|
||||
ready=Signal()
|
||||
task_creation_requested=Signal(object)
|
||||
diagnosis_event=Signal(object)
|
||||
task_creation_cancelled=Signal(object)
|
||||
action_requested=Signal(object)
|
||||
lifecycle_requested=Signal(object)
|
||||
lifecycle_cancelled=Signal(object)
|
||||
|
||||
|
||||
def protocol_state(qtbot):
|
||||
@@ -93,13 +96,34 @@ def protocol_state(qtbot):
|
||||
state=SimpleNamespace(_signal_owner=sink,
|
||||
process=SimpleNamespace(readAllStandardOutput=lambda:chunks.pop(0)),
|
||||
task_creation_requested=sink.task_creation_requested,diagnosis_event=sink.diagnosis_event,
|
||||
ready=sink.ready,
|
||||
task_creation_cancelled=sink.task_creation_cancelled,action_requested=sink.action_requested,
|
||||
lifecycle_requested=sink.lifecycle_requested,lifecycle_cancelled=sink.lifecycle_cancelled,
|
||||
context={'task_id':'t','revision':'rev'},last_error='')
|
||||
state._reset_output=lambda:NativeHarnessView._reset_output(state)
|
||||
state._reset_output()
|
||||
return state,chunks
|
||||
|
||||
|
||||
@pytest.mark.parametrize('prefix,signal', [('DX_DSH_LIFECYCLE_REQUEST', 'lifecycle_requested'),
|
||||
('DX_DSH_LIFECYCLE_CANCEL', 'lifecycle_cancelled')])
|
||||
def test_lifecycle_protocol_survives_invalid_lines_and_split_utf8(qtbot, prefix, signal):
|
||||
from dx_productivity.trial_task_center.ui.dsh_native import NativeHarnessView
|
||||
state,chunks=protocol_state(qtbot)
|
||||
received=[]
|
||||
getattr(state,signal).connect(received.append)
|
||||
payload={'request_id':'b'*32,'spec':{'operation':'reconcile_schedule','title':'核对排期🔧'}}
|
||||
invalid=(prefix+' {invalid private-diagnostic\n'+prefix+' []\n').encode('utf8')
|
||||
valid=(prefix+' '+json.dumps(payload,ensure_ascii=False)+'\n').encode('utf8')
|
||||
split=valid.index('核'.encode('utf8'))+1
|
||||
chunks.extend([invalid+valid[:split],valid[split:]])
|
||||
NativeHarnessView._stdout(state)
|
||||
assert not received
|
||||
NativeHarnessView._stdout(state)
|
||||
assert received==[payload]
|
||||
assert 'private-diagnostic' not in state.last_error
|
||||
|
||||
|
||||
@pytest.mark.parametrize('stop_kind',['none','pause','force'])
|
||||
def test_worker_exception_handoff_keeps_original_run_control(ui,qtbot,monkeypatch,stop_kind):
|
||||
from dx_productivity.trial_task_center.errors import TaskCenterError
|
||||
@@ -195,3 +219,50 @@ def test_stderr_preserves_utf8_across_process_chunks(qtbot):
|
||||
for byte in message.encode('utf8'):
|
||||
chunks.append(bytes([byte]));NativeHarnessView._stderr(state)
|
||||
assert state.last_error==message
|
||||
|
||||
|
||||
@pytest.mark.parametrize('prefix',['READY','DIAGNOSIS','CREATE_REQUEST','CREATE_CANCEL','ACTION'])
|
||||
@pytest.mark.parametrize('invalid',['{broken JSON','null','[]','"wrong shape"'])
|
||||
def test_bad_protocol_line_preserves_following_valid_messages(qtbot,prefix,invalid):
|
||||
from dx_productivity.trial_task_center.ui.dsh_native import NativeHarnessView
|
||||
state,chunks=protocol_state(qtbot)
|
||||
requests=[];diagnoses=[]
|
||||
state.task_creation_requested.connect(requests.append)
|
||||
state.diagnosis_event.connect(diagnoses.append)
|
||||
valid={'request_id':'a'*32,'spec':{'name':'电阻替换'}}
|
||||
diagnostic={'reply':'后续诊断正常'}
|
||||
first='DX_DSH_CREATE_REQUEST '+json.dumps(valid,ensure_ascii=False)+'\n'
|
||||
last='DX_DSH_DIAGNOSIS '+json.dumps(diagnostic,ensure_ascii=False)+'\n'
|
||||
chunks.append((first+f'DX_DSH_{prefix} {invalid}\n'+last).encode('utf8'))
|
||||
NativeHarnessView._stdout(state)
|
||||
assert requests==[valid]
|
||||
assert diagnoses==[diagnostic]
|
||||
assert 'DSH protocol'in state.last_error
|
||||
assert invalid not in state.last_error # Never persist the raw malformed payload.
|
||||
|
||||
|
||||
@pytest.mark.parametrize('payload',[{}, {'url':None}, {'url':[]}])
|
||||
def test_incomplete_ready_line_does_not_drop_later_diagnosis(qtbot,payload):
|
||||
from dx_productivity.trial_task_center.ui.dsh_native import NativeHarnessView
|
||||
state,chunks=protocol_state(qtbot)
|
||||
diagnoses=[];state.diagnosis_event.connect(diagnoses.append)
|
||||
chunks.append(('DX_DSH_READY '+json.dumps(payload)+'\nDX_DSH_DIAGNOSIS {"status":"completed"}\n').encode('utf8'))
|
||||
NativeHarnessView._stdout(state)
|
||||
assert diagnoses==[{'status':'completed'}]
|
||||
|
||||
|
||||
def test_bad_line_does_not_block_following_local_runtime_handshake(qtbot):
|
||||
from dx_productivity.trial_task_center.ui.dsh_native import NativeHarnessView
|
||||
state,chunks=protocol_state(qtbot)
|
||||
loaded=[];ready=[]
|
||||
page=SimpleNamespace(allowed_port=None)
|
||||
state.web=SimpleNamespace(page=lambda:page,load=loaded.append)
|
||||
state.timeout=SimpleNamespace(stop=lambda:None)
|
||||
state.status=SimpleNamespace(hide=lambda:None)
|
||||
state._diagnosis_queue=[]
|
||||
state.ready.connect(lambda:ready.append(True))
|
||||
chunks.append(b'DX_DSH_CREATE_REQUEST {bad}\nDX_DSH_READY {"url":"http://127.0.0.1:12345/"}\n')
|
||||
NativeHarnessView._stdout(state)
|
||||
assert state._started and ready==[True]
|
||||
assert page.allowed_port==12345
|
||||
assert [url.toString()for url in loaded]==['http://127.0.0.1:12345/']
|
||||
Reference in new issue
Block a user