backend: let a model put a figure in the paper, and set a formula's alignment
Two things the editor gained and MCP could not do, both because the tool layer
had been told about the domain's columns by hand.
**A figure.** Bytes go to MinIO and the sentence keeps a Markdown address, so a
picture is ordinary text — which means the writing tools already carry it, and
the only half a model cannot do is the upload: it has bytes and no way to send
multipart. `image_upload` takes base64 and answers with the URL, the Markdown
and the *sentence object* the editor produces when a picture is dropped in, so a
figure is written by putting that object into `sentences` unchanged. It does not
fetch a URL the caller names: a service inside the cluster that will GET any
address it is handed is an SSRF primitive aimed at everything beside it.
The width argument is the reader's rule or it is refused. `{width=70%}` is
parsed by `frontend/src/utils/rich.ts`, and a value it cannot read is not an
error there — the picture just prints at its natural size. A size that silently
does not apply is worse than a refusal, so the syntax and the range (pixels
1–4000, per cent 1–100) are mirrored in `app/mcp/tools/images.py`, with the
usual comment naming the other side.
`paragraph_text` also had to learn what a figure is: a sentence holding nothing
but an image is a 插图 — the view prints it on its own line with the brackets'
text as its caption — and the text a tool hands back broke lines around a
display formula but not around a picture. Same rule as `figureOf`, same pair of
implementations, same warning about changing both.
**A formula's alignment.** `paper_sentence.formula_align` reached the editor and
the REST API and stopped there: `SentenceSpec` had no such field, so a model that
sent one got a successful call and a centred formula. The column is now declared,
carried through every write path and reported by every read path.
That is the second column lost the same way, so the fix is structural rather
than another two edits. `SENTENCE_FIELDS` is read from
`app.schemas.paper.SentenceInput` instead of written out, the payload is built
by one `sentence_payload()`, and the three append paths spread
`SentenceCreate(**item.model_dump())` rather than copying fields. One edit
remains — declaring the field in `specs.py` — and smoke_mcp.py's first step
compares the two field sets, so forgetting it now fails the suite instead of
losing the field. `sort` is declared too, which it never was: a model that sent
one had it dropped in silence.
smoke_mcp.py: 99 checks to 119. The figure step uploads a real 1x1 GIF (the same
bytes twice, and the key is the same object), writes the returned sentence as it
came back, checks the paragraph prints it alone on its line and that an image
inside a sentence does not break the line, and takes the four refusals — not a
picture, an unparseable size, an out-of-range one, not base64. The alignment step
writes a right-aligned formula, moves the sentence to left on its own, and takes
the paragraph to another position to prove the setting travels with it.
Deployed as v6, and the pod now carries MINIO_ENDPOINT (the in-cluster Service)
plus the two credential keys from the Secret; without them the image tool answers
with the missing variable names and every writing tool still works.
This commit is contained in:
@@ -27,6 +27,15 @@ from pydantic import BaseModel, Field
|
||||
#: of an explicit list. See :func:`app.mcp.support.split_text`.
|
||||
SplitMode = Literal["line", "sentence", "paragraph"]
|
||||
|
||||
#: Where a display formula sits on its line. Spelled out here rather than as a
|
||||
#: plain ``str`` so the JSON Schema a client receives carries the three values:
|
||||
#: a model that reads "formula_align: string" invents ``middle``.
|
||||
#:
|
||||
#: This is the same set as :data:`app.models.paper_sentence.FORMULA_ALIGNMENTS`,
|
||||
#: which the payload validator enforces; a value outside it is refused by the
|
||||
#: same message the REST API gives.
|
||||
FormulaAlign = Literal["center", "left", "right"]
|
||||
|
||||
|
||||
class CitationSpec(BaseModel):
|
||||
"""One citation of one sentence."""
|
||||
@@ -42,9 +51,22 @@ class CitationSpec(BaseModel):
|
||||
|
||||
|
||||
class SentenceSpec(BaseModel):
|
||||
"""One sentence, optionally carrying citations."""
|
||||
"""One sentence, optionally carrying citations.
|
||||
|
||||
The fields here are the sentence's own columns, and they are meant to stay
|
||||
that way: :data:`app.mcp.support.SENTENCE_FIELDS` is read from
|
||||
:class:`~app.schemas.paper.SentenceInput` at import, and ``smoke_mcp.py``
|
||||
asserts that this model declares every one of them. A column added to the
|
||||
domain therefore fails the suite until it is declared here, instead of being
|
||||
dropped from every write in silence — which is what happened to
|
||||
``line_break_before`` and then to ``formula_align``.
|
||||
"""
|
||||
|
||||
content: Annotated[str, Field(description="句子正文;空白会被折叠成一行")]
|
||||
sort: Annotated[
|
||||
int | None,
|
||||
Field(description="段内排序值;不传则按写入顺序接在段尾"),
|
||||
] = None
|
||||
line_break_before: Annotated[
|
||||
bool,
|
||||
Field(
|
||||
@@ -55,6 +77,15 @@ class SentenceSpec(BaseModel):
|
||||
)
|
||||
),
|
||||
] = False
|
||||
formula_align: Annotated[
|
||||
FormulaAlign,
|
||||
Field(
|
||||
description=(
|
||||
"display 公式在这一行怎么排:center(默认)/ left / right。"
|
||||
"只对含 $$…$$ 的句子有意义,句号后的编号始终靠右"
|
||||
)
|
||||
),
|
||||
] = "center"
|
||||
citations: Annotated[
|
||||
list[CitationSpec],
|
||||
Field(description="这一段引用了哪些文献"),
|
||||
@@ -78,6 +109,10 @@ class TextSpec(BaseModel):
|
||||
)
|
||||
),
|
||||
] = False
|
||||
formula_align: Annotated[
|
||||
FormulaAlign,
|
||||
Field(description="这块切出来的公式怎么排:center(默认)/ left / right"),
|
||||
] = "center"
|
||||
citations: Annotated[
|
||||
list[CitationSpec],
|
||||
Field(description="整段共用的引用"),
|
||||
|
||||
+99
-16
@@ -260,6 +260,9 @@ def sentence_row(sentence: Any, *, separator: str | None = None) -> dict:
|
||||
# move one: a paragraph read back without this flag looks like prose
|
||||
# that happens to have no spaces in it.
|
||||
"line_break_before": sentence.line_break_before,
|
||||
# Only meaningful for a sentence holding a display formula, and reported
|
||||
# anyway: a row that hides it looks like a row where it is not set.
|
||||
"formula_align": sentence.formula_align,
|
||||
"citations": [citation_row(item) for item in sentence.citations],
|
||||
}
|
||||
if separator is not None:
|
||||
@@ -283,17 +286,46 @@ def paragraph_row(paragraph: ParagraphRead, *, preview: int = 80) -> dict:
|
||||
|
||||
#: A formula the paper view sets on a line of its own: ``$$…$$`` or ``\[…\]``.
|
||||
#:
|
||||
#: This is the same rule as ``hasDisplayMath`` in ``frontend/src/utils/math.ts``,
|
||||
#: This is the same rule as ``hasDisplayMath`` in ``frontend/src/utils/rich.ts``,
|
||||
#: written twice because the view is TypeScript and this is Python. The two must
|
||||
#: agree, or a tool result and the page a writer is looking at would disagree
|
||||
#: about where the lines are — which is the one thing this module exists to
|
||||
#: prevent. Change one, change the other.
|
||||
_DISPLAY_MATH = re.compile(r"\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]")
|
||||
|
||||
#: One image, as a sentence writes it: ```` with pandoc's optional
|
||||
#: ``{width=…}``. The counterpart of the image alternative in ``RICH_PATTERN``
|
||||
#: (same file as above), and the same warning applies: the two are one rule.
|
||||
_IMAGE = re.compile(r"!\[(?P<alt>[^\]]*)\]\([^()\s]+(?:\s+\"[^\"]*\")?\)(?:\{[^}]*\})?")
|
||||
|
||||
def _is_display(sentence: Any) -> bool:
|
||||
"""Whether this sentence is a display formula — a block, not a run of text."""
|
||||
return bool(_DISPLAY_MATH.search(sentence.content))
|
||||
|
||||
def _figure_caption(content: str) -> str | None:
|
||||
"""The 图注 of a figure sentence — a sentence that is nothing but one image.
|
||||
|
||||
The paper view's ``figureOf``: a sentence holding only a picture is a 插图,
|
||||
printed on a line of its own with the brackets' text underneath as its
|
||||
caption; a picture inside a sentence that says something stays in the line.
|
||||
Anything else — two images, or an image with words around it — is not a
|
||||
figure, and returns ``None``.
|
||||
"""
|
||||
match = _IMAGE.search(content)
|
||||
if match is None:
|
||||
return None
|
||||
if content[: match.start()].strip() or content[match.end() :].strip():
|
||||
return None
|
||||
return match.group("alt")
|
||||
|
||||
|
||||
def _is_block(sentence: Any) -> bool:
|
||||
"""Whether this sentence takes a line of its own, whether or not it asked.
|
||||
|
||||
Two kinds do, and both are rules the paper view already applies: a display
|
||||
formula, and a figure. Nothing else is inferred — an ordinary sentence that
|
||||
merely follows a full stop runs on, which is what a paragraph is.
|
||||
"""
|
||||
return bool(_DISPLAY_MATH.search(sentence.content)) or _figure_caption(
|
||||
sentence.content
|
||||
) is not None
|
||||
|
||||
|
||||
def paragraph_text(
|
||||
@@ -308,14 +340,20 @@ def paragraph_text(
|
||||
belongs at each seam, so a tool result and the paper view agree on where
|
||||
the spaces go. Nothing here adds spacing of its own.
|
||||
|
||||
A line break is printed where the model asked for one, and around a display
|
||||
formula — the paper view renders ``$$…$$`` as a block, so the lines on
|
||||
either side of it are line boundaries there too. A break *replaces* the
|
||||
A line break is printed where the model asked for one, and on both sides of
|
||||
a block — a display formula, or a sentence that is one figure — because the
|
||||
paper view sets those on a line of their own. A break *replaces* the
|
||||
separator rather than joining it: the new line already separates the two
|
||||
sentences, and a space as well would indent the line below by one blank.
|
||||
The first sentence of a paragraph is never preceded by a break, because
|
||||
there is nothing above it to break from.
|
||||
|
||||
A figure prints as the Markdown it is stored as — ```` on its
|
||||
own line — rather than as its caption alone. The text form cannot draw the
|
||||
picture, and the address is what says *which* picture: a model that reads a
|
||||
paragraph back sees the same string the writer put there, and can paste it
|
||||
somewhere else unchanged.
|
||||
|
||||
A marker's number comes from ``index_by_citation`` — the citation's *work*
|
||||
number as the whole document assigned it, not its position in this sentence —
|
||||
so what is printed in the text matches the 参考文献 list it points at. Read
|
||||
@@ -325,7 +363,7 @@ def paragraph_text(
|
||||
parts: list[str] = []
|
||||
previous_block = False
|
||||
for sentence in paragraph.sentences:
|
||||
block = _is_display(sentence)
|
||||
block = _is_block(sentence)
|
||||
if parts and (sentence.line_break_before or block or previous_block):
|
||||
parts.append("\n")
|
||||
else:
|
||||
@@ -619,6 +657,50 @@ def _is_latin_break(text: str, index: int) -> bool:
|
||||
return True
|
||||
|
||||
|
||||
#: Every field a sentence payload carries, read from the payload schema itself
|
||||
#: rather than listed by hand here.
|
||||
#:
|
||||
#: The hand-written list was wrong twice. A column added to the domain —
|
||||
#: ``line_break_before``, and then ``formula_align`` — reached the REST API, the
|
||||
#: editor and the paper view, and was silently dropped by every MCP write path
|
||||
#: that had spelled the fields out: the call succeeded and the field was simply
|
||||
#: gone. Reading the names from :class:`~app.schemas.paper.SentenceInput` means a
|
||||
#: new column flows through :func:`sentence_payload` and through the tools that
|
||||
#: spread it, and the only edit left is declaring it in
|
||||
#: :class:`~app.mcp.specs.SentenceSpec` — which ``smoke_mcp.py`` checks for, so
|
||||
#: forgetting *that* fails the suite instead of losing the field.
|
||||
SENTENCE_FIELDS: tuple[str, ...] = tuple(SentenceInput.model_fields)
|
||||
|
||||
|
||||
def sentence_payload(values: Mapping[str, Any], **overrides: Any) -> SentenceInput:
|
||||
"""One sentence payload, built from whatever the caller sent.
|
||||
|
||||
Fields the caller did not mention keep the schema's own defaults, and keys
|
||||
this layer does not know are dropped rather than handed to a validator that
|
||||
would refuse them: a model that copies a row out of ``paragraph_get`` and
|
||||
edits it sends back ``id``, ``position`` and ``separator_before`` as well,
|
||||
and read-modify-write is a reasonable way to work.
|
||||
"""
|
||||
known = {name: values[name] for name in SENTENCE_FIELDS if name in values}
|
||||
known.update(overrides)
|
||||
return SentenceInput(**known)
|
||||
|
||||
|
||||
def sentence_values(row: Any) -> dict[str, Any]:
|
||||
"""One *stored* sentence as payload fields again — for a move or a copy.
|
||||
|
||||
``sort`` is deliberately absent, and the caller decides about it: a sentence
|
||||
moved onto another paragraph must not carry its old number there, or the two
|
||||
paragraphs interleave by sort instead of the moved block landing after the
|
||||
target's own sentences.
|
||||
"""
|
||||
return {
|
||||
name: getattr(row, name)
|
||||
for name in SENTENCE_FIELDS
|
||||
if name not in {"sort", "citations"} and hasattr(row, name)
|
||||
}
|
||||
|
||||
|
||||
def sentence_inputs(items: Sequence[Any], *, default_split: str = "line") -> list[SentenceInput]:
|
||||
"""Normalise what a model sent into the project's own sentence payload.
|
||||
|
||||
@@ -660,13 +742,7 @@ def sentence_inputs(items: Sequence[Any], *, default_split: str = "line") -> lis
|
||||
line_break = bool(item.get("line_break_before", False))
|
||||
|
||||
if item.get("content") is not None:
|
||||
out.append(
|
||||
SentenceInput(
|
||||
content=str(item["content"]),
|
||||
line_break_before=line_break,
|
||||
citations=citations,
|
||||
)
|
||||
)
|
||||
out.append(sentence_payload(item, citations=citations))
|
||||
continue
|
||||
|
||||
if item.get("text") is not None:
|
||||
@@ -679,8 +755,12 @@ def sentence_inputs(items: Sequence[Any], *, default_split: str = "line") -> lis
|
||||
# would turn a paragraph the writer wrapped across three lines
|
||||
# into three lines of the paper.
|
||||
out.append(
|
||||
SentenceInput(
|
||||
sentence_payload(
|
||||
item,
|
||||
content=piece,
|
||||
# A block has no ``sort`` of its own: the pieces are one
|
||||
# after another, and the CRUD layer numbers them.
|
||||
sort=None,
|
||||
line_break_before=line_break and offset == 0,
|
||||
citations=citations,
|
||||
)
|
||||
@@ -728,6 +808,7 @@ def paragraph_inputs(spec: Any) -> list[SentenceInput]:
|
||||
|
||||
__all__ = [
|
||||
"MAX_PAGE_SIZE",
|
||||
"SENTENCE_FIELDS",
|
||||
"SPLIT_MODES",
|
||||
"clean",
|
||||
"citation_row",
|
||||
@@ -747,7 +828,9 @@ __all__ = [
|
||||
"resolve_position",
|
||||
"sentence_inputs",
|
||||
"sentence_or_fail",
|
||||
"sentence_payload",
|
||||
"sentence_row",
|
||||
"sentence_values",
|
||||
"session",
|
||||
"split_text",
|
||||
"template_or_fail",
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
"""Tool registry: the five groups, registered in one call.
|
||||
"""Tool registry: the groups, registered in one call.
|
||||
|
||||
The groups mirror the domain rather than the HTTP routes — papers and
|
||||
paragraphs and sentences are the same tables the REST API serves, but a model
|
||||
@@ -7,9 +7,10 @@ and the split between :mod:`~app.mcp.tools.papers` and
|
||||
:mod:`~app.mcp.tools.paragraphs` follows those jobs.
|
||||
|
||||
Prefixes are load-bearing: every tool name starts with its group
|
||||
(``paper_``, ``paragraph_``, ``sentence_``, ``template_``, ``field_``), because
|
||||
that prefix is what a model uses to pick a tool out of a list of twenty-nine
|
||||
without reading all twenty-nine descriptions.
|
||||
(``paper_``, ``paragraph_``, ``sentence_``, ``template_``, ``field_``,
|
||||
``reference_``, ``reference_tag_``, ``image_``), because that prefix is what a
|
||||
model uses to pick a tool out of a list of forty without reading all forty
|
||||
descriptions.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -18,6 +19,7 @@ from mcp.server.mcpserver import MCPServer
|
||||
|
||||
from app.mcp.tools import (
|
||||
fields,
|
||||
images,
|
||||
papers,
|
||||
paragraphs,
|
||||
reference_tags,
|
||||
@@ -28,8 +30,18 @@ from app.mcp.tools import (
|
||||
|
||||
#: Registration order is also the order a client lists the tools in, which is
|
||||
#: the order a paper is actually written in: find it, shape it, write it, then
|
||||
#: the things it is written against.
|
||||
MODULES = (papers, paragraphs, sentences, templates, fields, references, reference_tags)
|
||||
#: the things it is written against — and last the figure, which is written by
|
||||
#: putting a sentence somewhere.
|
||||
MODULES = (
|
||||
papers,
|
||||
paragraphs,
|
||||
sentences,
|
||||
templates,
|
||||
fields,
|
||||
references,
|
||||
reference_tags,
|
||||
images,
|
||||
)
|
||||
|
||||
|
||||
def register_all(server: MCPServer) -> None:
|
||||
|
||||
@@ -0,0 +1,191 @@
|
||||
"""Image tools (插图): put a figure in the bucket, and hand back the sentence.
|
||||
|
||||
A picture is not text, so it does not live in the database: the sentence keeps a
|
||||
Markdown address and the bytes live in MinIO (see :mod:`app.core.storage`). That
|
||||
is what keeps a sentence one editable string, and it is also why there is no
|
||||
``image_create`` that attaches a picture to a paragraph — writing a figure *is*
|
||||
writing a sentence whose content happens to be ````.
|
||||
|
||||
One tool, and one field of a sentence, is therefore the whole feature from a
|
||||
model's side. ``image_upload`` exists for the half a model cannot do itself: it
|
||||
has bytes (a screenshot the user pasted, a figure it generated) and no way to
|
||||
send a multipart request. Everything after that is ordinary text.
|
||||
|
||||
The base64 argument is a deliberate cost. A tool argument is context tokens, and
|
||||
base64 is a third larger than the bytes it carries — but the alternative is a
|
||||
second ingestion path (an HTTP fetch of a URL the caller names), and a service
|
||||
inside the cluster that will fetch any address it is handed is an SSRF primitive
|
||||
aimed at everything beside it. A model with a picture and no base64 can post it
|
||||
to ``POST /api/images`` and use the Markdown that comes back; the two produce the
|
||||
same sentence, byte for byte, because both go through
|
||||
:func:`app.core.storage.markdown_for`.
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import base64
|
||||
import binascii
|
||||
import re
|
||||
from typing import Annotated
|
||||
|
||||
from mcp.server.mcpserver import MCPServer
|
||||
from pydantic import Field
|
||||
|
||||
from app.core.config import get_settings
|
||||
from app.core.storage import get_store, image_url, markdown_for
|
||||
from app.mcp import support as s
|
||||
from app.mcp.tools.registry import mcp_tool
|
||||
|
||||
|
||||
def register(server: MCPServer) -> None:
|
||||
"""Register every image tool on ``server``."""
|
||||
|
||||
@mcp_tool(server, title="上传插图")
|
||||
def image_upload(
|
||||
data_base64: Annotated[
|
||||
str,
|
||||
Field(
|
||||
description=(
|
||||
"图片内容的 base64。可以直接给 data:image/png;base64,… 这种完整形式。"
|
||||
"PNG / JPEG / GIF / WebP,最大 20 MB"
|
||||
)
|
||||
),
|
||||
],
|
||||
caption: Annotated[
|
||||
str | None,
|
||||
Field(description="图注;不给就用 filename 的主干,都没有则留空"),
|
||||
] = None,
|
||||
filename: Annotated[
|
||||
str | None,
|
||||
Field(description="文件名,只用于取图注初值;存储的键由内容决定,与它无关"),
|
||||
] = None,
|
||||
width: Annotated[
|
||||
str | None,
|
||||
Field(
|
||||
description=(
|
||||
"可选宽度:70%(占栏宽)或 400px。不传则按原尺寸,最大不超过栏宽"
|
||||
)
|
||||
),
|
||||
] = None,
|
||||
) -> str:
|
||||
"""上传一张图片,返回可直接写进句子的 Markdown 与那个句子对象。"""
|
||||
data = _decode(data_base64)
|
||||
settings = get_settings()
|
||||
if len(data) > settings.max_image_bytes:
|
||||
s.fail(
|
||||
f"图片太大了({len(data) / (1024 * 1024):.1f} MB),"
|
||||
f"上限是 {settings.max_image_bytes // (1024 * 1024)} MB。先压缩或裁剪一下再传。"
|
||||
)
|
||||
|
||||
# The store sniffs the format out of the bytes and refuses anything that
|
||||
# is not a picture: an SVG is stored XSS when it is served from this
|
||||
# origin, and the caller's content type or filename is only a claim.
|
||||
key, content_type, digest = get_store().save(data)
|
||||
|
||||
markdown = _embed(key, caption=caption or _stem(filename), width=width)
|
||||
return s.dumps(
|
||||
{
|
||||
"key": key,
|
||||
"url": image_url(key),
|
||||
"markdown": markdown,
|
||||
"content_type": content_type,
|
||||
"size": len(data),
|
||||
"sha256": digest,
|
||||
# The sentence, not just the Markdown: this is what the editor
|
||||
# produces when a picture is dropped into it — the figure on a
|
||||
# line of its own — so a model writes a figure by putting this
|
||||
# object into `sentences` and changing nothing about it.
|
||||
"sentence": {
|
||||
"content": markdown,
|
||||
"line_break_before": True,
|
||||
"formula_align": "center",
|
||||
},
|
||||
}
|
||||
)
|
||||
|
||||
|
||||
# --- helpers -----------------------------------------------------------------
|
||||
|
||||
#: How a size may be written, and what it may be. Both halves mirror
|
||||
#: ``WIDTH_PATTERN`` and ``parseImageWidth`` in ``frontend/src/utils/rich.ts``,
|
||||
#: which is what actually reads the attribute when the paper is printed: the
|
||||
#: syntax is ``{width=70%}`` or ``{width=400px}``, digits with at most one unit,
|
||||
#: pixels up to :data:`MAX_PIXELS` and percentages up to 100.
|
||||
#:
|
||||
#: Written twice because one side is TypeScript and one is Python, and checked
|
||||
#: here rather than passed through, because the reader's answer to a value it
|
||||
#: cannot parse is to print the picture at its natural size — a size that
|
||||
#: silently does not apply is worse than a refusal that says so.
|
||||
_WIDTH_ATTRIBUTE = re.compile(r"^\s*(?:w|width)\s*=\s*(\d{1,4})\s*(%|px)?\s*$", re.IGNORECASE)
|
||||
_WIDTH_BARE = re.compile(r"^\s*(\d{1,4})\s*(%|px)?\s*$")
|
||||
_MAX_PIXELS = 4000
|
||||
_MAX_PERCENT = 100
|
||||
|
||||
|
||||
def _decode(value: str) -> bytes:
|
||||
"""The bytes behind a base64 argument, refusing anything that is not one.
|
||||
|
||||
A ``data:`` prefix is stripped rather than refused: it is what a browser
|
||||
writes when a picture is copied as a data URL, and it is what a model
|
||||
produces when it repeats what it was given.
|
||||
"""
|
||||
text = value.strip()
|
||||
if text.startswith("data:"):
|
||||
_, _, text = text.partition(",")
|
||||
# Whitespace is folded out because base64 arrives wrapped in as many ways as
|
||||
# there are tools that produced it.
|
||||
text = "".join(text.split())
|
||||
if not text:
|
||||
s.fail("data_base64 是空的,没有图片内容")
|
||||
try:
|
||||
return base64.b64decode(text, validate=True)
|
||||
except (binascii.Error, ValueError):
|
||||
s.fail("data_base64 不是合法的 base64;请给图片字节的 base64,不要给文件路径或 URL")
|
||||
|
||||
|
||||
def _stem(filename: str | None) -> str:
|
||||
"""The caption a filename suggests, the way the upload endpoint reads it."""
|
||||
if not filename:
|
||||
return ""
|
||||
name = filename.replace("\\", "/").rsplit("/", 1)[-1]
|
||||
return name.rsplit(".", 1)[0] if "." in name else name
|
||||
|
||||
|
||||
def _embed(key: str, *, caption: str, width: str | None) -> str:
|
||||
"""The Markdown a sentence carries: the address, plus an optional width.
|
||||
|
||||
``markdown_for`` writes the ```` half — the same function the
|
||||
upload endpoint answers with — and this adds the size, which the endpoint
|
||||
does not take because a browser appends it in the editor.
|
||||
"""
|
||||
markdown = markdown_for(key, caption)
|
||||
attribute = _width_attribute(width)
|
||||
return f"{markdown}{attribute}" if attribute else markdown
|
||||
|
||||
|
||||
def _width_attribute(width: str | None) -> str:
|
||||
"""``{width=70%}`` from what the caller wrote, or a refusal saying why not.
|
||||
|
||||
Tolerant about how it is written — ``70%``, ``70 %``, ``{width=70%}`` and
|
||||
``w=400px`` all mean the same thing, which is what a model repeats back from
|
||||
a sentence it read — and strict about what it means.
|
||||
"""
|
||||
if width is None or not str(width).strip():
|
||||
return ""
|
||||
|
||||
written = str(width).strip().strip("{}").strip()
|
||||
match = _WIDTH_ATTRIBUTE.match(written) or _WIDTH_BARE.match(written)
|
||||
if match is None:
|
||||
s.fail(
|
||||
f"width 只能是百分比或像素,例如 70% 或 400px,收到的是“{width}”。"
|
||||
"不写则按原尺寸显示(最多不超过栏宽)"
|
||||
)
|
||||
|
||||
digits, unit = int(match.group(1)), (match.group(2) or "px").lower()
|
||||
limit = _MAX_PERCENT if unit == "%" else _MAX_PIXELS
|
||||
if not 1 <= digits <= limit:
|
||||
s.fail(f"width 的 {unit} 值要在 1 到 {limit} 之间,收到的是“{width}”")
|
||||
return f"{{width={digits}{unit}}}"
|
||||
|
||||
|
||||
__all__ = ["register"]
|
||||
@@ -342,12 +342,12 @@ def register(server: MCPServer) -> None:
|
||||
paper_crud.append_sentence(
|
||||
db,
|
||||
paper,
|
||||
# Spread, not copied field by field: a sentence
|
||||
# column added to the domain then reaches this path
|
||||
# by itself, instead of being dropped in silence.
|
||||
SentenceCreate(
|
||||
**item.model_dump(),
|
||||
paper_template_filed_sort=position,
|
||||
content=item.content,
|
||||
line_break_before=item.line_break_before,
|
||||
citations=item.citations,
|
||||
sort=item.sort,
|
||||
),
|
||||
)
|
||||
else:
|
||||
|
||||
@@ -204,19 +204,13 @@ def register(server: MCPServer) -> None:
|
||||
if not rows:
|
||||
s.fail(f"第 {source} 段没有内容可以搬")
|
||||
|
||||
# Moved, not rewritten. Every column of the sentence travels —
|
||||
# where a line started, how a formula was aligned, what it cited —
|
||||
# because all of it is part of what was there; and ``sort`` is the
|
||||
# one field deliberately left behind (see
|
||||
# :func:`app.mcp.support.sentence_values`).
|
||||
inputs = [
|
||||
SentenceInput(
|
||||
content=row.content,
|
||||
# ``sort`` is deliberately left unset so that
|
||||
# :func:`app.crud.paper.replace_paragraph` numbers the block
|
||||
# from the *target's* current maximum. Carrying the old
|
||||
# numbers over instead would interleave the two paragraphs —
|
||||
# the moved sentence with ``sort=1`` would sort against the
|
||||
# target's own sentence with ``sort=1`` — and the merge would
|
||||
# read in an order neither writer wrote.
|
||||
line_break_before=row.line_break_before,
|
||||
citations=list(row.citations),
|
||||
)
|
||||
SentenceInput(**s.sentence_values(row), citations=list(row.citations))
|
||||
for row in rows
|
||||
]
|
||||
paper_crud.replace_paragraph(
|
||||
@@ -266,6 +260,11 @@ def _write(
|
||||
at a time — the same call ``POST /papers/{id}/sentences`` makes — rather
|
||||
than read-modify-write, so two sentences appended in one request cannot
|
||||
overwrite each other's ``sort``.
|
||||
|
||||
The payload is spread rather than copied field by field, so a column added
|
||||
to a sentence reaches this path without anyone remembering to add it here —
|
||||
which is how ``line_break_before`` and ``formula_align`` each went missing
|
||||
once.
|
||||
"""
|
||||
if mode == "append":
|
||||
for item in inputs:
|
||||
@@ -273,11 +272,7 @@ def _write(
|
||||
db,
|
||||
paper,
|
||||
SentenceCreate(
|
||||
paper_template_filed_sort=field_sort,
|
||||
content=item.content,
|
||||
line_break_before=item.line_break_before,
|
||||
citations=item.citations,
|
||||
sort=item.sort,
|
||||
**item.model_dump(), paper_template_filed_sort=field_sort
|
||||
),
|
||||
)
|
||||
else:
|
||||
|
||||
@@ -32,6 +32,7 @@ from typing import Any, TypeVar
|
||||
from mcp.server.mcpserver import MCPServer
|
||||
from mcp.server.mcpserver.exceptions import ToolError
|
||||
|
||||
from app.core.storage import StorageUnavailable, UnsupportedImage
|
||||
from app.crud.reference import UnknownReference
|
||||
from app.crud.reference_tag import DuplicateTagName, UnknownTag
|
||||
|
||||
@@ -46,7 +47,19 @@ F = TypeVar("F", bound=Callable[..., Any])
|
||||
#: would have let 「标签不存在:9」 reach the model as an unreadable
|
||||
#: "Error executing tool ...", which is the exact failure this wrapper exists to
|
||||
#: prevent. A new domain refusal belongs in this tuple on the day it is written.
|
||||
DOMAIN_REFUSALS = (UnknownReference, UnknownTag, DuplicateTagName)
|
||||
#:
|
||||
#: The two storage ones are here for the same reason. A bucket that is not
|
||||
#: configured and a file that is not a picture are both answers rather than
|
||||
#: faults — "缺少 MINIO_ENDPOINT" and "只接受 PNG / JPEG / GIF / WebP" are the
|
||||
#: two things a caller can act on, and neither survives the wrapper as a stack
|
||||
#: trace.
|
||||
DOMAIN_REFUSALS = (
|
||||
UnknownReference,
|
||||
UnknownTag,
|
||||
DuplicateTagName,
|
||||
StorageUnavailable,
|
||||
UnsupportedImage,
|
||||
)
|
||||
|
||||
|
||||
def mcp_tool(
|
||||
|
||||
@@ -20,7 +20,7 @@ from pydantic import Field
|
||||
|
||||
from app.crud import paper as paper_crud
|
||||
from app.mcp import support as s
|
||||
from app.mcp.specs import CitationSpec
|
||||
from app.mcp.specs import CitationSpec, FormulaAlign
|
||||
from app.mcp.tools.registry import mcp_tool
|
||||
from app.models import Paper
|
||||
from app.schemas.paper import CitationInput, SentenceCreate, SentenceUpdate
|
||||
@@ -94,6 +94,10 @@ def register(server: MCPServer) -> None:
|
||||
)
|
||||
),
|
||||
] = False,
|
||||
formula_align: Annotated[
|
||||
FormulaAlign,
|
||||
Field(description="display 公式怎么排:center(默认)/ left / right"),
|
||||
] = "center",
|
||||
sort: Annotated[
|
||||
int | None, Field(description="段内位置;不传则排在段尾")
|
||||
] = None,
|
||||
@@ -109,6 +113,7 @@ def register(server: MCPServer) -> None:
|
||||
paper_template_filed_sort=field_sort,
|
||||
content=content,
|
||||
line_break_before=line_break_before,
|
||||
formula_align=formula_align,
|
||||
citations=_citations(citations or []),
|
||||
sort=sort,
|
||||
),
|
||||
@@ -137,17 +142,22 @@ def register(server: MCPServer) -> None:
|
||||
bool | None,
|
||||
Field(description="这一句是否另起一行;不传则不动,false 表示取消换行"),
|
||||
] = None,
|
||||
formula_align: Annotated[
|
||||
FormulaAlign | None,
|
||||
Field(description="display 公式怎么排;不传则不动"),
|
||||
] = None,
|
||||
citations: Annotated[
|
||||
list[CitationSpec] | None,
|
||||
Field(description="引用整组替换;传 [] 表示清空引用"),
|
||||
] = None,
|
||||
) -> str:
|
||||
"""修改一句话的正文、所属段落、排序、换行或引用(引用是整体替换)。"""
|
||||
"""修改一句话的正文、所属段落、排序、换行、公式对齐或引用(引用是整体替换)。"""
|
||||
if (
|
||||
content is None
|
||||
and position is None
|
||||
and sort is None
|
||||
and line_break_before is None
|
||||
and formula_align is None
|
||||
and citations is None
|
||||
):
|
||||
s.fail("没有给出任何要修改的内容")
|
||||
@@ -164,6 +174,7 @@ def register(server: MCPServer) -> None:
|
||||
paper_template_filed_sort=position,
|
||||
sort=sort,
|
||||
line_break_before=line_break_before,
|
||||
formula_align=formula_align,
|
||||
citations=None if citations is None else _citations(citations),
|
||||
),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user