From 705774e8c55ecf5d9dc6b3e18ea8e0349fbd1164 Mon Sep 17 00:00:00 2001 From: Limin Wang Date: Thu, 19 Nov 2026 19:47:31 -0800 Subject: [PATCH] =?UTF-8?q?feat(briefing):=20=E5=B7=A5=E4=BD=9C=E7=AE=80?= =?UTF-8?q?=E6=8A=A5=E6=94=B9=E5=9C=A8=E6=B5=8F=E8=A7=88=E5=99=A8=E9=87=8C?= =?UTF-8?q?=E7=9C=8B=E2=80=94=E2=80=94=E9=85=8D=E7=BD=AE=E5=85=A8=E6=99=AF?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9A=84=E6=8A=A5=E5=91=8A=E9=A1=B5=20/repor?= =?UTF-8?q?t/work=5Fbriefing=EF=BC=8CQt=20=E5=A3=B3=E4=B8=8D=E5=86=8D?= =?UTF-8?q?=E5=B8=A6=E3=80=8C=E7=AE=80=E6=8A=A5=E3=80=8D=E9=A1=B5=EF=BC=88?= =?UTF-8?q?ADR=200018=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - pet/panorama/reports.py:报告页的数据(work_briefing provider:最近一份 → 标题 / 概要 / 用量 / 全文 HTML / 忙 / 错 / 按钮 / 有没有这项功能)、generate_work_briefing;markdown.py:零依赖的 Markdown → HTML(★ / bug 记号变类名、链接只认 http(s)) - service:reports 登记表、每份报告一个 Feed、report / publish_report(没人看过不白做)/ report_watched / open_report(起服务 不采集);_page_target 拆出 _server_url - routes:GET /report/<名字>(公开外壳)、GET /api/report/<名字>(要令牌,认 ?after=);actions.generate_report - 页面:report.html / report.css / report.js;client.js 抽出取令牌与带令牌的 fetch,boot.js 改用它 - WorkBriefingController:open_report / report_watched 两条路——「查看」开浏览器、打开即读过、页面开着不冒提醒; WorkBriefingWindow(briefing_page=False) 只给笔记 / Slack 当壳 - app:_panorama() 懒建服务并登记 reports 与 generate_report;简报 started / finished → publish_report - 菜单:「生成时间」子菜单拿掉,加「简报设置…」翻到配置全景(facade.open_work_briefing_settings) - ADR 0018;路线图新增 M4b;docs/config-panorama「报告页」一节;docs/work-assistant「窗口」改写;CHANGELOG;字表 Co-Authored-By: Claude Fable 5.1 --- CHANGELOG.md | 1 + .../0018-content-pages-move-to-the-browser.md | 37 +++ docs/adr/README.md | 1 + docs/config-panorama.md | 33 +- docs/roadmap.md | 8 + docs/work-assistant.md | 15 +- pet/app.py | 40 ++- pet/context_menus/shared.py | 17 +- pet/locale/en.json | 13 +- pet/locale/zh.json | 13 +- pet/panorama/actions.py | 11 + pet/panorama/markdown.py | 144 ++++++++ pet/panorama/page/boot.js | 41 +-- pet/panorama/page/client.js | 47 +++ pet/panorama/page/report.css | 37 +++ pet/panorama/page/report.html | 27 ++ pet/panorama/page/report.js | 76 +++++ pet/panorama/render.py | 32 +- pet/panorama/reports.py | 88 +++++ pet/panorama/routes.py | 38 +++ pet/panorama/service.py | 75 ++++- pet/sprite_menu_facade.py | 7 +- pet/work_briefing_ui.py | 34 +- tests/test_panorama_entry.py | 6 +- tests/test_panorama_markdown.py | 68 ++++ tests/test_panorama_page.py | 2 +- tests/test_panorama_report_page.py | 312 ++++++++++++++++++ tests/test_panorama_reports.py | 109 ++++++ tests/test_panorama_service.py | 4 +- tests/test_panorama_settings_panel.py | 2 +- tests/test_work_briefing.py | 8 +- tests/test_work_briefing_page.py | 127 +++++++ 32 files changed, 1380 insertions(+), 93 deletions(-) create mode 100644 docs/adr/0018-content-pages-move-to-the-browser.md create mode 100644 pet/panorama/markdown.py create mode 100644 pet/panorama/page/client.js create mode 100644 pet/panorama/page/report.css create mode 100644 pet/panorama/page/report.html create mode 100644 pet/panorama/page/report.js create mode 100644 pet/panorama/reports.py create mode 100644 tests/test_panorama_markdown.py create mode 100644 tests/test_panorama_report_page.py create mode 100644 tests/test_panorama_reports.py create mode 100644 tests/test_work_briefing_page.py diff --git a/CHANGELOG.md b/CHANGELOG.md index 73950417..f722ba00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,7 @@ ## 2026-11 +- 11-19 工作简报改在浏览器里看:岛上的小文档按钮、早上提醒的「查看」、右键「查看最近一份」都打开配置全景服务的简报页(概要、用量、全文、「重新生成」,生成中页面自己更新)。右键菜单里的「生成时间」子菜单拿掉,换成「简报设置…」翻到配置全景;笔记 / Slack 关注仍在原来的窗口里 - 11-19 配置全景的待处理里,「联动开着但没有 hooks」那一条有了「修复」按钮:确认一次就把 hooks 装回去,图上那条断线随即变回来(WSL 那条在后台装,装完自己更新)。从页面或设置进程关掉联动通道时,肥鱼自己装的 hooks 也会一起卸掉,和右键菜单关闭一样 - 11-19 Claude Code 联动、会话小鱼、「最近的对话」的设置搬到了配置全景(四块磁贴各带「设置」)。「最近的对话」最多留几天 / 几条这两项以前只能手改 config.json,现在也能改了。右键「Agent 联动」里只剩开关:上限 / 保留天数 / 配色 / 字号 / 桂冠 / 行数那六个子菜单换成一条「会话小鱼设置…」 - 11-18 右键菜单更短了:「播放动画」「切换角色」「播放速率」「大小」收进了「肥鱼控制」子菜单最上面一组。自己改过菜单编排的不受影响 diff --git a/docs/adr/0018-content-pages-move-to-the-browser.md b/docs/adr/0018-content-pages-move-to-the-browser.md new file mode 100644 index 00000000..4ff73dcd --- /dev/null +++ b/docs/adr/0018-content-pages-move-to-the-browser.md @@ -0,0 +1,37 @@ +# 0018:生成出来的内容也在浏览器里读,从工作简报开始;Qt 的简报窗口等别的页搬完再删 + +日期:2026-11-19 + +## 背景 + +[0014](0014-panorama-becomes-the-console.md) 把**设置**搬到了配置全景(网页)。但肥鱼还有一类界面是**读生成出来的 +内容**:工作简报、个人简报、工作笔记、Slack 关注,都在一扇 Qt 窗口 `WorkBriefingWindow` 里(三页,三处复用)。 +它用 Qt 的文本控件排 Markdown,再逐个文本片段上色;每多一种标记就多一段遍历代码,样式和网页那边各一套。 +用户 2026-11-19 说:先把工作简报搬到浏览器。 + +## 决定 + +- **内容页也走配置全景那个本机回环服务**,作为它的第二类页面:`/report/<名字>`(外壳公开、无数据)+ + `/api/report/<名字>`(要令牌,和图一样认 `?after=` 等更新)。内容**不进全景图、不落离线快照**:图是地图,这是读内容; + 快照落盘,公司内容不该多一份副本。肥鱼没开时没有报告可看(原来的 Qt 窗口也要肥鱼开着)。 +- **页面不认功能**:服务里按名字登记 provider(`reports={"work_briefing": …}`),provider 在界面线程上把那项功能的状态翻成 + 一份固定字段的字典(标题、概要、用量、全文 HTML、忙 / 错、按钮)。个人简报以后只是多登记一项。 +- **Markdown 在 Python 里渲染**(`pet/panorama/markdown.py`,零依赖,只认简报会写出来的子集);★ 和 bug 记号变成类名, + 样式在 `report.css`。逻辑留在 Python 可测;不引 markdown 库。 +- **一次只搬一页。** 这一步只搬工作简报的阅读页:岛按钮、提醒的「查看」、菜单「查看最近一份」都开浏览器,Qt 里不再有 + 第二个看它的地方。笔记页、Slack 关注页是交互列表,各自一期;个人简报紧随其后。**`WorkBriefingWindow` 先留着**只当别的页 + 的壳(不带「简报」页),都搬完再删——现在删它等于同时重做三个功能。 +- 页面跟「外观」里的主题偏好,不放自己的明暗切换:那个偏好只在一处改(0014)。 +- 顺手按 0014 把菜单里「生成时间」子菜单拿掉(页面上已能改),换成一条「简报设置…」。 + +没有选「在全景图上加一块显示简报」:图是配置的地图,和读一篇文字是两件事,而且会把公司内容带进快照。 +没有选「先删 Qt 窗口」:笔记 / Slack 页还靠它。 +没有选「页面里用 JS 渲染 Markdown」:渲染规则要和原来 `_decorate` 的上色一致,在 Python 里有测试守着更稳。 + +## 后果 + +- 本机服务多两个网址、一类页面;`PanoramaService` 多了报告登记表、`open_report`、`publish_report`。 +- 简报内容第一次经 HTTP 给浏览器(仍只在 `127.0.0.1`、要令牌、只记请求行);隐私边界不变。 +- 工作简报的阅读界面从此有两套样式令牌来源:Qt 壳(`_EXTRA_TOKENS`)和 `report.css` 顶部那组,改一处要两处一起改, + 直到 Qt 壳删掉。 +- 剩下的顺序记在[路线图](../roadmap.md)「内容页搬到浏览器」。 diff --git a/docs/adr/README.md b/docs/adr/README.md index cc4af8c5..fc7b21b3 100644 --- a/docs/adr/README.md +++ b/docs/adr/README.md @@ -65,3 +65,4 @@ PR 满足下面**任意一条**才新增一份 ADR: | [0015](0015-private-repos-are-home.md) | 私有仓库是数据的家,本机磁盘只是缓存;每种落盘数据都要登记从哪恢复 | | [0016](0016-drop-screen-watching-and-file-interpret.md) | 看屏幕和拖文件解读整个删掉,不按 0012 只摘入口 | | [0017](0017-drop-quick-launch-and-tools-help.md) | 右键菜单的「快捷启动」和「工具与帮助」整个删掉 | +| [0018](0018-content-pages-move-to-the-browser.md) | 生成出来的内容也在浏览器里读,从工作简报开始;Qt 的简报窗口等别的页搬完再删 | diff --git a/docs/config-panorama.md b/docs/config-panorama.md index 07f20de1..1ed64e0f 100644 --- a/docs/config-panorama.md +++ b/docs/config-panorama.md @@ -22,12 +22,15 @@ | `pet/panorama/places.py` | 存储画在图上哪里:`PLACES`(一个地方 = 几个根 + 分区 + 列 + 谁往这里写)、`OWN_TILE`、`ALSO_ON` | | `pet/panorama/model.py` | 图模型 `Graph`:账号带 `ZONES`、层 `TIERS`、分区、列、节点、连线、待处理;状态取值校验。没有坐标 | | `pet/panorama/sources.py` | 来源:若干 `@source` 纯函数,把事实翻译成节点 / 连线 / 待处理;`build(facts)` | -| `pet/panorama/page/` | 页面代码,两种交付方式共用:`shell.html`(外壳)、`app.css`,和一组原生模块——`util.js`(转义、图标、颜色)、`layout.js`(版面)、`roads.js`(走线)、`draw.js`(画)、`viewer.js`(文件查看面板)、`memory.js`(记忆一览面板)、`form.js`(设置表单)、`settings.js`(设置面板:开、关、跨重画存活)、`interact.js`(追踪、详情、搜索、筛选)、`app.js`(`start(G)` 把四步串起来)、`boot.js`(入口:数据从哪来、等新数据、连接断了) | +| `pet/panorama/page/` | 页面代码,两种交付方式共用:`shell.html`(外壳)、`app.css`,和一组原生模块——`util.js`(转义、图标、颜色)、`layout.js`(版面)、`roads.js`(走线)、`draw.js`(画)、`viewer.js`(文件查看面板)、`memory.js`(记忆一览面板)、`form.js`(设置表单)、`settings.js`(设置面板:开、关、跨重画存活)、`repair.js`(待处理里的「修复」)、`interact.js`(追踪、详情、搜索、筛选)、`app.js`(`start(G)` 把四步串起来)、`client.js`(取令牌、带令牌的 fetch,两张页共用)、`boot.js`(入口:数据从哪来、等新数据、连接断了);报告页自己的 `report.html` / `report.css` / `report.js` | | `pet/panorama/render.py` | 把图变成页面要的那份数据(`page_data` / `payload`);`shell()` / `asset()` 给本机服务;`render()` / `write()` 出离线快照 | | `pet/panorama/service.py` | `PanoramaService`:应用里的后台两段采集与发布;持有本机服务 | | `pet/panorama/server.py` | 本机回环服务 `PanoramaServer` + 路由表 `Router`:生命周期、守门检查、分发。**只用标准库、不碰 Qt** | | `pet/panorama/feed.py` | 发布台 `Feed`:存最近一次发布的数据和它的编号,让「等新数据」的请求等到有为止。**只用标准库** | -| `pet/panorama/routes.py` | `build_router`:登记有哪些网址(外壳、静态文件、`/api/ping`、`/api/graph` 及它的「等更新的」用法、`/api/files`、`/api/file`、`/api/settings/<组>`、`/api/audit`) | +| `pet/panorama/routes.py` | `build_router`:登记有哪些网址(外壳、静态文件、`/api/ping`、`/api/graph` 及它的「等更新的」用法、`/api/files`、`/api/file`、`/api/settings/<组>`、`/api/audit`、`/api/actions/<动作>`、`/report/<名字>` + `/api/report/<名字>`) | +| `pet/panorama/actions.py` | 页面动作的处理器:`repair_hooks`(装 hooks)、`generate_report`(报告页的「重新生成」) | +| `pet/panorama/reports.py` | 报告页的数据:`work_briefing(service_of, config)` 把简报服务的最近一份翻成页面要摆的字典;`generate_work_briefing` | +| `pet/panorama/markdown.py` | 简报那一小块 Markdown → HTML(零依赖,只认简报会写出来的子集;★ / bug 记号变成类名) | | `pet/panorama/settings_api.py` | 读、改一组设置的那段逻辑(`read` / `write`):先重读、对版本、校验、落盘、记审计。不碰 Qt,拿活的 `Config` 干活 | | `pet/panorama/files.py` | 文件查看的那道门:`VIEWABLE` 名单、`Reader.listing` / `Reader.read`。**只用标准库、不碰 Qt** | | `pet/panorama/__main__.py` | 命令行入口 `[--no-wsl] [--no-mcp] [--no-open]` | @@ -304,6 +307,32 @@ flowchart LR - **升级时开着的旧设置窗口**:它跑的是旧代码,里面还有搬走的那一组,一保存就把页面改的值盖回去。主进程启动 2.5 秒后发现设置窗口 已经开着,就弹一条通知请用户关掉重开(`AppShell._warn_settings_window_from_before`,跟着「系统通知」总开关)。不替用户关:里面可能有没存的改动。 +### 报告页:在浏览器里读生成出来的内容(现在只有工作简报) + +本机服务的第二类页面(2026-11-19,[ADR 0018](adr/0018-content-pages-move-to-the-browser.md)):`/report/<名字>` 是公开的外壳 +(无数据),`/api/report/<名字>` 要令牌,和 `/api/graph` 一样认 `?after=<编号>` 等更新的。 + +- **登记**:应用构造 `PanoramaService` 时传 `reports={"work_briefing": provider}`(`reports.py`)。provider 在**界面线程**上被调 + (它读 Qt 对象),返回固定字段的字典:`title / theme / summary / generated / usage[] / html / busy / busy_text / empty_text / + error / action{name, report, label, hint} / available`。页面(`report.js`)只按字段摆,不认识功能。 +- **数据怎么到页面**:每份报告自己一个 `Feed`。第一次 `GET /api/report/<名字>` 时还没发布过,请求线程经 `on_gui` 让界面线程做一份 + (`publish_report(force=True)`);之后页面带编号等更新。简报服务 `started` / `finished` 时应用调 `publish_report(name)`—— + **没人打开过页面就什么都不做**(provider 不白跑)。`report_watched(name)` = 有请求挂在那份报告上 = 用户正开着看, + 控制器据此不再为新一份冒提醒。 +- **打开**:`open_report(name)` 起本机服务(不采集全景那一轮)、`publish_report(force=True)`、开 `base_url/report/<名字>#令牌`。 + 报告没有离线快照:服务起不来就返回 False,调用方冒气泡。 +- **Markdown → HTML 在 Python 里**(`markdown.py`):标题、列表(可嵌套)、段落、粗体、行内代码 → ``、 + `[文字](http(s)://…)` 和裸地址 → 新标签页的链接(别的协议只是几个字);列表项开头的 ★ → ``, + bug 记号开头的项 → `
  • `(它的子列表随它上底色)。这几条就是原来 Qt 窗口 `_decorate` 的上色规则。 + 其余一律转义:` + + diff --git a/pet/panorama/page/report.js b/pet/panorama/page/report.js new file mode 100644 index 00000000..2ec79c4a --- /dev/null +++ b/pet/panorama/page/report.js @@ -0,0 +1,76 @@ +/* 报告页的脚本(/report/<名字>,现在只有工作简报):取令牌 → 向 /api/report/<名字> 要数据 → 摆到页面上 → + 带着编号去「等更新的」(服务把请求挂住,生成开始 / 结束那一刻才回),页面原地重画。 + + 页面不认识具体功能:标题、概要、用量、全文、按钮都是服务给的字段。全文是服务端渲染好的 HTML(markdown.py 只会产出 + 那几个标签,别的全转义过了),直接放进 article;概要、用量这类纯文字这里转义。 + 「重新生成」:POST /api/actions/<动作名> {report};服务回 started 之后不动按钮——生成开始的信号会让页面重画成忙碌, + 结束再重画成新内容。回 busy 时按钮保持灰,别的回答把原因写在状态栏、按钮放开。 */ +import {esc} from './util.js'; +import {takeToken, makeApi} from './client.js'; + +(function () { + var RETRY_MS = 1000; /* 服务说「这段时间没有新数据」之后隔多久再去等:只为防止出错时空转 */ + var name = location.pathname.split('/').pop(); + var api = makeApi(takeToken('report-token').token); + var el = function (id) { return document.getElementById(id); }; + var revision = 0, waiting = false, dead = false, S = {}; + + function lost() { dead = true; waiting = false; el('lost').hidden = false; el('action').disabled = true; } + + function show(data) { + var r = data.report || {}; + S = data.strings || {}; + document.documentElement.lang = data.page.lang; + document.documentElement.dataset.theme = r.theme || 'dark'; + document.title = data.page.title; + el('title').textContent = r.title || ''; + el('generated').textContent = r.generated || ''; + el('summary').textContent = r.summary || ''; + el('summary').hidden = !r.summary; + el('usage').innerHTML = (r.usage || []).map(function (u) { return '' + esc(u.text) + ''; }).join(''); + if (r.available === false) el('body').innerHTML = '

    ' + esc(S.report_unavailable) + '

    '; + else if (r.html) el('body').innerHTML = r.html; + else el('body').innerHTML = '

    ' + esc(r.busy ? r.busy_text : r.empty_text) + '

    '; + el('status').textContent = r.busy ? r.busy_text : (r.error || ''); + el('status').className = 'status' + (r.error && !r.busy ? ' bad' : ''); + var btn = el('action'); + if (r.action && r.available !== false) { + btn.hidden = false; + btn.textContent = r.action.label; + btn.title = r.action.hint || ''; + btn.disabled = !!r.busy; + btn.dataset.name = r.action.name; + btn.dataset.report = r.action.report; + } else btn.hidden = true; + revision = data.revision; + } + + function listen() { /* 同一时刻只挂一个请求;标签页藏着或连接已断就不挂 */ + if (waiting || dead || document.visibilityState !== 'visible') return; + waiting = true; + api('/api/report/' + name + '?after=' + revision).then(function (next) { + waiting = false; + if (next) { show(next); listen(); } else setTimeout(listen, RETRY_MS); + }).then(null, lost); + } + + el('action').addEventListener('click', function () { + var btn = el('action'); + if (btn.disabled || dead) return; + btn.disabled = true; + el('status').textContent = S.report_action_started || ''; + api.post('/api/actions/' + btn.dataset.name, {report: btn.dataset.report}).then(function (r) { + var state = (r.body || {}).state; + if (r.status === 200 && state === 'started') return; + el('status').textContent = S[state === 'busy' ? 'report_action_busy' : 'report_action_failed'] || ''; + btn.disabled = state === 'busy'; + }).then(null, function () { el('status').textContent = S.report_action_lost || ''; btn.disabled = false; }); + }); + + api('/api/report/' + name).then(function (data) { + if (!data) throw new Error('empty'); + show(data); + document.addEventListener('visibilitychange', listen); /* 回到这个标签页时接着等(期间有新数据会立刻拿到) */ + listen(); + }).then(null, lost); +})(); diff --git a/pet/panorama/render.py b/pet/panorama/render.py index 79216a5f..ff29be39 100644 --- a/pet/panorama/render.py +++ b/pet/panorama/render.py @@ -27,14 +27,20 @@ GENERATED = {"tokens.css": tokens_css} STYLES = ("tokens.css", "app.css") # 顺序即层叠顺序:令牌在前,页面样式在后 SCRIPT_TAGS = '' +#: 报告页(``/report/<名字>``,见 ``reports.py``):自己的外壳、样式和入口模块;``util.js`` / ``client.js`` 和配置全景共用。 +#: 报告页没有离线快照,所以这几个模块不进 ``MODULES``(``report.js`` 是会自己跑起来的入口,不能拼进全景的脚本里)。 +REPORT_SHELL = "report.html" +REPORT_STYLES = ("tokens.css", "report.css") +REPORT_MODULES = ("util.js", "client.js", "report.js") +REPORT_SCRIPT_TAG = '' #: 页面脚本的原生模块,**按依赖顺序**:被 import 的排在前面,入口 ``boot.js`` 在最后。 #: 本机服务把它们一个个发出去,浏览器按 import 自己装配;离线快照没法这样(``file://`` 页面加载不了模块), #: 所以 ``bundle()`` 按这个顺序把它们拼成一段普通脚本。加模块就在这里登记。 MODULES = ("util.js", "layout.js", "roads.js", "draw.js", "viewer.js", "memory.js", "form.js", "settings.js", "repair.js", - "interact.js", "app.js", "boot.js") + "interact.js", "app.js", "client.js", "boot.js") #: 本机服务发的静态文件:名字 → 内容类型。**都不含用户数据**,所以不要令牌。 -ASSETS = {**{name: "text/css; charset=utf-8" for name in STYLES}, - **{name: "text/javascript; charset=utf-8" for name in MODULES}} +ASSETS = {**{name: "text/css; charset=utf-8" for name in STYLES + REPORT_STYLES}, + **{name: "text/javascript; charset=utf-8" for name in MODULES + REPORT_MODULES}} # 模块里只许这两种写法,bundle() 才拼得起来:整行的具名 import,和顶层声明前的 export。 _IMPORT_LINE = re.compile(r"^import \{\w+(?:, \w+)*\} from '\./[a-z]+\.js';\n", re.M) _EXPORT_PREFIX = re.compile(r"^export (?=(?:function|const) )", re.M) @@ -51,6 +57,9 @@ "saving", "saved", "stale", "invalid", "busy", "unavailable", "failed", "lost", "save", "revert", "restore_builtin", "using_builtin", "dirty", "custom", "custom_label", "advanced", "err_unknown", "err_type", "err_not_a_choice", "err_rejected", "err_out_of_range"))) +#: 报告页自己的几句界面文字(随数据一起给:外壳是公开的静态文件,只带标题和「连接断了」) +REPORT_KEYS = ("report_lost", "report_unavailable", "report_action_started", "report_action_busy", "report_action_failed", + "report_action_lost") NODE_STATE_KEYS = ("live", "ok", "warn", "bad", "unknown", "off", "info") EDGE_STATE_KEYS = ("live", "ok", "warn", "broken", "unknown", "off") @@ -111,6 +120,23 @@ def bundle(names: tuple[str, ...] = MODULES) -> str: return "\n".join(parts) +def report_payload(report: dict, *, revision: int = 0) -> bytes: + """报告页向 ``/api/report/<名字>`` 要到的那份:provider 给的字典 + 编号 + 页面信息 + 几句界面文字。""" + data = {"revision": revision, + "page": {"lang": _language(), "title": L("ui.report_window_title", title=str(report.get("title") or ""))}, + "report": report, "strings": {key: L(f"ui.{key}") for key in REPORT_KEYS}} + return json.dumps(data, ensure_ascii=False, separators=(",", ":")).encode("utf-8") + + +def report_shell() -> str: + """报告页的外壳:公开的静态文件,没有数据,只有结构、语言、临时标题(页面拿到数据后再换)和「连接断了」那句话。""" + page = (PAGE_DIR / REPORT_SHELL).read_text(encoding="utf-8") + if REPORT_SCRIPT_TAG not in page: + raise RuntimeError("report shell lost its script tag") + return page.replace("__LANG__", _language()).replace("__TITLE__", _html(L("ui.report_shell_title"))).replace( + "__LOST__", _html(L("ui.report_lost"))) + + def shell() -> str: """本机服务发的页面外壳:没有数据,只有结构、语言、标题和「连接断了」那句话。""" page = (PAGE_DIR / "shell.html").read_text(encoding="utf-8") diff --git a/pet/panorama/reports.py b/pet/panorama/reports.py new file mode 100644 index 00000000..b9d5142d --- /dev/null +++ b/pet/panorama/reports.py @@ -0,0 +1,88 @@ +# -*- coding: utf-8 -*- +"""报告页:在浏览器里读一份「生成出来的内容」。现在只有工作简报;个人简报以后多登记一项就行。 + +页面薄、不认功能(ADR 0014):应用构造 ``PanoramaService`` 时按名字登记 provider(``reports={"work_briefing": …}``)。 +provider 在**界面线程**上被调(它读 Qt 对象),返回页面要摆的那份字典: + +- ``title`` / ``theme``(``dark`` / ``light``,跟「外观」里的偏好); +- ``summary``(一句概要)、``generated``(「生成于 …」那一行)、``usage``(模型 / effort / 用时 / tokens / 花费,每项 + ``{key, text, tip}``)、``html``(全文,Markdown 已由 ``markdown.py`` 渲染成只含几个标签的 HTML); +- ``busy`` / ``busy_text`` / ``empty_text`` / ``error``(上一次失败的原因,已翻成整句); +- ``action``:底部那个按钮——``{name, report, label, hint}``,页面 ``POST /api/actions/`` 时把 ``report`` 带回来; +- ``available``:这台机器上有没有这项功能(工作简报要 WSL;没有就只显示一句说明)。 + +隐私:报告内容只经带令牌的接口给本机浏览器,不落离线快照、不进日志(本机服务只记请求行)。 +""" +from __future__ import annotations + +import datetime as dt +from typing import Callable + +from .. import work_briefing as wb +from ..i18n import t +from . import markdown + +WORK_BRIEFING = "work_briefing" +GENERATE_ACTION = "generate_report" # 页面上「重新生成」走的动作名(actions.generate_report) +USAGE_ORDER = ("model", "effort", "time", "tokens_in", "tokens_out", "cost") + + +def work_briefing(service_of: Callable[[], object], config) -> Callable[[], dict]: + """工作简报的 provider。``service_of()`` 给 ``WorkBriefingService``(这台机器没有 WSL 时是 None)。""" + def build() -> dict: + service = service_of() + data = { + "id": WORK_BRIEFING, "title": t("briefing.app"), "theme": theme(config), "available": service is not None, + "summary": "", "generated": "", "usage": [], "html": "", + "busy": False, "busy_text": t("briefing.busy"), "empty_text": t("briefing.empty"), "error": "", + "action": {"name": GENERATE_ACTION, "report": WORK_BRIEFING, + "label": t("briefing.button.regenerate"), "hint": t("briefing.button.regenerate_hint")}, + } + if service is None: + return data + data["busy"] = bool(service.busy) + error = str(service.last_error() or "") + data["error"] = t("briefing.status.failed", error=error) if error else "" + briefing = service.latest() + if briefing is not None: + data.update(summary=briefing.summary, generated=generated_line(briefing.generated_at), usage=usage(briefing), + html=markdown.render(briefing.markdown, bug_mark=wb.BUG_MARK)) + return data + return build + + +def generate_work_briefing(service_of: Callable[[], object]) -> Callable[[], str]: + """页面上点了「重新生成」:``unavailable``(没接简报服务)/ ``busy`` / ``started`` / ``failed``。""" + def run() -> str: + service = service_of() + if service is None: + return "unavailable" + if service.busy: + return "busy" + return "started" if service.generate_now() else "failed" + return run + + +def generated_line(generated_at: str) -> str: + try: + when = f"{dt.datetime.fromisoformat(generated_at):%m-%d %H:%M}" + except ValueError: + when = "?" + return t("briefing.meta", when=when) + + +def usage(briefing: wb.Briefing) -> list[dict]: + """和 Qt 窗口底下那条图标栏同一套数字(``note_meta_bar.usage_values``),按固定顺序,空的不给。""" + from ..note_meta_bar import usage_values + + values = usage_values(briefing.model, briefing.effort, briefing.tokens_in, briefing.tokens_out, briefing.cost_usd, + briefing.seconds) + return [{"key": key, "text": text, "tip": tip} for key in USAGE_ORDER + for text, tip in [values.get(key, ("", ""))] if text] + + +def theme(config) -> str: + """页面的明暗:跟「外观」里的主题偏好(``system`` 按系统调色板定)。页面上不放切换按钮——那个偏好只在一处改。""" + from ..work_briefing_ui import resolve_dark, theme_preference + + return "dark" if resolve_dark(theme_preference(config)) else "light" diff --git a/pet/panorama/routes.py b/pet/panorama/routes.py index 3c875e6c..021f8cd8 100644 --- a/pet/panorama/routes.py +++ b/pet/panorama/routes.py @@ -16,6 +16,10 @@ - ``POST /api/actions/<动作>``:页面上的一个动作(现在只有 ``repair_hooks``:给联动通道装 hooks),要令牌。处理器在 ``actions.py``,由应用登记进服务;这里只把 ``ActionError`` 翻成状态码。没给设置入口时这个网址也不存在。 +- ``GET /report/<名字>``(公开的外壳,不含数据)和 ``GET /api/report/<名字>``(要令牌):报告页——在浏览器里读一份生成 + 出来的内容(现在只有工作简报 ``work_briefing``)。数据接口和 ``/api/graph`` 一样认 ``?after=<编号>`` 等更新的。 + 报告由应用登记进服务(``reports.py``);没登记的名字两个网址都是 404。没给设置入口时这两个网址也不存在。 + - ``GET /api/settings/<组>``、``PATCH /api/settings/<组>``、``GET /api/audit``:读、改一组设置,翻审计记录,都要令牌。 这是本机服务第一批**会改东西**的接口。守门检查(来源、令牌、JSON、大小)在 ``server.py``;改之前的每一道校验在 ``settings_api.py``;这里只把结果和拒绝翻成响应。拒绝时除了代码还带着页面用得上的东西(哪几项不对、现在的值)。 @@ -94,6 +98,39 @@ def run(request: Request) -> Response: router.add("POST", "/api/actions/{name}", run) +def _add_report_routes(router: Router, port, wait_seconds: float) -> None: + """``port.has_report(名字)``、``port.report(名字, after, 等多久)``:后者自己负责第一次时到界面线程上做一份。""" + def shell(request: Request) -> Response: + if not port.has_report(request.params["name"]): + raise HttpError(404, "not_found") + return Response(200, render.report_shell().encode("utf-8"), "text/html; charset=utf-8") + + def data(request: Request) -> Response: + name = request.params["name"] + if not port.has_report(name): + raise HttpError(404, "unknown_report") + after = parse_qs(request.query, keep_blank_values=True).get("after") + try: + if after is None: + body = port.report(name, None, 0.0) + if body is None: + raise HttpError(503, "not_ready") + return Response(200, body, JSON_TYPE) + try: + revision = int(after[-1]) + except ValueError: + raise HttpError(400, "bad_revision") from None + body = port.report(name, revision, wait_seconds) + except ActionError as exc: + return Response.error(exc.status, exc.code) + except Busy: + return Response.error(503, "busy") + return Response(200, body, JSON_TYPE) if body is not None else Response(204, b"", JSON_TYPE) + + router.add("GET", "/report/{name}", shell, public=True) + router.add("GET", "/api/report/{name}", data) + + def build_router(feed: Feed, *, files=None, settings=None, wait_seconds: float = LONG_POLL_SECONDS) -> Router: router = Router() router.static("/", lambda: render.shell().encode("utf-8"), "text/html; charset=utf-8") @@ -124,4 +161,5 @@ def graph(request: Request) -> Response: if settings is not None: _add_settings_routes(router, settings) _add_action_routes(router, settings) + _add_report_routes(router, settings, wait_seconds) return router diff --git a/pet/panorama/service.py b/pet/panorama/service.py index 1709f5d9..33df6ea4 100644 --- a/pet/panorama/service.py +++ b/pet/panorama/service.py @@ -88,7 +88,7 @@ def __init__(self, config, *, health: Callable[[], tuple[str, str]] | None = Non wsl: Callable[[], dict] | None = None, write: Callable[[dict, Path], Path] | None = None, open_page: Callable[[str], object] | None = None, spawn: Callable | None = None, server=None, apply: Callable[[], object] | None = None, audit=None, - actions: dict | None = None, parent: QObject | None = None) -> None: + actions: dict | None = None, reports: dict | None = None, parent: QObject | None = None) -> None: super().__init__(parent) self._config = config self._health = health or (lambda: ("unknown", "")) @@ -107,6 +107,8 @@ def __init__(self, config, *, health: Callable[[], tuple[str, str]] | None = Non self._apply = apply # 设置改完之后要跑的应用链(应用传进来:_apply_external_config_change) self._audit = audit # 审计记录;不给就用数据目录里那一份(第一次用到时才建) self.actions: dict = dict(actions or {}) # 页面上的动作:名字 → 处理器(见 actions.py),应用登记 + self._reports: dict = dict(reports or {}) # 报告页:名字 → provider(见 reports.py),应用登记 + self._report_feeds = {name: Feed() for name in self._reports} # 每份报告自己的发布台(页面挂在上面等更新) self._last_published: tuple[dict, Path] | None = None # 上一次发布用的事实和快照目录:设置改了之后拿它重画 self._settings_dirty = False # 设置在一轮采集途中被改过:那一轮回来时要按新设置再发布一次 self._focus = "" # 这次打开要直接翻到的那一组设置(只用一次) @@ -135,6 +137,8 @@ def stop(self) -> None: self._generation += 1 self._busy = False self._feed.close() + for feed in self._report_feeds.values(): + feed.close() if self._server is not None: try: self._server.stop() @@ -368,8 +372,55 @@ def _republish(self) -> None: except Exception: # noqa: BLE001 - 重画失败不影响已经存好的设置 log.exception("配置全景:设置改动后重新发布失败") - def _page_target(self, snapshot: str) -> str: - """(GUI 线程)浏览器该打开什么:本机服务的网址;服务起不来就退回快照文件。""" + # ------------------------------------------------------------ 报告页(见 reports.py) + + def has_report(self, name: str) -> bool: + return name in self._reports + + def report(self, name: str, after: int | None, wait_seconds: float) -> bytes | None: + """(请求线程)一份报告的数据。``after`` 是 None:要现成的,还没有就先到界面线程上做一份; + 否则等比 ``after`` 更新的那份,最多 ``wait_seconds`` 秒,没有就 None。不认识的名字抛 ``ActionError(404)``。""" + feed = self._report_feeds.get(name) + if feed is None: + raise ActionError(404, "unknown_report") + if after is None: + if feed.latest() is None: + self.on_gui(lambda: self.publish_report(name, force=True)) + return feed.latest() + return feed.wait_newer(after, wait_seconds) + + def publish_report(self, name: str, *, force: bool = False) -> bool: + """(界面线程)重做一份报告的数据并发布,页面挂着的「等更新的」请求立刻拿到。 + + ``force`` 为假时只在这份报告发布过(有人打开过页面)时才做:生成结束的信号每次都来,没有页面在看就不白做。""" + feed, provider = self._report_feeds.get(name), self._reports.get(name) + if feed is None or provider is None or (not force and feed.latest() is None): + return False + data = provider() + feed.publish(lambda revision: render.report_payload(data, revision=revision)) + return True + + def report_watched(self, name: str) -> bool: + """有没有页面正挂在这份报告上等更新(= 用户正开着那一页看)。""" + feed = self._report_feeds.get(name) + return feed is not None and feed.waiting > 0 + + def open_report(self, name: str) -> bool: + """(界面线程)在浏览器里打开一份报告:起本机服务(**不**采集全景那一轮),开 ``/report/<名字>``。 + 没登记这个名字、或服务起不来返回 False(报告没有离线快照可退)。""" + if name not in self._reports: + return False + self.publish_report(name, force=True) + url = self._server_url(f"/report/{name}") + if not url: + return False + self._open_page(url) + return True + + # ------------------------------------------------------------ 本机服务 + + def _server_url(self, path: str) -> str: + """(GUI 线程)起本机服务(第一次要用时才建),返回带令牌的网址;起不来返回空串(已记日志)。""" try: if self._server is None: from .files import Reader @@ -381,12 +432,20 @@ def _page_target(self, snapshot: str) -> str: reader = Reader(config_dir=self._config.dir, home=Path.home(), run_wsl=run_wsl) self._server = PanoramaServer(build_router(self._feed, files=reader, settings=self)) self._server.start() - # 组名跟在令牌后面,也在 # 片段里:不发给服务器、不进日志;页面取走令牌后整段从地址栏抹掉 - focus, self._focus = self._focus, "" - return self._server.page_url() + (f"&settings={focus}" if focus else "") - except Exception: # noqa: BLE001 - 端口绑不上之类:还有快照可看 - log.exception("配置全景:本机服务起不来,改开离线快照") + return self._server.page_url() if path == "/" else self._server.page_url(path) + except Exception: # noqa: BLE001 - 端口绑不上之类 + log.exception("配置全景:本机服务起不来") + return "" + + def _page_target(self, snapshot: str) -> str: + """(GUI 线程)浏览器该打开什么:本机服务的网址;服务起不来就退回快照文件。""" + url = self._server_url("/") + if not url: + log.warning("配置全景:改开离线快照") return snapshot + # 组名跟在令牌后面,也在 # 片段里:不发给服务器、不进日志;页面取走令牌后整段从地址栏抹掉 + focus, self._focus = self._focus, "" + return url + (f"&settings={focus}" if focus else "") def _on_stage(self, generation: int, stage: str, text: str) -> None: if generation != self._generation: diff --git a/pet/sprite_menu_facade.py b/pet/sprite_menu_facade.py index ba670f36..eab7c5c9 100644 --- a/pet/sprite_menu_facade.py +++ b/pet/sprite_menu_facade.py @@ -577,8 +577,11 @@ def toggle_work_briefing(self, on: bool) -> None: """「工作日自动生成」:落盘;后台服务每分钟读一次配置,最迟一分钟生效。""" self._set_work_briefing(enabled=bool(on)) - def set_work_briefing_time(self, value: str) -> None: - self._set_work_briefing(time=str(value)) + def open_work_briefing_settings(self) -> None: + """「简报设置…」:配置全景翻到「工作简报」那一组(时间 / 模型 / effort / 来源 / 提示词都在那里改)。""" + opener = self.on_open_config_panorama + if callable(opener): + opener(focus="work_briefing") def open_work_briefing(self) -> None: controller = self._work_briefing() diff --git a/pet/work_briefing_ui.py b/pet/work_briefing_ui.py index effddffe..cfa3d602 100644 --- a/pet/work_briefing_ui.py +++ b/pet/work_briefing_ui.py @@ -17,6 +17,7 @@ import datetime as dt import re +from typing import Callable from PySide6.QtCore import QObject, Qt, Signal from PySide6.QtGui import QColor, QPalette, QTextBlockFormat, QTextCharFormat, QTextCursor @@ -117,7 +118,10 @@ class WorkBriefingWindow(QWidget): theme_changed = Signal(str) def __init__(self, parent: QWidget | None = None, *, title: str = "", regenerate_label: str = "", - empty_text: str = "", busy_text: str = "", page_label: str = "", theme: str = "system") -> None: + empty_text: str = "", busy_text: str = "", page_label: str = "", theme: str = "system", + briefing_page: bool = True) -> None: + """``briefing_page=False``:不带「简报」那一页,只当别的页(笔记 / Slack 关注)的壳——工作简报的阅读页 + 在浏览器里(2026-11-19,配置全景的 ``/report/work_briefing``),Qt 里不再有第二个看它的地方。""" super().__init__(parent, Qt.Window) self.setObjectName("workBriefing") title = title or t("briefing.app") @@ -176,7 +180,10 @@ def __init__(self, parent: QWidget | None = None, *, title: str = "", regenerate self.tabs = QTabWidget(self) self.tabs.setObjectName("briefingTabs") self.tabs.setDocumentMode(True) - self.tabs.addTab(self.briefing_page, page_label or t("briefing.tab.briefing")) + if briefing_page: + self.tabs.addTab(self.briefing_page, page_label or t("briefing.tab.briefing")) + else: + self.briefing_page.hide() layout = QVBoxLayout(self) layout.setContentsMargins(24, 16, 24, 16) layout.setSpacing(6) @@ -361,10 +368,16 @@ class WorkBriefingController(QObject): state_changed = Signal(str) - def __init__(self, host, service, parent: QObject | None = None) -> None: + def __init__(self, host, service, parent: QObject | None = None, *, open_report: Callable[[], bool] | None = None, + report_watched: Callable[[], bool] | None = None) -> None: + """``open_report``:在浏览器里打开简报页(配置全景的 ``PanoramaService.open_report``),返回是否打开了;给了它, + 「查看」就不再开 Qt 窗口,Qt 窗口只剩给笔记 / Slack 关注当壳。``report_watched``:有没有页面正开着看—— + 有就不再为新一份冒提醒(和原来「窗口开着不冒气泡」一样)。两个都不给就是原来的 Qt 窗口(测试、旧路径)。""" super().__init__(parent or service) self._host = host self.service = service + self._open_report = open_report + self._report_watched = report_watched self.window: WorkBriefingWindow | None = None self._unread = False #: 建窗口时挂上的别的页:每个回调返回 [(标签, 部件)](工作笔记用) @@ -380,10 +393,17 @@ def generate_now(self) -> None: self._host.show_bubble(t("briefing.bubble.started"), 4000) def _make_window(self) -> WorkBriefingWindow: - return WorkBriefingWindow(theme=theme_preference(self.service._config)) + return WorkBriefingWindow(theme=theme_preference(self.service._config), briefing_page=self._open_report is None) def open_window(self, tab: str = "") -> None: - """开窗口;``tab`` 是要切到的标签(空 = 保持原样)。""" + """看简报:接了浏览器那条路就开浏览器里的简报页(打开即算读过);否则开 Qt 窗口。 + ``tab`` 是要切到的标签(笔记 / Slack 关注):那几页还在 Qt 窗口里,给了 tab 一律开窗口。""" + if not tab and self._open_report is not None: + if self._open_report(): + self._set_unread(False) + else: + self._host.show_bubble(t("briefing.bubble.page_failed"), 7000) + return if self.window is None: self.window = self._make_window() self.window.regenerate_requested.connect(self.service.generate_now) @@ -431,7 +451,9 @@ def _on_finished(self, briefing, _manual: bool) -> None: if not briefing.ok: self._host.show_bubble(t("briefing.bubble.failed", error=briefing.error), 8000) return - if self.window is not None and self.window.isVisible(): + if self._report_watched is not None and self._report_watched(): + return # 用户正开着浏览器里的简报页:页面已经原地换成新的了,不用再冒提醒 + if self._open_report is None and self.window is not None and self.window.isVisible(): return # 用户正开着窗口看:内容已经换成新的了,不用再冒气泡 self._set_unread(True) # 点「知道了」只是收起气泡;打开看过才算读了 self._host.show_alert( diff --git a/tests/test_panorama_entry.py b/tests/test_panorama_entry.py index 7142342a..7ab40f70 100644 --- a/tests/test_panorama_entry.py +++ b/tests/test_panorama_entry.py @@ -23,8 +23,9 @@ class _FakeService: """替掉真服务:记下被打开了几次、体检结论读到什么,不起线程、不开浏览器。""" made: list = [] - def __init__(self, config, *, health=None, apply=None, actions=None, parent=None): + def __init__(self, config, *, health=None, apply=None, actions=None, reports=None, parent=None): self.config, self.health, self.apply, self.actions, self.opened = config, health, apply, dict(actions or {}), 0 + self.reports = dict(reports or {}) _FakeService.made.append(self) def open(self, focus=""): @@ -150,7 +151,8 @@ def test_shell_opens_the_panorama_from_the_island_panel_and_reuses_one_service(t assert len(fake_service.made) == 1 and fake_service.made[0].opened == 1 assert fake_service.made[0].config is shell.config assert fake_service.made[0].apply == shell._apply_external_config_change # 页面改了设置后跑的应用链,和设置进程存盘后的是同一条 - assert set(fake_service.made[0].actions) == {"repair_hooks"} # 页面上的「修复」动作登记进了服务 + assert set(fake_service.made[0].actions) == {"repair_hooks", "generate_report"} # 页面上的动作:「修复」、「重新生成」 + assert set(fake_service.made[0].reports) == {"work_briefing"} # 报告页:工作简报登记进了服务 shell._api_key_monitor.status_changed.emit("bad", "DeepSeek · 认证失败") state, _detail = fake_service.made[0].health() assert state == shell._api_key_monitor.state # 体检结论取自岛上的体检器 diff --git a/tests/test_panorama_markdown.py b/tests/test_panorama_markdown.py new file mode 100644 index 00000000..d6e14dbd --- /dev/null +++ b/tests/test_panorama_markdown.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +"""简报页的 Markdown 渲染(``pet/panorama/markdown.py``):只认简报会写出来的子集,别的全是文字。 + +守住的:标题 / 列表 / 段落的结构;★ 与 bug 记号变成类名(原来是 Qt 窗口里 ``_decorate`` 做的上色); +链接只认 http(s) 且在新标签页开;任何像标记的东西(`` 与 粗\n- ") + assert "" not in out and "]*\son\w+=", out), "没有任何真的带事件属性的标签" + + +def test_code_spans_are_not_linked_or_bolded_inside(): + out = md.render("`https://in.code/** no **` 外面 **是**") + assert 'https://in.code/** no **' in out and "是" in out + assert out.count("\n
  • 一\n
      \n
    • 一甲\n
        \n
      • 一甲子
      • \n
      \n
    • \n
    \n
  • \n
  • 二
  • \n\n

    收尾一句

    " + + +def test_empty_and_plain_text(): + assert md.render("") == "" and md.render(" \n") == "" + assert md.render("就一句话") == "

    就一句话

    " diff --git a/tests/test_panorama_page.py b/tests/test_panorama_page.py index 009d2381..7f0a74c5 100644 --- a/tests/test_panorama_page.py +++ b/tests/test_panorama_page.py @@ -104,7 +104,7 @@ def _run(engine, graph: dict) -> dict: def _boot(engine, setup: str, steps: str = "") -> dict: """跑 boot.js。``setup`` 在它之前布置环境,``steps`` 在它之后推进定时器。""" - return _evaluate(engine, FAKE_DOM + FAKE_BROWSER + setup + render.bundle(("boot.js",)) + steps + + return _evaluate(engine, FAKE_DOM + FAKE_BROWSER + setup + render.bundle(("client.js", "boot.js")) + steps + "\nreturn JSON.stringify({calls: calls, timers: timers.length, intervals: intervals.length, reloads: reloads, " "replaced: replaced, started: started, disposed: disposed, store: store, hash: location.hash, " "watching: Object.keys(_docListeners), " diff --git a/tests/test_panorama_report_page.py b/tests/test_panorama_report_page.py new file mode 100644 index 00000000..501c221e --- /dev/null +++ b/tests/test_panorama_report_page.py @@ -0,0 +1,312 @@ +# -*- coding: utf-8 -*- +"""报告页整条路:服务里的登记与发布(``PanoramaService.report`` / ``publish_report`` / ``open_report``)、真实本机服务上的 +两个网址(``/report/<名字>`` 公开外壳、``/api/report/<名字>`` 要令牌、``?after=`` 等更新的)、页面脚本本身(QJSEngine)。 + +页面脚本和配置全景的 ``boot.js`` 共用 ``client.js``(取令牌、带令牌的 fetch)。 +""" +from __future__ import annotations + +import http.client +import json +import re +import threading +import time +from types import SimpleNamespace + +import pytest +from PySide6.QtQml import QJSEngine +from PySide6.QtWidgets import QApplication + +from pet import i18n +from pet.panorama import actions, render, routes +from pet.panorama import server as srv +from pet.panorama.service import PanoramaService +from tests import panorama_samples as samples +from tests.test_panorama_page import FAKE_BROWSER, FAKE_DOM, _evaluate + +WAIT = 30.0 + + +@pytest.fixture(autouse=True) +def _app(): + app = QApplication.instance() or QApplication([]) + i18n.set_language("zh") + yield app + i18n.set_language("zh") + + +def _config(tmp_path): + return SimpleNamespace(data=samples.all_on_config(), path=tmp_path / "config.json", dir=tmp_path) + + +def _report(counter, **over): + counter["n"] += 1 + return {"id": "demo", "title": "示例", "theme": "dark", "available": True, "summary": f"第 {counter['n']} 份", "generated": "生成于 x", + "usage": [{"key": "time", "text": "3 秒", "tip": "t"}], "html": "

    A

    ", "busy": False, "busy_text": "忙", + "empty_text": "空", "error": "", "action": {"name": "generate_report", "report": "demo", "label": "重做", "hint": ""}, **over} + + +def _service(tmp_path, opened=None, server=None, **kwargs): + counter = {"n": 0} + service = PanoramaService(_config(tmp_path), windows=lambda *a, **k: {}, wsl=dict, write=lambda facts, out_dir: out_dir / "p.html", + open_page=(opened if opened is not None else []).append, spawn=lambda run: None, server=server, + reports={"demo": lambda: _report(counter)}, + actions={"generate_report": actions.generate_report({"demo": lambda: "started"})}, **kwargs) + return service, counter + + +class _FakeServer: + def __init__(self): + self.running = False + + def start(self): + self.running = True + return "http://127.0.0.1:1/" + + def page_url(self, path="/"): + return f"http://127.0.0.1:1{path}#TOKEN" + + def stop(self): + self.running = False + + +# ───────────────────────── 服务 ───────────────────────── + +def test_publishing_only_happens_once_someone_has_looked(tmp_path): + service, counter = _service(tmp_path) + assert service.has_report("demo") and not service.has_report("nope") + assert service.publish_report("demo") is False and counter["n"] == 0, "没人打开过页面:生成结束的信号不白做" + assert service.publish_report("demo", force=True) is True and counter["n"] == 1 + assert service.publish_report("demo") is True and counter["n"] == 2, "看过一次之后每次都重做" + assert json.loads(service.report("demo", None, 0.0))["report"]["summary"] == "第 2 份" + assert service.report("demo", 2, 0.01) is None and service.report_watched("demo") is False + with pytest.raises(actions.ActionError): + service.report("nope", None, 0.0) + + +def test_the_first_request_makes_the_report_on_the_gui_thread(tmp_path): + service, counter = _service(tmp_path) + data = json.loads(service.report("demo", None, 0.0)) # 在界面线程上:on_gui 直接跑 + assert counter["n"] == 1 and data["revision"] == 1 and data["page"] == {"lang": "zh-CN", "title": "示例 · 大肥鱼"} + assert data["report"]["summary"] == "第 1 份" and data["strings"]["report_lost"].startswith("和肥鱼的连接断了") + + +def test_opening_a_report_starts_the_server_and_opens_its_page_not_the_panorama(tmp_path): + opened = [] + service, counter = _service(tmp_path, opened, server=_FakeServer()) + assert service.open_report("demo") is True + assert opened == ["http://127.0.0.1:1/report/demo#TOKEN"] and counter["n"] == 1 and service.is_busy() is False + assert service.open_report("nope") is False and len(opened) == 1 + + +def test_a_server_that_cannot_start_means_the_report_cannot_open(tmp_path): + class Dead(_FakeServer): + def start(self): + raise OSError("no port") + + opened = [] + service, _counter = _service(tmp_path, opened, server=Dead()) + assert service.open_report("demo") is False and opened == [] + + +def test_stop_releases_pages_waiting_on_a_report(tmp_path): + service, _counter = _service(tmp_path) + service.publish_report("demo", force=True) + box = {} + thread = threading.Thread(target=lambda: box.update(out=service.report("demo", 1, WAIT)), daemon=True) + thread.start() + deadline = time.monotonic() + WAIT + while not service.report_watched("demo") and time.monotonic() < deadline: + time.sleep(0.005) + assert service.report_watched("demo"), "有页面挂着等 = 用户正开着看" + service.stop() + thread.join(WAIT) + assert not thread.is_alive() and box["out"] is None + + +# ───────────────────────── 真实本机服务上的两个网址 ───────────────────────── + +@pytest.fixture +def stack(tmp_path): + app = QApplication.instance() + service, counter = _service(tmp_path) + server = srv.PanoramaServer(routes.build_router(service._feed, settings=service, wait_seconds=0.2), poll_seconds=0.02) + server.start() + yield SimpleNamespace(app=app, service=service, server=server, counter=counter) + service.stop() + server.stop() + + +def _send(server, method, path, body=None, *, token=True): + headers = {"Host": f"127.0.0.1:{server.port}"} + if token: + headers[srv.TOKEN_HEADER] = server.token + payload = None + if body is not None: + headers.update({"Origin": f"http://127.0.0.1:{server.port}", "Content-Type": "application/json"}) + payload = json.dumps(body).encode("utf-8") + connection = http.client.HTTPConnection("127.0.0.1", server.port, timeout=WAIT) + try: + connection.request(method, path, body=payload, headers=headers) + response = connection.getresponse() + data = response.read() + return response.status, response.getheader("Content-Type", ""), data + finally: + connection.close() + + +def _pump(app, call): + box = {} + worker = threading.Thread(target=lambda: box.update(out=call()), daemon=True) + worker.start() + deadline = time.monotonic() + WAIT + while worker.is_alive() and time.monotonic() < deadline: + app.processEvents() + worker.join(0.005) + assert not worker.is_alive(), "the request never came back" + return box["out"] + + +def test_the_shell_is_public_for_known_reports_only(stack): + status, content_type, body = _pump(stack.app, lambda: _send(stack.server, "GET", "/report/demo", token=False)) + assert status == 200 and content_type.startswith("text/html") and b'src="/report.js"' in body and "示例".encode() not in body + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/report/nope", token=False))[0] == 404 + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/report.js", token=False))[0] == 200 + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/client.js", token=False))[0] == 200 + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/report.css", token=False))[0] == 200 + + +def test_the_data_needs_the_token_and_is_made_on_first_ask(stack): + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/demo", token=False))[0] == 401 + status, _type, body = _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/demo")) + data = json.loads(body) + assert status == 200 and data["revision"] == 1 and data["report"]["summary"] == "第 1 份" and stack.counter["n"] == 1 + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/nope"))[0] == 404 + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/demo?after=x"))[0] == 400 + + +def test_waiting_for_a_newer_report_gets_it_when_the_service_publishes(stack): + _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/demo")) + assert _pump(stack.app, lambda: _send(stack.server, "GET", "/api/report/demo?after=1"))[0] == 204 + box = {} + thread = threading.Thread(target=lambda: box.update(out=_send(stack.server, "GET", "/api/report/demo?after=1")), daemon=True) + thread.start() + deadline = time.monotonic() + WAIT + while not stack.service.report_watched("demo") and time.monotonic() < deadline: + time.sleep(0.005) + stack.service.publish_report("demo") # 生成结束:主进程发布,挂着的请求立刻拿到 + thread.join(WAIT) + status, _type, body = box["out"] + assert status == 200 and json.loads(body)["revision"] == 2 and json.loads(body)["report"]["summary"] == "第 2 份" + + +def test_the_regenerate_action_goes_through_the_action_route(stack): + status, _type, body = _pump(stack.app, lambda: _send(stack.server, "POST", "/api/actions/generate_report", {"report": "demo"})) + assert (status, json.loads(body)) == (200, {"report": "demo", "state": "started"}) + status, _type, body = _pump(stack.app, lambda: _send(stack.server, "POST", "/api/actions/generate_report", {"report": "nope"})) + assert (status, json.loads(body)) == (400, {"error": "bad_report"}) + + +# ───────────────────────── render ───────────────────────── + +def test_report_shell_and_assets_hold_no_data_and_no_inline_script(): + shell = render.report_shell() + assert re.findall(r"]*>", shell) == ['