Remove obsolete code, bump version, update changelog

Author: ciur

changelog.md

@@ -1,8 +1,9 @@
 # Changelog
 
-## [3.5.2] - not yet released
+## [3.5.2] - 2025-07-23
 
-- Fix [A 50-page pdf file is very slow to open](https://github.com/papermerge/papermerge-core/issues/55)
+-
+Fix [A 50-page pdf file is very slow to open](https://github.com/papermerge/papermerge-core/issues/55)
 - Document previews (thumbnails as well as pages) rendered in frontend
 - Frontend refactoring - use monorepo structure
 - Frontend dependencies updates

papermerge/core/config.py

@@ -1,9 +1,9 @@
 from enum import Enum
-
 from pathlib import Path
 
 from pydantic_settings import BaseSettings
 
+
 class FileServer(str, Enum):
     LOCAL = 'local'
     S3 = 's3'
@@ -23,10 +23,6 @@ class Settings(BaseSettings):
     papermerge__redis__url: str | None = None
     papermerge__ocr__default_lang_code: str = 'deu'
     papermerge__preview__page_size_sm: int = 200  # pixels
-    papermerge__preview__page_size_md: int = 600  # pixels
-    papermerge__preview__page_size_lg: int = 900  # pixels
-    papermerge__preview__page_size_xl: int = 1600  # pixels
-    papermerge__thumbnail__size: int = 100  # pixels
     # When is OCR triggered ?
     # `ocr__automatic` = True means that OCR will be performed without
     #   end user intervention i.e. via background scheduler like celery scheduler

papermerge/core/features/document/router_pages.py

@@ -1,26 +1,18 @@
 import logging
-import uuid
 from typing import Annotated, List
 
-from fastapi import APIRouter, HTTPException, Query, Security, Depends
-from fastapi.responses import FileResponse
-from sqlalchemy.exc import NoResultFound
+from fastapi import APIRouter, Security, Depends
 from sqlalchemy import select
 
-from core.types import ImagePreviewSize
 from papermerge.core.config import get_settings
 from papermerge.core import db, utils, schema, orm
-from papermerge.core import pathlib as core_pathlib
 from papermerge.core.features.auth import get_current_user
 from papermerge.core.features.auth import scopes
-from papermerge.core.features.document.db import api as doc_dbapi
 from papermerge.core.features.page_mngm.db.api import apply_pages_op
 from papermerge.core.features.page_mngm.db.api import \
     extract_pages as api_extract_pages
 from papermerge.core.features.page_mngm.db.api import \
     move_pages as api_move_pages
-from papermerge.core.db import common as dbapi_common
-from papermerge.core.utils import image
 
 logger = logging.getLogger(__name__)
 config = get_settings()
@@ -31,99 +23,6 @@
     tags=["pages"],
 )
 
-
-class SVGFileResponse(FileResponse):
-    media_type = "application/svg"
-
-
-class JPEGFileResponse(FileResponse):
-    media_type = "application/jpeg"
-
-
-@router.get("/{page_id}/svg", response_class=SVGFileResponse)
-@utils.docstring_parameter(scope=scopes.PAGE_VIEW)
-def get_page_svg_url(
-    page_id: uuid.UUID,
-    user: Annotated[schema.User, Security(get_current_user, scopes=[scopes.PAGE_VIEW])],
-    db_session=Depends(db.get_db),
-):
-    """View page as SVG
-
-    Required scope: `{scope}`
-    """
-
-    try:
-        page = db.get_page(db_session, page_id=page_id, user_id=user.id)
-    except NoResultFound:
-        raise HTTPException(status_code=404, detail="Page not found")
-
-    svg_abs_path = core_pathlib.abs_page_svg_path(str(page.id))
-    logger.debug(f"page UUID={page_id} svg abs path={svg_abs_path}")
-
-    if not svg_abs_path.exists():
-        raise HTTPException(status_code=404, detail="File not found")
-
-    return SVGFileResponse(svg_abs_path)
-
-
-@router.get("/{page_id}/jpg", response_class=JPEGFileResponse)
-@utils.docstring_parameter(scope=scopes.NODE_VIEW)
-def get_page_jpg_url(
-    page_id: uuid.UUID,
-    user: Annotated[schema.User, Security(get_current_user, scopes=[scopes.NODE_VIEW])],
-    size: ImagePreviewSize = Query(
-        ImagePreviewSize.xl, description="jpg image width in pixels"
-    ),
-    db_session=Depends(db.get_db),
-):
-    """Returns jpg preview image of the page.
-
-    Required scope: `{scope}`
-
-    Returned jpg image's width is `size` pixels.
-    """
-    try:
-        document_id = doc_dbapi.get_page_document_id(db_session, page_id=page_id)
-        ok = dbapi_common.has_node_perm(
-            db_session,
-            user_id=user.id,
-            node_id=document_id,
-            codename=scopes.NODE_VIEW,
-        )
-        if not ok:
-            raise HTTPException(status_code=403, detail="Access Forbidden")
-
-        page = doc_dbapi.get_page(db_session, page_id=page_id)
-        doc_ver = doc_dbapi.get_doc_ver(
-            db_session,
-            document_version_id=page.document_version_id,
-        )
-    except NoResultFound:
-        raise HTTPException(status_code=404, detail="Page does not exist")
-
-    logger.debug(
-        f"Generating page preview for page.number={page.number}" f" page.id={page.id}"
-    )
-
-    jpeg_abs_path = core_pathlib.rel2abs(
-        core_pathlib.page_preview_jpg_path(page.id, size=size)
-    )
-
-    if not jpeg_abs_path.exists():
-        # generate preview only for this page
-        image.gen_page_preview(
-            page_id=page.id,
-            doc_ver_id=doc_ver.id,
-            page_number=page.number,
-            file_name=doc_ver.file_name,
-            size=size,
-        )
-
-    logger.debug(f"jpeg_abs_path={jpeg_abs_path}")
-
-    return JPEGFileResponse(jpeg_abs_path)
-
-
 @router.post("/")
 @utils.docstring_parameter(scope=scopes.PAGE_UPDATE)
 def apply_page_operations(

papermerge/core/features/document/schema.py

@@ -15,7 +15,6 @@
     ImagePreviewSize,
 )
 from papermerge.core.features.nodes.schema import Node
-from papermerge.core import pathlib as plib
 from papermerge.core.types import OCRStatusEnum
 from papermerge.core import config
 from papermerge.core.features.document import s3
@@ -294,38 +293,6 @@ class Thumbnail(BaseModel):
     size: int
 
 
-def _s3_page_svg_url(uid: UUID) -> str:
-    from papermerge.core.cloudfront import sign_url
-
-    resource_path = plib.page_svg_path(uid)
-    prefix = settings.papermerge__main__prefix
-    if prefix:
-        url = f"https://{settings.papermerge__main__cf_domain}/{prefix}/{resource_path}"
-    else:
-        url = f"https://{settings.papermerge__main__cf_domain}/{resource_path}"
-
-    return sign_url(
-        url,
-        valid_for=600,  # valid for 600 seconds
-    )
-
-
-def _s3_docver_download_url(uid: UUID, file_name: str) -> str:
-    from papermerge.core.cloudfront import sign_url
-
-    resource_path = plib.docver_path(uid, file_name)
-    prefix = settings.papermerge__main__cf_domain
-    if prefix:
-        url = f"https://{settings.papermerge__main__cf_domain}/{prefix}/{resource_path}"
-    else:
-        url = f"https://{settings.papermerge__main__cf_domain}/{resource_path}"
-
-    return sign_url(
-        url,
-        valid_for=600,  # valid for 600 seconds
-    )
-
-
 class MovePage(BaseModel):
     id: UUID
     number: int

papermerge/core/features/document/tests/test_pages_router.py

@@ -1,34 +1,7 @@
-from sqlalchemy import select
-
-from papermerge.core import orm, schema, dbapi
+from papermerge.core import schema, dbapi
 from papermerge.core.tests.resource_file import ResourceFile
 
 
-def test_get_document_details(
-    auth_api_client, make_document_from_resource, user, db_session
-):
-    doc = make_document_from_resource(
-        resource=ResourceFile.THREE_PAGES, user=user, parent=user.home_folder
-    )
-
-    stmt = (
-        select(orm.Page)
-        .join(orm.DocumentVersion)
-        .join(orm.Document)
-        .where(orm.Document.id == doc.id)
-    )
-    pages = db_session.execute(stmt).scalars().all()
-
-    response = auth_api_client.get(f"/pages/{pages[0].id}/jpg")
-    assert response.status_code == 200, response.json()
-
-    response = auth_api_client.get(f"/pages/{pages[1].id}/jpg")
-    assert response.status_code == 200, response.json()
-
-    response = auth_api_client.get(f"/pages/{pages[2].id}/jpg")
-    assert response.status_code == 200, response.json()
-
-
 def test_router_move_pages_endpoint_one_single_page_mix(
     auth_api_client, user, db_session, make_document_from_resource
 ):

papermerge/core/features/nodes/router_thumbnails.py

@@ -8,7 +8,6 @@
 from fastapi.responses import FileResponse
 from pydantic import BaseModel
 
-from papermerge.core.db.engine import Session
 from papermerge.core import utils, db
 from papermerge.core.features.users import schema as usr_schema
 from papermerge.core.features.auth import get_current_user
@@ -18,8 +17,6 @@
 from papermerge.core.utils import image
 from papermerge.core.db.common import has_node_perm
 from papermerge.core.exceptions import HTTP403Forbidden, HTTP404NotFound
-
-
 from papermerge.core.routers.common import OPEN_API_GENERIC_JSON_DETAIL
 
 router = APIRouter(