briefloop 0.22.2__tar.gz → 0.22.3__tar.gz

{briefloop-0.22.2 → briefloop-0.22.3}/CHANGELOG.md

@@ -1,5 +1,10 @@
 # 变更记录
 
+## 0.22.3
+
+- Word 导出合并可识别的内部来源索引，只保留面向读者的来源列表；来源标题使用可点击的原文超链接。不能可靠识别的业务表格保持原样。
+- 更新通用及定制模板的 Word 缓存身份，已有报告再次导出时使用新的来源呈现；保留历史文件。
+
 ## 0.22.2
 
 - 首页和新建报告提供紧凑研究深度、事实核查与 WikiSkill 控件；默认执行上限 60 分钟，深度研究默认目标 10,000 字、上限 12,000 字，保留用户明确篇幅。

{briefloop-0.22.2 → briefloop-0.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: briefloop
-Version: 0.22.2
+Version: 0.22.3
 Summary: Local multi-runtime agent workbench for sourced briefings, independent review and skill learning
 Author: Stahl-G
 License-Expression: MIT

briefloop-0.22.3/VERSION

@@ -0,0 +1 @@
+0.22.3

{briefloop-0.22.2 → briefloop-0.22.3}/desktop/electron/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "briefloop-desktop",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "briefloop-desktop",
-      "version": "0.22.2",
+      "version": "0.22.3",
       "hasInstallScript": true,
       "license": "MIT",
       "dependencies": {

{briefloop-0.22.2 → briefloop-0.22.3}/desktop/electron/package.json

@@ -1,6 +1,6 @@
 {
   "name": "briefloop-desktop",
-  "version": "0.22.2",
+  "version": "0.22.3",
   "private": true,
   "description": "BriefLoop local desktop workspace",
   "author": "Stahl-G",

{briefloop-0.22.2 → briefloop-0.22.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "briefloop"
-version = "0.22.2"
+version = "0.22.3"
 description = "Local multi-runtime agent workbench for sourced briefings, independent review and skill learning"
 readme = "README.md"
 requires-python = ">=3.11"

briefloop-0.22.3/src/briefloop/__init__.py

@@ -0,0 +1 @@
+__version__ = "0.22.3"

{briefloop-0.22.2 → briefloop-0.22.3}/src/briefloop/document_export.py

@@ -10,6 +10,43 @@ ALIGN = {'left': WD_ALIGN_PARAGRAPH.LEFT, 'center': WD_ALIGN_PARAGRAPH.CENTER,
          'right': WD_ALIGN_PARAGRAPH.RIGHT, 'justify': WD_ALIGN_PARAGRAPH.JUSTIFY}
 
 
+def reader_source_blocks(document, sources):
+    """Replace only a recognized internal source index, not authored data tables."""
+    def text(node):
+        return node.get('text', '') + ''.join(text(c) for c in node.get('content', []))
+    blocks = document.get('content', [])
+    kept, indexed = [], []
+    for node in blocks:
+        rows = node.get('content', [])
+        headers = [text(c).strip() for c in rows[0].get('content', [])] if rows else []
+        ids = []
+        if (node.get('type') == 'table' and kept and kept[-1].get('type') == 'heading'
+                and text(kept[-1]).strip() in ('来源', '参考来源', '参考资料')
+                and headers in (['编号', '主体/来源', 'source_id'], ['编号', '主体来源', 'source_id'])
+                and len(rows) > 1):
+            for row in rows[1:]:
+                cells = row.get('content', [])
+                if len(cells) != 3 or not text(cells[0]).strip().isdigit():
+                    break
+                if any(len(c.get('content', [])) != 1 or c['content'][0].get('type') != 'paragraph'
+                       or any(n.get('type') != 'text' for n in c['content'][0].get('content', []))
+                       for c in cells):
+                    break
+                sid = text(cells[2]).strip()
+                if sid not in sources or not sources[sid].get('name'):
+                    break
+                # Do not discard merged cells or additional structured content.
+                if any(c.get('attrs', {}).get(k, 1) != 1 for c in cells for k in ('colspan', 'rowspan')):
+                    break
+                ids.append(sid)
+            if len(ids) == len(rows) - 1:
+                kept.pop()
+                indexed.extend(ids)
+                continue
+        kept.append(node)
+    return kept, indexed
+
+
 def without_duplicate_cover_heading(document,title):
     """Drop one repeated cover H1, preserving every surrounding block and table."""
     from copy import deepcopy
@@ -185,14 +222,22 @@ def render_document(doc, document, *, figures=None, sources=None, append_sources
                 row._tr.get_or_add_trPr().append(OxmlElement('w:cantSplit'))
         else: raise ValueError('不支持的导出内容：' + kind)
 
-    for node in document.get('content', []): block(node)
+    blocks, indexed = reader_source_blocks(document, sources) if append_sources else (document.get('content', []), [])
+    for node in blocks: block(node)
+    for sid in indexed:
+        if sid not in used: used.append(sid)
     if append_sources and used:
         doc.add_heading('来源', level=2)
         for i, sid in enumerate(used, 1):
             source = sources.get(sid, {})
-            p = doc.add_paragraph(f'{i}. ' + source.get('name', sid))
-            if source.get('url'):
-                inline(p, [{'type': 'text', 'text': ' 原文', 'marks': [{'type': 'link', 'attrs': {'href': source['url']}}]}])
+            p = doc.add_paragraph(f'{i}. ')
+            label = source.get('name') or '引用来源未关联，请补充核对'
+            url = source.get('url') or ''
+            if url.startswith(('https://', 'http://')):
+                inline(p, [{'type': 'text', 'text': label, 'marks': [{'type': 'link', 'attrs': {'href': url}},
+                        {'type': 'textStyle', 'attrs': {'color': '#0563C1'}}]}])
+            else:
+                p.add_run(label)
     from .industry_export import populate_table_of_contents
     populate_table_of_contents(doc)
     return doc

{briefloop-0.22.2 → briefloop-0.22.3}/src/briefloop/export_jobs.py

@@ -15,7 +15,7 @@ def export_input(store, brief, template_override=None):
         # rendering template and must change the export fingerprint.
         requirements = {**requirements, 'template_id': template_override}
     figures = export_figures(store, brief)
-    identity = {'renderer': 15 if requirements.get('template_id') else 17, 'version_id': brief['id'], 'brief_hash': brief['hash'],
+    identity = {'renderer': 18 if requirements.get('template_id') else 19, 'version_id': brief['id'], 'brief_hash': brief['hash'],
                 'document': brief_document(brief), 'detail': json.loads(brief['detail']),
                 'requirements': requirements,
                 'figures': {fid: {**{k: v for k, v in f.items() if k != 'image_bytes'},

{briefloop-0.22.2 → briefloop-0.22.3}/src/briefloop/static/index.html

@@ -43,7 +43,7 @@
 <div class="settings-page-header"><div><p class="eyebrow">BRIEFLOOP · 设置</p><h1 id="settings-title">模型与工作设置</h1><p class="help">配置执行引擎、模型与工作习惯。</p></div><button id="settings-close" type="button" class="outline">返回对话 ↗</button></div>
 <div class="settings-layout"><nav class="settings-nav" aria-label="设置分类"><button type="button" data-settings-view="models" class="active">模型与提供商</button><button type="button" data-settings-view="connectors">数据连接器（MCP）</button><button type="button" data-settings-view="execution">运行与搜索</button><button type="button" data-settings-view="learning">反馈与学习</button><button type="button" data-settings-view="workspaces">工作区</button><button type="button" data-settings-view="updates">版本与更新</button></nav>
 <div class="settings-content"><section id="settings-view-models"><div class="settings-segments" role="tablist" aria-label="模型接入方式"><button id="settings-tab-cli" role="tab" aria-selected="true" aria-controls="settings-cli" type="button">本机 CLI</button><button id="settings-tab-api" role="tab" aria-selected="false" aria-controls="settings-api" type="button">API 提供商</button></div><div id="settings-session-note" class="settings-session-note help" hidden></div><section id="settings-cli" role="tabpanel" aria-labelledby="settings-tab-cli"><button id="settings-runtime-tests" type="button" class="outline">查看连接测试记录</button><div id="settings-runtime-list"></div><div id="settings-model-block"></div></section><section id="settings-api" role="tabpanel" aria-labelledby="settings-tab-api" hidden></section></section>
-<section id="settings-view-updates" data-web-version="0.22.2" hidden>
+<section id="settings-view-updates" data-web-version="0.22.3" hidden>
 <h2>版本与更新</h2><p id="app-update-version">正在读取实际运行版本…</p><p id="app-update-installation" class="help"></p><pre id="app-update-command" hidden></pre>
 <p id="app-update-source" class="help">官方稳定来源：Stahl-G/briefloop · GitHub Releases</p>
 <p id="app-update-status" role="status" aria-live="polite">尚未检查更新</p>

{briefloop-0.22.2 → briefloop-0.22.3}/src/briefloop.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: briefloop
-Version: 0.22.2
+Version: 0.22.3
 Summary: Local multi-runtime agent workbench for sourced briefings, independent review and skill learning
 Author: Stahl-G
 License-Expression: MIT

{briefloop-0.22.2 → briefloop-0.22.3}/src/briefloop.egg-info/SOURCES.txt

@@ -586,6 +586,7 @@ tests/test_progress.py
 tests/test_progress_pipeline.py
 tests/test_public_research.py
 tests/test_reader_contract.py
+tests/test_reader_source_export.py
 tests/test_reader_workflow.py
 tests/test_reconciliation.py
 tests/test_release.py

{briefloop-0.22.2 → briefloop-0.22.3}/tests/test_export_admission.py

@@ -39,3 +39,30 @@ def test_concurrent_exports_share_job_and_rebuild_missing_or_damaged_file(tmp_pa
     revised = store.revise(brief['id'], '# 验收\n\n本周三项交付。')
     changed = export_jobs.enqueue_export(store, revised['id'])
     assert changed['id'] not in {job['id'] for job in store.rows("SELECT * FROM jobs WHERE kind='export_docx'") if job['payload'] == rebuilt['payload']}
+
+
+def test_reader_source_upgrade_invalidates_both_renderer_caches(tmp_path, monkeypatch):
+    from briefloop.templates import import_builtin
+    store = Store(tmp_path)
+    import_builtin(store)
+    template_id = store.rows('SELECT id FROM templates LIMIT 1')[0]['id']
+    source = store.add_source('Synthetic', '本周两项交付。')
+    run = store.create_run({'title': '验收', 'objective': '合成测试'}, [source['id']])
+    brief = store.publish(run['id'], {'title': '验收', 'markdown': '# 验收\n\n本周两项交付。'})
+    current_input = export_jobs.export_input
+    def old_input(*args, **kwargs):
+        identity, figures = current_input(*args, **kwargs)
+        identity['renderer'] = 15 if identity['requirements'].get('template_id') else 17
+        return identity, figures
+    for layout in (None, template_id):
+        monkeypatch.setattr(export_jobs, 'export_input', old_input)
+        old = export_jobs.enqueue_export(store, brief['id'], layout)
+        result = export_jobs.generate_word(store, old, threading.Event())
+        with store.tx() as c:
+            c.execute("UPDATE jobs SET status='complete',result=? WHERE id=?", (dump(result), old['id']))
+        assert export_jobs.enqueue_export(store, brief['id'], layout)['id'] == old['id']
+        monkeypatch.setattr(export_jobs, 'export_input', current_input)
+        upgraded = export_jobs.enqueue_export(store, brief['id'], layout)
+        assert upgraded['id'] != old['id']
+        assert export_jobs.enqueue_export(store, brief['id'], layout)['id'] == upgraded['id']
+        assert export_jobs.output_path(store, old).is_file()

briefloop-0.22.3/tests/test_reader_source_export.py

@@ -0,0 +1,44 @@
+from copy import deepcopy
+from docx import Document
+from docx.oxml.ns import qn
+from briefloop.document_export import render_document, reader_source_blocks
+
+
+def fixture():
+    def p(text):
+        return {'type': 'paragraph', 'content': [{'type': 'text', 'text': text}]}
+    def row(values, kind):
+        return {'type': 'tableRow', 'content': [{'type': kind, 'content': [p(v)]} for v in values]}
+    return {'type': 'doc', 'content': [
+        {'type': 'paragraph', 'content': [{'type': 'citation', 'attrs': {'sourceId': 'src_one'}}]},
+        {'type': 'heading', 'attrs': {'level': 2}, 'content': [{'type': 'text', 'text': '来源'}]},
+        {'type': 'table', 'content': [row(['编号', '主体/来源', 'source_id'], 'tableHeader'),
+                                    row(['1', 'Source', 'src_one'], 'tableCell')]}]}
+
+
+def test_reader_export_replaces_internal_index_with_linked_title_without_mutating_draft():
+    draft = fixture(); original = deepcopy(draft); doc = Document()
+    render_document(doc, draft, sources={'src_one': {'name': 'Official source', 'url': 'https://example.org/report'}})
+    assert draft == original
+    assert len(doc.tables) == 0
+    assert sum(p.text == '来源' for p in doc.paragraphs) == 1
+    assert 'src_one' not in doc.element.xml
+    links = doc.element.xpath('//w:hyperlink')
+    assert len(links) == 1
+    assert links[0].xpath('.//w:t')[0].text == 'Official source'
+    relation = doc.part.rels[links[0].get(qn('r:id'))]
+    assert relation.is_external and relation.target_ref == 'https://example.org/report'
+    assert links[0].xpath('.//w:color')[0].get(qn('w:val')) == '0563C1'
+
+
+def test_unrecognized_or_unresolved_tables_are_not_discarded():
+    draft = fixture()
+    assert reader_source_blocks(draft, {})[0] == draft['content']
+    draft['content'][-1]['content'][0]['content'][2]['content'][0]['content'][0]['text'] = '业务指标'
+    assert reader_source_blocks(draft, {'src_one': {'name': 'Source'}})[0] == draft['content']
+
+
+def test_export_without_source_append_keeps_authored_index():
+    doc = Document()
+    render_document(doc, fixture(), sources={'src_one': {'name': 'Source'}}, append_sources=False)
+    assert len(doc.tables) == 1

briefloop-0.22.2/VERSION

@@ -1 +0,0 @@
-0.22.2

briefloop-0.22.2/src/briefloop/__init__.py

@@ -1 +0,0 @@
-__version__ = "0.22.2"