deepresearch-flow 0.7.1__py3-none-any.whl → 0.7.2__py3-none-any.whl

deepresearch_flow/paper/snapshot/mcp_server.py

@@ -227,18 +227,24 @@ def _load_summary_json(paper_id: str, template: str | None) -> tuple[str | None,
     conn = _open_ro_conn(cfg.snapshot_db)
     try:
         row = conn.execute(
-            "SELECT preferred_summary_template, summary_asset_paths_json FROM paper WHERE paper_id = ?",
+            "SELECT preferred_summary_template FROM paper WHERE paper_id = ?",
             (paper_id,),
         ).fetchone()
         if not row:
             return None, None
-        preferred = row["preferred_summary_template"]
-        asset_paths = json.loads(row["summary_asset_paths_json"] or "{}")
-        available = sorted(asset_paths.keys())
-        selected = template if template else preferred
-        if not selected or selected not in asset_paths:
+        preferred = str(row["preferred_summary_template"] or "")
+        template_rows = conn.execute(
+            "SELECT template_tag FROM paper_summary WHERE paper_id = ?",
+            (paper_id,),
+        ).fetchall()
+        available = sorted((str(item["template_tag"]) for item in template_rows), key=str.lower)
+        selected = (template or preferred).strip()
+        if not selected or selected not in set(available):
             return None, available
-        rel_path = asset_paths[selected]
+        if template:
+            rel_path = f"summary/{paper_id}/{selected}.json"
+        else:
+            rel_path = f"summary/{paper_id}.json"
         return _load_static_text(rel_path), available
     finally:
         conn.close()
@@ -267,15 +273,12 @@ def _load_translation_markdown(paper_id: str, lang: str) -> str | None:
     conn = _open_ro_conn(cfg.snapshot_db)
     try:
         row = conn.execute(
-            "SELECT translations_json FROM paper WHERE paper_id = ?",
-            (paper_id,),
+            "SELECT md_content_hash FROM paper_translation WHERE paper_id = ? AND lang = ?",
+            (paper_id, lang),
         ).fetchone()
-        if not row or not row["translations_json"]:
-            return None
-        translations = json.loads(row["translations_json"])
-        rel_path = translations.get(lang)
-        if not rel_path:
+        if not row or not row["md_content_hash"]:
             return None
+        rel_path = f"md_translate/{lang}/{row['md_content_hash']}.md"
         return _load_static_text(rel_path)
     finally:
         conn.close()
@@ -296,22 +299,32 @@ def search_papers(query: str, limit: int = 10) -> list[dict[str, Any]]:
     
     conn = _open_ro_conn(cfg.snapshot_db)
     try:
+        match_expr = rewrite_search_query(query)
+        if not match_expr:
+            return []
         cur = conn.execute(
             """
-            SELECT paper_id, title, year, venue, abstract
-            FROM paper_search
-            WHERE paper_search MATCH ?
+            SELECT
+              p.paper_id,
+              p.title,
+              p.year,
+              p.venue,
+              snippet(paper_fts, -1, '[[[', ']]]', '…', 30) AS snippet_markdown,
+              bm25(paper_fts, 5.0, 3.0, 1.0, 1.0, 2.0) AS rank
+            FROM paper_fts
+            JOIN paper p ON p.paper_id = paper_fts.paper_id
+            WHERE paper_fts MATCH ?
             ORDER BY rank
             LIMIT ?
             """,
-            (rewrite_search_query(query), limit),
+            (match_expr, limit),
         )
         rows = cur.fetchall()
         results: list[dict[str, Any]] = []
         for row in rows:
-            snippet = str(row["abstract"] or "")
+            snippet = str(row["snippet_markdown"] or "")
             snippet = remove_cjk_spaces(snippet)
-            snippet, markers = merge_adjacent_markers(snippet)
+            snippet = merge_adjacent_markers(snippet)
             results.append({
                 "paper_id": str(row["paper_id"]),
                 "title": str(row["title"]),
@@ -337,7 +350,7 @@ def search_papers_by_keyword(keyword: str, limit: int = 10) -> list[dict[str, An
     try:
         rows = conn.execute(
             """
-            SELECT DISTINCT p.paper_id, p.title, p.year, p.venue, p.abstract
+            SELECT DISTINCT p.paper_id, p.title, p.year, p.venue, p.summary_preview
             FROM paper p
             JOIN paper_keyword pk ON pk.paper_id = p.paper_id
             JOIN keyword k ON k.keyword_id = pk.keyword_id
@@ -349,9 +362,9 @@ def search_papers_by_keyword(keyword: str, limit: int = 10) -> list[dict[str, An
         ).fetchall()
         results: list[dict[str, Any]] = []
         for row in rows:
-            snippet = str(row["abstract"] or "")
+            snippet = str(row["summary_preview"] or "")
             snippet = remove_cjk_spaces(snippet)
-            snippet, markers = merge_adjacent_markers(snippet)
+            snippet = merge_adjacent_markers(snippet)
             results.append({
                 "paper_id": str(row["paper_id"]),
                 "title": str(row["title"]),
@@ -377,26 +390,27 @@ def get_paper_metadata(paper_id: str) -> dict[str, Any]:
     try:
         row = conn.execute(
             """
-            SELECT paper_id, title, year, venue, doi, arxiv_id, openreview_id, paper_pw_url,
-                   preferred_summary_template, summary_asset_paths_json
+            SELECT paper_id, title, year, venue, preferred_summary_template
             FROM paper WHERE paper_id = ?
             """,
             (paper_id,),
         ).fetchone()
         if not row:
             raise McpToolError("not_found", "paper not found", paper_id=paper_id)
-        
-        asset_paths = json.loads(row["summary_asset_paths_json"] or "{}")
-        available = sorted(asset_paths.keys())
+        template_rows = conn.execute(
+            "SELECT template_tag FROM paper_summary WHERE paper_id = ?",
+            (paper_id,),
+        ).fetchall()
+        available = sorted((str(item["template_tag"]) for item in template_rows), key=str.lower)
         return {
             "paper_id": str(row["paper_id"]),
             "title": str(row["title"]),
             "year": str(row["year"]),
             "venue": str(row["venue"]),
-            "doi": row["doi"],
-            "arxiv_id": row["arxiv_id"],
-            "openreview_id": row["openreview_id"],
-            "paper_pw_url": row["paper_pw_url"],
+            "doi": None,
+            "arxiv_id": None,
+            "openreview_id": None,
+            "paper_pw_url": None,
             "preferred_summary_template": row["preferred_summary_template"],
             "available_summary_templates": available,
         }

deepresearch_flow/paper/snapshot/tests/test_mcp_server_schema_compat.py

@@ -0,0 +1,184 @@
+from __future__ import annotations
+
+import sqlite3
+import tempfile
+from pathlib import Path
+import unittest
+
+from deepresearch_flow.paper.snapshot.common import ApiLimits
+from deepresearch_flow.paper.snapshot.mcp_server import (
+    McpSnapshotConfig,
+    McpToolError,
+    configure,
+    get_paper_metadata,
+    get_paper_source,
+    get_paper_summary,
+    resource_translation,
+    search_papers,
+    search_papers_by_keyword,
+)
+from deepresearch_flow.paper.snapshot.schema import init_snapshot_db
+
+
+class TestMcpServerSchemaCompat(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls) -> None:
+        cls.tmpdir = tempfile.TemporaryDirectory()
+        root = Path(cls.tmpdir.name)
+        cls.db_path = root / "snapshot.db"
+        cls.static_dir = root / "static"
+        cls.paper_id = "eb87c02de5b908dff9f91edda47364a5"
+
+        (cls.static_dir / "summary" / cls.paper_id).mkdir(parents=True, exist_ok=True)
+        (cls.static_dir / "md").mkdir(parents=True, exist_ok=True)
+        (cls.static_dir / "md_translate" / "zh").mkdir(parents=True, exist_ok=True)
+        (cls.static_dir / "summary" / f"{cls.paper_id}.json").write_text(
+            '{"template_tag":"deep_read","summary":"default summary"}',
+            encoding="utf-8",
+        )
+        (cls.static_dir / "summary" / cls.paper_id / "deep_read.json").write_text(
+            '{"template_tag":"deep_read","summary":"deep summary"}',
+            encoding="utf-8",
+        )
+        (cls.static_dir / "summary" / cls.paper_id / "simple.json").write_text(
+            '{"template_tag":"simple","summary":"simple summary"}',
+            encoding="utf-8",
+        )
+        (cls.static_dir / "md" / "sourcehash.md").write_text(
+            "# source body",
+            encoding="utf-8",
+        )
+        (cls.static_dir / "md_translate" / "zh" / "trhash.md").write_text(
+            "# 翻译内容",
+            encoding="utf-8",
+        )
+
+        conn = sqlite3.connect(str(cls.db_path))
+        try:
+            init_snapshot_db(conn)
+            conn.execute(
+                """
+                INSERT INTO paper(
+                  paper_id, paper_key, paper_key_type, title, year, month, publication_date,
+                  venue, preferred_summary_template, summary_preview, paper_index, source_hash,
+                  output_language, provider, model, prompt_template, extracted_at,
+                  pdf_content_hash, source_md_content_hash
+                ) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
+                """,
+                (
+                    cls.paper_id,
+                    "meta:key",
+                    "meta",
+                    "Graph Neural Networks",
+                    "2024",
+                    "01",
+                    "2024-01-01",
+                    "ICLR",
+                    "deep_read",
+                    "Graph methods preview",
+                    1,
+                    "sourcekey",
+                    "en",
+                    "provider-x",
+                    "model-y",
+                    "deep_read",
+                    "2025-01-01T00:00:00Z",
+                    "pdfhash",
+                    "sourcehash",
+                ),
+            )
+            conn.execute(
+                "INSERT INTO paper_summary(paper_id, template_tag) VALUES (?, ?)",
+                (cls.paper_id, "deep_read"),
+            )
+            conn.execute(
+                "INSERT INTO paper_summary(paper_id, template_tag) VALUES (?, ?)",
+                (cls.paper_id, "simple"),
+            )
+            conn.execute(
+                "INSERT INTO paper_translation(paper_id, lang, md_content_hash) VALUES (?, ?, ?)",
+                (cls.paper_id, "zh", "trhash"),
+            )
+            conn.execute("INSERT INTO keyword(value) VALUES (?)", ("machine learning",))
+            keyword_row = conn.execute(
+                "SELECT keyword_id FROM keyword WHERE value = ?",
+                ("machine learning",),
+            ).fetchone()
+            conn.execute(
+                "INSERT INTO paper_keyword(paper_id, keyword_id) VALUES (?, ?)",
+                (cls.paper_id, int(keyword_row[0])),
+            )
+            conn.execute(
+                """
+                INSERT INTO paper_fts(paper_id, title, summary, source, translated, metadata)
+                VALUES (?, ?, ?, ?, ?, ?)
+                """,
+                (
+                    cls.paper_id,
+                    "graph neural networks",
+                    "graph representation learning",
+                    "source text",
+                    "translated text",
+                    "machine learning iclr",
+                ),
+            )
+            conn.commit()
+        finally:
+            conn.close()
+
+        configure(
+            McpSnapshotConfig(
+                snapshot_db=cls.db_path,
+                static_base_url="",
+                static_export_dir=cls.static_dir,
+                limits=ApiLimits(),
+                origin_allowlist=["*"],
+            )
+        )
+
+    @classmethod
+    def tearDownClass(cls) -> None:
+        cls.tmpdir.cleanup()
+
+    def test_get_paper_metadata_with_new_schema(self) -> None:
+        payload = get_paper_metadata(self.paper_id)
+        self.assertEqual(payload["paper_id"], self.paper_id)
+        self.assertEqual(payload["preferred_summary_template"], "deep_read")
+        self.assertEqual(payload["available_summary_templates"], ["deep_read", "simple"])
+        self.assertIsNone(payload["doi"])
+        self.assertIsNone(payload["arxiv_id"])
+        self.assertIsNone(payload["openreview_id"])
+        self.assertIsNone(payload["paper_pw_url"])
+
+    def test_get_paper_summary_default_and_template(self) -> None:
+        default_summary = get_paper_summary(self.paper_id)
+        deep_read_summary = get_paper_summary(self.paper_id, template="deep_read")
+        self.assertIn("default summary", default_summary)
+        self.assertIn("deep summary", deep_read_summary)
+
+    def test_get_paper_summary_template_not_available(self) -> None:
+        with self.assertRaises(McpToolError) as ctx:
+            get_paper_summary(self.paper_id, template="unknown")
+        self.assertEqual(ctx.exception.code, "template_not_available")
+        self.assertEqual(
+            ctx.exception.details["available_summary_templates"],
+            ["deep_read", "simple"],
+        )
+
+    def test_source_and_translation_loading(self) -> None:
+        source = get_paper_source(self.paper_id)
+        translated = resource_translation(self.paper_id, "zh")
+        self.assertIn("source body", source)
+        self.assertIn("翻译内容", translated)
+
+    def test_search_tools_use_current_schema(self) -> None:
+        fts_hits = search_papers("graph", limit=5)
+        facet_hits = search_papers_by_keyword("machine", limit=5)
+        self.assertGreaterEqual(len(fts_hits), 1)
+        self.assertGreaterEqual(len(facet_hits), 1)
+        self.assertEqual(fts_hits[0]["paper_id"], self.paper_id)
+        self.assertEqual(facet_hits[0]["paper_id"], self.paper_id)
+
+
+if __name__ == "__main__":
+    unittest.main()

{deepresearch_flow-0.7.1.dist-info → deepresearch_flow-0.7.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deepresearch-flow
-Version: 0.7.1
+Version: 0.7.2
 Summary: Workflow tools for paper extraction, review, and research automation.
 Author-email: DengQi <dengqi935@gmail.com>
 License: MIT License

{deepresearch_flow-0.7.1.dist-info → deepresearch_flow-0.7.2.dist-info}/RECORD

@@ -47,12 +47,13 @@ deepresearch_flow/paper/snapshot/api.py,sha256=F_qehvCjxTBTGj9FmqP4NnJQayUPJm0N5
 deepresearch_flow/paper/snapshot/builder.py,sha256=HbRcfNteMoP4RnQ4y2onZCm9XfnIvzXLn_EwsLZsDzY,38692
 deepresearch_flow/paper/snapshot/common.py,sha256=KAhlGlPgabOCe9Faps8BoDqin71qpkCfaL_ADCr_9vg,917
 deepresearch_flow/paper/snapshot/identity.py,sha256=k9x1EZPFBU1qgxzkTGvwVtDjLgcosmM_udPuvRLl0uI,7748
-deepresearch_flow/paper/snapshot/mcp_server.py,sha256=lvgbXmuZCZ_zaQMdZEMjN-OChHPdoZ9MmuuQ-7ORias,22901
+deepresearch_flow/paper/snapshot/mcp_server.py,sha256=KGNCtOWiJ82wHQmrLNVhLwDugGtosqVvKWeLq4ZlBlg,23395
 deepresearch_flow/paper/snapshot/schema.py,sha256=DcVmAklLYyEeDoVV9jYw7hoMHnHd9Eziivl-LP2busY,8991
 deepresearch_flow/paper/snapshot/text.py,sha256=0RnxLowa6AdirdLsUYym6BhWbjwiP2Qj2oZeA-pjmdE,4368
 deepresearch_flow/paper/snapshot/unpacker.py,sha256=ScKSFdrQLJHrITHe9KAxgAEH-vAAnXLolvW9zeJ3wsc,8575
 deepresearch_flow/paper/snapshot/tests/__init__.py,sha256=G0IowrxHjGUIaqxcw6SvlcLFAtE5ZsleG6ECgd-sIdk,52
 deepresearch_flow/paper/snapshot/tests/test_identity.py,sha256=KDFixAUU9l68KOum7gf1IrD0Oy18dBCSXG7RbJTqflA,4520
+deepresearch_flow/paper/snapshot/tests/test_mcp_server_schema_compat.py,sha256=T7FtkKkGpZx5M7Z278F4iaQFfwS0_XXce_tRdTArt5k,7076
 deepresearch_flow/paper/templates/__init__.py,sha256=p8W6kINvrf-T2X6Ow4GMr28syVOorFuMn0pbmieVzAw,35
 deepresearch_flow/paper/templates/deep_read.md.j2,sha256=vwVSPOzMBFIS72ez5XFBaKrDZGz0z32L3VGP6mNk434,4780
 deepresearch_flow/paper/templates/deep_read_phi.md.j2,sha256=6Yz2Kxk0czGDPkZiWX3b87glLYHwDU1afr6CkjS-dh8,1666
@@ -466,9 +467,9 @@ deepresearch_flow/translator/placeholder.py,sha256=mEgqA-dPdOsIhno0h_hzfpXpY2asb
 deepresearch_flow/translator/prompts.py,sha256=EvfBvBIpQXARDj4m87GAyFXJGL8EJeahj_rOmp9mv68,5556
 deepresearch_flow/translator/protector.py,sha256=yUMuS2FgVofK_MRXrcauLRiwNvdCCjNAnh6CcNd686o,11777
 deepresearch_flow/translator/segment.py,sha256=rBFMCLTrvm2GrPc_hNFymi-8Ih2DAtUQlZHCRE9nLaM,5146
-deepresearch_flow-0.7.1.dist-info/licenses/LICENSE,sha256=hT8F2Py1pe6flxq3Ufdm2UKFk0B8CBm0aAQfsLXfvjw,1063
-deepresearch_flow-0.7.1.dist-info/METADATA,sha256=rSmAZMSVrjhXLo6Dte3Gaf9AvVyznUaHd-Ahwn47Ne4,31331
-deepresearch_flow-0.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-deepresearch_flow-0.7.1.dist-info/entry_points.txt,sha256=1uIKscs0YRMg_mFsg9NjsaTt4CvQqQ_-zGERUKhhL_Y,65
-deepresearch_flow-0.7.1.dist-info/top_level.txt,sha256=qBl4RvPJNJUbL8CFfMNWxY0HpQLx5RlF_ko-z_aKpm0,18
-deepresearch_flow-0.7.1.dist-info/RECORD,,
+deepresearch_flow-0.7.2.dist-info/licenses/LICENSE,sha256=hT8F2Py1pe6flxq3Ufdm2UKFk0B8CBm0aAQfsLXfvjw,1063
+deepresearch_flow-0.7.2.dist-info/METADATA,sha256=2QzhwiS1G6q-XZyRXv7SGgzzsNueZ3PH5-q3g0jlP-Y,31331
+deepresearch_flow-0.7.2.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+deepresearch_flow-0.7.2.dist-info/entry_points.txt,sha256=1uIKscs0YRMg_mFsg9NjsaTt4CvQqQ_-zGERUKhhL_Y,65
+deepresearch_flow-0.7.2.dist-info/top_level.txt,sha256=qBl4RvPJNJUbL8CFfMNWxY0HpQLx5RlF_ko-z_aKpm0,18
+deepresearch_flow-0.7.2.dist-info/RECORD,,