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="整段共用的引用"),
|
||||
|
||||
Reference in New Issue
Block a user