feat: adapt DSH assistant to Harness desktop three-column UI

This commit is contained in:
阿白叔 committed 2026-10-30 09:43:49 +08:00
1 parent 2f58f07a5a
commit 9c508333bb
7 files changed
+569 -51

No files matched your search

+12
View File
@@ -1,5 +1,17 @@
# DSH助手
## Desktop 界面
界面按 [DeepSeek Harness 官方 desktop 共用 UI](https://github.com/deepseek-ai/deepseek-harness) 的三栏布局与浅色主题适配到 Qt:左侧工作区和会话,中间对话与圆角输入卡片,右侧任务上下文、建议动作、监管记录和能力边界。三栏宽度可拖动调整。
左侧可新建、搜索、切换对话;会话仅保留在本次窗口内。对话请求在后台运行,切换会话不会混入其他回复。“停止接收”会丢弃本次后续回复,底层 HTTP 请求仍等待完成或超时。右侧动作卡在确认后委托已有任务服务处理,提交不等于执行成功。
可运行 `python tools/preview_dsh_desktop.py` 单独预览真实界面;该预览不连接任务数据库、不启动 CAD。任务中心的“DSH助手”入口会带入当前任务快照和本窗口监管记录。
模型配置沿用进程环境变量 `DSH_API_BASE`、`DSH_MODEL`、`DSH_API_KEY`。本次适配只复用布局与视觉样式,不加载官方 Harness 的插件或系统工具。上游 MIT 许可保留在 `licenses/DeepSeek-Harness-MIT.txt`。
## 现有处理边界
DSH 是任务中心内的工具型监管入口。它先使用本地规则识别失败、超时和不确定状态;明确失败可生成一次性的重试动作。模型只负责解释和提出结构化建议,不能直接调用 CAD、Shell、文件系统或任意网络工具。
打开任务中心的“DSH助手”后,可以查看当前任务状态并进行人工对话。未配置 DeepSeek/OpenAI 兼容接口时,对话会明确提示,但本地监管和固定动作仍然可用。模型动作最多 3 个,必须绑定当前任务;未知动作、跨任务参数和非法 JSON 会被拒绝。工程写入、规则修改和不确定状态恢复始终需要人工确认。
+27
View File
@@ -0,0 +1,27 @@
DeepSeek Harness desktop UI reference / Qt adaptation
Source: https://github.com/deepseek-ai/deepseek-harness
Referenced components: ui-layout/AppFrame, ui-sidebar/SidebarRoot,
ui-sidebar-right/SidebarRight, ui-theme/design-platform and base tokens,
ui-chat/ChatView. Retrieved 2026-10-30 from master.
MIT License
Copyright (c) 2026 DeepSeek
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
@@ -1,73 +1,353 @@
"""Task-bound three-column desktop adapted from the Harness shell geometry."""
from __future__ import annotations
from PySide6.QtWidgets import QDialog, QFormLayout, QHBoxLayout, QLabel, QListWidget, QLineEdit, QMessageBox, QPushButton, QTextEdit, QVBoxLayout
from html import escape
from uuid import uuid4
from PySide6.QtCore import Qt, QThreadPool
from PySide6.QtWidgets import (
QDialog, QFrame, QHBoxLayout, QLabel, QLineEdit, QListWidget, QListWidgetItem,
QMessageBox, QPlainTextEdit, QPushButton, QSplitter, QStackedWidget,
QTabWidget, QTextBrowser, QTextEdit, QVBoxLayout, QWidget,
)
from ...dsh.actions import ActionProposal
from ...dsh.client import DshClientError, OpenAICompatibleClient
from ...dsh.client import DshClientError
from ...dsh.service_adapter import DshServiceAdapter
from ...dsh.snapshot import TaskSnapshot
from ...dsh.supervisor import DshSupervisor
from .dsh_styles import DSH_STYLESHEET
from .workers import ServiceWorker
STATUS = {'observe': '待命', 'paused': '已暂停', 'failed': '失败', 'running': '执行中',
'blocked': '已阻断', 'uncertain': '待核验', 'completed': '已完成', 'draft': '草稿'}
ACTION = {'retry_failed': '准备失败项重试', 'pause_task': '请求暂停任务', 'refresh_snapshot': '检查任务快照'}
def label(text, name='dshMuted'):
widget = QLabel(text, objectName=name)
widget.setTextFormat(Qt.TextFormat.PlainText)
widget.setWordWrap(True)
return widget
def column(name, margins=(18, 16, 18, 16)):
widget = QWidget(objectName=name)
layout = QVBoxLayout(widget)
layout.setContentsMargins(*margins)
layout.setSpacing(12)
return widget, layout
class DshPanel(QDialog):
def __init__(self, service, *, task_id: str = "", snapshot: TaskSnapshot | None = None, client=None, parent=None):
def __init__(self, service, *, task_id='', snapshot=None, client=None, supervisor=None, parent=None):
super().__init__(parent)
self.setWindowTitle("DSH助手")
self.resize(720, 520)
self.setObjectName('dshDesktop')
self.setWindowTitle('DSH助手')
self.setWindowFlag(Qt.WindowType.WindowMaximizeButtonHint, True)
self.resize(1320, 820)
self.setMinimumSize(1000, 660)
self.setStyleSheet(DSH_STYLESHEET)
self.client = client
self.adapter = DshServiceAdapter(service)
self.snapshot = snapshot or TaskSnapshot(task_id, "observe")
self.supervisor = DshSupervisor()
self.issue = QLabel("本地监管:等待异常事件")
self.issue.setWordWrap(True)
self.chat = QTextEdit(); self.chat.setReadOnly(True)
self.input = QLineEdit(); self.input.setPlaceholderText("描述问题,向助手提问…")
self.send = QPushButton("发送"); self.send.clicked.connect(self._send)
self.actions = QListWidget()
form = QFormLayout(); form.addRow("任务", QLabel(self.snapshot.task_id or "当前任务")); form.addRow("状态", self.issue)
controls = QHBoxLayout(); controls.addWidget(self.input, 1); controls.addWidget(self.send)
layout = QVBoxLayout(self); layout.addLayout(form); layout.addWidget(self.actions); layout.addWidget(self.chat, 1); layout.addLayout(controls)
self.snapshot = snapshot or TaskSnapshot(task_id, 'observe')
self.supervisor = supervisor or DshSupervisor()
self._workers = set()
self._sessions = {}
self._current = None
self._closing = False
self._executed = set()
self.workspace = QSplitter(Qt.Orientation.Horizontal)
self.workspace.setHandleWidth(1)
self.workspace.setChildrenCollapsible(False)
self._build_sidebar()
self._build_center()
self._build_right()
self.workspace.setSizes([236, 754, 330])
self.workspace.setStretchFactor(1, 1)
root = QVBoxLayout(self)
root.setContentsMargins(0, 12, 0, 0)
root.setSpacing(0)
root.addWidget(self.workspace)
self._new_chat()
self.observe(self.snapshot)
def observe(self, snapshot: TaskSnapshot):
def _build_sidebar(self):
sidebar, layout = column('dshSidebar', (12, 10, 12, 18))
sidebar.setMinimumWidth(190)
sidebar.setMaximumWidth(360)
layout.addWidget(label('dsh', 'dshBrand'))
layout.addWidget(label('DSH助手 · 器件替换工作台'))
self.new_chat_button = QPushButton('+ 新建对话', objectName='dshNewChat')
self.new_chat_button.clicked.connect(self._new_chat)
layout.addWidget(self.new_chat_button)
self.search = QLineEdit(objectName='dshSearch')
self.search.setPlaceholderText('搜索对话')
self.search.textChanged.connect(self._filter_sessions)
layout.addWidget(self.search)
layout.addWidget(label('当前工作区', 'dshSection'))
self.task_label = label(self.snapshot.task_id or '尚未选择任务', 'dshHeading')
layout.addWidget(self.task_label)
layout.addWidget(label('对话 / 本次窗口', 'dshSection'))
self.conversations = QListWidget()
self.conversations.currentItemChanged.connect(self._select_chat)
layout.addWidget(self.conversations, 1)
config_button = QPushButton('模型与能力说明')
config_button.clicked.connect(lambda: self.right_tabs.setCurrentIndex(1))
layout.addWidget(config_button)
layout.addWidget(label('本地规则监管 · 固定动作'))
self.workspace.addWidget(sidebar)
def _build_center(self):
center, layout = column('dshCenter', (0, 0, 0, 16))
center.setMinimumWidth(420)
header = QFrame(objectName='dshHeader')
row = QHBoxLayout(header)
row.setContentsMargins(24, 8, 24, 12)
self.chat_title = label('新对话', 'dshHeading')
row.addWidget(self.chat_title, 1)
self.model_badge = label('模型未配置', 'dshBadge')
row.addWidget(self.model_badge)
layout.addWidget(header)
self.chat_pages = QStackedWidget()
welcome, welcome_layout = column('dshWelcome', (36, 20, 36, 20))
welcome_layout.addStretch(2)
welcome_layout.addWidget(label('dsh', 'dshHeroMark'))
welcome_layout.addWidget(label('从任务出发,处理每个异常', 'dshHero'))
welcome_layout.addWidget(label('分析执行状态、核对异常证据,\n在允许的范围内准备下一步操作。'))
welcome_layout.addSpacing(22)
for title, prompt in [('分析当前任务', '分析当前任务状态,说明需要处理的问题。'),
('解释异常原因', '根据当前快照解释异常原因,区分已知事实和待核验事项。'),
('查看可用处理方式', '说明当前任务有哪些允许的处理方式,以及需要人工确认的步骤。')]:
button = QPushButton(title + ' ↗', objectName='dshSuggestion')
button.clicked.connect(lambda checked=False, text=prompt: self.input.setPlainText(text))
welcome_layout.addWidget(button)
welcome_layout.addStretch(3)
self.chat_pages.addWidget(welcome)
self.chat = QTextBrowser(objectName='dshChat')
self.chat.setOpenLinks(False)
self.chat.setOpenExternalLinks(False)
self.chat_pages.addWidget(self.chat)
layout.addWidget(self.chat_pages, 1)
composer = QFrame(objectName='dshComposer')
compose_layout = QVBoxLayout(composer)
compose_layout.setContentsMargins(14, 12, 14, 10)
self.input = QPlainTextEdit(objectName='dshInput')
self.input.setPlaceholderText('描述异常,或询问当前任务…')
self.input.setFixedHeight(72)
self.input.setTabChangesFocus(True)
compose_layout.addWidget(self.input)
controls = QHBoxLayout()
controls.addWidget(label('任务上下文已关联'))
controls.addStretch()
self.stop_button = QPushButton('停止接收')
self.stop_button.setToolTip('忽略本次后续回复;后台网络请求将在超时后结束。')
self.stop_button.clicked.connect(self._stop_reply)
controls.addWidget(self.stop_button)
self.send = QPushButton('发送 ↑', objectName='dshPrimary')
self.send.clicked.connect(self._send)
controls.addWidget(self.send)
compose_layout.addLayout(controls)
compose_row = QHBoxLayout()
compose_row.setContentsMargins(24, 0, 24, 0)
compose_row.addWidget(composer)
layout.addLayout(compose_row)
footer = label('建议与执行结果分开记录 · 修改工程仍使用原有确认与核验流程')
footer.setAlignment(Qt.AlignmentFlag.AlignCenter)
layout.addWidget(footer)
self.workspace.addWidget(center)
def _build_right(self):
right, layout = column('dshRight', (16, 0, 16, 18))
right.setMinimumWidth(280)
self.right_tabs = QTabWidget()
context, context_layout = column('dshInspector', (0, 12, 0, 0))
self.issue = label('', 'dshBadge')
context_layout.addWidget(self.issue)
context_layout.addWidget(label('任务上下文', 'dshHeading'))
self.context_text = QTextEdit(objectName='dshContext')
self.context_text.setReadOnly(True)
self.context_text.setMaximumHeight(175)
context_layout.addWidget(self.context_text)
context_layout.addWidget(label('建议动作', 'dshHeading'))
self.action_empty = label('暂无待处理动作。\n助手分析后,允许的操作将在此列出。')
context_layout.addWidget(self.action_empty)
self.actions = QListWidget()
context_layout.addWidget(self.actions, 1)
context_layout.addWidget(label('监管记录', 'dshHeading'))
self.audit = QListWidget()
self.audit.setMaximumHeight(170)
context_layout.addWidget(self.audit)
self.right_tabs.addTab(context, '任务与动作')
info, info_layout = column('dshCapabilities', (0, 16, 0, 0))
self.model_info = label('', 'dshHeading')
info_layout.addWidget(self.model_info)
info_layout.addWidget(label('本地规则监管不依赖模型配置。'))
info_layout.addSpacing(16)
for title, text in [('可以做', '分析任务快照、解释异常、提出固定动作建议。'),
('执行入口', '动作只通过现有任务服务执行,继续检查任务状态。'),
('需要确认', '暂停、恢复和工程修改沿用人工确认流程。'),
('未开放', 'Shell、任意文件访问、浏览器、插件及模型直接操作 CAD。')]:
info_layout.addWidget(label(title, 'dshHeading'))
info_layout.addWidget(label(text))
info_layout.addStretch()
self.right_tabs.addTab(info, '能力边界')
layout.addWidget(self.right_tabs)
self.workspace.addWidget(right)
def _new_chat(self):
session_id = uuid4().hex
self._sessions[session_id] = {'title': '新对话', 'messages': [], 'actions': [], 'request': None}
item = QListWidgetItem('新对话')
item.setData(Qt.ItemDataRole.UserRole, session_id)
self.conversations.insertItem(0, item)
self.conversations.setCurrentItem(item)
self.input.clear()
self._filter_sessions(self.search.text())
def _filter_sessions(self, text):
for index in range(self.conversations.count()):
item = self.conversations.item(index)
item.setHidden(text.casefold() not in item.text().casefold())
def _select_chat(self, item, previous):
if item is not None:
self._current = item.data(Qt.ItemDataRole.UserRole)
self._render_session()
def _render_session(self):
session = self._sessions[self._current]
self.chat_title.setText(session['title'])
self.chat_pages.setCurrentIndex(1 if session['messages'] else 0)
parts = []
for role, text in session['messages']:
background = '#f1f3f5' if role == '你' else '#ffffff'
parts.append(f'<div style="background:{background};padding:16px;">'
f'<p style="color:#81858c;font-size:12px;">{role}</p>'
f'<p style="line-height:160%;">{escape(text).replace(chr(10), "<br>")}</p></div><br>')
self.chat.setHtml(''.join(parts))
self.chat.verticalScrollBar().setValue(self.chat.verticalScrollBar().maximum())
self.send.setEnabled(not session['request'])
self.stop_button.setEnabled(bool(session['request']))
self._show_actions(session['actions'])
def observe(self, snapshot):
self.snapshot = snapshot
record = self.supervisor.observe(snapshot, auto=False)
self.issue.setText(f"本地监管:{record['classification']} · {snapshot.issue or '未发现异常'}")
self.actions.addItem("需要人工确认的动作会显示在这里")
self.task_label.setText(snapshot.task_id or '尚未选择任务')
state = STATUS.get(snapshot.status, snapshot.status)
self.issue.setText(f'● {state} · 本地规则监管')
safe = snapshot.safe_dict()
self.context_text.setPlainText(f"任务 {safe['task_id'] or '未选择'}\n状态 {state}\n规则 {safe['rules_count']} 条\n"
f"异常码 {safe['issue_code'] or '无'}\n摘要 {safe['issue'] or '暂无异常证据'}")
config = getattr(self.client, 'config', None)
configured = bool(config and config.configured)
self.model_badge.setText(config.model if configured else '模型未配置')
self.model_info.setText('已配置:' + config.model if configured else '模型尚未配置')
self.audit.clear()
for record in self.supervisor.history[-20:]:
if record.get('snapshot', {}).get('task_id') == snapshot.task_id:
self.audit.addItem('异常事件 · ' + record.get('classification', 'observe'))
if not self.audit.count():
self.audit.addItem('已关联当前任务快照')
if self._current:
self._render_session()
def _send(self):
message = self.input.text().strip()
if not message: return
self.input.clear(); self.chat.append(f"你:{message}")
if self.client is None:
self.chat.append("助手:尚未配置 DeepSeek/OpenAI 兼容模型;本地监管仍可用。")
text = self.input.toPlainText().strip()
session_id = self._current
session = self._sessions[session_id]
if not text or session['request']:
return
try:
result = self.client.chat(message, self.snapshot.safe_dict())
self.chat.append(f"助手:{result['reply']}")
self._show_actions(result.get("actions", []))
except DshClientError as error:
self.chat.append(f"助手:{error}")
if len(text) > 4000:
session['messages'].append(('DSH助手', '消息最多 4000 字,请缩短后发送。'))
self._render_session()
return
self.input.clear()
session['messages'].append(('你', text))
if session['title'] == '新对话':
session['title'] = text.replace('\n', ' ')[:22]
self.conversations.currentItem().setText(session['title'])
if self.client is None:
session['messages'].append(('DSH助手', '尚未配置模型;本地规则监管仍可使用。'))
self._render_session()
return
request_id = uuid4().hex
session['request'] = request_id
snapshot = self.snapshot.safe_dict()
worker = ServiceWorker(lambda: self.client.chat(text, snapshot))
self._workers.add(worker)
def finish_message(reply, actions=()):
if self._closing or session['request'] != request_id:
return
session['request'] = None
session['messages'].append(('DSH助手', reply))
session['actions'] = list(actions)
if self._current == session_id:
self._render_session()
def failed(error):
message = ('尚未配置模型;本地规则监管仍可使用。' if isinstance(error, DshClientError)
and str(error) == 'dsh_model_not_configured' else '对话请求未完成,请检查模型配置与网络后重试。')
finish_message(message)
worker.signals.succeeded.connect(lambda result: finish_message(result['reply'], result.get('actions', [])))
worker.signals.failed.connect(failed)
worker.signals.finished.connect(lambda: self._workers.discard(worker))
self._render_session()
QThreadPool.globalInstance().start(worker)
def _stop_reply(self):
session = self._sessions[self._current]
if session['request']:
session['request'] = None
session['messages'].append(('DSH助手', '已停止接收本次回复;后台请求将在超时后结束。'))
self._render_session()
def _show_actions(self, actions):
for proposal in actions:
if not isinstance(proposal, ActionProposal):
continue
button = QPushButton(f"执行:{proposal.name} · {proposal.reason or 'DSH建议'}")
button.clicked.connect(lambda _checked=False, p=proposal, b=button: self._execute(p, b))
self.actions.addItem("")
self.actions.setItemWidget(self.actions.item(self.actions.count() - 1), button)
self.actions.clear()
valid = [p for p in actions if isinstance(p, ActionProposal) and p.task_id == self.snapshot.task_id]
self.action_empty.setVisible(not valid)
for proposal in valid:
card = QFrame(objectName='dshCard')
layout = QVBoxLayout(card)
layout.addWidget(label(ACTION.get(proposal.name, proposal.name), 'dshHeading'))
layout.addWidget(label(proposal.reason or '请核对当前任务后执行。'))
button = QPushButton('确认执行', objectName='dshAction')
button.setEnabled(proposal.idempotency_key not in self._executed)
button.clicked.connect(lambda checked=False, p=proposal: self._execute(p))
layout.addWidget(button)
item = QListWidgetItem()
item.setSizeHint(card.sizeHint())
self.actions.addItem(item)
self.actions.setItemWidget(item, card)
def _execute(self, proposal: ActionProposal, button: QPushButton):
if proposal.requires_confirmation and QMessageBox.question(
self, "确认DSH动作", f"确认执行 {proposal.name}?\n\n{proposal.reason}",
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
QMessageBox.StandardButton.No) != QMessageBox.StandardButton.Yes:
def _execute(self, proposal):
if proposal.task_id != self.snapshot.task_id or proposal.idempotency_key in self._executed:
return
button.setEnabled(False)
try:
result = self.adapter.execute(proposal)
self.chat.append(f"DSH:动作已提交 {result.get('action', proposal.name)}")
except Exception as error:
button.setEnabled(True)
self.chat.append(f"DSH:动作未执行:{error}")
if QMessageBox.question(self, '确认DSH动作', f"{ACTION.get(proposal.name, proposal.name)}\n\n{proposal.reason}",
QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
QMessageBox.StandardButton.No) != QMessageBox.StandardButton.Yes:
return
self._executed.add(proposal.idempotency_key)
worker = ServiceWorker(lambda: self.adapter.execute(proposal))
self._workers.add(worker)
worker.signals.succeeded.connect(lambda _: self.audit.addItem('已提交 · ' + ACTION.get(proposal.name, proposal.name)) if not self._closing else None)
worker.signals.failed.connect(lambda _: self.audit.addItem('动作未完成,请核对任务状态') if not self._closing else None)
worker.signals.finished.connect(lambda: self._workers.discard(worker))
self._render_session()
QThreadPool.globalInstance().start(worker)
def closeEvent(self, event):
self._discard_pending_replies()
super().closeEvent(event)
def done(self, result):
# Escape/reject uses QDialog.done and does not deliver closeEvent.
self._discard_pending_replies()
super().done(result)
def _discard_pending_replies(self):
self._closing = True
for session in self._sessions.values():
session['request'] = None
@@ -0,0 +1,45 @@
"""Qt adaptation of DeepSeek Harness desktop light tokens; see licenses."""
DSH_STYLESHEET = """
QDialog#dshDesktop { background: #f9fafb; }
QWidget { color: #0f1115; font-family: "Microsoft YaHei", "Segoe UI"; font-size: 13px; background: transparent; }
QWidget#dshSidebar { background: #f9fafb; }
QWidget#dshCenter, QWidget#dshRight { background: #ffffff; }
QWidget#dshCenter { border-top-left-radius: 16px; }
QFrame#dshHeader { border-bottom: 1px solid #ebedf0; }
QLabel#dshBrand { font-size: 22px; font-weight: 500; }
QLabel#dshMuted { color: #81858c; font-size: 12px; }
QLabel#dshSection { color: #81858c; font-size: 11px; padding: 10px 2px 4px; }
QLabel#dshHeading { font-size: 14px; font-weight: 600; }
QLabel#dshHero { font-size: 28px; font-weight: 500; }
QLabel#dshHeroMark { color: #4176e6; font-size: 40px; font-weight: 500; }
QLabel#dshBadge { color: #4868b2; background: #edf3fe; border-radius: 8px; padding: 4px 8px; font-size: 11px; }
QPushButton { border: none; border-radius: 8px; min-height: 28px; padding: 5px 10px; background: transparent; }
QPushButton:hover { background: #ebeff5; }
QPushButton:disabled { color: #adb2b8; background: #f1f3f5; }
QPushButton#dshNewChat { background: #ffffff; border: 1px solid #e1e5ee; border-radius: 12px; text-align: left; padding: 7px 14px; }
QPushButton#dshNewChat:hover { background: #f1f3f5; }
QPushButton#dshPrimary { background: #0f1115; color: #ffffff; border-radius: 12px; min-width: 32px; }
QPushButton#dshPrimary:hover { background: #43454a; }
QPushButton#dshPrimary:disabled { background: #e1e5ee; color: #979da6; }
QPushButton#dshSuggestion { background: #ffffff; border: 1px solid #e1e5ee; border-radius: 12px; text-align: left; padding: 10px 16px; }
QPushButton#dshAction { background: #edf3fe; color: #4868b2; border-radius: 8px; }
QListWidget { background: transparent; border: none; outline: none; }
QListWidget::item { padding: 11px 10px; border: none; border-radius: 10px; margin: 2px 0; }
QListWidget::item:selected { background: #ebeff5; color: #0f1115; border: none; }
QListWidget::item:hover { background: #f1f3f5; }
QLineEdit#dshSearch { background: #f1f3f5; border: none; border-radius: 8px; padding: 6px 10px; min-height: 24px; }
QFrame#dshComposer { background: #f5f6f7; border: 1px solid #e1e5ee; border-radius: 20px; }
QPlainTextEdit#dshInput { border: none; background: transparent; padding: 6px; font-size: 14px; }
QTextBrowser#dshChat { background: #ffffff; border: none; padding: 10px 20px; font-family: "Microsoft YaHei", "Segoe UI"; font-size: 14px; }
QFrame#dshCard { background: #f9fafb; border: 1px solid #ebedf0; border-radius: 12px; }
QTextEdit#dshContext { background: transparent; border: none; padding: 0; font-family: "Microsoft YaHei"; font-size: 12px; color: #61666b; }
QTabWidget::pane { border: none; }
QTabBar::tab { padding: 14px 12px; color: #81858c; border: none; border-bottom: 2px solid transparent; }
QTabBar::tab:selected { color: #0f1115; border-bottom: 2px solid #0f1115; }
QSplitter::handle { background: #ebedf0; border: none; }
QSplitter::handle:hover { background: #cfd3d6; }
QScrollBar:vertical { background: transparent; width: 6px; margin: 0; }
QScrollBar::handle:vertical { background: #d5d9de; border-radius: 3px; min-height: 30px; }
QScrollBar::add-line:vertical, QScrollBar::sub-line:vertical { height: 0; }
"""
@@ -830,7 +830,9 @@ class TrialTaskCenterWindow(QMainWindow):
status = getattr(getattr(self, '_context', None), 'task', None)
status_value = getattr(getattr(status, 'status', None), 'value', 'observe')
panel = DshPanel(self.service, task_id=task_id,
snapshot=TaskSnapshot(task_id, str(status_value)),
snapshot=TaskSnapshot(task_id, str(status_value),
rules_count=len(getattr(self._context, 'rules', ()))),
supervisor=self._dsh,
client=OpenAICompatibleClient(DshConfig(
base_url=os.getenv('DSH_API_BASE', ''),
model=os.getenv('DSH_MODEL', ''),
+104
View File
@@ -0,0 +1,104 @@
"""DSH desktop layout and usable conversation lifecycle without model/CAD access."""
from threading import Event
from PySide6.QtCore import Qt
from dx_productivity.dsh.snapshot import TaskSnapshot
from dx_productivity.trial_task_center.ui.dsh_panel import DshPanel
def make_panel(qtbot, **kwargs):
panel = DshPanel(None, snapshot=TaskSnapshot('board-a', 'paused'), **kwargs)
qtbot.addWidget(panel)
panel.show()
return panel
def test_desktop_has_three_resizable_columns_and_initial_context(qtbot):
panel = make_panel(qtbot)
assert panel.workspace.orientation() == Qt.Orientation.Horizontal
assert panel.workspace.count() == 3
assert all(size > 0 for size in panel.workspace.sizes())
assert panel.windowTitle() == 'DSH助手'
assert 'board-a' in panel.context_text.toPlainText()
assert '暂停' in panel.issue.text()
def test_new_conversation_preserves_previous_local_history(qtbot):
panel = make_panel(qtbot)
panel.input.setPlainText('分析当前异常')
qtbot.mouseClick(panel.send, Qt.MouseButton.LeftButton)
qtbot.waitUntil(lambda: panel.send.isEnabled())
assert '未配置' in panel.chat.toPlainText()
qtbot.mouseClick(panel.new_chat_button, Qt.MouseButton.LeftButton)
assert panel.conversations.count() == 2
assert '分析当前异常' not in panel.chat.toPlainText()
panel.conversations.setCurrentRow(1)
assert '分析当前异常' in panel.chat.toPlainText()
def test_model_call_does_not_block_ui_or_mix_conversations(qtbot):
entered, release = Event(), Event()
class Client:
def chat(self, message, snapshot):
entered.set()
assert release.wait(5)
return {'reply': '<b>模型原文</b>', 'actions': []}
panel = make_panel(qtbot, client=Client())
panel.input.setPlainText('检查失败原因')
try:
qtbot.mouseClick(panel.send, Qt.MouseButton.LeftButton)
qtbot.waitUntil(entered.is_set)
assert not panel.send.isEnabled()
assert panel.stop_button.isEnabled()
qtbot.mouseClick(panel.new_chat_button, Qt.MouseButton.LeftButton)
release.set()
qtbot.waitUntil(lambda: not panel._workers)
assert '模型原文' not in panel.chat.toPlainText()
panel.conversations.setCurrentRow(1)
assert '<b>模型原文</b>' in panel.chat.toPlainText()
finally:
release.set()
def test_stopped_reply_is_not_displayed(qtbot):
release = Event()
class Client:
def chat(self, *_):
release.wait(5)
return {'reply': '迟到的回复', 'actions': []}
panel = make_panel(qtbot, client=Client())
panel.input.setPlainText('提问')
try:
qtbot.mouseClick(panel.send, Qt.MouseButton.LeftButton)
qtbot.mouseClick(panel.stop_button, Qt.MouseButton.LeftButton)
release.set()
qtbot.waitUntil(lambda: not panel._workers)
assert '迟到的回复' not in panel.chat.toPlainText()
assert '停止' in panel.chat.toPlainText()
finally:
release.set()
def test_escape_closes_panel_and_discards_late_reply(qtbot):
release = Event()
class Client:
def chat(self, *_):
release.wait(5)
return {'reply': '窗口关闭后的回复', 'actions': []}
panel = make_panel(qtbot, client=Client())
panel.input.setPlainText('分析')
try:
qtbot.mouseClick(panel.send, Qt.MouseButton.LeftButton)
qtbot.keyClick(panel, Qt.Key.Key_Escape)
release.set()
qtbot.waitUntil(lambda: not panel._workers)
assert not panel.isVisible()
assert '窗口关闭后的回复' not in panel.chat.toPlainText()
finally:
release.set()
+48
View File
@@ -0,0 +1,48 @@
"""Launch or render the actual DSH panel without opening CAD or a task database."""
from __future__ import annotations
import argparse
import os
from pathlib import Path
import sys
sys.path.insert(0, str(Path(__file__).resolve().parents[1] / 'src'))
def main():
parser = argparse.ArgumentParser(description=__doc__)
parser.add_argument('--screenshot', type=Path)
parser.add_argument('--width', type=int, default=1320)
parser.add_argument('--height', type=int, default=820)
args = parser.parse_args()
if args.screenshot:
os.environ['QT_QPA_PLATFORM'] = 'offscreen'
from PySide6.QtGui import QFont, QFontDatabase
from PySide6.QtWidgets import QApplication
from dx_productivity.dsh.client import DshConfig, OpenAICompatibleClient
from dx_productivity.trial_task_center.ui.dsh_panel import DshPanel
app = QApplication([])
# Offscreen Qt does not discover the Windows system font collection itself.
font_path = Path('C:/Windows/Fonts/msyh.ttc')
if args.screenshot and font_path.exists():
QFontDatabase.addApplicationFont(str(font_path))
app.setFont(QFont('Microsoft YaHei', 10))
panel = DshPanel(None, client=OpenAICompatibleClient(DshConfig(
base_url=os.getenv('DSH_API_BASE', ''), model=os.getenv('DSH_MODEL', ''),
api_key=os.getenv('DSH_API_KEY', ''))))
panel.resize(args.width, args.height)
panel.show()
if args.screenshot:
app.processEvents()
args.screenshot.parent.mkdir(parents=True, exist_ok=True)
if not panel.grab().save(str(args.screenshot)):
raise RuntimeError('Could not save screenshot')
print(args.screenshot.resolve())
panel.close()
return 0
return app.exec()
if __name__ == '__main__':
raise SystemExit(main())