mirror of
https://github.com/lrnselfreliance/wrolpi.git
synced 2026-10-26 10:51:36 -04:00
* db: serializers read only loaded data Serializing a model must not query. A lazy load there is a hidden query per row (search serialized 24 rows with 55 statements), and would be a `MissingGreenlet` error under an async Session. - `wrolpi.db.no_db_access(reason)` and `@serializer` (on every model `__json__`, and around `json_response`): an engine `before_cursor_execute` listener raises `UnexpectedQuery` during tests, and in production logs once per serializer and lets the query run. Tests record each trip as well, and the autouse `no_unexpected_queries` fixture fails a test even when the code caught the error (Video's serializer was swallowing its per-row loads of the deferred `ffprobe_json`). - Relationships serializers read load with their parent: `selectin` for FileGroup.tag_files and Collection.downloads; `joined` for TagFile.tag, Collection.tag, Channel.collection, Video.channel, Archive.collection, ZimSubscription.download, CollectionItem.zim, and the file_group of Video, Archive, Doc, Zim and CollectionItem. - Search and the Video lookups the video page uses load the deferred `ffprobe_json` (`undefer`). - `wrolpi/test/test_serializers.py`: every serialized model, freshly loaded, serializes without SQL. Search: 55 -> 5 statements for 24 videos (31 -> 5 for archives), and a few ms faster locally. Not in this change: guarding the `dict()` serializers and `expire_on_commit=False`, which go together (about 50 serialize-after-commit sites, and 40 tests that read values changed elsewhere after a commit). Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * db: serializer loads per query; the guard ignores transaction control The query guard reported the engine's own BEGIN (emitted through the same event as the first statement on a Session with no open transaction) instead of the lazy load after it, and in production that BEGIN used up the one warning per serializer. Transaction-control statements are now ignored. Mapper-level eager loads reached background code: every Video/Archive load in the modelers (one per file, inside the write transaction) joined file_group/channel/collection/tag and selectin-loaded the Collection's Download rows with their yt-dlp info_json. A second refresh of 100 videos took 0.40 s instead of 0.16 s. Serializer needs are now declared per model (`json_options()`) and added only by the queries whose results are serialized; Download.info_json is deferred there (no serializer reads it). Mapper defaults keep only narrow joins nearly every use needs: TagFile.tag, Collection.tag and Channel.collection. A second refresh is back to master's statement count and time; search still drops from 55 to 3 statements. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
169 lines
6.1 KiB
Python
169 lines
6.1 KiB
Python
import pathlib
|
|
from typing import Optional
|
|
|
|
from sqlalchemy import Column, Integer, BigInteger, ForeignKey, String, Text, Index, or_
|
|
from sqlalchemy.orm import relationship, Session, joinedload
|
|
|
|
from wrolpi.common import ModelHelper, Base
|
|
from wrolpi.db import get_db_session, serializer
|
|
from wrolpi.files.models import FileGroup
|
|
|
|
EPUB_MIMETYPE = 'application/epub'
|
|
MOBI_MIMETYPE = 'application/x-mobipocket-ebook'
|
|
|
|
DOC_MIMETYPES = (
|
|
'application/epub+zip',
|
|
'application/x-mobipocket-ebook',
|
|
'application/pdf',
|
|
'application/msword',
|
|
'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
|
|
'application/vnd.oasis.opendocument.text',
|
|
'application/vnd.comicbook-rar',
|
|
'application/vnd.comicbook+zip',
|
|
'application/x-cbz',
|
|
'application/x-cbr',
|
|
'application/x-cbt',
|
|
'application/x-cb7',
|
|
)
|
|
|
|
# Mimetypes that are considered ebook formats.
|
|
EBOOK_MIMETYPES = (
|
|
EPUB_MIMETYPE,
|
|
MOBI_MIMETYPE,
|
|
)
|
|
|
|
|
|
COMIC_BOOK_SUFFIXES = ('.cbz', '.cbr', '.cbt', '.cb7')
|
|
|
|
|
|
def mimetype_is_doc(mimetype: str) -> bool:
|
|
"""Check if a mimetype is a doc type that the Doc model handles."""
|
|
return any(mimetype.startswith(mt) for mt in DOC_MIMETYPES)
|
|
|
|
|
|
class Doc(ModelHelper, Base):
|
|
__tablename__ = 'doc'
|
|
__table_args__ = (
|
|
Index('doc_size_idx', 'size'),
|
|
)
|
|
|
|
id = Column(Integer, primary_key=True)
|
|
size = Column(BigInteger)
|
|
publisher = Column(String)
|
|
language = Column(String)
|
|
page_count = Column(Integer)
|
|
subject = Column(String)
|
|
description = Column(Text)
|
|
|
|
file_group_id = Column(BigInteger, ForeignKey('file_group.id', ondelete='CASCADE'), nullable=False, unique=True)
|
|
file_group: FileGroup = relationship('FileGroup')
|
|
sections = relationship('DocSection', back_populates='doc',
|
|
cascade='all, delete-orphan',
|
|
passive_deletes=True)
|
|
|
|
def __repr__(self):
|
|
path = str(self.file_group.primary_path) if self.file_group else 'None'
|
|
return f'<Doc id={self.id} path={repr(path)} file_group_id={self.file_group_id}>'
|
|
|
|
@staticmethod
|
|
def json_options() -> tuple:
|
|
"""Loader options for a query whose Docs will be serialized: `__json__` reads the FileGroup and its Tags."""
|
|
return joinedload(Doc.file_group).selectinload(FileGroup.tag_files),
|
|
|
|
@serializer
|
|
def __json__(self) -> dict:
|
|
d = self.file_group.__json__()
|
|
if d.get('data') and d['data'].get('doc_path'):
|
|
d['data']['doc_path'] = self.file_group.resolve_path(d['data']['doc_path'])
|
|
if d.get('data') and d['data'].get('cover_path'):
|
|
d['data']['cover_path'] = self.file_group.resolve_path(d['data']['cover_path'])
|
|
# Also handle legacy ebook_path key.
|
|
if d.get('data') and d['data'].get('ebook_path'):
|
|
d['data']['ebook_path'] = self.file_group.resolve_path(d['data']['ebook_path'])
|
|
return d
|
|
|
|
@staticmethod
|
|
def get_by_path(session: Session, path) -> Optional['Doc']:
|
|
return session.query(Doc).join(FileGroup).filter(FileGroup.primary_path == str(path)).one_or_none()
|
|
|
|
@staticmethod
|
|
def can_model(file_group: FileGroup) -> bool:
|
|
if file_group.mimetype and mimetype_is_doc(file_group.mimetype):
|
|
return True
|
|
if file_group.primary_path and file_group.primary_path.suffix.lower() in COMIC_BOOK_SUFFIXES:
|
|
return True
|
|
return False
|
|
|
|
@staticmethod
|
|
def do_model(session: Session, file_group: FileGroup) -> 'Doc':
|
|
from modules.docs import _model_doc
|
|
doc = _model_doc(file_group, session)
|
|
file_group.model = Doc.__tablename__
|
|
file_group.indexed = True
|
|
return doc
|
|
|
|
@property
|
|
def cover_file(self) -> Optional[dict]:
|
|
posters = self.file_group.my_poster_files()
|
|
if posters:
|
|
return posters[0]
|
|
return None
|
|
|
|
@property
|
|
def cover_path(self) -> Optional[pathlib.Path]:
|
|
cover = self.cover_file
|
|
if cover:
|
|
return cover['path']
|
|
return None
|
|
|
|
def _hide_calibre_files(self, file_group: FileGroup):
|
|
"""Delete FileGroups of the cover/metadata when this is a Calibre ebook directory."""
|
|
from modules.docs.lib import discover_calibre_cover
|
|
path = file_group.primary_path
|
|
if not discover_calibre_cover(path):
|
|
raise ValueError(f'Refusing to hide Calibre files when we do not have a Calibre ebook directory!')
|
|
|
|
metadata = path.parent / 'metadata.opf'
|
|
cover = path.parent / 'cover.jpg'
|
|
|
|
with get_db_session(commit=True) as session:
|
|
file_groups = session.query(FileGroup).filter(or_(
|
|
FileGroup.primary_path == str(metadata),
|
|
FileGroup.primary_path == str(cover),
|
|
))
|
|
for fg in file_groups:
|
|
session.delete(fg)
|
|
|
|
|
|
# Section kinds.
|
|
SECTION_KIND_EPUB_SPINE = 'epub_spine'
|
|
SECTION_KIND_PDF_PAGE = 'pdf_page'
|
|
|
|
|
|
class DocSection(ModelHelper, Base):
|
|
"""A searchable sub-range of a Doc.
|
|
|
|
For EPUB files, one row per spine item with `ordinal` as the 0-based spine index.
|
|
For PDF files, one row per page with `ordinal` as the 1-based page number.
|
|
Each row is indexed by the `doc_section_fts` FTS5 table for per-section full-text search,
|
|
which lets us deep-link from a search result into a specific chapter or page.
|
|
"""
|
|
__tablename__ = 'doc_section'
|
|
__table_args__ = (
|
|
Index('doc_section_doc_id_idx', 'doc_id', 'ordinal'),
|
|
)
|
|
|
|
# SQLite requires exactly "INTEGER PRIMARY KEY" for the rowid alias (FTS5 content_rowid).
|
|
id = Column(BigInteger().with_variant(Integer, 'sqlite'), primary_key=True)
|
|
doc_id = Column(Integer, ForeignKey('doc.id', ondelete='CASCADE'), nullable=False)
|
|
kind = Column(String, nullable=False)
|
|
ordinal = Column(Integer, nullable=False)
|
|
label = Column(String)
|
|
# Full-text search over `content` is provided by the external-content FTS5 table
|
|
# `doc_section_fts` (see `wrolpi.fts`).
|
|
content = Column(Text)
|
|
|
|
doc = relationship('Doc', back_populates='sections')
|
|
|
|
def __repr__(self):
|
|
return f'<DocSection id={self.id} doc_id={self.doc_id} kind={self.kind} ordinal={self.ordinal}>'
|