diff --git a/.env.example b/.env.example index 0ab1d9b..f38002f 100644 --- a/.env.example +++ b/.env.example @@ -4,9 +4,9 @@ S3_USE_SSL=false S3_ACCESS_KEY=minioadmin S3_SECRET_KEY=minioadmin S3_SESSION_TTL_SECONDS=3600 -CONVERSION_IMAGE_DPI=150 +CONVERSION_IMAGE_DPI=72 CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS=180 -CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS=600 +CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS=1800 CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS=45 CONVERSION_PPTX_TO_PDF_PER_SLIDE_TIMEOUT_SECONDS=3 CONVERSION_PDF_TO_IMAGES_BASE_TIMEOUT_SECONDS=30 diff --git a/Makefile b/Makefile index 0720e7d..deee93d 100644 --- a/Makefile +++ b/Makefile @@ -37,7 +37,7 @@ run-server: export S3_SESSION_TTL_SECONDS="$${S3_SESSION_TTL_SECONDS:-3600}"; \ export CONVERSION_IMAGE_DPI="$${CONVERSION_IMAGE_DPI:-72}"; \ export CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS="$${CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS:-180}"; \ - export CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS="$${CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS:-600}"; \ + export CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS="$${CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS:-1800}"; \ export CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS="$${CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS:-45}"; \ export CONVERSION_PPTX_TO_PDF_PER_SLIDE_TIMEOUT_SECONDS="$${CONVERSION_PPTX_TO_PDF_PER_SLIDE_TIMEOUT_SECONDS:-3}"; \ export CONVERSION_PDF_TO_IMAGES_BASE_TIMEOUT_SECONDS="$${CONVERSION_PDF_TO_IMAGES_BASE_TIMEOUT_SECONDS:-30}"; \ diff --git a/README.md b/README.md index 0b41205..7f58913 100644 --- a/README.md +++ b/README.md @@ -139,6 +139,6 @@ Use `.env.example` as your baseline env configuration. If conversion fails on larger decks, tune these environment variables: -- `CONVERSION_IMAGE_DPI` (default `150`): lower values reduce image generation time. +- `CONVERSION_IMAGE_DPI` (default `72`): lower values reduce image generation time. - `CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS` (default `180`): timeout for LibreOffice export. -- `CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS` (default `600`): timeout for Poppler rasterization. +- `CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS` (default `1800`): timeout for Poppler rasterization. diff --git a/deploy/docker-compose.yml b/deploy/docker-compose.yml index b04cf0c..190e980 100644 --- a/deploy/docker-compose.yml +++ b/deploy/docker-compose.yml @@ -29,7 +29,7 @@ services: S3_SESSION_TTL_SECONDS: ${S3_SESSION_TTL_SECONDS:-3600} CONVERSION_IMAGE_DPI: ${CONVERSION_IMAGE_DPI:-72} CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS: ${CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS:-180} - CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS: ${CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS:-600} + CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS: ${CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS:-1800} CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS: ${CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS:-45} CONVERSION_PPTX_TO_PDF_PER_SLIDE_TIMEOUT_SECONDS: ${CONVERSION_PPTX_TO_PDF_PER_SLIDE_TIMEOUT_SECONDS:-3} CONVERSION_PDF_TO_IMAGES_BASE_TIMEOUT_SECONDS: ${CONVERSION_PDF_TO_IMAGES_BASE_TIMEOUT_SECONDS:-30} diff --git a/python/packages/officeconvert/src/officeconvert/conversion.py b/python/packages/officeconvert/src/officeconvert/conversion.py index f95e42e..db35a8b 100644 --- a/python/packages/officeconvert/src/officeconvert/conversion.py +++ b/python/packages/officeconvert/src/officeconvert/conversion.py @@ -107,7 +107,7 @@ def render_pdf_to_images( pdf_path: Path, out_dir: Path, *, - dpi: int = 180, + dpi: int = 72, image_format: str = "png", timeout_s: int = 120, total_pages: int | None = None, @@ -254,10 +254,10 @@ def convert_pptx_to_slidedeck( pptx_path: Path, work_dir: Path, *, - dpi: int = 180, + dpi: int = 72, image_format: str = "png", pptx_to_pdf_timeout_s: int = 180, - pdf_to_images_timeout_s: int = 600, + pdf_to_images_timeout_s: int = 1800, pptx_to_pdf_base_timeout_s: int = 45, pptx_to_pdf_per_slide_timeout_s: int = 3, pdf_to_images_base_timeout_s: int = 30, diff --git a/python/packages/server/src/officeconvert_server/config.py b/python/packages/server/src/officeconvert_server/config.py index 5d4eb52..c2fd76a 100644 --- a/python/packages/server/src/officeconvert_server/config.py +++ b/python/packages/server/src/officeconvert_server/config.py @@ -40,7 +40,7 @@ def load_server_config() -> ServerConfig: os.getenv("CONVERSION_PPTX_TO_PDF_TIMEOUT_SECONDS", "180") ), conversion_pdf_to_images_timeout_seconds=int( - os.getenv("CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS", "600") + os.getenv("CONVERSION_PDF_TO_IMAGES_TIMEOUT_SECONDS", "1800") ), conversion_pptx_to_pdf_base_timeout_seconds=int( os.getenv("CONVERSION_PPTX_TO_PDF_BASE_TIMEOUT_SECONDS", "45")