smoother operatoin with CDN

Author: ciur

papermerge/core/features/document/schema.py

@@ -189,7 +189,15 @@ def thumbnail_url(value, info):
 ThumbnailUrl = Annotated[str | None, Field(validate_default=True)]
 
 
-class Document(BaseModel):
+class DocumentNode(BaseModel):
+    """Document without versions
+
+    The point of this class is to be used when listing folders/documents in
+    which case info about document versions (and their pages etc) is not
+    required (generating document version info in context of CDN is very
+    slow as for each page of each doc ver signed URL must be computed)
+    """
+
     id: UUID
     title: str
     ctype: Literal["document"]
@@ -199,7 +207,6 @@ class Document(BaseModel):
     parent_id: UUID | None
     document_type_id: UUID | None = None
     breadcrumb: list[tuple[UUID, str]] = []
-    versions: list[DocumentVersion] | None = []
     ocr: bool = True  # will this document be OCRed?
     ocr_status: OCRStatusEnum = OCRStatusEnum.unknown
     thumbnail_url: ThumbnailUrl = None
@@ -221,6 +228,10 @@ def thumbnail_url_validator(cls, value, info):
     model_config = ConfigDict(from_attributes=True)
 
 
+class Document(DocumentNode):
+    versions: list[DocumentVersion] | None = []
+
+
 class NewDocument(BaseModel):
     # UUID may be present to allow custom IDs
     # See https://github.com/papermerge/papermerge-core/issues/325

papermerge/core/features/nodes/db/api.py

@@ -137,9 +137,9 @@ def get_paginated_nodes(
         if node.ctype == "folder":
             items.append(schema.Folder.model_validate(node))
         else:
-            items.append(schema.Document.model_validate(node))
+            items.append(schema.DocumentNode.model_validate(node))
 
-    return PaginatedResponse[Union[schema.Document, schema.Folder]](
+    return PaginatedResponse[Union[schema.DocumentNode, schema.Folder]](
         page_size=page_size,
         page_number=page_number,
         num_pages=num_pages,

papermerge/core/features/nodes/router.py

@@ -42,7 +42,7 @@ def get_node(
     parent_id: UUID,
     user: Annotated[schema.User, Security(get_current_user, scopes=[scopes.NODE_VIEW])],
     params: CommonQueryParams = Depends(),
-) -> PaginatedResponse[Union[schema.Document, schema.Folder]]:
+) -> PaginatedResponse[Union[schema.DocumentNode, schema.Folder]]:
     """Returns list of *paginated* direct descendants of `parent_id` node
 
     Required scope: `{scope}`

papermerge/core/schema.py

@@ -10,6 +10,7 @@
 )
 from .features.document.schema import (
     Document,
+    DocumentNode,
     NewDocument,
     DocumentVersion,
     Page,
@@ -43,6 +44,7 @@
     'UpdateNode',
     'MoveNode',
     'Document',
+    'DocumentNode',
     'NewDocument',
     'DocumentVersion',
     'Page',